merge dev to main (v3.6.0)

.vscode/launch.json

@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "Debug CLI",
-            "program": "${workspaceFolder}/packages/cli/dist/index.js",
+            "program": "${workspaceFolder}/packages/cli/dist/index.mjs",
             "request": "launch",
             "skipFiles": ["<node_internals>/**"],
             "type": "node",

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "vitest.maximumConfigs": 20
+    "vitest.maximumConfigs": 20,
+    "js/ts.tsdk.path": "node_modules/typescript/lib"
 }

BREAKINGCHANGES.md

@@ -3,3 +3,4 @@
 1. non-optional to-one relation doesn't automatically filter parent read when evaluating access policies
 1. `@omit` and `@password` attributes have been removed
 1. SWR plugin is removed
+1. `makeModelSchema()` no longer includes relation fields by default — use `include` or `select` options to opt in, mirroring ORM behaviour

CLAUDE.md

@@ -79,6 +79,10 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 - Always target the `dev` branch (not `main`) when creating PRs
 
+## Git Workflow
+
+- Never commit or push changes unless explicitly asked to do so
+
 ## Development Notes
 
 - Always run `zenstack generate` after modifying ZModel schemas

README.md

@@ -74,7 +74,7 @@ Alternatively, you can set it up manually:
 
 ```bash
 npm install -D @zenstackhq/cli
-npm install @zenstackhq/orm
+npm install @zenstackhq/schema @zenstackhq/orm
 ```
 
 Then create a `zenstack` folder and a `schema.zmodel` file in it.

package.json

@@ -2,7 +2,7 @@
     "name": "zenstack-v3",
     "displayName": "ZenStack",
     "description": "ZenStack",
-    "version": "3.5.6",
+    "version": "3.6.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -14,7 +14,7 @@
         "url": "https://github.com/zenstackhq/zenstack"
     },
     "license": "MIT",
