@typescript-deploys/pr-build 5.5.0-pr-58525-2 → 5.5.0-pr-58528-2

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 CHANGED
@@ -6732,7 +6732,6 @@ var Diagnostics = {
6732
6732
  Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1: diag(4083, 1 /* Error */, "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083", "Type parameter '{0}' of exported type alias has or is using private name '{1}'."),
6733
6733
  Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2: diag(4084, 1 /* Error */, "Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2_4084", "Exported type alias '{0}' has or is using private name '{1}' from module {2}."),
6734
6734
  Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
6735
- Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: diag(4090, 1 /* Error */, "Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090", "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict."),
6736
6735
  Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
6737
6736
  Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
6738
6737
  Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
@@ -118041,7 +118040,7 @@ function createModuleResolutionLoader(containingFile, redirectedReference, optio
118041
118040
  };
118042
118041
  }
118043
118042
  function getTypeReferenceResolutionName(entry) {
118044
- return !isString(entry) ? entry.fileName : entry;
118043
+ return !isString(entry) ? toFileNameLowerCase(entry.fileName) : entry;
118045
118044
  }
118046
118045
  var typeReferenceResolutionNameAndModeGetter = {
118047
118046
  getName: getTypeReferenceResolutionName,
@@ -118150,11 +118149,11 @@ function getReferencedFileLocation(program, ref) {
118150
118149
  var _a, _b, _c, _d;
118151
118150
  const file = Debug.checkDefined(program.getSourceFileByPath(ref.file));
118152
118151
  const { kind, index } = ref;
118153
- let pos, end, packageId, resolutionMode;
118152
+ let pos, end, packageId;
118154
118153
  switch (kind) {
118155
118154
  case 3 /* Import */:
118156
118155
  const importLiteral = getModuleNameStringLiteralAt(file, index);
118157
- packageId = (_b = (_a = program.getResolvedModule(file, importLiteral.text, program.getModeForUsageLocation(file, importLiteral))) == null ? void 0 : _a.resolvedModule) == null ? void 0 : _b.packageId;
118156
+ packageId = (_b = (_a = program.getResolvedModuleFromModuleSpecifier(importLiteral, file)) == null ? void 0 : _a.resolvedModule) == null ? void 0 : _b.packageId;
118158
118157
  if (importLiteral.pos === -1) return { file, packageId, text: importLiteral.text };
118159
118158
  pos = skipTrivia(file.text, importLiteral.pos);
118160
118159
  end = importLiteral.end;
@@ -118163,8 +118162,8 @@ function getReferencedFileLocation(program, ref) {
118163
118162
  ({ pos, end } = file.referencedFiles[index]);
118164
118163
  break;
118165
118164
  case 5 /* TypeReferenceDirective */:
118166
- ({ pos, end, resolutionMode } = file.typeReferenceDirectives[index]);
118167
- packageId = (_d = (_c = program.getResolvedTypeReferenceDirective(file, file.typeReferenceDirectives[index].fileName, resolutionMode || file.impliedNodeFormat)) == null ? void 0 : _c.resolvedTypeReferenceDirective) == null ? void 0 : _d.packageId;
118165
+ ({ pos, end } = file.typeReferenceDirectives[index]);
118166
+ packageId = (_d = (_c = program.getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(file.typeReferenceDirectives[index], file)) == null ? void 0 : _c.resolvedTypeReferenceDirective) == null ? void 0 : _d.packageId;
118168
118167
  break;
118169
118168
  case 7 /* LibReferenceDirective */:
118170
118169
  ({ pos, end } = file.libReferenceDirectives[index]);
@@ -118364,7 +118363,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
118364
118363
  let reasonToRelatedInfo;
118365
118364
  const cachedBindAndCheckDiagnosticsForFile = {};
118366
118365
  const cachedDeclarationDiagnosticsForFile = {};
118367
- let resolvedTypeReferenceDirectives = createModeAwareCache();
118368
118366
  let fileProcessingDiagnostics;
118369
118367
  let automaticTypeDirectiveNames;
118370
118368
  let automaticTypeDirectiveResolutions;
@@ -118670,7 +118668,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
118670
118668
  getInstantiationCount: () => getTypeChecker().getInstantiationCount(),
118671
118669
  getRelationCacheSizes: () => getTypeChecker().getRelationCacheSizes(),
118672
118670
  getFileProcessingDiagnostics: () => fileProcessingDiagnostics,
118673
- getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives,
118674
118671
  getAutomaticTypeDirectiveNames: () => automaticTypeDirectiveNames,
118675
118672
  getAutomaticTypeDirectiveResolutions: () => automaticTypeDirectiveResolutions,
118676
118673
  isSourceFileFromExternalLibrary,
@@ -118689,6 +118686,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
118689
118686
  getResolvedModule,
118690
118687
  getResolvedModuleFromModuleSpecifier,
118691
118688
  getResolvedTypeReferenceDirective,
118689
+ getResolvedTypeReferenceDirectiveFromTypeReferenceDirective,
118692
118690
  forEachResolvedModule,
118693
118691
  forEachResolvedTypeReferenceDirective,
118694
118692
  getCurrentPackagesMap: () => packageMap,
@@ -118784,8 +118782,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
118784
118782
  var _a2;
118785
118783
  return (_a2 = resolvedModules == null ? void 0 : resolvedModules.get(file.path)) == null ? void 0 : _a2.get(moduleName, mode);
118786
118784
  }
118787
- function getResolvedModuleFromModuleSpecifier(moduleSpecifier) {
118788
- const sourceFile = getSourceFileOfNode(moduleSpecifier);
118785
+ function getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile) {
118786
+ sourceFile ?? (sourceFile = getSourceFileOfNode(moduleSpecifier));
118789
118787
  Debug.assertIsDefined(sourceFile, "`moduleSpecifier` must have a `SourceFile` ancestor. Use `program.getResolvedModule` instead to provide the containing file and resolution mode.");
118790
118788
  return getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation2(sourceFile, moduleSpecifier));
118791
118789
  }
@@ -118793,6 +118791,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
118793
118791
  var _a2;
118794
118792
  return (_a2 = resolvedTypeReferenceDirectiveNames == null ? void 0 : resolvedTypeReferenceDirectiveNames.get(file.path)) == null ? void 0 : _a2.get(typeDirectiveName, mode);
118795
118793
  }
118794
+ function getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(typeRef, sourceFile) {
118795
+ return getResolvedTypeReferenceDirective(sourceFile, toFileNameLowerCase(typeRef.fileName), typeRef.resolutionMode || sourceFile.impliedNodeFormat);
118796
+ }
118796
118797
  function forEachResolvedModule(callback, file) {
118797
118798
  forEachResolution(resolvedModules, callback, file);
118798
118799
  }
@@ -119261,7 +119262,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
119261
119262
  files = newSourceFiles;
119262
119263
  fileReasons = oldProgram.getFileIncludeReasons();
119263
119264
  fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
119264
- resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
119265
119265
  automaticTypeDirectiveNames = oldProgram.getAutomaticTypeDirectiveNames();
119266
119266
  automaticTypeDirectiveResolutions = oldProgram.getAutomaticTypeDirectiveResolutions();
119267
119267
  sourceFileToPackageName = oldProgram.sourceFileToPackageName;
@@ -120334,7 +120334,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
120334
120334
  for (let index = 0; index < typeDirectives.length; index++) {
120335
120335
  const ref = file.typeReferenceDirectives[index];
120336
120336
  const resolvedTypeReferenceDirective = resolutions[index];
120337
- const fileName = ref.fileName;
120337
+ const fileName = toFileNameLowerCase(ref.fileName);
120338
120338
  resolutionsInFile.set(fileName, getModeForFileReference(ref, file.impliedNodeFormat), resolvedTypeReferenceDirective);
120339
120339
  const mode = ref.resolutionMode || getDefaultResolutionModeForFile2(file);
120340
120340
  processTypeReferenceDirective(fileName, mode, resolvedTypeReferenceDirective, { kind: 5 /* TypeReferenceDirective */, file: file.path, index });
@@ -120351,53 +120351,19 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
120351
120351
  (_b2 = tracing) == null ? void 0 : _b2.pop();
120352
120352
  }
120353
120353
  function processTypeReferenceDirectiveWorker(typeReferenceDirective, mode, resolution, reason) {
120354
- var _a2;
120355
120354
  addResolutionDiagnostics(resolution);
120356
- const previousResolution = (_a2 = resolvedTypeReferenceDirectives.get(typeReferenceDirective, mode)) == null ? void 0 : _a2.resolvedTypeReferenceDirective;
120357
- if (previousResolution && previousResolution.primary) {
120358
- return;
120359
- }
120360
- let saveResolution = true;
120361
120355
  const { resolvedTypeReferenceDirective } = resolution;
120362
120356
  if (resolvedTypeReferenceDirective) {
120363
120357
  if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth++;
120364
- if (resolvedTypeReferenceDirective.primary) {
120365
- processSourceFile(
120366
- resolvedTypeReferenceDirective.resolvedFileName,
120367
- /*isDefaultLib*/
120368
- false,
120369
- /*ignoreNoDefaultLib*/
120370
- false,
120371
- resolvedTypeReferenceDirective.packageId,
120372
- reason
120373
- );
120374
- } else {
120375
- if (previousResolution) {
120376
- if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
120377
- const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
120378
- const existingFile = getSourceFile(previousResolution.resolvedFileName);
120379
- if (otherFileText !== existingFile.text) {
120380
- addFilePreprocessingFileExplainingDiagnostic(
120381
- existingFile,
120382
- reason,
120383
- Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
120384
- [typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName]
120385
- );
120386
- }
120387
- }
120388
- saveResolution = false;
120389
- } else {
120390
- processSourceFile(
120391
- resolvedTypeReferenceDirective.resolvedFileName,
120392
- /*isDefaultLib*/
120393
- false,
120394
- /*ignoreNoDefaultLib*/
120395
- false,
120396
- resolvedTypeReferenceDirective.packageId,
120397
- reason
120398
- );
120399
- }
120400
- }
120358
+ processSourceFile(
120359
+ resolvedTypeReferenceDirective.resolvedFileName,
120360
+ /*isDefaultLib*/
120361
+ false,
120362
+ /*ignoreNoDefaultLib*/
120363
+ false,
120364
+ resolvedTypeReferenceDirective.packageId,
120365
+ reason
120366
+ );
120401
120367
  if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth--;
120402
120368
  } else {
120403
120369
  addFilePreprocessingFileExplainingDiagnostic(
@@ -120408,9 +120374,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
120408
120374
  [typeReferenceDirective]
120409
120375
  );
120410
120376
  }
120411
- if (saveResolution) {
120412
- resolvedTypeReferenceDirectives.set(typeReferenceDirective, mode, resolution);
120413
- }
120414
120377
  }
