⚡ improved Value AST

Author: aexol

package.json

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

src/Models/ParserTree.ts

@@ -1,4 +1,4 @@
-import { Directive, OperationType, FieldType } from './Spec';
+import { Directive, OperationType, FieldType, Value } from './Spec';
 import { GraphQLNodeParams } from './Types';
 
 export interface ParserField {
@@ -15,6 +15,10 @@ export interface ParserField {
   directives: ParserField[];
   description?: string;
   fromInterface?: string[];
+  value?: {
+    type: Value;
+    value?: string;
+  };
 }
 
 export interface ParserTree {

src/Models/Types.ts

@@ -30,6 +30,7 @@ export type AllTypes =
   | Type;
 
 export const kindAsAllTypes = (v: string) => v as AllTypes;
+export const kindAsValue = (v: string) => v as Value;
 export interface GraphQLNodeParams {
   type: AllTypes;
 }

src/Parser/extractDefaultValueString.ts

@@ -0,0 +1,13 @@
+import { ValueNode } from 'graphql';
+
+export const extractDefaultValueString = (graphqlNode: ValueNode) => {
+  const startIndex = graphqlNode.loc?.start;
+  const endIndex = graphqlNode.loc?.end;
+  if (!startIndex || !endIndex) return;
+
+  const textNode = graphqlNode.loc?.source.body.slice(startIndex, endIndex);
+  if (textNode && graphqlNode.kind === 'StringValue' && textNode.match(/^"|'/gm) && textNode.match(/"|'$/gm)) {
+    return textNode.slice(1, -1);
+  }
+  return textNode;
+};

src/Parser/typeResolver.ts

@@ -10,9 +10,10 @@ import {
   TypeSystemExtensionNode,
   ValueNode,
 } from 'graphql';
-import { AllTypes, kindAsAllTypes, Options, ParserField } from '@/Models';
-import { Instances, TypeSystemDefinition, Value, ValueDefinition } from '@/Models/Spec';
+import { kindAsValue, Options, ParserField } from '@/Models';
+import { Instances, TypeSystemDefinition, ValueDefinition } from '@/Models/Spec';
 import { generateNodeId } from '@/shared';
+import { extractDefaultValueString } from '@/Parser/extractDefaultValueString';
 
 /**
  * Class for resolving Types to ParserFields
@@ -93,7 +94,6 @@ export class TypeResolver {
    * @param f
    */
   static resolveObjectField(f: ObjectFieldNode): ParserField[] {
-    const args = TypeResolver.resolveValue(f.value);
     return [
       {
         name: f.name.value,
@@ -105,106 +105,16 @@ export class TypeResolver {
         },
         interfaces: [],
         directives: [],
-        args,
-        id: generateNodeId(f.name.value, Instances.Argument, args),
+        args: [],
+        value: {
+          type: kindAsValue(f.value.kind),
+          value: extractDefaultValueString(f.value),
+        },
+        id: generateNodeId(f.name.value, Instances.Argument, []),
       },
     ];
   }
 
-  /**
-   * Resolve GraphQL ValueNode
-   *
-   * @param value
-   */
-  static resolveValue(value: ValueNode): ParserField[] {
-    if (value.kind === 'ListValue') {
-      const args = value.values.map((f) => TypeResolver.resolveValue(f)).reduce((a, b) => [...a, ...b], []);
-
-      return [
-        {
-          name: value.kind,
-          directives: [],
-          interfaces: [],
-          args,
-          data: {
-            type: kindAsAllTypes(value.kind),
-          },
-          type: {
-            fieldType: {
-              name: kindAsAllTypes(value.kind),
-              type: Options.name,
-            },
-          },
-          id: generateNodeId(value.kind, kindAsAllTypes(value.kind), args),
-        },
-      ];
-    }
-    if (value.kind === 'ObjectValue') {
-      const args = value.fields.map((f) => TypeResolver.resolveObjectField(f)).reduce((a, b) => [...a, ...b], []);
-
-      return [
-        {
-          args,
-          name: value.kind,
-          directives: [],
-          interfaces: [],
-          data: {
-            type: kindAsAllTypes(value.kind),
-          },
-          type: {
-            fieldType: {
-              name: kindAsAllTypes(value.kind),
-              type: Options.name,
-            },
-          },
-          id: generateNodeId(value.kind, kindAsAllTypes(value.kind), args),
-        },
-      ];
-    }
-    if (value.kind === 'EnumValue') {
-      return [
-        {
-          name: value.value,
-          args: [],
-          directives: [],
-          interfaces: [],
-          data: {
-            type: kindAsAllTypes(value.kind),
-          },
-          type: {
-            fieldType: {
-              name: value.value as AllTypes,
-              type: Options.name,
-            },
-          },
-          id: generateNodeId(value.value, kindAsAllTypes(value.kind), []),
-        },
-      ];
-    }
-    if (value.kind in Value) {
-      const name = 'value' in value ? value.value.toString() : 'name' in value ? value.name.value : '';
-      return [
-        {
-          name,
-          type: {
-            fieldType: {
-              name: value.kind,
-              type: Options.name,
-            },
-          },
-          args: [],
-          directives: [],
-          interfaces: [],
-          data: {
-            type: kindAsAllTypes(value.kind),
-          },
-          id: generateNodeId(name, kindAsAllTypes(value.kind), []),
-        },
-      ];
-    }
-    return [];
-  }
-
   /**
    * Iterate directives
    * @param directives GraphQL Directive nodes
@@ -239,7 +149,6 @@ export class TypeResolver {
    */
   static iterateArgumentFields(fields: ReadonlyArray<ArgumentNode>): ParserField[] {
     return fields.map((n) => {
-      const args = TypeResolver.resolveValue(n.value);
       return {
         name: n.name.value,
         type: {
@@ -250,8 +159,12 @@ export class TypeResolver {
         },
         directives: [],
         interfaces: [],
-        args,
-        id: generateNodeId(n.name.value, Instances.Argument, args),
+        value: {
+          type: kindAsValue(n.value.kind),
+          value: extractDefaultValueString(n.value),
+        },
+        args: [],
+        id: generateNodeId(n.name.value, Instances.Argument, []),
       };
     });
   }
@@ -263,7 +176,12 @@ export class TypeResolver {
    */
   static iterateInputValueFields(fields: ReadonlyArray<InputValueDefinitionNode>): ParserField[] {
     return fields.map((n) => {
-      const args = n.defaultValue ? TypeResolver.resolveValue(n.defaultValue) : [];
+      const value = n.defaultValue
+        ? {
+            type: kindAsValue(n.defaultValue.kind),
+            value: extractDefaultValueString(n.defaultValue),
+          }
+        : undefined;
       return {
         name: n.name.value,
         ...(n.description ? { description: n.description.value } : {}),
@@ -272,9 +190,10 @@ export class TypeResolver {
         data: {
           type: ValueDefinition.InputValueDefinition,
         },
-        args,
+        args: [],
         interfaces: [],
-        id: generateNodeId(n.name.value, ValueDefinition.InputValueDefinition, args),
+        ...(value ? { value } : {}),
+        id: generateNodeId(n.name.value, ValueDefinition.InputValueDefinition, []),
       };
     });
   }

src/TreeToGraphQL/templates/ArgumentTemplate.ts

@@ -1,19 +1,14 @@
-import { ParserField } from '@/Models';
+import { ParserField, Value } from '@/Models';
 import { getTypeName } from '@/shared';
-import { TemplateUtils } from './TemplateUtils';
 
 /**
  * resolve function argument
  */
 export class ArgumentTemplate {
-  static resolve({ args, type }: ParserField, prefix = 0): string {
+  static resolve({ type, value }: ParserField): string {
     let argsString = '';
-    if (args) {
-      if (args.length) {
-        argsString = `${args.map((a) => TemplateUtils.resolverForConnection(a, prefix)).join('\n')}`;
-      } else {
-        argsString = '[]';
-      }
+    if (value?.value) {
+      argsString = `${value.type === Value.StringValue ? `"${value.value}"` : value.value}`;
     }
     return `${getTypeName(type.fieldType)}: ${argsString}`;
   }

src/TreeToGraphQL/templates/InputValueTemplate.ts

@@ -1,4 +1,4 @@
-import { ParserField } from '@/Models';
+import { ParserField, Value } from '@/Models';
 import { TemplateUtils } from './TemplateUtils';
 
 /**
@@ -7,8 +7,8 @@ import { TemplateUtils } from './TemplateUtils';
 export class InputValueTemplate {
   static resolve(f: ParserField, prefix = 0): string {
     let argsString = '';
-    if (f.args.length > 0) {
-      argsString = ` = ${f.args.map((a) => TemplateUtils.resolverForConnection(a, prefix + 1)).join('\n')}`;
+    if (f.value?.value) {
+      argsString = ` = ${f.value.type === Value.StringValue ? `"${f.value.value}"` : f.value.value}`;
     }
     return `${TemplateUtils.descriptionResolver(f.description, prefix)}${'\t'.repeat(prefix)}${
       f.name

src/TreeToGraphQL/templates/TemplateUtils.ts

@@ -5,7 +5,6 @@ import {
   TypeDefinition,
   TypeExtension,
   TypeSystemDefinition,
-  Value,
   ValueDefinition,
 } from '@/Models';
 import { compileType } from '@/shared';
@@ -18,7 +17,6 @@ import { FieldTemplate } from './FieldTemplate';
 import { InputValueTemplate } from './InputValueTemplate';
 import { TypeDefinitionsTemplates } from './TypeDefinitionsTemplates';
 import { UnionMemberTemplate } from './UnionMemberTemplate';
-import { ValueTemplate } from './ValueTemplate';
 
 const dedent = new RegExp('\n([\t ]*)', 'gm');
 
@@ -95,9 +93,6 @@ export class TemplateUtils {
       if (type === TypeDefinition.UnionTypeDefinition) {
         return TypeDefinitionsTemplates.resolveUnion(f);
       }
-      if (type in Value) {
-        return ValueTemplate.resolve(f);
-      }
       if (type in TypeExtension) {
         if (type === TypeExtension.UnionTypeExtension) {
           return TypeDefinitionsTemplates.resolveUnionExtension(f);