Tweak to support multiple "full" fragments

Author: dupski

CHANGELOG.md

@@ -40,4 +40,5 @@
 
 ## 2.0.0
 
-* Update to TypeScript 3.7
+* Update to TypeScript 3.7
+* Support for full inline fragments (thanks @ConnorWhite)

README.md

@@ -33,6 +33,7 @@ Supported Options:
  * Support for variables via [`__variables`](#query-with-variables)
  * Support for simple directives (such as `@client`) via [`__directives`](#query-with-directives)
  * Support for one or more inline fragments via [`__on.__typeName`](#query-with-inline-fragments)
+ * Support for full fragments via [`__all_on`](#query-with-inline-fragments)
 
 ## Recent Changes
 
@@ -347,13 +348,46 @@ query {
 
 ### Query with Inline Fragments
 
+Full inline fragments
+
 ```typescript
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 
 const query = {
     query: {
         Posts: {
-            title: true
+            title: true,
+            __all_on: [
+                "ConfigurablePost",
+                "PageInfo"
+            ]
+        }
+    }
+};
+const graphql_query = jsonToGraphQLQuery(query, { pretty: true });
+```
+
+Resulting `graphql_query`
+
+```graphql
+query {
+    Posts {
+        title
+        ...ConfigurablePost
+        ...PageInfo
+    }
+}
+```
+
+Partial inline fragments
+
+```typescript
+import { jsonToGraphQLQuery } from 'json-to-graphql-query';
+
+const query = {
+    query: {
+        Posts: {
+            title: true,
             __on: {
                 __typeName: "ConfigurablePost",
                 id: true

src/__tests__/fragments.tests.ts

@@ -62,12 +62,15 @@ describe('jsonToGraphQLQuery() - fragments', () => {
       const query = {
           query: {
               Posts: {
-                  __on: 'ConfigurablePost'
+                  __all_on: [
+                      'ConfigurablePost',
+                      'PageInfo'
+                  ]
               }
           }
       };
       expect(jsonToGraphQLQuery(query)).to.equal(
-          'query { Posts { ... ConfigurablePost } }'
+          'query { Posts { ...ConfigurablePost ...PageInfo } }'
       );
   });
 

src/jsonToGraphQLQuery.ts

@@ -2,7 +2,7 @@ import { EnumType } from './types/EnumType';
 import { VariableType } from './types/VariableType';
 
 export const configFields = [
-    '__args', '__alias', '__aliasFor', '__variables', '__directives', '__on', '__typeName'
+    '__args', '__alias', '__aliasFor', '__variables', '__directives', '__on', '__all_on', '__typeName'
 ];
 
 function stringify(obj_from_json: any): string {
@@ -95,7 +95,8 @@ function convertQuery(node: any, level: number, output: [string, number][], opti
                 const subFields = fieldCount > 0;
                 const argsExist = typeof value.__args === 'object';
                 const directivesExist = typeof value.__directives === 'object';
-                const inlineFragmentsExist = typeof value.__on === 'object' || typeof value.__on === 'string';
+                const fullFragmentsExist = value.__all_on instanceof Array;
+                const partialFragmentsExist = typeof value.__on === 'object';
 
                 let token = `${key}`;
 
@@ -131,11 +132,15 @@ function convertQuery(node: any, level: number, output: [string, number][], opti
                     token = `${value.__alias}: ${token}`;
                 }
 
-                output.push([token + (subFields || inlineFragmentsExist ? ' {' : ''), level]);
+                output.push([token + (subFields || partialFragmentsExist || fullFragmentsExist ? ' {' : ''), level]);
                 convertQuery(value, level + 1, output, options);
 
-                if (inlineFragmentsExist) {
-                  if (typeof value.__on === 'object') {
+                if (fullFragmentsExist) {
+                    value.__all_on.forEach((fullFragment: string) => {
+                        output.push([`...${fullFragment}`, level + 1]);
+                    });
+                }
+                if (partialFragmentsExist) {
                     const inlineFragments: { __typeName: string }[]
                         = value.__on instanceof Array ? value.__on : [value.__on];
                     inlineFragments.forEach((inlineFragment) => {
@@ -144,13 +149,9 @@ function convertQuery(node: any, level: number, output: [string, number][], opti
                         convertQuery(inlineFragment, level + 2, output, options);
                         output.push(['}', level + 1]);
                     });
-                  } else if (typeof value.__on === 'string') {
-                    const inlineFragment: string = value.__on;
-                    output.push([`... ${inlineFragment}`, level + 1]);
-                  }
                 }
 
-                if (subFields || inlineFragmentsExist) {
+                if (subFields || partialFragmentsExist || fullFragmentsExist) {
                     output.push(['}', level]);
                 }