@typescript-deploys/pr-build 5.1.0-pr-54112-28 → 5.1.0-pr-53907-15

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.
Files changed (5) hide show
  1. package/lib/tsc.js +15 -6
  2. package/lib/tsserver.js +16 -7
  3. package/lib/tsserverlibrary.js +16 -7
  4. package/lib/typescript.js +16 -7
  5. package/package.json +2 -2
package/lib/tsc.js CHANGED
@@ -53979,7 +53979,7 @@ function createTypeChecker(host) {
53979
53979
  } else if (type !== firstType) {
53980
53980
  checkFlags |= 64 /* HasNonUniformType */;
53981
53981
  }
53982
- if (isLiteralType(type) || isPatternLiteralType(type)) {
53982
+ if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
53983
53983
  checkFlags |= 128 /* HasLiteralType */;
53984
53984
  }
53985
53985
  if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -66992,6 +66992,7 @@ function createTypeChecker(host) {
66992
66992
  case 9 /* NumericLiteral */:
66993
66993
  case 10 /* BigIntLiteral */:
66994
66994
  case 15 /* NoSubstitutionTemplateLiteral */:
66995
+ case 227 /* TemplateExpression */:
66995
66996
  case 112 /* TrueKeyword */:
66996
66997
  case 97 /* FalseKeyword */:
66997
66998
  case 106 /* NullKeyword */:
@@ -72386,6 +72387,10 @@ function createTypeChecker(host) {
72386
72387
  forEachReturnStatement(func.body, (returnStatement) => {
72387
72388
  const expr = returnStatement.expression;
72388
72389
  if (expr) {
72390
+ if (expr.kind === 212 /* CallExpression */ && expr.expression.kind === 80 /* Identifier */ && checkExpressionCached(expr.expression).symbol === func.symbol) {
72391
+ hasReturnOfTypeNever = true;
72392
+ return;
72393
+ }
72389
72394
  let type = checkExpressionCached(expr, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
72390
72395
  if (functionFlags & 2 /* Async */) {
72391
72396
  type = unwrapAwaitedType(checkAwaitedType(
@@ -73785,11 +73790,15 @@ function createTypeChecker(host) {
73785
73790
  texts.push(span.literal.text);
73786
73791
  types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
73787
73792
  }
73788
- return isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType(
73793
+ if (isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType(
73789
73794
  node,
73790
73795
  /*contextFlags*/
73791
73796
  void 0
73792
- ) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
73797
+ ) || unknownType, isTemplateLiteralContextualType)) {
73798
+ return getTemplateLiteralType(texts, types);
73799
+ }
73800
+ const evaluated = node.parent.kind !== 214 /* TaggedTemplateExpression */ && evaluateTemplateExpression(node);
73801
+ return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
73793
73802
  }
73794
73803
  function isTemplateLiteralContextualType(type) {
73795
73804
  return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) || type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
@@ -78767,11 +78776,11 @@ function createTypeChecker(host) {
78767
78776
  );
78768
78777
  if (symbol) {
78769
78778
  if (symbol.flags & 8 /* EnumMember */) {
78770
- return evaluateEnumMember(expr, symbol, location);
78779
+ return location ? evaluateEnumMember(expr, symbol, location) : getEnumMemberValue(symbol.valueDeclaration);
78771
78780
  }
78772
78781
  if (isConstVariable(symbol)) {
78773
78782
  const declaration = symbol.valueDeclaration;
78774
- if (declaration && !declaration.type && declaration.initializer && declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
78783
+ if (declaration && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
78775
78784
  return evaluate(declaration.initializer, declaration);
78776
78785
  }
78777
78786
  }
@@ -78791,7 +78800,7 @@ function createTypeChecker(host) {
78791
78800
  const name = escapeLeadingUnderscores(expr.argumentExpression.text);
78792
78801
  const member = rootSymbol.exports.get(name);
78793
78802
  if (member) {
78794
- return evaluateEnumMember(expr, member, location);
78803
+ return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
78795
78804
  }
78796
78805
  }
78797
78806
  }
package/lib/tsserver.js CHANGED
@@ -58629,7 +58629,7 @@ function createTypeChecker(host) {
58629
58629
  } else if (type !== firstType) {
58630
58630
  checkFlags |= 64 /* HasNonUniformType */;
58631
58631
  }
58632
- if (isLiteralType(type) || isPatternLiteralType(type)) {
58632
+ if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
58633
58633
  checkFlags |= 128 /* HasLiteralType */;
58634
58634
  }
58635
58635
  if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -71642,6 +71642,7 @@ function createTypeChecker(host) {
71642
71642
  case 9 /* NumericLiteral */:
71643
71643
  case 10 /* BigIntLiteral */:
71644
71644
  case 15 /* NoSubstitutionTemplateLiteral */:
71645
+ case 227 /* TemplateExpression */:
71645
71646
  case 112 /* TrueKeyword */:
71646
71647
  case 97 /* FalseKeyword */:
71647
71648
  case 106 /* NullKeyword */:
@@ -77036,6 +77037,10 @@ function createTypeChecker(host) {
77036
77037
  forEachReturnStatement(func.body, (returnStatement) => {
77037
77038
  const expr = returnStatement.expression;
77038
77039
  if (expr) {
77040
+ if (expr.kind === 212 /* CallExpression */ && expr.expression.kind === 80 /* Identifier */ && checkExpressionCached(expr.expression).symbol === func.symbol) {
77041
+ hasReturnOfTypeNever = true;
77042
+ return;
77043
+ }
77039
77044
  let type = checkExpressionCached(expr, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
77040
77045
  if (functionFlags & 2 /* Async */) {
77041
77046
  type = unwrapAwaitedType(checkAwaitedType(
@@ -78435,11 +78440,15 @@ function createTypeChecker(host) {
78435
78440
  texts.push(span.literal.text);
78436
78441
  types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
78437
78442
  }
78438
- return isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
78443
+ if (isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
78439
78444
  node,
78440
78445
  /*contextFlags*/
78441
78446
  void 0
78442
- ) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
78447
+ ) || unknownType, isTemplateLiteralContextualType)) {
78448
+ return getTemplateLiteralType(texts, types);
78449
+ }
78450
+ const evaluated = node.parent.kind !== 214 /* TaggedTemplateExpression */ && evaluateTemplateExpression(node);
78451
+ return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
78443
78452
  }
78444
78453
  function isTemplateLiteralContextualType(type) {
78445
78454
  return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) || type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
@@ -83417,11 +83426,11 @@ function createTypeChecker(host) {
83417
83426
  );
83418
83427
  if (symbol) {
83419
83428
  if (symbol.flags & 8 /* EnumMember */) {
83420
- return evaluateEnumMember(expr, symbol, location);
83429
+ return location ? evaluateEnumMember(expr, symbol, location) : getEnumMemberValue(symbol.valueDeclaration);
83421
83430
  }
83422
83431
  if (isConstVariable(symbol)) {
83423
83432
  const declaration = symbol.valueDeclaration;
83424
- if (declaration && !declaration.type && declaration.initializer && declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
83433
+ if (declaration && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
83425
83434
  return evaluate(declaration.initializer, declaration);
83426
83435
  }
83427
83436
  }
@@ -83441,7 +83450,7 @@ function createTypeChecker(host) {
83441
83450
  const name = escapeLeadingUnderscores(expr.argumentExpression.text);
83442
83451
  const member = rootSymbol.exports.get(name);
83443
83452
  if (member) {
83444
- return evaluateEnumMember(expr, member, location);
83453
+ return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
83445
83454
  }
83446
83455
  }
83447
83456
  }
@@ -165063,7 +165072,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, so
165063
165072
  displayParts.push(spacePart());
165064
165073
  displayParts.push(operatorPart(64 /* EqualsToken */));
165065
165074
  displayParts.push(spacePart());
165066
- addRange(displayParts, typeToDisplayParts(typeChecker, isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
165075
+ addRange(displayParts, typeToDisplayParts(typeChecker, location.parent && isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
165067
165076
  }
165068
165077
  if (symbolFlags & 384 /* Enum */) {
165069
165078
  prefixNextMeaning();
package/lib/tsserverlibrary.js CHANGED
@@ -56421,7 +56421,7 @@ ${lanes.join("\n")}
56421
56421
  } else if (type !== firstType) {
56422
56422
  checkFlags |= 64 /* HasNonUniformType */;
56423
56423
  }
56424
- if (isLiteralType(type) || isPatternLiteralType(type)) {
56424
+ if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
56425
56425
  checkFlags |= 128 /* HasLiteralType */;
56426
56426
  }
56427
56427
  if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -69434,6 +69434,7 @@ ${lanes.join("\n")}
69434
69434
  case 9 /* NumericLiteral */:
69435
69435
  case 10 /* BigIntLiteral */:
69436
69436
  case 15 /* NoSubstitutionTemplateLiteral */:
69437
+ case 227 /* TemplateExpression */:
69437
69438
  case 112 /* TrueKeyword */:
69438
69439
  case 97 /* FalseKeyword */:
69439
69440
  case 106 /* NullKeyword */:
@@ -74828,6 +74829,10 @@ ${lanes.join("\n")}
74828
74829
  forEachReturnStatement(func.body, (returnStatement) => {
74829
74830
  const expr = returnStatement.expression;
74830
74831
  if (expr) {
74832
+ if (expr.kind === 212 /* CallExpression */ && expr.expression.kind === 80 /* Identifier */ && checkExpressionCached(expr.expression).symbol === func.symbol) {
74833
+ hasReturnOfTypeNever = true;
74834
+ return;
74835
+ }
74831
74836
  let type = checkExpressionCached(expr, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
74832
74837
  if (functionFlags & 2 /* Async */) {
74833
74838
  type = unwrapAwaitedType(checkAwaitedType(
@@ -76227,11 +76232,15 @@ ${lanes.join("\n")}
76227
76232
  texts.push(span.literal.text);
76228
76233
  types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
76229
76234
  }
76230
- return isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
76235
+ if (isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
76231
76236
  node,
76232
76237
  /*contextFlags*/
76233
76238
  void 0
76234
- ) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
76239
+ ) || unknownType, isTemplateLiteralContextualType)) {
76240
+ return getTemplateLiteralType(texts, types);
76241
+ }
76242
+ const evaluated = node.parent.kind !== 214 /* TaggedTemplateExpression */ && evaluateTemplateExpression(node);
76243
+ return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
76235
76244
  }
76236
76245
  function isTemplateLiteralContextualType(type) {
76237
76246
  return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) || type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
@@ -81209,11 +81218,11 @@ ${lanes.join("\n")}
81209
81218
  );
81210
81219
  if (symbol) {
81211
81220
  if (symbol.flags & 8 /* EnumMember */) {
81212
- return evaluateEnumMember(expr, symbol, location);
81221
+ return location ? evaluateEnumMember(expr, symbol, location) : getEnumMemberValue(symbol.valueDeclaration);
81213
81222
  }
81214
81223
  if (isConstVariable(symbol)) {
81215
81224
  const declaration = symbol.valueDeclaration;
81216
- if (declaration && !declaration.type && declaration.initializer && declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
81225
+ if (declaration && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
81217
81226
  return evaluate(declaration.initializer, declaration);
81218
81227
  }
81219
81228
  }
@@ -81233,7 +81242,7 @@ ${lanes.join("\n")}
81233
81242
  const name = escapeLeadingUnderscores(expr.argumentExpression.text);
81234
81243
  const member = rootSymbol.exports.get(name);
81235
81244
  if (member) {
81236
- return evaluateEnumMember(expr, member, location);
81245
+ return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
81237
81246
  }
81238
81247
  }
81239
81248
  }
@@ -164503,7 +164512,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
164503
164512
  displayParts.push(spacePart());
164504
164513
  displayParts.push(operatorPart(64 /* EqualsToken */));
164505
164514
  displayParts.push(spacePart());
164506
- addRange(displayParts, typeToDisplayParts(typeChecker, isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
164515
+ addRange(displayParts, typeToDisplayParts(typeChecker, location.parent && isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
164507
164516
  }
164508
164517
  if (symbolFlags & 384 /* Enum */) {
164509
164518
  prefixNextMeaning();
package/lib/typescript.js CHANGED
@@ -56421,7 +56421,7 @@ ${lanes.join("\n")}
56421
56421
  } else if (type !== firstType) {
56422
56422
  checkFlags |= 64 /* HasNonUniformType */;
56423
56423
  }
56424
- if (isLiteralType(type) || isPatternLiteralType(type)) {
56424
+ if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
56425
56425
  checkFlags |= 128 /* HasLiteralType */;
56426
56426
  }
56427
56427
  if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -69434,6 +69434,7 @@ ${lanes.join("\n")}
69434
69434
  case 9 /* NumericLiteral */:
69435
69435
  case 10 /* BigIntLiteral */:
69436
69436
  case 15 /* NoSubstitutionTemplateLiteral */:
69437
+ case 227 /* TemplateExpression */:
69437
69438
  case 112 /* TrueKeyword */:
69438
69439
  case 97 /* FalseKeyword */:
69439
69440
  case 106 /* NullKeyword */:
@@ -74828,6 +74829,10 @@ ${lanes.join("\n")}
74828
74829
  forEachReturnStatement(func.body, (returnStatement) => {
74829
74830
  const expr = returnStatement.expression;
74830
74831
  if (expr) {
74832
+ if (expr.kind === 212 /* CallExpression */ && expr.expression.kind === 80 /* Identifier */ && checkExpressionCached(expr.expression).symbol === func.symbol) {
74833
+ hasReturnOfTypeNever = true;
74834
+ return;
74835
+ }
74831
74836
  let type = checkExpressionCached(expr, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
74832
74837
  if (functionFlags & 2 /* Async */) {
74833
74838
  type = unwrapAwaitedType(checkAwaitedType(
@@ -76227,11 +76232,15 @@ ${lanes.join("\n")}
76227
76232
  texts.push(span.literal.text);
76228
76233
  types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
76229
76234
  }
76230
- return isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
76235
+ if (isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
76231
76236
  node,
76232
76237
  /*contextFlags*/
76233
76238
  void 0
76234
- ) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
76239
+ ) || unknownType, isTemplateLiteralContextualType)) {
76240
+ return getTemplateLiteralType(texts, types);
76241
+ }
76242
+ const evaluated = node.parent.kind !== 214 /* TaggedTemplateExpression */ && evaluateTemplateExpression(node);
76243
+ return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
76235
76244
  }
76236
76245
  function isTemplateLiteralContextualType(type) {
76237
76246
  return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) || type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
@@ -81209,11 +81218,11 @@ ${lanes.join("\n")}
81209
81218
  );
81210
81219
  if (symbol) {
81211
81220
  if (symbol.flags & 8 /* EnumMember */) {
81212
- return evaluateEnumMember(expr, symbol, location);
81221
+ return location ? evaluateEnumMember(expr, symbol, location) : getEnumMemberValue(symbol.valueDeclaration);
81213
81222
  }
81214
81223
  if (isConstVariable(symbol)) {
81215
81224
  const declaration = symbol.valueDeclaration;
81216
- if (declaration && !declaration.type && declaration.initializer && declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
81225
+ if (declaration && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
81217
81226
  return evaluate(declaration.initializer, declaration);
81218
81227
  }
81219
81228
  }
@@ -81233,7 +81242,7 @@ ${lanes.join("\n")}
81233
81242
  const name = escapeLeadingUnderscores(expr.argumentExpression.text);
81234
81243
  const member = rootSymbol.exports.get(name);
81235
81244
  if (member) {
81236
- return evaluateEnumMember(expr, member, location);
81245
+ return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
81237
81246
  }
81238
81247
  }
81239
81248
  }
@@ -164518,7 +164527,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
164518
164527
  displayParts.push(spacePart());
164519
164528
  displayParts.push(operatorPart(64 /* EqualsToken */));
164520
164529
  displayParts.push(spacePart());
164521
- addRange(displayParts, typeToDisplayParts(typeChecker, isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
164530
+ addRange(displayParts, typeToDisplayParts(typeChecker, location.parent && isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
164522
164531
  }
164523
164532
  if (symbolFlags & 384 /* Enum */) {
164524
164533
  prefixNextMeaning();
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.1.0-pr-54112-28",
5
+ "version": "5.1.0-pr-53907-15",
6
6
  "license": "Apache-2.0",
7
7
  "description": "TypeScript is a language for application scale JavaScript development",
8
8
  "keywords": [
@@ -116,5 +116,5 @@
116
116
  "node": "14.21.1",
117
117
  "npm": "8.19.3"
118
118
  },
119
- "gitHead": "407cd798b1bc232d5fc9c0da289dea07741c9a51"
119
+ "gitHead": "1ac0eb9fb5345ae9eef7f7c0f225629db64e3b7c"
120
120
  }