Fix shorthand structs (#98)

* Iterate struct to find missing attributes

* Remove print

Author: spinillos

analyze.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/ast"
 	"cuelang.org/go/cue/format"
 )
 
@@ -31,7 +32,11 @@ func getKindFor(v cue.Value) (TSType, error) {
 			attr = a
 		}
 	}
+
 	if !found {
+		if t, ok := getKindForField(v); ok {
+			return t, nil
+		}
 		return "", valError(v, "value has no \"@%s\" attribute", attrname)
 	}
 
@@ -46,6 +51,42 @@ func getKindFor(v cue.Value) (TSType, error) {
 	return TSType(tt), nil
 }
 
+func getKindForField(v cue.Value) (TSType, bool) {
+	if field, ok := v.Source().(*ast.Field); ok {
+		if s, ok := field.Value.(*ast.StructLit); ok {
+			return iterateField(s)
+		}
+	}
+	return "", false
+}
+
+func iterateField(s *ast.StructLit) (TSType, bool) {
+	for _, el := range s.Elts {
+		if field, ok := el.(*ast.Field); ok {
+			if len(field.Attrs) > 0 {
+				return parseStringAttribute(field.Attrs[0].Text), true
+			}
+			if s, ok := field.Value.(*ast.StructLit); ok {
+				return iterateField(s)
+			}
+		}
+	}
+	return "", false
+}
+
+func parseStringAttribute(attr string) TSType {
+	switch attr {
+	case "@cuetsy(kind=\"interface\")":
+		return TypeInterface
+	case "@cuetsy(kind=\"enum\")":
+		return TypeEnum
+	case "@cuetsy(kind=\"type\")":
+		return TypeAlias
+	default:
+		return ""
+	}
+}
+
 func targetsKind(v cue.Value, kinds ...TSType) bool {
 	vkind, err := getKindFor(v)
 	if err != nil {

generate_test.go

@@ -44,8 +44,7 @@ func TestGenerateWithImports(t *testing.T) {
 		Name:   "gen",
 		Update: *updateGolden,
 		ToDo: map[string]string{
-			"imports/oneref_verbose":   "Figure out how to disambiguate struct literals from the struct-with-braces-and-one-element case",
-			"imports/struct_shorthand": "Shorthand struct notation is currently unsupported, needs fixing",
+			"imports/oneref_verbose": "Figure out how to disambiguate struct literals from the struct-with-braces-and-one-element case",
 		},
 	}
 

testdata/imports/struct_shorthand.txtar

@@ -8,6 +8,11 @@ TwoLevel: NestedDecl: {
     InnerTwo: number
 } @cuetsy(kind="interface")
 
+ThreeLevel: TwoLevel: NestedDecl: {
+    InnerOne: number
+    InnerTwo: number
+} @cuetsy(kind="interface")
+
 -- out/gen --
 
 export interface TwoLevel {
@@ -16,3 +21,12 @@ export interface TwoLevel {
     InnerTwo: number;
   };
 }
+
+export interface ThreeLevel {
+  TwoLevel: {
+    NestedDecl: {
+      InnerOne: number;
+      InnerTwo: number;
+    };
+  };
+}