120415
120378
  function pathForLibFile(libFileName) {
120416
120379
  const existing = resolvedLibReferences == null ? void 0 : resolvedLibReferences.get(libFileName);
package/lib/typescript.js CHANGED
@@ -10338,7 +10338,6 @@ var Diagnostics = {
10338
10338
  Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1: diag(4083, 1 /* Error */, "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083", "Type parameter '{0}' of exported type alias has or is using private name '{1}'."),
10339
10339
  Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2: diag(4084, 1 /* Error */, "Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2_4084", "Exported type alias '{0}' has or is using private name '{1}' from module {2}."),
10340
10340
  Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
10341
- Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: diag(4090, 1 /* Error */, "Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090", "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict."),
10342
10341
  Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
10343
10342
  Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
10344
10343
  Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
@@ -123070,7 +123069,7 @@ function createModuleResolutionLoader(containingFile, redirectedReference, optio
123070
123069
  };
123071
123070
  }
123072
123071
  function getTypeReferenceResolutionName(entry) {
123073
- return !isString(entry) ? entry.fileName : entry;
123072
+ return !isString(entry) ? toFileNameLowerCase(entry.fileName) : entry;
123074
123073
  }
123075
123074
  var typeReferenceResolutionNameAndModeGetter = {
123076
123075
  getName: getTypeReferenceResolutionName,
@@ -123179,11 +123178,11 @@ function getReferencedFileLocation(program, ref) {
123179
123178
  var _a, _b, _c, _d;
123180
123179
  const file = Debug.checkDefined(program.getSourceFileByPath(ref.file));
123181
123180
  const { kind, index } = ref;
123182
- let pos, end, packageId, resolutionMode;
123181
+ let pos, end, packageId;
123183
123182
  switch (kind) {
123184
123183
  case 3 /* Import */:
123185
123184
  const importLiteral = getModuleNameStringLiteralAt(file, index);
123186
- packageId = (_b = (_a = program.getResolvedModule(file, importLiteral.text, program.getModeForUsageLocation(file, importLiteral))) == null ? void 0 : _a.resolvedModule) == null ? void 0 : _b.packageId;
123185
+ packageId = (_b = (_a = program.getResolvedModuleFromModuleSpecifier(importLiteral, file)) == null ? void 0 : _a.resolvedModule) == null ? void 0 : _b.packageId;
123187
123186
  if (importLiteral.pos === -1) return { file, packageId, text: importLiteral.text };
123188
123187
  pos = skipTrivia(file.text, importLiteral.pos);
123189
123188
  end = importLiteral.end;
@@ -123192,8 +123191,8 @@ function getReferencedFileLocation(program, ref) {
123192
123191
  ({ pos, end } = file.referencedFiles[index]);
123193
123192
  break;
123194
123193
  case 5 /* TypeReferenceDirective */:
123195
- ({ pos, end, resolutionMode } = file.typeReferenceDirectives[index]);
123196
- packageId = (_d = (_c = program.getResolvedTypeReferenceDirective(file, file.typeReferenceDirectives[index].fileName, resolutionMode || file.impliedNodeFormat)) == null ? void 0 : _c.resolvedTypeReferenceDirective) == null ? void 0 : _d.packageId;
123194
+ ({ pos, end } = file.typeReferenceDirectives[index]);
123195
+ packageId = (_d = (_c = program.getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(file.typeReferenceDirectives[index], file)) == null ? void 0 : _c.resolvedTypeReferenceDirective) == null ? void 0 : _d.packageId;
123197
123196
  break;
123198
123197
  case 7 /* LibReferenceDirective */:
123199
123198
  ({ pos, end } = file.libReferenceDirectives[index]);
@@ -123397,7 +123396,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
123397
123396
  let reasonToRelatedInfo;
123398
123397
  const cachedBindAndCheckDiagnosticsForFile = {};
123399
123398
  const cachedDeclarationDiagnosticsForFile = {};
123400
- let resolvedTypeReferenceDirectives = createModeAwareCache();
123401
123399
  let fileProcessingDiagnostics;
123402
123400
  let automaticTypeDirectiveNames;
123403
123401
  let automaticTypeDirectiveResolutions;
@@ -123703,7 +123701,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
123703
123701
  getInstantiationCount: () => getTypeChecker().getInstantiationCount(),
123704
123702
  getRelationCacheSizes: () => getTypeChecker().getRelationCacheSizes(),
123705
123703
  getFileProcessingDiagnostics: () => fileProcessingDiagnostics,
123706
- getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives,
123707
123704
  getAutomaticTypeDirectiveNames: () => automaticTypeDirectiveNames,
123708
123705
  getAutomaticTypeDirectiveResolutions: () => automaticTypeDirectiveResolutions,
123709
123706
  isSourceFileFromExternalLibrary,
@@ -123722,6 +123719,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
123722
123719
  getResolvedModule,
123723
123720
  getResolvedModuleFromModuleSpecifier,
123724
123721
  getResolvedTypeReferenceDirective,
123722
+ getResolvedTypeReferenceDirectiveFromTypeReferenceDirective,
123725
123723
  forEachResolvedModule,
123726
123724
  forEachResolvedTypeReferenceDirective,
123727
123725
  getCurrentPackagesMap: () => packageMap,
@@ -123817,8 +123815,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
123817
123815
  var _a2;
123818
123816
  return (_a2 = resolvedModules == null ? void 0 : resolvedModules.get(file.path)) == null ? void 0 : _a2.get(moduleName, mode);
123819
123817
  }
123820
- function getResolvedModuleFromModuleSpecifier(moduleSpecifier) {
123821
- const sourceFile = getSourceFileOfNode(moduleSpecifier);
123818
+ function getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile) {
123819
+ sourceFile ?? (sourceFile = getSourceFileOfNode(moduleSpecifier));
123822
123820
  Debug.assertIsDefined(sourceFile, "`moduleSpecifier` must have a `SourceFile` ancestor. Use `program.getResolvedModule` instead to provide the containing file and resolution mode.");
123823
123821
  return getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation2(sourceFile, moduleSpecifier));
123824
123822
  }
@@ -123826,6 +123824,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
123826
123824
  var _a2;
123827
123825
  return (_a2 = resolvedTypeReferenceDirectiveNames == null ? void 0 : resolvedTypeReferenceDirectiveNames.get(file.path)) == null ? void 0 : _a2.get(typeDirectiveName, mode);
123828
123826
  }
123827
+ function getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(typeRef, sourceFile) {
123828
+ return getResolvedTypeReferenceDirective(sourceFile, toFileNameLowerCase(typeRef.fileName), typeRef.resolutionMode || sourceFile.impliedNodeFormat);
123829
+ }
123829
123830
  function forEachResolvedModule(callback, file) {
123830
123831
  forEachResolution(resolvedModules, callback, file);
123831
123832
  }
@@ -124294,7 +124295,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
124294
124295
  files = newSourceFiles;
124295
124296
  fileReasons = oldProgram.getFileIncludeReasons();
124296
124297
  fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
124297
- resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
124298
124298
  automaticTypeDirectiveNames = oldProgram.getAutomaticTypeDirectiveNames();
124299
124299
  automaticTypeDirectiveResolutions = oldProgram.getAutomaticTypeDirectiveResolutions();
124300
124300
  sourceFileToPackageName = oldProgram.sourceFileToPackageName;
@@ -125367,7 +125367,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
125367
125367
  for (let index = 0; index < typeDirectives.length; index++) {
125368
125368
  const ref = file.typeReferenceDirectives[index];
125369
125369
  const resolvedTypeReferenceDirective = resolutions[index];
125370
- const fileName = ref.fileName;
125370
+ const fileName = toFileNameLowerCase(ref.fileName);
125371
125371
  resolutionsInFile.set(fileName, getModeForFileReference(ref, file.impliedNodeFormat), resolvedTypeReferenceDirective);
125372
125372
  const mode = ref.resolutionMode || getDefaultResolutionModeForFile2(file);
125373
125373
  processTypeReferenceDirective(fileName, mode, resolvedTypeReferenceDirective, { kind: 5 /* TypeReferenceDirective */, file: file.path, index });
@@ -125384,53 +125384,19 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
125384
125384
  (_b2 = tracing) == null ? void 0 : _b2.pop();
125385
125385
  }
125386
125386
  function processTypeReferenceDirectiveWorker(typeReferenceDirective, mode, resolution, reason) {
125387
- var _a2;
125388
125387
  addResolutionDiagnostics(resolution);
125389
- const previousResolution = (_a2 = resolvedTypeReferenceDirectives.get(typeReferenceDirective, mode)) == null ? void 0 : _a2.resolvedTypeReferenceDirective;
125390
- if (previousResolution && previousResolution.primary) {
125391
- return;
125392
- }
125393
- let saveResolution = true;
125394
125388
  const { resolvedTypeReferenceDirective } = resolution;
125395
125389
  if (resolvedTypeReferenceDirective) {
125396
125390
  if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth++;
125397
- if (resolvedTypeReferenceDirective.primary) {
125398
- processSourceFile(
125399
- resolvedTypeReferenceDirective.resolvedFileName,
125400
- /*isDefaultLib*/
125401
- false,
125402
- /*ignoreNoDefaultLib*/
125403
- false,
125404
- resolvedTypeReferenceDirective.packageId,
125405
- reason
125406
- );
125407
- } else {
125408
- if (previousResolution) {
125409
- if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
125410
- const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
125411
- const existingFile = getSourceFile(previousResolution.resolvedFileName);
125412
- if (otherFileText !== existingFile.text) {
125413
- addFilePreprocessingFileExplainingDiagnostic(
125414
- existingFile,
125415
- reason,
125416
- Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
125417
- [typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName]
125418
- );
125419
- }
125420
- }
125421
- saveResolution = false;
125422
- } else {
125423
- processSourceFile(
125424
- resolvedTypeReferenceDirective.resolvedFileName,
125425
- /*isDefaultLib*/
125426
- false,
125427
- /*ignoreNoDefaultLib*/
125428
- false,
125429
- resolvedTypeReferenceDirective.packageId,
125430
- reason
125431
- );
125432
- }
125433
- }
125391
+ processSourceFile(
125392
+ resolvedTypeReferenceDirective.resolvedFileName,
125393
+ /*isDefaultLib*/
125394
+ false,
125395
+ /*ignoreNoDefaultLib*/
125396
+ false,
125397
+ resolvedTypeReferenceDirective.packageId,
125398
+ reason
125399
+ );
125434
125400
  if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth--;
125435
125401
  } else {
125436
125402
  addFilePreprocessingFileExplainingDiagnostic(
@@ -125441,9 +125407,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
125441
125407
  [typeReferenceDirective]
125442
125408
  );
125443
125409
  }
125444
- if (saveResolution) {
125445
- resolvedTypeReferenceDirectives.set(typeReferenceDirective, mode, resolution);
125446
- }
125447
125410
  }
125448
125411
  function pathForLibFile(libFileName) {
125449
125412
  const existing = resolvedLibReferences == null ? void 0 : resolvedLibReferences.get(libFileName);
@@ -139730,7 +139693,7 @@ function getSourceFileToImport(importedModuleSymbol, importLiteral, importingSou
139730
139693
  return newFileName === void 0 ? { newFileName: oldFileName, updated: false } : { newFileName, updated: true };
139731
139694
  } else {
139732
139695
  const mode = program.getModeForUsageLocation(importingSourceFile, importLiteral);
139733
- const resolved = host.resolveModuleNameLiterals || !host.resolveModuleNames ? program.getResolvedModuleFromModuleSpecifier(importLiteral) : host.getResolvedModuleWithFailedLookupLocationsFromCache && host.getResolvedModuleWithFailedLookupLocationsFromCache(importLiteral.text, importingSourceFile.fileName, mode);
139696
+ const resolved = host.resolveModuleNameLiterals || !host.resolveModuleNames ? program.getResolvedModuleFromModuleSpecifier(importLiteral, importingSourceFile) : host.getResolvedModuleWithFailedLookupLocationsFromCache && host.getResolvedModuleWithFailedLookupLocationsFromCache(importLiteral.text, importingSourceFile.fileName, mode);
139734
139697
  return getSourceFileToImportFromResolved(importLiteral, resolved, oldToNew, program.getSourceFiles());
139735
139698
  }
139736
139699
  }
@@ -140629,7 +140592,7 @@ function computeSuggestionDiagnostics(sourceFile, program, cancellationToken) {
140629
140592
  const importNode = importFromModuleSpecifier(moduleSpecifier);
140630
140593
  const name = importNameForConvertToDefaultImport(importNode);
140631
140594
  if (!name) continue;
140632
- const module2 = (_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier)) == null ? void 0 : _a.resolvedModule;
140595
+ const module2 = (_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile)) == null ? void 0 : _a.resolvedModule;
140633
140596
  const resolvedFile = module2 && program.getSourceFile(module2.resolvedFileName);
