chore: sync gqlPrettify and update snapshot

8base · Jun 21, 2022 · 32c5cfd · 32c5cfd
1 parent b9ba3e6
commit 32c5cfd
Show file tree

Hide file tree

Showing 4 changed files with 239 additions and 68 deletions.
diff --git a/packages/core/utils/src/queryGenerators/createQueryString.ts b/packages/core/utils/src/queryGenerators/createQueryString.ts
@@ -121,8 +121,7 @@ export const createQueryString = (
           isNotEmptyRelation = !R.isEmpty(innerFields);
 
           fieldContent = `{
-            id
-            ${innerFields}
+            id${innerFields}
             _description
           }`;
         }
@@ -162,7 +161,15 @@ export const createQueryString = (
         if (!!relationItemsCount && isList && isRelation) {
           queryObject += `\n${field.name}(first: ${relationItemsCount}) ${fieldContent}`;
         } else {
-          queryObject += `\n${field.name} ${fieldContent}`;
+          if (field.name === fieldContent) {
+            // skip double id
+            if (field.name !== 'id') {
+              queryObject += `\n${field.name}`;
+            }
+          } else {
+            queryObject += `\n${field.name}
+             ${fieldContent}`;
+          }
         }
       }
     });

diff --git a/packages/core/utils/src/queryGenerators/queryGenerators.ts b/packages/core/utils/src/queryGenerators/queryGenerators.ts
@@ -72,8 +72,7 @@ export const createTableFilterGraphqlTag = (
       skip: $skip
     ) {
       items {
-        id
-        ${withResultData ? createQueryString(tablesList, table.id, { ...restConfig }) : ''}
+        id${withResultData ? createQueryString(tablesList, table.id, { ...restConfig }) : ''}
         _description
       }
       count
@@ -98,8 +97,7 @@ export const createTableRowCreateTag = (
   mutation ${upperFirst(table.name)}Create($data: ${SchemaNameGenerator.getCreateInputName(table.name, appName)}!) {
     ${wrapInAppName(appName)(`
     ${SchemaNameGenerator.getCreateItemFieldName(table.name)}(data: $data) {
-        id
-        ${withResultData ? createQueryString(tablesList, tableId, { withMeta: false, ...restConfig }) : ''}
+        id${withResultData ? createQueryString(tablesList, tableId, { withMeta: false, ...restConfig }) : ''}
         _description
       }`)}
     }`);
@@ -109,8 +107,7 @@ export const createTableRowCreateTag = (
   mutation ${upperFirst(table.name)}Create {
   ${wrapInAppName(appName)(`
     ${SchemaNameGenerator.getCreateItemFieldName(table.name)} {
-        id
-        ${withResultData ? createQueryString(tablesList, tableId, { withMeta: false, ...restConfig }) : ''}
+        id${withResultData ? createQueryString(tablesList, tableId, { withMeta: false, ...restConfig }) : ''}
         _description
       }`)}
     }`);
@@ -160,8 +157,7 @@ export const createTableRowUpdateTag = (
     ) {
     ${wrapInAppName(appName)(`
       ${SchemaNameGenerator.getUpdateItemFieldName(table.name)}(data: $data, filter: $filter) {
-          id
-          ${withResultData ? createQueryString(tablesList, tableId, { withMeta: false, ...restConfig }) : ''}
+          id${withResultData ? createQueryString(tablesList, tableId, { withMeta: false, ...restConfig }) : ''}
           _description
         }`)}
       }`);
@@ -180,8 +176,7 @@ export const createTableRowQueryTag = (
     query ${upperFirst(table.name)}Entity($id: ID!) {
     ${wrapInAppName(appName)(`
       ${SchemaNameGenerator.getTableItemFieldName(table.name)}(id: $id) {
-          id
-          ${withResultData ? createQueryString(tablesList, tableId, { ...restConfig }) : ''}
+          id${withResultData ? createQueryString(tablesList, tableId, { ...restConfig }) : ''}
           _description
         }`)}
       }`);