@typescript-deploys/pr-build 5.5.0-pr-58337-46 → 5.5.0-pr-58361-3

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
@@ -18,7 +18,7 @@ and limitations under the License.
18
18
 
19
19
  // src/compiler/corePublic.ts
20
20
  var versionMajorMinor = "5.5";
21
- var version = `${versionMajorMinor}.0-insiders.20240428`;
21
+ var version = `${versionMajorMinor}.0-insiders.20240429`;
22
22
 
23
23
  // src/compiler/core.ts
24
24
  var emptyArray = [];
@@ -13536,7 +13536,8 @@ function createFileDiagnosticFromMessageChain(file, start, length2, messageChain
13536
13536
  code: messageChain.code,
13537
13537
  category: messageChain.category,
13538
13538
  messageText: messageChain.next ? messageChain : messageChain.messageText,
13539
- relatedInformation
13539
+ relatedInformation,
13540
+ canonicalHead: messageChain.canonicalHead
13540
13541
  };
13541
13542
  }
13542
13543
  function createDiagnosticForFileFromMessageChain(sourceFile, messageChain, relatedInformation) {
@@ -13568,6 +13569,12 @@ function createDiagnosticForRange(sourceFile, range, message) {
13568
13569
  messageText: message.message
13569
13570
  };
13570
13571
  }
