Merge pull request #78 from koddsson/fix-73

Use `optionalInputFields` instead of `inputFieldWhiteList`

Author: alloy

package.json

@@ -42,14 +42,15 @@
     "precommit": "lint-staged"
   },
   "dependencies": {
-    "immutable": "^3.7.6",
-    "invariant": "^2.2.2"
+    "immutable": "^3.8.2",
+    "invariant": "^2.2.2",
+    "jest-cli": "^23.6.0"
   },
   "peerDependencies": {
     "@types/react-relay": ">=1.3.9",
     "@types/relay-runtime": ">=1.3.5",
     "graphql-compiler": "*",
-    "relay-compiler": "*",
+    "relay-compiler": ">=1.7.0",
     "relay-runtime": "*",
     "typescript": ">=2.9.1"
   },
@@ -62,30 +63,17 @@
     "@types/relay-runtime": "^1.3.1",
     "graphql": "^0.13.2",
     "husky": "^1.1.0",
-    "jest": "^22.1.4",
+    "jest": "^23.6.0",
     "lint-staged": "^7.3.0",
     "prettier": "^1.10.2",
-    "relay-compiler":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/relay-compiler-1.6.1-plugin.1.tgz",
-    "relay-runtime":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/relay-runtime-1.6.1-plugin.1.tgz",
-    "relay-test-utils":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/relay-test-utils-1.6.1-plugin.1.tgz",
+    "relay-compiler": "^2.0.0-rc.1",
+    "relay-runtime": "^2.0.0-rc.1",
+    "relay-test-utils": "^2.0.0-rc.1",
     "ts-jest": "^22.0.1",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0",
     "typescript": "2.8.1"
   },
-  "resolutions": {
-    "graphql-compiler":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/graphql-compiler-1.6.1-plugin.1.tgz",
-    "relay-compiler":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/relay-compiler-1.6.1-plugin.1.tgz",
-    "relay-runtime":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/relay-runtime-1.6.1-plugin.1.tgz",
-    "relay-test-utils":
-      "https://github.com/alloy/relay/releases/download/v1.6.1-plugin.1/relay-test-utils-1.6.1-plugin.1.tgz"
-  },
   "jest": {
     "transform": {
       "^.+\\.tsx?$": "ts-jest"

src/TypeScriptGenerator.ts

@@ -285,7 +285,7 @@ function createVisitor(options: TypeGeneratorOptions) {
     existingFragmentNames: options.existingFragmentNames,
     generatedInputObjectTypes: {},
     generatedFragments: new Set(),
-    inputFieldWhiteList: options.inputFieldWhiteList,
+    optionalInputFields: options.optionalInputFields,
     relayRuntimeModule: options.relayRuntimeModule,
     usedEnums: {},
     usedFragments: new Set(),

src/TypeScriptTypeTransformers.ts

@@ -134,7 +134,11 @@ function transformNonNullableInputType(type: GraphQLInputType, state: State) {
 
     const props = Object.keys(fields)
       .map(key => fields[key])
-      .filter(field => state.inputFieldWhiteList.indexOf(field.name) < 0)
+      .filter(
+        field =>
+          state.optionalInputFields &&
+          state.optionalInputFields.indexOf(field.name) < 0
+      )
       .map(field => {
         const property = ts.createPropertySignature(
           [ts.createToken(ts.SyntaxKind.ReadonlyKeyword)],

test/TypeScriptGenerator-test.ts

@@ -21,7 +21,7 @@ describe('TypeScriptGenerator with a single artifact directory', () => {
           customScalars: {},
           enumsHasteModule: null,
           existingFragmentNames: new Set(['PhotoFragment']),
-          inputFieldWhiteList: [],
+          optionalInputFields: [],
           relayRuntimeModule: 'relay-runtime',
           useHaste: false,
           useSingleArtifactDirectory: true,
@@ -46,7 +46,7 @@ describe('TypeScriptGenerator without a single artifact directory', () => {
           customScalars: {},
           enumsHasteModule: null,
           existingFragmentNames: new Set(['PhotoFragment']),
-          inputFieldWhiteList: [],
+          optionalInputFields: [],
           relayRuntimeModule: 'relay-runtime',
           useHaste: true,
         }),

types/relay-compiler/language/RelayLanguagePluginInterface.d.ts

@@ -1,5 +1,5 @@
 import { RelayConcreteNode } from "relay-runtime";
-import { Root, Fragment, IRTransform } from "../../graphql-compiler";
+import { Fragment, IRTransform, Root } from "../../graphql-compiler";
 
 export type GraphQLTag = {
   keyName: string | null;
@@ -33,23 +33,20 @@ export type FormatModule = (
   }
 ) => string;
 
-export type GraphQLTagFinder = (
-  text: string,
-  filePath: string
-) => Array<GraphQLTag>;
+export type GraphQLTagFinder = (text: string, filePath: string) => GraphQLTag[];
 
 export interface TypeGeneratorOptions {
   readonly customScalars: { [type: string]: string };
   readonly useHaste: boolean;
   readonly enumsHasteModule: string | null;
   readonly existingFragmentNames: Set<string>;
-  readonly inputFieldWhiteList: ReadonlyArray<string>;
+  readonly optionalInputFields: ReadonlyArray<string>;
   readonly relayRuntimeModule: string;
   readonly useSingleArtifactDirectory: boolean;
 }
 
 export interface TypeGenerator {
-  transforms: Array<IRTransform>;
+  transforms: IRTransform[];
   generate: (node: Root | Fragment, options: TypeGeneratorOptions) => string;
 }