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

.github/workflows/build-test.yml

@@ -51,6 +51,11 @@ jobs:
                   node-version: ${{ matrix.node-version }}
                   cache: 'pnpm'
 
+            - name: Use Bun
+              uses: oven-sh/setup-bun@v2
+              with:
+                  bun-version: latest
+
             - name: Get pnpm store directory
               id: pnpm-cache
               shell: bash

.vscode/extensions.json

@@ -3,5 +3,5 @@
     // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
 
     // List of extensions which should be recommended for users of this workspace.
-    "recommendations": ["langium.langium-vscode", "kingwl.vscode-vitest-runner"]
+    "recommendations": ["langium.langium-vscode", "vitest.explorer"]
 }

.vscode/settings.json

@@ -1 +1,3 @@
-{}
+{
+    "vitest.maximumConfigs": 20
+}

package.json

@@ -1,13 +1,14 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
+    "type": "module",
     "scripts": {
         "build": "turbo run build",
         "watch": "turbo run watch build",
         "lint": "turbo run lint",
-        "test": "vitest run",
+        "test": "turbo run test",
         "format": "prettier --write \"**/*.{ts,tsx,md}\"",
         "pr": "gh pr create --fill-first --base dev",
         "merge-main": "gh pr create --title \"merge dev to main\" --body \"\" --base main --head dev",
@@ -31,7 +32,7 @@
         "turbo": "^2.5.4",
         "typescript": "catalog:",
         "typescript-eslint": "^8.34.1",
-        "vitest": "^3.2.4",
+        "vitest": "^4.0.14",
         "yaml": "^2.8.0"
     },
     "pnpm": {

packages/auth-adapters/better-auth/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "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.26",
+    "version": "3.0.0-beta.27",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/cli/src/utils/exec-utils.ts

@@ -43,11 +43,19 @@ export function execPrisma(args: string, options?: Omit<ExecSyncOptions, 'env'>
         // ignore and fallback
     }
 
+    const _options = {
+        ...options,
+        env: {
+            ...options?.env,
+            PRISMA_HIDE_UPDATE_MESSAGE: '1',
+        },
+    };
+
     if (!prismaPath) {
         // fallback to npx/bunx execute
-        execPackage(`prisma ${args}`, options);
+        execPackage(`prisma ${args}`, _options);
         return;
     }
 
-    execSync(`node ${prismaPath} ${args}`, options);
+    execSync(`node ${prismaPath} ${args}`, _options);
 }

packages/clients/tanstack-query/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "main": "index.js",
     "type": "module",

packages/common-helpers/package.json

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

packages/config/eslint-config/package.json

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

packages/config/typescript-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "private": true,
     "license": "MIT"
 }

