Mark fields as readonly in typescript-types

5 files changed, 44 insertions, 13 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/typescripttypes/TypescriptTypesGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/typescripttypes/TypescriptTypesGenerator.java
index 3d1f94f..f2c76d0 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/typescripttypes/TypescriptTypesGenerator.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/typescripttypes/TypescriptTypesGenerator.java
@@ -113,6 +113,7 @@ public class TypescriptTypesGenerator implements Generator {
                 this.typescriptGenerator.generateFieldName(field.name()),
                 TypescriptVisibility.PUBLIC,
                 false,
+                true,
                 Optional.of(this.typescriptGenerator.generateTypeExpression(field.type().value())),
                 Optional.empty()
             ));
@@ -123,6 +124,7 @@ public class TypescriptTypesGenerator implements Generator {
                 TypescriptIdentifier.of("INSTANCE"),
                 TypescriptVisibility.PUBLIC,
                 true,
+                true,
                 Optional.empty(),
                 Optional.of(new TypescriptNewCall(
                     new TypescriptRef(typescriptTypeName),
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriter.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriter.java
index 1110e96..fb98a30 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriter.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/TypescriptWriter.java
@@ -180,6 +180,10 @@ public class TypescriptWriter implements AutoCloseable {
             this.writer.write("static ");
         }
 
+        if (fieldDeclaration.isReadOnly()) {
+            this.writer.write("readonly ");
+        }
+
         this.writeIdentifier(fieldDeclaration.name());
 
         if (fieldDeclaration.type().isPresent()) {
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclaration.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclaration.java
index 8dbcacd..19a8e7d 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclaration.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptClassFieldDeclaration.java
@@ -9,62 +9,68 @@ public record TypescriptClassFieldDeclaration(
     org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier name,
     org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptVisibility visibility,
     boolean isStatic,
+    boolean isReadOnly,
     java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> type,
     java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> initialValue
 ) implements org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassElement {
     public static org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder arbitrary() {
-        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptVisibility.PRIVATE, false, java.util.Optional.empty(), java.util.Optional.empty());
+        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptVisibility.PRIVATE, false, false, java.util.Optional.empty(), java.util.Optional.empty());
     }
 
     public record Builder(
         org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier name,
         org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptVisibility visibility,
         boolean isStatic,
+        boolean isReadOnly,
         java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> type,
         java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> initialValue
     ) implements org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassElement.Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration build() {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration(name, visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration(name, visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier name) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptIdentifier.Builder name) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name.build(), visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name.build(), visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withVisibility(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptVisibility visibility) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withIsStatic(boolean isStatic) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, initialValue);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withIsReadOnly(boolean isReadOnly) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withType(java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> type) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression type) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, java.util.Optional.of(type), initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, java.util.Optional.of(type), initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder type) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, java.util.Optional.of(type.build()), initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, java.util.Optional.of(type.build()), initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withInitialValue(java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> initialValue) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, initialValue);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, initialValue);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withInitialValue(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression initialValue) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, java.util.Optional.of(initialValue));
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, java.util.Optional.of(initialValue));
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder withInitialValue(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder initialValue) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, type, java.util.Optional.of(initialValue.build()));
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder(name, visibility, isStatic, isReadOnly, type, java.util.Optional.of(initialValue.build()));
         }
 
         // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration.Builder body
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 718f6e4..7ca267a 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
@@ -212,7 +212,7 @@ public class TypescriptWriterTests {
     }
 
     @Test
-    public void staticClassFieldDeclarationWithoutInitialValue() throws IOException {
+    public void staticClassFieldDeclaration() throws IOException {
         var typescript = TypescriptClassFieldDeclaration.arbitrary()
             .withVisibility(TypescriptVisibility.PUBLIC)
             .withName(id("a"))
@@ -225,6 +225,19 @@ public class TypescriptWriterTests {
     }
 
     @Test
+    public void readOnlyClassFieldDeclaration() throws IOException {
+        var typescript = TypescriptClassFieldDeclaration.arbitrary()
+            .withVisibility(TypescriptVisibility.PUBLIC)
+            .withName(id("a"))
+            .withIsReadOnly(true)
+            .build();
+
+        var string = write(writer -> writer.writeClassElement(typescript));
+
+        assertThat(string, equalTo("public readonly a;"));
+    }
+
+    @Test
     public void classFieldDeclarationWithExplicitType() throws IOException {
         var typescript = TypescriptClassFieldDeclaration.arbitrary()
             .withVisibility(TypescriptVisibility.PUBLIC)
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
index 62a3f9e..f4afcc8 100644
--- 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
@@ -48,6 +48,12 @@ public final class TypescriptClassFieldDeclarationMatcher implements org.zwobble
         return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher(submatchers);
     }
 
+    public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher withIsReadOnly(org.zwobble.precisely.Matcher<? super java.lang.Boolean> isReadOnly) {
+        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("isReadOnly", org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration::isReadOnly, (org.zwobble.precisely.Matcher) isReadOnly));
+        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher(submatchers);
+    }
+
     public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclarationMatcher withType(org.zwobble.precisely.Matcher<? super java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression>> type) {
         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("type", org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptClassFieldDeclaration::type, (org.zwobble.precisely.Matcher) type));