-
Notifications
You must be signed in to change notification settings - Fork 455
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf(compiler): don’t write compile output to file system but rely on…
… jest cache (#1561)
- Loading branch information
Showing
10 changed files
with
68 additions
and
249 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,10 @@ | ||
| /** | ||
| * This code is heavily inspired from | ||
| * https://github.com/JsCommunity/make-error/blob/v1.3.4/index.js | ||
| * ...but more modified than expected :-D | ||
| * Below is the original license anyway: | ||
| * | ||
| * --- | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2014 Blake Embrey ([email protected]) | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| import { Logger } from 'bs-logger' | ||
| import { readFileSync, writeFileSync } from 'fs' | ||
| import { readFileSync } from 'fs' | ||
| import mkdirp = require('mkdirp') | ||
| import { basename, extname, join } from 'path' | ||
| import { basename, extname } from 'path' | ||
|
|
||
| import { ConfigSet } from '../config/config-set' | ||
| import { CompileFn, CompilerInstance, MemoryCache, TSFile, TsCompiler } from '../types' | ||
| import { sha1 } from '../util/sha1' | ||
| import { CompileFn, CompilerInstance, MemoryCache, TsCompiler } from '../types' | ||
|
|
||
| import { getResolvedModulesCache } from './compiler-utils' | ||
| import { initializeLanguageServiceInstance } from './language-service' | ||
|
|
@@ -72,74 +40,27 @@ const updateSourceMap = (sourceMapText: string, normalizedFileName: string): str | |
| return JSON.stringify(sourceMap) | ||
| } | ||
|
|
||
| /** | ||
| * Get the file name for the cache entry. | ||
| */ | ||
| const getCacheName = (sourceCode: string, normalizedFileName: string): string => { | ||
| return sha1(normalizedFileName, '\x00', sourceCode) | ||
| } | ||
|
|
||
| /** | ||
| * Ensure the given cached content is valid by sniffing for a base64 encoded '}' | ||
| * at the end of the content, which should exist if there is a valid sourceMap present. | ||
| */ | ||
| const isValidCacheContent = (contents: string): boolean => { | ||
| return /(?:9|0=|Q==)$/.test(contents.slice(-3)) | ||
| } | ||
|
|
||
| /** | ||
| * Compile files which are provided by jest via transform config and cache the result in file system if users run with | ||
| * cache mode | ||
| */ | ||
| const compileAndCacheResult = ( | ||
| cacheDir: string | undefined, | ||
| memoryCache: MemoryCache, | ||
| compileFn: CompileFn, | ||
| getExtension: (fileName: string) => string, | ||
| logger: Logger, | ||
| ) => { | ||
| return (code: string, fileName: string, lineOffset?: number) => { | ||
| function getCompileOutput(): string { | ||
| const [value, sourceMap] = compileFn(code, fileName, lineOffset) | ||
| const output = updateOutput(value, fileName, sourceMap, getExtension) | ||
| memoryCache.files.set(fileName, { | ||
| ...memoryCache.files.get(fileName)!, | ||
| output, | ||
| }) | ||
| logger.debug({ fileName }, 'compileAndCacheResult(): get compile output') | ||
|
|
||
| return output | ||
| const [value, sourceMap] = compileFn(code, fileName, lineOffset) | ||
| const output = updateOutput(value, fileName, sourceMap, getExtension) | ||
| memoryCache.files[fileName] = { | ||
| ...memoryCache.files[fileName], | ||
| output, | ||
| } | ||
| if (!cacheDir) { | ||
| logger.debug({ fileName }, 'compileAndCacheResult(): no cache') | ||
|
|
||
| return getCompileOutput() | ||
| } else { | ||
| const cachePath = join(cacheDir, getCacheName(code, fileName)) | ||
| const extension = getExtension(fileName) | ||
| const outputPath = `${cachePath}${extension}` | ||
| try { | ||
| const output = readFileSync(outputPath, 'utf8') | ||
| if (isValidCacheContent(output)) { | ||
| logger.debug({ fileName }, 'compileAndCacheResult(): cache hit') | ||
| memoryCache.files.set(fileName, { | ||
| ...memoryCache.files.get(fileName)!, | ||
| output, | ||
| }) | ||
|
|
||
| return output | ||
| } | ||
| } catch (err) {} | ||
|
|
||
| logger.debug({ fileName }, 'compileAndCacheResult(): cache miss') | ||
|
|
||
| const output = getCompileOutput() | ||
|
|
||
| logger.debug({ fileName, outputPath }, 'compileAndCacheResult(): writing caches') | ||
|
|
||
| writeFileSync(outputPath, output) | ||
|
|
||
| return output | ||
| } | ||
| return output | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -157,8 +78,8 @@ export const createCompilerInstance = (configs: ConfigSet): TsCompiler => { | |
| const ts = configs.compilerModule // Require the TypeScript compiler and configuration. | ||
| const extensions = ['.ts', '.tsx'] | ||
| const memoryCache: MemoryCache = { | ||
| files: Object.create(null), | ||
| resolvedModules: Object.create(null), | ||
| files: new Map<string, TSFile>(), | ||
| } | ||
| // Enable `allowJs` when flag is set. | ||
| if (compilerOptions.allowJs) { | ||
|
|
@@ -169,16 +90,16 @@ export const createCompilerInstance = (configs: ConfigSet): TsCompiler => { | |
| // Make sure the cache directory exists before continuing. | ||
| mkdirp.sync(cacheDir) | ||
| try { | ||
| const resolvedModulesCache = readFileSync(getResolvedModulesCache(cacheDir), 'utf-8') | ||
| const fsMemoryCache = readFileSync(getResolvedModulesCache(cacheDir), 'utf-8') | ||
| /* istanbul ignore next (covered by e2e) */ | ||
| memoryCache.resolvedModules = JSON.parse(resolvedModulesCache) | ||
| memoryCache.resolvedModules = JSON.parse(fsMemoryCache) | ||
| } catch (e) {} | ||
| } | ||
| /* istanbul ignore next (we leave this for e2e) */ | ||
| configs.jest.setupFiles.concat(configs.jest.setupFilesAfterEnv).forEach(setupFile => { | ||
| memoryCache.files.set(setupFile, { | ||
| memoryCache.files[setupFile] = { | ||
| version: 0, | ||
| }) | ||
| } | ||
| }) | ||
| /** | ||
| * Get the extension for a transpiled file. | ||
|
|
@@ -194,7 +115,7 @@ export const createCompilerInstance = (configs: ConfigSet): TsCompiler => { | |
| } else { | ||
| compilerInstance = initializeTranspilerInstance(configs, memoryCache, logger) | ||
| } | ||
| const compile = compileAndCacheResult(cacheDir, memoryCache, compilerInstance.compileFn, getExtension, logger) | ||
| const compile = compileAndCacheResult(memoryCache, compilerInstance.compileFn, getExtension, logger) | ||
|
|
||
| return { cwd: configs.cwd, compile, program: compilerInstance.program } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.