merge dev to main (v2.22.2) (#2324)

ymc9 · web-flow · commit 2bc0e5bacb89 · 2025-12-29T20:26:12.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.22.1",
+    "version": "2.22.2",
     "description": "",
     "scripts": {
         "build": "pnpm -r --filter=\"!./packages/ide/*\" build",
@@ -11,10 +11,9 @@
         "test-integration": "pnpm run --filter=integration test --silent --forceExit",
         "test-regression": "pnpm run --filter=regression test --silent --forceExit",
         "test-scaffold": "tsx script/test-scaffold.ts",
-        "publish-all": "pnpm --filter \"./packages/**\" -r publish --access public",
+        "publish-all": "pnpm --filter \"./packages/**\" -r publish --access public --tag v2",
         "publish-preview": "pnpm --filter \"./packages/**\" -r publish --force --registry https://preview.registry.zenstack.dev/",
         "unpublish-preview": "pnpm --recursive --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ \"\\$PNPM_PACKAGE_NAME\"",
-        "publish-next": "pnpm --filter \"./packages/**\" -r publish --access public --tag next",
         "publish-preview-next": "pnpm --filter \"./packages/**\" -r publish --force --registry https://preview.registry.zenstack.dev/ --tag next",
         "unpublish-preview-next": "pnpm --recursive --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ --tag next \"\\$PNPM_PACKAGE_NAME\"",
         "publish-test": "pnpm --filter \"./packages/**\" -r publish --access public --tag test"
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.22.1"
+version = "2.22.2"
 
 repositories {
     mavenCentral()
diff --git a/packages/ide/jetbrains/package.json b/packages/ide/jetbrains/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.22.1",
+  "version": "2.22.2",
   "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.22.1",
+    "version": "2.22.2",
     "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.22.1",
+    "version": "2.22.2",
     "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.22.1",
+  "version": "2.22.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": "2.22.1",
+    "version": "2.22.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": "2.22.1",
+    "version": "2.22.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": "2.22.1",
+    "version": "2.22.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": "2.22.1",
+    "version": "2.22.2",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",
diff --git a/packages/runtime/src/enhancements/node/policy/policy-utils.ts b/packages/runtime/src/enhancements/node/policy/policy-utils.ts
@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import deepmerge from 'deepmerge';
-import { z, type ZodError, type ZodObject, type ZodSchema } from 'zod';
+import type { z, ZodError, ZodObject, ZodSchema } from 'zod';
+import { z as zod3 } from 'zod/v3';
+import { z as zod4 } from 'zod/v4';
 import { CrudFailureReason, PrismaErrorCode } from '../../../constants';
 import {
     clone,
@@ -1376,17 +1378,19 @@ export class PolicyUtil extends QueryUtils {
             let schema: ZodObject<any> | undefined;
 
             const overridePasswordFields = (schema: z.ZodObject<any>) => {
+                const useZod: any = schema._def ? zod3 : zod4;
+
                 let result = schema;
                 const modelFields = this.modelMeta.models[lowerCaseFirst(model)]?.fields;
                 if (modelFields) {
                     for (const [key, field] of Object.entries(modelFields)) {
                         if (field.attributes?.some((attr) => attr.name === '@password')) {
                             // override `@password` field schema with a string schema
-                            let pwFieldSchema: ZodSchema = z.string();
+                            let pwFieldSchema: ZodSchema = useZod.string();
                             if (field.isOptional) {
                                 pwFieldSchema = pwFieldSchema.nullish();
                             }
-                            result = result.merge(z.object({ [key]: pwFieldSchema }));
+                            result = result.merge(useZod.object({ [key]: pwFieldSchema }));
                         }
                     }
                 }
@@ -1540,7 +1544,12 @@ export class PolicyUtil extends QueryUtils {
                     continue;
                 }
 
-                if (fieldInfo.isDataModel && queryArgs?.include && typeof queryArgs.include === 'object' && !queryArgs.include[field]) {
+                if (
+                    fieldInfo.isDataModel &&
+                    queryArgs?.include &&
+                    typeof queryArgs.include === 'object' &&
+                    !queryArgs.include[field]
+                ) {
                     // respect include
                     delete entityData[field];
                     continue;
diff --git a/packages/runtime/src/validation.ts b/packages/runtime/src/validation.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import type { z } from 'zod';
 import { getZodErrorMessage } from './local-helpers';
 
 /**
diff --git a/packages/runtime/src/zod-utils.ts b/packages/runtime/src/zod-utils.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { z as Z } from 'zod';
+import type { z as Z } from 'zod';
 
 /**
  * A smarter version of `z.union` that decide which candidate to use based on how few unrecognized keys it has.
diff --git a/packages/schema/README.md b/packages/schema/README.md
@@ -1,5 +1,7 @@
 # ZenStack VS Code Extension
 
+> This extension only supports ZenStack v2. For the latest ZenStack v3, please use the [ZenStack V3 Language Tools](https://marketplace.visualstudio.com/items?itemName=zenstack.zenstack-v3) extension instead.
+
 [ZenStack](https://zenstack.dev) is a toolkit that simplifies the development of a web app's backend. It enhances [Prisma ORM](https://prisma.io) with flexible Authorization and auto-generated, type-safe APIs/hooks, simplifying full-stack development.
 
 This VS Code extension provides code editing helpers for authoring ZenStack's schema files (.zmodel files).
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,9 +1,9 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "displayName": "ZenStack Language Tools",
+    "displayName": "ZenStack V2 Language Tools",
     "description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
-    "version": "2.22.1",
+    "version": "2.22.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": "2.22.1",
+    "version": "2.22.2",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {
@@ -20,6 +20,7 @@
     "dependencies": {
         "@prisma/generator-helper": "6.19.x",
         "@prisma/internals": "6.19.x",
+        "@prisma/internals-v7": "npm:@prisma/internals@7",
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/runtime": "workspace:*",
         "langium": "1.3.1",
diff --git a/packages/sdk/src/prisma.ts b/packages/sdk/src/prisma.ts
@@ -2,14 +2,15 @@
 
 import type { DMMF } from '@prisma/generator-helper';
 import { getDMMF as _getDMMF, type GetDMMFOptions } from '@prisma/internals';
+import { getDMMF as _getDMMF7 } from '@prisma/internals-v7';
 import { DEFAULT_RUNTIME_LOAD_PATH } from '@zenstackhq/runtime';
 import path from 'path';
 import semver from 'semver';
 import { Model } from './ast';
 import { RUNTIME_PACKAGE } from './constants';
+import { normalizedRelative } from './path';
 import type { PluginOptions } from './types';
 import { getDataSourceProvider } from './utils';
-import { normalizedRelative } from './path';
 
 /**
  * Given an import context directory and plugin options, compute the import spec for the Prisma Client.
@@ -51,7 +52,12 @@ function normalizePath(p: string) {
  * Loads Prisma DMMF
  */
 export function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document> {
-    return _getDMMF(options);
+    const prismaVersion = getPrismaVersion();
+    if (prismaVersion && semver.gte(prismaVersion, '7.0.0')) {
+        return _getDMMF7(options);
+    } else {
+        return _getDMMF(options);
+    }
 }
 
 /**
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "2.22.1",
+    "version": "2.22.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": "2.22.1",
+  "version": "2.22.2",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`group = "dev.zenstack"`
`12`		`-version = "2.22.1"`
	`12`	`+version = "2.22.2"`
`13`	`13`
`14`	`14`	`repositories {`
`15`	`15`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jetbrains",`
`3`		`- "version": "2.22.1",`
	`3`	`+ "version": "2.22.2",`
`4`	`4`	`"displayName": "ZenStack JetBrains IDE Plugin",`
`5`	`5`	`"description": "ZenStack JetBrains IDE plugin",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`		`- "version": "2.22.1",`
	`3`	`+ "version": "2.22.2",`
`4`	`4`	`"displayName": "ZenStack modeling language compiler",`
`5`	`5`	`"description": "ZenStack modeling language compiler",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/redwood",`
`3`	`3`	`"displayName": "ZenStack RedwoodJS Integration",`
`4`		`- "version": "2.22.1",`
	`4`	`+ "version": "2.22.2",`
`5`	`5`	`"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/openapi",`
`3`	`3`	`"displayName": "ZenStack Plugin and Runtime for OpenAPI",`
`4`		`- "version": "2.22.1",`
	`4`	`+ "version": "2.22.2",`
`5`	`5`	`"description": "ZenStack plugin and runtime supporting OpenAPI",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/swr",`
`3`	`3`	`"displayName": "ZenStack plugin for generating SWR hooks",`
`4`		`- "version": "2.22.1",`
	`4`	`+ "version": "2.22.2",`
`5`	`5`	`"description": "ZenStack plugin for generating SWR hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/tanstack-query",`
`3`	`3`	`"displayName": "ZenStack plugin for generating tanstack-query hooks",`
`4`		`- "version": "2.22.1",`
	`4`	`+ "version": "2.22.2",`
`5`	`5`	`"description": "ZenStack plugin for generating tanstack-query hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"exports": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/trpc",`
`3`	`3`	`"displayName": "ZenStack plugin for tRPC",`
`4`		`- "version": "2.22.1",`
	`4`	`+ "version": "2.22.2",`
`5`	`5`	`"description": "ZenStack plugin for tRPC",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/runtime",`
`3`	`3`	`"displayName": "ZenStack Runtime Library",`
`4`		`- "version": "2.22.1",`
	`4`	`+ "version": "2.22.2",`
`5`	`5`	`"description": "Runtime of ZenStack for both client-side and server-side environments.",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`