Rename __fragmentName to __typeName and update CHANGELOG

Author: dupski

CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # json-to-graphql-query Changelog
 
+## 1.8.0
+
+* Added support for Inline Fragments. Thanks again @jeniffer9 :)
+
 ## 1.7.0
 
 * Added `__aliasFor` option. The old `__alias` syntax did not support more than one alias. Thanks @jeniffer9

README.md

@@ -31,7 +31,7 @@ Supported Options:
  * Support for Enum values via [`EnumType`](#query-with-enum-values)
  * Support for variables via [`__variables`](#query-with-variables)
  * Support for simple directives (such as `@client`) via [`__directives`](#query-with-directives)
- * Support for inline fragments via [`__on.__fragmentName`](#query-with-inline-fragments)
+ * Support for one or more inline fragments via [`__on.__typeName`](#query-with-inline-fragments)
 
 ## Recent Changes
 
@@ -352,7 +352,7 @@ const query = {
         Posts: {
             title: true
             __on: {
-                __fragmentName: "ConfigurablePost",
+                __typeName: "ConfigurablePost",
                 id: true
             }
         }
@@ -383,11 +383,11 @@ const query = {
                 Posts: {
                     __on: [
                     {
-                        __fragmentName: "ConfigurablePost",
+                        __typeName: "ConfigurablePost",
                         id: true
                     },
                     {
-                        __fragmentName: "UnconfigurablePost",
+                        __typeName: "UnconfigurablePost",
                         name: true
                     }]
                 }

package.json

@@ -1,27 +1,27 @@
 {
-  "name": "json-to-graphql-query",
-  "version": "1.8.0",
-  "main": "lib/index.js",
-  "license": "MIT",
-  "scripts": {
-    "build": "tslint -p . && rm -rf lib/ && tsc",
-    "test": "mocha -r ts-node/register --recursive \"./src/**/__tests__/*\"",
-    "test-watch": "mocha -r ts-node/register --recursive \"./src/**/__tests__/*\" --watch --watch-extensions ts,tsx",
-    "prepublish": "npm run build && npm run test"
-  },
-  "typings": "lib/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dupski/json-to-graphql-query.git"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.0.10",
-    "@types/mocha": "^2.2.45",
-    "chai": "^4.1.2",
-    "mocha": "^4.1.0",
-    "sinon": "^4.1.3",
-    "ts-node": "^4.1.0",
-    "tslint": "5.8.0",
-    "typescript": "2.6.2"
-  }
-}
+    "name": "json-to-graphql-query",
+    "version": "1.7.0",
+    "main": "lib/index.js",
+    "license": "MIT",
+    "scripts": {
+        "build": "tslint -p . && rm -rf lib/ && tsc",
+        "test": "mocha -r ts-node/register --recursive \"./src/**/__tests__/*\"",
+        "test-watch": "mocha -r ts-node/register --recursive \"./src/**/__tests__/*\" --watch --watch-extensions ts,tsx",
+        "prepublish": "npm run build && npm run test"
+    },
+    "typings": "lib/index.d.ts",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/dupski/json-to-graphql-query.git"
+    },
+    "devDependencies": {
+        "@types/chai": "^4.0.10",
+        "@types/mocha": "^2.2.45",
+        "chai": "^4.1.2",
+        "mocha": "^4.1.0",
+        "sinon": "^4.1.3",
+        "ts-node": "^4.1.0",
+        "tslint": "5.8.0",
+        "typescript": "2.6.2"
+    }
+}

src/__tests__/jsonToGraphQLQuery.tests.ts

@@ -436,7 +436,7 @@ describe('jsonToGraphQL()', () => {
             query: {
                 Posts: {
                     __on: {
-                        __fragmentName: 'ConfigurablePost',
+                        __typeName: 'ConfigurablePost',
                         id: true
                     }
                 }
@@ -453,7 +453,7 @@ describe('jsonToGraphQL()', () => {
                 Posts: {
                     title: true,
                     __on: {
-                        __fragmentName: 'ConfigurablePost',
+                        __typeName: 'ConfigurablePost',
                         id: true
                     }
                 }
@@ -470,11 +470,11 @@ describe('jsonToGraphQL()', () => {
                 Posts: {
                     __on: [
                         {
-                            __fragmentName: 'ConfigurablePost',
+                            __typeName: 'ConfigurablePost',
                             id: true
                         },
                         {
-                            __fragmentName: 'UnconfigurablePost',
+                            __typeName: 'UnconfigurablePost',
                             name: true
                         }]
                 }

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', '__fragmentName'
+    '__args', '__alias', '__aliasFor', '__variables', '__directives', '__on', '__typeName'
 ];
 
 function stringify(obj_from_json: any): string {
@@ -128,10 +128,10 @@ function convertQuery(node: any, level: number, output: Array<[string, number]>,
                 convertQuery(node[key], level + 1, output, options);
 
                 if (inlineFragmentsExist) {
-                    const inlineFragments: Array<{ __fragmentName: string }>
+                    const inlineFragments: Array<{ __typeName: string }>
                         = node[key].__on instanceof Array ? node[key].__on : [node[key].__on];
                     inlineFragments.forEach((inlineFragment) => {
-                        const name = inlineFragment.__fragmentName;
+                        const name = inlineFragment.__typeName;
                         output.push([`... on ${name} {`, level + 1]);
                         convertQuery(inlineFragment, level + 2, output, options);
                         output.push(['}', level + 1]);