typescript 4.8.3 → 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 +55 -54
- package/lib/tsserver.js +67 -59
- package/lib/tsserverlibrary.js +67 -59
- package/lib/typescript.js +66 -58
- package/lib/typescriptServices.js +66 -58
- package/lib/typingsInstaller.js +65 -57
- 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 :
|
|
@@ -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
|
}
|
|
@@ -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");
|
|
@@ -42545,7 +42547,7 @@ var ts;
|
|
|
42545
42547
|
if (ext === ".ts" || ext === ".js" || ext === ".tsx" || ext === ".jsx") {
|
|
42546
42548
|
var scope = currentSourceFile.packageJsonScope;
|
|
42547
42549
|
var targetExt = ext === ".ts" ? ".mts" : ext === ".js" ? ".mjs" : undefined;
|
|
42548
|
-
if (scope && !scope.packageJsonContent.type) {
|
|
42550
|
+
if (scope && !scope.contents.packageJsonContent.type) {
|
|
42549
42551
|
if (targetExt) {
|
|
42550
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"));
|
|
42551
42553
|
}
|
|
@@ -44559,19 +44561,14 @@ var ts;
|
|
|
44559
44561
|
context.approximateLength += ts.symbolName(parameterSymbol).length + 3;
|
|
44560
44562
|
return parameterNode;
|
|
44561
44563
|
function cloneBindingName(node) {
|
|
44562
|
-
return
|
|
44563
|
-
function
|
|
44564
|
+
return elideInitializerAndSetEmitFlags(node);
|
|
44565
|
+
function elideInitializerAndSetEmitFlags(node) {
|
|
44564
44566
|
if (context.tracker.trackSymbol && ts.isComputedPropertyName(node) && isLateBindableName(node)) {
|
|
44565
44567
|
trackComputedName(node.expression, context.enclosingDeclaration, context);
|
|
44566
44568
|
}
|
|
44567
|
-
var visited = ts.visitEachChild(node,
|
|
44569
|
+
var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, undefined, elideInitializerAndSetEmitFlags);
|
|
44568
44570
|
if (ts.isBindingElement(visited)) {
|
|
44569
|
-
|
|
44570
|
-
visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, undefined, visited.propertyName, undefined);
|
|
44571
|
-
}
|
|
44572
|
-
else {
|
|
44573
|
-
visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, undefined);
|
|
44574
|
-
}
|
|
44571
|
+
visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, undefined);
|
|
44575
44572
|
}
|
|
44576
44573
|
if (!ts.nodeIsSynthesized(visited)) {
|
|
44577
44574
|
visited = ts.factory.cloneNode(visited);
|
|
@@ -47113,7 +47110,7 @@ var ts;
|
|
|
47113
47110
|
if (reportErrors && !declarationBelongsToPrivateAmbientMember(element)) {
|
|
47114
47111
|
reportImplicitAny(element, anyType);
|
|
47115
47112
|
}
|
|
47116
|
-
return anyType;
|
|
47113
|
+
return includePatternInType ? nonInferrableAnyType : anyType;
|
|
47117
47114
|
}
|
|
47118
47115
|
function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
|
|
47119
47116
|
var members = ts.createSymbolTable();
|
|
@@ -48941,6 +48938,10 @@ var ts;
|
|
|
48941
48938
|
return mapType(type, getLowerBoundOfKeyType);
|
|
48942
48939
|
}
|
|
48943
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
|
+
}
|
|
48944
48945
|
return getIntersectionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
|
|
48945
48946
|
}
|
|
48946
48947
|
return type;
|
|
@@ -57813,7 +57814,7 @@ var ts;
|
|
|
57813
57814
|
}
|
|
57814
57815
|
var inference = getInferenceInfoForType(target);
|
|
57815
57816
|
if (inference) {
|
|
57816
|
-
if (ts.getObjectFlags(source) & 262144) {
|
|
57817
|
+
if (ts.getObjectFlags(source) & 262144 || source === nonInferrableAnyType) {
|
|
57817
57818
|
return;
|
|
57818
57819
|
}
|
|
57819
57820
|
if (!inference.isFixed) {
|
|
@@ -68354,7 +68355,7 @@ var ts;
|
|
|
68354
68355
|
checkDecorators(node);
|
|
68355
68356
|
}
|
|
68356
68357
|
function getEffectiveTypeArgumentAtIndex(node, typeParameters, index) {
|
|
68357
|
-
if (index <
|
|
68358
|
+
if (node.typeArguments && index < node.typeArguments.length) {
|
|
68358
68359
|
return getTypeFromTypeNode(node.typeArguments[index]);
|
|
68359
68360
|
}
|
|
68360
68361
|
return getEffectiveTypeArguments(node, typeParameters)[index];
|
|
@@ -76001,7 +76002,7 @@ var ts;
|
|
|
76001
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);
|
|
76002
76003
|
}
|
|
76003
76004
|
var nodeArguments = node.arguments;
|
|
76004
|
-
if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext) {
|
|
76005
|
+
if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext && moduleKind !== ts.ModuleKind.Node16) {
|
|
76005
76006
|
checkGrammarForDisallowedTrailingComma(nodeArguments);
|
|
76006
76007
|
if (nodeArguments.length > 1) {
|
|
76007
76008
|
var assertionArgument = nodeArguments[1];
|
|
@@ -97471,7 +97472,7 @@ var ts;
|
|
|
97471
97472
|
state.failedLookupLocations = packageJsonLocations;
|
|
97472
97473
|
state.affectingLocations = packageJsonLocations;
|
|
97473
97474
|
var packageJsonScope = ts.getPackageScopeForPath(fileName, state);
|
|
97474
|
-
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;
|
|
97475
97476
|
return { impliedNodeFormat: impliedNodeFormat, packageJsonLocations: packageJsonLocations, packageJsonScope: packageJsonScope };
|
|
97476
97477
|
}
|
|
97477
97478
|
}
|
|
@@ -98966,7 +98967,7 @@ var ts;
|
|
|
98966
98967
|
return result;
|
|
98967
98968
|
}
|
|
98968
98969
|
function getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options) {
|
|
98969
|
-
var result = getImpliedNodeFormatForFileWorker(
|
|
98970
|
+
var result = getImpliedNodeFormatForFileWorker(ts.getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
|
|
98970
98971
|
var languageVersion = ts.getEmitScriptTarget(options);
|
|
98971
98972
|
var setExternalModuleIndicator = ts.getSetExternalModuleIndicator(options);
|
|
98972
98973
|
return typeof result === "object" ? __assign(__assign({}, result), { languageVersion: languageVersion, setExternalModuleIndicator: setExternalModuleIndicator }) :
|
|
@@ -102976,7 +102977,7 @@ var ts;
|
|
|
102976
102977
|
var maybeBlockedByTypesVersions = false;
|
|
102977
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);
|
|
102978
102979
|
if (typeof cachedPackageJson === "object" || cachedPackageJson === undefined && host.fileExists(packageJsonPath)) {
|
|
102979
|
-
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));
|
|
102980
102981
|
var importMode = overrideMode || importingSourceFile.impliedNodeFormat;
|
|
102981
102982
|
if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node16 || ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext) {
|
|
102982
102983
|
var conditions = ["node", importMode === ts.ModuleKind.ESNext ? "import" : "require", "types"];
|
|
@@ -103308,7 +103309,7 @@ var ts;
|
|
|
103308
103309
|
break;
|
|
103309
103310
|
case ts.ModuleKind.CommonJS:
|
|
103310
103311
|
if (file.packageJsonScope) {
|
|
103311
|
-
(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 ?
|
|
103312
103313
|
ts.Diagnostics.File_is_CommonJS_module_because_0_has_field_type_whose_value_is_not_module :
|
|
103313
103314
|
ts.Diagnostics.File_is_CommonJS_module_because_0_does_not_have_field_type, toFileName(ts.last(file.packageJsonLocations), fileNameConvertor)));
|
|
103314
103315
|
}
|