♻️ refactored

Author: aexol

package.json

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

src/TreeToGraphQL/templates/TemplateUtils.ts

@@ -1,14 +1,14 @@
 import {
   Helpers,
   Instances,
-  Options,
   ParserField,
   TypeDefinition,
   TypeExtension,
   TypeSystemDefinition,
   Value,
   ValueDefinition,
 } from '@/Models';
+import { compileType } from '@/shared/getTypeName';
 import { ArgumentTemplate } from './ArgumentTemplate';
 import { CommentTemplate } from './CommentTemplate';
 import { DirectiveTemplate } from './DirectiveTemplate';
@@ -29,18 +29,8 @@ const dedent = new RegExp('\n([\t ]*)', 'gm');
  * @class TemplateUtils
  */
 export class TemplateUtils {
-  static resolveFieldType = (
-    f: ParserField['type']['fieldType'],
-    fn: (x: string) => string = (x) => x,
-    required = false,
-  ): string => {
-    if (f.type === Options.array) {
-      return TemplateUtils.resolveFieldType(f.nest, (x) => (required ? `[${fn(x)}]!` : `[${fn(x)}]`));
-    }
-    if (f.type === Options.required) {
-      return TemplateUtils.resolveFieldType(f.nest, fn, true);
-    }
-    return fn(required ? `${f.name}!` : f.name);
+  static resolveFieldType = (f: ParserField['type']['fieldType']): string => {
+    return compileType(f);
   };
   /**
    *

src/shared/getTypeName.ts

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