Merge pull request #198 from zenstackhq/dev

merge dev to main (v3.0.0-alpha.30)

Author: ymc9

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "description": "ZenStack",
     "packageManager": "[email protected]",
     "scripts": {

packages/cli/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/cli/src/plugins/prisma.ts

@@ -5,16 +5,16 @@ import path from 'node:path';
 const plugin: CliPlugin = {
     name: 'Prisma Schema Generator',
     statusText: 'Generating Prisma schema',
-    async generate({ model, defaultOutputPath, pluginOptions }) {
-        let outDir = defaultOutputPath;
+    async generate({ model, schemaFile, defaultOutputPath, pluginOptions }) {
+        let outFile = path.join(defaultOutputPath, 'schema.prisma');
         if (typeof pluginOptions['output'] === 'string') {
-            outDir = path.resolve(defaultOutputPath, pluginOptions['output']);
-            if (!fs.existsSync(outDir)) {
-                fs.mkdirSync(outDir, { recursive: true });
+            outFile = path.resolve(path.dirname(schemaFile), pluginOptions['output']);
+            if (!fs.existsSync(path.dirname(outFile))) {
+                fs.mkdirSync(path.dirname(outFile), { recursive: true });
             }
         }
         const prismaSchema = await new PrismaSchemaGenerator(model).generate();
-        fs.writeFileSync(path.join(outDir, 'schema.prisma'), prismaSchema);
+        fs.writeFileSync(outFile, prismaSchema);
     },
 };
 

packages/cli/test/plugins/prisma-plugin.test.ts

@@ -47,14 +47,14 @@ model User {
         const workDir = createProject(`
 plugin prisma {
     provider = '@core/prisma'
-    output = './prisma'
+    output = '../prisma/schema.prisma'
 }
 
 model User {
     id String @id @default(cuid())
 }
 `);
         runCli('generate', workDir);
-        expect(fs.existsSync(path.join(workDir, 'zenstack/prisma/schema.prisma'))).toBe(true);
+        expect(fs.existsSync(path.join(workDir, 'prisma/schema.prisma'))).toBe(true);
     });
 });

packages/common-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {

packages/create-zenstack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {

packages/dialects/sql.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/kysely-sql-js",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "type": "module",
     "private": true,
     "license": "MIT"

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,

packages/language/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.29",
+    "version": "3.0.0-alpha.30",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [