chore: type invariant as assert function (#9228)

jestjs · Nov 24, 2019 · 346b074 · 346b074
1 parent 2c1addd
commit 346b074
Show file tree

Hide file tree

Showing 6 changed files with 613 additions and 576 deletions.
diff --git a/packages/jest-circus/src/eventHandler.ts b/packages/jest-circus/src/eventHandler.ts
@@ -106,14 +106,14 @@ const eventHandler: Circus.EventHandler = (event, state): void => {
 
       if (type === 'beforeAll') {
         invariant(describeBlock, 'always present for `*All` hooks');
-        addErrorToEachTestUnderDescribe(describeBlock!, error, asyncError);
+        addErrorToEachTestUnderDescribe(describeBlock, error, asyncError);
       } else if (type === 'afterAll') {
         // Attaching `afterAll` errors to each test makes execution flow
         // too complicated, so we'll consider them to be global.
         state.unhandledErrors.push([error, asyncError]);
       } else {
         invariant(test, 'always present for `*Each` hooks');
-        test!.errors.push([error, asyncError]);
+        test.errors.push([error, asyncError]);
       }
       break;
     }
@@ -178,8 +178,8 @@ const eventHandler: Circus.EventHandler = (event, state): void => {
       invariant(state.originalGlobalErrorHandlers);
       invariant(state.parentProcess);
       restoreGlobalErrorHandlers(
-        state.parentProcess!,
-        state.originalGlobalErrorHandlers!,
+        state.parentProcess,
+        state.originalGlobalErrorHandlers,
       );
       break;
     }

diff --git a/packages/jest-circus/src/run.ts b/packages/jest-circus/src/run.ts
@@ -155,7 +155,7 @@ const _callCircusTest = (
     return Promise.resolve();
   }
 
-  return callAsyncCircusFn(test.fn!, testContext, {isHook: false, timeout})
+  return callAsyncCircusFn(test.fn, testContext, {isHook: false, timeout})
     .then(() => dispatch({name: 'test_fn_success', test}))
     .catch(error => dispatch({error, name: 'test_fn_failure', test}));
 };

diff --git a/packages/jest-circus/src/utils.ts b/packages/jest-circus/src/utils.ts
@@ -351,8 +351,11 @@ export const addErrorToEachTestUnderDescribe = (
   }
 };
 
-export const invariant = (condition: unknown, message?: string) => {
+export function invariant(
+  condition: unknown,
+  message?: string,
+): asserts condition {
   if (!condition) {
     throw new Error(message);
   }
-};
+}
diff --git a/packages/jest-haste-map/package.json b/packages/jest-haste-map/package.json
@@ -14,7 +14,6 @@
     "anymatch": "^3.0.3",
     "fb-watchman": "^2.0.0",
     "graceful-fs": "^4.2.3",
-    "invariant": "^2.2.4",
     "jest-serializer": "^24.9.0",
     "jest-util": "^24.9.0",
     "jest-worker": "^24.9.0",
@@ -26,7 +25,6 @@
     "@types/anymatch": "^1.3.1",
     "@types/fb-watchman": "^2.0.0",
     "@types/graceful-fs": "^4.1.2",
-    "@types/invariant": "^2.2.29",
     "@types/micromatch": "^3.1.0",
     "@types/sane": "^2.0.0"
   },

diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts
@@ -12,7 +12,6 @@ import * as fs from 'fs';
 import {tmpdir} from 'os';
 import * as path from 'path';
 import {NodeWatcher, Watcher as SaneWatcher} from 'sane';
-import invariant = require('invariant');
 import {Config} from '@jest/types';
 import serializer from 'jest-serializer';
 import Worker from 'jest-worker';
@@ -153,6 +152,12 @@ const getWhiteList = (list: Array<string> | undefined): RegExp | null => {
   return null;
 };
 
+function invariant(condition: unknown, message?: string): asserts condition {
+  if (!condition) {
+    throw new Error(message);
+  }
+}
+
 /**
  * HasteMap is a JavaScript implementation of Facebook's haste module system.
  *
@@ -950,8 +955,8 @@ class HasteMap extends EventEmitter {
             );
             const fileMetadata: FileMetaData = [
               '',
-              stat ? stat.mtime.getTime() : -1,
-              stat ? stat.size : 0,
+              stat.mtime.getTime(),
+              stat.size,
               0,
               '',
               null,