typescript 4.8.2 → 4.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/tsc.js +165 -137
- package/lib/tsserver.js +186 -152
- package/lib/tsserverlibrary.d.ts +0 -1
- package/lib/tsserverlibrary.js +185 -151
- package/lib/typescript.js +177 -143
- package/lib/typescriptServices.js +177 -143
- package/lib/typingsInstaller.js +176 -142
- package/package.json +1 -1
package/lib/tsc.js
CHANGED
|
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
69
69
|
var ts;
|
|
70
70
|
(function (ts) {
|
|
71
71
|
ts.versionMajorMinor = "4.8";
|
|
72
|
-
ts.version = "4.8.
|
|
72
|
+
ts.version = "4.8.4";
|
|
73
73
|
var NativeCollections;
|
|
74
74
|
(function (NativeCollections) {
|
|
75
75
|
var globals = typeof globalThis !== "undefined" ? globalThis :
|
|
@@ -6031,7 +6031,7 @@ var ts;
|
|
|
6031
6031
|
Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashno_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node` and then add 'node' to the types field in your tsconfig."),
|
|
6032
6032
|
Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slash_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @types/jquery` and then add 'jquery' to the types field in your tsconfig."),
|
|
6033
6033
|
Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_types_Slashjest_or_npm_i_save_dev_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_type_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i --save-dev @types/jest` or `npm i --save-dev @types/mocha` and then add 'jest' or 'mocha' to the types field in your tsconfig."),
|
|
6034
|
-
|
|
6034
|
+
This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag_2594", "This module is declared with 'export =', and can only be used with a default import when using the '{0}' flag."),
|
|
6035
6035
|
_0_can_only_be_imported_by_using_a_default_import: diag(2595, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_default_import_2595", "'{0}' can only be imported by using a default import."),
|
|
6036
6036
|
_0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import: diag(2596, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import_2596", "'{0}' can only be imported by turning on the 'esModuleInterop' flag and using a default import."),
|
|
6037
6037
|
_0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import: diag(2597, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import_2597", "'{0}' can only be imported by using a 'require' call or by using a default import."),
|
|
@@ -25457,6 +25457,7 @@ var ts;
|
|
|
25457
25457
|
case 335:
|
|
25458
25458
|
case 336:
|
|
25459
25459
|
case 331:
|
|
25460
|
+
case 337:
|
|
25460
25461
|
return visitNode(cbNode, node.tagName)
|
|
25461
25462
|
|| (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
|
|
25462
25463
|
case 350:
|
|
@@ -34938,7 +34939,7 @@ var ts;
|
|
|
34938
34939
|
function withPackageId(packageInfo, r) {
|
|
34939
34940
|
var packageId;
|
|
34940
34941
|
if (r && packageInfo) {
|
|
34941
|
-
var packageJsonContent = packageInfo.packageJsonContent;
|
|
34942
|
+
var packageJsonContent = packageInfo.contents.packageJsonContent;
|
|
34942
34943
|
if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
|
|
34943
34944
|
packageId = {
|
|
34944
34945
|
name: packageJsonContent.name,
|
|
@@ -36067,13 +36068,13 @@ var ts;
|
|
|
36067
36068
|
function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
|
|
36068
36069
|
if (considerPackageJson === void 0) { considerPackageJson = true; }
|
|
36069
36070
|
var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
|
|
36070
|
-
var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
|
|
36071
|
-
var versionPaths = packageInfo && packageInfo.versionPaths;
|
|
36071
|
+
var packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
|
|
36072
|
+
var versionPaths = packageInfo && packageInfo.contents.versionPaths;
|
|
36072
36073
|
return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
|
|
36073
36074
|
}
|
|
36074
36075
|
function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache, resolveJs) {
|
|
36075
|
-
if (!resolveJs && packageJsonInfo.resolvedEntrypoints !== undefined) {
|
|
36076
|
-
return packageJsonInfo.resolvedEntrypoints;
|
|
36076
|
+
if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== undefined) {
|
|
36077
|
+
return packageJsonInfo.contents.resolvedEntrypoints;
|
|
36077
36078
|
}
|
|
36078
36079
|
var entrypoints;
|
|
36079
36080
|
var extensions = resolveJs ? Extensions.JavaScript : Extensions.TypeScript;
|
|
@@ -36081,13 +36082,13 @@ var ts;
|
|
|
36081
36082
|
var requireState = getTemporaryModuleResolutionState(cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(), host, options);
|
|
36082
36083
|
requireState.conditions = ["node", "require", "types"];
|
|
36083
36084
|
requireState.requestContainingDirectory = packageJsonInfo.packageDirectory;
|
|
36084
|
-
var requireResolution = loadNodeModuleFromDirectoryWorker(extensions, packageJsonInfo.packageDirectory, false, requireState, packageJsonInfo.packageJsonContent, packageJsonInfo.versionPaths);
|
|
36085
|
+
var requireResolution = loadNodeModuleFromDirectoryWorker(extensions, packageJsonInfo.packageDirectory, false, requireState, packageJsonInfo.contents.packageJsonContent, packageJsonInfo.contents.versionPaths);
|
|
36085
36086
|
entrypoints = ts.append(entrypoints, requireResolution === null || requireResolution === void 0 ? void 0 : requireResolution.path);
|
|
36086
|
-
if (features & NodeResolutionFeatures.Exports && packageJsonInfo.packageJsonContent.exports) {
|
|
36087
|
+
if (features & NodeResolutionFeatures.Exports && packageJsonInfo.contents.packageJsonContent.exports) {
|
|
36087
36088
|
for (var _i = 0, _a = [["node", "import", "types"], ["node", "require", "types"]]; _i < _a.length; _i++) {
|
|
36088
36089
|
var conditions = _a[_i];
|
|
36089
36090
|
var exportState = __assign(__assign({}, requireState), { failedLookupLocations: [], conditions: conditions });
|
|
36090
|
-
var exportResolutions = loadEntrypointsFromExportMap(packageJsonInfo, packageJsonInfo.packageJsonContent.exports, exportState, extensions);
|
|
36091
|
+
var exportResolutions = loadEntrypointsFromExportMap(packageJsonInfo, packageJsonInfo.contents.packageJsonContent.exports, exportState, extensions);
|
|
36091
36092
|
if (exportResolutions) {
|
|
36092
36093
|
for (var _b = 0, exportResolutions_1 = exportResolutions; _b < exportResolutions_1.length; _b++) {
|
|
36093
36094
|
var resolution = exportResolutions_1[_b];
|
|
@@ -36096,7 +36097,7 @@ var ts;
|
|
|
36096
36097
|
}
|
|
36097
36098
|
}
|
|
36098
36099
|
}
|
|
36099
|
-
return packageJsonInfo.resolvedEntrypoints = entrypoints || false;
|
|
36100
|
+
return packageJsonInfo.contents.resolvedEntrypoints = entrypoints || false;
|
|
36100
36101
|
}
|
|
36101
36102
|
ts.getEntrypointsFromPackageJsonInfo = getEntrypointsFromPackageJsonInfo;
|
|
36102
36103
|
function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
|
|
@@ -36192,7 +36193,9 @@ var ts;
|
|
|
36192
36193
|
if (traceEnabled)
|
|
36193
36194
|
trace(host, ts.Diagnostics.File_0_exists_according_to_earlier_cached_lookups, packageJsonPath);
|
|
36194
36195
|
state.affectingLocations.push(packageJsonPath);
|
|
36195
|
-
return existing
|
|
36196
|
+
return existing.packageDirectory === packageDirectory ?
|
|
36197
|
+
existing :
|
|
36198
|
+
{ packageDirectory: packageDirectory, contents: existing.contents };
|
|
36196
36199
|
}
|
|
36197
36200
|
else {
|
|
36198
36201
|
if (existing && traceEnabled)
|
|
@@ -36208,7 +36211,7 @@ var ts;
|
|
|
36208
36211
|
trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
|
|
36209
36212
|
}
|
|
36210
36213
|
var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
|
|
36211
|
-
var result = { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths, resolvedEntrypoints: undefined };
|
|
36214
|
+
var result = { packageDirectory: packageDirectory, contents: { packageJsonContent: packageJsonContent, versionPaths: versionPaths, resolvedEntrypoints: undefined } };
|
|
36212
36215
|
(_b = state.packageJsonInfoCache) === null || _b === void 0 ? void 0 : _b.setPackageJsonInfo(packageJsonPath, result);
|
|
36213
36216
|
state.affectingLocations.push(packageJsonPath);
|
|
36214
36217
|
return result;
|
|
@@ -36320,17 +36323,16 @@ var ts;
|
|
|
36320
36323
|
}
|
|
36321
36324
|
function loadModuleFromSelfNameReference(extensions, moduleName, directory, state, cache, redirectedReference) {
|
|
36322
36325
|
var _a, _b;
|
|
36323
|
-
var
|
|
36324
|
-
var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
|
|
36326
|
+
var directoryPath = ts.getNormalizedAbsolutePath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
|
|
36325
36327
|
var scope = getPackageScopeForPath(directoryPath, state);
|
|
36326
|
-
if (!scope || !scope.packageJsonContent.exports) {
|
|
36328
|
+
if (!scope || !scope.contents.packageJsonContent.exports) {
|
|
36327
36329
|
return undefined;
|
|
36328
36330
|
}
|
|
36329
|
-
if (typeof scope.packageJsonContent.name !== "string") {
|
|
36331
|
+
if (typeof scope.contents.packageJsonContent.name !== "string") {
|
|
36330
36332
|
return undefined;
|
|
36331
36333
|
}
|
|
36332
36334
|
var parts = ts.getPathComponents(moduleName);
|
|
36333
|
-
var nameParts = ts.getPathComponents(scope.packageJsonContent.name);
|
|
36335
|
+
var nameParts = ts.getPathComponents(scope.contents.packageJsonContent.name);
|
|
36334
36336
|
if (!ts.every(nameParts, function (p, i) { return parts[i] === p; })) {
|
|
36335
36337
|
return undefined;
|
|
36336
36338
|
}
|
|
@@ -36338,30 +36340,30 @@ var ts;
|
|
|
36338
36340
|
return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
|
|
36339
36341
|
}
|
|
36340
36342
|
function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
|
|
36341
|
-
if (!scope.packageJsonContent.exports) {
|
|
36343
|
+
if (!scope.contents.packageJsonContent.exports) {
|
|
36342
36344
|
return undefined;
|
|
36343
36345
|
}
|
|
36344
36346
|
if (subpath === ".") {
|
|
36345
36347
|
var mainExport = void 0;
|
|
36346
|
-
if (typeof scope.packageJsonContent.exports === "string" || Array.isArray(scope.packageJsonContent.exports) || (typeof scope.packageJsonContent.exports === "object" && noKeyStartsWithDot(scope.packageJsonContent.exports))) {
|
|
36347
|
-
mainExport = scope.packageJsonContent.exports;
|
|
36348
|
+
if (typeof scope.contents.packageJsonContent.exports === "string" || Array.isArray(scope.contents.packageJsonContent.exports) || (typeof scope.contents.packageJsonContent.exports === "object" && noKeyStartsWithDot(scope.contents.packageJsonContent.exports))) {
|
|
36349
|
+
mainExport = scope.contents.packageJsonContent.exports;
|
|
36348
36350
|
}
|
|
36349
|
-
else if (ts.hasProperty(scope.packageJsonContent.exports, ".")) {
|
|
36350
|
-
mainExport = scope.packageJsonContent.exports["."];
|
|
36351
|
+
else if (ts.hasProperty(scope.contents.packageJsonContent.exports, ".")) {
|
|
36352
|
+
mainExport = scope.contents.packageJsonContent.exports["."];
|
|
36351
36353
|
}
|
|
36352
36354
|
if (mainExport) {
|
|
36353
36355
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, false);
|
|
36354
36356
|
return loadModuleFromTargetImportOrExport(mainExport, "", false);
|
|
36355
36357
|
}
|
|
36356
36358
|
}
|
|
36357
|
-
else if (allKeysStartWithDot(scope.packageJsonContent.exports)) {
|
|
36358
|
-
if (typeof scope.packageJsonContent.exports !== "object") {
|
|
36359
|
+
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
36360
|
+
if (typeof scope.contents.packageJsonContent.exports !== "object") {
|
|
36359
36361
|
if (state.traceEnabled) {
|
|
36360
36362
|
trace(state.host, ts.Diagnostics.Export_specifier_0_does_not_exist_in_package_json_scope_at_path_1, subpath, scope.packageDirectory);
|
|
36361
36363
|
}
|
|
36362
36364
|
return toSearchResult(undefined);
|
|
36363
36365
|
}
|
|
36364
|
-
var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, subpath, scope.packageJsonContent.exports, scope, false);
|
|
36366
|
+
var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, subpath, scope.contents.packageJsonContent.exports, scope, false);
|
|
36365
36367
|
if (result) {
|
|
36366
36368
|
return result;
|
|
36367
36369
|
}
|
|
@@ -36379,8 +36381,7 @@ var ts;
|
|
|
36379
36381
|
}
|
|
36380
36382
|
return toSearchResult(undefined);
|
|
36381
36383
|
}
|
|
36382
|
-
var
|
|
36383
|
-
var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
|
|
36384
|
+
var directoryPath = ts.getNormalizedAbsolutePath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
|
|
36384
36385
|
var scope = getPackageScopeForPath(directoryPath, state);
|
|
36385
36386
|
if (!scope) {
|
|
36386
36387
|
if (state.traceEnabled) {
|
|
@@ -36388,13 +36389,13 @@ var ts;
|
|
|
36388
36389
|
}
|
|
36389
36390
|
return toSearchResult(undefined);
|
|
36390
36391
|
}
|
|
36391
|
-
if (!scope.packageJsonContent.imports) {
|
|
36392
|
+
if (!scope.contents.packageJsonContent.imports) {
|
|
36392
36393
|
if (state.traceEnabled) {
|
|
36393
36394
|
trace(state.host, ts.Diagnostics.package_json_scope_0_has_no_imports_defined, scope.packageDirectory);
|
|
36394
36395
|
}
|
|
36395
36396
|
return toSearchResult(undefined);
|
|
36396
36397
|
}
|
|
36397
|
-
var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, scope.packageJsonContent.imports, scope, true);
|
|
36398
|
+
var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, scope.contents.packageJsonContent.imports, scope, true);
|
|
36398
36399
|
if (result) {
|
|
36399
36400
|
return result;
|
|
36400
36401
|
}
|
|
@@ -36545,7 +36546,7 @@ var ts;
|
|
|
36545
36546
|
var _a, _b;
|
|
36546
36547
|
if (path === undefined)
|
|
36547
36548
|
return path;
|
|
36548
|
-
return ts.
|
|
36549
|
+
return ts.getNormalizedAbsolutePath(path, (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
|
|
36549
36550
|
}
|
|
36550
36551
|
function combineDirectoryPath(root, dir) {
|
|
36551
36552
|
return ts.ensureTrailingDirectorySeparator(ts.combinePaths(root, dir));
|
|
@@ -36560,7 +36561,7 @@ var ts;
|
|
|
36560
36561
|
if ((extensions === Extensions.TypeScript || extensions === Extensions.JavaScript || extensions === Extensions.Json)
|
|
36561
36562
|
&& (state.compilerOptions.declarationDir || state.compilerOptions.outDir)
|
|
36562
36563
|
&& finalPath.indexOf("/node_modules/") === -1
|
|
36563
|
-
&& (state.compilerOptions.configFile ? ts.
|
|
36564
|
+
&& (state.compilerOptions.configFile ? ts.containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames()) : true)) {
|
|
36564
36565
|
var getCanonicalFileName = ts.hostGetCanonicalFileName({ useCaseSensitiveFileNames: useCaseSensitiveFileNames });
|
|
36565
36566
|
var commonSourceDirGuesses = [];
|
|
36566
36567
|
if (state.compilerOptions.rootDir || (state.compilerOptions.composite && state.compilerOptions.configFilePath)) {
|
|
@@ -36590,7 +36591,7 @@ var ts;
|
|
|
36590
36591
|
var candidateDirectories = getOutputDirectoriesForBaseDirectory(commonSourceDirGuess);
|
|
36591
36592
|
for (var _e = 0, candidateDirectories_1 = candidateDirectories; _e < candidateDirectories_1.length; _e++) {
|
|
36592
36593
|
var candidateDir = candidateDirectories_1[_e];
|
|
36593
|
-
if (ts.
|
|
36594
|
+
if (ts.containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames())) {
|
|
36594
36595
|
var pathFragment = finalPath.slice(candidateDir.length + 1);
|
|
36595
36596
|
var possibleInputBase = ts.combinePaths(commonSourceDirGuess, pathFragment);
|
|
36596
36597
|
var jsAndDtsExtensions = [".mjs", ".cjs", ".js", ".json", ".d.mts", ".d.cts", ".d.ts"];
|
|
@@ -36691,20 +36692,20 @@ var ts;
|
|
|
36691
36692
|
if (fromFile) {
|
|
36692
36693
|
return noPackageId(fromFile);
|
|
36693
36694
|
}
|
|
36694
|
-
var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
|
|
36695
|
+
var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.contents.packageJsonContent, packageInfo.contents.versionPaths);
|
|
36695
36696
|
return withPackageId(packageInfo, fromDirectory);
|
|
36696
36697
|
}
|
|
36697
36698
|
}
|
|
36698
36699
|
var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
|
|
36699
36700
|
var loader = function (extensions, candidate, onlyRecordFailures, state) {
|
|
36700
36701
|
var _a;
|
|
36701
|
-
if (packageInfo && packageInfo.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
|
|
36702
|
+
if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
|
|
36702
36703
|
return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
|
|
36703
36704
|
}
|
|
36704
36705
|
var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
|
|
36705
|
-
loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
|
|
36706
|
+
loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
|
|
36706
36707
|
if (!pathAndExtension && packageInfo
|
|
36707
|
-
&& (packageInfo.packageJsonContent.exports === undefined || packageInfo.packageJsonContent.exports === null)
|
|
36708
|
+
&& (packageInfo.contents.packageJsonContent.exports === undefined || packageInfo.contents.packageJsonContent.exports === null)
|
|
36708
36709
|
&& state.features & NodeResolutionFeatures.EsmMode) {
|
|
36709
36710
|
pathAndExtension = loadModuleFromFile(extensions, ts.combinePaths(candidate, "index.js"), onlyRecordFailures, state);
|
|
36710
36711
|
}
|
|
@@ -36713,12 +36714,12 @@ var ts;
|
|
|
36713
36714
|
if (rest !== "") {
|
|
36714
36715
|
var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
|
|
36715
36716
|
packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
|
|
36716
|
-
if (packageInfo && packageInfo.versionPaths) {
|
|
36717
|
+
if (packageInfo && packageInfo.contents.versionPaths) {
|
|
36717
36718
|
if (state.traceEnabled) {
|
|
36718
|
-
trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
|
|
36719
|
+
trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
|
|
36719
36720
|
}
|
|
36720
36721
|
var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
|
|
36721
|
-
var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, undefined, loader, !packageDirectoryExists, state);
|
|
36722
|
+
var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, undefined, loader, !packageDirectoryExists, state);
|
|
36722
36723
|
if (fromPaths) {
|
|
36723
36724
|
return fromPaths.value;
|
|
36724
36725
|
}
|
|
@@ -40287,6 +40288,7 @@ var ts;
|
|
|
40287
40288
|
var wildcardType = createIntrinsicType(1, "any");
|
|
40288
40289
|
var errorType = createIntrinsicType(1, "error");
|
|
40289
40290
|
var unresolvedType = createIntrinsicType(1, "unresolved");
|
|
40291
|
+
var nonInferrableAnyType = createIntrinsicType(1, "any", 65536);
|
|
40290
40292
|
var intrinsicMarkerType = createIntrinsicType(1, "intrinsic");
|
|
40291
40293
|
var unknownType = createIntrinsicType(2, "unknown");
|
|
40292
40294
|
var nonNullUnknownType = createIntrinsicType(2, "unknown");
|
|
@@ -41875,40 +41877,60 @@ var ts;
|
|
|
41875
41877
|
return typeof file.externalModuleIndicator !== "object" && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), undefined, dontResolveAlias);
|
|
41876
41878
|
}
|
|
41877
41879
|
function getTargetOfImportClause(node, dontResolveAlias) {
|
|
41878
|
-
var _a;
|
|
41879
41880
|
var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
|
|
41880
41881
|
if (moduleSymbol) {
|
|
41881
|
-
|
|
41882
|
-
|
|
41883
|
-
|
|
41884
|
-
|
|
41885
|
-
|
|
41886
|
-
|
|
41887
|
-
|
|
41888
|
-
|
|
41889
|
-
|
|
41890
|
-
|
|
41891
|
-
|
|
41892
|
-
|
|
41893
|
-
|
|
41894
|
-
|
|
41895
|
-
|
|
41896
|
-
|
|
41897
|
-
|
|
41898
|
-
|
|
41899
|
-
|
|
41900
|
-
|
|
41901
|
-
|
|
41902
|
-
|
|
41882
|
+
return getTargetofModuleDefault(moduleSymbol, node, dontResolveAlias);
|
|
41883
|
+
}
|
|
41884
|
+
}
|
|
41885
|
+
function getTargetofModuleDefault(moduleSymbol, node, dontResolveAlias) {
|
|
41886
|
+
var _a;
|
|
41887
|
+
var exportDefaultSymbol;
|
|
41888
|
+
if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
|
|
41889
|
+
exportDefaultSymbol = moduleSymbol;
|
|
41890
|
+
}
|
|
41891
|
+
else {
|
|
41892
|
+
exportDefaultSymbol = resolveExportByName(moduleSymbol, "default", node, dontResolveAlias);
|
|
41893
|
+
}
|
|
41894
|
+
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
|
|
41895
|
+
var specifier = getModuleSpecifierForImportOrExport(node);
|
|
41896
|
+
if (!specifier) {
|
|
41897
|
+
return exportDefaultSymbol;
|
|
41898
|
+
}
|
|
41899
|
+
var hasDefaultOnly = isOnlyImportedAsDefault(specifier);
|
|
41900
|
+
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
|
|
41901
|
+
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
|
|
41902
|
+
if (hasExportAssignmentSymbol(moduleSymbol)) {
|
|
41903
|
+
var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
|
|
41904
|
+
var exportEqualsSymbol = moduleSymbol.exports.get("export=");
|
|
41905
|
+
var exportAssignment = exportEqualsSymbol.valueDeclaration;
|
|
41906
|
+
var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
|
|
41907
|
+
if (exportAssignment) {
|
|
41908
|
+
ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
|
|
41903
41909
|
}
|
|
41904
41910
|
}
|
|
41905
|
-
else if (
|
|
41906
|
-
|
|
41907
|
-
markSymbolOfAliasDeclarationIfTypeOnly(node, moduleSymbol, resolved, false);
|
|
41908
|
-
return resolved;
|
|
41911
|
+
else if (ts.isImportClause(node)) {
|
|
41912
|
+
reportNonDefaultExport(moduleSymbol, node);
|
|
41909
41913
|
}
|
|
41910
|
-
|
|
41911
|
-
|
|
41914
|
+
else {
|
|
41915
|
+
errorNoModuleMemberSymbol(moduleSymbol, moduleSymbol, node, ts.isImportOrExportSpecifier(node) && node.propertyName || node.name);
|
|
41916
|
+
}
|
|
41917
|
+
}
|
|
41918
|
+
else if (hasSyntheticDefault || hasDefaultOnly) {
|
|
41919
|
+
var resolved = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
|
|
41920
|
+
markSymbolOfAliasDeclarationIfTypeOnly(node, moduleSymbol, resolved, false);
|
|
41921
|
+
return resolved;
|
|
41922
|
+
}
|
|
41923
|
+
markSymbolOfAliasDeclarationIfTypeOnly(node, exportDefaultSymbol, undefined, false);
|
|
41924
|
+
return exportDefaultSymbol;
|
|
41925
|
+
}
|
|
41926
|
+
function getModuleSpecifierForImportOrExport(node) {
|
|
41927
|
+
switch (node.kind) {
|
|
41928
|
+
case 267: return node.parent.moduleSpecifier;
|
|
41929
|
+
case 265: return ts.isExternalModuleReference(node.moduleReference) ? node.moduleReference.expression : undefined;
|
|
41930
|
+
case 268: return node.parent.parent.moduleSpecifier;
|
|
41931
|
+
case 270: return node.parent.parent.parent.moduleSpecifier;
|
|
41932
|
+
case 275: return node.parent.parent.moduleSpecifier;
|
|
41933
|
+
default: return ts.Debug.assertNever(node);
|
|
41912
41934
|
}
|
|
41913
41935
|
}
|
|
41914
41936
|
function reportNonDefaultExport(moduleSymbol, node) {
|
|
@@ -41980,7 +42002,7 @@ var ts;
|
|
|
41980
42002
|
}
|
|
41981
42003
|
}
|
|
41982
42004
|
function getExternalModuleMember(node, specifier, dontResolveAlias) {
|
|
41983
|
-
var _a
|
|
42005
|
+
var _a;
|
|
41984
42006
|
if (dontResolveAlias === void 0) { dontResolveAlias = false; }
|
|
41985
42007
|
var moduleSpecifier = ts.getExternalModuleRequireArgument(node) || node.moduleSpecifier;
|
|
41986
42008
|
var moduleSymbol = resolveExternalModuleName(node, moduleSpecifier);
|
|
@@ -42014,29 +42036,33 @@ var ts;
|
|
|
42014
42036
|
combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
|
|
42015
42037
|
symbolFromModule || symbolFromVariable;
|
|
42016
42038
|
if (!symbol) {
|
|
42017
|
-
|
|
42018
|
-
var declarationName = ts.declarationNameToString(name);
|
|
42019
|
-
var suggestion = getSuggestedSymbolForNonexistentModule(name, targetSymbol);
|
|
42020
|
-
if (suggestion !== undefined) {
|
|
42021
|
-
var suggestionName = symbolToString(suggestion);
|
|
42022
|
-
var diagnostic = error(name, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
|
|
42023
|
-
if (suggestion.valueDeclaration) {
|
|
42024
|
-
ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
|
|
42025
|
-
}
|
|
42026
|
-
}
|
|
42027
|
-
else {
|
|
42028
|
-
if ((_b = moduleSymbol.exports) === null || _b === void 0 ? void 0 : _b.has("default")) {
|
|
42029
|
-
error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_to_use_import_1_from_0_instead, moduleName, declarationName);
|
|
42030
|
-
}
|
|
42031
|
-
else {
|
|
42032
|
-
reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName);
|
|
42033
|
-
}
|
|
42034
|
-
}
|
|
42039
|
+
errorNoModuleMemberSymbol(moduleSymbol, targetSymbol, node, name);
|
|
42035
42040
|
}
|
|
42036
42041
|
return symbol;
|
|
42037
42042
|
}
|
|
42038
42043
|
}
|
|
42039
42044
|
}
|
|
42045
|
+
function errorNoModuleMemberSymbol(moduleSymbol, targetSymbol, node, name) {
|
|
42046
|
+
var _a;
|
|
42047
|
+
var moduleName = getFullyQualifiedName(moduleSymbol, node);
|
|
42048
|
+
var declarationName = ts.declarationNameToString(name);
|
|
42049
|
+
var suggestion = getSuggestedSymbolForNonexistentModule(name, targetSymbol);
|
|
42050
|
+
if (suggestion !== undefined) {
|
|
42051
|
+
var suggestionName = symbolToString(suggestion);
|
|
42052
|
+
var diagnostic = error(name, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
|
|
42053
|
+
if (suggestion.valueDeclaration) {
|
|
42054
|
+
ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
|
|
42055
|
+
}
|
|
42056
|
+
}
|
|
42057
|
+
else {
|
|
42058
|
+
if ((_a = moduleSymbol.exports) === null || _a === void 0 ? void 0 : _a.has("default")) {
|
|
42059
|
+
error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_to_use_import_1_from_0_instead, moduleName, declarationName);
|
|
42060
|
+
}
|
|
42061
|
+
else {
|
|
42062
|
+
reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName);
|
|
42063
|
+
}
|
|
42064
|
+
}
|
|
42065
|
+
}
|
|
42040
42066
|
function reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName) {
|
|
42041
42067
|
var _a, _b;
|
|
42042
42068
|
var localSymbol = (_b = (_a = moduleSymbol.valueDeclaration) === null || _a === void 0 ? void 0 : _a.locals) === null || _b === void 0 ? void 0 : _b.get(name.escapedText);
|
|
@@ -42082,6 +42108,13 @@ var ts;
|
|
|
42082
42108
|
}
|
|
42083
42109
|
}
|
|
42084
42110
|
function getTargetOfImportSpecifier(node, dontResolveAlias) {
|
|
42111
|
+
if (ts.isImportSpecifier(node) && ts.idText(node.propertyName || node.name) === "default") {
|
|
42112
|
+
var specifier = getModuleSpecifierForImportOrExport(node);
|
|
42113
|
+
var moduleSymbol = specifier && resolveExternalModuleName(node, specifier);
|
|
42114
|
+
if (moduleSymbol) {
|
|
42115
|
+
return getTargetofModuleDefault(moduleSymbol, node, dontResolveAlias);
|
|
42116
|
+
}
|
|
42117
|
+
}
|
|
42085
42118
|
var root = ts.isBindingElement(node) ? ts.getRootDeclaration(node) : node.parent.parent.parent;
|
|
42086
42119
|
var commonJSPropertyAccess = getCommonJSPropertyAccess(root);
|
|
42087
42120
|
var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
|
|
@@ -42103,6 +42136,13 @@ var ts;
|
|
|
42103
42136
|
return resolved;
|
|
42104
42137
|
}
|
|
42105
42138
|
function getTargetOfExportSpecifier(node, meaning, dontResolveAlias) {
|
|
42139
|
+
if (ts.idText(node.propertyName || node.name) === "default") {
|
|
42140
|
+
var specifier = getModuleSpecifierForImportOrExport(node);
|
|
42141
|
+
var moduleSymbol = specifier && resolveExternalModuleName(node, specifier);
|
|
42142
|
+
if (moduleSymbol) {
|
|
42143
|
+
return getTargetofModuleDefault(moduleSymbol, node, !!dontResolveAlias);
|
|
42144
|
+
}
|
|
42145
|
+
}
|
|
42106
42146
|
var resolved = node.parent.parent.moduleSpecifier ?
|
|
42107
42147
|
getExternalModuleMember(node.parent.parent, node, dontResolveAlias) :
|
|
42108
42148
|
resolveEntityName(node.propertyName || node.name, meaning, false, dontResolveAlias);
|
|
@@ -42507,7 +42547,7 @@ var ts;
|
|
|
42507
42547
|
if (ext === ".ts" || ext === ".js" || ext === ".tsx" || ext === ".jsx") {
|
|
42508
42548
|
var scope = currentSourceFile.packageJsonScope;
|
|
42509
42549
|
var targetExt = ext === ".ts" ? ".mts" : ext === ".js" ? ".mjs" : undefined;
|
|
42510
|
-
if (scope && !scope.packageJsonContent.type) {
|
|
42550
|
+
if (scope && !scope.contents.packageJsonContent.type) {
|
|
42511
42551
|
if (targetExt) {
|
|
42512
42552
|
diagnosticDetails = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1, targetExt, ts.combinePaths(scope.packageDirectory, "package.json"));
|
|
42513
42553
|
}
|
|
@@ -44521,19 +44561,14 @@ var ts;
|
|
|
44521
44561
|
context.approximateLength += ts.symbolName(parameterSymbol).length + 3;
|
|
44522
44562
|
return parameterNode;
|
|
44523
44563
|
function cloneBindingName(node) {
|
|
44524
|
-
return
|
|
44525
|
-
function
|
|
44564
|
+
return elideInitializerAndSetEmitFlags(node);
|
|
44565
|
+
function elideInitializerAndSetEmitFlags(node) {
|
|
44526
44566
|
if (context.tracker.trackSymbol && ts.isComputedPropertyName(node) && isLateBindableName(node)) {
|
|
44527
44567
|
trackComputedName(node.expression, context.enclosingDeclaration, context);
|
|
44528
44568
|
}
|
|
44529
|
-
var visited = ts.visitEachChild(node,
|
|
44569
|
+
var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, undefined, elideInitializerAndSetEmitFlags);
|
|
44530
44570
|
if (ts.isBindingElement(visited)) {
|
|
44531
|
-
|
|
44532
|
-
visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, undefined, visited.propertyName, undefined);
|
|
44533
|
-
}
|
|
44534
|
-
else {
|
|
44535
|
-
visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, undefined);
|
|
44536
|
-
}
|
|
44571
|
+
visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, undefined);
|
|
44537
44572
|
}
|
|
44538
44573
|
if (!ts.nodeIsSynthesized(visited)) {
|
|
44539
44574
|
visited = ts.factory.cloneNode(visited);
|
|
@@ -47075,7 +47110,7 @@ var ts;
|
|
|
47075
47110
|
if (reportErrors && !declarationBelongsToPrivateAmbientMember(element)) {
|
|
47076
47111
|
reportImplicitAny(element, anyType);
|
|
47077
47112
|
}
|
|
47078
|
-
return anyType;
|
|
47113
|
+
return includePatternInType ? nonInferrableAnyType : anyType;
|
|
47079
47114
|
}
|
|
47080
47115
|
function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
|
|
47081
47116
|
var members = ts.createSymbolTable();
|
|
@@ -48903,6 +48938,10 @@ var ts;
|
|
|
48903
48938
|
return mapType(type, getLowerBoundOfKeyType);
|
|
48904
48939
|
}
|
|
48905
48940
|
if (type.flags & 2097152) {
|
|
48941
|
+
var types = type.types;
|
|
48942
|
+
if (types.length === 2 && !!(types[0].flags & (4 | 8 | 64)) && types[1] === emptyTypeLiteralType) {
|
|
48943
|
+
return type;
|
|
48944
|
+
}
|
|
48906
48945
|
return getIntersectionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
|
|
48907
48946
|
}
|
|
48908
48947
|
return type;
|
|
@@ -51674,7 +51713,7 @@ var ts;
|
|
|
51674
51713
|
return includes & 8388608 ? wildcardType : anyType;
|
|
51675
51714
|
}
|
|
51676
51715
|
if (!strictNullChecks && includes & 98304) {
|
|
51677
|
-
return includes & 32768 ? undefinedType : nullType;
|
|
51716
|
+
return includes & 16777216 ? neverType : includes & 32768 ? undefinedType : nullType;
|
|
51678
51717
|
}
|
|
51679
51718
|
if (includes & 4 && includes & (128 | 134217728 | 268435456) ||
|
|
51680
51719
|
includes & 8 && includes & 256 ||
|
|
@@ -52309,7 +52348,7 @@ var ts;
|
|
|
52309
52348
|
type;
|
|
52310
52349
|
}
|
|
52311
52350
|
function distributeIndexOverObjectType(objectType, indexType, writing) {
|
|
52312
|
-
if (objectType.flags &
|
|
52351
|
+
if (objectType.flags & 1048576 || objectType.flags & 2097152 && !shouldDeferIndexType(objectType)) {
|
|
52313
52352
|
var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
|
|
52314
52353
|
return objectType.flags & 2097152 || writing ? getIntersectionType(types) : getUnionType(types);
|
|
52315
52354
|
}
|
|
@@ -54448,7 +54487,7 @@ var ts;
|
|
|
54448
54487
|
if (reduced !== type) {
|
|
54449
54488
|
return reduced;
|
|
54450
54489
|
}
|
|
54451
|
-
if (type.flags & 2097152) {
|
|
54490
|
+
if (type.flags & 2097152 && ts.some(type.types, isEmptyAnonymousObjectType)) {
|
|
54452
54491
|
var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
|
|
54453
54492
|
if (normalizedTypes !== type.types) {
|
|
54454
54493
|
return getIntersectionType(normalizedTypes);
|
|
@@ -55432,7 +55471,7 @@ var ts;
|
|
|
55432
55471
|
if (reportErrors && originalErrorInfo) {
|
|
55433
55472
|
resetErrorInfo(saveErrorInfo);
|
|
55434
55473
|
}
|
|
55435
|
-
if (result = isRelatedTo(source, constraint, 2, reportErrors)) {
|
|
55474
|
+
if (result = isRelatedTo(source, constraint, 2, reportErrors, undefined, intersectionState)) {
|
|
55436
55475
|
return result;
|
|
55437
55476
|
}
|
|
55438
55477
|
if (reportErrors && originalErrorInfo && errorInfo) {
|
|
@@ -55495,8 +55534,8 @@ var ts;
|
|
|
55495
55534
|
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
|
|
55496
55535
|
var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
|
|
55497
55536
|
var skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
|
|
55498
|
-
if (result = skipTrue ? -1 : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2, false)) {
|
|
55499
|
-
result &= skipFalse ? -1 : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2, false);
|
|
55537
|
+
if (result = skipTrue ? -1 : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2, false, undefined, intersectionState)) {
|
|
55538
|
+
result &= skipFalse ? -1 : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2, false, undefined, intersectionState);
|
|
55500
55539
|
if (result) {
|
|
55501
55540
|
return result;
|
|
55502
55541
|
}
|
|
@@ -57775,7 +57814,7 @@ var ts;
|
|
|
57775
57814
|
}
|
|
57776
57815
|
var inference = getInferenceInfoForType(target);
|
|
57777
57816
|
if (inference) {
|
|
57778
|
-
if (ts.getObjectFlags(source) & 262144) {
|
|
57817
|
+
if (ts.getObjectFlags(source) & 262144 || source === nonInferrableAnyType) {
|
|
57779
57818
|
return;
|
|
57780
57819
|
}
|
|
57781
57820
|
if (!inference.isFixed) {
|
|
@@ -59855,7 +59894,7 @@ var ts;
|
|
|
59855
59894
|
var narrowedPropType = narrowType(propType);
|
|
59856
59895
|
return filterType(type, function (t) {
|
|
59857
59896
|
var discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
|
|
59858
|
-
return !(narrowedPropType.flags & 131072) &&
|
|
59897
|
+
return !(narrowedPropType.flags & 131072) && areTypesComparable(narrowedPropType, discriminantType);
|
|
59859
59898
|
});
|
|
59860
59899
|
}
|
|
59861
59900
|
function narrowTypeByDiscriminantProperty(type, access, operator, value, assumeTrue) {
|
|
@@ -59904,7 +59943,7 @@ var ts;
|
|
|
59904
59943
|
}
|
|
59905
59944
|
function narrowByInKeyword(type, name, assumeTrue) {
|
|
59906
59945
|
if (type.flags & 1048576
|
|
59907
|
-
|| type.flags & 524288 && declaredType !== type
|
|
59946
|
+
|| type.flags & 524288 && declaredType !== type && !(declaredType === unknownType && isEmptyAnonymousObjectType(type))
|
|
59908
59947
|
|| ts.isThisTypeParameter(type)
|
|
59909
59948
|
|| type.flags & 2097152 && ts.every(type.types, function (t) { return t.symbol !== globalThisSymbol; })) {
|
|
59910
59949
|
return filterType(type, function (t) { return isTypePresencePossible(t, name, assumeTrue); });
|
|
@@ -60024,14 +60063,18 @@ var ts;
|
|
|
60024
60063
|
assumeTrue = !assumeTrue;
|
|
60025
60064
|
}
|
|
60026
60065
|
var valueType = getTypeOfExpression(value);
|
|
60027
|
-
if ((type.flags & 2)
|
|
60066
|
+
if (((type.flags & 2) || isEmptyAnonymousObjectType(type) && !(valueType.flags & 98304)) &&
|
|
60067
|
+
assumeTrue &&
|
|
60068
|
+
(operator === 36 || operator === 37)) {
|
|
60028
60069
|
if (valueType.flags & (131068 | 67108864)) {
|
|
60029
60070
|
return valueType;
|
|
60030
60071
|
}
|
|
60031
60072
|
if (valueType.flags & 524288) {
|
|
60032
60073
|
return nonPrimitiveType;
|
|
60033
60074
|
}
|
|
60034
|
-
|
|
60075
|
+
if (type.flags & 2) {
|
|
60076
|
+
return type;
|
|
60077
|
+
}
|
|
60035
60078
|
}
|
|
60036
60079
|
if (valueType.flags & 98304) {
|
|
60037
60080
|
if (!strictNullChecks) {
|
|
@@ -60426,7 +60469,9 @@ var ts;
|
|
|
60426
60469
|
!!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
|
|
60427
60470
|
}
|
|
60428
60471
|
function isGenericTypeWithoutNullableConstraint(type) {
|
|
60429
|
-
return
|
|
60472
|
+
return type.flags & 2097152 ?
|
|
60473
|
+
ts.some(type.types, isGenericTypeWithoutNullableConstraint) :
|
|
60474
|
+
!!(type.flags & 465829888 && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304));
|
|
60430
60475
|
}
|
|
60431
60476
|
function hasContextualTypeWithNoGenericTypes(node, checkMode) {
|
|
60432
60477
|
var contextualType = (ts.isIdentifier(node) || ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)) &&
|
|
@@ -68310,7 +68355,7 @@ var ts;
|
|
|
68310
68355
|
checkDecorators(node);
|
|
68311
68356
|
}
|
|
68312
68357
|
function getEffectiveTypeArgumentAtIndex(node, typeParameters, index) {
|
|
68313
|
-
if (index <
|
|
68358
|
+
if (node.typeArguments && index < node.typeArguments.length) {
|
|
68314
68359
|
return getTypeFromTypeNode(node.typeArguments[index]);
|
|
68315
68360
|
}
|
|
68316
68361
|
return getEffectiveTypeArguments(node, typeParameters)[index];
|
|
@@ -75957,7 +76002,7 @@ var ts;
|
|
|
75957
76002
|
return grammarErrorOnNode(node, ts.Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
|
|
75958
76003
|
}
|
|
75959
76004
|
var nodeArguments = node.arguments;
|
|
75960
|
-
if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext) {
|
|
76005
|
+
if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext && moduleKind !== ts.ModuleKind.Node16) {
|
|
75961
76006
|
checkGrammarForDisallowedTrailingComma(nodeArguments);
|
|
75962
76007
|
if (nodeArguments.length > 1) {
|
|
75963
76008
|
var assertionArgument = nodeArguments[1];
|
|
@@ -97427,7 +97472,7 @@ var ts;
|
|
|
97427
97472
|
state.failedLookupLocations = packageJsonLocations;
|
|
97428
97473
|
state.affectingLocations = packageJsonLocations;
|
|
97429
97474
|
var packageJsonScope = ts.getPackageScopeForPath(fileName, state);
|
|
97430
|
-
var impliedNodeFormat = (packageJsonScope === null || packageJsonScope === void 0 ? void 0 : packageJsonScope.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
|
|
97475
|
+
var impliedNodeFormat = (packageJsonScope === null || packageJsonScope === void 0 ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
|
|
97431
97476
|
return { impliedNodeFormat: impliedNodeFormat, packageJsonLocations: packageJsonLocations, packageJsonScope: packageJsonScope };
|
|
97432
97477
|
}
|
|
97433
97478
|
}
|
|
@@ -98922,7 +98967,7 @@ var ts;
|
|
|
98922
98967
|
return result;
|
|
98923
98968
|
}
|
|
98924
98969
|
function getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options) {
|
|
98925
|
-
var result = getImpliedNodeFormatForFileWorker(
|
|
98970
|
+
var result = getImpliedNodeFormatForFileWorker(ts.getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
|
|
98926
98971
|
var languageVersion = ts.getEmitScriptTarget(options);
|
|
98927
98972
|
var setExternalModuleIndicator = ts.getSetExternalModuleIndicator(options);
|
|
98928
98973
|
return typeof result === "object" ? __assign(__assign({}, result), { languageVersion: languageVersion, setExternalModuleIndicator: setExternalModuleIndicator }) :
|
|
@@ -102932,7 +102977,7 @@ var ts;
|
|
|
102932
102977
|
var maybeBlockedByTypesVersions = false;
|
|
102933
102978
|
var cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) === null || _a === void 0 ? void 0 : _a.call(host)) === null || _b === void 0 ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
|
|
102934
102979
|
if (typeof cachedPackageJson === "object" || cachedPackageJson === undefined && host.fileExists(packageJsonPath)) {
|
|
102935
|
-
var packageJsonContent = (cachedPackageJson === null || cachedPackageJson === void 0 ? void 0 : cachedPackageJson.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
|
|
102980
|
+
var packageJsonContent = (cachedPackageJson === null || cachedPackageJson === void 0 ? void 0 : cachedPackageJson.contents.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
|
|
102936
102981
|
var importMode = overrideMode || importingSourceFile.impliedNodeFormat;
|
|
102937
102982
|
if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node16 || ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext) {
|
|
102938
102983
|
var conditions = ["node", importMode === ts.ModuleKind.ESNext ? "import" : "require", "types"];
|
|
@@ -103264,7 +103309,7 @@ var ts;
|
|
|
103264
103309
|
break;
|
|
103265
103310
|
case ts.ModuleKind.CommonJS:
|
|
103266
103311
|
if (file.packageJsonScope) {
|
|
103267
|
-
(result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(undefined, file.packageJsonScope.packageJsonContent.type ?
|
|
103312
|
+
(result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(undefined, file.packageJsonScope.contents.packageJsonContent.type ?
|
|
103268
103313
|
ts.Diagnostics.File_is_CommonJS_module_because_0_has_field_type_whose_value_is_not_module :
|
|
103269
103314
|
ts.Diagnostics.File_is_CommonJS_module_because_0_does_not_have_field_type, toFileName(ts.last(file.packageJsonLocations), fileNameConvertor)));
|
|
103270
103315
|
}
|
|
@@ -105437,9 +105482,7 @@ var ts;
|
|
|
105437
105482
|
}
|
|
105438
105483
|
}
|
|
105439
105484
|
}
|
|
105440
|
-
var seenRefs = buildInfoPath ? new ts.Set() : undefined;
|
|
105441
105485
|
var buildInfoCacheEntry = state.buildInfoCache.get(resolvedPath);
|
|
105442
|
-
seenRefs === null || seenRefs === void 0 ? void 0 : seenRefs.add(resolvedPath);
|
|
105443
105486
|
var pseudoUpToDate = false;
|
|
105444
105487
|
var usesPrepend = false;
|
|
105445
105488
|
var upstreamChangedProject;
|
|
@@ -105450,7 +105493,7 @@ var ts;
|
|
|
105450
105493
|
if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
|
|
105451
105494
|
continue;
|
|
105452
105495
|
}
|
|
105453
|
-
if (buildInfoCacheEntry && hasSameBuildInfo(state, buildInfoCacheEntry,
|
|
105496
|
+
if (buildInfoCacheEntry && hasSameBuildInfo(state, buildInfoCacheEntry, resolvedRefPath)) {
|
|
105454
105497
|
return {
|
|
105455
105498
|
type: ts.UpToDateStatusType.OutOfDateWithUpstream,
|
|
105456
105499
|
outOfDateOutputFileName: buildInfoPath,
|
|
@@ -105501,24 +105544,9 @@ var ts;
|
|
|
105501
105544
|
oldestOutputFileName: oldestOutputFileName
|
|
105502
105545
|
};
|
|
105503
105546
|
}
|
|
105504
|
-
function hasSameBuildInfo(state, buildInfoCacheEntry,
|
|
105505
|
-
if (seenRefs.has(resolvedRefPath))
|
|
105506
|
-
return false;
|
|
105507
|
-
seenRefs.add(resolvedRefPath);
|
|
105547
|
+
function hasSameBuildInfo(state, buildInfoCacheEntry, resolvedRefPath) {
|
|
105508
105548
|
var refBuildInfo = state.buildInfoCache.get(resolvedRefPath);
|
|
105509
|
-
|
|
105510
|
-
return true;
|
|
105511
|
-
if (resolvedConfig.projectReferences) {
|
|
105512
|
-
for (var _i = 0, _a = resolvedConfig.projectReferences; _i < _a.length; _i++) {
|
|
105513
|
-
var ref = _a[_i];
|
|
105514
|
-
var resolvedRef = ts.resolveProjectReferencePath(ref);
|
|
105515
|
-
var resolvedRefPath_1 = toResolvedConfigFilePath(state, resolvedRef);
|
|
105516
|
-
var resolvedConfig_1 = parseConfigFile(state, resolvedRef, resolvedRefPath_1);
|
|
105517
|
-
if (hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig_1, resolvedRefPath_1))
|
|
105518
|
-
return true;
|
|
105519
|
-
}
|
|
105520
|
-
}
|
|
105521
|
-
return false;
|
|
105549
|
+
return refBuildInfo.path === buildInfoCacheEntry.path;
|
|
105522
105550
|
}
|
|
105523
105551
|
function getUpToDateStatus(state, project, resolvedPath) {
|
|
105524
105552
|
if (project === undefined) {
|