Add constructed types to TypeScript AST

3 files changed, 70 insertions, 1 deletions

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 fb98a30..79ff43f 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
@@ -228,6 +228,10 @@ public class TypescriptWriter implements AutoCloseable {
                 this.writeBinaryOperation(binaryOperation);
             }
 
+            case TypescriptConstructedType constructedType -> {
+                this.writeConstructedType(constructedType);
+            }
+
             case TypescriptFieldAccess fieldAccess -> {
                 this.writeFieldAccess(fieldAccess);
             }
@@ -260,6 +264,17 @@ public class TypescriptWriter implements AutoCloseable {
         });
     }
 
+    private void writeConstructedType(TypescriptConstructedType constructedType) throws IOException {
+        this.writeExpression(constructedType.receiver());
+        this.writer.write("<");
+        writeWithSeparator(
+            constructedType.args(),
+            this::writeExpression,
+            () -> this.writer.write(", ")
+        );
+        this.writer.write(">");
+    }
+
     private void writeFieldAccess(TypescriptFieldAccess fieldAccess) throws IOException {
         this.writeExpression(fieldAccess.receiver());
         this.writer.write(".");
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptConstructedType.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptConstructedType.java
new file mode 100644
index 0000000..8b2264d
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptConstructedType.java
@@ -0,0 +1,54 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.typescript.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType imports
+
+public record TypescriptConstructedType(
+    org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression receiver,
+    java.util.List<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> args
+) implements org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression {
+    public static org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptNumberLiteral.arbitrary().build(), java.util.List.of());
+    }
+
+    public record Builder(
+        org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression receiver,
+        java.util.List<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> args
+    ) implements org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType(receiver, args);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder withReceiver(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression receiver) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder(receiver, args);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder withReceiver(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder receiver) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder(receiver.build(), args);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder withArgs(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression> args) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder(receiver, args);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder addArg(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression arg) {
+            var args = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression>(this.args);
+            args.add(arg);
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder(receiver, args);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder addArg(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder arg) {
+            var args = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression>(this.args);
+            args.add(arg.build());
+            return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder(receiver, args);
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType body
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptExpression.java
index 1cf2e81..79057fe 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptExpression.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptExpression.java
@@ -5,7 +5,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.typescript.ast;
 // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression imports
 // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression imports
 
-public sealed interface TypescriptExpression permits org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptNewCall, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptNumberLiteral, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptRef {
+public sealed interface TypescriptExpression permits org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptConstructedType, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptNewCall, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptNumberLiteral, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptRef {
     public interface Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression build();