Merge pull request #517 from zenstackhq/dev

ymc9 · web-flow · commit da6cf60f8854 · 2025-12-18T14:16:15.000Z
merge dev to main (v3.0.0-beta.33)
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ dist
 *.db-journal
 *.tgz
 .pnpm-store
+*.vsix
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
     "type": "module",
diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "scripts": {
diff --git a/packages/cli/package.json b/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.32",
+    "version": "3.0.0-beta.33",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/cli/src/actions/init.ts b/packages/cli/src/actions/init.ts
@@ -23,9 +23,9 @@ export async function run(projectPath: string) {
     console.log(colors.gray(`Using package manager: ${pm.agent}`));
 
     for (const pkg of packages) {
-        const resolved = resolveCommand(pm.agent, 'install', [
+        const resolved = resolveCommand(pm.agent, 'add', [
             pkg.name,
-            ...(pkg.dev ? [pm.agent === 'yarn' ? '--dev' : '--save-dev'] : []),
+            ...(pkg.dev ? [pm.agent.startsWith('yarn') || pm.agent === 'bun' ? '--dev' : '--save-dev'] : []),
         ]);
         if (!resolved) {
             throw new CliError(`Unable to determine how to install package "${pkg.name}". Please install it manually.`);
diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "main": "index.js",
     "type": "module",
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/config/vitest-config/package.json b/packages/config/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/language/src/validators/expression-validator.ts b/packages/language/src/validators/expression-validator.ts
@@ -12,6 +12,7 @@ import {
     isReferenceExpr,
     isThisExpr,
     MemberAccessExpr,
+    UnaryExpr,
     type ExpressionType,
 } from '../generated/ast';
 
@@ -67,6 +68,9 @@ export default class ExpressionValidator implements AstValidator<Expression> {
             case 'BinaryExpr':
                 this.validateBinaryExpr(expr, accept);
                 break;
+            case 'UnaryExpr':
+                this.validateUnaryExpr(expr, accept);
+                break;
         }
     }
 
@@ -245,6 +249,12 @@ export default class ExpressionValidator implements AstValidator<Expression> {
         }
     }
 
+    private validateUnaryExpr(expr: UnaryExpr, accept: ValidationAcceptor) {
+        if (expr.operand.$resolvedType && expr.operand.$resolvedType.decl !== 'Boolean') {
+            accept('error', `operand of "${expr.operator}" must be of Boolean type`, { node: expr.operand });
+        }
+    }
+
     private validateCollectionPredicate(expr: BinaryExpr, accept: ValidationAcceptor) {
         if (!expr.$resolvedType) {
             accept('error', 'collection predicate can only be used on an array of model type', { node: expr });
diff --git a/packages/orm/package.json b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
diff --git a/packages/orm/src/client/executor/zenstack-query-executor.ts b/packages/orm/src/client/executor/zenstack-query-executor.ts
@@ -198,7 +198,7 @@ export class ZenStackQueryExecutor extends DefaultQueryExecutor {
             if (parameters) {
                 compiled = { ...compiled, parameters };
             }
-            return connection.executeQuery<any>(compiled);
+            return this.internalExecuteQuery(connection, compiled);
         }
 
         if (
@@ -246,7 +246,7 @@ export class ZenStackQueryExecutor extends DefaultQueryExecutor {
             queryId,
         );
 
-        const result = await connection.executeQuery<any>(compiled);
+        const result = await this.internalExecuteQuery(connection, compiled);
 
         if (!this.driver.isTransactionConnection(connection)) {
             // not in a transaction, just call all after-mutation hooks
@@ -470,7 +470,7 @@ export class ZenStackQueryExecutor extends DefaultQueryExecutor {
         const compiled = this.compileQuery(selectQueryNode, createQueryId());
         // execute the query directly with the given connection to avoid triggering
         // any other side effects
-        const result = await connection.executeQuery(compiled);
+        const result = await this.internalExecuteQuery(connection, compiled);
         return result.rows as Record<string, unknown>[];
     }
 
@@ -483,4 +483,12 @@ export class ZenStackQueryExecutor extends DefaultQueryExecutor {
             return condition2;
         }
     }
+
+    private async internalExecuteQuery(connection: DatabaseConnection, compiledQuery: CompiledQuery) {
+        try {
+            return await connection.executeQuery<any>(compiledQuery);
+        } catch (err) {
+            throw createDBQueryError('Failed to execute query', err, compiledQuery.sql, compiledQuery.parameters);
+        }
+    }
 }
diff --git a/packages/orm/src/client/options.ts b/packages/orm/src/client/options.ts
@@ -50,6 +50,8 @@ export type ClientOptions<Schema extends SchemaDef> = {
 
     /**
      * Custom function definitions.
+     *
+     * @private
      */
     functions?: Record<string, ZModelFunction<Schema>>;
 
diff --git a/packages/orm/src/client/plugin.ts b/packages/orm/src/client/plugin.ts
@@ -24,8 +24,10 @@ export interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
      */
     description?: string;
 
+    // TODO: revisit
     /**
      * Custom function implementations.
+     * @private
      */
     functions?: Record<string, ZModelFunction<Schema>>;
 
diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
@@ -25,6 +25,16 @@
                 "types": "./dist/index.d.cts",
                 "default": "./dist/index.cjs"
             }
+        },
+        "./ast": {
+            "import": {
+                "types": "./dist/ast.d.ts",
+                "default": "./dist/ast.js"
+            },
+            "require": {
+                "types": "./dist/ast.d.cts",
+                "default": "./dist/ast.cjs"
+            }
         }
     },
     "dependencies": {
diff --git a/packages/sdk/src/ast.ts b/packages/sdk/src/ast.ts
@@ -0,0 +1 @@
+export * from '@zenstackhq/language/ast';
diff --git a/packages/sdk/tsup.config.ts b/packages/sdk/tsup.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'tsup';
 export default defineConfig({
     entry: {
         index: 'src/index.ts',
+        ast: 'src/ast.ts',
     },
     outDir: 'dist',
     splitting: false,
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-beta.32",
+    "version": "3.0.0-beta.33",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/samples/next.js/package.json b/samples/next.js/package.json
diff --git a/samples/orm/package.json b/samples/orm/package.json
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
diff --git a/tests/regression/package.json b/tests/regression/package.json
diff --git a/tests/regression/test/issue-503/regression.test.ts b/tests/regression/test/issue-503/regression.test.ts
diff --git a/tests/regression/test/issue-505.test.ts b/tests/regression/test/issue-505.test.ts
diff --git a/tests/regression/test/issue-510.test.ts b/tests/regression/test/issue-510.test.ts
diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json
diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`		`- "version": "3.0.0-beta.32",`
	`3`	`+ "version": "3.0.0-beta.33",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "pnpm@10.23.0",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/better-auth",`
`3`		`- "version": "3.0.0-beta.32",`
	`3`	`+ "version": "3.0.0-beta.33",`
`4`	`4`	`"description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/tanstack-query",`
`3`		`- "version": "3.0.0-beta.32",`
	`3`	`+ "version": "3.0.0-beta.33",`
`4`	`4`	`"description": "TanStack Query Client for consuming ZenStack v3's CRUD service",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/common-helpers",`
`3`		`- "version": "3.0.0-beta.32",`
	`3`	`+ "version": "3.0.0-beta.33",`
`4`	`4`	`"description": "ZenStack Common Helpers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-beta.32",`
	`3`	`+ "version": "3.0.0-beta.33",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/typescript-config",`
`3`		`- "version": "3.0.0-beta.32",`
	`3`	`+ "version": "3.0.0-beta.33",`
`4`	`4`	`"private": true,`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/vitest-config",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "3.0.0-beta.32",`
	`4`	`+ "version": "3.0.0-beta.33",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"exports": {`