From b853399ce5ab5adb1a8899265d106ae1ab96bb35 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 31 Aug 2026 22:58:36 +0100 Subject: Add type unions to TypeScript AST --- .../output/lang/typescript/TypescriptWriter.java | 12 ++++++ .../lang/typescript/ast/TypescriptExpression.java | 2 +- .../lang/typescript/ast/TypescriptTypeUnion.java | 44 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptTypeUnion.java (limited to 'src/main/java') 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 50d67bf..7931855 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 @@ -276,6 +276,10 @@ public class TypescriptWriter implements AutoCloseable { case TypescriptRef ref -> { this.writeRef(ref); } + + case TypescriptTypeUnion typeUnion -> { + this.writeTypeUnion(typeUnion); + } } } @@ -341,6 +345,14 @@ public class TypescriptWriter implements AutoCloseable { this.writeIdentifier(ref.name()); } + private void writeTypeUnion(TypescriptTypeUnion typeUnion) throws IOException { + writeWithSeparator( + typeUnion.variants(), + this::writeExpression, + () -> this.writer.write(" | ") + ); + } + // == Doc comments == private void writeDocComment(DocComment docComment) throws IOException { 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 7d443a3..b8e79d3 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.TypescriptCall, 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 sealed interface TypescriptExpression permits org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptCall, 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, org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression build(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptTypeUnion.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptTypeUnion.java new file mode 100644 index 0000000..9b32b6c --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/typescript/ast/TypescriptTypeUnion.java @@ -0,0 +1,44 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.typescript.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion imports + +public record TypescriptTypeUnion( + java.util.List variants +) implements org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder(java.util.List.of()); + } + + public record Builder( + java.util.List variants + ) implements org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion build() { + return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion(variants); + } + + public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder withVariants(java.util.List variants) { + return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder(variants); + } + + public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder addVariant(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression variant) { + var variants = new java.util.ArrayList(this.variants); + variants.add(variant); + return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder(variants); + } + + public org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder addVariant(org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptExpression.Builder variant) { + var variants = new java.util.ArrayList(this.variants); + variants.add(variant.build()); + return new org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder(variants); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.typescript.ast.TypescriptTypeUnion body +} -- cgit v1.2.3