@typescript-deploys/pr-build 5.3.0-pr-55371-11 → 5.3.0-pr-55452-7

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.3";
21
- var version = `${versionMajorMinor}.0-insiders.20230824`;
21
+ var version = `${versionMajorMinor}.0-insiders.20230825`;
22
22
 
23
23
  // src/compiler/core.ts
24
24
  var emptyArray = [];
@@ -17484,6 +17484,9 @@ function getPropertyNameFromType(type) {
17484
17484
  }
17485
17485
  return Debug.fail();
17486
17486
  }
17487
+ function isNamedTupleMemberName(node) {
17488
+ return node.kind === 80 /* Identifier */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 15 /* NoSubstitutionTemplateLiteral */;
17489
+ }
17487
17490
 
17488
17491
  // src/compiler/factory/baseNodeFactory.ts
17489
17492
  function createBaseNodeFactory() {
@@ -28657,21 +28660,29 @@ var Parser;
28657
28660
  }
28658
28661
  return type;
28659
28662
  }
28660
- function isNextTokenColonOrQuestionColon() {
28661
- return nextToken() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
28663
+ function isTokenColonOrQuestionColon() {
28664
+ return token() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
28662
28665
  }
28663
28666
  function isTupleElementName() {
28664
28667
  if (token() === 26 /* DotDotDotToken */) {
28665
- return tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon();
28668
+ nextToken();
28669
+ }
28670
+ if (token() === 16 /* TemplateHead */) {
28671
+ parseTemplateType();
28672
+ return isTokenColonOrQuestionColon();
28673
+ }
28674
+ if (tokenIsIdentifierOrKeyword(token()) || token() === 15 /* NoSubstitutionTemplateLiteral */) {
28675
+ nextToken();
28676
+ return isTokenColonOrQuestionColon();
28666
28677
  }
28667
- return tokenIsIdentifierOrKeyword(token()) && isNextTokenColonOrQuestionColon();
28678
+ return false;
28668
28679
  }
28669
28680
  function parseTupleElementNameOrTupleElementType() {
28670
28681
  if (lookAhead(isTupleElementName)) {
28671
28682
  const pos = getNodePos();
28672
28683
  const hasJSDoc = hasPrecedingJSDocComment();
28673
28684
  const dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
28674
- const name = parseIdentifierName();
28685
+ const name = token() === 15 /* NoSubstitutionTemplateLiteral */ ? parseLiteralLikeNode(token()) : token() === 16 /* TemplateHead */ ? parseTemplateType() : parseIdentifierName();
28675
28686
  const questionToken = parseOptionalToken(58 /* QuestionToken */);
28676
28687
  parseExpected(59 /* ColonToken */);
28677
28688
  const type = parseTupleElementType();
@@ -48083,10 +48094,11 @@ function createTypeChecker(host) {
48083
48094
  for (let i = 0; i < tupleConstituentNodes.length; i++) {
48084
48095
  const flags = type2.target.elementFlags[i];
48085
48096
  const labeledElementDeclaration = labeledElementDeclarations == null ? void 0 : labeledElementDeclarations[i];
48086
- if (labeledElementDeclaration) {
48097
+ const label = labeledElementDeclaration && getTupleElementLabel(type2, labeledElementDeclaration);
48098
+ if (label) {
48087
48099
  tupleConstituentNodes[i] = factory.createNamedTupleMember(
48088
48100
  flags & 12 /* Variable */ ? factory.createToken(26 /* DotDotDotToken */) : void 0,
48089
- factory.createIdentifier(unescapeLeadingUnderscores(getTupleElementLabel(labeledElementDeclaration))),
48101
+ factory.createIdentifier(unescapeLeadingUnderscores(label)),
48090
48102
  flags & 2 /* Optional */ ? factory.createToken(58 /* QuestionToken */) : void 0,
48091
48103
  flags & 4 /* Rest */ ? factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]
48092
48104
  );
@@ -53310,7 +53322,7 @@ function createTypeChecker(host) {
53310
53322
  function getUniqAssociatedNamesFromTupleType(type, restName) {
53311
53323
  const associatedNamesMap = /* @__PURE__ */ new Map();
53312
53324
  return map(type.target.labeledElementDeclarations, (labeledElement, i) => {
53313
- const name = getTupleElementLabel(labeledElement, i, restName);
53325
+ const name = getTupleElementLabel(type, labeledElement, i, restName);
53314
53326
  const prevCounter = associatedNamesMap.get(name);
53315
53327
  if (prevCounter === void 0) {
53316
53328
  associatedNamesMap.set(name, 1);
@@ -61225,9 +61237,6 @@ function createTypeChecker(host) {
61225
61237
  }
61226
61238
  instantiateType(source2, reportUnreliableMapper);
61227
61239
  }
61228
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(target2) && isTypeAssignableTo(source2, stringType) && isTypeAssignableTo(target2.types[0], stringType)) {
61229
- return isRelatedTo(source2, target2.types[0], 3 /* Both */, reportErrors2);
61230
- }
61231
61240
  if (isTypeMatchedByTemplateLiteralType(source2, target2)) {
61232
61241
  return -1 /* True */;
61233
61242
  }
@@ -61278,9 +61287,6 @@ function createTypeChecker(host) {
61278
61287
  }
61279
61288
  } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
61280
61289
  if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
61281
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(source2) && isTypeAssignableTo(source2.types[0], stringType) && isTypeAssignableTo(target2, stringType)) {
61282
- return isRelatedTo(source2.types[0], target2, 3 /* Both */, reportErrors2);
61283
- }
61284
61290
  const constraint = getBaseConstraintOfType(source2);
61285
61291
  if (constraint && constraint !== source2 && (result2 = isRelatedTo(constraint, target2, 1 /* Source */, reportErrors2))) {
61286
61292
  return result2;
@@ -63405,13 +63411,6 @@ function createTypeChecker(host) {
63405
63411
  }
63406
63412
  return false;
63407
63413
  }
63408
- function isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(type) {
63409
- if (!(type.flags & 134217728 /* TemplateLiteral */)) {
63410
- return false;
63411
- }
63412
- const texts = type.texts;
63413
- return texts.length === 2 && texts[0] === "" && texts[1] === "";
63414
- }
63415
63414
  function isValidTypeForTemplateLiteralPlaceholder(source, target) {
63416
63415
  if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
63417
63416
  return true;
@@ -63431,8 +63430,9 @@ function createTypeChecker(host) {
63431
63430
  false
63432
63431
  ) || target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName || target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target) || target.flags & 134217728 /* TemplateLiteral */ && isTypeMatchedByTemplateLiteralType(source, target));
63433
63432
  }
63434
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(source)) {
63435
- return isTypeAssignableTo(source.types[0], target);
63433
+ if (source.flags & 134217728 /* TemplateLiteral */) {
63434
+ const texts = source.texts;
63435
+ return texts.length === 2 && texts[0] === "" && texts[1] === "" && isTypeAssignableTo(source.types[0], target);
63436
63436
  }
63437
63437
  return isTypeAssignableTo(source, target);
63438
63438
  }
@@ -72099,11 +72099,18 @@ function createTypeChecker(host) {
72099
72099
  !!declaration && (hasInitializer(declaration) || isOptionalDeclaration(declaration))
72100
72100
  );
72101
72101
  }
72102
- function getTupleElementLabel(d, index, restParameterName = "arg") {
72102
+ function getTupleElementLabel(tupleType, d, index, restParameterName = "arg") {
72103
72103
  if (!d) {
72104
72104
  return `${restParameterName}_${index}`;
72105
72105
  }
72106
- Debug.assert(isIdentifier(d.name));
72106
+ Debug.assert(!isBindingPattern(d.name));
72107
+ if (d.name.kind === 203 /* TemplateLiteralType */) {
72108
+ const label = instantiateType(getTypeFromTypeNode(d.name), tupleType.mapper);
72109
+ return label.flags & 128 /* StringLiteral */ ? escapeLeadingUnderscores(label.value) : typeof index === "number" ? `${restParameterName}_${index}` : void 0;
72110
+ }
72111
+ if (d.name.kind === 15 /* NoSubstitutionTemplateLiteral */) {
72112
+ return escapeLeadingUnderscores(d.name.text);
72113
+ }
72107
72114
  return d.name.escapedText;
72108
72115
  }
72109
72116
  function getParameterNameAtPosition(signature, pos, overrideRestType) {
@@ -72116,7 +72123,7 @@ function createTypeChecker(host) {
72116
72123
  if (isTupleType(restType)) {
72117
72124
  const associatedNames = restType.target.labeledElementDeclarations;
72118
72125
  const index = pos - paramCount;
72119
- return getTupleElementLabel(associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
72126
+ return getTupleElementLabel(restType, associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
72120
72127
  }
72121
72128
  return restParameter.escapedName;
72122
72129
  }
@@ -72146,8 +72153,7 @@ function createTypeChecker(host) {
72146
72153
  const index = pos - paramCount;
72147
72154
  const associatedName = associatedNames == null ? void 0 : associatedNames[index];
72148
72155
  const isRestTupleElement = !!(associatedName == null ? void 0 : associatedName.dotDotDotToken);
72149
- if (associatedName) {
72150
- Debug.assert(isIdentifier(associatedName.name));
72156
+ if (associatedName && isIdentifier(associatedName.name)) {
72151
72157
  return { parameter: associatedName.name, parameterName: associatedName.name.escapedText, isRestParameter: isRestTupleElement };
72152
72158
  }
72153
72159
  return void 0;
@@ -75652,6 +75658,9 @@ function createTypeChecker(host) {
75652
75658
  if (node.type.kind === 191 /* RestType */) {
75653
75659
  grammarErrorOnNode(node.type, Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type);
75654
75660
  }
75661
+ if (node.name.kind === 203 /* TemplateLiteralType */) {
75662
+ checkSourceElement(node.name);
75663
+ }
75655
75664
  checkSourceElement(node.type);
75656
75665
  getTypeFromTypeNode(node);
75657
75666
  }
@@ -84463,7 +84472,7 @@ var visitEachChildTable = {
84463
84472
  return context.factory.updateNamedTupleMember(
84464
84473
  node,
84465
84474
  tokenVisitor ? nodeVisitor(node.dotDotDotToken, tokenVisitor, isDotDotDotToken) : node.dotDotDotToken,
84466
- Debug.checkDefined(nodeVisitor(node.name, visitor, isIdentifier)),
84475
+ Debug.checkDefined(nodeVisitor(node.name, visitor, isNamedTupleMemberName)),
84467
84476
  tokenVisitor ? nodeVisitor(node.questionToken, tokenVisitor, isQuestionToken) : node.questionToken,
84468
84477
  Debug.checkDefined(nodeVisitor(node.type, visitor, isTypeNode))
84469
84478
  );
package/lib/tsserver.js CHANGED
@@ -1587,6 +1587,7 @@ __export(server_exports, {
1587
1587
  isNamedImports: () => isNamedImports,
1588
1588
  isNamedImportsOrExports: () => isNamedImportsOrExports,
1589
1589
  isNamedTupleMember: () => isNamedTupleMember,
1590
+ isNamedTupleMemberName: () => isNamedTupleMemberName,
1590
1591
  isNamespaceBody: () => isNamespaceBody,
1591
1592
  isNamespaceExport: () => isNamespaceExport,
1592
1593
  isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -2333,7 +2334,7 @@ module.exports = __toCommonJS(server_exports);
2333
2334
 
2334
2335
  // src/compiler/corePublic.ts
2335
2336
  var versionMajorMinor = "5.3";
2336
- var version = `${versionMajorMinor}.0-insiders.20230824`;
2337
+ var version = `${versionMajorMinor}.0-insiders.20230825`;
2337
2338
  var Comparison = /* @__PURE__ */ ((Comparison3) => {
2338
2339
  Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
2339
2340
  Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -21685,6 +21686,9 @@ function getPropertyNameFromType(type) {
21685
21686
  }
21686
21687
  return Debug.fail();
21687
21688
  }
21689
+ function isNamedTupleMemberName(node) {
21690
+ return node.kind === 80 /* Identifier */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 15 /* NoSubstitutionTemplateLiteral */;
21691
+ }
21688
21692
 
21689
21693
  // src/compiler/factory/baseNodeFactory.ts
21690
21694
  function createBaseNodeFactory() {
@@ -33059,21 +33063,29 @@ var Parser;
33059
33063
  }
33060
33064
  return type;
33061
33065
  }
33062
- function isNextTokenColonOrQuestionColon() {
33063
- return nextToken() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
33066
+ function isTokenColonOrQuestionColon() {
33067
+ return token() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
33064
33068
  }
33065
33069
  function isTupleElementName() {
33066
33070
  if (token() === 26 /* DotDotDotToken */) {
33067
- return tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon();
33071
+ nextToken();
33072
+ }
33073
+ if (token() === 16 /* TemplateHead */) {
33074
+ parseTemplateType();
33075
+ return isTokenColonOrQuestionColon();
33076
+ }
33077
+ if (tokenIsIdentifierOrKeyword(token()) || token() === 15 /* NoSubstitutionTemplateLiteral */) {
33078
+ nextToken();
33079
+ return isTokenColonOrQuestionColon();
33068
33080
  }
33069
- return tokenIsIdentifierOrKeyword(token()) && isNextTokenColonOrQuestionColon();
33081
+ return false;
33070
33082
  }
33071
33083
  function parseTupleElementNameOrTupleElementType() {
33072
33084
  if (lookAhead(isTupleElementName)) {
33073
33085
  const pos = getNodePos();
33074
33086
  const hasJSDoc = hasPrecedingJSDocComment();
33075
33087
  const dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
33076
- const name = parseIdentifierName();
33088
+ const name = token() === 15 /* NoSubstitutionTemplateLiteral */ ? parseLiteralLikeNode(token()) : token() === 16 /* TemplateHead */ ? parseTemplateType() : parseIdentifierName();
33077
33089
  const questionToken = parseOptionalToken(58 /* QuestionToken */);
33078
33090
  parseExpected(59 /* ColonToken */);
33079
33091
  const type = parseTupleElementType();
@@ -52791,10 +52803,11 @@ function createTypeChecker(host) {
52791
52803
  for (let i = 0; i < tupleConstituentNodes.length; i++) {
52792
52804
  const flags = type2.target.elementFlags[i];
52793
52805
  const labeledElementDeclaration = labeledElementDeclarations == null ? void 0 : labeledElementDeclarations[i];
52794
- if (labeledElementDeclaration) {
52806
+ const label = labeledElementDeclaration && getTupleElementLabel(type2, labeledElementDeclaration);
52807
+ if (label) {
52795
52808
  tupleConstituentNodes[i] = factory.createNamedTupleMember(
52796
52809
  flags & 12 /* Variable */ ? factory.createToken(26 /* DotDotDotToken */) : void 0,
52797
- factory.createIdentifier(unescapeLeadingUnderscores(getTupleElementLabel(labeledElementDeclaration))),
52810
+ factory.createIdentifier(unescapeLeadingUnderscores(label)),
52798
52811
  flags & 2 /* Optional */ ? factory.createToken(58 /* QuestionToken */) : void 0,
52799
52812
  flags & 4 /* Rest */ ? factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]
52800
52813
  );
@@ -58018,7 +58031,7 @@ function createTypeChecker(host) {
58018
58031
  function getUniqAssociatedNamesFromTupleType(type, restName) {
58019
58032
  const associatedNamesMap = /* @__PURE__ */ new Map();
58020
58033
  return map(type.target.labeledElementDeclarations, (labeledElement, i) => {
58021
- const name = getTupleElementLabel(labeledElement, i, restName);
58034
+ const name = getTupleElementLabel(type, labeledElement, i, restName);
58022
58035
  const prevCounter = associatedNamesMap.get(name);
58023
58036
  if (prevCounter === void 0) {
58024
58037
  associatedNamesMap.set(name, 1);
@@ -65933,9 +65946,6 @@ function createTypeChecker(host) {
65933
65946
  }
65934
65947
  instantiateType(source2, reportUnreliableMapper);
65935
65948
  }
65936
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(target2) && isTypeAssignableTo(source2, stringType) && isTypeAssignableTo(target2.types[0], stringType)) {
65937
- return isRelatedTo(source2, target2.types[0], 3 /* Both */, reportErrors2);
65938
- }
65939
65949
  if (isTypeMatchedByTemplateLiteralType(source2, target2)) {
65940
65950
  return -1 /* True */;
65941
65951
  }
@@ -65986,9 +65996,6 @@ function createTypeChecker(host) {
65986
65996
  }
65987
65997
  } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
65988
65998
  if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
65989
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(source2) && isTypeAssignableTo(source2.types[0], stringType) && isTypeAssignableTo(target2, stringType)) {
65990
- return isRelatedTo(source2.types[0], target2, 3 /* Both */, reportErrors2);
65991
- }
65992
65999
  const constraint = getBaseConstraintOfType(source2);
65993
66000
  if (constraint && constraint !== source2 && (result2 = isRelatedTo(constraint, target2, 1 /* Source */, reportErrors2))) {
65994
66001
  return result2;
@@ -68113,13 +68120,6 @@ function createTypeChecker(host) {
68113
68120
  }
68114
68121
  return false;
68115
68122
  }
68116
- function isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(type) {
68117
- if (!(type.flags & 134217728 /* TemplateLiteral */)) {
68118
- return false;
68119
- }
68120
- const texts = type.texts;
68121
- return texts.length === 2 && texts[0] === "" && texts[1] === "";
68122
- }
68123
68123
  function isValidTypeForTemplateLiteralPlaceholder(source, target) {
68124
68124
  if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
68125
68125
  return true;
@@ -68139,8 +68139,9 @@ function createTypeChecker(host) {
68139
68139
  false
68140
68140
  ) || target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName || target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target) || target.flags & 134217728 /* TemplateLiteral */ && isTypeMatchedByTemplateLiteralType(source, target));
68141
68141
  }
68142
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(source)) {
68143
- return isTypeAssignableTo(source.types[0], target);
68142
+ if (source.flags & 134217728 /* TemplateLiteral */) {
68143
+ const texts = source.texts;
68144
+ return texts.length === 2 && texts[0] === "" && texts[1] === "" && isTypeAssignableTo(source.types[0], target);
68144
68145
  }
68145
68146
  return isTypeAssignableTo(source, target);
68146
68147
  }
@@ -76807,11 +76808,18 @@ function createTypeChecker(host) {
76807
76808
  !!declaration && (hasInitializer(declaration) || isOptionalDeclaration(declaration))
76808
76809
  );
76809
76810
  }
76810
- function getTupleElementLabel(d, index, restParameterName = "arg") {
76811
+ function getTupleElementLabel(tupleType, d, index, restParameterName = "arg") {
76811
76812
  if (!d) {
76812
76813
  return `${restParameterName}_${index}`;
76813
76814
  }
76814
- Debug.assert(isIdentifier(d.name));
76815
+ Debug.assert(!isBindingPattern(d.name));
76816
+ if (d.name.kind === 203 /* TemplateLiteralType */) {
76817
+ const label = instantiateType(getTypeFromTypeNode(d.name), tupleType.mapper);
76818
+ return label.flags & 128 /* StringLiteral */ ? escapeLeadingUnderscores(label.value) : typeof index === "number" ? `${restParameterName}_${index}` : void 0;
76819
+ }
76820
+ if (d.name.kind === 15 /* NoSubstitutionTemplateLiteral */) {
76821
+ return escapeLeadingUnderscores(d.name.text);
76822
+ }
76815
76823
  return d.name.escapedText;
76816
76824
  }
76817
76825
  function getParameterNameAtPosition(signature, pos, overrideRestType) {
@@ -76824,7 +76832,7 @@ function createTypeChecker(host) {
76824
76832
  if (isTupleType(restType)) {
76825
76833
  const associatedNames = restType.target.labeledElementDeclarations;
76826
76834
  const index = pos - paramCount;
76827
- return getTupleElementLabel(associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
76835
+ return getTupleElementLabel(restType, associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
76828
76836
  }
76829
76837
  return restParameter.escapedName;
76830
76838
  }
@@ -76854,8 +76862,7 @@ function createTypeChecker(host) {
76854
76862
  const index = pos - paramCount;
76855
76863
  const associatedName = associatedNames == null ? void 0 : associatedNames[index];
76856
76864
  const isRestTupleElement = !!(associatedName == null ? void 0 : associatedName.dotDotDotToken);
76857
- if (associatedName) {
76858
- Debug.assert(isIdentifier(associatedName.name));
76865
+ if (associatedName && isIdentifier(associatedName.name)) {
76859
76866
  return { parameter: associatedName.name, parameterName: associatedName.name.escapedText, isRestParameter: isRestTupleElement };
76860
76867
  }
76861
76868
  return void 0;
@@ -80360,6 +80367,9 @@ function createTypeChecker(host) {
80360
80367
  if (node.type.kind === 191 /* RestType */) {
80361
80368
  grammarErrorOnNode(node.type, Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type);
80362
80369
  }
80370
+ if (node.name.kind === 203 /* TemplateLiteralType */) {
80371
+ checkSourceElement(node.name);
80372
+ }
80363
80373
  checkSourceElement(node.type);
80364
80374
  getTypeFromTypeNode(node);
80365
80375
  }
@@ -89171,7 +89181,7 @@ var visitEachChildTable = {
89171
89181
  return context.factory.updateNamedTupleMember(
89172
89182
  node,
89173
89183
  tokenVisitor ? nodeVisitor(node.dotDotDotToken, tokenVisitor, isDotDotDotToken) : node.dotDotDotToken,
89174
- Debug.checkDefined(nodeVisitor(node.name, visitor, isIdentifier)),
89184
+ Debug.checkDefined(nodeVisitor(node.name, visitor, isNamedTupleMemberName)),
89175
89185
  tokenVisitor ? nodeVisitor(node.questionToken, tokenVisitor, isQuestionToken) : node.questionToken,
89176
89186
  Debug.checkDefined(nodeVisitor(node.type, visitor, isTypeNode))
89177
89187
  );
@@ -173516,6 +173526,7 @@ __export(ts_exports2, {
173516
173526
  isNamedImports: () => isNamedImports,
173517
173527
  isNamedImportsOrExports: () => isNamedImportsOrExports,
173518
173528
  isNamedTupleMember: () => isNamedTupleMember,
173529
+ isNamedTupleMemberName: () => isNamedTupleMemberName,
173519
173530
  isNamespaceBody: () => isNamespaceBody,
173520
173531
  isNamespaceExport: () => isNamespaceExport,
173521
173532
  isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -188079,6 +188090,7 @@ start(initializeNodeSystem(), require("os").platform());
188079
188090
  isNamedImports,
188080
188091
  isNamedImportsOrExports,
188081
188092
  isNamedTupleMember,
188093
+ isNamedTupleMemberName,
188082
188094
  isNamespaceBody,
188083
188095
  isNamespaceExport,
188084
188096
  isNamespaceExportDeclaration,
@@ -5196,10 +5196,11 @@ declare namespace ts {
5196
5196
  readonly kind: SyntaxKind.TupleType;
5197
5197
  readonly elements: NodeArray<TypeNode | NamedTupleMember>;
5198
5198
  }
5199
+ type NamedTupleMemberName = Identifier | NoSubstitutionTemplateLiteral | TemplateLiteralTypeNode;
5199
5200
  interface NamedTupleMember extends TypeNode, Declaration, JSDocContainer {
5200
5201
  readonly kind: SyntaxKind.NamedTupleMember;
5201
5202
  readonly dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
5202
- readonly name: Identifier;
5203
+ readonly name: NamedTupleMemberName;
5203
5204
  readonly questionToken?: Token<SyntaxKind.QuestionToken>;
5204
5205
  readonly type: TypeNode;
5205
5206
  }
@@ -7932,8 +7933,8 @@ declare namespace ts {
7932
7933
  updateArrayTypeNode(node: ArrayTypeNode, elementType: TypeNode): ArrayTypeNode;
7933
7934
  createTupleTypeNode(elements: readonly (TypeNode | NamedTupleMember)[]): TupleTypeNode;
7934
7935
  updateTupleTypeNode(node: TupleTypeNode, elements: readonly (TypeNode | NamedTupleMember)[]): TupleTypeNode;
7935
- createNamedTupleMember(dotDotDotToken: DotDotDotToken | undefined, name: Identifier, questionToken: QuestionToken | undefined, type: TypeNode): NamedTupleMember;
7936
- updateNamedTupleMember(node: NamedTupleMember, dotDotDotToken: DotDotDotToken | undefined, name: Identifier, questionToken: QuestionToken | undefined, type: TypeNode): NamedTupleMember;
7936
+ createNamedTupleMember(dotDotDotToken: DotDotDotToken | undefined, name: NamedTupleMemberName, questionToken: QuestionToken | undefined, type: TypeNode): NamedTupleMember;
7937
+ updateNamedTupleMember(node: NamedTupleMember, dotDotDotToken: DotDotDotToken | undefined, name: NamedTupleMemberName, questionToken: QuestionToken | undefined, type: TypeNode): NamedTupleMember;
7937
7938
  createOptionalTypeNode(type: TypeNode): OptionalTypeNode;
7938
7939
  updateOptionalTypeNode(node: OptionalTypeNode, type: TypeNode): OptionalTypeNode;
7939
7940
  createRestTypeNode(type: TypeNode): RestTypeNode;
package/lib/typescript.js CHANGED
@@ -35,7 +35,7 @@ var ts = (() => {
35
35
  "src/compiler/corePublic.ts"() {
36
36
  "use strict";
37
37
  versionMajorMinor = "5.3";
38
- version = `${versionMajorMinor}.0-insiders.20230824`;
38
+ version = `${versionMajorMinor}.0-insiders.20230825`;
39
39
  Comparison = /* @__PURE__ */ ((Comparison3) => {
40
40
  Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
41
41
  Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -18907,6 +18907,9 @@ ${lanes.join("\n")}
18907
18907
  }
18908
18908
  return Debug.fail();
18909
18909
  }
18910
+ function isNamedTupleMemberName(node) {
18911
+ return node.kind === 80 /* Identifier */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 15 /* NoSubstitutionTemplateLiteral */;
18912
+ }
18910
18913
  var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, getScriptTargetFeatures, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashLibReferenceRegEx, fullTripleSlashAMDReferencePathRegEx, fullTripleSlashAMDModuleRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed, objectAllocator, objectAllocatorPatchers, localizedDiagnosticMessages, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, extensionsNotSupportingExtensionlessResolution, ModuleSpecifierEnding, extensionsToRemove, emptyFileSystemEntries;
18911
18914
  var init_utilities = __esm({
18912
18915
  "src/compiler/utilities.ts"() {
@@ -31126,21 +31129,29 @@ ${lanes.join("\n")}
31126
31129
  }
31127
31130
  return type;
31128
31131
  }
31129
- function isNextTokenColonOrQuestionColon() {
31130
- return nextToken() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
31132
+ function isTokenColonOrQuestionColon() {
31133
+ return token() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
31131
31134
  }
31132
31135
  function isTupleElementName() {
31133
31136
  if (token() === 26 /* DotDotDotToken */) {
31134
- return tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon();
31137
+ nextToken();
31138
+ }
31139
+ if (token() === 16 /* TemplateHead */) {
31140
+ parseTemplateType();
31141
+ return isTokenColonOrQuestionColon();
31142
+ }
31143
+ if (tokenIsIdentifierOrKeyword(token()) || token() === 15 /* NoSubstitutionTemplateLiteral */) {
31144
+ nextToken();
31145
+ return isTokenColonOrQuestionColon();
31135
31146
  }
31136
- return tokenIsIdentifierOrKeyword(token()) && isNextTokenColonOrQuestionColon();
31147
+ return false;
31137
31148
  }
31138
31149
  function parseTupleElementNameOrTupleElementType() {
31139
31150
  if (lookAhead(isTupleElementName)) {
31140
31151
  const pos = getNodePos();
31141
31152
  const hasJSDoc = hasPrecedingJSDocComment();
31142
31153
  const dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
31143
- const name = parseIdentifierName();
31154
+ const name = token() === 15 /* NoSubstitutionTemplateLiteral */ ? parseLiteralLikeNode(token()) : token() === 16 /* TemplateHead */ ? parseTemplateType() : parseIdentifierName();
31144
31155
  const questionToken = parseOptionalToken(58 /* QuestionToken */);
31145
31156
  parseExpected(59 /* ColonToken */);
31146
31157
  const type = parseTupleElementType();
@@ -50552,10 +50563,11 @@ ${lanes.join("\n")}
50552
50563
  for (let i = 0; i < tupleConstituentNodes.length; i++) {
50553
50564
  const flags = type2.target.elementFlags[i];
50554
50565
  const labeledElementDeclaration = labeledElementDeclarations == null ? void 0 : labeledElementDeclarations[i];
50555
- if (labeledElementDeclaration) {
50566
+ const label = labeledElementDeclaration && getTupleElementLabel(type2, labeledElementDeclaration);
50567
+ if (label) {
50556
50568
  tupleConstituentNodes[i] = factory.createNamedTupleMember(
50557
50569
  flags & 12 /* Variable */ ? factory.createToken(26 /* DotDotDotToken */) : void 0,
50558
- factory.createIdentifier(unescapeLeadingUnderscores(getTupleElementLabel(labeledElementDeclaration))),
50570
+ factory.createIdentifier(unescapeLeadingUnderscores(label)),
50559
50571
  flags & 2 /* Optional */ ? factory.createToken(58 /* QuestionToken */) : void 0,
50560
50572
  flags & 4 /* Rest */ ? factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]
50561
50573
  );
@@ -55779,7 +55791,7 @@ ${lanes.join("\n")}
55779
55791
  function getUniqAssociatedNamesFromTupleType(type, restName) {
55780
55792
  const associatedNamesMap = /* @__PURE__ */ new Map();
55781
55793
  return map(type.target.labeledElementDeclarations, (labeledElement, i) => {
55782
- const name = getTupleElementLabel(labeledElement, i, restName);
55794
+ const name = getTupleElementLabel(type, labeledElement, i, restName);
55783
55795
  const prevCounter = associatedNamesMap.get(name);
55784
55796
  if (prevCounter === void 0) {
55785
55797
  associatedNamesMap.set(name, 1);
@@ -63694,9 +63706,6 @@ ${lanes.join("\n")}
63694
63706
  }
63695
63707
  instantiateType(source2, reportUnreliableMapper);
63696
63708
  }
63697
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(target2) && isTypeAssignableTo(source2, stringType) && isTypeAssignableTo(target2.types[0], stringType)) {
63698
- return isRelatedTo(source2, target2.types[0], 3 /* Both */, reportErrors2);
63699
- }
63700
63709
  if (isTypeMatchedByTemplateLiteralType(source2, target2)) {
63701
63710
  return -1 /* True */;
63702
63711
  }
@@ -63747,9 +63756,6 @@ ${lanes.join("\n")}
63747
63756
  }
63748
63757
  } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
63749
63758
  if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
63750
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(source2) && isTypeAssignableTo(source2.types[0], stringType) && isTypeAssignableTo(target2, stringType)) {
63751
- return isRelatedTo(source2.types[0], target2, 3 /* Both */, reportErrors2);
63752
- }
63753
63759
  const constraint = getBaseConstraintOfType(source2);
63754
63760
  if (constraint && constraint !== source2 && (result2 = isRelatedTo(constraint, target2, 1 /* Source */, reportErrors2))) {
63755
63761
  return result2;
@@ -65874,13 +65880,6 @@ ${lanes.join("\n")}
65874
65880
  }
65875
65881
  return false;
65876
65882
  }
65877
- function isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(type) {
65878
- if (!(type.flags & 134217728 /* TemplateLiteral */)) {
65879
- return false;
65880
- }
65881
- const texts = type.texts;
65882
- return texts.length === 2 && texts[0] === "" && texts[1] === "";
65883
- }
65884
65883
  function isValidTypeForTemplateLiteralPlaceholder(source, target) {
65885
65884
  if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
65886
65885
  return true;
@@ -65900,8 +65899,9 @@ ${lanes.join("\n")}
65900
65899
  false
65901
65900
  ) || target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName || target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target) || target.flags & 134217728 /* TemplateLiteral */ && isTypeMatchedByTemplateLiteralType(source, target));
65902
65901
  }
65903
- if (isTemplateLiteralTypeWithSinglePlaceholderAndNoExtraTexts(source)) {
65904
- return isTypeAssignableTo(source.types[0], target);
65902
+ if (source.flags & 134217728 /* TemplateLiteral */) {
65903
+ const texts = source.texts;
65904
+ return texts.length === 2 && texts[0] === "" && texts[1] === "" && isTypeAssignableTo(source.types[0], target);
65905
65905
  }
65906
65906
  return isTypeAssignableTo(source, target);
65907
65907
  }
@@ -74568,11 +74568,18 @@ ${lanes.join("\n")}
74568
74568
  !!declaration && (hasInitializer(declaration) || isOptionalDeclaration(declaration))
74569
74569
  );
74570
74570
  }
74571
- function getTupleElementLabel(d, index, restParameterName = "arg") {
74571
+ function getTupleElementLabel(tupleType, d, index, restParameterName = "arg") {
74572
74572
  if (!d) {
74573
74573
  return `${restParameterName}_${index}`;
74574
74574
  }
74575
- Debug.assert(isIdentifier(d.name));
74575
+ Debug.assert(!isBindingPattern(d.name));
74576
+ if (d.name.kind === 203 /* TemplateLiteralType */) {
74577
+ const label = instantiateType(getTypeFromTypeNode(d.name), tupleType.mapper);
74578
+ return label.flags & 128 /* StringLiteral */ ? escapeLeadingUnderscores(label.value) : typeof index === "number" ? `${restParameterName}_${index}` : void 0;
74579
+ }
74580
+ if (d.name.kind === 15 /* NoSubstitutionTemplateLiteral */) {
74581
+ return escapeLeadingUnderscores(d.name.text);
74582
+ }
74576
74583
  return d.name.escapedText;
74577
74584
  }
74578
74585
  function getParameterNameAtPosition(signature, pos, overrideRestType) {
@@ -74585,7 +74592,7 @@ ${lanes.join("\n")}
74585
74592
  if (isTupleType(restType)) {
74586
74593
  const associatedNames = restType.target.labeledElementDeclarations;
74587
74594
  const index = pos - paramCount;
74588
- return getTupleElementLabel(associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
74595
+ return getTupleElementLabel(restType, associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
74589
74596
  }
74590
74597
  return restParameter.escapedName;
74591
74598
  }
@@ -74615,8 +74622,7 @@ ${lanes.join("\n")}
74615
74622
  const index = pos - paramCount;
74616
74623
  const associatedName = associatedNames == null ? void 0 : associatedNames[index];
74617
74624
  const isRestTupleElement = !!(associatedName == null ? void 0 : associatedName.dotDotDotToken);
74618
- if (associatedName) {
74619
- Debug.assert(isIdentifier(associatedName.name));
74625
+ if (associatedName && isIdentifier(associatedName.name)) {
74620
74626
  return { parameter: associatedName.name, parameterName: associatedName.name.escapedText, isRestParameter: isRestTupleElement };
74621
74627
  }
74622
74628
  return void 0;
@@ -78121,6 +78127,9 @@ ${lanes.join("\n")}
78121
78127
  if (node.type.kind === 191 /* RestType */) {
78122
78128
  grammarErrorOnNode(node.type, Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type);
78123
78129
  }
78130
+ if (node.name.kind === 203 /* TemplateLiteralType */) {
78131
+ checkSourceElement(node.name);
78132
+ }
78124
78133
  checkSourceElement(node.type);
78125
78134
  getTypeFromTypeNode(node);
78126
78135
  }
@@ -87075,7 +87084,7 @@ ${lanes.join("\n")}
87075
87084
  return context.factory.updateNamedTupleMember(
87076
87085
  node,
87077
87086
  tokenVisitor ? nodeVisitor(node.dotDotDotToken, tokenVisitor, isDotDotDotToken) : node.dotDotDotToken,
87078
- Debug.checkDefined(nodeVisitor(node.name, visitor, isIdentifier)),
87087
+ Debug.checkDefined(nodeVisitor(node.name, visitor, isNamedTupleMemberName)),
87079
87088
  tokenVisitor ? nodeVisitor(node.questionToken, tokenVisitor, isQuestionToken) : node.questionToken,
87080
87089
  Debug.checkDefined(nodeVisitor(node.type, visitor, isTypeNode))
87081
87090
  );
@@ -184694,6 +184703,7 @@ ${e.message}`;
184694
184703
  isNamedImports: () => isNamedImports,
184695
184704
  isNamedImportsOrExports: () => isNamedImportsOrExports,
184696
184705
  isNamedTupleMember: () => isNamedTupleMember,
184706
+ isNamedTupleMemberName: () => isNamedTupleMemberName,
184697
184707
  isNamespaceBody: () => isNamespaceBody,
184698
184708
  isNamespaceExport: () => isNamespaceExport,
184699
184709
  isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -187103,6 +187113,7 @@ ${e.message}`;
187103
187113
  isNamedImports: () => isNamedImports,
187104
187114
  isNamedImportsOrExports: () => isNamedImportsOrExports,
187105
187115
  isNamedTupleMember: () => isNamedTupleMember,
187116
+ isNamedTupleMemberName: () => isNamedTupleMemberName,
187106
187117
  isNamespaceBody: () => isNamespaceBody,
187107
187118
  isNamespaceExport: () => isNamespaceExport,
187108
187119
  isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
54
54
 
55
55
  // src/compiler/corePublic.ts
56
56
  var versionMajorMinor = "5.3";
57
- var version = `${versionMajorMinor}.0-insiders.20230824`;
57
+ var version = `${versionMajorMinor}.0-insiders.20230825`;
58
58
 
59
59
  // src/compiler/core.ts
60
60
  var emptyArray = [];
@@ -11742,6 +11742,9 @@ function getEscapedTextOfJsxNamespacedName(node) {
11742
11742
  function getTextOfJsxNamespacedName(node) {
11743
11743
  return `${idText(node.namespace)}:${idText(node.name)}`;
11744
11744
  }
11745
+ function isNamedTupleMemberName(node) {
11746
+ return node.kind === 80 /* Identifier */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 15 /* NoSubstitutionTemplateLiteral */;
11747
+ }
11745
11748
 
11746
11749
  // src/compiler/factory/baseNodeFactory.ts
11747
11750
  function createBaseNodeFactory() {
@@ -20514,21 +20517,29 @@ var Parser;
20514
20517
  }
20515
20518
  return type;
20516
20519
  }
20517
- function isNextTokenColonOrQuestionColon() {
20518
- return nextToken() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
20520
+ function isTokenColonOrQuestionColon() {
20521
+ return token() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
20519
20522
  }
20520
20523
  function isTupleElementName() {
20521
20524
  if (token() === 26 /* DotDotDotToken */) {
20522
- return tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon();
20525
+ nextToken();
20526
+ }
20527
+ if (token() === 16 /* TemplateHead */) {
20528
+ parseTemplateType();
20529
+ return isTokenColonOrQuestionColon();
20530
+ }
20531
+ if (tokenIsIdentifierOrKeyword(token()) || token() === 15 /* NoSubstitutionTemplateLiteral */) {
20532
+ nextToken();
20533
+ return isTokenColonOrQuestionColon();
20523
20534
  }
20524
- return tokenIsIdentifierOrKeyword(token()) && isNextTokenColonOrQuestionColon();
20535
+ return false;
20525
20536
  }
20526
20537
  function parseTupleElementNameOrTupleElementType() {
20527
20538
  if (lookAhead(isTupleElementName)) {
20528
20539
  const pos = getNodePos();
20529
20540
  const hasJSDoc = hasPrecedingJSDocComment();
20530
20541
  const dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
20531
- const name = parseIdentifierName();
20542
+ const name = token() === 15 /* NoSubstitutionTemplateLiteral */ ? parseLiteralLikeNode(token()) : token() === 16 /* TemplateHead */ ? parseTemplateType() : parseIdentifierName();
20532
20543
  const questionToken = parseOptionalToken(58 /* QuestionToken */);
20533
20544
  parseExpected(59 /* ColonToken */);
20534
20545
  const type = parseTupleElementType();
@@ -29683,7 +29694,7 @@ var visitEachChildTable = {
29683
29694
  return context.factory.updateNamedTupleMember(
29684
29695
  node,
29685
29696
  tokenVisitor ? nodeVisitor(node.dotDotDotToken, tokenVisitor, isDotDotDotToken) : node.dotDotDotToken,
29686
- Debug.checkDefined(nodeVisitor(node.name, visitor, isIdentifier)),
29697
+ Debug.checkDefined(nodeVisitor(node.name, visitor, isNamedTupleMemberName)),
29687
29698
  tokenVisitor ? nodeVisitor(node.questionToken, tokenVisitor, isQuestionToken) : node.questionToken,
29688
29699
  Debug.checkDefined(nodeVisitor(node.type, visitor, isTypeNode))
29689
29700
  );
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.3.0-pr-55371-11",
5
+ "version": "5.3.0-pr-55452-7",
6
6
  "license": "Apache-2.0",
7
7
  "description": "TypeScript is a language for application scale JavaScript development",
8
8
  "keywords": [
@@ -113,5 +113,5 @@
113
113
  "node": "20.1.0",
114
114
  "npm": "8.19.4"
115
115
  },
116
- "gitHead": "a9de88c08e82e6143ae36b4260ed04a83636078a"
116
+ "gitHead": "70cb7717b6c1bdfb06e172b22e6a6494fe8e5320"
117
117
  }