feat(types): update

jzero-io · Jul 9, 2024 · d73536f · d73536f
1 parent d231ee7
commit d73536f
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 116 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -74,7 +74,7 @@ func getHandlerTypes(apiSpec *spec.ApiSpec, handlerType spec.Type) []spec.Type {
 		tt, ok := t.Value.(spec.DefineStruct)
 		if ok {
 			for _, x := range apiSpec.Types {
-				if x.Name() == tt.Name() {
+				if x.Name() == tt.RawName {
 					requestTypes = append(requestTypes, x)
 					//if ds, ok := x.(spec.DefineStruct); ok {
 					//	for _, m := range ds.Members {

diff --git a/parser/testdata/desc/base/base.api b/parser/testdata/desc/base/base.api
diff --git a/parser/testdata/desc/hello.api b/parser/testdata/desc/hello.api
diff --git a/parser/testdata/desc/main.api b/parser/testdata/desc/main.api
diff --git a/parser/testdata/desc/test.api b/parser/testdata/desc/test.api
@@ -8,11 +8,24 @@ type Tree {
     base BaseTree `json:"base"`
 }
 
+type User {
+    username string `json:"username"`
+}
+
+@server (
+    prefix: /api/v1
+    group: err1
+)
+service test {
+    @handler Error1
+    post /test/error1 () returns ([]Tree)
+}
+
 @server (
     prefix: /api/v1
-    group: test
+    group: err2
 )
-service demo-api {
-    @handler Tree
-    post /test/tree () returns ([]Tree)
+service test {
+    @handler Error2
+    post /test/error2 () returns (*User)
 }
diff --git a/parser/testdata/desc/user/group.api b/parser/testdata/desc/user/group.api
diff --git a/parser/testdata/desc/user/user.api b/parser/testdata/desc/user/user.api
diff --git a/parser/testdata/internal/types/test.types.go → parser/testdata/internal/types/err1.types.go b/parser/testdata/internal/types/test.types.go → parser/testdata/internal/types/err1.types.go
diff --git a/parser/testdata/internal/types/types.go b/parser/testdata/internal/types/types.go
diff --git a/parser/testdata/internal/types/user_group.types.go b/parser/testdata/internal/types/user_group.types.go
diff --git a/parser/testdata/internal/types/user_user.types.go b/parser/testdata/internal/types/user_user.types.go