fix: Support auto accessors with TypeScript annotations

packages/babel-parser/src/parse-error/standard-errors.ts

@@ -35,6 +35,7 @@ export default {
   AwaitNotInAsyncContext:
     "'await' is only allowed within async functions and at the top levels of modules.",
   AwaitNotInAsyncFunction: "'await' is only allowed within async functions.",
+  // TODO: Accesor -> Accessor
   BadGetterArity: "A 'get' accesor must not have any formal parameters.",
   BadSetterArity: "A 'set' accesor must have exactly one formal parameter.",
   BadSetterRestParameter:

packages/babel-parser/src/plugins/typescript/index.ts

@@ -90,12 +90,14 @@ const TSErrors = ParseErrorEnum`typescript`({
     propertyName: string;
   }) =>
     `Property '${propertyName}' cannot have an initializer because it is marked abstract.`,
-  AccesorCannotDeclareThisParameter:
+  AccessorCannotBeOptional:
+    "An 'accessor' property cannot be declared optional.",
+  AccessorCannotDeclareThisParameter:
     "'get' and 'set' accessors cannot declare 'this' parameters.",
-  AccesorCannotHaveTypeParameters: "An accessor cannot have type parameters.",
+  AccessorCannotHaveTypeParameters: "An accessor cannot have type parameters.",
   ClassMethodHasDeclare: "Class methods cannot have the 'declare' modifier.",
   ClassMethodHasReadonly: "Class methods cannot have the 'readonly' modifier.",
-  ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference:
+  ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference:
     "A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference.",
   ConstructorHasTypeParameters:
     "Type parameters cannot appear on a constructor declaration.",
@@ -194,11 +196,11 @@ const TSErrors = ParseErrorEnum`typescript`({
     "This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma, as in `<T,>() => ...`.",
   ReservedTypeAssertion:
     "This syntax is reserved in files with the .mts or .cts extension. Use an `as` expression instead.",
-  SetAccesorCannotHaveOptionalParameter:
+  SetAccessorCannotHaveOptionalParameter:
     "A 'set' accessor cannot have an optional parameter.",
-  SetAccesorCannotHaveRestParameter:
+  SetAccessorCannotHaveRestParameter:
     "A 'set' accessor cannot have rest parameter.",
-  SetAccesorCannotHaveReturnType:
+  SetAccessorCannotHaveReturnType:
     "A 'set' accessor cannot have a return type annotation.",
   SingleTypeParameterWithoutTrailingComma: ({
     typeParameterName,
@@ -835,7 +837,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
         }
         const method: N.TsMethodSignature = nodeAny;
         if (method.kind && this.match(tt.lt)) {
-          this.raise(TSErrors.AccesorCannotHaveTypeParameters, {
+          this.raise(TSErrors.AccessorCannotHaveTypeParameters, {
             at: this.state.curPosition(),
           });
         }
@@ -851,7 +853,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
           if (method[paramsKey].length > 0) {
             this.raise(Errors.BadGetterArity, { at: this.state.curPosition() });
             if (this.isThisParam(method[paramsKey][0])) {
-              this.raise(TSErrors.AccesorCannotDeclareThisParameter, {
+              this.raise(TSErrors.AccessorCannotDeclareThisParameter, {
                 at: this.state.curPosition(),
               });
             }
@@ -862,26 +864,26 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
           } else {
             const firstParameter = method[paramsKey][0];
             if (this.isThisParam(firstParameter)) {
-              this.raise(TSErrors.AccesorCannotDeclareThisParameter, {
+              this.raise(TSErrors.AccessorCannotDeclareThisParameter, {
                 at: this.state.curPosition(),
               });
             }
             if (
               firstParameter.type === "Identifier" &&
               firstParameter.optional
             ) {
-              this.raise(TSErrors.SetAccesorCannotHaveOptionalParameter, {
+              this.raise(TSErrors.SetAccessorCannotHaveOptionalParameter, {
                 at: this.state.curPosition(),
               });
             }
             if (firstParameter.type === "RestElement") {
-              this.raise(TSErrors.SetAccesorCannotHaveRestParameter, {
+              this.raise(TSErrors.SetAccessorCannotHaveRestParameter, {
                 at: this.state.curPosition(),
               });
             }
           }
           if (method[returnTypeKey]) {
-            this.raise(TSErrors.SetAccesorCannotHaveReturnType, {
+            this.raise(TSErrors.SetAccessorCannotHaveReturnType, {
               at: method[returnTypeKey],
             });
           }
@@ -2794,7 +2796,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
           !isPossiblyLiteralEnum(init)
         ) {
           this.raise(
-            TSErrors.ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference,
+            TSErrors.ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference,
             { at: init },
           );
         }
@@ -3124,10 +3126,14 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
     }
 
     parseClassPropertyAnnotation(
-      node: N.ClassProperty | N.ClassPrivateProperty,
+      node: N.ClassProperty | N.ClassPrivateProperty | N.ClassAccessorProperty,
     ): void {
-      if (!node.optional && this.eat(tt.bang)) {
-        node.definite = true;
+      if (!node.optional) {
+        if (this.eat(tt.bang)) {
+          node.definite = true;
+        } else if (this.eat(tt.question)) {
+          node.optional = true;
+        }
       }
 
       const type = this.tsTryParseTypeAnnotation();
@@ -3181,6 +3187,16 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
       return super.parseClassPrivateProperty(node);
     }
 
+    parseClassAccessorProperty(
+      node: N.ClassAccessorProperty,
+    ): N.ClassAccessorProperty {
+      this.parseClassPropertyAnnotation(node);
+      if (node.optional) {
+        this.raise(TSErrors.AccessorCannotBeOptional, { at: node });
+      }
+      return super.parseClassAccessorProperty(node);
+    }
+
     pushClassMethod(
       classBody: N.ClassBody,
       method: N.ClassMethod,

packages/babel-parser/test/fixtures/typescript/class/accessor/input.ts

@@ -0,0 +1,21 @@
+abstract class Foo {
+  accessor prop: number = 1;
+  static accessor prop2: number = 1;
+  accessor #prop3: number = 1;
+  accessor [prop4]: number = 1;
+  private accessor prop5: number = 1;
+  abstract accessor prop6: number;
+  declare accessor prop7: number;
+  private accessor #p: any;
+
+  accessor a!;
+  abstract accessor #s;
+  accessor #d?;
+  abstract accessor f = 1;
+  readonly accessor g;
+}
+
+declare class C {
+  accessor x = 1;
+  #y = 1;
+}

packages/babel-parser/test/fixtures/typescript/class/accessor/options.json

@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "typescript",
+    "decoratorAutoAccessors"
+  ]
+}