merge dev to main (#620)

Author: ymc9

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-beta.15",
+    "version": "1.0.0-beta.16",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-beta.15",
+    "version": "1.0.0-beta.16",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.16",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/prisma-types.ts

@@ -10,3 +10,22 @@ export type TupleToUnion<K extends readonly any[]> = _TupleToUnion<K>;
 export type MaybeTupleToUnion<T> = T extends any[] ? TupleToUnion<T> : T;
 
 export type PickEnumerable<T, K extends Enumerable<keyof T> | keyof T> = Pick<T, MaybeTupleToUnion<K>>;
+
+type SelectAndInclude = {
+    select: any;
+    include: any;
+};
+type HasSelect = {
+    select: any;
+};
+type HasInclude = {
+    include: any;
+};
+
+export type CheckSelect<T, S, U> = T extends SelectAndInclude
+    ? 'Please either choose `select` or `include`'
+    : T extends HasSelect
+    ? U
+    : T extends HasInclude
+    ? U
+    : S;

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "1.0.0-beta.15",
+    "version": "1.0.0-beta.16",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {

packages/plugins/swr/src/generator.ts

@@ -59,7 +59,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,
     });
     sf.addStatements([
         `import { useContext } from 'react';`,
-        `import { RequestHandlerContext, type RequestOptions, type PickEnumerable } from '@zenstackhq/swr/runtime';`,
+        `import { RequestHandlerContext, type RequestOptions, type PickEnumerable, type CheckSelect } from '@zenstackhq/swr/runtime';`,
         `import * as request from '@zenstackhq/swr/runtime';`,
     ]);
 
@@ -82,7 +82,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,
     if (mapping.create || (mapping as any).createOne) {
         const argsType = `Prisma.${model.name}CreateArgs`;
         const inputType = `Prisma.SelectSubset<T, ${argsType}>`;
-        const returnType = `Prisma.CheckSelect<T, ${model.name}, Prisma.${model.name}GetPayload<T>>`;
+        const returnType = `CheckSelect<T, ${model.name}, Prisma.${model.name}GetPayload<T>>`;
         mutationFuncs.push(
             generateMutation(useMutation, model, 'post', 'create', argsType, inputType, returnType, true)
         );

packages/plugins/tanstack-query/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "1.0.0-beta.15",
+    "version": "1.0.0-beta.16",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {

packages/plugins/tanstack-query/src/generator.ts

@@ -107,7 +107,7 @@ function generateMutationHook(
 
     const argsType = `Prisma.${model}${capOperation}Args`;
     const inputType = `Prisma.SelectSubset<T, ${argsType}>`;
-    let returnType = overrideReturnType ?? `Prisma.CheckSelect<T, ${model}, Prisma.${model}GetPayload<T>>`;
+    let returnType = overrideReturnType ?? `CheckSelect<T, ${model}, Prisma.${model}GetPayload<T>>`;
     if (checkReadBack) {
         returnType = `(${returnType} | undefined )`;
     }
@@ -414,7 +414,7 @@ function makeGetContext(target: TargetFramework) {
 function makeBaseImports(target: TargetFramework) {
     const shared = [
         `import { query, postMutation, putMutation, deleteMutation } from '@zenstackhq/tanstack-query/runtime/${target}';`,
-        `import type { PickEnumerable } from '@zenstackhq/tanstack-query/runtime';`,
+        `import type { PickEnumerable, CheckSelect } from '@zenstackhq/tanstack-query/runtime';`,
     ];
     switch (target) {
         case 'react':

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "1.0.0-beta.15",
+    "version": "1.0.0-beta.16",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {

packages/plugins/trpc/src/generator.ts

@@ -95,6 +95,7 @@ function createAppRouter(
         {
             namedImports: ['PrismaClient'],
             moduleSpecifier: prismaImport,
+            isTypeOnly: true,
         },
         {
             namedImports: ['createRouterFactory', 'AnyRouter'],