Fixing empty variables, empty directives (#47)

* Fix empty var, empty directives
Co-authored-by: Morgan DUBOIS <[email protected]>

Author: MorganDbs

src/__tests__/directives.tests.ts

@@ -105,6 +105,37 @@ describe('jsonToGraphQLQuery() - directives', () => {
         );
     });
 
+    it('converts a simple query with args and multiple directives but a directive has an empty object', () => {
+        const query = {
+            query: {
+                Posts: {
+                    __args: {
+                        where: {
+                            id: 10,
+                        },
+                        orderBy: 'flibble',
+                    },
+                    __directives: {
+                        client: true,
+                        withArgs: {},
+                    },
+                    id: true,
+                    title: true,
+                    post_date: true,
+                },
+            },
+        } as any;
+        expect(jsonToGraphQLQuery(query, { pretty: true })).to.equal(
+            `query {
+    Posts (where: {id: 10}, orderBy: "flibble") @client @withArgs {
+        id
+        title
+        post_date
+    }
+}`
+        );
+    });
+
     it('converts a complex query with multiple directives', () => {
         const query = {
             query: {

src/__tests__/name.tests.ts

@@ -54,6 +54,32 @@ describe('jsonToGraphQLQuery() - name', () => {
 });
 
 describe('jsonToGraphQLQuery() - combinations', () => {
+    it('correctly converts query with name/ empty variables', () => {
+        const query = {
+            query: {
+                __name: 'NewName',
+                __variables: {},
+                Posts: {
+                    __args: {
+                        arg1: 20,
+                        arg2: new VariableType('variable1'),
+                    },
+                    id: true,
+                    title: true,
+                },
+            },
+        };
+        expect(jsonToGraphQLQuery(query, { pretty: true })).to.equal(
+            `query NewName {
+    Posts (arg1: 20, arg2: $variable1) {
+        id
+        title
+    }
+}`
+        );
+    });
+
+
     it('correctly converts query with name/variables', () => {
         const query = {
             query: {

src/jsonToGraphQLQuery.ts

@@ -50,7 +50,7 @@ function buildVariables(varsObj: any): string {
 function buildDirectives(dirsObj: any): string {
     const directiveName = Object.keys(dirsObj)[0];
     const directiveValue = dirsObj[directiveName];
-    if (typeof directiveValue === 'boolean') {
+    if (typeof directiveValue === 'boolean' || (typeof directiveValue === 'object' && Object.keys(directiveValue).length === 0)) {
         return directiveName;
     }
     else if (typeof directiveValue === 'object') {
@@ -108,7 +108,7 @@ function convertQuery(node: any, level: number, output: [string, number][], opti
                     token = `${token}: ${value.__aliasFor}`;
                 }
 
-                if (typeof value.__variables === 'object') {
+                if (typeof value.__variables === 'object' && Object.keys(value.__variables).length > 0) {
                     token = `${token} (${buildVariables(value.__variables)})`;
                 }
                 else if (argsExist || directivesExist) {