fix jest-haste-map-types (#7951)

Author: jeysal

CHANGELOG.md

@@ -22,7 +22,7 @@
 
 ### Chore & Maintenance
 
-- `[*]`: Setup building, linting and testing of TypeScript ([#7808](https://github.com/facebook/jest/pull/7808), [#7855](https://github.com/facebook/jest/pull/7855))
+- `[*]`: Setup building, linting and testing of TypeScript ([#7808](https://github.com/facebook/jest/pull/7808), [#7855](https://github.com/facebook/jest/pull/7855), [#7951](https://github.com/facebook/jest/pull/7951))
 - `[pretty-format]`: Migrate to TypeScript ([#7809](https://github.com/facebook/jest/pull/7809))
 - `[diff-sequences]`: Migrate to Typescript ([#7820](https://github.com/facebook/jest/pull/7820))
 - `[jest-get-type]`: Migrate to TypeScript ([#7818](https://github.com/facebook/jest/pull/7818))
@@ -39,7 +39,7 @@
 - `[jest-watcher]`: Migrate to TypeScript ([#7843](https://github.com/facebook/jest/pull/7843))
 - `[jest-mock]`: Migrate to TypeScript ([#7847](https://github.com/facebook/jest/pull/7847), [#7850](https://github.com/facebook/jest/pull/7850))
 - `[jest-worker]`: Migrate to TypeScript ([#7853](https://github.com/facebook/jest/pull/7853))
-- `[jest-haste-map]`: Migrate to TypeScript ([#7854](https://github.com/facebook/jest/pull/7854))
+- `[jest-haste-map]`: Migrate to TypeScript ([#7854](https://github.com/facebook/jest/pull/7854), [#7951](https://github.com/facebook/jest/pull/7951))
 - `[docs]`: Fix image paths in SnapshotTesting.md for current and version 24 ([#7872](https://github.com/facebook/jest/pull/7872))
 - `[babel-jest]`: Migrate to TypeScript ([#7862](https://github.com/facebook/jest/pull/7862))
 - `[jest-resolve]`: Migrate to TypeScript ([#7871](https://github.com/facebook/jest/pull/7871))

babel.config.js

@@ -9,6 +9,7 @@ module.exports = {
     },
     {
       plugins: [
+        'babel-plugin-typescript-strip-namespaces',
         require.resolve(
           './scripts/babel-plugin-jest-replace-ts-export-assignment.js'
         ),

package.json

@@ -19,6 +19,7 @@
     "ansi-styles": "^3.2.0",
     "babel-eslint": "^9.0.0",
     "babel-loader": "^8.0.5",
+    "babel-plugin-typescript-strip-namespaces": "^1.1.0",
     "camelcase": "^5.0.0",
     "chalk": "^2.0.1",
     "codecov": "^3.0.0",

packages/jest-haste-map/src/index.ts

@@ -98,9 +98,12 @@ type Watcher = {
 
 type WorkerInterface = {worker: typeof worker; getSha1: typeof getSha1};
 
-export type ModuleMap = HasteModuleMap;
-export type SerializableModuleMap = HasteSerializableModuleMap;
-export type FS = HasteFS;
+// TODO: Ditch namespace when this module exports ESM
+namespace HasteMap {
+  export type ModuleMap = HasteModuleMap;
+  export type SerializableModuleMap = HasteSerializableModuleMap;
+  export type FS = HasteFS;
+}
 
 const CHANGE_INTERVAL = 30;
 const MAX_WAIT_TIME = 240000;
@@ -368,7 +371,7 @@ class HasteMap extends EventEmitter {
     return hasteMap;
   }
 
-  readModuleMap(): ModuleMap {
+  readModuleMap(): HasteModuleMap {
     const data = this.read();
     return new HasteModuleMap({
       duplicates: data.duplicates,
@@ -1079,4 +1082,4 @@ function copyMap<K, V>(input: Map<K, V>): Map<K, V> {
 HasteMap.H = H;
 HasteMap.ModuleMap = HasteModuleMap;
 
-module.exports = HasteMap;
+export = HasteMap;

packages/jest-resolve-dependencies/src/__tests__/dependency_resolver.test.ts

@@ -33,10 +33,10 @@ beforeEach(() => {
     roots: ['./packages/jest-resolve-dependencies'],
   });
   return Runtime.createContext(config, {maxWorkers, watchman: false}).then(
-    (hasteMap: any) => {
+    (runtimeContext: any) => {
       dependencyResolver = new DependencyResolver(
-        hasteMap.resolver,
-        hasteMap.hasteFS,
+        runtimeContext.resolver,
+        runtimeContext.hasteFS,
         buildSnapshotResolver(config),
       );
     },

packages/jest-resolve/src/__tests__/resolve.test.ts

@@ -8,17 +8,14 @@
 
 import fs from 'fs';
 import path from 'path';
-import HasteMap from 'jest-haste-map';
+import {ModuleMap} from 'jest-haste-map';
 import Resolver from '../';
 // @ts-ignore: js file
 import userResolver from '../__mocks__/userResolver';
 import nodeModulesPaths from '../nodeModulesPaths';
 import defaultResolver from '../defaultResolver';
 import {ResolverConfig} from '../types';
 
-// @ts-ignore: types are wrong. not sure how...
-const {ModuleMap} = HasteMap;
-
 jest.mock('../__mocks__/userResolver');
 
 beforeEach(() => {

packages/jest-transform/src/ScriptTransformer.ts

@@ -110,7 +110,6 @@ export default class ScriptTransformer {
     content: string,
     instrument: boolean,
   ): Config.Path {
-    // @ts-ignore: not properly exported (needs ESM)
     const baseCacheDir = HasteMap.getCacheFilePath(
       this._config.cacheDirectory,
       'jest-transform-cache-' + this._config.name,

yarn.lock

@@ -2610,6 +2610,11 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
   integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
 
+babel-plugin-typescript-strip-namespaces@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-typescript-strip-namespaces/-/babel-plugin-typescript-strip-namespaces-1.1.0.tgz#7f8b022505bc742905801f9c41dd93f08f34ffc4"
+  integrity sha512-69kdF5HJoSIdgTVtHDor6XGJzVcxF5Hh92Rnh+rcitBZpj0pVU3Go0CrNJdPog6uoTcB90Ifk9O55FPZg0XN4w==
+
 [email protected]:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"