@zenstackhq/cli 3.3.0-beta.3 → 3.3.0-beta.5

package/dist/index.js

@@ -12,6 +12,7 @@ var __export = (target, all) => {
 };
 
 // src/index.ts
+import "dotenv/config";
 import { ZModelLanguageMetaData as ZModelLanguageMetaData2 } from "@zenstackhq/language";
 import colors10 from "colors";
 import { Command, CommanderError, Option } from "commander";
@@ -226,7 +227,7 @@ function execPrisma(args, options) {
     execPackage(`prisma ${args}`, _options);
     return;
   }
-  execSync(`node ${prismaPath} ${args}`, _options);
+  execSync(`node "${prismaPath}" ${args}`, _options);
 }
 __name(execPrisma, "execPrisma");
 
@@ -913,20 +914,23 @@ function handleSubProcessError2(err) {
 __name(handleSubProcessError2, "handleSubProcessError");
 
 // src/actions/proxy.ts
-import { isDataSource as isDataSource2 } from "@zenstackhq/language/ast";
 import { ZModelCodeGenerator } from "@zenstackhq/language";
+import { isDataSource as isDataSource2 } from "@zenstackhq/language/ast";
 import { getStringLiteral } from "@zenstackhq/language/utils";
-import { SqliteDialect } from "@zenstackhq/orm/dialects/sqlite";
-import { PostgresDialect } from "@zenstackhq/orm/dialects/postgres";
-import SQLite from "better-sqlite3";
-import { Pool } from "pg";
-import path9 from "path";
 import { ZenStackClient } from "@zenstackhq/orm";
+import { MysqlDialect } from "@zenstackhq/orm/dialects/mysql";
+import { PostgresDialect } from "@zenstackhq/orm/dialects/postgres";
+import { SqliteDialect } from "@zenstackhq/orm/dialects/sqlite";
 import { RPCApiHandler } from "@zenstackhq/server/api";
 import { ZenStackMiddleware } from "@zenstackhq/server/express";
-import express from "express";
+import SQLite from "better-sqlite3";
 import colors9 from "colors";
+import cors from "cors";
+import express from "express";
 import { createJiti as createJiti2 } from "jiti";
+import { createPool as createMysqlPool } from "mysql2";
+import path9 from "path";
+import { Pool as PgPool } from "pg";
 
 // src/utils/version-utils.ts
 import colors8 from "colors";
@@ -977,7 +981,6 @@ async function getLatestVersion() {
 __name(getLatestVersion, "getLatestVersion");
 
 // src/actions/proxy.ts
-import cors from "cors";
 async function run9(options) {
   const schemaFile = getSchemaFile(options.schema);
   console.log(colors9.gray(`Loading ZModel schema from: ${schemaFile}`));
@@ -1038,6 +1041,21 @@ function evaluateUrl(value) {
   }
 }
 __name(evaluateUrl, "evaluateUrl");
+function redactDatabaseUrl(url) {
+  try {
+    const parsedUrl = new URL(url);
+    if (parsedUrl.password) {
+      parsedUrl.password = "***";
+    }
+    if (parsedUrl.username) {
+      parsedUrl.username = "***";
+    }
+    return parsedUrl.toString();
+  } catch {
+    return url;
+  }
+}
+__name(redactDatabaseUrl, "redactDatabaseUrl");
 function createDialect(provider, databaseUrl, outputPath) {
   switch (provider) {
     case "sqlite": {
@@ -1054,12 +1072,17 @@ function createDialect(provider, databaseUrl, outputPath) {
       });
     }
     case "postgresql":
-      console.log(colors9.gray(`Connecting to PostgreSQL database at: ${databaseUrl}`));
+      console.log(colors9.gray(`Connecting to PostgreSQL database at: ${redactDatabaseUrl(databaseUrl)}`));
       return new PostgresDialect({
-        pool: new Pool({
+        pool: new PgPool({
           connectionString: databaseUrl
         })
       });
+    case "mysql":
+      console.log(colors9.gray(`Connecting to MySQL database at: ${redactDatabaseUrl(databaseUrl)}`));
+      return new MysqlDialect({
+        pool: createMysqlPool(databaseUrl)
+      });
     default:
       throw new CliError(`Unsupported database provider: ${provider}`);
   }
@@ -1091,6 +1114,14 @@ function startServer(client, schema, options) {
     console.log(`ZenStack proxy server is running on port: ${options.port}`);
     console.log(`You can visit ZenStack Studio at: ${colors9.blue("https://studio.zenstack.dev")}`);
   });
+  server.on("error", (err) => {
+    if (err.code === "EADDRINUSE") {
+      console.error(colors9.red(`Port ${options.port} is already in use. Please choose a different port using -p option.`));
+    } else {
+      throw new CliError(`Failed to start the server: ${err.message}`);
+    }
+    process.exit(1);
+  });
   process.on("SIGTERM", async () => {
     server.close(() => {
       console.log("\nZenStack proxy server closed");
@@ -1407,7 +1438,7 @@ Arguments following -- are passed to the seed script. E.g.: "zen db seed -- --us
   program.command("init").description("Initialize an existing project for ZenStack").argument("[path]", "project path", ".").addOption(noVersionCheckOption).action(initAction);
   program.command("check").description("Check a ZModel schema for syntax or semantic errors").addOption(schemaOption).addOption(noVersionCheckOption).action(checkAction);
   program.command("format").description("Format a ZModel schema file").addOption(schemaOption).addOption(noVersionCheckOption).action(formatAction);
-  program.command("proxy").alias("studio").description("Start the ZenStack proxy server").addOption(schemaOption).addOption(new Option("-p, --port <port>", "port to run the proxy server on").default(8008)).addOption(new Option("-o, --output <path>", "output directory for `zen generate` command")).addOption(new Option("-d, --databaseUrl <url>", "database connection URL")).addOption(new Option("-l, --logLevel <level>", "Query log levels (e.g., query, error)")).addOption(noVersionCheckOption).action(proxyAction);
+  program.command("proxy").alias("studio").description("Start the ZenStack proxy server").addOption(schemaOption).addOption(new Option("-p, --port <port>", "port to run the proxy server on").default(2311)).addOption(new Option("-o, --output <path>", "output directory for `zen generate` command")).addOption(new Option("-d, --databaseUrl <url>", "database connection URL")).addOption(new Option("-l, --logLevel <level>", "Query log levels (e.g., query, error)")).addOption(noVersionCheckOption).action(proxyAction);
   program.addHelpCommand("help [command]", "Display help for a command");
   program.hook("preAction", async (_thisCommand, actionCommand) => {
     if (actionCommand.getOptionValue("versionCheck") !== false) {