invariant/devAssert: make typings of condition stricter (graphql#3569)

Author: IvanGoncharov

src/error/__tests__/GraphQLError-test.ts

@@ -20,7 +20,7 @@ const ast = parse(source);
 const operationNode = ast.definitions[0];
 invariant(operationNode.kind === Kind.OPERATION_DEFINITION);
 const fieldNode = operationNode.selectionSet.selections[0];
-invariant(fieldNode);
+invariant(fieldNode != null);
 
 describe('GraphQLError', () => {
  it('is a class and is a subclass of Error', () => {
@@ -254,7 +254,7 @@ describe('toString', () => {
  ),
  );
  const opA = docA.definitions[0];
- invariant(opA.kind === Kind.OBJECT_TYPE_DEFINITION && opA.fields);
+ invariant(opA.kind === Kind.OBJECT_TYPE_DEFINITION && opA.fields != null);
  const fieldA = opA.fields[0];
 
  const docB = parse(
@@ -268,7 +268,7 @@ describe('toString', () => {
  ),
  );
  const opB = docB.definitions[0];
- invariant(opB.kind === Kind.OBJECT_TYPE_DEFINITION && opB.fields);
+ invariant(opB.kind === Kind.OBJECT_TYPE_DEFINITION && opB.fields != null);
  const fieldB = opB.fields[0];
 
  const error = new GraphQLError('Example error with two nodes', [

src/execution/__tests__/simplePubSub.ts

@@ -64,7 +64,7 @@ export class SimplePubSub<T> {
  const value: R = transform(event);
  if (pullQueue.length > 0) {
  const receiver = pullQueue.shift();
- invariant(receiver);
+ invariant(receiver != null);
  receiver({ value, done: false });
  } else {
  pushQueue.push(value);

src/execution/execute.ts

@@ -258,7 +258,7 @@ export function assertValidExecutionArguments(
  document: DocumentNode,
  rawVariableValues: Maybe<{ readonly [variable: string]: unknown }>,
 ): void {
- devAssert(document, 'Must provide document.');
+ devAssert(document != null, 'Must provide document.');
 
  // If the schema used for execution is invalid, throw an error.
  assertValidSchema(schema);

src/jsutils/devAssert.ts

@@ -1,6 +1,5 @@
-export function devAssert(condition: unknown, message: string): void {
- const booleanCondition = Boolean(condition);
- if (!booleanCondition) {
+export function devAssert(condition: boolean, message: string): void {
+ if (!condition) {
  throw new Error(message);
  }
 }

src/jsutils/invariant.ts

@@ -1,9 +1,8 @@
 export function invariant(
- condition: unknown,
+ condition: boolean,
  message?: string,
 ): asserts condition {
- const booleanCondition = Boolean(condition);
- if (!booleanCondition) {
+ if (!condition) {
  throw new Error(
  message != null ? message : 'Unexpected invariant triggered.',
  );

src/type/__tests__/extensions-test.ts

@@ -72,7 +72,7 @@ describe('Type System: Extensions', () => {
  expect(config.extensions).to.deep.equal({});
  const someFieldConfig = config.fields.someField;
  expect(someFieldConfig.extensions).to.deep.equal({});
- invariant(someFieldConfig.args);
+ invariant(someFieldConfig.args != null);
  const someArgConfig = someFieldConfig.args.someArg;
  expect(someArgConfig.extensions).to.deep.equal({});
  });
@@ -109,7 +109,7 @@ describe('Type System: Extensions', () => {
  expectObjMap(config.extensions).to.deep.equal(objectExtensions);
  const someFieldConfig = config.fields.someField;
  expectObjMap(someFieldConfig.extensions).to.deep.equal(fieldExtensions);
- invariant(someFieldConfig.args);
+ invariant(someFieldConfig.args != null);
  const someArgConfig = someFieldConfig.args.someArg;
  expectObjMap(someArgConfig.extensions).to.deep.equal(argExtensions);
  });
@@ -141,7 +141,7 @@ describe('Type System: Extensions', () => {
  expect(config.extensions).to.deep.equal({});
  const someFieldConfig = config.fields.someField;
  expect(someFieldConfig.extensions).to.deep.equal({});
- invariant(someFieldConfig.args);
+ invariant(someFieldConfig.args != null);
  const someArgConfig = someFieldConfig.args.someArg;
  expect(someArgConfig.extensions).to.deep.equal({});
  });
@@ -180,7 +180,7 @@ describe('Type System: Extensions', () => {
  expectObjMap(config.extensions).to.deep.equal(interfaceExtensions);
  const someFieldConfig = config.fields.someField;
  expectObjMap(someFieldConfig.extensions).to.deep.equal(fieldExtensions);
- invariant(someFieldConfig.args);
+ invariant(someFieldConfig.args != null);
  const someArgConfig = someFieldConfig.args.someArg;
  expectObjMap(someArgConfig.extensions).to.deep.equal(argExtensions);
  });

src/type/schema.ts

@@ -220,7 +220,7 @@ export class GraphQLSchema {
 
  const typeName = namedType.name;
  devAssert(
- typeName,
+ typeName != null,
  'One of the provided types for building the Schema is missing a name.',
  );
  if (this._typeMap[typeName] !== undefined) {

src/utilities/introspectionFromSchema.ts

@@ -36,6 +36,6 @@ export function introspectionFromSchema(
 
  const document = parse(getIntrospectionQuery(optionsWithDefaults));
  const result = executeSync({ schema, document });
- invariant(!result.errors && result.data);
+ invariant(result.errors == null && result.data != null);
  return result.data as any;
 }

src/validation/rules/UniqueInputFieldNamesRule.ts

@@ -30,7 +30,7 @@ export function UniqueInputFieldNamesRule(
  },
  leave() {
  const prevKnownNames = knownNameStack.pop();
- invariant(prevKnownNames);
+ invariant(prevKnownNames != null);
  knownNames = prevKnownNames;
  },
  },

src/validation/validate.ts

@@ -46,7 +46,7 @@ export function validate(
 ): ReadonlyArray<GraphQLError> {
  const maxErrors = options?.maxErrors ?? 100;
 
- devAssert(documentAST, 'Must provide document.');
+ devAssert(documentAST != null, 'Must provide document.');
  // If the schema used for validation is invalid, throw an error.
  assertValidSchema(schema);