merge dev to main (v2.11.3) (#1963)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.11.2",
+    "version": "2.11.3",
     "description": "",
     "scripts": {
         "build": "pnpm -r --filter=\"!./packages/ide/*\" build",

packages/ide/jetbrains/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.11.2"
+version = "2.11.3"
 
 repositories {
     mavenCentral()

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.11.2",
+  "version": "2.11.3",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

packages/language/package.json

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

packages/misc/redwood/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.11.2",
+    "version": "2.11.3",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

packages/plugins/openapi/package.json

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

packages/plugins/swr/package.json

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

packages/plugins/tanstack-query/package.json

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

packages/plugins/trpc/package.json

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

packages/runtime/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "2.11.2",
+    "version": "2.11.3",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

packages/runtime/src/constants.ts

@@ -77,5 +77,6 @@ export const ACTIONS_WITH_WRITE_PAYLOAD = [
     'createManyAndReturn',
     'update',
     'updateMany',
+    'updateManyAndReturn',
     'upsert',
 ];

packages/runtime/src/cross/nested-write-visitor.ts

@@ -247,6 +247,7 @@ export class NestedWriteVisitor {
                 break;
 
             case 'updateMany':
+            case 'updateManyAndReturn':
                 for (const item of this.enumerateReverse(data)) {
                     const newContext = pushNewContext(field, model, item.where);
                     let callbackResult: any;

packages/runtime/src/cross/types.ts

@@ -8,6 +8,7 @@ export const PrismaWriteActions = [
     'connectOrCreate',
     'update',
     'updateMany',
+    'updateManyAndReturn',
     'upsert',
     'connect',
     'disconnect',

packages/runtime/src/enhancements/node/policy/handler.ts

@@ -511,7 +511,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 });
             }
 
-            // throw read-back error if any of create result read-back fails
+            // throw read-back error if any of the create result read-back fails
             const error = result.find((r) => !!r.error)?.error;
             if (error) {
                 throw error;
@@ -1268,6 +1268,14 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
     }
 
     updateMany(args: any) {
+        return this.doUpdateMany(args, 'updateMany');
+    }
+
+    updateManyAndReturn(args: any): Promise<unknown[]> {
+        return this.doUpdateMany(args, 'updateManyAndReturn');
+    }
+
+    private doUpdateMany(args: any, action: 'updateMany' | 'updateManyAndReturn'): Promise<any> {
         if (!args) {
             throw prismaClientValidationError(this.prisma, this.prismaModule, 'query argument is required');
         }
@@ -1279,9 +1287,10 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
             );
         }
 
-        return createDeferredPromise(() => {
+        return createDeferredPromise(async () => {
             this.policyUtils.tryReject(this.prisma, this.model, 'update');
 
+            const origArgs = args;
             args = this.policyUtils.safeClone(args);
             this.policyUtils.injectAuthGuardAsWhere(this.prisma, args, this.model, 'update');
 
@@ -1302,13 +1311,37 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 if (this.shouldLogQuery) {
                     this.logger.info(`[policy] \`updateMany\` ${this.model}: ${formatObject(args)}`);
                 }
-                return this.modelClient.updateMany(args);
+                if (action === 'updateMany') {
+                    return this.modelClient.updateMany(args);
+                } else {
+                    // make sure only id fields are returned so we can directly use the result
+                    // for read-back check
+                    const updatedArg = {
+                        ...args,
+                        select: this.policyUtils.makeIdSelection(this.model),
+                        include: undefined,
+                    };
+                    const updated = await this.modelClient.updateManyAndReturn(updatedArg);
+                    // process read-back
+                    const result = await Promise.all(
+                        updated.map((item) =>
+                            this.policyUtils.readBack(this.prisma, this.model, 'update', origArgs, item)
+                        )
+                    );
+                    // throw read-back error if any of create result read-back fails
+                    const error = result.find((r) => !!r.error)?.error;
+                    if (error) {
+                        throw error;
+                    } else {
+                        return result.map((r) => r.result);
+                    }
+                }
             }
 
             // collect post-update checks
             const postWriteChecks: PostWriteCheckRecord[] = [];
 
-            return this.queryUtils.transaction(this.prisma, async (tx) => {
+            const result = await this.queryUtils.transaction(this.prisma, async (tx) => {
                 // collect pre-update values
                 let select = this.policyUtils.makeIdSelection(this.model);
                 const preValueSelect = this.policyUtils.getPreValueSelect(this.model);
@@ -1352,13 +1385,45 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 if (this.shouldLogQuery) {
                     this.logger.info(`[policy] \`updateMany\` in tx for ${this.model}: ${formatObject(args)}`);
                 }
-                const result = await tx[this.model].updateMany(args);
 
-                // run post-write checks
-                await this.runPostWriteChecks(postWriteChecks, tx);
+                if (action === 'updateMany') {
+                    const result = await tx[this.model].updateMany(args);
+                    // run post-write checks
+                    await this.runPostWriteChecks(postWriteChecks, tx);
+                    return result;
+                } else {
+                    // make sure only id fields are returned so we can directly use the result
+                    // for read-back check
+                    const updatedArg = {
+                        ...args,
+                        select: this.policyUtils.makeIdSelection(this.model),
+                        include: undefined,
+                    };
+                    const result = await tx[this.model].updateManyAndReturn(updatedArg);
+                    // run post-write checks
+                    await this.runPostWriteChecks(postWriteChecks, tx);
+                    return result;
+                }
+            });
 
+            if (action === 'updateMany') {
+                // no further processing needed
                 return result;
-            });
+            } else {
+                // process read-back
+                const readBackResult = await Promise.all(
+                    (result as unknown[]).map((item) =>
+                        this.policyUtils.readBack(this.prisma, this.model, 'update', origArgs, item)
+                    )
+                );
+                // throw read-back error if any of the update result read-back fails
+                const error = readBackResult.find((r) => !!r.error)?.error;
+                if (error) {
+                    throw error;
+                } else {
+                    return readBackResult.map((r) => r.result);
+                }
+            }
         });
     }
 

packages/runtime/src/enhancements/node/proxy.ts

@@ -35,6 +35,8 @@ export interface PrismaProxyHandler {
 
     updateMany(args: any): Promise<BatchResult>;
 
+    updateManyAndReturn(args: any): Promise<unknown[]>;
+
     upsert(args: any): Promise<unknown>;
 
     delete(args: any): Promise<unknown>;
@@ -132,6 +134,10 @@ export class DefaultPrismaProxyHandler implements PrismaProxyHandler {
         return this.deferred<{ count: number }>('updateMany', args, false);
     }
 
+    updateManyAndReturn(args: any) {
+        return this.deferred<unknown[]>('updateManyAndReturn', args);
+    }
+
     upsert(args: any) {
         return this.deferred('upsert', args);
     }

packages/runtime/src/types.ts

@@ -19,6 +19,7 @@ export interface DbOperations {
     createManyAndReturn(args: unknown): Promise<unknown[]>;
     update(args: unknown): Promise<any>;
     updateMany(args: unknown): Promise<{ count: number }>;
+    updateManyAndReturn(args: unknown): Promise<unknown[]>;
     upsert(args: unknown): Promise<any>;
     delete(args: unknown): Promise<any>;
     deleteMany(args?: unknown): Promise<{ count: number }>;

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.11.2",
+    "version": "2.11.3",
     "author": {
         "name": "ZenStack Team"
     },

packages/schema/src/plugins/prisma/schema-generator.ts

@@ -32,7 +32,7 @@ import {
 } from '@zenstackhq/language/ast';
 import { getIdFields } from '@zenstackhq/sdk';
 import { getPrismaVersion } from '@zenstackhq/sdk/prisma';
-import { match } from 'ts-pattern';
+import { match, P } from 'ts-pattern';
 
 import { DELEGATE_AUX_RELATION_PREFIX, PRISMA_MINIMUM_VERSION } from '@zenstackhq/runtime';
 import {
@@ -869,9 +869,34 @@ export class PrismaSchemaGenerator {
         const docs = [...field.comments, ...this.getCustomAttributesAsComments(field)];
         const result = model.addField(field.name, type, attributes, docs, addToFront);
 
+        if (this.mode === 'logical') {
+            if (field.attributes.some((attr) => isDefaultWithAuth(attr))) {
+                // field has `@default` with `auth()`, turn it into a dummy default value, and the
+                // real default value setting is handled outside Prisma
+                this.setDummyDefault(result, field);
+            }
+        }
+
         return result;
     }
 
+    private setDummyDefault(result: ModelField, field: DataModelField) {
+        const dummyDefaultValue = match(field.type.type)
+            .with('String', () => new AttributeArgValue('String', ''))
+            .with(P.union('Int', 'BigInt', 'Float', 'Decimal'), () => new AttributeArgValue('Number', '0'))
+            .with('Boolean', () => new AttributeArgValue('Boolean', 'false'))
+            .with('DateTime', () => new AttributeArgValue('FunctionCall', new PrismaFunctionCall('now')))
+            .with('Json', () => new AttributeArgValue('String', '{}'))
+            .with('Bytes', () => new AttributeArgValue('String', ''))
+            .otherwise(() => {
+                throw new PluginError(name, `Unsupported field type with default value: ${field.type.type}`);
+            });
+
+        result.attributes.push(
+            new PrismaFieldAttribute('@default', [new PrismaAttributeArg(undefined, dummyDefaultValue)])
+        );
+    }
+
     private ensureSupportingTypeDefFields(zmodel: Model) {
         const dsProvider = getDataSourceProvider(zmodel);
         if (dsProvider && !PROVIDERS_SUPPORTING_TYPEDEF_FIELDS.includes(dsProvider)) {

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "2.11.2",
+    "version": "2.11.3",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "2.11.2",
+    "version": "2.11.3",
     "displayName": "ZenStack Server-side Adapters",
     "description": "ZenStack server-side adapters",
     "homepage": "https://zenstack.dev",

packages/testtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "2.11.2",
+  "version": "2.11.3",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,