Merge pull request #67 from grafana/allow-multiple-types-string-map

Allow multiple types string map

Author: sam boyer

generator.go

@@ -911,16 +911,20 @@ func tsprintField(v cue.Value, isType bool) (ts.Expr, error) {
 	case cue.StructKind:
 		switch op {
 		case cue.SelectorOp, cue.AndOp, cue.NoOp:
+			// Checks [string]something and {...}
 			val := v.LookupPath(cue.MakePath(cue.AnyString))
 			if val.Exists() {
+				expr, err := tsprintField(val, isType)
+				if err != nil {
+					return nil, valError(v, err.Error())
+				}
 				kvs := []tsast.KeyValueExpr{
 					{
 						Key:         ts.Ident("string"),
-						Value:       tsprintType(val.IncompleteKind()),
+						Value:       expr,
 						CommentList: commentsFor(val.Value(), true),
 					},
 				}
-
 				return tsast.ObjectLit{Elems: kvs, IsType: isType, IsMap: true}, nil
 			}
 
@@ -1118,7 +1122,7 @@ func tsprintType(k cue.Kind) ts.Expr {
 	case cue.NumberKind, cue.FloatKind, cue.IntKind:
 		return ts.Ident("number")
 	case cue.TopKind:
-		return ts.Ident("any")
+		return ts.Ident("unknown")
 	default:
 		return nil
 	}

testdata/interfaces.txtar

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

testdata/map_to_type.txtar

@@ -1,16 +1,38 @@
 -- cue --
 package cuetsy
 
+#StructTest: {
+  a: string
+}
+
 Map: {
   boolTest: [string]: bool
   numberTest: [string]: int64
   stringTest: [string]: string
+  emptyStructTest: {...}
+  listTest: [string]: [...string]
+  listWithStructTest: [string]: [...#StructTest]
+  mapTest: [string]: [string]: string
+  structTest: [string]: #StructTest
+  optionalTest?: [string]: string
 } @cuetsy(kind="interface")
 
+
+
 -- ts  --
 
 export interface Map {
   boolTest: Record<string, boolean>;
+  emptyStructTest: Record<string, unknown>;
+  listTest: Record<string, Array<string>>;
+  listWithStructTest: Record<string, Array<{
+  a: string,
+}>>;
+  mapTest: Record<string, Record<string, string>>;
   numberTest: Record<string, number>;
+  optionalTest?: Record<string, string>;
   stringTest: Record<string, string>;
+  structTest: Record<string, {
+  a: string,
+}>;
 }