Implement def for ClassAccessorProperty.

Author: benjamn

src/def/babel-core.ts

@@ -220,6 +220,7 @@ export default function (fork: Fork) {
     def("ClassPrivateProperty"),
     def("ClassMethod"),
     def("ClassPrivateMethod"),
+    def("ClassAccessorProperty"),
     def("StaticBlock"),
   );
 
@@ -239,19 +240,40 @@ export default function (fork: Fork) {
     .build("key", "params", "body", "kind", "computed", "static")
     .field("key", def("PrivateName"));
 
+  def("ClassAccessorProperty")
+    .bases("Declaration")
+    .build("key", "value", "decorators", "computed", "static")
+    .field("key", or(
+      def("Literal"),
+      def("Identifier"),
+      def("PrivateName"),
+      // Only when .computed is true (TODO enforce this)
+      def("Expression"),
+    ))
+    .field("value", def("Expression"));
+
   ["ClassMethod",
    "ClassPrivateMethod",
   ].forEach(typeName => {
     def(typeName)
       .field("kind", or("get", "set", "method", "constructor"), () => "method")
       .field("body", def("BlockStatement"))
-      .field("computed", Boolean, defaults["false"])
-      .field("static", or(Boolean, null), defaults["null"])
-      .field("abstract", or(Boolean, null), defaults["null"])
+      // For backwards compatibility only. Expect accessibility instead (see below).
       .field("access", or("public", "private", "protected", null), defaults["null"])
+  });
+
+  ["ClassMethod",
+   "ClassPrivateMethod",
+   "ClassAccessorProperty",
+  ].forEach(typeName => {
+    def(typeName)
+      .field("computed", Boolean, defaults["false"])
+      .field("static", Boolean, defaults["false"])
+      .field("abstract", Boolean, defaults["false"])
       .field("accessibility", or("public", "private", "protected", null), defaults["null"])
       .field("decorators", or([def("Decorator")], null), defaults["null"])
-      .field("optional", or(Boolean, null), defaults["null"]);
+      .field("optional", Boolean, defaults["false"])
+      .field("readonly", Boolean, defaults["false"]);
   });
 
   var ObjectPatternProperty = or(

src/def/typescript.ts

@@ -498,7 +498,10 @@ export default function (fork: Fork) {
   def("ClassProperty")
     .field("access", // Not "accessibility"?
            or("public", "private", "protected", void 0),
-           defaults["undefined"])
+           defaults["undefined"]);
+
+  def("ClassAccessorProperty")
+    .bases("Declaration", "TSHasOptionalTypeAnnotation");
 
   // Defined already in es6 and babel-core.
   def("ClassBody")
@@ -508,6 +511,7 @@ export default function (fork: Fork) {
       def("ClassPropertyDefinition"),
       def("ClassProperty"),
       def("ClassPrivateProperty"),
+      def("ClassAccessorProperty"),
       def("ClassMethod"),
       def("ClassPrivateMethod"),
       def("StaticBlock"),

src/gen/builders.ts

@@ -901,11 +901,11 @@ export interface StaticBlockBuilder {
 
 export interface ClassBodyBuilder {
   (
-    body: (K.MethodDefinitionKind | K.VariableDeclaratorKind | K.ClassPropertyDefinitionKind | K.ClassPropertyKind | K.ClassPrivatePropertyKind | K.ClassMethodKind | K.ClassPrivateMethodKind | K.StaticBlockKind | K.TSDeclareMethodKind | K.TSCallSignatureDeclarationKind | K.TSConstructSignatureDeclarationKind | K.TSIndexSignatureKind | K.TSMethodSignatureKind | K.TSPropertySignatureKind)[]
+    body: (K.MethodDefinitionKind | K.VariableDeclaratorKind | K.ClassPropertyDefinitionKind | K.ClassPropertyKind | K.ClassPrivatePropertyKind | K.ClassAccessorPropertyKind | K.ClassMethodKind | K.ClassPrivateMethodKind | K.StaticBlockKind | K.TSDeclareMethodKind | K.TSCallSignatureDeclarationKind | K.TSConstructSignatureDeclarationKind | K.TSIndexSignatureKind | K.TSMethodSignatureKind | K.TSPropertySignatureKind)[]
   ): namedTypes.ClassBody;
   from(
     params: {
-      body: (K.MethodDefinitionKind | K.VariableDeclaratorKind | K.ClassPropertyDefinitionKind | K.ClassPropertyKind | K.ClassPrivatePropertyKind | K.ClassMethodKind | K.ClassPrivateMethodKind | K.StaticBlockKind | K.TSDeclareMethodKind | K.TSCallSignatureDeclarationKind | K.TSConstructSignatureDeclarationKind | K.TSIndexSignatureKind | K.TSMethodSignatureKind | K.TSPropertySignatureKind)[];
+      body: (K.MethodDefinitionKind | K.VariableDeclaratorKind | K.ClassPropertyDefinitionKind | K.ClassPropertyKind | K.ClassPrivatePropertyKind | K.ClassAccessorPropertyKind | K.ClassMethodKind | K.ClassPrivateMethodKind | K.StaticBlockKind | K.TSDeclareMethodKind | K.TSCallSignatureDeclarationKind | K.TSConstructSignatureDeclarationKind | K.TSIndexSignatureKind | K.TSMethodSignatureKind | K.TSPropertySignatureKind)[];
       comments?: K.CommentKind[] | null;
       loc?: K.SourceLocationKind | null;
     }
@@ -2757,11 +2757,11 @@ export interface ClassMethodBuilder {
     params: K.PatternKind[],
     body: K.BlockStatementKind,
     computed?: boolean,
-    staticParam?: boolean | null
+    staticParam?: boolean
   ): namedTypes.ClassMethod;
   from(
     params: {
-      abstract?: boolean | null;
+      abstract?: boolean;
       access?: "public" | "private" | "protected" | null;
       accessibility?: "public" | "private" | "protected" | null;
       async?: boolean;
@@ -2776,12 +2776,13 @@ export interface ClassMethodBuilder {
       key: K.LiteralKind | K.IdentifierKind | K.ExpressionKind;
       kind?: "get" | "set" | "method" | "constructor";
       loc?: K.SourceLocationKind | null;
-      optional?: boolean | null;
+      optional?: boolean;
       params: K.PatternKind[];
       predicate?: K.FlowPredicateKind | null;
+      readonly?: boolean;
       rest?: K.IdentifierKind | null;
       returnType?: K.TypeAnnotationKind | K.TSTypeAnnotationKind | null;
-      static?: boolean | null;
+      static?: boolean;
       typeParameters?: K.TypeParameterDeclarationKind | K.TSTypeParameterDeclarationKind | null;
     }
   ): namedTypes.ClassMethod;
@@ -2794,11 +2795,11 @@ export interface ClassPrivateMethodBuilder {
     body: K.BlockStatementKind,
     kind?: "get" | "set" | "method" | "constructor",
     computed?: boolean,
-    staticParam?: boolean | null
+    staticParam?: boolean
   ): namedTypes.ClassPrivateMethod;
   from(
     params: {
-      abstract?: boolean | null;
+      abstract?: boolean;
       access?: "public" | "private" | "protected" | null;
       accessibility?: "public" | "private" | "protected" | null;
       async?: boolean;
@@ -2813,17 +2814,44 @@ export interface ClassPrivateMethodBuilder {
       key: K.PrivateNameKind;
       kind?: "get" | "set" | "method" | "constructor";
       loc?: K.SourceLocationKind | null;
-      optional?: boolean | null;
+      optional?: boolean;
       params: K.PatternKind[];
       predicate?: K.FlowPredicateKind | null;
+      readonly?: boolean;
       rest?: K.IdentifierKind | null;
       returnType?: K.TypeAnnotationKind | K.TSTypeAnnotationKind | null;
-      static?: boolean | null;
+      static?: boolean;
       typeParameters?: K.TypeParameterDeclarationKind | K.TSTypeParameterDeclarationKind | null;
     }
   ): namedTypes.ClassPrivateMethod;
 }
 
+export interface ClassAccessorPropertyBuilder {
+  (
+    key: K.LiteralKind | K.IdentifierKind | K.PrivateNameKind | K.ExpressionKind,
+    value: K.ExpressionKind,
+    decorators?: K.DecoratorKind[] | null,
+    computed?: boolean,
+    staticParam?: boolean
+  ): namedTypes.ClassAccessorProperty;
+  from(
+    params: {
+      abstract?: boolean;
+      accessibility?: "public" | "private" | "protected" | null;
+      comments?: K.CommentKind[] | null;
+      computed?: boolean;
+      decorators?: K.DecoratorKind[] | null;
+      key: K.LiteralKind | K.IdentifierKind | K.PrivateNameKind | K.ExpressionKind;
+      loc?: K.SourceLocationKind | null;
+      optional?: boolean;
+      readonly?: boolean;
+      static?: boolean;
+      typeAnnotation?: K.TSTypeAnnotationKind | null;
+      value: K.ExpressionKind;
+    }
+  ): namedTypes.ClassAccessorProperty;
+}
+
 export interface RestPropertyBuilder {
   (argument: K.ExpressionKind): namedTypes.RestProperty;
   from(
@@ -3915,6 +3943,7 @@ export interface builders {
   regExpLiteral: RegExpLiteralBuilder;
   classMethod: ClassMethodBuilder;
   classPrivateMethod: ClassPrivateMethodBuilder;
+  classAccessorProperty: ClassAccessorPropertyBuilder;
   restProperty: RestPropertyBuilder;
   forAwaitStatement: ForAwaitStatementBuilder;
   import: ImportBuilder;