Merge pull request #56 from grafana/disjunct-parens

ts: Generate all unions inside parentheses

testdata/defaults_interface.txtar

@@ -27,7 +27,7 @@ NestedFoo: {
 
 -- ts  --
 
-export type AType = 'foo' | 'bar' | 'baz';
+export type AType = ('foo' | 'bar' | 'baz');
 
 export const defaultAType: AType = 'baz';
 

testdata/imports/force_text.txtar

@@ -25,7 +25,7 @@ export enum MyType {
   B = 2,
 }
 
-export type ModeOptions = ModeOptionsA | ModeOptionsB;
+export type ModeOptions = (ModeOptionsA | ModeOptionsB);
 
 export interface ModeOptionsA {
   aProp: boolean;
@@ -35,4 +35,4 @@ export interface ModeOptionsA {
 export interface ModeOptionsB {
   bProp: boolean;
   type: MyType.B;
-}
+}

testdata/imports/union.txtar

@@ -55,8 +55,8 @@ export interface LocalStruct {
 
 export type LocalScalar = string;
 
-export type UnionType = With | Without | LocalStruct | LocalScalar;
+export type UnionType = (With | Without | LocalStruct | LocalScalar);
 
 export interface UnionInterface {
-  field: With | Without | LocalStruct | LocalScalar;
+  field: (With | Without | LocalStruct | LocalScalar);
 }

testdata/imports/union_paren.txtar

@@ -0,0 +1,41 @@
+-- cue.mod/module.cue --
+module: "example.com"
+
+-- one.cue --
+package test
+
+import "example.com/dep"
+
+U1: "foo" | "bar" | "baz" @cuetsy(kind="type")
+U2: U1 | "bix" @cuetsy(kind="type")
+U3: {
+    bigU: dep.U1 | U2 | U1
+    listU: [...(dep.U1 | U2 | U1)]
+} @cuetsy(kind="interface")
+
+-- dep/file.cue --
+package dep
+
+U1: 1 | 2 | 3 @cuetsy(kind="type")
+
+NoAttrib: {
+    ImportedInner: {
+      nestedval: string
+    }
+    importedNoAttribField: string
+}
+
+-- out/gen --
+
+export type U1 = ('foo' | 'bar' | 'baz');
+
+export type U2 = (U1 | 'bix');
+
+export interface U3 {
+  bigU: (dep.U1 | U2 | U1);
+  listU: (dep.U1 | U2 | U1)[];
+}
+
+export const defaultU3: Partial<U3> = {
+  listU: [],
+};

testdata/interfaces.txtar

@@ -54,7 +54,7 @@ export enum E2 {
 
 export interface I1 {
   I1_FloatLiteral: 4.4;
-  I1_OptionalDisjunctionLiteral?: 'other' | 'values' | 2;
+  I1_OptionalDisjunctionLiteral?: ('other' | 'values' | 2);
   I1_Top: any;
 }
 

ts/ast/ast.go

@@ -202,6 +202,19 @@ func (k KeyValueExpr) innerString(eol EOL, lvl int) string {
 	return fmt.Sprintf("%s: %s", k.Key, innerString(eol, lvl, k.Value))
 }
 
+type ParenExpr struct {
+	Expr Expr
+}
+
+func (p ParenExpr) expr() {}
+func (p ParenExpr) String() string {
+	return p.innerString(EOL(""), 0)
+}
+
+func (p ParenExpr) innerString(eol EOL, lvl int) string {
+	return fmt.Sprintf("(%s)", innerString(eol, lvl, p.Expr))
+}
+
 type UnaryExpr struct {
 	Op   string // operator
 	Expr Expr   // operand

ts/ts.go

@@ -46,7 +46,7 @@ func Union(elems ...Expr) Expr {
 		}
 	}
 
-	return U
+	return ast.ParenExpr{Expr: U}
 }
 
 func Export(decl ast.Decl) Decl {