fix35982: allow BigIntLiteral to parse as PropertyName for literal object and indices

src/compiler/checker.ts

@@ -18753,14 +18753,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
  }
  if (accessNode) {
  const indexNode = getIndexNodeForAccessExpression(accessNode);
- if (indexType.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral)) {
+ if (indexNode.kind !== SyntaxKind.BigIntLiteral && indexType.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral)) {
  error(indexNode, Diagnostics.Property_0_does_not_exist_on_type_1, "" + (indexType as StringLiteralType | NumberLiteralType).value, typeToString(objectType));
  }
  else if (indexType.flags & (TypeFlags.String | TypeFlags.Number)) {
  error(indexNode, Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
  }
  else {
- error(indexNode, Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+ const typeString = indexNode.kind === SyntaxKind.BigIntLiteral ? "bigint" : typeToString(indexType);
+ error(indexNode, Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeString);
  }
  }
  if (isTypeAny(indexType)) {
@@ -43889,6 +43890,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
  return;
  }
 
+ if (node.name.kind === SyntaxKind.BigIntLiteral) {
+ error(node.name, Diagnostics.A_bigint_literal_cannot_be_used_as_a_property_name);
+ }
+
  const type = convertAutoToAny(getTypeOfSymbol(symbol));
  if (node === symbol.valueDeclaration) {
  // Node is the primary declaration of the symbol, just validate the initializer
@@ -51088,6 +51093,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
  if (name.kind === SyntaxKind.NumericLiteral) {
  checkGrammarNumericLiteral(name);
  }
+ if (name.kind === SyntaxKind.BigIntLiteral) {
+ addErrorOrSuggestion(/*isError*/ true, createDiagnosticForNode(name, Diagnostics.A_bigint_literal_cannot_be_used_as_a_property_name));
+ }
  currentKind = DeclarationMeaning.PropertyAssignment;
  break;
  case SyntaxKind.MethodDeclaration:

src/compiler/diagnosticMessages.json

@@ -1809,6 +1809,10 @@
  "category": "Error",
  "code": 1538
  },
+ "A 'bigint' literal cannot be used as a property name.": {
+ "category": "Error",
+ "code": 1539
+ },
 
  "The types of '{0}' are incompatible between these types.": {
  "category": "Error",

src/compiler/parser.ts

@@ -14,6 +14,7 @@ import {
  attachFileToDiagnostics,
  AwaitExpression,
  BaseNodeFactory,
+ BigIntLiteral,
  BinaryExpression,
  BinaryOperatorToken,
  BindingElement,
@@ -2692,16 +2693,17 @@ namespace Parser {
  function isLiteralPropertyName(): boolean {
  return tokenIsIdentifierOrKeyword(token()) ||
  token() === SyntaxKind.StringLiteral ||
- token() === SyntaxKind.NumericLiteral;
+ token() === SyntaxKind.NumericLiteral ||
+ token() === SyntaxKind.BigIntLiteral;
  }
 
  function isImportAttributeName(): boolean {
  return tokenIsIdentifierOrKeyword(token()) || token() === SyntaxKind.StringLiteral;
  }
 
  function parsePropertyNameWorker(allowComputedPropertyNames: boolean): PropertyName {
- if (token() === SyntaxKind.StringLiteral || token() === SyntaxKind.NumericLiteral) {
- const node = parseLiteralNode() as StringLiteral | NumericLiteral;
+ if (token() === SyntaxKind.StringLiteral || token() === SyntaxKind.NumericLiteral || token() === SyntaxKind.BigIntLiteral) {
+ const node = parseLiteralNode() as StringLiteral | NumericLiteral | BigIntLiteral;
  node.text = internIdentifier(node.text);
  return node;
  }
@@ -8058,6 +8060,7 @@ namespace Parser {
  tokenIsIdentifierOrKeyword(token()) ||
  token() === SyntaxKind.StringLiteral ||
  token() === SyntaxKind.NumericLiteral ||
+ token() === SyntaxKind.BigIntLiteral ||
  token() === SyntaxKind.AsteriskToken ||
  token() === SyntaxKind.OpenBracketToken
  ) {

src/compiler/transformers/destructuring.ts

@@ -23,6 +23,7 @@ import {
  isArrayBindingElement,
  isArrayBindingOrAssignmentElement,
  isArrayBindingOrAssignmentPattern,
+ isBigIntLiteral,
  isBindingElement,
  isBindingName,
  isBindingOrAssignmentElement,
@@ -558,7 +559,7 @@ function createDestructuringPropertyAccess(flattenContext: FlattenContext, value
  const argumentExpression = ensureIdentifier(flattenContext, Debug.checkDefined(visitNode(propertyName.expression, flattenContext.visitor, isExpression)), /*reuseIdentifierExpressions*/ false, /*location*/ propertyName);
  return flattenContext.context.factory.createElementAccessExpression(value, argumentExpression);
  }
- else if (isStringOrNumericLiteralLike(propertyName)) {
+ else if (isStringOrNumericLiteralLike(propertyName) || isBigIntLiteral(propertyName)) {
  const argumentExpression = factory.cloneNode(propertyName);
  return flattenContext.context.factory.createElementAccessExpression(value, argumentExpression);
  }

src/compiler/types.ts

@@ -1721,7 +1721,14 @@ export interface QualifiedName extends Node, FlowContainer {
 
 export type EntityName = Identifier | QualifiedName;
 
-export type PropertyName = Identifier | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier;
+export type PropertyName =
+ | Identifier
+ | StringLiteral
+ | NoSubstitutionTemplateLiteral
+ | NumericLiteral
+ | ComputedPropertyName
+ | PrivateIdentifier
+ | BigIntLiteral;
 
 export type MemberName = Identifier | PrivateIdentifier;
 
@@ -2340,7 +2347,8 @@ export interface LiteralTypeNode extends TypeNode {
 
 export interface StringLiteral extends LiteralExpression, Declaration {
  readonly kind: SyntaxKind.StringLiteral;
- /** @internal */ readonly textSourceNode?: Identifier | StringLiteralLike | NumericLiteral | PrivateIdentifier | JsxNamespacedName; // Allows a StringLiteral to get its text from another node (used by transforms).
+ /** @internal */
+ readonly textSourceNode?: Identifier | StringLiteralLike | NumericLiteral | PrivateIdentifier | JsxNamespacedName | BigIntLiteral; // Allows a StringLiteral to get its text from another node (used by transforms).
  /**
  * Note: this is only set when synthesizing a node, not during parsing.
  *
@@ -2350,7 +2358,7 @@ export interface StringLiteral extends LiteralExpression, Declaration {
 }
 
 export type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
-export type PropertyNameLiteral = Identifier | StringLiteralLike | NumericLiteral | JsxNamespacedName;
+export type PropertyNameLiteral = Identifier | StringLiteralLike | NumericLiteral | JsxNamespacedName | BigIntLiteral;
 
 export interface TemplateLiteralTypeNode extends TypeNode {
  kind: SyntaxKind.TemplateLiteralType;

src/compiler/utilities.ts

@@ -2206,6 +2206,7 @@ export function tryGetTextOfPropertyName(name: PropertyName | NoSubstitutionTemp
  return name.emitNode?.autoGenerate ? undefined : name.escapedText;
  case SyntaxKind.StringLiteral:
  case SyntaxKind.NumericLiteral:
+ case SyntaxKind.BigIntLiteral:
  case SyntaxKind.NoSubstitutionTemplateLiteral:
  return escapeLeadingUnderscores(name.text);
  case SyntaxKind.ComputedPropertyName:
@@ -5220,6 +5221,7 @@ export function getPropertyNameForPropertyNameNode(name: PropertyName | JsxAttri
  case SyntaxKind.StringLiteral:
  case SyntaxKind.NoSubstitutionTemplateLiteral:
  case SyntaxKind.NumericLiteral:
+ case SyntaxKind.BigIntLiteral:
  return escapeLeadingUnderscores(name.text);
  case SyntaxKind.ComputedPropertyName:
  const nameExpression = name.expression;

tests/baselines/reference/api/typescript.d.ts

@@ -4422,7 +4422,7 @@ declare namespace ts {
  readonly right: Identifier;
  }
  type EntityName = Identifier | QualifiedName;
- type PropertyName = Identifier | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier;
+ type PropertyName = Identifier | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier | BigIntLiteral;
  type MemberName = Identifier | PrivateIdentifier;
  type DeclarationName = PropertyName | JsxAttributeName | StringLiteralLike | ElementAccessExpression | BindingPattern | EntityNameExpression;
  interface Declaration extends Node {
@@ -4773,7 +4773,7 @@ declare namespace ts {
  readonly kind: SyntaxKind.StringLiteral;
  }
  type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
- type PropertyNameLiteral = Identifier | StringLiteralLike | NumericLiteral | JsxNamespacedName;
+ type PropertyNameLiteral = Identifier | StringLiteralLike | NumericLiteral | JsxNamespacedName | BigIntLiteral;
  interface TemplateLiteralTypeNode extends TypeNode {
  kind: SyntaxKind.TemplateLiteralType;
  readonly head: TemplateHead;

tests/baselines/reference/bigintArbirtraryIdentifier.errors.txt

@@ -0,0 +1,69 @@
+badExport.ts(1,10): error TS2304: Cannot find name 'foo'.
+badExport.ts(1,17): error TS1003: Identifier expected.
+badExport.ts(1,20): error TS1128: Declaration or statement expected.
+badExport2.ts(1,10): error TS1003: Identifier expected.
+badExport2.ts(1,16): error TS2304: Cannot find name 'foo'.
+badExport2.ts(1,20): error TS1128: Declaration or statement expected.
+badImport.ts(1,10): error TS1003: Identifier expected.
+badImport.ts(1,10): error TS1141: String literal expected.
+badImport.ts(1,20): error TS1128: Declaration or statement expected.
+badImport.ts(1,22): error TS1434: Unexpected keyword or identifier.
+badImport.ts(1,22): error TS2304: Cannot find name 'from'.
+badImport2.ts(1,17): error TS1003: Identifier expected.
+badImport2.ts(1,17): error TS1141: String literal expected.
+badImport2.ts(1,20): error TS1128: Declaration or statement expected.
+badImport2.ts(1,22): error TS1434: Unexpected keyword or identifier.
+badImport2.ts(1,22): error TS2304: Cannot find name 'from'.
+
+
+==== foo.ts (0 errors) ====
+ const foo = 0n;
+ export { foo as "0n" };
+
+==== correctUse.ts (0 errors) ====
+ import { "0n" as foo } from "./foo";
+ export { foo as "0n" };
+
+==== badImport.ts (5 errors) ====
+ import { 0n as foo } from "./foo";
+ ~~
+!!! error TS1003: Identifier expected.
+ ~~~~~~~~~
+!!! error TS1141: String literal expected.
+ ~
+!!! error TS1128: Declaration or statement expected.
+ ~~~~
+!!! error TS1434: Unexpected keyword or identifier.
+ ~~~~
+!!! error TS2304: Cannot find name 'from'.
+
+==== badImport2.ts (5 errors) ====
+ import { foo as 0n } from "./foo";
+ ~~
+!!! error TS1003: Identifier expected.
+ ~~
+!!! error TS1141: String literal expected.
+ ~
+!!! error TS1128: Declaration or statement expected.
+ ~~~~
+!!! error TS1434: Unexpected keyword or identifier.
+ ~~~~
+!!! error TS2304: Cannot find name 'from'.
+
+==== badExport.ts (3 errors) ====
+ export { foo as 0n };
+ ~~~
+!!! error TS2304: Cannot find name 'foo'.
+ ~~
+!!! error TS1003: Identifier expected.
+ ~
+!!! error TS1128: Declaration or statement expected.
+
+==== badExport2.ts (3 errors) ====
+ export { 0n as foo };
+ ~~
+!!! error TS1003: Identifier expected.
+ ~~~
+!!! error TS2304: Cannot find name 'foo'.
+ ~
+!!! error TS1128: Declaration or statement expected.

tests/baselines/reference/bigintArbirtraryIdentifier.js

@@ -0,0 +1,44 @@
+//// [tests/cases/compiler/bigintArbirtraryIdentifier.ts] ////
+
+//// [foo.ts]
+const foo = 0n;
+export { foo as "0n" };
+
+//// [correctUse.ts]
+import { "0n" as foo } from "./foo";
+export { foo as "0n" };
+
+//// [badImport.ts]
+import { 0n as foo } from "./foo";
+
+//// [badImport2.ts]
+import { foo as 0n } from "./foo";
+
+//// [badExport.ts]
+export { foo as 0n };
+
+//// [badExport2.ts]
+export { 0n as foo };
+
+//// [foo.js]
+const foo = 0n;
+export { foo as "0n" };
+//// [correctUse.js]
+import { "0n" as foo } from "./foo";
+export { foo as "0n" };
+//// [badImport.js]
+from;
+"./foo";
+export {};
+//// [badImport2.js]
+from;
+"./foo";
+export {};
+//// [badExport.js]
+export { foo as };
+0n;
+;
+//// [badExport2.js]
+0n;
+;
+export {};

tests/baselines/reference/bigintArbirtraryIdentifier.symbols

@@ -0,0 +1,34 @@
+//// [tests/cases/compiler/bigintArbirtraryIdentifier.ts] ////
+
+=== foo.ts ===
+const foo = 0n;
+>foo : Symbol(foo, Decl(foo.ts, 0, 5))
+
+export { foo as "0n" };
+>foo : Symbol(foo, Decl(foo.ts, 0, 5))
+>"0n" : Symbol("0n", Decl(foo.ts, 1, 8))
+
+=== correctUse.ts ===
+import { "0n" as foo } from "./foo";
+>foo : Symbol(foo, Decl(correctUse.ts, 0, 8))
+
+export { foo as "0n" };
+>foo : Symbol(foo, Decl(correctUse.ts, 0, 8))
+>"0n" : Symbol("0n", Decl(correctUse.ts, 1, 8))
+
+=== badImport.ts ===
+import { 0n as foo } from "./foo";
+>foo : Symbol(foo)
+
+=== badImport2.ts ===
+import { foo as 0n } from "./foo";
+> : Symbol((Missing), Decl(badImport2.ts, 0, 8))
+
+=== badExport.ts ===
+export { foo as 0n };
+> : Symbol((Missing), Decl(badExport.ts, 0, 8))
+
+=== badExport2.ts ===
+export { 0n as foo };
+>foo : Symbol(foo)
+

tests/baselines/reference/bigintArbirtraryIdentifier.types

@@ -0,0 +1,64 @@
+//// [tests/cases/compiler/bigintArbirtraryIdentifier.ts] ////
+
+=== foo.ts ===
+const foo = 0n;
+>foo : 0n
+> : ^^
+>0n : 0n
+> : ^^
+
+export { foo as "0n" };
+>foo : 0n
+> : ^^
+>"0n" : 0n
+> : ^^
+
+=== correctUse.ts ===
+import { "0n" as foo } from "./foo";
+>foo : 0n
+> : ^^
+
+export { foo as "0n" };
+>foo : 0n
+> : ^^
+>"0n" : 0n
+> : ^^
+
+=== badImport.ts ===
+import { 0n as foo } from "./foo";
+>0n as foo : foo
+> : ^^^
+>0n : 0n
+> : ^^
+>from : any
+> : ^^^
+>"./foo" : "./foo"
+> : ^^^^^^^
+
+=== badImport2.ts ===
+import { foo as 0n } from "./foo";
+>foo : any
+> : ^^^
+> : any
+> : ^^^
+>from : any
+> : ^^^
+>"./foo" : "./foo"
+> : ^^^^^^^
+
+=== badExport.ts ===
+export { foo as 0n };
+>foo : any
+> : ^^^
+> : any
+> : ^^^
+>0n : 0n
+> : ^^
+
+=== badExport2.ts ===
+export { 0n as foo };
+>0n as foo : foo
+> : ^^^
+>0n : 0n
+> : ^^
+