Reject template property-keys (TS1136) and tighten enum members (TS1357)

Two grammar over-accepts, both from a failed declaration falling back to a
looser parse:

- A template literal as an object/class property key (`{ `b`: 321 }`) was
  explicitly allowed by a `[Template, …]` branch in Prop. No valid JS/TS permits
  a template property key (only ident/string/number/computed/#private), so the
  branch is removed. A tagged template `obj.tag`s`` is unaffected (it parses as
  a postfix expression, not a property key).

- An enum member followed by `:` (`enum E { a: 1 }`) was accepted because the
  enum Decl failed on the `:` and fell back to parsing `enum` as an identifier
  expression + `E` + a `{…}` block. Two fixes: forbid `enum` as a standalone
  expression identifier (`[not('enum'), Ident]` — enum is reserved), and widen
  EnumMember's name to MemberName (covers numeric/bigint/#private members) so the
  enum Decl path remains the only parse and valid numeric-member enums still parse.

FP 103->95 (8 cases), FN stays 0 (3376/3376), TP unchanged. Artifacts regenerated.

Author: johnsoncodehk

examples/lezer/typescript.grammar

@@ -98,7 +98,7 @@ Expr {
     Expr !l16 (Op_2b2b | Op_2d2d)
 }
 Prop {
-  (Spread Expr | (kw_public | kw_private | kw_protected)? (kw_get | kw_set) MemberName ParenL ((Param (Comma Param)*)?)? ParenR (Colon Type)? Block | kw_async? Op_2a? MemberName TypeParams? ParenL (Param (Comma Param)*)? ParenR (Colon Type)? Block | Template (Colon Expr | ParenL (Param (Comma Param)*)? ParenR (Colon Type)? Block) | MemberName Colon Expr | BracketL Expr (Comma Expr)* BracketR Colon Expr | Ident (Op_3d Expr | Question (Colon Expr)? | ))
+  (Spread Expr | (kw_public | kw_private | kw_protected)? (kw_get | kw_set) MemberName ParenL ((Param (Comma Param)*)?)? ParenR (Colon Type)? Block | kw_async? Op_2a? MemberName TypeParams? ParenL (Param (Comma Param)*)? ParenR (Colon Type)? Block | MemberName Colon Expr | BracketL Expr (Comma Expr)* BracketR Colon Expr | Ident (Op_3d Expr | Question (Colon Expr)? | ))
 }
 MemberName {
   (Ident | PrivateField | String | Number | HexNumber | OctalNumber | BinaryNumber | BigInt | BracketL Expr BracketR)
@@ -158,7 +158,7 @@ ClassMember {
   (DecoratorExpr | kw_constructor ParenL (Param (Comma Param)*)? ParenR Block Semi? | kw_static Block | (kw_public | kw_private | kw_protected | kw_static | kw_abstract | kw_readonly | kw_override | kw_accessor | kw_async)* (Op_2a MemberName Question? TypeParams? ParenL (Param (Comma Param)*)? ParenR (Colon Type)? Block? Semi? | (kw_get | kw_set) MemberName ParenL ((Param (Comma Param)*)?)? ParenR (Colon Type)? Block? Semi? | BracketL Ident Colon Type BracketR Colon Type Semi? | MemberName (Question? TypeParams? ParenL (Param (Comma Param)*)? ParenR (Colon Type)? Block? Semi? | Op_21? Question? (Colon Type)? (Op_3d Expr)? Semi?)) | MemberName Op_21? Question? (Colon Type)? (Op_3d Expr)? Semi? | MemberName Question? TypeParams? ParenL (Param (Comma Param)*)? ParenR (Colon Type)? Block? Semi?)
 }
 EnumMember {
-  (Ident | String | BracketL Expr BracketR) (Op_3d Expr)?
+  MemberName (Op_3d Expr)?
 }
 ImportClause {
   (Ident (Comma (BraceL (ImportSpecifier (Comma ImportSpecifier)*)? BraceR | Op_2a kw_as Ident))? | BraceL (ImportSpecifier (Comma ImportSpecifier)*)? BraceR | Op_2a kw_as Ident)

examples/tree-sitter/grammar.js

@@ -105,7 +105,7 @@ module.exports = grammar({
       seq("<", $.type, ">", $.expr)
     ),
 
-    prop: $ => choice(seq("...", $.expr), seq(optional(choice("public", "private", "protected")), choice("get", "set"), $.member_name, "(", optional(optional(seq($.param, repeat(seq(",", $.param)), optional(",")))), ")", optional(seq(":", $.type)), $.block), seq(optional("async"), optional("*"), $.member_name, optional($.type_params), "(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", optional(seq(":", $.type)), $.block), seq($.template, choice(seq(":", $.expr), seq("(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", optional(seq(":", $.type)), $.block))), seq($.member_name, ":", $.expr), seq("[", $.expr, repeat(seq(",", $.expr)), "]", ":", $.expr), seq($.ident, choice(seq("=", $.expr), seq("?", optional(seq(":", $.expr))), blank()))),
+    prop: $ => choice(seq("...", $.expr), seq(optional(choice("public", "private", "protected")), choice("get", "set"), $.member_name, "(", optional(optional(seq($.param, repeat(seq(",", $.param)), optional(",")))), ")", optional(seq(":", $.type)), $.block), seq(optional("async"), optional("*"), $.member_name, optional($.type_params), "(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", optional(seq(":", $.type)), $.block), seq($.member_name, ":", $.expr), seq("[", $.expr, repeat(seq(",", $.expr)), "]", ":", $.expr), seq($.ident, choice(seq("=", $.expr), seq("?", optional(seq(":", $.expr))), blank()))),
 
     member_name: $ => choice($.ident, $.private_field, $.string, $.number, $.hex_number, $.octal_number, $.binary_number, $.big_int, seq("[", $.expr, "]")),
 
@@ -145,7 +145,7 @@ module.exports = grammar({
 
     class_member: $ => choice($.decorator_expr, seq("constructor", "(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", $.block, optional(";")), seq("static", $.block), seq(repeat(choice("public", "private", "protected", "static", "abstract", "readonly", "override", "accessor", "async")), choice(seq("*", $.member_name, optional("?"), optional($.type_params), "(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", optional(seq(":", $.type)), optional($.block), optional(";")), seq(choice("get", "set"), $.member_name, "(", optional(optional(seq($.param, repeat(seq(",", $.param)), optional(",")))), ")", optional(seq(":", $.type)), optional($.block), optional(";")), seq("[", $.ident, ":", $.type, "]", ":", $.type, optional(";")), seq($.member_name, choice(seq(optional("?"), optional($.type_params), "(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", optional(seq(":", $.type)), optional($.block), optional(";")), seq(optional("!"), optional("?"), optional(seq(":", $.type)), optional(seq("=", $.expr)), optional(";")))))), seq($.member_name, optional("!"), optional("?"), optional(seq(":", $.type)), optional(seq("=", $.expr)), optional(";")), seq($.member_name, optional("?"), optional($.type_params), "(", optional(seq($.param, repeat(seq(",", $.param)), optional(","))), ")", optional(seq(":", $.type)), optional($.block), optional(";"))),
 
-    enum_member: $ => seq(choice($.ident, $.string, seq("[", $.expr, "]")), optional(seq("=", $.expr))),
+    enum_member: $ => seq($.member_name, optional(seq("=", $.expr))),
 
     import_clause: $ => choice(seq($.ident, optional(seq(",", choice(seq("{", optional(seq($.import_specifier, repeat(seq(",", $.import_specifier)), optional(","))), "}"), seq("*", "as", $.ident))))), seq("{", optional(seq($.import_specifier, repeat(seq(",", $.import_specifier)), optional(","))), "}"), seq("*", "as", $.ident)),
 

examples/typescript.cst-types.ts

@@ -155,12 +155,9 @@ export interface PropNode extends CstPos {
   kind: 'node';
   rule: 'Prop';
   children: Array<
-    | $templateNode
     | (CstLeaf & { tokenType: '$keyword' })
     | (CstLeaf & { tokenType: '$punct' })
-    | (CstLeaf & { tokenType: '$templateHead' })
     | (CstLeaf & { tokenType: 'Ident' })
-    | (CstLeaf & { tokenType: 'Template' })
     | BlockNode
     | ExprNode
     | MemberNameNode
@@ -445,9 +442,8 @@ export interface EnumMemberNode extends CstPos {
   rule: 'EnumMember';
   children: Array<
     | (CstLeaf & { tokenType: '$punct' })
-    | (CstLeaf & { tokenType: 'Ident' })
-    | (CstLeaf & { tokenType: 'String' })
     | ExprNode
+    | MemberNameNode
   >;
 }
 

examples/typescript.ts

@@ -152,8 +152,6 @@ const Prop = rule($ => {
     [opt(alt('public', 'private', 'protected')), alt('get', 'set'), MemberName, '(', opt(sep(Param, ',')), ')', opt(':', Type), Block],
     // method: async?/generator?, any member name (incl `#x`, computed `[e]`), then ( … ) { … }
     [opt('async'), opt('*'), MemberName, opt(TypeParams), ...method],
-    // template-literal key: value | method
-    [Template, alt([':', Expr], method)],
     // value property — any member name incl computed `[e]: v` (MemberName covers `[Expr]`)
     [MemberName, ':', Expr],
     ['[', Expr, many(',', Expr), ']', ':', Expr],                      // computed comma list (lenient)
@@ -177,7 +175,10 @@ const NewTarget = rule($ => [
 ]);
 
 const Expr = rule($ => [
-  Ident,
+  // `enum` is reserved — it can't be a standalone expression identifier. Without this
+  // an invalid `enum E { a: 1 }` (where the enum Decl fails on `:`) would fall back to
+  // parsing `enum` as an identifier expr + `E` + `{…}` block, wrongly accepting it.
+  [not('enum'), Ident],
   Number_,
   String_,
   Template,
@@ -416,7 +417,7 @@ const ClassMember = rule($ => [
 ]);
 
 const EnumMember = rule($ => [
-  [alt(Ident, String_, ['[', Expr, ']']), opt('=', Expr)],
+  [MemberName, opt('=', Expr)],
 ]);
 
 const ImportSpecifier = rule($ => [