Enable Flow typings on errors tests + Fix typing for Error constructor (#1582)

Author: IvanGoncharov

src/error/GraphQLError.js

@@ -22,7 +22,7 @@ import type { Source } from '../language/source';
 declare class GraphQLError extends Error {
   constructor(
     message: string,
-    nodes?: $ReadOnlyArray<ASTNode> | ASTNode | void,
+    nodes?: $ReadOnlyArray<ASTNode> | ASTNode | void | null,
     source?: ?Source,
     positions?: ?$ReadOnlyArray<number>,
     path?: ?$ReadOnlyArray<string | number>,

src/error/__tests__/GraphQLError-test.js

@@ -4,18 +4,31 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @noflow
+ * @flow strict
  */
 
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse, Source, GraphQLError, formatError } from '../../';
+import dedent from '../../jsutils/dedent';
+import invariant from '../../jsutils/invariant';
+import { Kind, parse, Source, GraphQLError, formatError } from '../../';
+
+const source = new Source(dedent`
+  {
+    field
+  }
+`);
+const ast = parse(source);
+const operationNode = ast.definitions[0];
+invariant(operationNode && operationNode.kind === Kind.OPERATION_DEFINITION);
+const fieldNode = operationNode.selectionSet.selections[0];
+invariant(fieldNode);
 
 describe('GraphQLError', () => {
   it('is a class and is a subclass of Error', () => {
-    expect(new GraphQLError()).to.be.instanceof(Error);
-    expect(new GraphQLError()).to.be.instanceof(GraphQLError);
+    expect(new GraphQLError('str')).to.be.instanceof(Error);
+    expect(new GraphQLError('str')).to.be.instanceof(GraphQLError);
   });
 
   it('has a name, message, and stack trace', () => {
@@ -42,7 +55,7 @@ describe('GraphQLError', () => {
   });
 
   it('creates new stack if original error has no stack', () => {
-    const original = { message: 'original' };
+    const original = new Error('original');
     const e = new GraphQLError('msg', null, null, null, null, original);
     expect(e.name).to.equal('GraphQLError');
     expect(e.stack).to.be.a('string');
@@ -51,37 +64,22 @@ describe('GraphQLError', () => {
   });
 
   it('converts nodes to positions and locations', () => {
-    const source = new Source(`{
-      field
-    }`);
-    const ast = parse(source);
-    const fieldNode = ast.definitions[0].selectionSet.selections[0];
     const e = new GraphQLError('msg', [fieldNode]);
     expect(e.nodes).to.deep.equal([fieldNode]);
     expect(e.source).to.equal(source);
-    expect(e.positions).to.deep.equal([8]);
-    expect(e.locations).to.deep.equal([{ line: 2, column: 7 }]);
+    expect(e.positions).to.deep.equal([4]);
+    expect(e.locations).to.deep.equal([{ line: 2, column: 3 }]);
   });
 
   it('converts single node to positions and locations', () => {
-    const source = new Source(`{
-      field
-    }`);
-    const ast = parse(source);
-    const fieldNode = ast.definitions[0].selectionSet.selections[0];
     const e = new GraphQLError('msg', fieldNode); // Non-array value.
     expect(e.nodes).to.deep.equal([fieldNode]);
     expect(e.source).to.equal(source);
-    expect(e.positions).to.deep.equal([8]);
-    expect(e.locations).to.deep.equal([{ line: 2, column: 7 }]);
+    expect(e.positions).to.deep.equal([4]);
+    expect(e.locations).to.deep.equal([{ line: 2, column: 3 }]);
   });
 
   it('converts node with loc.start === 0 to positions and locations', () => {
-    const source = new Source(`{
-      field
-    }`);
-    const ast = parse(source);
-    const operationNode = ast.definitions[0];
     const e = new GraphQLError('msg', [operationNode]);
     expect(e.nodes).to.deep.equal([operationNode]);
     expect(e.source).to.equal(source);
@@ -90,14 +88,11 @@ describe('GraphQLError', () => {
   });
 
   it('converts source and positions to locations', () => {
-    const source = new Source(`{
-      field
-    }`);
-    const e = new GraphQLError('msg', null, source, [10]);
+    const e = new GraphQLError('msg', null, source, [6]);
     expect(e.nodes).to.equal(undefined);
     expect(e.source).to.equal(source);
-    expect(e.positions).to.deep.equal([10]);
-    expect(e.locations).to.deep.equal([{ line: 2, column: 9 }]);
+    expect(e.positions).to.deep.equal([6]);
+    expect(e.locations).to.deep.equal([{ line: 2, column: 5 }]);
   });
 
   it('serializes to include message', () => {
@@ -106,10 +101,9 @@ describe('GraphQLError', () => {
   });
 
   it('serializes to include message and locations', () => {
-    const node = parse('{ field }').definitions[0].selectionSet.selections[0];
-    const e = new GraphQLError('msg', [node]);
+    const e = new GraphQLError('msg', [fieldNode]);
     expect(JSON.stringify(e)).to.equal(
-      '{"message":"msg","locations":[{"line":1,"column":3}]}',
+      '{"message":"msg","locations":[{"line":2,"column":3}]}',
     );
   });
 

src/error/__tests__/locatedError-test.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @noflow
+ * @flow strict
  */
 
 import { expect } from 'chai';
@@ -26,7 +26,7 @@ describe('locatedError', () => {
   });
 
   it('passes GraphQLError-ish through', () => {
-    const e = new Error('I have a different prototype chain');
+    const e: any = new Error('I have a different prototype chain');
     e.locations = [];
     e.path = [];
     e.nodes = [];
@@ -38,7 +38,7 @@ describe('locatedError', () => {
   });
 
   it('does not pass through elasticsearch-like errors', () => {
-    const e = new Error('I am from elasticsearch');
+    const e: any = new Error('I am from elasticsearch');
     e.path = '/something/feed/_search';
 
     expect(locatedError(e, [], [])).to.not.deep.equal(e);

src/error/__tests__/printError-test.js

@@ -4,16 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @noflow
+ * @flow strict
  */
 
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
+import dedent from '../../jsutils/dedent';
+import invariant from '../../jsutils/invariant';
 import { GraphQLError } from '../GraphQLError';
 import { printError } from '../printError';
-import { parse, Source } from '../../language';
-import dedent from '../../jsutils/dedent';
+import { Kind, parse, Source } from '../../language';
 
 describe('printError', () => {
   it('prints an line numbers with correct padding', () => {
@@ -48,7 +49,7 @@ describe('printError', () => {
   });
 
   it('prints an error with nodes from different sources', () => {
-    const sourceA = parse(
+    const docA = parse(
       new Source(
         dedent`
           type Foo {
@@ -58,9 +59,11 @@ describe('printError', () => {
         'SourceA',
       ),
     );
-    const fieldTypeA = sourceA.definitions[0].fields[0].type;
+    const opA = docA.definitions[0];
+    invariant(opA && opA.kind === Kind.OBJECT_TYPE_DEFINITION && opA.fields);
+    const fieldA = opA.fields[0];
 
-    const sourceB = parse(
+    const docB = parse(
       new Source(
         dedent`
           type Foo {
@@ -70,11 +73,14 @@ describe('printError', () => {
         'SourceB',
       ),
     );
-    const fieldTypeB = sourceB.definitions[0].fields[0].type;
+    const opB = docB.definitions[0];
+    invariant(opB && opB.kind === Kind.OBJECT_TYPE_DEFINITION && opB.fields);
+    const fieldB = opB.fields[0];
 
+    invariant(fieldA && fieldB);
     const error = new GraphQLError('Example error with two nodes', [
-      fieldTypeA,
-      fieldTypeB,
+      fieldA.type,
+      fieldB.type,
     ]);
 
     expect(printError(error)).to.equal(dedent`

src/jsutils/__tests__/inspect-test.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @noflow
+ * @flow strict
  */
 
 import { expect } from 'chai';
@@ -28,6 +28,7 @@ describe('inspect', () => {
   it('string', () => {
     expect(inspect('')).to.equal('""');
     expect(inspect('abc')).to.equal('"abc"');
+    // $FlowFixMe
     expect(inspect('"')).to.equal(String.raw`"\""`);
   });