Fix naming & remove wrapper

Author: Perlmint

graphql/builder.ts

@@ -153,6 +153,16 @@ export const builder = new SchemaBuilder<PothosTypes>({
   relay: {
     clientMutationId: "optional",
   },
+  errors: {
+    directResult: true,
+    defaultUnionOptions: {
+      name(options) {
+        return `${options.fieldName.charAt(0).toUpperCase()}${
+          options.fieldName.slice(1)
+        }Result`;
+      },
+    },
+  },
 });
 
 builder.addScalarType("Date", DateResolver);

graphql/login.ts

@@ -69,6 +69,9 @@ builder.mutationFields((t) => ({
     type: LoginChallengeRef,
     errors: {
       types: [AccountNotFoundError],
+      union: {
+        name: "LoginResult",
+      },
       result: {
         name: "LoginSuccess",
       },
@@ -132,6 +135,9 @@ builder.mutationFields((t) => ({
     type: LoginChallengeRef,
     errors: {
       types: [AccountNotFoundError],
+      union: {
+        name: "LoginResult",
+      },
       result: {
         name: "LoginSuccess",
       },

graphql/post.ts

@@ -477,9 +477,6 @@ builder.relayMutationField(
         NotAuthenticatedError,
         InvalidInputError,
       ],
-      result: {
-        name: "CreateNoteSuccess",
-      },
     },
     async resolve(_root, args, ctx) {
       const session = await ctx.session;

graphql/schema.graphql

@@ -288,9 +288,7 @@ type CreateNotePayload {
   note: Note!
 }
 
-type CreateNoteSuccess {
-  data: CreateNotePayload!
-}
+union CreateNoteResult = CreateNotePayload | InvalidInputError | NotAuthenticatedError
 
 type CustomEmoji implements Node {
   id: ID!
@@ -387,9 +385,7 @@ type LoginChallenge {
   token: UUID!
 }
 
-type LoginSuccess {
-  data: LoginChallenge!
-}
+union LoginResult = AccountNotFoundError | LoginChallenge
 
 """A Hackers' Pub-flavored Markdown text."""
 scalar Markdown
@@ -425,7 +421,7 @@ type Mutation {
     """The signup token."""
     token: UUID!
   ): SignupResult!
-  createNote(input: CreateNoteInput!): MutationCreateNoteResult!
+  createNote(input: CreateNoteInput!): CreateNoteResult!
   loginByEmail(
     """The email of the account to sign in."""
     email: String!
@@ -437,7 +433,7 @@ type Mutation {
     The RFC 6570-compliant URI Template for the verification link.  Available variabvles: `{token}` and `{code}`.
     """
     verifyUrl: URITemplate!
-  ): MutationLoginByUsernameResult!
+  ): LoginResult!
   loginByUsername(
     """The locale for the sign-in email."""
     locale: Locale!
@@ -449,7 +445,7 @@ type Mutation {
     The RFC 6570-compliant URI Template for the verification link.  Available variabvles: `{token}` and `{code}`.
     """
     verifyUrl: URITemplate!
-  ): MutationLoginByUsernameResult!
+  ): LoginResult!
 
   """Revoke a session by its ID."""
   revokeSession(
@@ -459,10 +455,6 @@ type Mutation {
   updateAccount(input: UpdateAccountInput!): UpdateAccountPayload!
 }
 
-union MutationCreateNoteResult = CreateNoteSuccess | InvalidInputError | NotAuthenticatedError
-
-union MutationLoginByUsernameResult = AccountNotFoundError | LoginSuccess
-
 interface Node {
   id: ID!
 }

web-next/src/routes/sign/index.tsx

@@ -32,16 +32,14 @@ import type { signCompleteMutation } from "./__generated__/signCompleteMutation.
 const signByEmailMutation = graphql`
   mutation signByEmailMutation($locale: Locale!, $email: String!, $verifyUrl: URITemplate!) {
     loginByEmail(locale: $locale, email: $email, verifyUrl: $verifyUrl) {
-      ... on LoginSuccess {
+      ... on LoginChallenge {
         __typename
-        data {
-          account {
-            name
-            handle
-            avatarUrl
-          }
-          token
+        account {
+          name
+          handle
+          avatarUrl
         }
+        token
       }
       ... on AccountNotFoundError {
         __typename
@@ -53,16 +51,14 @@ const signByEmailMutation = graphql`
 const signByUsernameMutation = graphql`
   mutation signByUsernameMutation($locale: Locale!, $username: String!, $verifyUrl: URITemplate!) {
     loginByUsername(locale: $locale, username: $username, verifyUrl: $verifyUrl) {
-      ... on LoginSuccess {
+      ... on LoginChallenge {
         __typename
-        data {
-          account {
-            name
-            handle
-            avatarUrl
-          }
-          token
+        account {
+          name
+          handle
+          avatarUrl
         }
+        token
       }
       ... on AccountNotFoundError {
         __typename
@@ -171,8 +167,8 @@ export default function SignPage() {
 
   function onCompleted(data: signByUsernameMutation$data["loginByUsername"]) {
     setChallenging(false);
-    if (data.__typename === "LoginSuccess") {
-      setToken(data.data.token);
+    if (data.__typename === "LoginChallenge") {
+      setToken(data.token);
       codeInput?.focus();
     } else if (
       data.__typename === "AccountNotFoundError"