13572
+ function getCanonicalDiagnostic(message, ...args) {
13573
+ return {
13574
+ code: message.code,
13575
+ messageText: formatMessage(message, ...args)
13576
+ };
13577
+ }
13571
13578
  function getSpanOfTokenAtPosition(sourceFile, pos) {
13572
13579
  const scanner = createScanner(
13573
13580
  sourceFile.languageVersion,
@@ -17380,7 +17387,9 @@ function compareDiagnostics(d1, d2) {
17380
17387
  return compareDiagnosticsSkipRelatedInformation(d1, d2) || compareRelatedInformation(d1, d2) || 0 /* EqualTo */;
17381
17388
  }
17382
17389
  function compareDiagnosticsSkipRelatedInformation(d1, d2) {
17383
- return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(d1.code, d2.code) || compareMessageText(d1.messageText, d2.messageText) || 0 /* EqualTo */;
17390
+ const code1 = getDiagnosticCode(d1);
17391
+ const code2 = getDiagnosticCode(d2);
17392
+ return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(code1, code2) || compareMessageText(d1, d2) || 0 /* EqualTo */;
17384
17393
  }
17385
17394
  function compareRelatedInformation(d1, d2) {
17386
17395
  if (!d1.relatedInformation && !d2.relatedInformation) {
@@ -17394,21 +17403,32 @@ function compareRelatedInformation(d1, d2) {
17394
17403
  }
17395
17404
  return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
17396
17405
  }
17397
- function compareMessageText(t1, t2) {
17398
- if (typeof t1 === "string" && typeof t2 === "string") {
17399
- return compareStringsCaseSensitive(t1, t2);
17406
+ function compareMessageText(d1, d2) {
17407
+ let headMsg1 = getDiagnosticMessage(d1);
17408
+ let headMsg2 = getDiagnosticMessage(d2);
17409
+ if (typeof headMsg1 !== "string") {
17410
+ headMsg1 = headMsg1.messageText;
17400
17411
  }
17401
- if (typeof t1 === "string") {
17402
- t1 = { messageText: t1 };
17412
+ if (typeof headMsg2 !== "string") {
17413
+ headMsg2 = headMsg2.messageText;
17403
17414
  }
17404
- if (typeof t2 === "string") {
17405
- t2 = { messageText: t2 };
17415
+ const chain1 = typeof d1.messageText !== "string" ? d1.messageText.next : void 0;
17416
+ const chain2 = typeof d2.messageText !== "string" ? d2.messageText.next : void 0;
17417
+ let res = compareStringsCaseSensitive(headMsg1, headMsg2);
17418
+ if (res) {
17419
+ return res;
17406
17420
  }
17407
- const res = compareStringsCaseSensitive(t1.messageText, t2.messageText);
17421
+ res = compareMessageChain(chain1, chain2);
17408
17422
  if (res) {
17409
17423
  return res;
17410
17424
  }
17411
- return compareMessageChain(t1.next, t2.next);
17425
+ if (d1.canonicalHead && !d2.canonicalHead) {
17426
+ return -1 /* LessThan */;
17427
+ }
17428
+ if (d2.canonicalHead && !d1.canonicalHead) {
17429
+ return 1 /* GreaterThan */;
17430
+ }
17431
+ return 0 /* EqualTo */;
17412
17432
  }
17413
17433
  function compareMessageChain(c1, c2) {
17414
17434
  if (c1 === void 0 && c2 === void 0) {
@@ -17462,7 +17482,19 @@ function compareMessageChainContent(c1, c2) {
17462
17482
  return 0 /* EqualTo */;
17463
17483
  }
17464
17484
  function diagnosticsEqualityComparer(d1, d2) {
17465
- return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) === 0 /* EqualTo */ && compareValues(d1.start, d2.start) === 0 /* EqualTo */ && compareValues(d1.length, d2.length) === 0 /* EqualTo */ && compareValues(d1.code, d2.code) === 0 /* EqualTo */ && messageTextEqualityComparer(d1.messageText, d2.messageText);
17485
+ const code1 = getDiagnosticCode(d1);
17486
+ const code2 = getDiagnosticCode(d2);
17487
+ const msg1 = getDiagnosticMessage(d1);
17488
+ const msg2 = getDiagnosticMessage(d2);
17489
+ return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) === 0 /* EqualTo */ && compareValues(d1.start, d2.start) === 0 /* EqualTo */ && compareValues(d1.length, d2.length) === 0 /* EqualTo */ && compareValues(code1, code2) === 0 /* EqualTo */ && messageTextEqualityComparer(msg1, msg2);
17490
+ }
17491
+ function getDiagnosticCode(d) {
17492
+ var _a;
17493
+ return ((_a = d.canonicalHead) == null ? void 0 : _a.code) || d.code;
17494
+ }
17495
+ function getDiagnosticMessage(d) {
17496
+ var _a;
17497
+ return ((_a = d.canonicalHead) == null ? void 0 : _a.messageText) || d.messageText;
17466
17498
  }
17467
17499
  function messageTextEqualityComparer(m1, m2) {
17468
17500
  const t1 = typeof m1 === "string" ? m1 : m1.messageText;
@@ -46996,6 +47028,7 @@ function createTypeChecker(host) {
46996
47028
  );
46997
47029
  const message = meaning === 1920 /* Namespace */ || nameArg && typeof nameArg !== "string" && nodeIsSynthesized(nameArg) ? Diagnostics.Cannot_find_namespace_0_Did_you_mean_1 : isUncheckedJS ? Diagnostics.Could_not_find_name_0_Did_you_mean_1 : Diagnostics.Cannot_find_name_0_Did_you_mean_1;
46998
47030
  const diagnostic = createError(errorLocation, message, diagnosticName(nameArg), suggestionName);
47031
+ diagnostic.canonicalHead = getCanonicalDiagnostic(nameNotFoundMessage, diagnosticName(nameArg));
46999
47032
  addErrorOrSuggestion(!isUncheckedJS, diagnostic);
47000
47033
  if (suggestion.valueDeclaration) {
47001
47034
  addRelatedInfo(
@@ -54774,7 +54807,7 @@ function createTypeChecker(host) {
54774
54807
  }
54775
54808
  type = anyType;
54776
54809
  }
54777
- links.type ?? (links.type = type);
54810
+ links.type = type;
54778
54811
  }
54779
54812
  return links.type;
54780
54813
  }
@@ -54792,7 +54825,7 @@ function createTypeChecker(host) {
54792
54825
  }
54793
54826
  writeType = anyType;
54794
54827
  }
54795
- links.writeType ?? (links.writeType = writeType || getTypeOfAccessors(symbol));
54828
+ links.writeType = writeType || getTypeOfAccessors(symbol);
54796
54829
  }
54797
54830
  return links.writeType;
54798
54831
  }
@@ -54869,10 +54902,10 @@ function createTypeChecker(host) {
54869
54902
  true
54870
54903
  );
54871
54904
  const declaredType = firstDefined(exportSymbol == null ? void 0 : exportSymbol.declarations, (d) => isExportAssignment(d) ? tryGetTypeFromEffectiveTypeNode(d) : void 0);
54872
- links.type ?? (links.type = (exportSymbol == null ? void 0 : exportSymbol.declarations) && isDuplicatedCommonJSExport(exportSymbol.declarations) && symbol.declarations.length ? getFlowTypeFromCommonJSExport(exportSymbol) : isDuplicatedCommonJSExport(symbol.declarations) ? autoType : declaredType ? declaredType : getSymbolFlags(targetSymbol) & 111551 /* Value */ ? getTypeOfSymbol(targetSymbol) : errorType);
54905
+ links.type = (exportSymbol == null ? void 0 : exportSymbol.declarations) && isDuplicatedCommonJSExport(exportSymbol.declarations) && symbol.declarations.length ? getFlowTypeFromCommonJSExport(exportSymbol) : isDuplicatedCommonJSExport(symbol.declarations) ? autoType : declaredType ? declaredType : getSymbolFlags(targetSymbol) & 111551 /* Value */ ? getTypeOfSymbol(targetSymbol) : errorType;
54873
54906
  if (!popTypeResolution()) {
54874
54907
  reportCircularityError(exportSymbol ?? symbol);
54875
- return links.type ?? (links.type = errorType);
54908
+ return links.type = errorType;
54876
54909
  }
54877
54910
  }
54878
54911
  return links.type;
@@ -55138,7 +55171,7 @@ function createTypeChecker(host) {
55138
55171
  }
55139
55172
  if (!popTypeResolution()) {
55140
55173
  error(type.symbol.valueDeclaration, Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_base_expression, symbolToString(type.symbol));
55141
- return type.resolvedBaseConstructorType ?? (type.resolvedBaseConstructorType = errorType);
55174
+ return type.resolvedBaseConstructorType = errorType;
55142
55175
  }
55143
55176
  if (!(baseConstructorType.flags & 1 /* Any */) && baseConstructorType !== nullWideningType && !isConstructorType(baseConstructorType)) {
55144
55177
  const err = error(baseTypeNode.expression, Diagnostics.Type_0_is_not_a_constructor_function_type, typeToString(baseConstructorType));
@@ -55155,9 +55188,9 @@ function createTypeChecker(host) {
55155
55188
  addRelatedInfo(err, createDiagnosticForNode(baseConstructorType.symbol.declarations[0], Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
55156
55189
  }
55157
55190
  }
55158
- return type.resolvedBaseConstructorType ?? (type.resolvedBaseConstructorType = errorType);
55191
+ return type.resolvedBaseConstructorType = errorType;
55159
55192
  }
55160
- type.resolvedBaseConstructorType ?? (type.resolvedBaseConstructorType = baseConstructorType);
55193
+ type.resolvedBaseConstructorType = baseConstructorType;
55161
55194
  }
55162
55195
  return type.resolvedBaseConstructorType;
55163
55196
  }
@@ -55398,7 +55431,7 @@ function createTypeChecker(host) {
55398
55431
  error(isNamedDeclaration(declaration) ? declaration.name || declaration : declaration, Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
55399
55432
  }
55400
55433
  }
55401
- links.declaredType ?? (links.declaredType = type);
55434
+ links.declaredType = type;
55402
55435
  }
55403
55436
  return links.declaredType;
55404
55437
  }
