Added missing types in @types/[email protected]

Author: sorenhoyer

package.json

@@ -80,7 +80,7 @@
     "@types/invariant": "2.2.30",
     "@types/jest": "^24.0.17",
     "@types/node": "8.10.51",
-    "@types/relay-compiler": "^7.0.0",
+    "@types/relay-compiler": "^7.0.2",
     "@types/relay-runtime": "^6.0.7",
     "chokidar-cli": "^2.0.0",
     "concurrently": "^5.0.0",

src/TypeScriptGenerator.ts

@@ -1,7 +1,7 @@
 import {
   Condition,
+  createUserError,
   Fragment,
-  FragmentSpread,
   IRVisitor,
   LinkedField,
   Root,
@@ -10,11 +10,7 @@ import {
   TypeGenerator,
   TypeID
 } from "relay-compiler";
-import {
-  ConnectionField,
-  InlineFragment,
-  ModuleImport
-} from "relay-compiler/lib/core/GraphQLIR";
+import { ConnectionField } from "relay-compiler/lib/core/GraphQLIR";
 import { TypeGeneratorOptions } from "relay-compiler/lib/language/RelayLanguagePluginInterface";
 import * as ConnectionFieldTransform from "relay-compiler/lib/transforms/ConnectionFieldTransform";
 import * as FlattenTransform from "relay-compiler/lib/transforms/FlattenTransform";
@@ -28,13 +24,9 @@ import {
   transformInputType,
   transformScalarType
 } from "./TypeScriptTypeTransformers";
-// import { NodeVisitor } from "relay-compiler/lib/core/GraphQLIRVisitor";
 
 // TODO: update typings and import properly
 const { ConnectionInterface } = require("relay-runtime");
-const {
-  createUserError
-} = require("relay-compiler/lib/core/RelayCompilerError");
 
 type Selection = {
   key: string;
@@ -364,17 +356,17 @@ function importTypes(names: string[], fromModule: string): ts.Statement {
   );
 }
 
-// TODO: Add Connection to IRVisitor.NodeVisitor leave
 function createVisitor(
   schema: Schema,
   options: TypeGeneratorOptions
-): any /* IRVisitor.NodeVisitor */ {
+): IRVisitor.NodeVisitor {
   const state: State = {
     customScalars: options.customScalars,
     enumsHasteModule: options.enumsHasteModule,
     existingFragmentNames: options.existingFragmentNames,
     generatedInputObjectTypes: {},
     generatedFragments: new Set(),
+    hasConnectionResolver: false,
     optionalInputFields: options.optionalInputFields,
     usedEnums: {},
     usedFragments: new Set(),
@@ -386,7 +378,7 @@ function createVisitor(
 
   return {
     leave: {
-      Root(node: Root) {
+      Root(node) {
         const inputVariablesType = generateInputVariablesType(
           schema,
           node,
@@ -468,7 +460,7 @@ function createVisitor(
         return nodes;
       },
 
-      Fragment(node: Fragment) {
+      Fragment(node) {
         const flattenedSelections: Selection[] = flattenArray(
           /* $FlowFixMe: selections have already been transformed */
           (node.selections as any) as ReadonlyArray<ReadonlyArray<Selection>>
@@ -519,7 +511,7 @@ function createVisitor(
           exportType(node.name, type)
         ];
       },
-      InlineFragment(node: InlineFragment) {
+      InlineFragment(node) {
         return flattenArray(
           /* $FlowFixMe: selections have already been transformed */
           (node.selections as any) as ReadonlyArray<ReadonlyArray<Selection>>
@@ -537,15 +529,15 @@ function createVisitor(
       },
       Condition: visitCondition,
       // TODO: Why not inline it like others?
-      ScalarField(node: any) {
+      ScalarField(node) {
         return visitScalarField(schema, node, state);
       },
       ConnectionField: visitLinkedField,
       LinkedField: visitLinkedField,
-      Connection(node: any) {
+      Connection(node) {
         return visitConnection(schema, node, state);
       },
-      ModuleImport(node: ModuleImport) {
+      ModuleImport(node) {
         return [
           {
             key: "__fragmentPropName",
@@ -563,7 +555,7 @@ function createVisitor(
           }
         ];
       },
-      FragmentSpread(node: FragmentSpread) {
+      FragmentSpread(node) {
         state.usedFragments.add(node.name);
         return [
           {
@@ -576,8 +568,7 @@ function createVisitor(
   };
 }
 
-// TODO: Add hasConnectionResolver to State
-function visitConnection(schema: Schema, node: any, state: any) {
+function visitConnection(schema: Schema, node: any, state: State) {
   const { EDGES } = ConnectionInterface.get();
 
   state.hasConnectionResolver = true;
@@ -841,6 +832,9 @@ function createRawResponseTypeVisitor(
       },
       ConnectionField: visitLinkedField,
       LinkedField: visitLinkedField,
+      Connection(node) {
+        return visitConnection(schema, node, state);
+      },
       ClientExtension(node) {
         return flattenArray(
           /* $FlowFixMe: selections have already been transformed */

src/TypeScriptTypeTransformers.ts

@@ -7,13 +7,14 @@ export type ScalarTypeMapping = {
 };
 
 export type State = {
-  usedEnums: { [name: string]: TypeID };
-  usedFragments: Set<string>;
+  generatedFragments: Set<string>;
   generatedInputObjectTypes: {
     [name: string]: ts.TypeNode | "pending";
   };
-  generatedFragments: Set<string>;
+  hasConnectionResolver: boolean;
   matchFields: Map<string, ts.TypeNode>;
+  usedEnums: { [name: string]: TypeID };
+  usedFragments: Set<string>;
 } & TypeGeneratorOptions;
 
 function getInputObjectTypeIdentifier(schema: Schema, typeID: TypeID): string {
@@ -65,12 +66,7 @@ function transformNonNullableScalarType(
   } else if (schema.isScalar(type)) {
     return transformGraphQLScalarType(schema.getTypeString(type), state);
   } else if (schema.isEnum(type)) {
-    // TODO: Add assertEnumType to Schema
-    return transformGraphQLEnumType(
-      schema,
-      (schema as any).assertEnumType(type),
-      state
-    );
+    return transformGraphQLEnumType(schema, schema.assertEnumType(type), state);
   } else {
     throw new Error(`Could not convert from GraphQL type ${type.toString()}`);
   }
@@ -142,12 +138,7 @@ function transformNonNullableInputType(
   } else if (schema.isScalar(type)) {
     return transformGraphQLScalarType(schema.getTypeString(type), state);
   } else if (schema.isEnum(type)) {
-    // TODO: Add assertEnumType to Schema
-    return transformGraphQLEnumType(
-      schema,
-      (schema as any).assertEnumType(type),
-      state
-    );
+    return transformGraphQLEnumType(schema, schema.assertEnumType(type), state);
   } else if (schema.isInputObject(type)) {
     const typeIdentifier = getInputObjectTypeIdentifier(schema, type);
     if (state.generatedInputObjectTypes[typeIdentifier]) {
@@ -157,10 +148,8 @@ function transformNonNullableInputType(
       );
     }
     state.generatedInputObjectTypes[typeIdentifier] = "pending";
-    // TODO: Add assertInputObjectType to Schema
-    const fields = schema.getFields(
-      (schema as any).assertInputObjectType(type)
-    );
+
+    const fields = schema.getFields(schema.assertInputObjectType(type));
 
     const props = fields.map((fieldID: FieldID) => {
       const fieldType = schema.getFieldType(fieldID);

yarn.lock

@@ -749,13 +749,14 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
-"@types/relay-compiler@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@types/relay-compiler/-/relay-compiler-7.0.0.tgz#677479e008f1ad386f97ef6380b8fbf769765079"
-  integrity sha512-V4U6NS4xOi5qg2EN+tOVtRDx835StEEvsOBLeWaG0IJuoi0mIj0wMX79CzFyZYvk3TjJkgWTCVBvor38SAH7UQ==
+"@types/relay-compiler@^7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/relay-compiler/-/relay-compiler-7.0.2.tgz#3d5ddd33aeea7a248a86f197a9f847be14874c6d"
+  integrity sha512-qmK4itE/82YG9Xt6WFCj8oDvAgdpPWU5GV5TbDRfn2dgMbq9vVFeLiNw+uymzLurQTlKPJejZnL0ByYq+pkFSg==
   dependencies:
     "@types/relay-runtime" "*"
     graphql "^14.5.3"
+    typescript "^3.0.0"
 
 "@types/relay-runtime@*", "@types/relay-runtime@^6.0.7":
   version "6.0.7"
@@ -5937,7 +5938,7 @@ type-fest@^0.6.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
-[email protected]:
+[email protected], typescript@^3.0.0:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
   integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==