Support enum strings (#247)

* allow string enum

* update go example with enum string support

* do not return error when type is not enum

* remove error out on structType func

_examples/golang-basics/example.ridl

@@ -8,6 +8,10 @@ enum Kind: uint32
   - USER
   - ADMIN
 
+enum Intent: string
+  - openSession
+  - closeSession
+  - validateSession
 
 struct Empty
 
@@ -25,6 +29,12 @@ struct User
   - role: string
     + go.tag.db = -
 
+  - kind: Kind
+    + json = kind
+
+  - intent: Intent
+    + json = intent
+
 struct SearchFilter
   - q: string
 

_examples/golang-basics/example_test.go

@@ -42,8 +42,11 @@ func TestGetUser(t *testing.T) {
 	{
 		arg1 := map[string]string{"a": "1"}
 		code, user, err := client.GetUser(context.Background(), arg1, 12)
+		intent := Intent_openSession
+		kind := Kind_ADMIN
+
 		assert.Equal(t, uint32(200), code)
-		assert.Equal(t, &User{ID: 12, Username: "hihi"}, user)
+		assert.Equal(t, &User{ID: 12, Username: "hihi", Intent: &intent, Kind: &kind}, user)
 		assert.NoError(t, err)
 	}
 

_examples/golang-basics/main.go

@@ -60,9 +60,14 @@ func (s *ExampleServiceRPC) GetUser(ctx context.Context, header map[string]strin
 		return 0, nil, ErrorWithCause(ErrUserNotFound, fmt.Errorf("unknown user id %d", userID))
 	}
 
+	kind := Kind_ADMIN
+	intent := Intent_openSession
+
 	return 200, &User{
 		ID:       userID,
 		Username: "hihi",
+		Kind:     &kind,
+		Intent:   &intent,
 	}, nil
 }
 

_examples/hello-webrpc-ts/webapp/src/client.gen.ts

@@ -369,3 +369,4 @@ const webrpcErrorByCode: { [code: number]: any } = {
 }
 
 export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>
+

_examples/node-ts/webapp/client.gen.ts

@@ -344,3 +344,4 @@ const webrpcErrorByCode: { [code: number]: any } = {
 }
 
 export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>
+

gen/funcmap_types.go

@@ -14,40 +14,40 @@ func isCoreType(v interface{}) bool {
 }
 
 // Returns true if given type is struct.
-func isStructType(v interface{}) (bool, error) {
+func isStructType(v interface{}) bool {
 	switch t := v.(type) {
 	case schema.Type:
-		return t.Kind == "struct", nil
+		return t.Kind == "struct"
 	case *schema.Type:
-		return t.Kind == "struct", nil
+		return t.Kind == "struct"
 	case schema.VarType:
-		return t.Type == schema.T_Struct, nil
+		return t.Type == schema.T_Struct
 	case *schema.VarType:
 		if t != nil {
-			return t.Type == schema.T_Struct, nil
+			return t.Type == schema.T_Struct
 		}
-		return false, nil
+		return false
 	default:
-		return false, fmt.Errorf("isStructType(): unexpected type %T: %+v", v, v)
+		return false
 	}
 }
 
 // Returns true if given type is enum.
-func isEnumType(v interface{}) (bool, error) {
+func isEnumType(v interface{}) bool {
 	switch t := v.(type) {
 	case schema.Type:
-		return t.Kind == "enum", nil
+		return t.Kind == "enum"
 	case *schema.Type:
-		return t.Kind == "enum", nil
+		return t.Kind == "enum"
 	case schema.VarType:
-		return t.Struct.Type.Kind == "enum", nil
+		return t.Struct.Type.Kind == "enum"
 	case *schema.VarType:
 		if t != nil {
-			return t.Struct.Type.Kind == "enum", nil
+			return t.Struct.Type.Kind == "enum"
 		}
-		return false, nil
+		return false
 	default:
-		return false, fmt.Errorf("isEnumType(): unexpected type %T: %+v", v, v)
+		return false
 	}
 }
 

schema/type.go

@@ -126,8 +126,9 @@ func (t *Type) Parse(schema *WebRPCSchema) error {
 
 		// ensure enum type is one of the allowed types.. aka integer
 		fieldType := t.Type
-		if !isValidVarType(fieldType.String(), VarIntegerCoreTypes) {
-			return fmt.Errorf("schema error: enum '%s' field '%s' is invalid. must be an integer type.", t.Name, fieldType.String())
+		validCoreTypes := append(VarIntegerCoreTypes, T_String)
+		if !isValidVarType(fieldType.String(), validCoreTypes) {
+			return fmt.Errorf("schema error: enum '%s' field '%s' is invalid. must be an integer type", t.Name, fieldType.String())
 		}
 	}