merge dev to main (v1.8.2) (#989)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/ide/jetbrains/build.gradle.kts

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

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jetbrains",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+  "version": "1.8.2",
   "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": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+    "version": "1.8.2",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

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

@@ -23,6 +23,7 @@ import { formatObject, prismaClientValidationError } from '../utils';
 import { Logger } from './logger';
 import { PolicyUtil } from './policy-utils';
 import { createDeferredPromise } from './promise';
+import { WithPolicyOptions } from '.';
 
 // a record for post-write policy check
 type PostWriteCheckRecord = {
@@ -42,14 +43,17 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
     private readonly utils: PolicyUtil;
     private readonly model: string;
 
+    private readonly DEFAULT_TX_MAXWAIT = 100000;
+    private readonly DEFAULT_TX_TIMEOUT = 100000;
+
     constructor(
         private readonly prisma: DbClient,
         private readonly policy: PolicyDef,
         private readonly modelMeta: ModelMeta,
         private readonly zodSchemas: ZodSchemas | undefined,
         model: string,
-        private readonly user?: AuthUser,
-        private readonly logPrismaQuery?: boolean
+        private readonly user: AuthUser | undefined,
+        private readonly options: WithPolicyOptions | undefined
     ) {
         this.logger = new Logger(prisma);
         this.utils = new PolicyUtil(
@@ -1276,12 +1280,22 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
     //#region Utils
 
     private get shouldLogQuery() {
-        return !!this.logPrismaQuery && this.logger.enabled('info');
+        return !!this.options?.logPrismaQuery && this.logger.enabled('info');
     }
 
     private transaction(action: (tx: Record<string, DbOperations>) => Promise<any>) {
         if (this.prisma['$transaction']) {
-            return this.prisma.$transaction((tx) => action(tx), { maxWait: 100000, timeout: 100000 });
+            const txOptions: any = { maxWait: this.DEFAULT_TX_MAXWAIT, timeout: this.DEFAULT_TX_TIMEOUT };
+            if (this.options?.transactionMaxWait !== undefined) {
+                txOptions.maxWait = this.options.transactionMaxWait;
+            }
+            if (this.options?.transactionTimeout !== undefined) {
+                txOptions.timeout = this.options.transactionTimeout;
+            }
+            if (this.options?.transactionIsolationLevel !== undefined) {
+                txOptions.isolationLevel = this.options.transactionIsolationLevel;
+            }
+            return this.prisma.$transaction((tx) => action(tx), txOptions);
         } else {
             // already in transaction, don't nest
             return action(this.prisma);
@@ -1304,7 +1318,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
             this.zodSchemas,
             model,
             this.user,
-            this.logPrismaQuery
+            this.options
         );
     }
 

packages/runtime/src/enhancements/policy/index.ts

@@ -18,6 +18,16 @@ export type WithPolicyContext = {
     user?: AuthUser;
 };
 
+/**
+ * Transaction isolation levels: https://www.prisma.io/docs/orm/prisma-client/queries/transactions#transaction-isolation-level
+ */
+export type TransactionIsolationLevel =
+    | 'ReadUncommitted'
+    | 'ReadCommitted'
+    | 'RepeatableRead'
+    | 'Snapshot'
+    | 'Serializable';
+
 /**
  * Options for @see withPolicy
  */
@@ -46,6 +56,21 @@ export interface WithPolicyOptions extends CommonEnhancementOptions {
      * Hook for transforming errors before they are thrown to the caller.
      */
     errorTransformer?: ErrorTransformer;
+
+    /**
+     * The `maxWait` option passed to `prisma.$transaction()` call for transactions initiated by ZenStack.
+     */
+    transactionMaxWait?: number;
+
+    /**
+     * The `timeout` option passed to `prisma.$transaction()` call for transactions initiated by ZenStack.
+     */
+    transactionTimeout?: number;
+
+    /**
+     * The `isolationLevel` option passed to `prisma.$transaction()` call for transactions initiated by ZenStack.
+     */
+    transactionIsolationLevel?: TransactionIsolationLevel;
 }
 
 /**
@@ -115,7 +140,7 @@ export function withPolicy<DbClient extends object>(
                 _zodSchemas,
                 model,
                 context?.user,
-                options?.logPrismaQuery
+                options
             ),
         'policy',
         options?.errorTransformer

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

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

@@ -136,14 +136,18 @@ export default class PrismaSchemaGenerator {
         const generateClient = options.generateClient !== false;
 
         if (generateClient) {
+            let generateCmd = `npx prisma generate --schema "${outFile}"`;
+            if (typeof options.generateArgs === 'string') {
+                generateCmd += ` ${options.generateArgs}`;
+            }
             try {
                 // run 'prisma generate'
-                await execSync(`npx prisma generate --schema "${outFile}"`, 'ignore');
+                await execSync(generateCmd, 'ignore');
             } catch {
                 await this.trackPrismaSchemaError(outFile);
                 try {
                     // run 'prisma generate' again with output to the console
-                    await execSync(`npx prisma generate --schema "${outFile}"`);
+                    await execSync(generateCmd);
                 } catch {
                     // noop
                 }

packages/schema/src/plugins/zod/utils/schema-gen.ts

@@ -89,6 +89,18 @@ export function makeFieldSchema(field: DataModelField, respectDefault = false) {
                 schema += `.url(${messageArgFirst})`;
                 break;
             }
+            case '@trim': {
+                schema += `.trim()`;
+                break;
+            }
+            case '@lower': {
+                schema += `.toLowerCase()`;
+                break;
+            }
+            case '@upper': {
+                schema += `.toUpperCase()`;
+                break;
+            }
             case '@datetime': {
                 schema += `.datetime({ offset: true${message ? ', message: ' + JSON.stringify(message) : ''} })`;
                 break;

packages/schema/src/res/stdlib.zmodel

@@ -514,6 +514,21 @@ attribute @datetime(_ message: String?) @@@targetField([StringField]) @@@validat
  */
 attribute @url(_ message: String?) @@@targetField([StringField]) @@@validation
 
+/**
+ * Trims whitespaces from the start and end of the string.
+ */
+attribute @trim() @@@targetField([StringField]) @@@validation
+
+/**
+ * Transform entire string toLowerCase.
+ */
+attribute @lower() @@@targetField([StringField]) @@@validation
+
+/**
+ * Transform entire string toUpperCase.
+ */
+attribute @upper() @@@targetField([StringField]) @@@validation
+
 /**
  * Validates a number field is greater than the given value.
  */

packages/sdk/package.json

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

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "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": "1.8.1",
+  "version": "1.8.2",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,

tests/integration/tests/cli/generate.test.ts

@@ -180,4 +180,18 @@ model Post {
         expect(fs.existsSync('./node_modules/.zenstack/zod/index.js')).toBeFalsy();
         expect(fs.existsSync('./node_modules/.zenstack/zod/index.ts')).toBeTruthy();
     });
+
+    it('generate with prisma generateArgs', async () => {
+        fs.appendFileSync(
+            'schema.zmodel',
+            `
+        plugin prisma {
+            provider = '@core/prisma'
+            generateArgs = '--no-engine'
+        }
+        `
+        );
+        const program = createProgram();
+        await program.parseAsync(['generate', '--no-dependency-check', '--no-default-plugins'], { from: 'user' });
+    });
 });