140634
140597
  if (resolvedFile && resolvedFile.externalModuleIndicator && resolvedFile.externalModuleIndicator !== true && isExportAssignment(resolvedFile.externalModuleIndicator) && resolvedFile.externalModuleIndicator.isExportEquals) {
140635
140598
  diags.push(createDiagnosticForNode(name, Diagnostics.Import_may_be_converted_to_a_default_import));
@@ -152322,7 +152285,7 @@ registerCodeFix({
152322
152285
  function fixImportOfModuleExports(importingFile, exportingFile, program, changes, quotePreference) {
152323
152286
  var _a;
152324
152287
  for (const moduleSpecifier of importingFile.imports) {
152325
- const imported = (_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier)) == null ? void 0 : _a.resolvedModule;
152288
+ const imported = (_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier, importingFile)) == null ? void 0 : _a.resolvedModule;
152326
152289
  if (!imported || imported.resolvedFileName !== exportingFile.fileName) {
152327
152290
  continue;
152328
152291
  }
@@ -154682,7 +154645,7 @@ function promoteFromTypeOnly(changes, aliasDeclaration, program, sourceFile, pre
154682
154645
  changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(importClause, sourceFile));
154683
154646
  if (!compilerOptions.allowImportingTsExtensions) {
154684
154647
  const moduleSpecifier = tryGetModuleSpecifierFromDeclaration(importClause.parent);
154685
- const resolvedModule = moduleSpecifier && ((_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier)) == null ? void 0 : _a.resolvedModule);
154648
+ const resolvedModule = moduleSpecifier && ((_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile)) == null ? void 0 : _a.resolvedModule);
154686
154649
  if (resolvedModule == null ? void 0 : resolvedModule.resolvedUsingTsExtension) {
154687
154650
  const changedExtension = changeAnyExtension(moduleSpecifier.text, getOutputExtension(moduleSpecifier.text, compilerOptions));
154688
154651
  changes.replaceNode(sourceFile, moduleSpecifier, factory.createStringLiteral(changedExtension));
@@ -155356,7 +155319,7 @@ function getInfo7(sourceFile, pos, program) {
155356
155319
  if (importDeclaration === void 0) return void 0;
155357
155320
  const moduleSpecifier = isStringLiteral(importDeclaration.moduleSpecifier) ? importDeclaration.moduleSpecifier : void 0;
155358
155321
  if (moduleSpecifier === void 0) return void 0;
155359
- const resolvedModule = (_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier)) == null ? void 0 : _a.resolvedModule;
155322
+ const resolvedModule = (_a = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile)) == null ? void 0 : _a.resolvedModule;
155360
155323
  if (resolvedModule === void 0) return void 0;
155361
155324
  const moduleSourceFile = program.getSourceFile(resolvedModule.resolvedFileName);
155362
155325
  if (moduleSourceFile === void 0 || isSourceFileFromLibrary(program, moduleSourceFile)) return void 0;
@@ -155559,7 +155522,7 @@ function getInfo8(sourceFile, pos, context, errorCode) {
155559
155522
  } else if (isImportSpecifier(parent2) && parent2.name === node) {
155560
155523
  Debug.assertNode(node, isIdentifier, "Expected an identifier for spelling (import)");
155561
155524
  const importDeclaration = findAncestor(node, isImportDeclaration);
155562
- const resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(context, importDeclaration);
155525
+ const resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(context, importDeclaration, sourceFile);
155563
155526
  if (resolvedSourceFile && resolvedSourceFile.symbol) {
155564
155527
  suggestedSymbol = checker.getSuggestedSymbolForNonexistentModule(node, resolvedSourceFile.symbol);
155565
155528
  }
@@ -155609,10 +155572,10 @@ function convertSemanticMeaningToSymbolFlags(meaning) {
155609
155572
  }
155610
155573
  return flags;
155611
155574
  }
155612
- function getResolvedSourceFileFromImportDeclaration(context, importDeclaration) {
155575
+ function getResolvedSourceFileFromImportDeclaration(context, importDeclaration, importingFile) {
155613
155576
  var _a;
155614
155577
  if (!importDeclaration || !isStringLiteralLike(importDeclaration.moduleSpecifier)) return void 0;
155615
- const resolvedModule = (_a = context.program.getResolvedModuleFromModuleSpecifier(importDeclaration.moduleSpecifier)) == null ? void 0 : _a.resolvedModule;
155578
+ const resolvedModule = (_a = context.program.getResolvedModuleFromModuleSpecifier(importDeclaration.moduleSpecifier, importingFile)) == null ? void 0 : _a.resolvedModule;
155616
155579
  if (!resolvedModule) return void 0;
155617
155580
  return context.program.getSourceFile(resolvedModule.resolvedFileName);
155618
155581
  }
@@ -166783,7 +166746,7 @@ function findModuleReferences(program, sourceFiles, searchModuleSymbol) {
166783
166746
  }
166784
166747
  }
166785
166748
  for (const ref of referencingFile.typeReferenceDirectives) {
166786
- const referenced = (_a = program.getResolvedTypeReferenceDirectives().get(ref.fileName, ref.resolutionMode || program.getDefaultResolutionModeForFile(referencingFile))) == null ? void 0 : _a.resolvedTypeReferenceDirective;
166749
+ const referenced = (_a = program.getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(ref, referencingFile)) == null ? void 0 : _a.resolvedTypeReferenceDirective;
166787
166750
  if (referenced !== void 0 && referenced.resolvedFileName === searchSourceFile.fileName) {
166788
166751
  refs.push({ kind: "reference", referencingFile, ref });
166789
166752
  }
@@ -168995,7 +168958,7 @@ function getDefinitionAtPosition(program, sourceFile, position, searchOtherFiles
168995
168958
  }
168996
168959
  }
168997
168960
  if (!symbol && isModuleSpecifierLike(fallbackNode)) {
168998
- const ref = (_a = program.getResolvedModuleFromModuleSpecifier(fallbackNode)) == null ? void 0 : _a.resolvedModule;
168961
+ const ref = (_a = program.getResolvedModuleFromModuleSpecifier(fallbackNode, sourceFile)) == null ? void 0 : _a.resolvedModule;
168999
168962
  if (ref) {
169000
168963
  return [{
169001
168964
  name: fallbackNode.text,
@@ -169092,7 +169055,7 @@ function getReferenceAtPosition(sourceFile, position, program) {
169092
169055
  }
169093
169056
  const typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
169094
169057
  if (typeReferenceDirective) {
169095
- const reference = (_a = program.getResolvedTypeReferenceDirectives().get(typeReferenceDirective.fileName, typeReferenceDirective.resolutionMode || program.getDefaultResolutionModeForFile(sourceFile))) == null ? void 0 : _a.resolvedTypeReferenceDirective;
169058
+ const reference = (_a = program.getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(typeReferenceDirective, sourceFile)) == null ? void 0 : _a.resolvedTypeReferenceDirective;
169096
169059
  const file = reference && program.getSourceFile(reference.resolvedFileName);
169097
169060
  return file && { reference: typeReferenceDirective, fileName: file.fileName, file, unverified: false };
169098
169061
  }
@@ -169104,7 +169067,7 @@ function getReferenceAtPosition(sourceFile, position, program) {
169104
169067
  if (sourceFile.imports.length || sourceFile.moduleAugmentations.length) {
169105
169068
  const node = getTouchingToken(sourceFile, position);
169106
169069
  let resolution;
169107
- if (isModuleSpecifierLike(node) && isExternalModuleNameRelative(node.text) && (resolution = program.getResolvedModuleFromModuleSpecifier(node))) {
169070
+ if (isModuleSpecifierLike(node) && isExternalModuleNameRelative(node.text) && (resolution = program.getResolvedModuleFromModuleSpecifier(node, sourceFile))) {
169108
169071
  const verifiedFileName = (_b = resolution.resolvedModule) == null ? void 0 : _b.resolvedFileName;
169109
169072
  const fileName = verifiedFileName || resolvePath(getDirectoryPath(sourceFile.fileName), node.text);
169110
169073
  return {
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@typescript-deploys/pr-build",
3
3
  "author": "Microsoft Corp.",
4
4
  "homepage": "https://www.typescriptlang.org/",
5
- "version": "5.5.0-pr-58525-2",
5
+ "version": "5.5.0-pr-58528-2",
6
6
  "license": "Apache-2.0",
7
7
  "description": "TypeScript is a language for application scale JavaScript development",
8
8
  "keywords": [