merge dev to main (v2.22.1)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.22.0",
+    "version": "2.22.1",
     "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.22.0"
+version = "2.22.1"
 
 repositories {
     mavenCentral()

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.22.0",
+  "version": "2.22.1",
   "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.22.0",
+    "version": "2.22.1",
     "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.22.0",
+    "version": "2.22.1",
     "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.22.0",
+  "version": "2.22.1",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/openapi/src/rpc-generator.ts

@@ -785,9 +785,11 @@ export class RPCOpenAPIGenerator extends OpenAPIGeneratorBase {
                 const field = dataModel.fields.find((f) => f.name === def.name);
                 if (field?.type.reference?.ref && isTypeDef(field.type.reference.ref)) {
                     // This Json field references a TypeDef
+                    // Use field.type.array from ZModel AST instead of def.isList from DMMF,
+                    // since Prisma treats TypeDef fields as plain Json and doesn't know about arrays
                     return this.wrapArray(
                         this.wrapNullable(this.ref(field.type.reference.ref.name, true), !def.isRequired),
-                        def.isList
+                        field.type.array
                     );
                 }
             }

packages/plugins/openapi/tests/openapi-rpc.test.ts

@@ -518,6 +518,65 @@ model Product {
         }
     });
 
+    it('array of TypeDef with enum directly on model field', async () => {
+        for (const specVersion of ['3.0.0', '3.1.0']) {
+            const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
+plugin openapi {
+    provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
+    specVersion = '${specVersion}'
+}
+
+enum Language {
+    FR
+    EN
+    ES
+    DE
+    IT
+}
+
+type TranslatedField {
+    language Language
+    content String
+}
+
+model Article {
+    id String @id @default(cuid())
+    title TranslatedField[] @json
+    description TranslatedField[] @json
+
+    @@allow('all', true)
+}
+        `);
+
+            const { name: output } = tmp.fileSync({ postfix: '.yaml' });
+
+            const options = buildOptions(model, modelFile, output);
+            await generate(model, options, dmmf);
+
+            await OpenAPIParser.validate(output);
+
+            const parsed = YAML.parse(fs.readFileSync(output, 'utf-8'));
+            expect(parsed.openapi).toBe(specVersion);
+
+            // Verify TranslatedField TypeDef is generated
+            expect(parsed.components.schemas.TranslatedField).toBeDefined();
+
+            // Verify Language enum is generated
+            expect(parsed.components.schemas.Language).toBeDefined();
+
+            // Verify enum reference inside TranslatedField
+            expect(parsed.components.schemas.TranslatedField.properties.language.$ref).toBe('#/components/schemas/Language');
+
+            // Verify array of TypeDef directly on model field
+            expect(parsed.components.schemas.Article.properties.title.type).toBe('array');
+            expect(parsed.components.schemas.Article.properties.title.items.$ref).toBe('#/components/schemas/TranslatedField');
+
+            // Verify second array field as well
+            expect(parsed.components.schemas.Article.properties.description.type).toBe('array');
+            expect(parsed.components.schemas.Article.properties.description.items.$ref).toBe('#/components/schemas/TranslatedField');
+        }
+    });
+
     it('full-text search', async () => {
         const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
 generator js {

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.22.0",
+    "version": "2.22.1",
     "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.22.0",
+    "version": "2.22.1",
     "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.22.0",
+    "version": "2.22.1",
     "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.22.0",
+    "version": "2.22.1",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

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

packages/schema/src/cli/actions/init.ts

@@ -1,7 +1,6 @@
 import colors from 'colors';
 import fs from 'fs';
 import path from 'path';
-import pkgJson from '../../package.json';
 import { PackageManagers, ensurePackage, installPackage } from '../../utils/pkg-utils';
 import { getVersion } from '../../utils/version-utils';
 import { CliError } from '../cli-error';
@@ -79,13 +78,6 @@ Moving forward please edit this file and run "zenstack generate" to regenerate P
 }
 
 function getLatestSupportedPrismaVersion() {
-    const versionSpec = pkgJson.peerDependencies.prisma;
-    let maxVersion: string | undefined;
-    const hyphen = versionSpec.indexOf('-');
-    if (hyphen > 0) {
-        maxVersion = versionSpec.substring(hyphen + 1).trim();
-    } else {
-        maxVersion = versionSpec;
-    }
-    return maxVersion ?? 'latest';
+    // Prisma 7 is not tested
+    return '6';
 }

packages/sdk/package.json

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

packages/server/package.json

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