#1 sibling arg support

Author: ChuckJonas

force-app/main/default/classes/GraphQLArgument.cls

@@ -17,18 +17,18 @@ public class GraphQLArgument{
 
     public string build(){
         String qry = this.name + ':';
-        if(isVariable || this.value instanceOf Integer || this.value instanceOf Decimal){
+        if(isVariable || this.value instanceOf Integer || this.value instanceOf Decimal || this.value instanceOf Boolean){
             qry += String.valueOf(this.value);
         }else if(this.value instanceOf DateTime){
             qry += '\"' + ((DateTime) this.value).format('yyyy-MM-dd\'T\'HH:mm:ss.SSS\'Z\'') + '\"';
         }else if(this.value instanceOf GraphQLArgument){
             qry += '{' + ((GraphQLArgument) this.value).build() + '}';
         }else if(this.value instanceOf GraphQLArgument[]){
-            qry += '{';
-            for(GraphQLArgument childParam : (GraphQLArgument[]) this.value){
-                qry += childParam.build();
+            String[] argsStrings = new String[]{};
+            for(GraphQLArgument arg : (GraphQLArgument[]) this.value){
+                argsStrings.add(arg.build());
             }
-            qry += '}';
+            qry += '{' + String.join(argsStrings, ', ') + '}';
         }else { // default to string
             qry += '\"' + String.valueOf(this.value) + '\"';
         }

force-app/main/default/classes/GraphQLNode.cls

@@ -2,11 +2,12 @@ public class GraphQLNode {
     public String id;
     public Boolean typeFrament; // transforms to "...on {id} {"
     public String alias;
-    public GraphQLArgument arg; //not sure this supports all use cases... might need to be GraphQLArgument | GraphQLArgument[]
+    public GraphQLArgument[] args; //not sure this supports all use cases... might need to be GraphQLArgument | GraphQLArgument[]
     public Object[] children; //object or other nodes
 
     public GraphQLNode(String id){
         this.typeFrament = false;
+        this.args = new GraphQLArgument[]{};
         this.children = new Object[]{};
         this.id = id;
     }
@@ -24,8 +25,13 @@ public class GraphQLNode {
     }
 
     //returns the current node
-    public GraphQLNode setArguments(GraphQLArgument arg){
-        this.arg = arg;
+    public GraphQLNode addArguments(GraphQLArgument arg){
+        this.args.add(arg);
+        return this;
+    }
+
+    public GraphQLNode addArguments(GraphQLArgument[] args){
+        this.args.addAll(args);
         return this;
     }
 
@@ -52,9 +58,14 @@ public class GraphQLNode {
             qry = this.alias + ': ' + qry;
         }
 
-        if(this.arg != null){
-            qry += '(' + this.arg.build() + ')';
+        if(this.args.size() > 0){
+            String[] argsStrings = new String[]{};
+            for(GraphQLArgument arg : this.args){
+                argsStrings.add(arg.build());
+            }
+            qry += '(' + String.join(argsStrings, ', ') + ')';
         }
+        
         qry += '{\n';
         for(Object child : this.children){
             if(child instanceOf GraphQLNode){

force-app/main/default/classes/GraphQLQueryTests.cls

@@ -4,14 +4,14 @@ public class GraphQLQueryTests {
     @isTest
     private static void readmeExample(){
         GraphQLNode human = new GraphQLNode('human')
-        .setArguments(new GraphQLArgument('id', '1000'))
+        .addArguments(new GraphQLArgument('id', '1000'))
         .add(new Object[]{
             'name',
             'height',
             new GraphQLNode('address')
                 .add(new Object[]{ 'city', 'country' })
         });
-        String qry = human.build();
+        GraphQLQuery qry = new GraphQLQuery(human, null);
     }
 
 
@@ -23,13 +23,36 @@ public class GraphQLQueryTests {
     }
 
     @isTest
-    private static void testSimpleNodeInput(){
+    private static void testSimpleArgs(){
         GraphQLNode n = new GraphQLNode('hello')
-        .setArguments(new GraphQLArgument('key', 'value'))
+        .addArguments(new GraphQLArgument('key', 'value'))
         .add('world');
         System.assertEquals('hello(key:\"value\"){world}', n.build().deleteWhitespace());
     }
 
+    @isTest
+    private static void testChildArgs(){
+        GraphQLNode n = new GraphQLNode('hello')
+        .addArguments(new GraphQLArgument('input', new GraphQLArgument[]{
+            new GraphQLArgument('key1', 'value1'),
+            new GraphQLArgument('key2', 'value2')
+        }))
+        .add('world');
+        System.assertEquals('hello(input:{key1:\"value1\", key2:\"value2\"}){world}', n.build().remove('\n'));
+    }
+
+    @isTest
+    private static void testMultipleTopLevelArgs(){
+        GraphQLNode n = new GraphQLNode('hero')
+            .addArguments(new GraphQLArgument[]{ 
+                new GraphQLArgument('episode', 'EMPIRE', true),
+                new GraphQLArgument('robot', true)
+            })
+            .add('name');
+        
+        System.assertEquals('hero(episode:EMPIRE, robot:true){name}', n.build().remove('\n'));
+    }
+
     @isTest
     private static void testChildNode(){
         GraphQLNode n = new GraphQLNode('message')
@@ -55,11 +78,11 @@ public class GraphQLQueryTests {
         GraphQLNode[] nodes = new GraphQLNode[]{
              new GraphQLNode('hero')
             .setAlias('empireHero')
-            .setArguments(new GraphQLArgument('episode', 'EMPIRE', true))
+            .addArguments(new GraphQLArgument('episode', 'EMPIRE', true))
             .add('name'),
             new GraphQLNode('hero')
             .setAlias('jediHero')
-            .setArguments(new GraphQLArgument('episode', 'JEDI', true))
+            .addArguments(new GraphQLArgument('episode', 'JEDI', true))
             .add('name')
         };