@@ -56516,7 +56549,6 @@ function createTypeChecker(host) {
56516
56549
  }
56517
56550
  }
56518
56551
  function getTypeOfMappedSymbol(symbol) {
56519
- var _a;
56520
56552
  if (!symbol.links.type) {
56521
56553
  const mappedType = symbol.links.mappedType;
56522
56554
  if (!pushTypeResolution(symbol, 0 /* Type */)) {
@@ -56535,7 +56567,7 @@ function createTypeChecker(host) {
56535
56567
  error(currentNode, Diagnostics.Type_of_property_0_circularly_references_itself_in_mapped_type_1, symbolToString(symbol), typeToString(mappedType));
56536
56568
  type = errorType;
56537
56569
  }
56538
- (_a = symbol.links).type ?? (_a.type = type);
56570
+ symbol.links.type = type;
56539
56571
  }
56540
56572
  return symbol.links.type;
56541
56573
  }
@@ -56888,7 +56920,7 @@ function createTypeChecker(host) {
56888
56920
  }
56889
56921
  result = circularConstraintType;
56890
56922
  }
56891
- t.immediateBaseConstraint ?? (t.immediateBaseConstraint = result || noConstraintType);
56923
+ t.immediateBaseConstraint = result || noConstraintType;
56892
56924
  }
56893
56925
  return t.immediateBaseConstraint;
56894
56926
  }
@@ -57762,7 +57794,7 @@ function createTypeChecker(host) {
57762
57794
  }
57763
57795
  type = anyType;
57764
57796
  }
57765
- signature.resolvedReturnType ?? (signature.resolvedReturnType = type);
57797
+ signature.resolvedReturnType = type;
57766
57798
  }
57767
57799
  return signature.resolvedReturnType;
57768
57800
  }
@@ -58108,9 +58140,9 @@ function createTypeChecker(host) {
58108
58140
  const node = type.node;
58109
58141
  const typeArguments = !node ? emptyArray : node.kind === 183 /* TypeReference */ ? concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) : node.kind === 188 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : map(node.elements, getTypeFromTypeNode);
