entgql: check fields RType for Map and use Map scalar if possible (#455)

* fix(entgql): check fields RType for Map and use Map scalar if possible * feat(entgql): add tests to cover field JSON with Map scalar * entgql: update codegen Signed-off-by: Giau. Tran Minh <hello@giautm.dev> --------- Signed-off-by: Giau. Tran Minh <hello@giautm.dev> Co-authored-by: Giau. Tran Minh <hello@giautm.dev>
ent · Mar 24, 2023 · bb1039b · bb1039b
1 parent f0e9994
commit bb1039b
Show file tree

Hide file tree

Showing 38 changed files with 916 additions and 20 deletions.
diff --git a/entgql/internal/todo/ent.graphql b/entgql/internal/todo/ent.graphql
@@ -255,6 +255,7 @@ input CreateUserInput {
   name: String
   username: UUID
   password: String
+  metadata: Map
   groupIDs: [ID!]
   friendIDs: [ID!]
 }
@@ -694,6 +695,8 @@ input UpdateUserInput {
   username: UUID
   password: String
   clearPassword: Boolean
+  metadata: Map
+  clearMetadata: Boolean
   addGroupIDs: [ID!]
   removeGroupIDs: [ID!]
   clearGroups: Boolean
@@ -705,6 +708,7 @@ type User implements Node {
   id: ID!
   name: String!
   username: UUID!
+  metadata: Map
   groups(
     """Returns the elements in the list that come after the specified cursor."""
     after: Cursor

diff --git a/entgql/internal/todo/ent/gql_collection.go b/entgql/internal/todo/ent/gql_collection.go
diff --git a/entgql/internal/todo/ent/gql_mutation_input.go b/entgql/internal/todo/ent/gql_mutation_input.go
diff --git a/entgql/internal/todo/ent/gql_node_descriptor.go b/entgql/internal/todo/ent/gql_node_descriptor.go
diff --git a/entgql/internal/todo/ent/migrate/schema.go b/entgql/internal/todo/ent/migrate/schema.go
diff --git a/entgql/internal/todo/ent/mutation.go b/entgql/internal/todo/ent/mutation.go
diff --git a/entgql/internal/todo/ent/schema/user.go b/entgql/internal/todo/ent/schema/user.go
@@ -38,6 +38,8 @@ func (User) Fields() []ent.Field {
 		field.String("password").
 			Sensitive().
 			Optional(),
+		field.JSON("metadata", map[string]interface{}{}).
+			Optional(),
 	}
 }
 

diff --git a/entgql/internal/todo/ent/user.go b/entgql/internal/todo/ent/user.go
diff --git a/entgql/internal/todo/ent/user/user.go b/entgql/internal/todo/ent/user/user.go
diff --git a/entgql/internal/todo/ent/user/where.go b/entgql/internal/todo/ent/user/where.go
diff --git a/entgql/internal/todo/ent/user_create.go b/entgql/internal/todo/ent/user_create.go