-    "packageManager": "pnpm@10.23.0",
+    "packageManager": "pnpm@10.33.0",
     "scripts": {
         "build": "turbo run build",
         "watch": "turbo run watch build",
@@ -45,7 +45,7 @@
         "npm-run-all": "^4.1.5",
         "prettier": "^3.5.3",
         "prisma": "catalog:",
-        "tsup": "^8.5.0",
+        "tsdown": "^0.21.8",
         "tsx": "^4.20.3",
         "turbo": "^2.5.4",
         "typescript": "catalog:",

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

@@ -2,7 +2,7 @@
     "name": "@zenstackhq/better-auth",
     "displayName": "ZenStack Better Auth Adapter",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
-    "version": "3.5.6",
+    "version": "3.6.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -15,8 +15,8 @@
     },
     "license": "MIT",
     "scripts": {
-        "build": "tsc --noEmit && tsup-node",
-        "watch": "tsup-node --watch",
+        "build": "tsc --noEmit && tsdown",
+        "watch": "tsdown --watch",
         "lint": "eslint src --ext ts",
         "test": "vitest run",
         "pack": "pnpm pack"
@@ -31,8 +31,8 @@
     "exports": {
         ".": {
             "import": {
-                "types": "./dist/index.d.ts",
-                "default": "./dist/index.js"
+                "types": "./dist/index.d.mts",
+                "default": "./dist/index.mjs"
             },
             "require": {
                 "types": "./dist/index.d.cts",
@@ -55,14 +55,16 @@
         "better-auth": "^1.3.0"
     },
     "devDependencies": {
-        "@better-auth/core": "1.4.19",
-        "better-auth": "1.4.19",
         "@better-auth/cli": "1.4.19",
+        "@better-auth/core": "1.4.19",
         "@types/tmp": "catalog:",
         "@zenstackhq/cli": "workspace:*",
         "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/tsdown-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
+        "better-auth": "1.4.19",
+        "kysely": "catalog:",
         "tmp": "catalog:"
     },
     "funding": "https://github.com/sponsors/zenstackhq"

packages/auth-adapters/better-auth/test/cli-generate.test.ts

@@ -28,7 +28,7 @@ function generateSchema(configFile: string): string {
  * Helper function to verify schema with zenstack check
  */
 function verifySchema(schemaPath: string) {
-    const cliPath = path.join(__dirname, '../../../cli/dist/index.js');
+    const cliPath = path.join(__dirname, '../../../cli/dist/index.mjs');
     const workDir = path.dirname(schemaPath);
 
     expect(fs.existsSync(schemaPath)).toBe(true);

packages/auth-adapters/better-auth/tsdown.config.ts

@@ -0,0 +1,3 @@
+import { createConfig } from '@zenstackhq/tsdown-config';
+
+export default createConfig({ entry: { index: 'src/index.ts' } });

packages/cli/bin/cli

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-import '../dist/index.js';
+import '../dist/index.mjs';

packages/cli/package.json

@@ -2,7 +2,7 @@
     "name": "@zenstackhq/cli",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.5.6",
+    "version": "3.6.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -30,8 +30,8 @@
         "bin"
     ],
     "scripts": {
-        "build": "tsc --noEmit && tsup-node",
-        "watch": "tsup-node --watch",
+        "build": "tsc --noEmit && tsdown",
+        "watch": "tsdown --watch",
         "lint": "eslint src --ext ts",
         "test": "vitest run",
         "pack": "pnpm pack"
@@ -73,6 +73,7 @@
         "@types/tmp": "catalog:",
         "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/testtools": "workspace:*",
+        "@zenstackhq/tsdown-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
         "tmp": "catalog:"

packages/cli/scripts/post-build.ts

@@ -8,7 +8,7 @@ if (!token) {
     console.warn('TELEMETRY_TRACKING_TOKEN is not set.');
 }
 
-const filesToProcess = ['dist/index.js', 'dist/index.cjs'];
+const filesToProcess = ['dist/index.mjs', 'dist/index.cjs'];
 const _dirname = path.dirname(fileURLToPath(import.meta.url));
 
 for (const file of filesToProcess) {

packages/cli/test/utils.ts

@@ -55,7 +55,10 @@ export function getTestDbUrl(provider: 'sqlite' | 'postgresql' | 'mysql', dbName
     }
 }
 
-export function getDefaultPrelude(options?: { provider?: 'sqlite' | 'postgresql' | 'mysql', datasourceFields?: Record<string, string | string[]> }) {
+export function getDefaultPrelude(options?: {
+    provider?: 'sqlite' | 'postgresql' | 'mysql';
+    datasourceFields?: Record<string, string | string[]>;
+}) {
     const provider = (options?.provider || getTestDbProvider()) ?? 'sqlite';
     const dbName = getTestDbName(provider);
     let dbUrl: string;
@@ -78,33 +81,41 @@ export function getDefaultPrelude(options?: { provider?: 'sqlite' | 'postgresql'
         ['provider', `'${provider}'`],
         ['url', `'${dbUrl}'`],
         ...Object.entries(options?.datasourceFields || {}).map(([k, v]) => {
-            const value = Array.isArray(v) ? `[${v.map(item => `'${item}'`).join(', ')}]` : `'${v}'`;
+            const value = Array.isArray(v) ? `[${v.map((item) => `'${item}'`).join(', ')}]` : `'${v}'`;
             return [k, value] as [string, string];
         }),
     ];
 
-    const formattedFields = fields.map(([name, value]) => {
-        return `    ${name} = ${value}`;
-    }).join('\n');
+    const formattedFields = fields
+        .map(([name, value]) => {
+            return `    ${name} = ${value}`;
+        })
+        .join('\n');
 
     const ZMODEL_PRELUDE = `datasource db {\n${formattedFields}\n}`;
     return ZMODEL_PRELUDE;
 }
 
 export async function createProject(
     zmodel: string,
-    options?: { customPrelude?: boolean; provider?: 'sqlite' | 'postgresql' | 'mysql'; datasourceFields?: Record<string, string | string[]> },
+    options?: {
+        customPrelude?: boolean;
+        provider?: 'sqlite' | 'postgresql' | 'mysql';
+        datasourceFields?: Record<string, string | string[]>;
+    },
 ) {
     const workDir = createTestProject();
     fs.mkdirSync(path.join(workDir, 'zenstack'), { recursive: true });
     const schemaPath = path.join(workDir, 'zenstack/schema.zmodel');
-    const content = options?.customPrelude ? zmodel : `${getDefaultPrelude({ provider: options?.provider, datasourceFields: options?.datasourceFields })}\n\n${zmodel}`;
+    const content = options?.customPrelude
+        ? zmodel
+        : `${getDefaultPrelude({ provider: options?.provider, datasourceFields: options?.datasourceFields })}\n\n${zmodel}`;
     const schema = await formatDocument(content);
     fs.writeFileSync(schemaPath, schema);
     return { workDir, schema };
 }
 
 export function runCli(command: string, cwd: string) {
-    const cli = path.join(__dirname, '../dist/index.js');
+    const cli = path.join(__dirname, '../dist/index.mjs');
     execSync(`node ${cli} ${command}`, { cwd });
 }

packages/cli/tsdown.config.ts

@@ -0,0 +1,3 @@
+import { createConfig } from '@zenstackhq/tsdown-config';
+
+export default createConfig({ entry: { index: 'src/index.ts' } });

packages/clients/client-helpers/package.json

@@ -2,7 +2,7 @@
     "name": "@zenstackhq/client-helpers",
     "displayName": "ZenStack Client Helpers",
     "description": "Helpers for implementing clients that consume ZenStack's CRUD service",
-    "version": "3.5.6",
+    "version": "3.6.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team",
@@ -15,8 +15,8 @@
     },
     "license": "MIT",
     "scripts": {
-        "build": "tsc --noEmit && tsup-node && pnpm test:typecheck",
-        "watch": "tsup-node --watch",
+        "build": "tsc --noEmit && tsdown && pnpm test:typecheck",
+        "watch": "tsdown --watch",
         "lint": "eslint src --ext ts",
         "test": "vitest run",
         "test:typecheck": "tsc --noEmit --project tsconfig.test.json",
@@ -27,25 +27,25 @@
     ],
     "exports": {
         ".": {
-            "types": "./dist/index.d.ts",
-            "default": "./dist/index.js"
+            "types": "./dist/index.d.mts",
+            "default": "./dist/index.mjs"
         },
         "./fetch": {
-            "types": "./dist/fetch.d.ts",
-            "default": "./dist/fetch.js"
+            "types": "./dist/fetch.d.mts",
+            "default": "./dist/fetch.mjs"
         }
     },
     "dependencies": {
         "@zenstackhq/common-helpers": "workspace:*",
         "@zenstackhq/schema": "workspace:*",
+        "@zenstackhq/orm": "workspace:*",
         "decimal.js": "catalog:",
         "superjson": "^2.2.3"
     },
     "devDependencies": {
+        "@types/node": "catalog:",
         "@zenstackhq/eslint-config": "workspace:*",
-        "@zenstackhq/language": "workspace:*",
-        "@zenstackhq/orm": "workspace:*",
-        "@zenstackhq/sdk": "workspace:*",
+        "@zenstackhq/tsdown-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*"
     },

packages/clients/client-helpers/tsconfig.json

@@ -1,4 +1,7 @@
 {
     "extends": "@zenstackhq/typescript-config/base.json",
+    "compilerOptions": {
+        "lib": ["ESNext", "DOM"]
+    },
     "include": ["src/**/*.ts"]
 }

packages/clients/client-helpers/tsconfig.test.json

@@ -2,6 +2,7 @@
     "extends": "@zenstackhq/typescript-config/base.json",
     "include": ["src/**/*.ts", "test/**/*.ts"],
     "compilerOptions": {
-        "lib": ["ESNext"]
+        "lib": ["ESNext", "DOM"],
+        "types": ["node"]
     }
 }

packages/clients/client-helpers/tsdown.config.ts

@@ -0,0 +1,9 @@
+import { createConfig } from '@zenstackhq/tsdown-config';
+
+export default createConfig({
+    entry: {
+        index: 'src/index.ts',
+        fetch: 'src/fetch.ts',
+    },
+    format: ['esm'],
+});