Replace generic gospeak.Enum[int] with enum.Int64, enum.Uint etc.

The generic Enum type didn't work, as it failed with:
"cannot use a type parameter as RHS in type declaration"

golang/go#45639

Author: VojtechVitek

enum.go

@@ -0,0 +1,29 @@
+package enum
+
+// type Enum[T EnumType] T
+//
+// type EnumType interface {
+//	~int | ~int8 | ~int16 | ~int32 | ~int64 | ~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~string
+// }
+//
+// NOTE: The generic Enum type didn't work, as it failed with:
+// "cannot use a type parameter as RHS in type declaration"
+// https://github.com/golang/go/issues/45639
+
+type Int int
+type Uint uint
+
+type Int8 int8
+type Uint8 uint8
+
+type Int16 int16
+type Uint16 uint16
+
+type Int32 int32
+type Uint32 uint32
+
+type Int64 int64
+type Uint64 uint64
+
+// webrpc TODO: string ENUM
+// https://github.com/webrpc/webrpc/issues/203

enum/enum.go

@@ -32,7 +32,7 @@ func (p *Parser) CollectEnums() error {
 			if typeDeclaration, ok := decl.(*ast.GenDecl); ok && typeDeclaration.Tok == token.IMPORT {
 				for _, spec := range typeDeclaration.Specs {
 					if importSpec, ok := spec.(*ast.ImportSpec); ok {
-						if strings.Contains(importSpec.Path.Value, `"github.com/golang-cz/gospeak"`) {
+						if strings.Contains(importSpec.Path.Value, `"github.com/golang-cz/gospeak/enum"`) {
 							gospeakImportFound = true
 						}
 					}
@@ -49,23 +49,26 @@ func (p *Parser) CollectEnums() error {
 			if typeDeclaration, ok := decl.(*ast.GenDecl); ok && typeDeclaration.Tok == token.TYPE {
 				for _, spec := range typeDeclaration.Specs {
 					if typeSpec, ok := spec.(*ast.TypeSpec); ok {
-						var enumName, enumTypeName string
-						if iExpr, ok := typeSpec.Type.(*ast.IndexExpr); ok {
-							if selExpr, ok := iExpr.X.(*ast.SelectorExpr); ok {
-								pkgName, ok := selExpr.X.(*ast.Ident)
-								if ok && pkgName.Name == "gospeak" && selExpr.Sel.Name == "Enum" {
-									if id, ok := iExpr.Index.(*ast.Ident); ok {
-										enumName = typeSpec.Name.Name
-										enumTypeName = id.Name
-									}
-								}
-							}
+						//panic(debug.Sdump(typeSpec))
+
+						selExpr, ok := typeSpec.Type.(*ast.SelectorExpr)
+						if !ok {
+							continue
 						}
-						if enumName == "" || enumTypeName == "" {
+						ident, ok := selExpr.X.(*ast.Ident)
+						if !ok {
+							continue
+						}
+
+						// type Status enum.Int64
+						enumName := typeSpec.Name.Name   // Status
+						pkgName := ident.Name            // enum
+						enumTypeName := selExpr.Sel.Name // Int64
+						if pkgName != "enum" || enumName == "" || enumTypeName == "" {
 							continue
 						}
 
-						enumElemType, ok := schema.CoreTypeFromString[enumTypeName]
+						enumElemType, ok := schema.CoreTypeFromString[strings.ToLower(enumTypeName)]
 						if !ok {
 							return fmt.Errorf("unknown enum type %v", enumTypeName)
 						}

internal/parser/enums.go

@@ -22,7 +22,7 @@ func TestStructFieldEnum(t *testing.T) {
 				// pending  = 1
 				// closed   = 2
 				// new      = 3
-				type Status gospeak.Enum[int]
+				type Status enum.Int
 			`,
 			t: schema.T_Int,
 			out: []*schema.TypeField{
@@ -39,7 +39,7 @@ func TestStructFieldEnum(t *testing.T) {
 				// pending
 				// closed
 				// new
-				type Status gospeak.Enum[uint64]
+				type Status enum.Uint64
 			`,
 			t: schema.T_Uint64,
 			out: []*schema.TypeField{
@@ -57,7 +57,7 @@ func TestStructFieldEnum(t *testing.T) {
 			import (
 				"context"
 			
-				"github.com/golang-cz/gospeak"
+				"github.com/golang-cz/gospeak/enum"
 			)
 
 			%s