Added support for args and directives on the same query.

Author: joeflack4

src/__tests__/jsonToGraphQLQuery.tests.ts

@@ -167,15 +167,15 @@ describe('jsonToGraphQL()', () => {
         } as any;
         expect(jsonToGraphQLQuery(query, { pretty: true })).to.equal(
 `query {
-    Posts @client (where: {id: 10}, orderBy: 'flibble') {
+    Posts @client (where: {id: 10}, orderBy: "flibble") {
         id
         title
         post_date
     }
 }`);
     });
 
-    it('Converts a complex query with directives with no arguments', () => {
+    it('converts a complex query with directives with no arguments', () => {
         const query = {
             query: {
                 diet: {
@@ -215,8 +215,8 @@ describe('jsonToGraphQL()', () => {
     });
 
     // TODO: Need this test still? How to handle variables unless $ declared explicitly?
-    // it('Converts a JavaScript object into a valid query, including single directives ' +
-    // 'with args, so long as any variables used are enclosed in a string with "$" included.', () => {
+    // it('converts a JavaScript object into a valid query, including single directives ' +
+    // 'with args, so long as any variables used are enclosed in a string with "$" included', () => {
     //     interface ILooseObject { [key: string]: any; }
     //     let input: ILooseObject = {
     //         someOtherAbritraryKey: {
@@ -236,12 +236,12 @@ describe('jsonToGraphQL()', () => {
     // });
 
     // TODO
-    // it('Converts a JavaScript object into a valid query, including *multiple* directives ' +
-    // 'with args, so long as any variables used are enclosed in a string with "$" included.', () => {
+    // it('converts a JavaScript object into a valid query, including *multiple* directives ' +
+    // 'with args, so long as any variables used are enclosed in a string with "$" included', () => {
     // });
 
     // TODO
-    // it('Creates a query, stripping/ignoring certain, specified keys.', () => {
+    // it('creates a query, stripping/ignoring certain, specified keys', () => {
     // // Example usage: jsonToGraphqlQuery(preInput, { keysToStrip: ['__typename'] });
     // });
 

src/jsonToGraphQLQuery.ts

@@ -82,23 +82,32 @@ function convertQuery(node: any, level: number, output: Array<[ string, number ]
             const fieldCount = Object.keys(node[key])
                 .filter((keyCount) => filterNonConfigFields(keyCount, options.ignoreFields)).length;
             const subFields = fieldCount > 0;
+            const argsExist = typeof node[key].__args === 'object';
+            const directivesExist = typeof node[key].__directives === 'object';
             let token: string;
-
-            if (typeof node[key].__args === 'object') {
-                token = `${key} (${buildArgs(node[key].__args)})`;
-            }
-            else if (typeof node[key].__variables === 'object') {
+            if (typeof node[key].__variables === 'object') {
                 token = `${key} (${buildVariables(node[key].__variables)})`;
             }
-            else if (typeof node[key].__directives === 'object') {
-                // TODO: Add support for multiple directives on one node.
-                const numDirectives = Object.keys(node[key].__directives).length;
-                if (numDirectives > 1) {
-                    throw new Error(`Too many directives. The object/key ` +
-                    `'${Object.keys(node[key])[0]}' had ${numDirectives} directives, ` +
-                    `but only 1 directive per object/key is supported at this time.`);
+            else if (argsExist || directivesExist) {
+                let argsStr: string;
+                let dirsStr: string;
+                if (directivesExist) {
+                    // TODO: Add support for multiple directives on one node. Then condense blocks into terniary lines.
+                    // const directives = Object.keys(node[key].__directives);
+                    const numDirectives = Object.keys(node[key].__directives).length;
+                    if (numDirectives > 1) {
+                        throw new Error(`Too many directives. The object/key ` +
+                        `'${Object.keys(node[key])[0]}' had ${numDirectives} directives, ` +
+                        `but only 1 directive per object/key is supported at this time.`);
+                    }
+                    // directives.map(((x) => { dirsStr += ` @${buildDirectives(node[key].__directives)}`; }));
+                    dirsStr = `@${buildDirectives(node[key].__directives)}`;
+                }
+                if (argsExist) {
+                    argsStr = `(${buildArgs(node[key].__args)})`;
                 }
-                token = `${key} @${buildDirectives(node[key].__directives)}`;
+                const spacer = directivesExist && argsExist ? ' ' : '';
+                token = `${key} ${dirsStr ? dirsStr : ''}${spacer}${argsStr ? argsStr : ''}`;
             }
             else {
                 token = `${key}`;