TS: Fix strict issues in src/utilities

leebyron · leebyron · commit 5accb29e380b · 2021-05-27T15:46:04.000-07:00
diff --git a/src/type/schema.ts b/src/type/schema.ts
@@ -274,7 +274,7 @@ export class GraphQLSchema {
     return this._typeMap;
   }
 
-  getType(name: string): Maybe<GraphQLNamedType> {
+  getType(name: string): GraphQLNamedType | undefined {
     return this.getTypeMap()[name];
   }
 
diff --git a/src/utilities/TypeInfo.ts b/src/utilities/TypeInfo.ts
@@ -337,11 +337,12 @@ export function visitWithTypeInfo(
   visitor: ASTVisitor,
 ): ASTVisitor {
   return {
-    enter(node) {
+    enter(...args) {
+      const node = args[0];
       typeInfo.enter(node);
       const fn = getVisitFn(visitor, node.kind, /* isLeaving */ false);
       if (fn) {
-        const result = fn.apply(visitor, arguments);
+        const result = fn.apply(visitor, args);
         if (result !== undefined) {
           typeInfo.leave(node);
           if (isNode(result)) {
@@ -351,11 +352,12 @@ export function visitWithTypeInfo(
         return result;
       }
     },
-    leave(node) {
+    leave(...args) {
+      const node = args[0];
       const fn = getVisitFn(visitor, node.kind, /* isLeaving */ true);
       let result;
       if (fn) {
-        result = fn.apply(visitor, arguments);
+        result = fn.apply(visitor, args);
       }
       typeInfo.leave(node);
       return result;
diff --git a/src/utilities/__tests__/TypeInfo-test.ts b/src/utilities/__tests__/TypeInfo-test.ts
@@ -58,7 +58,7 @@ describe('visitWithTypeInfo', () => {
     `);
     const typeInfo = new TypeInfo(schema);
 
-    const rootTypes = {};
+    const rootTypes: any = {};
     visit(
       ast,
       visitWithTypeInfo(typeInfo, {
@@ -80,7 +80,7 @@ describe('visitWithTypeInfo', () => {
       '{ human(id: 4) { name, pets { ... { name } }, unknown } }',
     );
 
-    const visitorArgs = [];
+    const visitorArgs: Array<any> = [];
     visit(ast, {
       enter(...args) {
         visitorArgs.push(['enter', ...args]);
@@ -90,7 +90,7 @@ describe('visitWithTypeInfo', () => {
       },
     });
 
-    const wrappedVisitorArgs = [];
+    const wrappedVisitorArgs: Array<any> = [];
     const typeInfo = new TypeInfo(testSchema);
     visit(
       ast,
@@ -108,7 +108,7 @@ describe('visitWithTypeInfo', () => {
   });
 
   it('maintains type info during visit', () => {
-    const visited = [];
+    const visited: Array<any> = [];
 
     const typeInfo = new TypeInfo(testSchema);
 
@@ -193,7 +193,7 @@ describe('visitWithTypeInfo', () => {
   });
 
   it('maintains type info during edit', () => {
-    const visited = [];
+    const visited: Array<any> = [];
     const typeInfo = new TypeInfo(testSchema);
 
     const ast = parse('{ human(id: 4) { name, pets }, alien }');
@@ -314,7 +314,7 @@ describe('visitWithTypeInfo', () => {
 
     const typeInfo = new TypeInfo(testSchema, complexInputType);
 
-    const visited = [];
+    const visited: Array<any> = [];
     visit(
       ast,
       visitWithTypeInfo(typeInfo, {
@@ -363,7 +363,7 @@ describe('visitWithTypeInfo', () => {
     const operationNode = ast.definitions[0];
     invariant(operationNode.kind === 'OperationDefinition');
 
-    const visited = [];
+    const visited: Array<any> = [];
     visit(
       operationNode.selectionSet,
       visitWithTypeInfo(typeInfo, {
diff --git a/src/utilities/__tests__/buildASTSchema-test.ts b/src/utilities/__tests__/buildASTSchema-test.ts
@@ -89,7 +89,7 @@ describe('Schema Builder', () => {
 
     const source = '{ add(x: 34, y: 55) }';
     const rootValue = {
-      add: ({ x, y }) => x + y,
+      add: ({ x, y }: { x: number; y: number }) => x + y,
     };
     expect(graphqlSync({ schema, source, rootValue })).to.deep.equal({
       data: { add: 89 },
@@ -1095,6 +1095,7 @@ describe('Schema Builder', () => {
   });
 
   it('Rejects invalid AST', () => {
+    // TODO ts-expect-error (First parameter expected to be DocumentNode)
     expect(() => buildASTSchema(null)).to.throw(
       'Must provide valid Document AST',
     );
diff --git a/src/utilities/__tests__/buildClientSchema-test.ts b/src/utilities/__tests__/buildClientSchema-test.ts
@@ -629,6 +629,7 @@ describe('Type System: build schema from introspection', () => {
     `);
 
     it('throws when introspection is missing __schema property', () => {
+      // TODO ts-expect-error (First parameter expected to be introspection results)
       expect(() => buildClientSchema(null)).to.throw(
         'Invalid or incomplete introspection result. Ensure that you are passing "data" property of introspection response and no "errors" was returned alongside: null.',
       );
diff --git a/src/utilities/__tests__/coerceInputValue-test.ts b/src/utilities/__tests__/coerceInputValue-test.ts
@@ -15,18 +15,20 @@ import { coerceInputValue } from '../coerceInputValue';
 
 interface CoerceResult {
   value: unknown;
-  errors: ReadonlyArray<{
-    path: ReadonlyArray<string | number>;
-    value: unknown;
-    error: string;
-  }>;
+  errors: ReadonlyArray<CoerceError>;
+}
+
+interface CoerceError {
+  path: ReadonlyArray<string | number>;
+  value: unknown;
+  error: string;
 }
 
 function coerceValue(
   inputValue: unknown,
   type: GraphQLInputType,
 ): CoerceResult {
-  const errors = [];
+  const errors: Array<CoerceError> = [];
   const value = coerceInputValue(
     inputValue,
     type,
@@ -82,7 +84,7 @@ describe('coerceInputValue', () => {
   describe('for GraphQLScalar', () => {
     const TestScalar = new GraphQLScalarType({
       name: 'TestScalar',
-      parseValue(input: { error?: string; value?: unknown }) {
+      parseValue(input: any) {
         if (input.error != null) {
           throw new Error(input.error);
         }
@@ -272,7 +274,7 @@ describe('coerceInputValue', () => {
   });
 
   describe('for GraphQLInputObject with default value', () => {
-    const makeTestInputObject = (defaultValue) =>
+    const makeTestInputObject = (defaultValue: any) =>
       new GraphQLInputObjectType({
         name: 'TestInputObject',
         fields: {
diff --git a/src/utilities/__tests__/extendSchema-test.ts b/src/utilities/__tests__/extendSchema-test.ts
@@ -1143,6 +1143,7 @@ describe('extendSchema', () => {
   it('Rejects invalid AST', () => {
     const schema = new GraphQLSchema({});
 
+    // TODO ts-expect-error (Second argument expects DocumentNode)
     expect(() => extendSchema(schema, null)).to.throw(
       'Must provide valid Document AST',
     );
diff --git a/src/utilities/coerceInputValue.ts b/src/utilities/coerceInputValue.ts
@@ -95,7 +95,7 @@ function coerceInputValueImpl(
       return;
     }
 
-    const coercedValue = {};
+    const coercedValue: any = {};
     const fieldDefs = type.getFields();
 
     for (const field of Object.values(fieldDefs)) {
diff --git a/src/utilities/concatAST.ts b/src/utilities/concatAST.ts
@@ -1,4 +1,4 @@
-import type { DocumentNode } from '../language/ast';
+import type { DocumentNode, DefinitionNode } from '../language/ast';
 
 /**
  * Provided a collection of ASTs, presumably each from different files,
@@ -8,9 +8,9 @@ import type { DocumentNode } from '../language/ast';
 export function concatAST(
   documents: ReadonlyArray<DocumentNode>,
 ): DocumentNode {
-  let definitions = [];
+  const definitions: Array<DefinitionNode> = [];
   for (const doc of documents) {
-    definitions = definitions.concat(doc.definitions);
+    definitions.push(...doc.definitions);
   }
   return { kind: 'Document', definitions };
 }
diff --git a/src/utilities/extendSchema.ts b/src/utilities/extendSchema.ts
@@ -379,7 +379,7 @@ export function extendSchemaImpl(
     return {
       ...field,
       type: replaceType(field.type),
-      args: mapValue(field.args, extendArg),
+      args: field.args && mapValue(field.args, extendArg),
     };
   }
 
@@ -393,24 +393,24 @@ export function extendSchemaImpl(
   function getOperationTypes(
     nodes: ReadonlyArray<SchemaDefinitionNode | SchemaExtensionNode>,
   ): {
-    query: Maybe<GraphQLObjectType>;
-    mutation: Maybe<GraphQLObjectType>;
-    subscription: Maybe<GraphQLObjectType>;
+    query?: Maybe<GraphQLObjectType>;
+    mutation?: Maybe<GraphQLObjectType>;
+    subscription?: Maybe<GraphQLObjectType>;
   } {
     const opTypes = {};
     for (const node of nodes) {
       // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const operationTypesNodes = node.operationTypes ?? [];
 
       for (const operationType of operationTypesNodes) {
+        // Note: While this could make early assertions to get the correctly
+        // typed values below, that would throw immediately while type system
+        // validation with validateSchema() will produce more actionable results.
+        // TODO ts-expect-error
         opTypes[operationType.operation] = getNamedType(operationType.type);
       }
     }
 
-    // Note: While this could make early assertions to get the correctly
-    // typed values below, that would throw immediately while type system
-    // validation with validateSchema() will produce more actionable results.
-    // @ts-expect-error
     return opTypes;
   }
 
@@ -656,8 +656,7 @@ export function extendSchemaImpl(
 }
 
 const stdTypeMap = keyMap(
-  // @ts-expect-error FIXME: TS Conversion
-  specifiedScalarTypes.concat(introspectionTypes),
+  [...specifiedScalarTypes, ...introspectionTypes],
   (type) => type.name,
 );
 
diff --git a/src/utilities/findBreakingChanges.ts b/src/utilities/findBreakingChanges.ts
@@ -561,9 +561,9 @@ function diff<T extends { name: string }>(
   removed: Array<T>;
   persisted: Array<[T, T]>;
 } {
-  const added = [];
-  const removed = [];
-  const persisted = [];
+  const added: Array<T> = [];
+  const removed: Array<T> = [];
+  const persisted: Array<[T, T]> = [];
 
   const oldMap = keyMap(oldArray, ({ name }) => name);
   const newMap = keyMap(newArray, ({ name }) => name);
diff --git a/src/utilities/getIntrospectionQuery.ts b/src/utilities/getIntrospectionQuery.ts
@@ -54,7 +54,7 @@ export function getIntrospectionQuery(options?: IntrospectionOptions): string {
     ? descriptions
     : '';
 
-  function inputDeprecation(str) {
+  function inputDeprecation(str: string) {
     return optionsWithDefault.inputValueDeprecation ? str : '';
   }
 
diff --git a/src/utilities/introspectionFromSchema.ts b/src/utilities/introspectionFromSchema.ts
@@ -36,6 +36,5 @@ export function introspectionFromSchema(
   const document = parse(getIntrospectionQuery(optionsWithDefaults));
   const result = executeSync({ schema, document });
   invariant(!result.errors && result.data);
-  // @ts-expect-error FIXME
-  return result.data;
+  return result.data as any;
 }
diff --git a/src/utilities/lexicographicSortSchema.ts b/src/utilities/lexicographicSortSchema.ts
@@ -68,13 +68,12 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
   }
 
   function replaceNamedType<T extends GraphQLNamedType>(type: T): T {
-    // @ts-expect-error
-    return typeMap[type.name];
+    return typeMap[type.name] as T;
   }
 
-  function replaceMaybeType<T extends Maybe<GraphQLNamedType>>(
-    maybeType: T,
-  ): T {
+  function replaceMaybeType<T extends GraphQLNamedType>(
+    maybeType: Maybe<T>,
+  ): Maybe<T> {
     return maybeType && replaceNamedType(maybeType);
   }
 
@@ -98,7 +97,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
     return sortObjMap(fieldsMap, (field) => ({
       ...field,
       type: replaceType(field.type),
-      args: sortArgs(field.args),
+      args: field.args && sortArgs(field.args),
     }));
   }
 
diff --git a/src/utilities/separateOperations.ts b/src/utilities/separateOperations.ts
@@ -85,7 +85,7 @@ function collectTransitiveDependencies(
 }
 
 function collectDependencies(selectionSet: SelectionSetNode): Array<string> {
-  const dependencies = [];
+  const dependencies: Array<string> = [];
 
   visit(selectionSet, {
     FragmentSpread(node) {

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ export class GraphQLSchema {`
`274`	`274`	`return this._typeMap;`
`275`	`275`	`}`
`276`	`276`
`277`		`- getType(name: string): Maybe<GraphQLNamedType> {`
	`277`	`+ getType(name: string): GraphQLNamedType \| undefined {`
`278`	`278`	`return this.getTypeMap()[name];`
`279`	`279`	`}`
`280`	`280`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ function coerceInputValueImpl(`
`95`	`95`	`return;`
`96`	`96`	`}`
`97`	`97`
`98`		`- const coercedValue = {};`
	`98`	`+ const coercedValue: any = {};`
`99`	`99`	`const fieldDefs = type.getFields();`
`100`	`100`
`101`	`101`	`for (const field of Object.values(fieldDefs)) {`