fixes related to rename input and object types (#1789)

lolopinto · Mar 3, 2024 · d1e4f3f · d1e4f3f
1 parent 1f99850
commit d1e4f3f
Show file tree

Hide file tree

Showing 19 changed files with 492 additions and 46 deletions.
diff --git a/examples/ent-rsvp/backend/src/graphql/generated/mutations/auth_guest_type.ts b/examples/ent-rsvp/backend/src/graphql/generated/mutations/auth_guest_type.ts
diff --git a/examples/ent-rsvp/backend/src/graphql/generated/mutations/auth_user_type.ts b/examples/ent-rsvp/backend/src/graphql/generated/mutations/auth_user_type.ts
diff --git a/examples/ent-rsvp/backend/src/graphql/generated/resolvers/viewer_query_type.ts b/examples/ent-rsvp/backend/src/graphql/generated/resolvers/viewer_query_type.ts
diff --git a/examples/ent-rsvp/backend/src/graphql/generated/schema.ts b/examples/ent-rsvp/backend/src/graphql/generated/schema.ts
diff --git a/examples/ent-rsvp/backend/src/graphql/mutations/auth/auth.ts b/examples/ent-rsvp/backend/src/graphql/mutations/auth/auth.ts
@@ -2,7 +2,7 @@ import { RequestContext, loadRow, query } from "@snowtop/ent";
 import { gqlContextType, gqlMutation, gqlQuery } from "@snowtop/ent/graphql";
 import { useAndVerifyAuthJWT } from "@snowtop/ent-passport";
 import { Guest, User } from "src/ent";
-import { ViewerType } from "../../resolvers/viewer_type";
+import { GraphQLViewer } from "../../resolvers/viewer_type";
 import { GraphQLString } from "graphql";
 import {
   AuthGuestInput,
@@ -58,7 +58,7 @@ export class AuthResolver {
     if (!viewer) {
       throw new Error(`could not log user in with given credentials`);
     }
-    return new AuthGuestPayload(token, new ViewerType(viewer));
+    return new AuthGuestPayload(token, new GraphQLViewer(viewer));
   }
 
   @gqlQuery({
@@ -141,6 +141,6 @@ export class AuthResolver {
       throw new Error(`not the right credentials`);
     }
 
-    return new AuthUserPayload(token, new ViewerType(viewer));
+    return new AuthUserPayload(token, new GraphQLViewer(viewer));
   }
 }
diff --git a/examples/ent-rsvp/backend/src/graphql/mutations/auth/auth_types.ts b/examples/ent-rsvp/backend/src/graphql/mutations/auth/auth_types.ts
@@ -4,7 +4,7 @@ import {
   gqlField,
   gqlObjectType,
 } from "@snowtop/ent/graphql";
-import { ViewerType } from "../../resolvers/viewer_type";
+import { GraphQLViewer } from "../../resolvers/viewer_type";
 import { GraphQLString } from "graphql";
 
 @gqlInputObjectType()
@@ -30,11 +30,11 @@ export class AuthGuestPayload {
 
   @gqlField({
     class: "AuthGuestPayload",
-    type: ViewerType,
+    type: GraphQLViewer,
   })
-  viewer: ViewerType = new ViewerType(new LoggedOutViewer());
+  viewer: GraphQLViewer = new GraphQLViewer(new LoggedOutViewer());
 
-  constructor(token: string, viewer: ViewerType) {
+  constructor(token: string, viewer: GraphQLViewer) {
     this.token = token;
     this.viewer = viewer;
   }
@@ -65,11 +65,11 @@ export class AuthUserPayload {
 
   @gqlField({
     class: "AuthUserPayload",
-    type: ViewerType,
+    type: GraphQLViewer,
   })
-  viewer: ViewerType = new ViewerType(new LoggedOutViewer());
+  viewer: GraphQLViewer = new GraphQLViewer(new LoggedOutViewer());
 
-  constructor(token: string, viewer: ViewerType) {
+  constructor(token: string, viewer: GraphQLViewer) {
     this.token = token;
     this.viewer = viewer;
   }

diff --git a/examples/ent-rsvp/backend/src/graphql/resolvers/viewer.ts b/examples/ent-rsvp/backend/src/graphql/resolvers/viewer.ts
@@ -1,16 +1,16 @@
 import { gqlContextType, gqlQuery } from "@snowtop/ent/graphql";
 import { RequestContext } from "@snowtop/ent";
-import { ViewerType } from "./viewer_type";
+import { GraphQLViewer } from "./viewer_type";
 
 export default class ViewerResolver {
   @gqlQuery({
     class: "ViewerResolver",
     name: "viewer",
-    type: ViewerType,
+    type: GraphQLViewer,
     nullable: true,
     args: [gqlContextType()],
   })
-  viewer(context: RequestContext): ViewerType {
-    return new ViewerType(context.getViewer());
+  viewer(context: RequestContext): GraphQLViewer {
+    return new GraphQLViewer(context.getViewer());
   }
 }
diff --git a/examples/ent-rsvp/backend/src/graphql/resolvers/viewer_type.ts b/examples/ent-rsvp/backend/src/graphql/resolvers/viewer_type.ts
@@ -2,12 +2,13 @@ import { gqlField, gqlObjectType } from "@snowtop/ent/graphql";
 import { Viewer } from "@snowtop/ent";
 import { Guest, User } from "src/ent/";
 
+// TODO we should expecially throw for "Viewer"
 @gqlObjectType({ name: "Viewer" })
-export class ViewerType {
+export class GraphQLViewer {
   constructor(private viewer: Viewer) {}
 
   @gqlField({
-    class: "ViewerType",
+    class: "GraphQLViewer",
     type: User,
     nullable: true,
     async: true,
@@ -21,7 +22,7 @@ export class ViewerType {
   }
 
   @gqlField({
-    class: "ViewerType",
+    class: "GraphQLViewer",
     type: Guest,
     nullable: true,
     async: true,

diff --git a/examples/simple/src/graphql/generated/mutations/mutation_type.ts b/examples/simple/src/graphql/generated/mutations/mutation_type.ts
diff --git a/examples/simple/src/graphql/generated/mutations/phone_available_type.ts b/examples/simple/src/graphql/generated/mutations/phone_available_type.ts
diff --git a/examples/simple/src/graphql/generated/resolvers/viewer_query_type.ts b/examples/simple/src/graphql/generated/resolvers/viewer_query_type.ts
diff --git a/examples/simple/src/graphql/generated/schema.gql b/examples/simple/src/graphql/generated/schema.gql
diff --git a/examples/simple/src/graphql/generated/schema.ts b/examples/simple/src/graphql/generated/schema.ts