Better memoization & minor fixes (#501)

* fixed minor things

* minor cleanups

* commen

* fixed 1 issue

* removed params

* reverted to earlier configuration

* reverted to earlier configuration

* fixed types

Author: GeeWee

package.json

@@ -68,6 +68,7 @@
     "cpx": "^1.5.0",
     "fs-extra": "6.0.0",
     "jest-config": "^22.4.3",
+    "lodash": "^4.17.10",
     "pkg-dir": "^2.0.0",
     "yargs": "^11.0.0"
   },
@@ -76,6 +77,7 @@
     "typescript": "2.x"
   },
   "devDependencies": {
+    "@types/lodash": "^4.14.108",
     "@types/babel-core": "latest",
     "@types/es6-shim": "0.31.36",
     "@types/fs-extra": "5.0.2",

src/logger.ts

@@ -36,10 +36,6 @@ export function flushLogs() {
   fs.writeFileSync(filePath, logString);
 }
 
-function includes<T>(array: T[], subject: T) {
-  return array.indexOf(subject) !== -1;
-}
-
 function convertToJSONIfPossible(object: any): string {
   try {
     return JSON.stringify(object, null, 2);

src/preprocessor.ts

@@ -4,7 +4,6 @@ import { JestConfig, Path, TransformOptions } from './jest-types';
 import { flushLogs, logOnce } from './logger';
 import { getPostProcessHook } from './postprocess';
 import {
-  cacheFile,
   getTSConfig,
   getTSJestConfig,
   runTsDiagnostics,
@@ -19,11 +18,7 @@ export function process(
 ) {
   // transformOptions.instrument is a proxy for collectCoverage
   // https://github.com/kulshekhar/ts-jest/issues/201#issuecomment-300572902
-  const compilerOptions = getTSConfig(
-    jestConfig.globals,
-    jestConfig.rootDir,
-    transformOptions.instrument,
-  );
+  const compilerOptions = getTSConfig(jestConfig.globals, jestConfig.rootDir);
 
   logOnce('final compilerOptions:', compilerOptions);
 
@@ -92,6 +87,9 @@ export function process(
   return modified;
 }
 
+/**
+ * This is the function Jest uses to check if it has the file already in cache
+ */
 export function getCacheKey(
   fileData: string,
   filePath: Path,
@@ -100,11 +98,7 @@ export function getCacheKey(
 ): string {
   const jestConfig: JestConfig = JSON.parse(jestConfigStr);
 
-  const tsConfig = getTSConfig(
-    jestConfig.globals,
-    jestConfig.rootDir,
-    transformOptions.instrument,
-  );
+  const tsConfig = getTSConfig(jestConfig.globals, jestConfig.rootDir);
 
   return crypto
     .createHash('md5')

src/test-utils.ts

@@ -2,8 +2,9 @@ import * as fs from 'fs';
 import { normalize } from 'jest-config';
 import * as setFromArgv from 'jest-config/build/set_from_argv';
 import * as path from 'path';
+import * as _ from 'lodash';
 
-function readRawConfig(argv, root) {
+function readRawConfig(argv: string, root: string) {
   const rawConfig = parseConfig(argv);
 
   if (typeof rawConfig === 'string') {
@@ -16,6 +17,7 @@ function readRawConfig(argv, root) {
     return normalize(config, argv);
   }
 
+  // Rawconfig is undefined
   const packageConfig = loadJestConfigFromPackage(
     path.join(root, 'package.json'),
     argv,
@@ -43,7 +45,7 @@ function loadJestConfigFromPackage(filePath, argv) {
 function parseConfig(argv) {
   if (argv.config && typeof argv.config === 'string') {
     // If the passed in value looks like JSON, treat it as an object.
-    if (argv.config[0] === '{' && argv.config[argv.config.length - 1] === '}') {
+    if (argv.config.startsWith('{') && argv.config.endsWith('}')) {
       return JSON.parse(argv.config);
     }
   }
@@ -58,7 +60,7 @@ function loadJestConfigFromFile(filePath, argv) {
   return normalize(config, argv);
 }
 
-export function getJestConfig(root) {
+export function getJestConfig(root: string) {
   const yargs = require('yargs');
   const argv = yargs(process.argv.slice(2)).argv;
   const rawConfig = readRawConfig(argv, root);

src/transpile-if-ts.ts

@@ -12,7 +12,6 @@ export function transpileIfTypescript(
       compilerOptions: getTSConfig(
         config || mockGlobalTSConfigSchema(global),
         rootDir,
-        true,
       ),
       fileName: path,
     });

src/utils.ts

@@ -3,10 +3,11 @@ import * as fs from 'fs';
 import * as fsExtra from 'fs-extra';
 import * as path from 'path';
 import * as tsc from 'typescript';
-import { JestConfig, TsJestConfig } from './jest-types';
+import { ConfigGlobals, JestConfig, TsJestConfig } from './jest-types';
 import { logOnce } from './logger';
+import * as _ from 'lodash';
 
-export function getTSJestConfig(globals: any): TsJestConfig {
+export function getTSJestConfig(globals: ConfigGlobals): TsJestConfig {
   return globals && globals['ts-jest'] ? globals['ts-jest'] : {};
 }
 
@@ -94,8 +95,7 @@ function getPathToClosestTSConfig(
   return getPathToClosestTSConfig(path.join(startDir, '..'), startDir);
 }
 
-// TODO: This can take something more specific than globals
-function getTSConfigPathFromConfig(globals: any): string {
+function getTSConfigPathFromConfig(globals: ConfigGlobals): string {
   const defaultTSConfigFile = getPathToClosestTSConfig();
   if (!globals) {
     return defaultTSConfigFile;
@@ -115,29 +115,18 @@ export function mockGlobalTSConfigSchema(globals: any) {
   return { 'ts-jest': { tsConfigFile: configPath } };
 }
 
-const tsConfigCache: { [key: string]: any } = {};
-// TODO: Perhaps rename collectCoverage to here, as it seems to be the official jest name now:
-// https://github.com/facebook/jest/issues/3524
-export function getTSConfig(
-  globals,
-  rootDir: string = '',
-  collectCoverage: boolean = false,
-) {
-  const configPath = getTSConfigPathFromConfig(globals);
-  logOnce(`Reading tsconfig file from path ${configPath}`);
-  const skipBabel = getTSJestConfig(globals).skipBabel;
-
+export const getTSConfig = _.memoize(getTSConfig_local, (globals, rootDir) => {
   // check cache before resolving configuration
   // NB: We use JSON.stringify() to create a consistent, unique signature. Although it lacks a uniform
   //     shape, this is simpler and faster than using the crypto package to generate a hash signature.
-  const tsConfigCacheKey = JSON.stringify([
-    skipBabel,
-    collectCoverage,
-    configPath,
-  ]);
-  if (tsConfigCacheKey in tsConfigCache) {
-    return tsConfigCache[tsConfigCacheKey];
-  }
+  return JSON.stringify(globals, rootDir);
+});
+
+// Non-memoized version of TSConfig
+function getTSConfig_local(globals, rootDir: string = '') {
+  const configPath = getTSConfigPathFromConfig(globals);
+  logOnce(`Reading tsconfig file from path ${configPath}`);
+  const skipBabel = getTSJestConfig(globals).skipBabel;
 
   const config = readCompilerOptions(configPath, rootDir);
   logOnce('Original typescript config before modifications: ', { ...config });
@@ -171,8 +160,6 @@ export function getTSConfig(
     config.module = tsc.ModuleKind.ES2015;
   }
 
-  // cache result for future requests
-  tsConfigCache[tsConfigCacheKey] = config;
   return config;
 }
 

yarn.lock

@@ -63,6 +63,10 @@
   version "22.2.3"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.3.tgz#0157c0316dc3722c43a7b71de3fdf3acbccef10d"
 
+"@types/lodash@^4.14.108":
+  version "4.14.108"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.108.tgz#02656af3add2e5b3174f830862c47421c00ef817"
+
 "@types/node@*":
   version "8.0.31"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.31.tgz#d9af61093cf4bfc9f066ca34de0175012cfb0ce9"
@@ -3128,6 +3132,10 @@ lodash@^4.14.0, lodash@^4.17.5:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
+lodash@^4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"