Fix allowed and tests

grafana · Feb 10, 2023 · f614e6f · f614e6f
1 parent f776edd
commit f614e6f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/generator.go b/generator.go
@@ -285,11 +285,11 @@ func (g *generator) genEnum(name string, v cue.Value) []ts.Decl {
 		op, _ = v.Expr()
 	}
 
-	// We restrict the expression of TS enums to CUE disjunctions (sum types) of strings.
-	allowed := cue.StringKind | cue.NumberKind | cue.NumberKind
+	// We restrict the expression of TS enums to ints or strings.
+	allowed := cue.StringKind | cue.IntKind
 	ik := v.IncompleteKind()
 	if ik&allowed != ik {
-		g.addErr(valError(v, "typescript enums may only be generated from a disjunction of concrete int with memberNames attribute or strings"))
+		g.addErr(valError(v, "typescript enums may only be generated from concrete strings, or ints with memberNames attribute"))
 		return nil
 	}
 

diff --git a/testdata/multi_level_type_extension.txtar b/testdata/multi_level_type_extension.txtar
@@ -0,0 +1,27 @@
+-- cue --
+
+#AType: "a" | "b" | "c" @cuetsy(kind="type")
+#BType: "d" | "e" | "f" | #AType @cuetsy(kind="type")
+
+#Base: {
+	type:  #AType
+} @cuetsy(kind="interface")
+
+#Struct: {
+    #Base
+	type:  #BType
+} @cuetsy(kind="interface")
+
+-- ts --
+
+export type AType = ('a' | 'b' | 'c');
+
+export type BType = ('d' | 'e' | 'f' | AType);
+
+export interface Base {
+  type: AType;
+}
+
+export interface Struct extends Base {
+  type: BType;
+}
diff --git a/testdata/struct_enum_error.txtar b/testdata/struct_enum_error.txtar
@@ -11,4 +11,4 @@ TableCellDisplayMode: {
 } @cuetsy(kind="enum")
 
 -- err --
-typescript enums may only be generated from a disjunction of concrete int with memberNames attribute or strings
+typescript enums may only be generated from concrete strings, or ints with memberNames attribute"