more fixes

Author: ymc9

packages/plugins/trpc/src/client-helper/index.ts

@@ -154,8 +154,12 @@ export function getPrismaOperationTypes(model: string, operation: string) {
 
     switch (operation) {
         case 'findUnique':
-        case 'findUniqueOrThrow':
         case 'findFirst':
+            argsType = selectSubset;
+            resultType = `${getPayload} | null`;
+            break;
+
+        case 'findUniqueOrThrow':
         case 'findFirstOrThrow':
             argsType = selectSubset;
             resultType = getPayload;

packages/plugins/trpc/src/client-helper/nuxt.ts

@@ -31,11 +31,17 @@ export function generateProcedureTyping(
     writer.block(() => {
         if (procType === 'query') {
             writer.writeLine(`
+                query: <T extends ${genericBase}>(input${inputOptional}: ${argsType}) => Promise<${resultType}>;
                 useQuery: <T extends ${genericBase}, ResT = ${resultType}, DataE = ${errorType}, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null>(input${inputOptional}: MaybeRefOrGetter<${argsType}>, opts?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'watch'> & {
                     trpc?: TRPCRequestOptions;
                     queryKey?: string;
                     watch?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>['watch'] | false;
                 }) => AsyncData<PickFrom<DataT, PickKeys> | DefaultT, DataE>;
+                useLazyQuery: <T extends ${genericBase}, ResT = ${resultType}, DataE = ${errorType}, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null>(input${inputOptional}: MaybeRefOrGetter<${argsType}>, opts?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy' | 'watch'> & {
+                    trpc?: TRPCRequestOptions;
+                    queryKey?: string;
+                    watch?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>['watch'] | false;
+                }) => AsyncData<PickFrom<DataT, PickKeys> | DefaultT, DataE>;
                 `);
         } else if (procType === 'mutation') {
             writer.writeLine(`

packages/plugins/trpc/src/client-helper/react.ts

@@ -81,10 +81,10 @@ export function generateProcedureTyping(
                     ${errorType},
                     ${resultType},
                     Context
-                >,) =>
+                >) =>
                 Omit<UseTRPCMutationResult<${resultType}, ${errorType}, ${argsType}, Context>, 'mutateAsync'> & {
                     mutateAsync:
-                        <T extends ${genericBase}>(variables${argsOptional}: T, opts?: UseTRPCMutationOptions<T, ${errorType}, ${resultType}, Context>) => Promise<${resultType}>
+                        <T extends ${genericBase}>(variables${inputOptional}: T, opts?: UseTRPCMutationOptions<T, ${errorType}, ${resultType}, Context>) => Promise<${resultType}>
                 };
                 `);
         }

packages/plugins/trpc/src/utils.ts

@@ -110,7 +110,7 @@ export const getInputSchemaByOpName = (opName: string, modelName: string) => {
 };
 
 export const getProcedureTypeByOpName = (opName: string) => {
-    let procType;
+    let procType: string | undefined;
     switch (opName) {
         case 'findUnique':
         case 'findFirst':
@@ -132,7 +132,7 @@ export const getProcedureTypeByOpName = (opName: string) => {
             procType = 'mutation';
             break;
         default:
-            console.log('getProcedureTypeByOpName: ', { opName });
+            break;
     }
     return procType;
 };

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/app.vue

@@ -1,11 +1,23 @@
 <script setup lang="ts">
 const { $client } = useNuxtApp();
+
+$client.post.findFirst
+    .query({
+        where: { id: '1' },
+        include: { author: true },
+    })
+    .then((post) => {
+        console.log('Author:', post?.author.email);
+    });
+
 const { data: posts } = $client.post.findMany.useQuery({
     include: { author: true },
 });
 
 const { mutate } = $client.post.create.useMutation();
 
+$client.post.findMany.query();
+
 const onCreate = async () => {
     const r1 = await $client.post.create.mutate({
         data: {

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/Post.nuxt.type.ts

@@ -1,5 +1,15 @@
 <script setup lang="ts">
 const { $client } = useNuxtApp();
+
+$client.post.findFirst
+    .query({
+        where: { id: '1' },
+        include: { author: true },
+    })
+    .then((post) => {
+        console.log('Author:', post?.author.email);
+    });
+
 const { data: posts } = $client.post.findMany.useQuery({
     include: { author: true },
 });