microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-29 16:29:19 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

builderPrograms as ConfigFileMap

Browse Source
This commit is contained in:
Sheetal Nandi
2019-04-18 17:56:50 -07:00
parent fd6773f944
commit 11b21fbba6
1 changed files with 8 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/compiler/tsbuild.ts
View File

@@ -356,7 +356,7 @@ namespace ts {
const buildInfoChecked = createMap() as ConfigFileMap<true>;
// Watch state
const builderPrograms = createFileMap<T>();
const builderPrograms = createMap() as ConfigFileMap<T>;
const diagnostics = createMap() as ConfigFileMap<ReadonlyArray<Diagnostic>>;
const projectPendingBuild = createMap() as ConfigFileMap<ConfigFileProgramReloadLevel>;
const projectErrorsReported = createMap() as ConfigFileMap<true>;
@@ -396,57 +396,6 @@ namespace ts {
return resolvedPath;
}
// TODO remove this and use normal map so we arent transforming paths constantly
function createFileMap<T>(): {
setValue(fileName: ResolvedConfigFileName, value: T): void;
getValue(fileName: ResolvedConfigFileName): T | undefined;
hasKey(fileName: ResolvedConfigFileName): boolean;
removeKey(fileName: ResolvedConfigFileName): void;
forEach(action: (value: T, key: ResolvedConfigFilePath) => void): void;
getSize(): number;
clear(): void;
} {
const lookup = createMap<T>();
return {
setValue,
getValue,
removeKey,
forEach,
hasKey,
getSize,
clear
};
function forEach(action: (value: T, key: ResolvedConfigFilePath) => void) {
lookup.forEach(action);
}
function hasKey(fileName: ResolvedConfigFileName) {
return lookup.has(toResolvedConfigFilePath(fileName));
}
function removeKey(fileName: ResolvedConfigFileName) {
lookup.delete(toResolvedConfigFilePath(fileName));
}
function setValue(fileName: ResolvedConfigFileName, value: T) {
lookup.set(toResolvedConfigFilePath(fileName), value);
}
function getValue(fileName: ResolvedConfigFileName): T | undefined {
return lookup.get(toResolvedConfigFilePath(fileName));
}
function getSize() {
return lookup.size;
}
function clear() {
lookup.clear();
}
}
function resetBuildContext(opts = defaultOptions) {
options = opts;
baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
@@ -1116,7 +1065,7 @@ namespace ts {
configFile.fileNames,
configFile.options,
compilerHost,
getOldProgram(proj, configFile),
getOldProgram(resolvedPath, configFile),
configFile.errors,
configFile.projectReferences
);
@@ -1194,7 +1143,7 @@ namespace ts {
};
diagnostics.delete(resolvedPath);
projectStatus.set(resolvedPath, status);
afterProgramCreate(proj, program);
afterProgramCreate(resolvedPath, program);
projectCompilerOptions = baseCompilerOptions;
return resultFlags;
@@ -1204,7 +1153,7 @@ namespace ts {
// List files if any other build error using program (emit errors already report files)
if (writeFileName) listFiles(program, writeFileName);
projectStatus.set(resolvedPath, { type: UpToDateStatusType.Unbuildable, reason: `${errorType} errors` });
afterProgramCreate(proj, program);
afterProgramCreate(resolvedPath, program);
projectCompilerOptions = baseCompilerOptions;
return resultFlags;
}
@@ -1216,19 +1165,19 @@ namespace ts {
}
}
function afterProgramCreate(proj: ResolvedConfigFileName, program: T) {
function afterProgramCreate(proj: ResolvedConfigFilePath, program: T) {
if (host.afterProgramEmitAndDiagnostics) {
host.afterProgramEmitAndDiagnostics(program);
}
if (options.watch) {
program.releaseProgram();
builderPrograms.setValue(proj, program);
builderPrograms.set(proj, program);
}
}
function getOldProgram(proj: ResolvedConfigFileName, parsed: ParsedCommandLine) {
function getOldProgram(proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) {
if (options.force) return undefined;
const value = builderPrograms.getValue(proj);
const value = builderPrograms.get(proj);
if (value) return value;
return readBuilderProgram(parsed.options, readFileWithCache) as any as T;
}