Merge pull request #12 from light-speak/staging

Staging
light-speak · Nov 1, 2024 · b5fe63d · b5fe63d
2 parents b37c94a + 4f5928d
commit b5fe63d
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 30 deletions.
diff --git a/example/user/models/model.go b/example/user/models/model.go
diff --git a/example/user/repo/repo.go b/example/user/repo/repo.go
diff --git a/example/user/resolver/operation_gen.go b/example/user/resolver/operation_gen.go
diff --git a/example/user/resolver/query.go b/example/user/resolver/query.go
diff --git a/example/user/schema/post.graphqls b/example/user/schema/post.graphqls
@@ -13,6 +13,8 @@ extend type Query {
   getPost(fuck: String!): Post! 
   getPosts(fuck: String!): [Post!]! 
   getPostIds: [ID!]!
+  testPostId(id: ID!): Post
+  testPostInt(id: Boolean!): Post
   testPostEnum(enum: TestEnum!): String!
   testPostInput(input: TestInput!): String! 
 }

diff --git a/graphql/model/generate/tpl/operation_gen.tpl b/graphql/model/generate/tpl/operation_gen.tpl
@@ -9,7 +9,11 @@ func init() {
   {{- range $index, $arg := $args }}
 
     {{- if eq $arg.Type.GetRealType.Kind "SCALAR" }}
-    {{ $arg.Name | lcFirst }}, ok := args["{{ $index }}"].({{ false | $arg.Type.GetGoType }})
+    pv, e := graphql.Parser.NodeStore.Scalars["{{ $arg.Type.GetRealType.Name }}"].ScalarType.ParseValue(args["{{ $index }}"], nil)
+    if e != nil {
+      return nil, e
+    }
+    {{ $arg.Name | lcFirst }}, ok := pv.({{ false | $arg.Type.GetGoType }})
     if !ok {
       return nil, fmt.Errorf("argument: '{{ $arg.Name }}' is not a {{ false | $arg.Type.GetGoType }}, got %T", args["{{ $index }}"])
     }

diff --git a/template/import.go b/template/import.go
@@ -75,6 +75,9 @@ var importRegexMap = map[string]Import{
 	`handler\.`: {
 		Path: "github.com/light-speak/lighthouse/handler",
 	},
+	`graphql\.`: {
+		Path: "github.com/light-speak/lighthouse/graphql",
+	},
 }
 
 // AddImportRegex add a new import regex and path to the importRegexMap

diff --git a/version/version.go b/version/version.go
@@ -1,3 +1,3 @@
 package version
 
-var Version = "v0.0.2"
+var Version = "v0.0.3"