typescript 4.9.0-dev.20221014 → 4.9.0-dev.20221015
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 +37 -12
- package/lib/tsserver.js +37 -12
- package/lib/tsserverlibrary.js +37 -12
- package/lib/typescript.js +37 -12
- package/lib/typescriptServices.js +37 -12
- package/lib/typingsInstaller.js +37 -12
- 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.9";
|
|
72
|
-
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.
|
|
72
|
+
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221015");
|
|
73
73
|
var NativeCollections;
|
|
74
74
|
(function (NativeCollections) {
|
|
75
75
|
var globals = typeof globalThis !== "undefined" ? globalThis :
|
|
@@ -6749,6 +6749,10 @@ var ts;
|
|
|
6749
6749
|
Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
|
|
6750
6750
|
Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
|
|
6751
6751
|
Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
|
|
6752
|
+
Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
|
|
6753
|
+
Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
|
|
6754
|
+
Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
|
|
6755
|
+
Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
|
|
6752
6756
|
The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
|
|
6753
6757
|
The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
|
|
6754
6758
|
The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
|
|
@@ -36265,6 +36269,9 @@ var ts;
|
|
|
36265
36269
|
requestContainingDirectory: containingDirectory,
|
|
36266
36270
|
reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
|
|
36267
36271
|
};
|
|
36272
|
+
if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
|
|
36273
|
+
trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
|
|
36274
|
+
}
|
|
36268
36275
|
var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
|
|
36269
36276
|
return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
|
|
36270
36277
|
function tryResolve(extensions) {
|
|
@@ -36794,7 +36801,7 @@ var ts;
|
|
|
36794
36801
|
}
|
|
36795
36802
|
if (mainExport) {
|
|
36796
36803
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, false);
|
|
36797
|
-
return loadModuleFromTargetImportOrExport(mainExport, "", false);
|
|
36804
|
+
return loadModuleFromTargetImportOrExport(mainExport, "", false, ".");
|
|
36798
36805
|
}
|
|
36799
36806
|
}
|
|
36800
36807
|
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
@@ -36869,7 +36876,7 @@ var ts;
|
|
|
36869
36876
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
|
|
36870
36877
|
if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
|
|
36871
36878
|
var target = lookupTable[moduleName];
|
|
36872
|
-
return loadModuleFromTargetImportOrExport(target, "", false);
|
|
36879
|
+
return loadModuleFromTargetImportOrExport(target, "", false, moduleName);
|
|
36873
36880
|
}
|
|
36874
36881
|
var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
|
|
36875
36882
|
for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
|
|
@@ -36878,17 +36885,17 @@ var ts;
|
|
|
36878
36885
|
var target = lookupTable[potentialTarget];
|
|
36879
36886
|
var starPos = potentialTarget.indexOf("*");
|
|
36880
36887
|
var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
|
|
36881
|
-
return loadModuleFromTargetImportOrExport(target, subpath, true);
|
|
36888
|
+
return loadModuleFromTargetImportOrExport(target, subpath, true, potentialTarget);
|
|
36882
36889
|
}
|
|
36883
36890
|
else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
|
|
36884
36891
|
var target = lookupTable[potentialTarget];
|
|
36885
36892
|
var subpath = moduleName.substring(potentialTarget.length - 1);
|
|
36886
|
-
return loadModuleFromTargetImportOrExport(target, subpath, true);
|
|
36893
|
+
return loadModuleFromTargetImportOrExport(target, subpath, true, potentialTarget);
|
|
36887
36894
|
}
|
|
36888
36895
|
else if (ts.startsWith(moduleName, potentialTarget)) {
|
|
36889
36896
|
var target = lookupTable[potentialTarget];
|
|
36890
36897
|
var subpath = moduleName.substring(potentialTarget.length);
|
|
36891
|
-
return loadModuleFromTargetImportOrExport(target, subpath, false);
|
|
36898
|
+
return loadModuleFromTargetImportOrExport(target, subpath, false, potentialTarget);
|
|
36892
36899
|
}
|
|
36893
36900
|
}
|
|
36894
36901
|
function matchesPatternWithTrailer(target, name) {
|
|
@@ -36902,7 +36909,7 @@ var ts;
|
|
|
36902
36909
|
}
|
|
36903
36910
|
function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
|
|
36904
36911
|
return loadModuleFromTargetImportOrExport;
|
|
36905
|
-
function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
|
|
36912
|
+
function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
|
|
36906
36913
|
if (typeof target === "string") {
|
|
36907
36914
|
if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
|
|
36908
36915
|
if (state.traceEnabled) {
|
|
@@ -36913,6 +36920,8 @@ var ts;
|
|
|
36913
36920
|
if (!ts.startsWith(target, "./")) {
|
|
36914
36921
|
if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
|
|
36915
36922
|
var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
|
|
36923
|
+
traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
|
|
36924
|
+
traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
|
|
36916
36925
|
var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
|
|
36917
36926
|
return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
|
|
36918
36927
|
}
|
|
@@ -36937,6 +36946,9 @@ var ts;
|
|
|
36937
36946
|
}
|
|
36938
36947
|
return toSearchResult(undefined);
|
|
36939
36948
|
}
|
|
36949
|
+
if (state.traceEnabled) {
|
|
36950
|
+
trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
|
|
36951
|
+
}
|
|
36940
36952
|
var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
|
|
36941
36953
|
var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
|
|
36942
36954
|
if (inputLink)
|
|
@@ -36946,14 +36958,18 @@ var ts;
|
|
|
36946
36958
|
else if (typeof target === "object" && target !== null) {
|
|
36947
36959
|
if (!Array.isArray(target)) {
|
|
36948
36960
|
for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
|
|
36949
|
-
var
|
|
36950
|
-
if (
|
|
36951
|
-
|
|
36952
|
-
var
|
|
36961
|
+
var condition = _a[_i];
|
|
36962
|
+
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
|
|
36963
|
+
traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
|
|
36964
|
+
var subTarget = target[condition];
|
|
36965
|
+
var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
|
|
36953
36966
|
if (result) {
|
|
36954
36967
|
return result;
|
|
36955
36968
|
}
|
|
36956
36969
|
}
|
|
36970
|
+
else {
|
|
36971
|
+
traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
|
|
36972
|
+
}
|
|
36957
36973
|
}
|
|
36958
36974
|
return undefined;
|
|
36959
36975
|
}
|
|
@@ -36966,7 +36982,7 @@ var ts;
|
|
|
36966
36982
|
}
|
|
36967
36983
|
for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
|
|
36968
36984
|
var elem = target_2[_b];
|
|
36969
|
-
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
|
|
36985
|
+
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
|
|
36970
36986
|
if (result) {
|
|
36971
36987
|
return result;
|
|
36972
36988
|
}
|
|
@@ -37317,6 +37333,15 @@ var ts;
|
|
|
37317
37333
|
function toSearchResult(value) {
|
|
37318
37334
|
return value !== undefined ? { value: value } : undefined;
|
|
37319
37335
|
}
|
|
37336
|
+
function traceIfEnabled(state, diagnostic) {
|
|
37337
|
+
var args = [];
|
|
37338
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
37339
|
+
args[_i - 2] = arguments[_i];
|
|
37340
|
+
}
|
|
37341
|
+
if (state.traceEnabled) {
|
|
37342
|
+
trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
|
|
37343
|
+
}
|
|
37344
|
+
}
|
|
37320
37345
|
})(ts || (ts = {}));
|
|
37321
37346
|
var ts;
|
|
37322
37347
|
(function (ts) {
|
package/lib/tsserver.js
CHANGED
|
@@ -109,7 +109,7 @@ var ts;
|
|
|
109
109
|
// The following is baselined as a literal template type without intervention
|
|
110
110
|
/** The version of the TypeScript compiler release */
|
|
111
111
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
112
|
-
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.
|
|
112
|
+
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221015");
|
|
113
113
|
/* @internal */
|
|
114
114
|
var Comparison;
|
|
115
115
|
(function (Comparison) {
|
|
@@ -9604,6 +9604,10 @@ var ts;
|
|
|
9604
9604
|
Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
|
|
9605
9605
|
Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
|
|
9606
9606
|
Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
|
|
9607
|
+
Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
|
|
9608
|
+
Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
|
|
9609
|
+
Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
|
|
9610
|
+
Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
|
|
9607
9611
|
The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
|
|
9608
9612
|
The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
|
|
9609
9613
|
The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
|
|
@@ -44332,6 +44336,9 @@ var ts;
|
|
|
44332
44336
|
requestContainingDirectory: containingDirectory,
|
|
44333
44337
|
reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
|
|
44334
44338
|
};
|
|
44339
|
+
if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
|
|
44340
|
+
trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
|
|
44341
|
+
}
|
|
44335
44342
|
var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
|
|
44336
44343
|
return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
|
|
44337
44344
|
function tryResolve(extensions) {
|
|
@@ -44921,7 +44928,7 @@ var ts;
|
|
|
44921
44928
|
}
|
|
44922
44929
|
if (mainExport) {
|
|
44923
44930
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
|
|
44924
|
-
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false);
|
|
44931
|
+
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false, ".");
|
|
44925
44932
|
}
|
|
44926
44933
|
}
|
|
44927
44934
|
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
@@ -45001,7 +45008,7 @@ var ts;
|
|
|
45001
45008
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
|
|
45002
45009
|
if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
|
|
45003
45010
|
var target = lookupTable[moduleName];
|
|
45004
|
-
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false);
|
|
45011
|
+
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
|
|
45005
45012
|
}
|
|
45006
45013
|
var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
|
|
45007
45014
|
for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
|
|
@@ -45010,17 +45017,17 @@ var ts;
|
|
|
45010
45017
|
var target = lookupTable[potentialTarget];
|
|
45011
45018
|
var starPos = potentialTarget.indexOf("*");
|
|
45012
45019
|
var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
|
|
45013
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45020
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45014
45021
|
}
|
|
45015
45022
|
else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
|
|
45016
45023
|
var target = lookupTable[potentialTarget];
|
|
45017
45024
|
var subpath = moduleName.substring(potentialTarget.length - 1);
|
|
45018
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45025
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45019
45026
|
}
|
|
45020
45027
|
else if (ts.startsWith(moduleName, potentialTarget)) {
|
|
45021
45028
|
var target = lookupTable[potentialTarget];
|
|
45022
45029
|
var subpath = moduleName.substring(potentialTarget.length);
|
|
45023
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false);
|
|
45030
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false, potentialTarget);
|
|
45024
45031
|
}
|
|
45025
45032
|
}
|
|
45026
45033
|
function matchesPatternWithTrailer(target, name) {
|
|
@@ -45037,7 +45044,7 @@ var ts;
|
|
|
45037
45044
|
*/
|
|
45038
45045
|
function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
|
|
45039
45046
|
return loadModuleFromTargetImportOrExport;
|
|
45040
|
-
function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
|
|
45047
|
+
function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
|
|
45041
45048
|
if (typeof target === "string") {
|
|
45042
45049
|
if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
|
|
45043
45050
|
if (state.traceEnabled) {
|
|
@@ -45048,6 +45055,8 @@ var ts;
|
|
|
45048
45055
|
if (!ts.startsWith(target, "./")) {
|
|
45049
45056
|
if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
|
|
45050
45057
|
var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
|
|
45058
|
+
traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
|
|
45059
|
+
traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
|
|
45051
45060
|
var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
|
|
45052
45061
|
return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
|
|
45053
45062
|
}
|
|
@@ -45074,6 +45083,9 @@ var ts;
|
|
|
45074
45083
|
}
|
|
45075
45084
|
return toSearchResult(/*value*/ undefined);
|
|
45076
45085
|
}
|
|
45086
|
+
if (state.traceEnabled) {
|
|
45087
|
+
trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
|
|
45088
|
+
}
|
|
45077
45089
|
var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
|
|
45078
45090
|
var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
|
|
45079
45091
|
if (inputLink)
|
|
@@ -45083,14 +45095,18 @@ var ts;
|
|
|
45083
45095
|
else if (typeof target === "object" && target !== null) { // eslint-disable-line no-null/no-null
|
|
45084
45096
|
if (!Array.isArray(target)) {
|
|
45085
45097
|
for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
|
|
45086
|
-
var
|
|
45087
|
-
if (
|
|
45088
|
-
|
|
45089
|
-
var
|
|
45098
|
+
var condition = _a[_i];
|
|
45099
|
+
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
|
|
45100
|
+
traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
|
|
45101
|
+
var subTarget = target[condition];
|
|
45102
|
+
var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
|
|
45090
45103
|
if (result) {
|
|
45091
45104
|
return result;
|
|
45092
45105
|
}
|
|
45093
45106
|
}
|
|
45107
|
+
else {
|
|
45108
|
+
traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
|
|
45109
|
+
}
|
|
45094
45110
|
}
|
|
45095
45111
|
return undefined;
|
|
45096
45112
|
}
|
|
@@ -45103,7 +45119,7 @@ var ts;
|
|
|
45103
45119
|
}
|
|
45104
45120
|
for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
|
|
45105
45121
|
var elem = target_2[_b];
|
|
45106
|
-
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
|
|
45122
|
+
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
|
|
45107
45123
|
if (result) {
|
|
45108
45124
|
return result;
|
|
45109
45125
|
}
|
|
@@ -45519,6 +45535,15 @@ var ts;
|
|
|
45519
45535
|
function toSearchResult(value) {
|
|
45520
45536
|
return value !== undefined ? { value: value } : undefined;
|
|
45521
45537
|
}
|
|
45538
|
+
function traceIfEnabled(state, diagnostic) {
|
|
45539
|
+
var args = [];
|
|
45540
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
45541
|
+
args[_i - 2] = arguments[_i];
|
|
45542
|
+
}
|
|
45543
|
+
if (state.traceEnabled) {
|
|
45544
|
+
trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
|
|
45545
|
+
}
|
|
45546
|
+
}
|
|
45522
45547
|
})(ts || (ts = {}));
|
|
45523
45548
|
/* @internal */
|
|
45524
45549
|
var ts;
|
package/lib/tsserverlibrary.js
CHANGED
|
@@ -108,7 +108,7 @@ var ts;
|
|
|
108
108
|
// The following is baselined as a literal template type without intervention
|
|
109
109
|
/** The version of the TypeScript compiler release */
|
|
110
110
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
111
|
-
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.
|
|
111
|
+
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221015");
|
|
112
112
|
/* @internal */
|
|
113
113
|
var Comparison;
|
|
114
114
|
(function (Comparison) {
|
|
@@ -9603,6 +9603,10 @@ var ts;
|
|
|
9603
9603
|
Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
|
|
9604
9604
|
Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
|
|
9605
9605
|
Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
|
|
9606
|
+
Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
|
|
9607
|
+
Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
|
|
9608
|
+
Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
|
|
9609
|
+
Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
|
|
9606
9610
|
The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
|
|
9607
9611
|
The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
|
|
9608
9612
|
The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
|
|
@@ -44331,6 +44335,9 @@ var ts;
|
|
|
44331
44335
|
requestContainingDirectory: containingDirectory,
|
|
44332
44336
|
reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
|
|
44333
44337
|
};
|
|
44338
|
+
if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
|
|
44339
|
+
trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
|
|
44340
|
+
}
|
|
44334
44341
|
var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
|
|
44335
44342
|
return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
|
|
44336
44343
|
function tryResolve(extensions) {
|
|
@@ -44920,7 +44927,7 @@ var ts;
|
|
|
44920
44927
|
}
|
|
44921
44928
|
if (mainExport) {
|
|
44922
44929
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
|
|
44923
|
-
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false);
|
|
44930
|
+
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false, ".");
|
|
44924
44931
|
}
|
|
44925
44932
|
}
|
|
44926
44933
|
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
@@ -45000,7 +45007,7 @@ var ts;
|
|
|
45000
45007
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
|
|
45001
45008
|
if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
|
|
45002
45009
|
var target = lookupTable[moduleName];
|
|
45003
|
-
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false);
|
|
45010
|
+
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
|
|
45004
45011
|
}
|
|
45005
45012
|
var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
|
|
45006
45013
|
for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
|
|
@@ -45009,17 +45016,17 @@ var ts;
|
|
|
45009
45016
|
var target = lookupTable[potentialTarget];
|
|
45010
45017
|
var starPos = potentialTarget.indexOf("*");
|
|
45011
45018
|
var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
|
|
45012
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45019
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45013
45020
|
}
|
|
45014
45021
|
else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
|
|
45015
45022
|
var target = lookupTable[potentialTarget];
|
|
45016
45023
|
var subpath = moduleName.substring(potentialTarget.length - 1);
|
|
45017
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45024
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45018
45025
|
}
|
|
45019
45026
|
else if (ts.startsWith(moduleName, potentialTarget)) {
|
|
45020
45027
|
var target = lookupTable[potentialTarget];
|
|
45021
45028
|
var subpath = moduleName.substring(potentialTarget.length);
|
|
45022
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false);
|
|
45029
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false, potentialTarget);
|
|
45023
45030
|
}
|
|
45024
45031
|
}
|
|
45025
45032
|
function matchesPatternWithTrailer(target, name) {
|
|
@@ -45036,7 +45043,7 @@ var ts;
|
|
|
45036
45043
|
*/
|
|
45037
45044
|
function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
|
|
45038
45045
|
return loadModuleFromTargetImportOrExport;
|
|
45039
|
-
function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
|
|
45046
|
+
function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
|
|
45040
45047
|
if (typeof target === "string") {
|
|
45041
45048
|
if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
|
|
45042
45049
|
if (state.traceEnabled) {
|
|
@@ -45047,6 +45054,8 @@ var ts;
|
|
|
45047
45054
|
if (!ts.startsWith(target, "./")) {
|
|
45048
45055
|
if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
|
|
45049
45056
|
var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
|
|
45057
|
+
traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
|
|
45058
|
+
traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
|
|
45050
45059
|
var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
|
|
45051
45060
|
return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
|
|
45052
45061
|
}
|
|
@@ -45073,6 +45082,9 @@ var ts;
|
|
|
45073
45082
|
}
|
|
45074
45083
|
return toSearchResult(/*value*/ undefined);
|
|
45075
45084
|
}
|
|
45085
|
+
if (state.traceEnabled) {
|
|
45086
|
+
trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
|
|
45087
|
+
}
|
|
45076
45088
|
var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
|
|
45077
45089
|
var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
|
|
45078
45090
|
if (inputLink)
|
|
@@ -45082,14 +45094,18 @@ var ts;
|
|
|
45082
45094
|
else if (typeof target === "object" && target !== null) { // eslint-disable-line no-null/no-null
|
|
45083
45095
|
if (!Array.isArray(target)) {
|
|
45084
45096
|
for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
|
|
45085
|
-
var
|
|
45086
|
-
if (
|
|
45087
|
-
|
|
45088
|
-
var
|
|
45097
|
+
var condition = _a[_i];
|
|
45098
|
+
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
|
|
45099
|
+
traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
|
|
45100
|
+
var subTarget = target[condition];
|
|
45101
|
+
var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
|
|
45089
45102
|
if (result) {
|
|
45090
45103
|
return result;
|
|
45091
45104
|
}
|
|
45092
45105
|
}
|
|
45106
|
+
else {
|
|
45107
|
+
traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
|
|
45108
|
+
}
|
|
45093
45109
|
}
|
|
45094
45110
|
return undefined;
|
|
45095
45111
|
}
|
|
@@ -45102,7 +45118,7 @@ var ts;
|
|
|
45102
45118
|
}
|
|
45103
45119
|
for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
|
|
45104
45120
|
var elem = target_2[_b];
|
|
45105
|
-
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
|
|
45121
|
+
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
|
|
45106
45122
|
if (result) {
|
|
45107
45123
|
return result;
|
|
45108
45124
|
}
|
|
@@ -45518,6 +45534,15 @@ var ts;
|
|
|
45518
45534
|
function toSearchResult(value) {
|
|
45519
45535
|
return value !== undefined ? { value: value } : undefined;
|
|
45520
45536
|
}
|
|
45537
|
+
function traceIfEnabled(state, diagnostic) {
|
|
45538
|
+
var args = [];
|
|
45539
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
45540
|
+
args[_i - 2] = arguments[_i];
|
|
45541
|
+
}
|
|
45542
|
+
if (state.traceEnabled) {
|
|
45543
|
+
trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
|
|
45544
|
+
}
|
|
45545
|
+
}
|
|
45521
45546
|
})(ts || (ts = {}));
|
|
45522
45547
|
/* @internal */
|
|
45523
45548
|
var ts;
|
package/lib/typescript.js
CHANGED
|
@@ -99,7 +99,7 @@ var ts;
|
|
|
99
99
|
// The following is baselined as a literal template type without intervention
|
|
100
100
|
/** The version of the TypeScript compiler release */
|
|
101
101
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
102
|
-
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.
|
|
102
|
+
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221015");
|
|
103
103
|
/* @internal */
|
|
104
104
|
var Comparison;
|
|
105
105
|
(function (Comparison) {
|
|
@@ -9594,6 +9594,10 @@ var ts;
|
|
|
9594
9594
|
Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
|
|
9595
9595
|
Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
|
|
9596
9596
|
Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
|
|
9597
|
+
Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
|
|
9598
|
+
Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
|
|
9599
|
+
Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
|
|
9600
|
+
Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
|
|
9597
9601
|
The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
|
|
9598
9602
|
The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
|
|
9599
9603
|
The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
|
|
@@ -44322,6 +44326,9 @@ var ts;
|
|
|
44322
44326
|
requestContainingDirectory: containingDirectory,
|
|
44323
44327
|
reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
|
|
44324
44328
|
};
|
|
44329
|
+
if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
|
|
44330
|
+
trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
|
|
44331
|
+
}
|
|
44325
44332
|
var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
|
|
44326
44333
|
return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
|
|
44327
44334
|
function tryResolve(extensions) {
|
|
@@ -44911,7 +44918,7 @@ var ts;
|
|
|
44911
44918
|
}
|
|
44912
44919
|
if (mainExport) {
|
|
44913
44920
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
|
|
44914
|
-
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false);
|
|
44921
|
+
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false, ".");
|
|
44915
44922
|
}
|
|
44916
44923
|
}
|
|
44917
44924
|
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
@@ -44991,7 +44998,7 @@ var ts;
|
|
|
44991
44998
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
|
|
44992
44999
|
if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
|
|
44993
45000
|
var target = lookupTable[moduleName];
|
|
44994
|
-
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false);
|
|
45001
|
+
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
|
|
44995
45002
|
}
|
|
44996
45003
|
var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
|
|
44997
45004
|
for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
|
|
@@ -45000,17 +45007,17 @@ var ts;
|
|
|
45000
45007
|
var target = lookupTable[potentialTarget];
|
|
45001
45008
|
var starPos = potentialTarget.indexOf("*");
|
|
45002
45009
|
var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
|
|
45003
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45010
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45004
45011
|
}
|
|
45005
45012
|
else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
|
|
45006
45013
|
var target = lookupTable[potentialTarget];
|
|
45007
45014
|
var subpath = moduleName.substring(potentialTarget.length - 1);
|
|
45008
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45015
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45009
45016
|
}
|
|
45010
45017
|
else if (ts.startsWith(moduleName, potentialTarget)) {
|
|
45011
45018
|
var target = lookupTable[potentialTarget];
|
|
45012
45019
|
var subpath = moduleName.substring(potentialTarget.length);
|
|
45013
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false);
|
|
45020
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false, potentialTarget);
|
|
45014
45021
|
}
|
|
45015
45022
|
}
|
|
45016
45023
|
function matchesPatternWithTrailer(target, name) {
|
|
@@ -45027,7 +45034,7 @@ var ts;
|
|
|
45027
45034
|
*/
|
|
45028
45035
|
function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
|
|
45029
45036
|
return loadModuleFromTargetImportOrExport;
|
|
45030
|
-
function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
|
|
45037
|
+
function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
|
|
45031
45038
|
if (typeof target === "string") {
|
|
45032
45039
|
if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
|
|
45033
45040
|
if (state.traceEnabled) {
|
|
@@ -45038,6 +45045,8 @@ var ts;
|
|
|
45038
45045
|
if (!ts.startsWith(target, "./")) {
|
|
45039
45046
|
if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
|
|
45040
45047
|
var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
|
|
45048
|
+
traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
|
|
45049
|
+
traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
|
|
45041
45050
|
var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
|
|
45042
45051
|
return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
|
|
45043
45052
|
}
|
|
@@ -45064,6 +45073,9 @@ var ts;
|
|
|
45064
45073
|
}
|
|
45065
45074
|
return toSearchResult(/*value*/ undefined);
|
|
45066
45075
|
}
|
|
45076
|
+
if (state.traceEnabled) {
|
|
45077
|
+
trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
|
|
45078
|
+
}
|
|
45067
45079
|
var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
|
|
45068
45080
|
var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
|
|
45069
45081
|
if (inputLink)
|
|
@@ -45073,14 +45085,18 @@ var ts;
|
|
|
45073
45085
|
else if (typeof target === "object" && target !== null) { // eslint-disable-line no-null/no-null
|
|
45074
45086
|
if (!Array.isArray(target)) {
|
|
45075
45087
|
for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
|
|
45076
|
-
var
|
|
45077
|
-
if (
|
|
45078
|
-
|
|
45079
|
-
var
|
|
45088
|
+
var condition = _a[_i];
|
|
45089
|
+
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
|
|
45090
|
+
traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
|
|
45091
|
+
var subTarget = target[condition];
|
|
45092
|
+
var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
|
|
45080
45093
|
if (result) {
|
|
45081
45094
|
return result;
|
|
45082
45095
|
}
|
|
45083
45096
|
}
|
|
45097
|
+
else {
|
|
45098
|
+
traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
|
|
45099
|
+
}
|
|
45084
45100
|
}
|
|
45085
45101
|
return undefined;
|
|
45086
45102
|
}
|
|
@@ -45093,7 +45109,7 @@ var ts;
|
|
|
45093
45109
|
}
|
|
45094
45110
|
for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
|
|
45095
45111
|
var elem = target_2[_b];
|
|
45096
|
-
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
|
|
45112
|
+
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
|
|
45097
45113
|
if (result) {
|
|
45098
45114
|
return result;
|
|
45099
45115
|
}
|
|
@@ -45509,6 +45525,15 @@ var ts;
|
|
|
45509
45525
|
function toSearchResult(value) {
|
|
45510
45526
|
return value !== undefined ? { value: value } : undefined;
|
|
45511
45527
|
}
|
|
45528
|
+
function traceIfEnabled(state, diagnostic) {
|
|
45529
|
+
var args = [];
|
|
45530
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
45531
|
+
args[_i - 2] = arguments[_i];
|
|
45532
|
+
}
|
|
45533
|
+
if (state.traceEnabled) {
|
|
45534
|
+
trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
|
|
45535
|
+
}
|
|
45536
|
+
}
|
|
45512
45537
|
})(ts || (ts = {}));
|
|
45513
45538
|
/* @internal */
|
|
45514
45539
|
var ts;
|
|
@@ -99,7 +99,7 @@ var ts;
|
|
|
99
99
|
// The following is baselined as a literal template type without intervention
|
|
100
100
|
/** The version of the TypeScript compiler release */
|
|
101
101
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
102
|
-
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.
|
|
102
|
+
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221015");
|
|
103
103
|
/* @internal */
|
|
104
104
|
var Comparison;
|
|
105
105
|
(function (Comparison) {
|
|
@@ -9594,6 +9594,10 @@ var ts;
|
|
|
9594
9594
|
Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
|
|
9595
9595
|
Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
|
|
9596
9596
|
Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
|
|
9597
|
+
Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
|
|
9598
|
+
Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
|
|
9599
|
+
Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
|
|
9600
|
+
Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
|
|
9597
9601
|
The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
|
|
9598
9602
|
The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
|
|
9599
9603
|
The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
|
|
@@ -44322,6 +44326,9 @@ var ts;
|
|
|
44322
44326
|
requestContainingDirectory: containingDirectory,
|
|
44323
44327
|
reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
|
|
44324
44328
|
};
|
|
44329
|
+
if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
|
|
44330
|
+
trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
|
|
44331
|
+
}
|
|
44325
44332
|
var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
|
|
44326
44333
|
return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
|
|
44327
44334
|
function tryResolve(extensions) {
|
|
@@ -44911,7 +44918,7 @@ var ts;
|
|
|
44911
44918
|
}
|
|
44912
44919
|
if (mainExport) {
|
|
44913
44920
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
|
|
44914
|
-
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false);
|
|
44921
|
+
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false, ".");
|
|
44915
44922
|
}
|
|
44916
44923
|
}
|
|
44917
44924
|
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
@@ -44991,7 +44998,7 @@ var ts;
|
|
|
44991
44998
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
|
|
44992
44999
|
if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
|
|
44993
45000
|
var target = lookupTable[moduleName];
|
|
44994
|
-
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false);
|
|
45001
|
+
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
|
|
44995
45002
|
}
|
|
44996
45003
|
var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
|
|
44997
45004
|
for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
|
|
@@ -45000,17 +45007,17 @@ var ts;
|
|
|
45000
45007
|
var target = lookupTable[potentialTarget];
|
|
45001
45008
|
var starPos = potentialTarget.indexOf("*");
|
|
45002
45009
|
var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
|
|
45003
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45010
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45004
45011
|
}
|
|
45005
45012
|
else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
|
|
45006
45013
|
var target = lookupTable[potentialTarget];
|
|
45007
45014
|
var subpath = moduleName.substring(potentialTarget.length - 1);
|
|
45008
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45015
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
45009
45016
|
}
|
|
45010
45017
|
else if (ts.startsWith(moduleName, potentialTarget)) {
|
|
45011
45018
|
var target = lookupTable[potentialTarget];
|
|
45012
45019
|
var subpath = moduleName.substring(potentialTarget.length);
|
|
45013
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false);
|
|
45020
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false, potentialTarget);
|
|
45014
45021
|
}
|
|
45015
45022
|
}
|
|
45016
45023
|
function matchesPatternWithTrailer(target, name) {
|
|
@@ -45027,7 +45034,7 @@ var ts;
|
|
|
45027
45034
|
*/
|
|
45028
45035
|
function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
|
|
45029
45036
|
return loadModuleFromTargetImportOrExport;
|
|
45030
|
-
function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
|
|
45037
|
+
function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
|
|
45031
45038
|
if (typeof target === "string") {
|
|
45032
45039
|
if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
|
|
45033
45040
|
if (state.traceEnabled) {
|
|
@@ -45038,6 +45045,8 @@ var ts;
|
|
|
45038
45045
|
if (!ts.startsWith(target, "./")) {
|
|
45039
45046
|
if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
|
|
45040
45047
|
var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
|
|
45048
|
+
traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
|
|
45049
|
+
traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
|
|
45041
45050
|
var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
|
|
45042
45051
|
return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
|
|
45043
45052
|
}
|
|
@@ -45064,6 +45073,9 @@ var ts;
|
|
|
45064
45073
|
}
|
|
45065
45074
|
return toSearchResult(/*value*/ undefined);
|
|
45066
45075
|
}
|
|
45076
|
+
if (state.traceEnabled) {
|
|
45077
|
+
trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
|
|
45078
|
+
}
|
|
45067
45079
|
var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
|
|
45068
45080
|
var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
|
|
45069
45081
|
if (inputLink)
|
|
@@ -45073,14 +45085,18 @@ var ts;
|
|
|
45073
45085
|
else if (typeof target === "object" && target !== null) { // eslint-disable-line no-null/no-null
|
|
45074
45086
|
if (!Array.isArray(target)) {
|
|
45075
45087
|
for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
|
|
45076
|
-
var
|
|
45077
|
-
if (
|
|
45078
|
-
|
|
45079
|
-
var
|
|
45088
|
+
var condition = _a[_i];
|
|
45089
|
+
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
|
|
45090
|
+
traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
|
|
45091
|
+
var subTarget = target[condition];
|
|
45092
|
+
var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
|
|
45080
45093
|
if (result) {
|
|
45081
45094
|
return result;
|
|
45082
45095
|
}
|
|
45083
45096
|
}
|
|
45097
|
+
else {
|
|
45098
|
+
traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
|
|
45099
|
+
}
|
|
45084
45100
|
}
|
|
45085
45101
|
return undefined;
|
|
45086
45102
|
}
|
|
@@ -45093,7 +45109,7 @@ var ts;
|
|
|
45093
45109
|
}
|
|
45094
45110
|
for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
|
|
45095
45111
|
var elem = target_2[_b];
|
|
45096
|
-
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
|
|
45112
|
+
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
|
|
45097
45113
|
if (result) {
|
|
45098
45114
|
return result;
|
|
45099
45115
|
}
|
|
@@ -45509,6 +45525,15 @@ var ts;
|
|
|
45509
45525
|
function toSearchResult(value) {
|
|
45510
45526
|
return value !== undefined ? { value: value } : undefined;
|
|
45511
45527
|
}
|
|
45528
|
+
function traceIfEnabled(state, diagnostic) {
|
|
45529
|
+
var args = [];
|
|
45530
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
45531
|
+
args[_i - 2] = arguments[_i];
|
|
45532
|
+
}
|
|
45533
|
+
if (state.traceEnabled) {
|
|
45534
|
+
trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
|
|
45535
|
+
}
|
|
45536
|
+
}
|
|
45512
45537
|
})(ts || (ts = {}));
|
|
45513
45538
|
/* @internal */
|
|
45514
45539
|
var ts;
|
package/lib/typingsInstaller.js
CHANGED
|
@@ -89,7 +89,7 @@ var ts;
|
|
|
89
89
|
// The following is baselined as a literal template type without intervention
|
|
90
90
|
/** The version of the TypeScript compiler release */
|
|
91
91
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
92
|
-
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.
|
|
92
|
+
ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221015");
|
|
93
93
|
/* @internal */
|
|
94
94
|
var Comparison;
|
|
95
95
|
(function (Comparison) {
|
|
@@ -9584,6 +9584,10 @@ var ts;
|
|
|
9584
9584
|
Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
|
|
9585
9585
|
Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
|
|
9586
9586
|
Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
|
|
9587
|
+
Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
|
|
9588
|
+
Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
|
|
9589
|
+
Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
|
|
9590
|
+
Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
|
|
9587
9591
|
The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
|
|
9588
9592
|
The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
|
|
9589
9593
|
The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
|
|
@@ -44312,6 +44316,9 @@ var ts;
|
|
|
44312
44316
|
requestContainingDirectory: containingDirectory,
|
|
44313
44317
|
reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
|
|
44314
44318
|
};
|
|
44319
|
+
if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
|
|
44320
|
+
trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
|
|
44321
|
+
}
|
|
44315
44322
|
var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
|
|
44316
44323
|
return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
|
|
44317
44324
|
function tryResolve(extensions) {
|
|
@@ -44901,7 +44908,7 @@ var ts;
|
|
|
44901
44908
|
}
|
|
44902
44909
|
if (mainExport) {
|
|
44903
44910
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
|
|
44904
|
-
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false);
|
|
44911
|
+
return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false, ".");
|
|
44905
44912
|
}
|
|
44906
44913
|
}
|
|
44907
44914
|
else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
|
|
@@ -44981,7 +44988,7 @@ var ts;
|
|
|
44981
44988
|
var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
|
|
44982
44989
|
if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
|
|
44983
44990
|
var target = lookupTable[moduleName];
|
|
44984
|
-
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false);
|
|
44991
|
+
return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
|
|
44985
44992
|
}
|
|
44986
44993
|
var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
|
|
44987
44994
|
for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
|
|
@@ -44990,17 +44997,17 @@ var ts;
|
|
|
44990
44997
|
var target = lookupTable[potentialTarget];
|
|
44991
44998
|
var starPos = potentialTarget.indexOf("*");
|
|
44992
44999
|
var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
|
|
44993
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45000
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
44994
45001
|
}
|
|
44995
45002
|
else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
|
|
44996
45003
|
var target = lookupTable[potentialTarget];
|
|
44997
45004
|
var subpath = moduleName.substring(potentialTarget.length - 1);
|
|
44998
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true);
|
|
45005
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
|
|
44999
45006
|
}
|
|
45000
45007
|
else if (ts.startsWith(moduleName, potentialTarget)) {
|
|
45001
45008
|
var target = lookupTable[potentialTarget];
|
|
45002
45009
|
var subpath = moduleName.substring(potentialTarget.length);
|
|
45003
|
-
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false);
|
|
45010
|
+
return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false, potentialTarget);
|
|
45004
45011
|
}
|
|
45005
45012
|
}
|
|
45006
45013
|
function matchesPatternWithTrailer(target, name) {
|
|
@@ -45017,7 +45024,7 @@ var ts;
|
|
|
45017
45024
|
*/
|
|
45018
45025
|
function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
|
|
45019
45026
|
return loadModuleFromTargetImportOrExport;
|
|
45020
|
-
function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
|
|
45027
|
+
function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
|
|
45021
45028
|
if (typeof target === "string") {
|
|
45022
45029
|
if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
|
|
45023
45030
|
if (state.traceEnabled) {
|
|
@@ -45028,6 +45035,8 @@ var ts;
|
|
|
45028
45035
|
if (!ts.startsWith(target, "./")) {
|
|
45029
45036
|
if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
|
|
45030
45037
|
var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
|
|
45038
|
+
traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
|
|
45039
|
+
traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
|
|
45031
45040
|
var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
|
|
45032
45041
|
return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
|
|
45033
45042
|
}
|
|
@@ -45054,6 +45063,9 @@ var ts;
|
|
|
45054
45063
|
}
|
|
45055
45064
|
return toSearchResult(/*value*/ undefined);
|
|
45056
45065
|
}
|
|
45066
|
+
if (state.traceEnabled) {
|
|
45067
|
+
trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
|
|
45068
|
+
}
|
|
45057
45069
|
var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
|
|
45058
45070
|
var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
|
|
45059
45071
|
if (inputLink)
|
|
@@ -45063,14 +45075,18 @@ var ts;
|
|
|
45063
45075
|
else if (typeof target === "object" && target !== null) { // eslint-disable-line no-null/no-null
|
|
45064
45076
|
if (!Array.isArray(target)) {
|
|
45065
45077
|
for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
|
|
45066
|
-
var
|
|
45067
|
-
if (
|
|
45068
|
-
|
|
45069
|
-
var
|
|
45078
|
+
var condition = _a[_i];
|
|
45079
|
+
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
|
|
45080
|
+
traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
|
|
45081
|
+
var subTarget = target[condition];
|
|
45082
|
+
var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
|
|
45070
45083
|
if (result) {
|
|
45071
45084
|
return result;
|
|
45072
45085
|
}
|
|
45073
45086
|
}
|
|
45087
|
+
else {
|
|
45088
|
+
traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
|
|
45089
|
+
}
|
|
45074
45090
|
}
|
|
45075
45091
|
return undefined;
|
|
45076
45092
|
}
|
|
@@ -45083,7 +45099,7 @@ var ts;
|
|
|
45083
45099
|
}
|
|
45084
45100
|
for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
|
|
45085
45101
|
var elem = target_2[_b];
|
|
45086
|
-
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
|
|
45102
|
+
var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
|
|
45087
45103
|
if (result) {
|
|
45088
45104
|
return result;
|
|
45089
45105
|
}
|
|
@@ -45499,6 +45515,15 @@ var ts;
|
|
|
45499
45515
|
function toSearchResult(value) {
|
|
45500
45516
|
return value !== undefined ? { value: value } : undefined;
|
|
45501
45517
|
}
|
|
45518
|
+
function traceIfEnabled(state, diagnostic) {
|
|
45519
|
+
var args = [];
|
|
45520
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
45521
|
+
args[_i - 2] = arguments[_i];
|
|
45522
|
+
}
|
|
45523
|
+
if (state.traceEnabled) {
|
|
45524
|
+
trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
|
|
45525
|
+
}
|
|
45526
|
+
}
|
|
45502
45527
|
})(ts || (ts = {}));
|
|
45503
45528
|
/* @internal */
|
|
45504
45529
|
var ts;
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "typescript",
|
|
3
3
|
"author": "Microsoft Corp.",
|
|
4
4
|
"homepage": "https://www.typescriptlang.org/",
|
|
5
|
-
"version": "4.9.0-dev.
|
|
5
|
+
"version": "4.9.0-dev.20221015",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"description": "TypeScript is a language for application scale JavaScript development",
|
|
8
8
|
"keywords": [
|