Merge pull request #304 from zenstackhq/dev

merge dev to main (v3.0.0-beta.9)

Author: ymc9

TODO.md

@@ -56,7 +56,6 @@
         - [x] Array update
         - [x] Strict typing for checked/unchecked input
     - [x] Upsert
-        - [ ] Implement with "on conflict"
     - [x] Delete
     - [x] Aggregation
         - [x] Count
@@ -86,7 +85,7 @@
         - [ ] Global omit
         - [ ] DbNull vs JsonNull
         - [ ] Migrate to tsdown
-        - [ ] @default validation
+        - [x] @default validation
     - [ ] Benchmark
 - [x] Plugin
     - [x] Post-mutation hooks should be called after transaction is committed
@@ -96,7 +95,7 @@
     - [x] ZModel
     - [x] Runtime
     - [x] Typing
-- [ ] Validation
+- [x] Validation
 - [ ] Access Policy
     - [ ] Short-circuit pre-create check for scalar-field only policies
     - [x] Inject "on conflict do update"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.8",
+    "version": "3.0.0-beta.9",
     "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-beta.8",
+    "version": "3.0.0-beta.9",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
@@ -53,7 +53,7 @@
         "@zenstackhq/testtools": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
-        "better-sqlite3": "^12.2.0",
+        "better-sqlite3": "catalog:",
         "tmp": "catalog:"
     }
 }

packages/cli/src/plugins/prisma.ts

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

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

@@ -57,4 +57,25 @@ model User {
         runCli('generate', workDir);
         expect(fs.existsSync(path.join(workDir, 'prisma/schema.prisma'))).toBe(true);
     });
+
+    it('can generate a Prisma schema with custom output relative to zenstack.output', () => {
+        const workDir = createProject(`
+plugin prisma {
+    provider = '@core/prisma'
+    output = './schema.prisma'
+}
+
+model User {
+    id String @id @default(cuid())
+}
+`);
+
+        const pkgJson = JSON.parse(fs.readFileSync(path.join(workDir, 'package.json'), 'utf8'));
+        pkgJson.zenstack = {
+            output: './relative',
+        };
+        fs.writeFileSync(path.join(workDir, 'package.json'), JSON.stringify(pkgJson, null, 2));
+        runCli('generate', workDir);
+        expect(fs.existsSync(path.join(workDir, 'relative/schema.prisma'))).toBe(true);
+    });
 });

packages/cli/test/ts-schema-gen.test.ts

@@ -360,4 +360,64 @@ model User extends Base {
         expect(schema.enums).toMatchObject({ Role: expect.any(Object) });
         expect(schema.models).toMatchObject({ User: expect.any(Object) });
     });
+
+    it('generates correct default literal function arguments', async () => {
+        const { schema } = await generateTsSchema(`
+model User {
+    id String @id @default(uuid(7))
+}
+        `);
+
+        expect(schema.models).toMatchObject({
+            User: {
+                name: 'User',
+                fields: {
+                    id: {
+                        name: 'id',
+                        type: 'String',
+                        id: true,
+                        attributes: [
+                            {
+                                name: '@id',
+                            },
+                            {
+                                name: '@default',
+                                args: [
+                                    {
+                                        name: 'value',
+                                        value: {
+                                            kind: 'call',
+                                            function: 'uuid',
+                                            args: [
+                                                {
+                                                    kind: 'literal',
+                                                    value: 7,
+                                                },
+                                            ],
+                                        },
+                                    },
+                                ],
+                            },
+                        ],
+                        default: {
+                            kind: 'call',
+                            function: 'uuid',
+                            args: [
+                                {
+                                    kind: 'literal',
+                                    value: 7,
+                                },
+                            ],
+                        },
+                    },
+                },
+                idFields: ['id'],
+                uniqueFields: {
+                    id: {
+                        type: 'String',
+                    },
+                },
+            },
+        });
+    });
 });

packages/common-helpers/package.json

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

packages/eslint-config/base.js renamed to packages/config/eslint-config/base.js

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-beta.8",
+    "version": "3.0.0-beta.9",
     "type": "module",
     "private": true,
     "license": "MIT"