fix: do not require explicit annotation on type enum variants (#1520)

block · May 17, 2024 · 1300bf2 · 1300bf2
1 parent 80c00ab
commit 1300bf2
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 38 deletions.
diff --git a/buildengine/testdata/projects/another/another.go b/buildengine/testdata/projects/another/another.go
@@ -12,20 +12,17 @@ type TypeEnum interface {
 	tag()
 }
 
-//ftl:typealias export
 type A int
 
 func (A) tag() {}
 
-//ftl:typealias export
 type B string
 
 func (B) tag() {}
 
 //ftl:enum export
 type SecondTypeEnum interface{ typeEnum() }
 
-//ftl:typealias export
 type One int
 
 func (One) typeEnum() {}

diff --git a/buildengine/testdata/projects/other/other.go b/buildengine/testdata/projects/other/other.go
@@ -15,42 +15,34 @@ type TypeEnum interface {
 	tag()
 }
 
-//ftl:typealias
 type MyBool bool
 
 func (MyBool) tag() {}
 
-//ftl:typealias
 type MyBytes []byte
 
 func (MyBytes) tag() {}
 
-//ftl:typealias
 type MyFloat float64
 
 func (MyFloat) tag() {}
 
-//ftl:typealias
 type MyInt int
 
 func (MyInt) tag() {}
 
-//ftl:typealias
 type MyTime time.Time
 
 func (MyTime) tag() {}
 
-//ftl:typealias
 type List []string
 
 func (List) tag() {}
 
-//ftl:typealias
 type Map map[string]string
 
 func (Map) tag() {}
 
-//ftl:typealias
 type MyString string
 
 func (MyString) tag() {}
@@ -59,12 +51,10 @@ type Struct struct{}
 
 func (Struct) tag() {}
 
-//ftl:typealias
 type MyOption ftl.Option[string]
 
 func (MyOption) tag() {}
 
-//ftl:typealias
 type MyUnit ftl.Unit
 
 func (MyUnit) tag() {}
@@ -74,12 +64,10 @@ type SecondTypeEnum interface {
 	tag2()
 }
 
-//ftl:typealias
 type A string
 
 func (A) tag2() {}
 
-//ftl:typealias
 type B EchoRequest
 
 func (B) tag2() {}

diff --git a/go-runtime/compile/schema.go b/go-runtime/compile/schema.go
@@ -658,8 +658,7 @@ func visitGenDecl(pctx *parseContext, node *ast.GenDecl) {
 						if sType, ok := visitType(pctx, node.Pos(), typ, isExported).Get(); ok {
 							typeAlias.Type = sType
 						} else {
-							pctx.errors.add(errorf(node, "unsupported type %q for type alias",
-								pctx.pkg.TypesInfo.TypeOf(t.Type).Underlying()))
+							pctx.errors.add(errorf(node, "unsupported type %q for type alias", typ.Underlying()))
 						}
 					} else {
 						visitType(pctx, node.Pos(), pctx.pkg.TypesInfo.Defs[t.Name].Type(), isExported)
@@ -1219,15 +1218,10 @@ func visitType(pctx *parseContext, pos token.Pos, tnode types.Type, isExported b
 	switch underlying := tnode.Underlying().(type) {
 	case *types.Basic:
 		if named, ok := tnode.(*types.Named); ok {
-			if _, ok := visitType(pctx, pos, named.Underlying(), isExported).Get(); !ok {
-				return optional.None[schema.Type]()
-			}
 			ref, doneWithVisit := visitNamedRef(pctx, pos, named)
 			if doneWithVisit {
 				return ref
 			}
-			pctx.errors.add(noEndColumnErrorf(pos, "type is not declared as an ftl enum or type alias"))
-			return optional.None[schema.Type]()
 		}
 
 		switch underlying.Kind() {

diff --git a/go-runtime/compile/schema_test.go b/go-runtime/compile/schema_test.go
@@ -52,13 +52,9 @@ func TestExtractModuleSchema(t *testing.T) {
 
   database postgres testDb
 
-  export typealias Blob String
-
-  export typealias List [String]
-
   export enum BlobOrList {
-    Blob one.Blob
-    List one.List
+    Blob String
+    List [String]
   }
 
   export enum Color: String {
@@ -167,16 +163,14 @@ func TestExtractModuleSchemaTwo(t *testing.T) {
 	assert.Equal(t, r.MustGet().Errors, nil)
 	actual := schema.Normalise(r.MustGet().Module)
 	expected := `module two {
-		export typealias Scalar String
-
 		export enum TwoEnum: String {
 		  Red = "Red"
 		  Blue = "Blue"
 		  Green = "Green"
         }
 
         export enum TypeEnum {
-		  Scalar two.Scalar
+		  Scalar String
 		  List [String]
 		  Exported two.Exported
 		  WithoutDirective two.WithoutDirective
@@ -439,8 +433,6 @@ func TestErrorReporting(t *testing.T) {
 		`117:1-26: parent enum "ExportedTypeEnum" is exported, but directive "ftl:data" on "PrivateData" is not: all variants of exported enums that have a directive must be explicitly exported as well`,
 		`121:21-60: config and secret names must be valid identifiers`,
 		`127:1-26: only one directive expected for type alias`,
-		`133:2-2: type is not declared as an ftl enum or type alias`,
-		`133:2-7: unsupported type "ftl/failing.NonFTLAlias" for field "Value"`,
 		`143:1-35: type can not be a variant of more than 1 type enums (TypeEnum1, TypeEnum2)`,
 	}
 	assert.Equal(t, expected, actual)

diff --git a/go-runtime/compile/testdata/one/one.go b/go-runtime/compile/testdata/one/one.go
@@ -53,12 +53,10 @@ const (
 //ftl:enum
 type BlobOrList interface{ blobOrList() }
 
-//ftl:typealias
 type Blob string
 
 func (Blob) blobOrList() {}
 
-//ftl:typealias
 type List []string
 
 func (List) blobOrList() {}

diff --git a/go-runtime/compile/testdata/two/two.go b/go-runtime/compile/testdata/two/two.go
@@ -18,7 +18,6 @@ const (
 //ftl:enum export
 type TypeEnum interface{ typeEnum() }
 
-//ftl:typealias export
 type Scalar string
 
 func (Scalar) typeEnum() {}

diff --git a/integration/testdata/go/httpingress/httpingress.go b/integration/testdata/go/httpingress/httpingress.go
@@ -28,12 +28,10 @@ type SumType interface {
 	tag()
 }
 
-//ftl:typealias export
 type A string
 
 func (A) tag() {}
 
-//ftl:typealias export
 type B []string
 
 func (B) tag() {}