merge dev to main (v3.5.0) (#2513)

Author: ymc9

.github/workflows/build-test.yml

@@ -8,6 +8,7 @@ on:
 
 env:
     TELEMETRY_TRACKING_TOKEN: ${{ secrets.TELEMETRY_TRACKING_TOKEN }}
+    VSCODE_TELEMETRY_TRACKING_TOKEN: ${{ secrets.VSCODE_TELEMETRY_TRACKING_TOKEN }}
     DO_NOT_TRACK: '1'
 
 permissions:

README.md

@@ -34,6 +34,7 @@ ZenStack is a TypeScript database toolkit for developing full-stack or backend N
 - 🧩 Designed for extensibility and flexibility
 - ⚙️ Automatic CRUD web APIs with adapters for popular frameworks
 - 🏖️ Automatic [TanStack Query](https://github.com/TanStack/query) hooks for easy CRUD from the frontend
+- 💎 [Zod](https://zod.dev) schema generation
 
 # What's New in V3
 
@@ -111,3 +112,23 @@ Thank you for your generous support!
 # Community
 
 Join our [discord server](https://discord.gg/Ykhr738dUe) for chat and updates!
+
+# Contributors
+
+Thanks to all the contributors who have helped make ZenStack better!
+
+### Source
+
+<a href="https://github.com/zenstackhq/zenstack/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=zenstackhq/zenstack" />
+</a>
+
+### Docs
+
+<a href="https://github.com/zenstackhq/zenstack-docs/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=zenstackhq/zenstack-docs" />
+</a>
+
+## License
+
+[MIT](LICENSE)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.4.6",
+    "version": "3.5.0",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
     "type": "module",

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

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.4.6",
+    "version": "3.5.0",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "scripts": {

packages/cli/README.md

@@ -0,0 +1,24 @@
+# @zenstackhq/cli
+
+The command-line interface for ZenStack. Provides commands for initializing projects, generating TypeScript code from ZModel schemas, managing database migrations, and etc.
+
+## Key Commands
+
+- `zenstack init` — Initialize ZenStack in an existing project
+- `zenstack generate` — Compile ZModel schema to TypeScript
+- `zenstack db push` — Sync schema to the database
+- `zenstack db pull` — Pull database schema changes into ZModel
+- `zenstack migrate dev` — Create and apply database migrations
+- `zenstack migrate deploy` — Deploy migrations to production
+- `zenstack format` — Format ZModel schema files
+- `zenstack proxy|studio` — Start a database proxy server for using studio
+
+## Installation
+
+```bash
+npm install -D @zenstackhq/cli
+```
+
+## Learn More
+
+- [ZenStack Documentation](https://zenstack.dev/docs)

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.4.6",
+    "version": "3.5.0",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/cli/src/actions/action-utils.ts

@@ -291,6 +291,14 @@ export async function loadPluginModule(provider: string, basePath: string) {
         }
     }
 
+    // try jiti import for bare package specifiers (handles workspace packages)
+    try {
+        const result = (await jiti.import(moduleSpec, { default: true })) as CliPlugin;
+        return result;
+    } catch {
+        // fall through to last resort
+    }
+
     // last resort, try to import as esm directly
     try {
         const mod = await import(moduleSpec);

packages/cli/src/actions/check.ts

@@ -29,7 +29,9 @@ async function checkPluginResolution(schemaFile: string, model: Model) {
     for (const plugin of plugins) {
         const provider = getPluginProvider(plugin);
         if (!provider.startsWith('@core/')) {
-            await loadPluginModule(provider, path.dirname(schemaFile));
+            const pluginSourcePath =
+                plugin.$cstNode?.parent?.element.$document?.uri?.fsPath ?? schemaFile;
+            await loadPluginModule(provider, path.dirname(pluginSourcePath));
         }
     }
 }

packages/cli/src/actions/generate.ts

@@ -186,7 +186,11 @@ async function runPlugins(schemaFile: string, model: Model, outputPath: string,
                 throw new CliError(`Unknown core plugin: ${provider}`);
             }
         } else {
-            cliPlugin = await loadPluginModule(provider, path.dirname(schemaFile));
+            // resolve relative plugin paths against the schema file where the plugin is declared,
+            // not the entry schema file
+            const pluginSourcePath =
+                plugin.$cstNode?.parent?.element.$document?.uri?.fsPath ?? schemaFile;
+            cliPlugin = await loadPluginModule(provider, path.dirname(pluginSourcePath));
         }
 
         if (cliPlugin) {
@@ -252,7 +256,7 @@ async function runPlugins(schemaFile: string, model: Model, outputPath: string,
             spinner?.succeed();
         } catch (err) {
             spinner?.fail();
-            console.error(err);
+            throw err;
         }
     }
 }

packages/cli/src/index.ts

@@ -1,7 +1,7 @@
-import 'dotenv/config';
 import { ZModelLanguageMetaData } from '@zenstackhq/language';
 import colors from 'colors';
 import { Command, CommanderError, Option } from 'commander';
+import 'dotenv/config';
 import * as actions from './actions';
 import { CliError } from './cli-error';
 import { telemetry } from './telemetry';