Add class field declarations to TypeScript AST

3 files changed, 86 insertions, 0 deletions

diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriterTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriterTests.java
index a375b13..05fa013 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriterTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriterTests.java
@@ -3,6 +3,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.typescript;
 import org.junit.jupiter.api.Test;
 import org.zwobble.hobgoblin.compiler.output.CodeWriter;
 import org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclaration;
+import org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration;
 import org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier;
 import org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptModule;
 
@@ -72,6 +73,44 @@ public class TypescriptWriterTests {
         ));
     }
 
+    @Test
+    public void classDeclarationWithElements() throws IOException {
+        var typescript = TypescriptClassDeclaration.arbitrary()
+            .withName(TypescriptIdentifier.of("X"))
+            .addBodyElement(TypescriptClassFieldDeclaration.arbitrary()
+                .withName(TypescriptIdentifier.of("a"))
+            )
+            .addBodyElement(TypescriptClassFieldDeclaration.arbitrary()
+                .withName(TypescriptIdentifier.of("b"))
+            )
+            .build();
+
+        var string = write(writer -> writer.writeStatement(typescript));
+
+        assertThat(string, equalTo("""
+            class X {
+                a;
+
+                b;
+            }"""
+        ));
+    }
+
+    // == Class elements ==
+
+    // === Class field declarations ===
+
+    @Test
+    public void classFieldDeclarationWithoutInitialValue() throws IOException {
+        var typescript = TypescriptClassFieldDeclaration.arbitrary()
+            .withName(TypescriptIdentifier.of("a"))
+            .build();
+
+        var string = write(writer -> writer.writeClassElement(typescript));
+
+        assertThat(string, equalTo("a;"));
+    }
+
     private String write(TypescriptWriter.Write write) throws IOException {
         return write(write, Optional.empty());
     }
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassDeclarationMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassDeclarationMatcher.java
index 8bde6e1..35461f6 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassDeclarationMatcher.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassDeclarationMatcher.java
@@ -36,6 +36,12 @@ public final class TypescriptClassDeclarationMatcher implements org.zwobble.prec
         return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclarationMatcher(submatchers);
     }
 
+    public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclarationMatcher withBody(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassElement>> body) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclaration>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("body", org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclaration::body, body));
+        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclarationMatcher(submatchers);
+    }
+
     // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclarationMatcher body
     // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassDeclarationMatcher body
 }
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclarationMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclarationMatcher.java
new file mode 100644
index 0000000..289c477
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclarationMatcher.java
@@ -0,0 +1,41 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.typescript.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher imports
+
+public final class TypescriptClassFieldDeclarationMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher isTypescriptClassFieldDeclaration() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration>> submatchers;
+
+    private TypescriptClassFieldDeclarationMatcher(
+        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration>> submatchers
+    ) {
+        this.submatchers = submatchers;
+    }
+
+    public org.zwobble.precisely.MatchResult match(java.lang.Object actual) {
+        return this.toMatcher().match(actual);
+    }
+
+    public org.zwobble.precisely.TextTree describe() {
+        return this.toMatcher().describe();
+    }
+
+    private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() {
+        return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher withName(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier> name) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration::name, name));
+        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher body
+}