Skip to content

Commit 7c63658

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into buildWatchCaching
2 parents 5940eb8 + 49d6f61 commit 7c63658

File tree

207 files changed

+5395
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+5395
-819
lines changed

‎src/compiler/checker.ts

Lines changed: 355 additions & 107 deletions
Large diffs are not rendered by default.

‎src/compiler/commandLineParser.ts

Lines changed: 76 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ namespace ts {
4545
["es2018.promise", "lib.es2018.promise.d.ts"],
4646
["es2018.regexp", "lib.es2018.regexp.d.ts"],
4747
["es2019.array", "lib.es2019.array.d.ts"],
48+
["es2019.object", "lib.es2019.object.d.ts"],
4849
["es2019.string", "lib.es2019.string.d.ts"],
4950
["es2019.symbol", "lib.es2019.symbol.d.ts"],
5051
["es2020.string", "lib.es2020.string.d.ts"],
@@ -218,6 +219,7 @@ namespace ts {
218219
}),
219220
affectsSourceFile: true,
220221
affectsModuleResolution: true,
222+
affectsEmit: true,
221223
paramType: Diagnostics.VERSION,
222224
showInSimplifiedHelpView: true,
223225
category: Diagnostics.Basic_Options,
@@ -1345,7 +1347,12 @@ namespace ts {
13451347
/**
13461348
* Reads the config file, reports errors if any and exits if the config file cannot be found
13471349
*/
1348-
export function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost): ParsedCommandLine | undefined {
1350+
export function getParsedCommandLineOfConfigFile(
1351+
configFileName: string,
1352+
optionsToExtend: CompilerOptions,
1353+
host: ParseConfigFileHost,
1354+
extendedConfigCache?: Map<ExtendedConfigCacheEntry>
1355+
): ParsedCommandLine | undefined {
13491356
let configFileText: string | undefined;
13501357
try {
13511358
configFileText = host.readFile(configFileName);
@@ -1366,7 +1373,16 @@ namespace ts {
13661373
result.path = toPath(configFileName, cwd, createGetCanonicalFileName(host.useCaseSensitiveFileNames));
13671374
result.resolvedPath = result.path;
13681375
result.originalFileName = result.fileName;
1369-
return parseJsonSourceFileConfigFileContent(result, host, getNormalizedAbsolutePath(getDirectoryPath(configFileName), cwd), optionsToExtend, getNormalizedAbsolutePath(configFileName, cwd));
1376+
return parseJsonSourceFileConfigFileContent(
1377+
result,
1378+
host,
1379+
getNormalizedAbsolutePath(getDirectoryPath(configFileName), cwd),
1380+
optionsToExtend,
1381+
getNormalizedAbsolutePath(configFileName, cwd),
1382+
/*resolutionStack*/ undefined,
1383+
/*extraFileExtension*/ undefined,
1384+
extendedConfigCache
1385+
);
13701386
}
13711387

13721388
/**
@@ -1980,8 +1996,8 @@ namespace ts {
19801996
* @param basePath A root directory to resolve relative path entries in the config
19811997
* file to. e.g. outDir
19821998
*/
1983-
export function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine {
1984-
return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
1999+
export function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, /*@internal*/ extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine {
2000+
return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
19852001
}
19862002

19872003
/*@internal*/
@@ -2020,11 +2036,12 @@ namespace ts {
20202036
configFileName?: string,
20212037
resolutionStack: Path[] = [],
20222038
extraFileExtensions: ReadonlyArray<FileExtensionInfo> = [],
2039+
extendedConfigCache?: Map<ExtendedConfigCacheEntry>
20232040
): ParsedCommandLine {
20242041
Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
20252042
const errors: Diagnostic[] = [];
20262043

2027-
const parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
2044+
const parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
20282045
const { raw } = parsedConfig;
20292046
const options = extend(existingOptions, parsedConfig.options || {});
20302047
options.configFilePath = configFileName && normalizeSlashes(configFileName);
@@ -2172,7 +2189,7 @@ namespace ts {
21722189
return existingErrors !== configParseDiagnostics.length;
21732190
}
21742191

2175-
interface ParsedTsconfig {
2192+
export interface ParsedTsconfig {
21762193
raw: any;
21772194
options?: CompilerOptions;
21782195
typeAcquisition?: TypeAcquisition;
@@ -2191,13 +2208,14 @@ namespace ts {
21912208
* It does *not* resolve the included files.
21922209
*/
21932210
function parseConfig(
2194-
json: any,
2195-
sourceFile: TsConfigSourceFile | undefined,
2196-
host: ParseConfigHost,
2197-
basePath: string,
2198-
configFileName: string | undefined,
2199-
resolutionStack: string[],
2200-
errors: Push<Diagnostic>,
2211+
json: any,
2212+
sourceFile: TsConfigSourceFile | undefined,
2213+
host: ParseConfigHost,
2214+
basePath: string,
2215+
configFileName: string | undefined,
2216+
resolutionStack: string[],
2217+
errors: Push<Diagnostic>,
2218+
extendedConfigCache?: Map<ExtendedConfigCacheEntry>
22012219
): ParsedTsconfig {
22022220
basePath = normalizeSlashes(basePath);
22032221
const resolvedPath = getNormalizedAbsolutePath(configFileName || "", basePath);
@@ -2214,7 +2232,7 @@ namespace ts {
22142232
if (ownConfig.extendedConfigPath) {
22152233
// copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
22162234
resolutionStack = resolutionStack.concat([resolvedPath]);
2217-
const extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
2235+
const extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
22182236
if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
22192237
const baseRaw = extendedConfig.raw;
22202238
const raw = ownConfig.raw;
@@ -2358,47 +2376,65 @@ namespace ts {
23582376
return undefined;
23592377
}
23602378

2379+
export interface ExtendedConfigCacheEntry {
2380+
extendedResult: TsConfigSourceFile;
2381+
extendedConfig: ParsedTsconfig | undefined;
2382+
}
2383+
23612384
function getExtendedConfig(
23622385
sourceFile: TsConfigSourceFile | undefined,
23632386
extendedConfigPath: string,
23642387
host: ParseConfigHost,
23652388
basePath: string,
23662389
resolutionStack: string[],
23672390
errors: Push<Diagnostic>,
2391+
extendedConfigCache?: Map<ExtendedConfigCacheEntry>
23682392
): ParsedTsconfig | undefined {
2369-
const extendedResult = readJsonConfigFile(extendedConfigPath, path => host.readFile(path));
2393+
const path = host.useCaseSensitiveFileNames ? extendedConfigPath : toLowerCase(extendedConfigPath);
2394+
let value: ExtendedConfigCacheEntry | undefined;
2395+
let extendedResult: TsConfigSourceFile;
2396+
let extendedConfig: ParsedTsconfig | undefined;
2397+
if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
2398+
({ extendedResult, extendedConfig } = value);
2399+
}
2400+
else {
2401+
extendedResult = readJsonConfigFile(extendedConfigPath, path => host.readFile(path));
2402+
if (!extendedResult.parseDiagnostics.length) {
2403+
const extendedDirname = getDirectoryPath(extendedConfigPath);
2404+
extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname,
2405+
getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
2406+
2407+
if (isSuccessfulParsedTsconfig(extendedConfig)) {
2408+
// Update the paths to reflect base path
2409+
const relativeDifference = convertToRelativePath(extendedDirname, basePath, identity);
2410+
const updatePath = (path: string) => isRootedDiskPath(path) ? path : combinePaths(relativeDifference, path);
2411+
const mapPropertiesInRawIfNotUndefined = (propertyName: string) => {
2412+
if (raw[propertyName]) {
2413+
raw[propertyName] = map(raw[propertyName], updatePath);
2414+
}
2415+
};
2416+
2417+
const { raw } = extendedConfig;
2418+
mapPropertiesInRawIfNotUndefined("include");
2419+
mapPropertiesInRawIfNotUndefined("exclude");
2420+
mapPropertiesInRawIfNotUndefined("files");
2421+
}
2422+
}
2423+
if (extendedConfigCache) {
2424+
extendedConfigCache.set(path, { extendedResult, extendedConfig });
2425+
}
2426+
}
23702427
if (sourceFile) {
23712428
sourceFile.extendedSourceFiles = [extendedResult.fileName];
2429+
if (extendedResult.extendedSourceFiles) {
2430+
sourceFile.extendedSourceFiles.push(...extendedResult.extendedSourceFiles);
2431+
}
23722432
}
23732433
if (extendedResult.parseDiagnostics.length) {
23742434
errors.push(...extendedResult.parseDiagnostics);
23752435
return undefined;
23762436
}
2377-
2378-
const extendedDirname = getDirectoryPath(extendedConfigPath);
2379-
const extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname,
2380-
getBaseFileName(extendedConfigPath), resolutionStack, errors);
2381-
if (sourceFile && extendedResult.extendedSourceFiles) {
2382-
sourceFile.extendedSourceFiles!.push(...extendedResult.extendedSourceFiles);
2383-
}
2384-
2385-
if (isSuccessfulParsedTsconfig(extendedConfig)) {
2386-
// Update the paths to reflect base path
2387-
const relativeDifference = convertToRelativePath(extendedDirname, basePath, identity);
2388-
const updatePath = (path: string) => isRootedDiskPath(path) ? path : combinePaths(relativeDifference, path);
2389-
const mapPropertiesInRawIfNotUndefined = (propertyName: string) => {
2390-
if (raw[propertyName]) {
2391-
raw[propertyName] = map(raw[propertyName], updatePath);
2392-
}
2393-
};
2394-
2395-
const { raw } = extendedConfig;
2396-
mapPropertiesInRawIfNotUndefined("include");
2397-
mapPropertiesInRawIfNotUndefined("exclude");
2398-
mapPropertiesInRawIfNotUndefined("files");
2399-
}
2400-
2401-
return extendedConfig;
2437+
return extendedConfig!;
24022438
}
24032439

24042440
function convertCompileOnSaveOptionFromJson(jsonOption: any, basePath: string, errors: Push<Diagnostic>): boolean {

‎src/compiler/core.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,4 +2284,29 @@ namespace ts {
22842284
}
22852285
return result;
22862286
}
2287+
2288+
export function cartesianProduct<T>(arrays: readonly T[][]) {
2289+
const result: T[][] = [];
2290+
cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
2291+
return result;
2292+
}
2293+
2294+
function cartesianProductWorker<T>(arrays: readonly (readonly T[])[], result: (readonly T[])[], outer: readonly T[] | undefined, index: number) {
2295+
for (const element of arrays[index]) {
2296+
let inner: T[];
2297+
if (outer) {
2298+
inner = outer.slice();
2299+
inner.push(element);
2300+
}
2301+
else {
2302+
inner = [element];
2303+
}
2304+
if (index === arrays.length - 1) {
2305+
result.push(inner);
2306+
}
2307+
else {
2308+
cartesianProductWorker(arrays, result, inner, index + 1);
2309+
}
2310+
}
2311+
}
22872312
}

‎src/compiler/diagnosticMessages.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3096,6 +3096,10 @@
30963096
"category": "Error",
30973097
"code": 5074
30983098
},
3099+
"'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.": {
3100+
"category": "Error",
3101+
"code": 5075
3102+
},
30993103

31003104
"Generates a sourcemap for each corresponding '.d.ts' file.": {
31013105
"category": "Message",
@@ -4272,7 +4276,10 @@
42724276
"category": "Error",
42734277
"code": 7051
42744278
},
4275-
4279+
"Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?": {
4280+
"category": "Error",
4281+
"code": 7052
4282+
},
42764283
"You cannot rename this element.": {
42774284
"category": "Error",
42784285
"code": 8000

‎src/compiler/factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2189,7 +2189,7 @@ namespace ts {
21892189
}
21902190

21912191
/* @internal */
2192-
export function createJSDocTypeTag(typeExpression?: JSDocTypeExpression, comment?: string): JSDocTypeTag {
2192+
export function createJSDocTypeTag(typeExpression: JSDocTypeExpression, comment?: string): JSDocTypeTag {
21932193
const tag = createJSDocTag<JSDocTypeTag>(SyntaxKind.JSDocTypeTag, "type");
21942194
tag.typeExpression = typeExpression;
21952195
tag.comment = comment;

‎src/compiler/parser.ts

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6855,7 +6855,7 @@ namespace ts {
68556855
}
68566856

68576857
function parseReturnTag(start: number, tagName: Identifier): JSDocReturnTag {
6858-
if (forEach(tags, t => t.kind === SyntaxKind.JSDocReturnTag)) {
6858+
if (some(tags, isJSDocReturnTag)) {
68596859
parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
68606860
}
68616861

@@ -6866,7 +6866,7 @@ namespace ts {
68666866
}
68676867

68686868
function parseTypeTag(start: number, tagName: Identifier): JSDocTypeTag {
6869-
if (forEach(tags, t => t.kind === SyntaxKind.JSDocTypeTag)) {
6869+
if (some(tags, isJSDocTypeTag)) {
68706870
parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
68716871
}
68726872

@@ -7782,24 +7782,9 @@ namespace ts {
77827782

77837783
/*@internal*/
77847784
export function processCommentPragmas(context: PragmaContext, sourceText: string): void {
7785-
const triviaScanner = createScanner(context.languageVersion, /*skipTrivia*/ false, LanguageVariant.Standard, sourceText);
77867785
const pragmas: PragmaPseudoMapEntry[] = [];
77877786

7788-
// Keep scanning all the leading trivia in the file until we get to something that
7789-
// isn't trivia. Any single line comment will be analyzed to see if it is a
7790-
// reference comment.
7791-
while (true) {
7792-
const kind = triviaScanner.scan();
7793-
if (!isTrivia(kind)) {
7794-
break;
7795-
}
7796-
7797-
const range = {
7798-
kind: <SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia>triviaScanner.getToken(),
7799-
pos: triviaScanner.getTokenPos(),
7800-
end: triviaScanner.getTextPos(),
7801-
};
7802-
7787+
for (const range of getLeadingCommentRanges(sourceText, 0) || emptyArray) {
78037788
const comment = sourceText.substring(range.pos, range.end);
78047789
extractPragmas(pragmas, range, comment);
78057790
}

‎src/compiler/program.ts

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,18 +2678,32 @@ namespace ts {
26782678
return fromCache || undefined;
26792679
}
26802680

2681-
// An absolute path pointing to the containing directory of the config file
2682-
const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), host.getCurrentDirectory());
2683-
const sourceFile = host.getSourceFile(refPath, ScriptTarget.JSON) as JsonSourceFile | undefined;
2684-
addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
2685-
if (sourceFile === undefined) {
2686-
projectReferenceRedirects.set(sourceFilePath, false);
2687-
return undefined;
2681+
let commandLine: ParsedCommandLine | undefined;
2682+
let sourceFile: JsonSourceFile | undefined;
2683+
if (host.getParsedCommandLine) {
2684+
commandLine = host.getParsedCommandLine(refPath);
2685+
if (!commandLine) {
2686+
addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
2687+
projectReferenceRedirects.set(sourceFilePath, false);
2688+
return undefined;
2689+
}
2690+
sourceFile = Debug.assertDefined(commandLine.options.configFile);
2691+
addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
2692+
}
2693+
else {
2694+
// An absolute path pointing to the containing directory of the config file
2695+
const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), host.getCurrentDirectory());
2696+
sourceFile = host.getSourceFile(refPath, ScriptTarget.JSON) as JsonSourceFile | undefined;
2697+
addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
2698+
if (sourceFile === undefined) {
2699+
projectReferenceRedirects.set(sourceFilePath, false);
2700+
return undefined;
2701+
}
2702+
sourceFile.path = sourceFilePath;
2703+
sourceFile.resolvedPath = sourceFilePath;
2704+
sourceFile.originalFileName = refPath;
2705+
commandLine = parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
26882706
}
2689-
sourceFile.path = sourceFilePath;
2690-
sourceFile.resolvedPath = sourceFilePath;
2691-
sourceFile.originalFileName = refPath;
2692-
const commandLine = parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
26932707
const resolvedRef: ResolvedProjectReference = { commandLine, sourceFile };
26942708
projectReferenceRedirects.set(sourceFilePath, resolvedRef);
26952709
if (commandLine.projectReferences) {

‎src/compiler/tsbuild.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ namespace ts {
399399
let projectCompilerOptions = baseCompilerOptions;
400400
const compilerHost = createCompilerHostFromProgramHost(host, () => projectCompilerOptions);
401401
setGetSourceFileAsHashVersioned(compilerHost, host);
402+
compilerHost.getParsedCommandLine = parseConfigFile;
402403

403404
compilerHost.resolveModuleNames = maybeBind(host, host.resolveModuleNames);
404405
compilerHost.resolveTypeReferenceDirectives = maybeBind(host, host.resolveTypeReferenceDirectives);
@@ -415,6 +416,7 @@ namespace ts {
415416
} | undefined;
416417

417418
const buildInfoChecked = createFileMap<true>(toPath);
419+
const extendedConfigCache = createMap<ExtendedConfigCacheEntry>();
418420

419421
// Watch state
420422
const builderPrograms = createFileMap<T>(toPath);
@@ -491,7 +493,7 @@ namespace ts {
491493

492494
let diagnostic: Diagnostic | undefined;
493495
parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = d => diagnostic = d;
494-
const parsed = getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
496+
const parsed = getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
495497
parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = noop;
496498
configFileCache.setValue(configFilePath, parsed || diagnostic!);
497499
return parsed;
@@ -1439,6 +1441,7 @@ namespace ts {
14391441
compilerHost.getSourceFile = cacheState.originalGetSourceFile;
14401442
readFileWithCache = cacheState.originalReadFileWithCache;
14411443
compilerHost.resolveModuleNames = cacheState.originalResolveModuleNames;
1444+
extendedConfigCache.clear();
14421445
if (moduleResolutionCache) {
14431446
moduleResolutionCache.directoryToModuleNameMap.clear();
14441447
moduleResolutionCache.moduleNameToDirectoryMap.clear();

0 commit comments

Comments
 (0)