🐛 fixed compileType

Author: aexol

package.json

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

src/TreeToGraphQL/templates/ArgumentTemplate.ts

@@ -1,5 +1,5 @@
 import { ParserField } from '@/Models';
-import { getTypeName } from '@/shared/getTypeName';
+import { getTypeName } from '@/shared';
 import { TemplateUtils } from './TemplateUtils';
 
 /**

src/TreeToGraphQL/templates/DirectiveTemplate.ts

@@ -1,5 +1,5 @@
 import { ParserField } from '@/Models';
-import { getTypeName } from '@/shared/getTypeName';
+import { getTypeName } from '@/shared';
 import { TemplateUtils } from './TemplateUtils';
 
 /**

src/TreeToGraphQL/templates/TemplateUtils.ts

@@ -8,7 +8,7 @@ import {
   Value,
   ValueDefinition,
 } from '@/Models';
-import { compileType } from '@/shared/getTypeName';
+import { compileType } from '@/shared';
 import { ArgumentTemplate } from './ArgumentTemplate';
 import { CommentTemplate } from './CommentTemplate';
 import { DirectiveTemplate } from './DirectiveTemplate';

src/TreeToGraphQL/templates/UnionMemberTemplate.ts

@@ -1,5 +1,5 @@
 import { ParserField } from '@/Models';
-import { getTypeName } from '@/shared/getTypeName';
+import { getTypeName } from '@/shared';
 
 /**
  * Template for union member represented in GraphQL Union - `type U = A | B` where A and B are union members

src/TreeToGraphQL/templates/ValueTemplate.ts

@@ -1,5 +1,5 @@
 import { ParserField, Value } from '@/Models';
-import { getTypeName } from '@/shared/getTypeName';
+import { getTypeName } from '@/shared';
 import { TemplateUtils } from './TemplateUtils';
 
 /**

src/__tests__/TreeToGraphQL/TemplateUtils.spec.ts

@@ -1,5 +1,5 @@
-import { TemplateUtils } from '@/TreeToGraphQL/templates/TemplateUtils';
-import { Options, ParserField, TypeSystemDefinition } from '../../Models';
+import { compileType, decompileType } from '@/shared';
+import { FieldType, Options, ParserField, TypeSystemDefinition } from '../../Models';
 
 describe('TemplateUtils tests on parser', () => {
   test(`ListType fields`, () => {
@@ -25,7 +25,36 @@ describe('TemplateUtils tests on parser', () => {
       args: [],
     };
 
-    const graphql = TemplateUtils.resolveFieldType(treeMock.type.fieldType);
+    const graphql = compileType(treeMock.type.fieldType);
     expect(graphql).toContain(`[Person]!`);
   });
+  test(`ListType fields  2`, () => {
+    const treeMock: FieldType = {
+      type: Options.required,
+      nest: {
+        type: Options.array,
+        nest: {
+          type: Options.array,
+          nest: {
+            type: Options.required,
+            nest: {
+              type: Options.name,
+              name: 'Person',
+            },
+          },
+        },
+      },
+    };
+
+    const graphql = compileType(treeMock);
+    expect(graphql).toContain(`[[Person!]]!`);
+  });
+  test(`ListType fields  3`, () => {
+    const ft = decompileType(`[[Person]!]!`);
+    expect(compileType(ft)).toContain(`[[Person]!]!`);
+  });
+  test(`ListType fields  4`, () => {
+    const ft = decompileType(`[[Person]!]!`);
+    expect(compileType(ft)).toContain(`[[Person]!]!`);
+  });
 });

src/index.ts

@@ -1,4 +1,4 @@
 export * from './TreeToGraphQL';
 export * from './Parser';
 export * from './Models';
-export * from './shared/getTypeName';
+export * from './shared/index';

src/shared/getTypeName.ts src/shared/index.tssrc/shared/getTypeName.ts renamed to src/shared/index.ts

@@ -7,14 +7,14 @@ export const getTypeName = (f: FieldType): string => {
   return getTypeName(f.nest);
 };
 
-export const compileType = (f: FieldType, fn: (x: string) => string = (x) => x, required = false): string => {
+export const compileType = (f: FieldType): string => {
   if (f.type === Options.array) {
-    return compileType(f.nest, (x) => (required ? `[${fn(x)}]!` : `[${fn(x)}]`));
+    return `[${compileType(f.nest)}]`;
   }
   if (f.type === Options.required) {
-    return compileType(f.nest, fn, true);
+    return `${compileType(f.nest)}!`;
   }
-  return required ? fn(`${f.name}!`) : fn(f.name);
+  return f.name;
 };
 
 export const decompileType = (typeName: string): FieldType => {