packages/config/vitest-config/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "private": true,
     "license": "MIT",
     "exports": {

packages/create-zenstack/package.json

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

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.0.13",
+    "version": "3.0.14",
     "displayName": "ZenStack V3 Language Tools",
     "description": "VSCode extension for ZenStack (v3) ZModel language",
     "private": true,

packages/language/package.json

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

packages/language/src/validator.ts

@@ -6,6 +6,7 @@ import type {
     Enum,
     Expression,
     FunctionDecl,
+    GeneratorDecl,
     InvocationExpr,
     Model,
     TypeDef,
@@ -31,6 +32,7 @@ export function registerValidationChecks(services: ZModelServices) {
     const checks: ValidationChecks<ZModelAstType> = {
         Model: validator.checkModel,
         DataSource: validator.checkDataSource,
+        GeneratorDecl: validator.checkGenerator,
         DataModel: validator.checkDataModel,
         TypeDef: validator.checkTypeDef,
         Enum: validator.checkEnum,
@@ -56,6 +58,10 @@ export class ZModelValidator {
         new DataSourceValidator().validate(node, accept);
     }
 
+    checkGenerator(node: GeneratorDecl, accept: ValidationAcceptor): void {
+        accept('warning', '"generator" is not used by ZenStack and should be removed.', { node });
+    }
+
     checkDataModel(node: DataModel, accept: ValidationAcceptor): void {
         new DataModelValidator().validate(node, accept);
     }

packages/language/test/attribute-application.test.ts

@@ -20,4 +20,29 @@ describe('Attribute application validation tests', () => {
             `"before()" is only allowed in "post-update" policy rules`,
         );
     });
+
+    it('requires relation and fk to have consistent optionality', async () => {
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model Foo {
+                id Int @id @default(autoincrement())
+                bar Bar @relation(fields: [barId], references: [id])
+                barId Int?
+                @@allow('all', true)
+            }
+
+            model Bar {
+                id Int @id @default(autoincrement())
+                foos Foo[]
+                @@allow('all', true)
+            }
+            `,
+            /relation "bar" is not optional/,
+        );
+    });
 });

packages/language/test/this-resolution.test.ts

@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest';
+import { loadSchema, loadSchemaWithError } from './utils';
+
+describe('This keyword resolution tests', () => {
+    it('always resolves to the containing model', async () => {
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model A {
+                id Int @id @default(autoincrement())
+                av Int
+                b B[]
+
+                @@allow('read', b?[c?[cv == this.cv]])
+            }
+
+            model B {
+                id Int @id @default(autoincrement())
+                bv Int
+                aId Int
+                a A @relation(fields: [aId], references: [id])
+                c C[]
+            }
+
+            model C {
+                id Int @id @default(autoincrement())
+                cv Int
+                bId Int
+                b B @relation(fields: [bId], references: [id])
+            }
+        `,
+            /MemberAccessTarget named 'cv'/,
+        );
+
+        await expect(
+            loadSchema(`
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model A {
+                id Int @id @default(autoincrement())
+                av Int
+                b B[]
+
+                @@allow('read', b?[c?[cv == this.av]])
+            }
+
+            model B {
+                id Int @id @default(autoincrement())
+                bv Int
+                aId Int
+                a A @relation(fields: [aId], references: [id])
+                c C[]
+            }
+
+            model C {
+                id Int @id @default(autoincrement())
+                cv Int
+                bId Int
+                b B @relation(fields: [bId], references: [id])
+            }
+        `),
+        ).resolves.toBeTruthy();
+    });
+});

packages/orm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {

packages/orm/src/client/crud/dialects/postgresql.ts

@@ -106,7 +106,10 @@ export class PostgresCrudDialect<Schema extends SchemaDef> extends BaseCrudDiale
 
     private transformOutputDate(value: unknown) {
         if (typeof value === 'string') {
-            return new Date(value);
+            // PostgreSQL's jsonb_build_object serializes timestamptz as ISO 8601 strings
+            // in UTC but without the 'Z' suffix (e.g., "2023-01-01T12:00:00.123456").
+            // We add 'Z' to explicitly mark them as UTC for correct Date object creation.
+            return new Date(value.endsWith('Z') ? value : `${value}Z`);
         } else if (value instanceof Date && this.options.fixPostgresTimezone !== false) {
             // SPECIAL NOTES:
             // node-pg has a terrible quirk that it returns the date value in local timezone

packages/plugins/policy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {

packages/schema/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {

packages/server/src/adapter/elysia/handler.ts

@@ -25,7 +25,7 @@ export interface ElysiaOptions<Schema extends SchemaDef> extends CommonAdapterOp
 export function createElysiaHandler<Schema extends SchemaDef>(options: ElysiaOptions<Schema>) {
     return async (app: Elysia) => {
         app.all('/*', async (ctx: ElysiaContext) => {
-            const { request, body, set } = ctx;
+            const { query, body, set, request } = ctx;
             const client = await options.getClient(ctx);
             if (!client) {
                 set.status = 500;
@@ -35,7 +35,6 @@ export function createElysiaHandler<Schema extends SchemaDef>(options: ElysiaOpt
             }
 
             const url = new URL(request.url);
-            const query = Object.fromEntries(url.searchParams);
             let path = url.pathname;
 
             if (options.basePath && path.startsWith(options.basePath)) {

packages/server/src/adapter/nuxt/handler.ts

@@ -1,7 +1,14 @@
 import type { ClientContract } from '@zenstackhq/orm';
 import type { SchemaDef } from '@zenstackhq/orm/schema';
-import { H3Event, defineEventHandler, getQuery, getRouterParams, readBody, type EventHandlerRequest } from 'h3';
-import { setResponseStatus } from 'nuxt/app';
+import {
+    defineEventHandler,
+    getQuery,
+    getRouterParams,
+    readBody,
+    setResponseStatus,
+    type H3Event,
+    type EventHandlerRequest,
+} from 'h3';
 import { logInternalError, type CommonAdapterOptions } from '../common';
 
 /**

packages/testtools/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-beta.26",
+    "version": "3.0.0-beta.27",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {