Fix invalid query generation when query arguments have arrays of obje…

…cts or are empty
graphql-editor · Apr 19, 2022 · bd216d3 · bd216d3
1 parent 520e7eb
commit bd216d3
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 7 deletions.
diff --git a/src/TreeToTS/functions/new/buildQuery.spec.ts b/src/TreeToTS/functions/new/buildQuery.spec.ts
@@ -69,6 +69,30 @@ describe('Test generated function buildQuery', () => {
         }
     }`);
   });
+  test('Query with array and object arguments', () => {
+    const matchExact = replSpace(
+      builder('query', {
+        cards: [
+          {
+            where: { active: true },
+            order_by: [{ date: 'asc' }, { age: 'desc' }],
+          },
+          {
+            name: true,
+            age: true,
+            bio: true,
+          },
+        ],
+      }),
+    );
+    matchExact(`query{
+        cards(where: {active: true}, order_by: [{date: "asc"}, {age: "desc"}]){
+            name
+            age
+            bio
+        }
+    }`);
+  });
   test('Query with arguments and variables', () => {
     const variables = useZeusVariables({ id: 'String!' })({
       id: 'a1',
@@ -102,6 +126,28 @@ describe('Test generated function buildQuery', () => {
         }
     }`);
   });
+
+  test('Query with empty arguments params', () => {
+    const matchExact = replSpace(
+      builder('query', {
+        cards: [
+          {},
+          {
+            name: true,
+            age: true,
+            bio: true,
+          },
+        ],
+      }),
+    );
+    matchExact(`query{
+        cards {
+            name
+            age
+            bio
+        }
+    }`);
+  });
   test('Mutation with arguments', () => {
     const enum Status {
       CREATED = 'CREATED',
@@ -155,6 +201,7 @@ describe('Test generated function buildQuery', () => {
         }
     }`);
   });
+
   test('Undefined param', () => {
     const Children = undefined;
     const matchExact = replSpace(

diff --git a/src/TreeToTS/functions/new/buildQuery.ts b/src/TreeToTS/functions/new/buildQuery.ts
@@ -29,12 +29,8 @@ export const InternalsBuildQuery = (
       return `${k} ${o}`;
     }
     if (Array.isArray(o)) {
-      return `${ibb(
-        `${k}(${InternalArgsBuilt(props, returns, ops, options?.variables?.values)(o[0], newPath)})`,
-        o[1],
-        p,
-        false,
-      )}`;
+      const args = InternalArgsBuilt(props, returns, ops, options?.variables?.values)(o[0], newPath);
+      return `${ibb(args ? `${k}(${args})` : k, o[1], p, false)}`;
     }
     if (k === '__alias') {
       const alias = Object.keys(o)[0];

diff --git a/src/TreeToTS/functions/new/resolvePath.ts b/src/TreeToTS/functions/new/resolvePath.ts
@@ -91,7 +91,7 @@ export const InternalArgsBuilt = (
 ) => {
   const arb = (a: ZeusArgsType, p = '', root = true): string => {
     if (Array.isArray(a)) {
-      return `[${a.map((arr) => arb(arr, p)).join(', ')}]`;
+      return `[${a.map((arr) => arb(arr, p, false)).join(', ')}]`;
     }
     if (typeof a === 'string') {
       if (a.startsWith('$') && variables?.[a.slice(1)]) {