Fix TSC errors

graphql · May 24, 2021 · baa6a5d · baa6a5d
1 parent f6655ec
commit baa6a5d
Show file tree

Hide file tree

Showing 33 changed files with 99 additions and 47 deletions.
diff --git a/src/error/GraphQLError.ts b/src/error/GraphQLError.ts
@@ -98,8 +98,10 @@ export class GraphQLError extends Error {
       _source = _nodes[0].loc?.source;
     }
 
-    let _positions = positions;
-    if (!_positions && _nodes) {
+    let _positions;
+    if (positions) {
+      _positions = positions;
+    } else if (_nodes) {
       _positions = [];
       for (const node of _nodes) {
         if (node.loc) {

diff --git a/src/error/locatedError.ts b/src/error/locatedError.ts
@@ -22,6 +22,7 @@ export function locatedError(
       : new Error('Unexpected error value: ' + inspect(rawOriginalError));
 
   // Note: this uses a brand-check to support GraphQL errors originating from other contexts.
+  // @ts-expect-error FIXME: TS Conversion
   if (Array.isArray(originalError.path)) {
     // @ts-expect-error
     return originalError;

diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -191,7 +191,9 @@ export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
   // field and its descendants will be omitted, and sibling fields will still
   // be executed. An execution which encounters errors will still result in a
   // resolved Promise.
+  // @ts-expect-error FIXME: TS Conversion
   const data = executeOperation(exeContext, exeContext.operation, rootValue);
+  // @ts-expect-error FIXME: TS Conversion
   return buildResponse(exeContext, data);
 }
 
@@ -313,7 +315,6 @@ export function buildExecutionContext(
     return coercedVariableValues.errors;
   }
 
-  // @ts-expect-error
   return {
     schema,
     fragments,
@@ -1078,7 +1079,7 @@ function _collectSubfields(
   fieldNodes: ReadonlyArray<FieldNode>,
 ): Map<string, Array<FieldNode>> {
   let subFieldNodes = new Map();
-  const visitedFragmentNames = new Set();
+  const visitedFragmentNames = new Set<string>();
   for (const node of fieldNodes) {
     if (node.selectionSet) {
       subFieldNodes = collectFields(

diff --git a/src/jsutils/__tests__/inspect-test.ts b/src/jsutils/__tests__/inspect-test.ts
@@ -124,7 +124,7 @@ describe('inspect', () => {
   });
 
   it('detect circular objects', () => {
-    const obj = {};
+    const obj: { [name: string]: unknown } = {};
     obj.self = obj;
     obj.deepSelf = { self: obj };
 

diff --git a/src/jsutils/__tests__/isIterableObject-test.ts b/src/jsutils/__tests__/isIterableObject-test.ts
@@ -60,7 +60,7 @@ describe('isIterableObject', () => {
     };
     expect(isIterableObject(invalidIterable)).to.equal(false);
 
-    const arrayLike = {};
+    const arrayLike: { [key: string]: unknown } = {};
     arrayLike[0] = 'Alpha';
     arrayLike[1] = 'Bravo';
     arrayLike[2] = 'Charlie';

diff --git a/src/jsutils/inspect.ts b/src/jsutils/inspect.ts
@@ -35,7 +35,9 @@ function formatObjectValue(
 
   const seenValues = [...previouslySeenValues, value];
 
+  // @ts-expect-error FIXME: TS Conversion
   if (typeof value.toJSON === 'function') {
+    // @ts-expect-error FIXME: TS Conversion
     const jsonValue = (value.toJSON as () => unknown)();
 
     // check for infinite recursion

diff --git a/src/jsutils/isPromise.ts b/src/jsutils/isPromise.ts
@@ -3,5 +3,6 @@
  * otherwise returns false.
  */
 export function isPromise(value: unknown): value is Promise<unknown> {
-  return typeof value?.then === 'function';
+  // eslint-disable-next-line @typescript-eslint/dot-notation
+  return typeof value?.['then'] === 'function';
 }
diff --git a/src/language/__tests__/printer-test.ts b/src/language/__tests__/printer-test.ts
@@ -9,7 +9,10 @@ import { print } from '../printer';
 
 describe('Printer: Query document', () => {
   it('prints minimal ast', () => {
-    const ast = { kind: 'Field', name: { kind: 'Name', value: 'foo' } };
+    const ast = {
+      kind: 'Field',
+      name: { kind: 'Name', value: 'foo' },
+    } as const;
     expect(print(ast)).to.equal('foo');
   });
 

diff --git a/src/language/__tests__/schema-printer-test.ts b/src/language/__tests__/schema-printer-test.ts
@@ -12,7 +12,7 @@ describe('Printer: SDL document', () => {
     const ast = {
       kind: 'ScalarTypeDefinition',
       name: { kind: 'Name', value: 'foo' },
-    };
+    } as const;
     expect(print(ast)).to.equal('scalar foo');
   });
 

diff --git a/src/language/__tests__/toJSONDeep.ts b/src/language/__tests__/toJSONDeep.ts
@@ -11,7 +11,6 @@ export function toJSONDeep(value: unknown): unknown {
   }
 
   if (typeof value.toJSON === 'function') {
-    // @ts-expect-error
     return value.toJSON();
   }
 

diff --git a/src/language/__tests__/visitor-test.ts b/src/language/__tests__/visitor-test.ts
@@ -4,6 +4,7 @@ import { describe, it } from 'mocha';
 import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery';
 
 import type { ASTNode } from '../ast';
+import { isNode } from '../ast';
 import { Kind } from '../kinds';
 import { parse } from '../parser';
 import { visit, visitInParallel, BREAK } from '../visitor';
@@ -50,6 +51,7 @@ function checkVisitorFnArgs(ast: any, args: any, isEdited: boolean = false) {
 }
 
 function getValue(node: ASTNode) {
+  // @ts-expect-error FIXME
   return node.value != null ? node.value : undefined;
 }
 
@@ -263,6 +265,7 @@ describe('Visitor', () => {
         if (node.kind === 'Field' && node.name.value === 'a') {
           return {
             kind: 'Field',
+            // @ts-expect-error FIXME
             selectionSet: [addedField].concat(node.selectionSet),
           };
         }
@@ -522,7 +525,7 @@ describe('Visitor', () => {
           'enter',
           node.kind,
           key,
-          parent?.kind != null ? parent.kind : undefined,
+          isNode(parent) ? parent.kind : undefined,
         ]);
 
         checkVisitorFnArgs(ast, arguments);
@@ -534,7 +537,7 @@ describe('Visitor', () => {
           'leave',
           node.kind,
           key,
-          parent?.kind != null ? parent.kind : undefined,
+          isNode(parent) ? parent.kind : undefined,
         ]);
 
         expect(argsStack.pop()).to.deep.equal([...arguments]);

diff --git a/src/language/ast.ts b/src/language/ast.ts
@@ -125,7 +125,8 @@ export class Token {
  * @internal
  */
 export function isNode(maybeNode: unknown): maybeNode is ASTNode {
-  return maybeNode != null && typeof maybeNode.kind === 'string';
+  // eslint-disable-next-line @typescript-eslint/dot-notation
+  return typeof maybeNode?.['kind'] === 'string';
 }
 
 /**

diff --git a/src/language/parser.ts b/src/language/parser.ts
@@ -440,7 +440,6 @@ export class Parser {
   }
 
   parseConstArgument(): ConstArgumentNode {
-    // @ts-expect-error FIXME during TS conversion
     return this.parseArgument(true);
   }
 
@@ -610,7 +609,6 @@ export class Parser {
   }
 
   parseConstValueLiteral(): ConstValueNode {
-    // @ts-expect-error FIXME during TS conversion
     return this.parseValueLiteral(true);
   }
 
@@ -695,7 +693,6 @@ export class Parser {
   }
 
   parseConstDirectives(): Array<ConstDirectiveNode> {
-    // @ts-expect-error FIXME during TS conversion
     return this.parseDirectives(true);
   }
 

diff --git a/src/language/printLocation.ts b/src/language/printLocation.ts
@@ -38,7 +38,7 @@ export function printSourceLocation(
   if (locationLine.length > 120) {
     const subLineIndex = Math.floor(columnNum / 80);
     const subLineColumnNum = columnNum % 80;
-    const subLines = [];
+    const subLines: Array<string> = [];
     for (let i = 0; i < locationLine.length; i += 80) {
       subLines.push(locationLine.slice(i, i + 80));
     }
@@ -47,8 +47,11 @@ export function printSourceLocation(
       locationStr +
       printPrefixedLines([
         [`${lineNum} |`, subLines[0]],
+        // @ts-expect-error FIXME
         ...subLines.slice(1, subLineIndex + 1).map((subLine) => ['|', subLine]),
+        // @ts-expect-error FIXME
         ['|', '^'.padStart(subLineColumnNum)],
+        // @ts-expect-error FIXME
         ['|', subLines[subLineIndex + 1]],
       ])
     );

diff --git a/src/subscription/__tests__/mapAsyncIterator-test.ts b/src/subscription/__tests__/mapAsyncIterator-test.ts
@@ -105,6 +105,7 @@ describe('mapAsyncIterator', () => {
     expect(await doubles.next()).to.deep.equal({ value: 4, done: false });
 
     // Early return
+    // @ts-expect-error FIXME: TS Conversion
     expect(await doubles.return()).to.deep.equal({
       value: 'The End',
       done: true,
@@ -142,6 +143,7 @@ describe('mapAsyncIterator', () => {
     expect(await doubles.next()).to.deep.equal({ value: 4, done: false });
 
     // Early return
+    // @ts-expect-error FIXME: TS Conversion
     expect(await doubles.return()).to.deep.equal({
       value: undefined,
       done: true,
@@ -151,11 +153,11 @@ describe('mapAsyncIterator', () => {
   it('passes through early return from async values', async () => {
     async function* source() {
       try {
-        yield 1;
-        yield 2;
+        yield 'a';
+        yield 'b';
 
         // istanbul ignore next (Shouldn't be reached)
-        yield 3;
+        yield 'c';
       } finally {
         yield 'Done';
         yield 'Last';
@@ -164,8 +166,8 @@ describe('mapAsyncIterator', () => {
 
     const doubles = mapAsyncIterator(source(), (x) => x + x);
 
-    expect(await doubles.next()).to.deep.equal({ value: 2, done: false });
-    expect(await doubles.next()).to.deep.equal({ value: 4, done: false });
+    expect(await doubles.next()).to.deep.equal({ value: 'aa', done: false });
+    expect(await doubles.next()).to.deep.equal({ value: 'bb', done: false });
 
     // Early return
     expect(await doubles.return()).to.deep.equal({

diff --git a/src/subscription/__tests__/subscribe-test.ts b/src/subscription/__tests__/subscribe-test.ts
@@ -482,7 +482,7 @@ describe('Subscription Initialization Phase', () => {
 // Once a subscription returns a valid AsyncIterator, it can still yield errors.
 describe('Subscription Publish Phase', () => {
   it('produces a payload for multiple subscribe in same subscription', async () => {
-    const pubsub = new SimplePubSub();
+    const pubsub = new SimplePubSub<Email>();
 
     const subscription = await createSubscription(pubsub);
     invariant(isAsyncIterable(subscription));
@@ -525,7 +525,7 @@ describe('Subscription Publish Phase', () => {
   });
 
   it('produces a payload per subscription event', async () => {
-    const pubsub = new SimplePubSub();
+    const pubsub = new SimplePubSub<Email>();
     const subscription = await createSubscription(pubsub);
     invariant(isAsyncIterable(subscription));
 
@@ -614,7 +614,7 @@ describe('Subscription Publish Phase', () => {
   });
 
   it('produces a payload when there are multiple events', async () => {
-    const pubsub = new SimplePubSub();
+    const pubsub = new SimplePubSub<Email>();
     const subscription = await createSubscription(pubsub);
     invariant(isAsyncIterable(subscription));
 
@@ -680,7 +680,7 @@ describe('Subscription Publish Phase', () => {
   });
 
   it('should not trigger when subscription is already done', async () => {
-    const pubsub = new SimplePubSub();
+    const pubsub = new SimplePubSub<Email>();
     const subscription = await createSubscription(pubsub);
     invariant(isAsyncIterable(subscription));
 
@@ -734,7 +734,7 @@ describe('Subscription Publish Phase', () => {
   });
 
   it('should not trigger when subscription is thrown', async () => {
-    const pubsub = new SimplePubSub();
+    const pubsub = new SimplePubSub<Email>();
     const subscription = await createSubscription(pubsub);
     invariant(isAsyncIterable(subscription));
 
@@ -786,7 +786,7 @@ describe('Subscription Publish Phase', () => {
   });
 
   it('event order is correct for multiple publishes', async () => {
-    const pubsub = new SimplePubSub();
+    const pubsub = new SimplePubSub<Email>();
     const subscription = await createSubscription(pubsub);
     invariant(isAsyncIterable(subscription));
 

diff --git a/src/type/__tests__/introspection-test.ts b/src/type/__tests__/introspection-test.ts
@@ -1566,12 +1566,12 @@ describe('Introspection', () => {
     });
 
     // istanbul ignore next (Called only to fail test)
-    function fieldResolver(_1, _2, _3, info) {
+    function fieldResolver(_1, _2, _3, info): never {
       expect.fail(`Called on ${info.parentType.name}::${info.fieldName}`);
     }
 
     // istanbul ignore next (Called only to fail test)
-    function typeResolver(_1, _2, info) {
+    function typeResolver(_1, _2, info): never {
       expect.fail(`Called on ${info.parentType.name}::${info.fieldName}`);
     }
 

diff --git a/src/type/definition.ts b/src/type/definition.ts
@@ -180,6 +180,15 @@ export function assertListType(type: unknown): GraphQLList<GraphQLType> {
   return type;
 }
 
+export function isNonNullType(
+  type: GraphQLInputType,
+): type is GraphQLNonNull<GraphQLInputType>;
+export function isNonNullType(
+  type: GraphQLOutputType,
+): type is GraphQLNonNull<GraphQLOutputType>;
+export function isNonNullType(
+  type: unknown,
+): type is GraphQLNonNull<GraphQLType>;
 export function isNonNullType(
   type: unknown,
 ): type is GraphQLNonNull<GraphQLType> {
@@ -819,6 +828,7 @@ function defineFieldMap<TSource, TContext>(
     `${config.name} fields must be an object with field names as keys or a function which returns such an object.`,
   );
 
+  // @ts-expect-error FIXME: TS Conversion
   return mapValue(fieldMap, (fieldConfig, fieldName) => {
     devAssert(
       isPlainObj(fieldConfig),

diff --git a/src/type/introspection.ts b/src/type/introspection.ts
@@ -234,16 +234,19 @@ export const __Type: GraphQLObjectType = new GraphQLObjectType({
       },
       name: {
         type: GraphQLString,
+        // @ts-expect-error FIXME: TS Conversion
         resolve: (type) => (type.name !== undefined ? type.name : undefined),
       },
       description: {
         type: GraphQLString,
         resolve: (type) =>
+          // @ts-expect-error FIXME: TS Conversion
           type.description !== undefined ? type.description : undefined,
       },
       specifiedByURL: {
         type: GraphQLString,
         resolve: (obj) =>
+          // @ts-expect-error FIXME: TS Conversion
           obj.specifiedByURL !== undefined ? obj.specifiedByURL : undefined,
       },
       fields: {
@@ -310,6 +313,7 @@ export const __Type: GraphQLObjectType = new GraphQLObjectType({
       ofType: {
         type: __Type,
         resolve: (type) =>
+          // @ts-expect-error FIXME: TS Conversion
           type.ofType !== undefined ? type.ofType : undefined,
       },
     } as GraphQLFieldConfigMap<GraphQLType, unknown>),

diff --git a/src/type/scalars.ts b/src/type/scalars.ts
@@ -139,7 +139,6 @@ function serializeObject(outputValue: unknown): unknown {
       }
     }
     if (typeof outputValue.toJSON === 'function') {
-      // @ts-expect-error
       return outputValue.toJSON();
     }
   }