🔖 Fixed translateGraphql

Author: aexol

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-js-tree",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "license": "MIT",
   "description": "GraphQL Parser providing simplier structure",

src/TreeToGraphQL/templates/TemplateUtils.ts

@@ -29,15 +29,19 @@ const dedent = new RegExp('\n([\t ]*)', 'gm');
  * @class TemplateUtils
  */
 export class TemplateUtils {
-  static resolveFieldType = (f: ParserField['type']['fieldType'], fn: (x: string) => string = (x) => x): string => {
+  static resolveFieldType = (
+    f: ParserField['type']['fieldType'],
+    fn: (x: string) => string = (x) => x,
+    required = false,
+  ): string => {
     if (f.type === Options.name && f.name) {
-      return fn(f.name);
+      return fn(required ? `${f.name}!` : f.name);
     }
-    if (f.type === Options.array && f.nest) {
-      return TemplateUtils.resolveFieldType(f.nest, (x) => `[${fn(x)}]`);
+    if (f.type === Options.array) {
+      return TemplateUtils.resolveFieldType(f.nest, (x) => (required ? `[${fn(x)}]!` : `[${fn(x)}]`));
     }
-    if (f.type === Options.required && f.nest) {
-      return TemplateUtils.resolveFieldType(f.nest, (x) => `${fn(x)}!`);
+    if (f.type === Options.required) {
+      return TemplateUtils.resolveFieldType(f.nest, fn, true);
     }
     throw new Error('Invalid field type:' + JSON.stringify(f));
   };

src/__tests__/Parser/Field.spec.ts

@@ -623,4 +623,90 @@ describe('Fields tests on parser', () => {
     };
     expect(tree.nodes).toEqual(expect.arrayContaining(treeMock.nodes));
   });
+  test(`ListType fields`, () => {
+    const schema = `type Person{
+        id: ${ScalarTypes.ID}!
+        name: [${ScalarTypes.String}]
+        friends: [Person]!
+    }`;
+    const tree = Parser.parse(schema);
+    const treeMock: ParserTree = {
+      nodes: [
+        {
+          name: 'Person',
+          type: {
+            fieldType: {
+              name: TypeDefinitionDisplayStrings.type,
+              type: Options.name,
+            },
+          },
+          data: {
+            type: TypeDefinition.ObjectTypeDefinition,
+          },
+          interfaces: [],
+          directives: [],
+          args: [
+            {
+              name: 'id',
+              type: {
+                fieldType: {
+                  type: Options.required,
+                  nest: {
+                    name: ScalarTypes.ID,
+                    type: Options.name,
+                  },
+                },
+              },
+              data: {
+                type: TypeSystemDefinition.FieldDefinition,
+              },
+              directives: [],
+              args: [],
+              interfaces: [],
+            },
+            {
+              name: 'name',
+              type: {
+                fieldType: {
+                  type: Options.array,
+                  nest: {
+                    name: ScalarTypes.String,
+                    type: Options.name,
+                  },
+                },
+              },
+              data: {
+                type: TypeSystemDefinition.FieldDefinition,
+              },
+              directives: [],
+              args: [],
+              interfaces: [],
+            },
+            {
+              name: 'friends',
+              type: {
+                fieldType: {
+                  type: Options.required,
+                  nest: {
+                    type: Options.array,
+                    nest: {
+                      type: Options.name,
+                      name: 'Person',
+                    },
+                  },
+                },
+              },
+              data: {
+                type: TypeSystemDefinition.FieldDefinition,
+              },
+              directives: [],
+              args: [],
+              interfaces: [],
+            },
+          ],
+        },
+      ],
+    };
+    expect(tree.nodes).toEqual(expect.arrayContaining(treeMock.nodes));
+  });
 });

src/__tests__/TreeToGraphQL/Field.spec.ts

@@ -553,11 +553,8 @@ describe('Fields tests on parser', () => {
                   nest: {
                     type: Options.array,
                     nest: {
-                      type: Options.required,
-                      nest: {
-                        type: Options.name,
-                        name: 'Person',
-                      },
+                      type: Options.name,
+                      name: 'Person',
                     },
                   },
                 },
@@ -576,7 +573,7 @@ describe('Fields tests on parser', () => {
 
     const graphql = TreeToGraphQL.parse(treeMock);
     expect(graphql).toContain(`name: [${ScalarTypes.String}]`);
-    expect(graphql).toContain(`friends: [Person!]!`);
+    expect(graphql).toContain(`friends: [Person]!`);
   });
   test(`ListType nested lists`, () => {
     const treeMock: ParserTree = {

src/__tests__/TreeToGraphQL/TemplateUtils.spec.ts

@@ -0,0 +1,31 @@
+import { TemplateUtils } from '@/TreeToGraphQL/templates/TemplateUtils';
+import { Options, ParserField, TypeSystemDefinition } from '../../Models';
+
+describe('TemplateUtils tests on parser', () => {
+  test(`ListType fields`, () => {
+    const treeMock: ParserField = {
+      name: 'friends',
+      type: {
+        fieldType: {
+          type: Options.required,
+          nest: {
+            type: Options.array,
+            nest: {
+              type: Options.name,
+              name: 'Person',
+            },
+          },
+        },
+      },
+      data: {
+        type: TypeSystemDefinition.FieldDefinition,
+      },
+      directives: [],
+      interfaces: [],
+      args: [],
+    };
+
+    const graphql = TemplateUtils.resolveFieldType(treeMock.type.fieldType);
+    expect(graphql).toContain(`[Person]!`);
+  });
+});