fix: zenstack generate warnings in pnpm repo with custom prisma clien…

…t output dir (#1876)
zenstackhq · Nov 19, 2024 · c0b240c · c0b240c
1 parent 768d94c
commit c0b240c
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

diff --git a/packages/ide/jetbrains/build.gradle.kts b/packages/ide/jetbrains/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.9.0"
+version = "2.9.1"
 
 repositories {
     mavenCentral()

diff --git a/packages/ide/jetbrains/package.json b/packages/ide/jetbrains/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

diff --git a/packages/misc/redwood/package.json b/packages/misc/redwood/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {

diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {

diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "author": {
         "name": "ZenStack Team"
     },

diff --git a/packages/schema/src/plugins/prisma/index.ts b/packages/schema/src/plugins/prisma/index.ts
@@ -82,17 +82,27 @@ const run: PluginFunction = async (model, options, _dmmf, _globalOptions) => {
         }
 
         // get PrismaClient dts path
-        try {
-            const prismaClientResolvedPath = require.resolve(clientOutputDir, {
-                paths: [path.dirname(options.schemaPath)],
-            });
-            prismaClientDtsPath = path.join(path.dirname(prismaClientResolvedPath), 'index.d.ts');
-        } catch (err) {
-            console.warn(
-                colors.yellow(
-                    `Could not resolve PrismaClient type declaration path. This may break plugins that depend on it.`
-                )
-            );
+
+        if (clientOutput) {
+            // if a custom prisma client output path is configured, first try treating
+            // clientOutputDir as a relative path and locate the index.d.ts file
+            prismaClientDtsPath = path.resolve(path.dirname(options.schemaPath), clientOutputDir, 'index.d.ts');
+        }
+
+        if (!prismaClientDtsPath || !fs.existsSync(prismaClientDtsPath)) {
+            // if the file does not exist, try node module resolution
+            try {
+                const prismaClientResolvedPath = require.resolve(clientOutputDir, {
+                    paths: [path.dirname(options.schemaPath)],
+                });
+                prismaClientDtsPath = path.join(path.dirname(prismaClientResolvedPath), 'index.d.ts');
+            } catch (err) {
+                console.warn(
+                    colors.yellow(
+                        `Could not resolve PrismaClient type declaration path. This may break plugins that depend on it.`
+                    )
+                );
+            }
         }
     } else {
         console.warn(

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "displayName": "ZenStack Server-side Adapters",
     "description": "ZenStack server-side adapters",
     "homepage": "https://zenstack.dev",

diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,