fix: enhanced client doesn't work with client extensions that add new…

… model methods (#851)
zenstackhq · Nov 26, 2023 · ea564c9 · ea564c9
2 parents b5929d8 + fed4134
commit ea564c9
Show file tree

Hide file tree

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

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

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": "1.3.1",
+  "version": "1.3.2",
   "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": "1.3.1",
+    "version": "1.3.2",
     "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": "1.3.1",
+    "version": "1.3.2",
     "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": "1.3.1",
+    "version": "1.3.2",
     "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": "1.3.1",
+    "version": "1.3.2",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

diff --git a/packages/runtime/src/enhancements/proxy.ts b/packages/runtime/src/enhancements/proxy.ts
@@ -227,20 +227,22 @@ export function makeProxy<T extends PrismaProxyHandler>(
                 return propVal;
             }
 
-            return createHandlerProxy(makeHandler(target, prop));
+            return createHandlerProxy(makeHandler(target, prop), propVal);
         },
     });
 
     return proxy;
 }
 
 // A proxy for capturing errors and processing stack trace
-function createHandlerProxy<T extends PrismaProxyHandler>(handler: T): T {
+function createHandlerProxy<T extends PrismaProxyHandler>(handler: T, origTarget: any): T {
     return new Proxy(handler, {
         get(target, propKey) {
             const prop = target[propKey as keyof T];
             if (typeof prop !== 'function') {
-                return prop;
+                // the proxy handler doesn't have this method, fall back to the original target
+                // this can happen for new methods added by Prisma Client Extensions
+                return origTarget[propKey];
             }
 
             // eslint-disable-next-line @typescript-eslint/ban-types

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "Build scalable web apps with minimum code by defining authorization and validation rules inside the data schema that closer to the database",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "author": {
         "name": "ZenStack Team"
     },

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "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": "1.3.1",
+    "version": "1.3.2",
     "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": "1.3.1",
+  "version": "1.3.2",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/package.json b/tests/integration/package.json
@@ -33,7 +33,8 @@
         "ts-node": "^10.9.1",
         "typescript": "^4.6.2",
         "uuid": "^9.0.0",
-        "zenstack": "workspace: *"
+        "zenstack": "workspace: *",
+        "prisma-client-internal": "npm:@prisma/client@^5.0.0"
     },
     "dependencies": {
         "@types/node": "^18.0.0",