58110
58142
  if (popTypeResolution()) {
58111
- type.resolvedTypeArguments ?? (type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments);
58143
+ type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments;
58112
58144
  } else {
58113
- type.resolvedTypeArguments ?? (type.resolvedTypeArguments = ((_b = type.target.localTypeParameters) == null ? void 0 : _b.map(() => errorType)) || emptyArray);
58145
+ type.resolvedTypeArguments = ((_b = type.target.localTypeParameters) == null ? void 0 : _b.map(() => errorType)) || emptyArray;
58114
58146
  error(
58115
58147
  type.node || currentNode,
58116
58148
  type.target.symbol ? Diagnostics.Type_arguments_for_0_circularly_reference_themselves : Diagnostics.Tuple_type_arguments_circularly_reference_themselves,
@@ -63169,6 +63201,16 @@ function createTypeChecker(host) {
63169
63201
  errorInfo = elaborateNeverIntersection(errorInfo, originalTarget);
63170
63202
  }
63171
63203
  if (!headMessage2 && maybeSuppress) {
63204
+ const savedErrorState = captureErrorCalculationState();
63205
+ reportRelationError(headMessage2, source2, target2);
63206
+ let canonical;
63207
+ if (errorInfo && errorInfo !== savedErrorState.errorInfo) {
63208
+ canonical = { code: errorInfo.code, messageText: errorInfo.messageText };
63209
+ }
63210
+ resetErrorInfo(savedErrorState);
63211
+ if (canonical && errorInfo) {
63212
+ errorInfo.canonicalHead = canonical;
63213
+ }
63172
63214
  lastSkippedInfo = [source2, target2];
63173
63215
  return;
63174
63216
  }
@@ -65157,7 +65199,6 @@ function createTypeChecker(host) {
65157
65199
  if (!links.variances) {
65158
65200
  (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
65159
65201
  const oldVarianceComputation = inVarianceComputation;
65160
- const saveResolutionStart = resolutionStart;
65161
65202
  if (!inVarianceComputation) {
65162
65203
  inVarianceComputation = true;
65163
65204
  resolutionStart = resolutionTargets.length;
@@ -65192,7 +65233,7 @@ function createTypeChecker(host) {
65192
65233
  }
65193
65234
  if (!oldVarianceComputation) {
65194
65235
  inVarianceComputation = false;
65195
- resolutionStart = saveResolutionStart;
65236
+ resolutionStart = 0;
65196
65237
  }
65197
65238
  links.variances = variances;
65198
65239
  (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
@@ -69385,7 +69426,7 @@ function createTypeChecker(host) {
69385
69426
  reportCircularityError(declaration.symbol);
69386
69427
  return true;
69387
69428
  }
69388
- links.parameterInitializerContainsUndefined ?? (links.parameterInitializerContainsUndefined = containsUndefined);
69429
+ links.parameterInitializerContainsUndefined = containsUndefined;
69389
69430
  }
69390
69431
  return links.parameterInitializerContainsUndefined;
69391
69432
  }
@@ -74794,13 +74835,8 @@ function createTypeChecker(host) {
74794
74835
  if (cached && cached !== resolvingSignature && !candidatesOutArray) {
74795
74836
  return cached;
74796
74837
  }
74797
- const saveResolutionStart = resolutionStart;
74798
- if (!cached) {
74799
- resolutionStart = resolutionTargets.length;
74800
- }
74801
74838
  links.resolvedSignature = resolvingSignature;
74802
74839
  let result = resolveSignature(node, candidatesOutArray, checkMode || 0 /* Normal */);
74803
- resolutionStart = saveResolutionStart;
74804
74840
  if (result !== resolvingSignature) {
74805
74841
  if (links.resolvedSignature !== resolvingSignature) {
74806
74842
  result = links.resolvedSignature;
@@ -118932,7 +118968,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
118932
118968
  const createProgramOptions = isArray(rootNamesOrOptions) ? createCreateProgramOptions(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) : rootNamesOrOptions;
118933
118969
  const { rootNames, options, configFileParsingDiagnostics, projectReferences, typeScriptVersion: typeScriptVersion2 } = createProgramOptions;
118934
118970
  let { oldProgram } = createProgramOptions;
118935
- const reportInvalidIgnoreDeprecations = memoize(() => createOptionValueDiagnostic("ignoreDeprecations", Diagnostics.Invalid_value_for_ignoreDeprecations));
118936
118971
  let processingDefaultLibFiles;
118937
118972
  let processingOtherFiles;
118938
118973
  let files;
@@ -119219,6 +119254,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
119219
119254
  resolvedLibProcessing = void 0;
119220
119255
  resolvedModulesProcessing = void 0;
119221
119256
  resolvedTypeReferenceDirectiveNamesProcessing = void 0;
119257
+ let ignoreDeprecationsVersion;
119222
119258
  const program = {
119223
119259
  getRootFileNames: () => rootNames,
119224
119260
  getSourceFile,
@@ -121470,22 +121506,26 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
121470
121506
  }
121471
121507
  }
121472
121508
  function getIgnoreDeprecationsVersion() {
121473
- const ignoreDeprecations = options.ignoreDeprecations;
121474
- if (ignoreDeprecations) {
121475
- if (ignoreDeprecations === "5.0") {
121476
- return new Version(ignoreDeprecations);
121509
+ if (!ignoreDeprecationsVersion) {
121510
+ ignoreDeprecationsVersion = Version.zero;
121511
+ const ignoreDeprecations = options.ignoreDeprecations;
121512
+ if (ignoreDeprecations) {
121513
+ if (ignoreDeprecations === "5.0") {
121514
+ ignoreDeprecationsVersion = new Version(ignoreDeprecations);
121515
+ } else {
121516
+ createOptionValueDiagnostic("ignoreDeprecations", Diagnostics.Invalid_value_for_ignoreDeprecations);
121517
+ }
121477
121518
  }
121478
- reportInvalidIgnoreDeprecations();
121479
121519
  }
121480
- return Version.zero;
121520
+ return ignoreDeprecationsVersion;
121481
121521
  }
121482
121522
  function checkDeprecations(deprecatedIn, removedIn, createDiagnostic, fn) {
121483
121523
  const deprecatedInVersion = new Version(deprecatedIn);
121484
121524
  const removedInVersion = new Version(removedIn);
121485
121525
  const typescriptVersion = new Version(typeScriptVersion2 || versionMajorMinor);
121486
- const ignoreDeprecationsVersion = getIgnoreDeprecationsVersion();
121526
+ const ignoreDeprecationsVersion2 = getIgnoreDeprecationsVersion();
121487
121527
  const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion) === 1 /* GreaterThan */);
121488
- const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion.compareTo(deprecatedInVersion) === -1 /* LessThan */;
121528
+ const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion2.compareTo(deprecatedInVersion) === -1 /* LessThan */;
121489
121529
  if (mustBeRemoved || canBeSilenced) {
121490
121530
  fn((name, value, useInstead) => {
121491
121531
  if (mustBeRemoved) {
package/lib/typescript.js CHANGED
@@ -685,6 +685,7 @@ __export(typescript_exports, {
685
685
  getBuildOrderFromAnyBuildOrder: () => getBuildOrderFromAnyBuildOrder,
686
686
  getBuilderCreationParameters: () => getBuilderCreationParameters,
687
687
  getBuilderFileEmit: () => getBuilderFileEmit,
688
+ getCanonicalDiagnostic: () => getCanonicalDiagnostic,
688
689
  getCheckFlags: () => getCheckFlags,
689
690
  getClassExtendsHeritageElement: () => getClassExtendsHeritageElement,
690
691
  getClassLikeDeclarationOfSymbol: () => getClassLikeDeclarationOfSymbol,
@@ -2361,7 +2362,7 @@ module.exports = __toCommonJS(typescript_exports);
2361
2362
 
2362
2363
  // src/compiler/corePublic.ts
2363
2364
  var versionMajorMinor = "5.5";
2364
- var version = `${versionMajorMinor}.0-insiders.20240428`;
2365
+ var version = `${versionMajorMinor}.0-insiders.20240429`;
2365
2366
  var Comparison = /* @__PURE__ */ ((Comparison3) => {
2366
2367
  Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
2367
2368
  Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -17460,7 +17461,8 @@ function createFileDiagnosticFromMessageChain(file, start, length2, messageChain
17460
17461
  code: messageChain.code,
17461
17462
  category: messageChain.category,
17462
17463
  messageText: messageChain.next ? messageChain : messageChain.messageText,
17463
- relatedInformation
17464
+ relatedInformation,
17465
+ canonicalHead: messageChain.canonicalHead
17464
17466
  };
17465
17467
  }
17466
17468
  function createDiagnosticForFileFromMessageChain(sourceFile, messageChain, relatedInformation) {
@@ -17492,6 +17494,12 @@ function createDiagnosticForRange(sourceFile, range, message) {
17492
17494
  messageText: message.message
17493
17495
  };
17494
17496
  }
17497
+ function getCanonicalDiagnostic(message, ...args) {
17498
+ return {
17499
+ code: message.code,
17500
+ messageText: formatMessage(message, ...args)
17501
+ };
17502
+ }
17495
17503
  function getSpanOfTokenAtPosition(sourceFile, pos) {
17496
17504
  const scanner2 = createScanner(
17497
17505
  sourceFile.languageVersion,
@@ -21625,7 +21633,9 @@ function compareDiagnostics(d1, d2) {
21625
21633
  return compareDiagnosticsSkipRelatedInformation(d1, d2) || compareRelatedInformation(d1, d2) || 0 /* EqualTo */;
21626
21634
  }
21627
21635
  function compareDiagnosticsSkipRelatedInformation(d1, d2) {
21628
- return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(d1.code, d2.code) || compareMessageText(d1.messageText, d2.messageText) || 0 /* EqualTo */;
21636
+ const code1 = getDiagnosticCode(d1);
21637
+ const code2 = getDiagnosticCode(d2);
21638
+ return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(code1, code2) || compareMessageText(d1, d2) || 0 /* EqualTo */;
21629
21639
  }
21630
21640
  function compareRelatedInformation(d1, d2) {
21631
21641
  if (!d1.relatedInformation && !d2.relatedInformation) {
@@ -21639,21 +21649,32 @@ function compareRelatedInformation(d1, d2) {
21639
21649
  }
21640
21650
  return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
21641
21651
  }
21642
- function compareMessageText(t1, t2) {
21643
- if (typeof t1 === "string" && typeof t2 === "string") {
21644
- return compareStringsCaseSensitive(t1, t2);
21652
+ function compareMessageText(d1, d2) {
21653
+ let headMsg1 = getDiagnosticMessage(d1);
21654
+ let headMsg2 = getDiagnosticMessage(d2);
21655
+ if (typeof headMsg1 !== "string") {
21656
+ headMsg1 = headMsg1.messageText;
21645
21657
  }
21646
- if (typeof t1 === "string") {
21647
- t1 = { messageText: t1 };
21658
+ if (typeof headMsg2 !== "string") {
21659
+ headMsg2 = headMsg2.messageText;
21648
21660
  }
21649
- if (typeof t2 === "string") {
21650
- t2 = { messageText: t2 };
21661
+ const chain1 = typeof d1.messageText !== "string" ? d1.messageText.next : void 0;
21662
+ const chain2 = typeof d2.messageText !== "string" ? d2.messageText.next : void 0;
21663
+ let res = compareStringsCaseSensitive(headMsg1, headMsg2);
21664
+ if (res) {
21665
+ return res;
21651
21666
  }
21652
- const res = compareStringsCaseSensitive(t1.messageText, t2.messageText);
21667
+ res = compareMessageChain(chain1, chain2);
21653
21668
  if (res) {
21654
21669
  return res;
21655
21670
  }
21656
- return compareMessageChain(t1.next, t2.next);
21671
+ if (d1.canonicalHead && !d2.canonicalHead) {
21672
+ return -1 /* LessThan */;
21673
+ }
21674
+ if (d2.canonicalHead && !d1.canonicalHead) {
21675
+ return 1 /* GreaterThan */;
21676
+ }
21677
+ return 0 /* EqualTo */;
21657
21678
  }
21658
21679
  function compareMessageChain(c1, c2) {
21659
21680
  if (c1 === void 0 && c2 === void 0) {
@@ -21707,7 +21728,19 @@ function compareMessageChainContent(c1, c2) {
21707
21728
  return 0 /* EqualTo */;
21708
21729
  }
21709
21730
  function diagnosticsEqualityComparer(d1, d2) {
21710
- return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) === 0 /* EqualTo */ && compareValues(d1.start, d2.start) === 0 /* EqualTo */ && compareValues(d1.length, d2.length) === 0 /* EqualTo */ && compareValues(d1.code, d2.code) === 0 /* EqualTo */ && messageTextEqualityComparer(d1.messageText, d2.messageText);
21731
+ const code1 = getDiagnosticCode(d1);
21732
+ const code2 = getDiagnosticCode(d2);
21733
+ const msg1 = getDiagnosticMessage(d1);
21734
+ const msg2 = getDiagnosticMessage(d2);
21735
+ return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) === 0 /* EqualTo */ && compareValues(d1.start, d2.start) === 0 /* EqualTo */ && compareValues(d1.length, d2.length) === 0 /* EqualTo */ && compareValues(code1, code2) === 0 /* EqualTo */ && messageTextEqualityComparer(msg1, msg2);
21736
+ }
21737
+ function getDiagnosticCode(d) {
21738
+ var _a;
21739
+ return ((_a = d.canonicalHead) == null ? void 0 : _a.code) || d.code;
21740
+ }
21741
+ function getDiagnosticMessage(d) {
21742
+ var _a;
21743
+ return ((_a = d.canonicalHead) == null ? void 0 : _a.messageText) || d.messageText;
21711
21744
  }
21712
21745
  function messageTextEqualityComparer(m1, m2) {
21713
21746
  const t1 = typeof m1 === "string" ? m1 : m1.messageText;
@@ -51826,6 +51859,7 @@ function createTypeChecker(host) {
51826
51859
  );
51827
51860
  const message = meaning === 1920 /* Namespace */ || nameArg && typeof nameArg !== "string" && nodeIsSynthesized(nameArg) ? Diagnostics.Cannot_find_namespace_0_Did_you_mean_1 : isUncheckedJS ? Diagnostics.Could_not_find_name_0_Did_you_mean_1 : Diagnostics.Cannot_find_name_0_Did_you_mean_1;
51828
51861
  const diagnostic = createError(errorLocation, message, diagnosticName(nameArg), suggestionName);
51862
+ diagnostic.canonicalHead = getCanonicalDiagnostic(nameNotFoundMessage, diagnosticName(nameArg));
51829
51863
  addErrorOrSuggestion(!isUncheckedJS, diagnostic);
51830
51864
  if (suggestion.valueDeclaration) {
51831
51865
  addRelatedInfo(
@@ -59604,7 +59638,7 @@ function createTypeChecker(host) {
59604
59638
  }
59605
59639
  type = anyType;
59606
59640
  }
59607
- links.type ?? (links.type = type);
59641
+ links.type = type;
59608
59642
  }
59609
59643
  return links.type;
59610
59644
  }
@@ -59622,7 +59656,7 @@ function createTypeChecker(host) {
59622
59656
  }
59623
59657
  writeType = anyType;
59624
59658
  }
59625
- links.writeType ?? (links.writeType = writeType || getTypeOfAccessors(symbol));
59659
+ links.writeType = writeType || getTypeOfAccessors(symbol);
59626
59660
  }
59627
59661
  return links.writeType;
59628
59662
  }
@@ -59699,10 +59733,10 @@ function createTypeChecker(host) {
59699
59733
  true
59700
59734
  );
59701
59735
  const declaredType = firstDefined(exportSymbol == null ? void 0 : exportSymbol.declarations, (d) => isExportAssignment(d) ? tryGetTypeFromEffectiveTypeNode(d) : void 0);
59702
- links.type ?? (links.type = (exportSymbol == null ? void 0 : exportSymbol.declarations) && isDuplicatedCommonJSExport(exportSymbol.declarations) && symbol.declarations.length ? getFlowTypeFromCommonJSExport(exportSymbol) : isDuplicatedCommonJSExport(symbol.declarations) ? autoType : declaredType ? declaredType : getSymbolFlags(targetSymbol) & 111551 /* Value */ ? getTypeOfSymbol(targetSymbol) : errorType);
59736
+ links.type = (exportSymbol == null ? void 0 : exportSymbol.declarations) && isDuplicatedCommonJSExport(exportSymbol.declarations) && symbol.declarations.length ? getFlowTypeFromCommonJSExport(exportSymbol) : isDuplicatedCommonJSExport(symbol.declarations) ? autoType : declaredType ? declaredType : getSymbolFlags(targetSymbol) & 111551 /* Value */ ? getTypeOfSymbol(targetSymbol) : errorType;
59703
59737
  if (!popTypeResolution()) {
59704
59738
  reportCircularityError(exportSymbol ?? symbol);
59705
- return links.type ?? (links.type = errorType);
59739
+ return links.type = errorType;
59706
59740
  }
59707
59741
  }
59708
59742
  return links.type;
@@ -59968,7 +60002,7 @@ function createTypeChecker(host) {
59968
60002
  }
59969
60003
  if (!popTypeResolution()) {
59970
60004
  error2(type.symbol.valueDeclaration, Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_base_expression, symbolToString(type.symbol));
59971
- return type.resolvedBaseConstructorType ?? (type.resolvedBaseConstructorType = errorType);
60005
+ return type.resolvedBaseConstructorType = errorType;
59972
60006
  }
59973
60007
  if (!(baseConstructorType.flags & 1 /* Any */) && baseConstructorType !== nullWideningType && !isConstructorType(baseConstructorType)) {
59974
60008
  const err = error2(baseTypeNode.expression, Diagnostics.Type_0_is_not_a_constructor_function_type, typeToString(baseConstructorType));
@@ -59985,9 +60019,9 @@ function createTypeChecker(host) {
59985
60019
  addRelatedInfo(err, createDiagnosticForNode(baseConstructorType.symbol.declarations[0], Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
59986
60020
  }
59987
60021
  }
59988
- return type.resolvedBaseConstructorType ?? (type.resolvedBaseConstructorType = errorType);
60022
+ return type.resolvedBaseConstructorType = errorType;
59989
60023
  }
59990
- type.resolvedBaseConstructorType ?? (type.resolvedBaseConstructorType = baseConstructorType);
60024
+ type.resolvedBaseConstructorType = baseConstructorType;
59991
60025
  }
59992
60026
  return type.resolvedBaseConstructorType;
59993
60027
  }
@@ -60228,7 +60262,7 @@ function createTypeChecker(host) {
60228
60262
  error2(isNamedDeclaration(declaration) ? declaration.name || declaration : declaration, Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
60229
60263
  }
60230
60264
  }
60231
- links.declaredType ?? (links.declaredType = type);
60265
+ links.declaredType = type;
60232
60266
  }
60233
60267
  return links.declaredType;
60234
60268
  }
@@ -61346,7 +61380,6 @@ function createTypeChecker(host) {
61346
61380
  }
61347
61381
  }
61348
61382
  function getTypeOfMappedSymbol(symbol) {
61349
- var _a;
61350
61383
  if (!symbol.links.type) {
61351
61384
  const mappedType = symbol.links.mappedType;
61352
61385
  if (!pushTypeResolution(symbol, 0 /* Type */)) {
@@ -61365,7 +61398,7 @@ function createTypeChecker(host) {
61365
61398
  error2(currentNode, Diagnostics.Type_of_property_0_circularly_references_itself_in_mapped_type_1, symbolToString(symbol), typeToString(mappedType));
61366
61399
  type = errorType;
61367
61400
  }
61368
- (_a = symbol.links).type ?? (_a.type = type);
61401
+ symbol.links.type = type;
61369
61402
  }
61370
61403
  return symbol.links.type;
61371
61404
  }
@@ -61718,7 +61751,7 @@ function createTypeChecker(host) {
61718
61751
  }
61719
61752
  result = circularConstraintType;
61720
61753
  }
61721
- t.immediateBaseConstraint ?? (t.immediateBaseConstraint = result || noConstraintType);
61754
+ t.immediateBaseConstraint = result || noConstraintType;
61722
61755
  }
61723
61756
  return t.immediateBaseConstraint;
61724
61757
  }
@@ -62592,7 +62625,7 @@ function createTypeChecker(host) {
62592
62625
  }
62593
62626
  type = anyType;
62594
62627
  }
62595
- signature.resolvedReturnType ?? (signature.resolvedReturnType = type);
62628
+ signature.resolvedReturnType = type;
62596
62629
  }
62597
62630
  return signature.resolvedReturnType;
62598
62631
  }
@@ -62938,9 +62971,9 @@ function createTypeChecker(host) {
62938
62971
  const node = type.node;
62939
62972
  const typeArguments = !node ? emptyArray : node.kind === 183 /* TypeReference */ ? concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments2(node, type.target.localTypeParameters)) : node.kind === 188 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : map(node.elements, getTypeFromTypeNode);
62940
62973
  if (popTypeResolution()) {
62941
- type.resolvedTypeArguments ?? (type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments);
62974
+ type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments;
62942
62975
  } else {
62943
- type.resolvedTypeArguments ?? (type.resolvedTypeArguments = ((_b = type.target.localTypeParameters) == null ? void 0 : _b.map(() => errorType)) || emptyArray);
62976
+ type.resolvedTypeArguments = ((_b = type.target.localTypeParameters) == null ? void 0 : _b.map(() => errorType)) || emptyArray;
62944
62977
  error2(
62945
62978
  type.node || currentNode,
62946
62979
  type.target.symbol ? Diagnostics.Type_arguments_for_0_circularly_reference_themselves : Diagnostics.Tuple_type_arguments_circularly_reference_themselves,
@@ -67999,6 +68032,16 @@ function createTypeChecker(host) {
67999
68032
  errorInfo = elaborateNeverIntersection(errorInfo, originalTarget);
68000
68033
  }
68001
68034
  if (!headMessage2 && maybeSuppress) {
68035
+ const savedErrorState = captureErrorCalculationState();
68036
+ reportRelationError(headMessage2, source2, target2);
68037
+ let canonical;
68038
+ if (errorInfo && errorInfo !== savedErrorState.errorInfo) {
68039
+ canonical = { code: errorInfo.code, messageText: errorInfo.messageText };
68040
+ }
68041
+ resetErrorInfo(savedErrorState);
68042
+ if (canonical && errorInfo) {
68043
+ errorInfo.canonicalHead = canonical;
68044
+ }
68002
68045
  lastSkippedInfo = [source2, target2];
68003
68046
  return;
68004
68047
  }
@@ -69987,7 +70030,6 @@ function createTypeChecker(host) {
69987
70030
  if (!links.variances) {
69988
70031
  (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
69989
70032
  const oldVarianceComputation = inVarianceComputation;
69990
- const saveResolutionStart = resolutionStart;
69991
70033
  if (!inVarianceComputation) {
69992
70034
  inVarianceComputation = true;
69993
70035
  resolutionStart = resolutionTargets.length;
@@ -70022,7 +70064,7 @@ function createTypeChecker(host) {
70022
70064
  }
70023
70065
  if (!oldVarianceComputation) {
70024
70066
  inVarianceComputation = false;
70025
- resolutionStart = saveResolutionStart;
70067
+ resolutionStart = 0;
70026
70068
  }
70027
70069
  links.variances = variances;
70028
70070
  (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
@@ -74215,7 +74257,7 @@ function createTypeChecker(host) {
74215
74257
  reportCircularityError(declaration.symbol);
74216
74258
  return true;
74217
74259
  }
74218
- links.parameterInitializerContainsUndefined ?? (links.parameterInitializerContainsUndefined = containsUndefined);
74260
+ links.parameterInitializerContainsUndefined = containsUndefined;
74219
74261
  }
74220
74262
  return links.parameterInitializerContainsUndefined;
74221
74263
  }
@@ -79624,13 +79666,8 @@ function createTypeChecker(host) {
79624
79666
  if (cached && cached !== resolvingSignature && !candidatesOutArray) {
79625
79667
  return cached;
79626
79668
  }
79627
- const saveResolutionStart = resolutionStart;
79628
- if (!cached) {
79629
- resolutionStart = resolutionTargets.length;
79630
- }
79631
79669
  links.resolvedSignature = resolvingSignature;
79632
79670
  let result = resolveSignature(node, candidatesOutArray, checkMode || 0 /* Normal */);
79633
- resolutionStart = saveResolutionStart;
79634
79671
  if (result !== resolvingSignature) {
79635
79672
  if (links.resolvedSignature !== resolvingSignature) {
79636
79673
  result = links.resolvedSignature;
@@ -124006,7 +124043,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
124006
124043
  const createProgramOptions = isArray(rootNamesOrOptions) ? createCreateProgramOptions(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) : rootNamesOrOptions;
124007
124044
  const { rootNames, options, configFileParsingDiagnostics, projectReferences, typeScriptVersion: typeScriptVersion3 } = createProgramOptions;
124008
124045
  let { oldProgram } = createProgramOptions;
124009
- const reportInvalidIgnoreDeprecations = memoize(() => createOptionValueDiagnostic("ignoreDeprecations", Diagnostics.Invalid_value_for_ignoreDeprecations));
124010
124046
  let processingDefaultLibFiles;
124011
124047
  let processingOtherFiles;
124012
124048
  let files;
@@ -124293,6 +124329,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
124293
124329
  resolvedLibProcessing = void 0;
124294
124330
  resolvedModulesProcessing = void 0;
124295
124331
  resolvedTypeReferenceDirectiveNamesProcessing = void 0;
124332
+ let ignoreDeprecationsVersion;
124296
124333
  const program = {
124297
124334
  getRootFileNames: () => rootNames,
124298
124335
  getSourceFile,
@@ -126544,22 +126581,26 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
126544
126581
  }
126545
126582
  }
126546
126583
  function getIgnoreDeprecationsVersion() {
126547
- const ignoreDeprecations = options.ignoreDeprecations;
126548
- if (ignoreDeprecations) {
126549
- if (ignoreDeprecations === "5.0") {
126550
- return new Version(ignoreDeprecations);
126584
+ if (!ignoreDeprecationsVersion) {
126585
+ ignoreDeprecationsVersion = Version.zero;
126586
+ const ignoreDeprecations = options.ignoreDeprecations;
126587
+ if (ignoreDeprecations) {
126588
+ if (ignoreDeprecations === "5.0") {
126589
+ ignoreDeprecationsVersion = new Version(ignoreDeprecations);
126590
+ } else {
126591
+ createOptionValueDiagnostic("ignoreDeprecations", Diagnostics.Invalid_value_for_ignoreDeprecations);
126592
+ }
126551
126593
  }
126552
- reportInvalidIgnoreDeprecations();
126553
126594
  }
126554
- return Version.zero;
126595
+ return ignoreDeprecationsVersion;
126555
126596
  }
126556
126597
  function checkDeprecations(deprecatedIn, removedIn, createDiagnostic, fn) {
126557
126598
  const deprecatedInVersion = new Version(deprecatedIn);
126558
126599
  const removedInVersion = new Version(removedIn);
126559
126600
  const typescriptVersion = new Version(typeScriptVersion3 || versionMajorMinor);
126560
- const ignoreDeprecationsVersion = getIgnoreDeprecationsVersion();
126601
+ const ignoreDeprecationsVersion2 = getIgnoreDeprecationsVersion();
126561
126602
  const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion) === 1 /* GreaterThan */);
126562
- const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion.compareTo(deprecatedInVersion) === -1 /* LessThan */;
126603
+ const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion2.compareTo(deprecatedInVersion) === -1 /* LessThan */;
126563
126604
  if (mustBeRemoved || canBeSilenced) {
126564
126605
  fn((name, value, useInstead) => {
126565
126606
  if (mustBeRemoved) {
@@ -178471,6 +178512,7 @@ __export(ts_exports2, {
178471
178512
  getBuildOrderFromAnyBuildOrder: () => getBuildOrderFromAnyBuildOrder,
178472
178513
  getBuilderCreationParameters: () => getBuilderCreationParameters,
178473
178514
  getBuilderFileEmit: () => getBuilderFileEmit,
178515
+ getCanonicalDiagnostic: () => getCanonicalDiagnostic,
178474
178516
  getCheckFlags: () => getCheckFlags,
178475
178517
  getClassExtendsHeritageElement: () => getClassExtendsHeritageElement,
178476
178518
  getClassLikeDeclarationOfSymbol: () => getClassLikeDeclarationOfSymbol,
@@ -192898,6 +192940,7 @@ if (typeof console !== "undefined") {
192898
192940
  getBuildOrderFromAnyBuildOrder,
192899
192941
  getBuilderCreationParameters,
192900
192942
  getBuilderFileEmit,
192943
+ getCanonicalDiagnostic,
192901
192944
  getCheckFlags,
192902
192945
  getClassExtendsHeritageElement,
192903
192946
  getClassLikeDeclarationOfSymbol,
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-58337-46",
5
+ "version": "5.5.0-pr-58361-3",
6
6
  "license": "Apache-2.0",
7
7
  "description": "TypeScript is a language for application scale JavaScript development",
8
8
  "keywords": [