merge dev to main (v2.10.1) (#1913)

zenstackhq · Dec 13, 2024 · f7f85ea · f7f85ea
2 parents 7cc5f00 + 6d53c18
commit f7f85ea
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 29 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -86,7 +86,7 @@ jobs:
                   gradle-home-cache-cleanup: true
 
             - name: Build
-              run: DEFAULT_NPM_TAG=latest pnpm run build
+              run: DEFAULT_NPM_TAG=latest pnpm run build-ci
 
             - name: Lint
               run: pnpm lint

diff --git a/package.json b/package.json
@@ -1,9 +1,10 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.10.0",
+    "version": "2.10.1",
     "description": "",
     "scripts": {
-        "build": "pnpm -r build",
+        "build": "pnpm -r --filter=\"!./packages/ide/*\" build",
+        "build-ci": "pnpm -r build",
         "lint": "pnpm -r lint",
         "test": "pnpm -r --parallel run test --silent --forceExit",
         "test-ci": "pnpm -r --parallel run --filter=\"./packages/**\" test --silent --forceExit",

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.10.0"
+version = "2.10.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.10.0",
+  "version": "2.10.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.10.0",
+    "version": "2.10.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.10.0",
+    "version": "2.10.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.10.0",
+  "version": "2.10.1",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
@@ -36,7 +36,7 @@
     "ts-pattern": "^4.3.0",
     "upper-case-first": "^2.0.2",
     "yaml": "^2.2.2",
-    "zod": "^3.22.4",
+    "zod": "^3.22.4",    
     "zod-validation-error": "^1.5.0"
   },
   "devDependencies": {

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.10.0",
+    "version": "2.10.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.10.0",
+    "version": "2.10.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.10.0",
+    "version": "2.10.1",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {
@@ -31,8 +31,10 @@
         "lower-case-first": "^2.0.2",
         "ts-morph": "^16.0.0",
         "tslib": "^2.4.1",
-        "upper-case-first": "^2.0.2",
-        "zod": "^3.22.4"
+        "upper-case-first": "^2.0.2"
+    },
+    "peerDependencies": {
+        "zod": "^3.22.4"        
     },
     "devDependencies": {
         "@trpc/next": "^10.32.0",

diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json b/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json
@@ -17,7 +17,7 @@
         "trpc-nuxt": "^0.10.22",
         "vue": "latest",
         "vue-router": "latest",
-        "zod": "^3.23.8"
+        "zod": "^3.22.4"        
     },
     "devDependencies": {
         "esbuild": "^0.24.0",

diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json b/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json
@@ -17,7 +17,7 @@
         "trpc-nuxt": "^0.11.0-beta.1",
         "vue": "latest",
         "vue-router": "latest",
-        "zod": "^3.23.8"
+        "zod": "^3.22.4"        
     },
     "devDependencies": {
         "esbuild": "^0.24.0",

diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/package.json b/packages/plugins/trpc/tests/projects/t3-trpc-v10/package.json
@@ -24,7 +24,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "superjson": "^2.2.1",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4"        
   },
   "devDependencies": {
     "@types/eslint": "^8.44.7",

diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json b/packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json
@@ -28,7 +28,7 @@
         "react-dom": "^18.3.1",
         "server-only": "^0.0.1",
         "superjson": "^2.2.1",
-        "zod": "^3.23.3"
+        "zod": "^3.22.4"        
     },
     "devDependencies": {
         "@types/eslint": "^8.56.10",

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

diff --git a/packages/runtime/src/zod-utils.ts b/packages/runtime/src/zod-utils.ts
@@ -9,10 +9,12 @@ import { z as Z } from 'zod';
  * accidentally matching a less-ideal schema candidate.
  *
  * The helper uses a custom schema to find the candidate that results in the fewest unrecognized keys when parsing the data.
+ *
+ * The function uses `any` for parameter and return type to be compatible with various zod versions.
  */
-export function smartUnion(z: typeof Z, candidates: Z.ZodSchema[]) {
+export function smartUnion(z: any, candidates: any[]): any {
     // strip `z.lazy`
-    const processedCandidates = candidates.map((candidate) => unwrapLazy(z, candidate));
+    const processedCandidates: Z.ZodSchema[] = candidates.map((candidate) => unwrapLazy(z, candidate));
 
     if (processedCandidates.some((c) => !(c instanceof z.ZodObject || c instanceof z.ZodArray))) {
         // fall back to plain union if not all candidates are objects or arrays
@@ -22,11 +24,13 @@ export function smartUnion(z: typeof Z, candidates: Z.ZodSchema[]) {
     let resultData: any;
 
     return z
-        .custom((data) => {
+        .custom((data: any) => {
             if (Array.isArray(data)) {
                 const { data: result, success } = smartArrayUnion(
                     z,
-                    processedCandidates.filter((c) => c instanceof z.ZodArray),
+                    processedCandidates.filter((c) => c instanceof z.ZodArray) as Array<
+                        Z.ZodArray<Z.ZodObject<Z.ZodRawShape>>
+                    >,
                     data
                 );
                 if (success) {
@@ -36,7 +40,7 @@ export function smartUnion(z: typeof Z, candidates: Z.ZodSchema[]) {
             } else {
                 const { data: result, success } = smartObjectUnion(
                     z,
-                    processedCandidates.filter((c) => c instanceof z.ZodObject),
+                    processedCandidates.filter((c) => c instanceof z.ZodObject) as Z.ZodObject<Z.ZodRawShape>[],
                     data
                 );
                 if (success) {

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

diff --git a/packages/schema/src/plugins/enhancer/enhance/index.ts b/packages/schema/src/plugins/enhancer/enhance/index.ts
@@ -283,6 +283,7 @@ export function enhance(prisma: any, context?: EnhancementContext<${authTypePara
             output: logicalPrismaFile,
             overrideClientGenerationPath: prismaClientOutDir,
             mode: 'logical',
+            customAttributesAsComments: true,
         });
 
         // generate the prisma client

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

diff --git a/script/test-scaffold.ts b/script/test-scaffold.ts
@@ -19,6 +19,6 @@ function run(cmd: string) {
 }
 
 run('npm init -y');
-run('npm i --no-audit --no-fund typescript [email protected] @prisma/[email protected] zod decimal.js @types/node');
+run('npm i --no-audit --no-fund typescript [email protected] @prisma/[email protected] zod@^3.22.4 decimal.js @types/node');
 
 console.log('Test scaffold setup complete.');