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

package/dist/index.cjs

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
+var import_config = require("dotenv/config");
 var import_language5 = require("@zenstackhq/language");
 var import_colors10 = __toESM(require("colors"), 1);
 var import_commander = require("commander");
@@ -243,7 +244,7 @@ function execPrisma(args, options) {
     execPackage(`prisma ${args}`, _options);
     return;
   }
-  execSync(`node ${prismaPath} ${args}`, _options);
+  execSync(`node "${prismaPath}" ${args}`, _options);
 }
 __name(execPrisma, "execPrisma");
 
@@ -930,20 +931,23 @@ function handleSubProcessError2(err) {
 __name(handleSubProcessError2, "handleSubProcessError");
 
 // src/actions/proxy.ts
-var import_ast3 = require("@zenstackhq/language/ast");
 var import_language4 = require("@zenstackhq/language");
+var import_ast3 = require("@zenstackhq/language/ast");
 var import_utils2 = require("@zenstackhq/language/utils");
-var import_sqlite = require("@zenstackhq/orm/dialects/sqlite");
-var import_postgres = require("@zenstackhq/orm/dialects/postgres");
-var import_better_sqlite3 = __toESM(require("better-sqlite3"), 1);
-var import_pg = require("pg");
-var import_node_path9 = __toESM(require("path"), 1);
 var import_orm = require("@zenstackhq/orm");
+var import_mysql = require("@zenstackhq/orm/dialects/mysql");
+var import_postgres = require("@zenstackhq/orm/dialects/postgres");
+var import_sqlite = require("@zenstackhq/orm/dialects/sqlite");
 var import_api = require("@zenstackhq/server/api");
 var import_express = require("@zenstackhq/server/express");
-var import_express2 = __toESM(require("express"), 1);
+var import_better_sqlite3 = __toESM(require("better-sqlite3"), 1);
 var import_colors9 = __toESM(require("colors"), 1);
+var import_cors = __toESM(require("cors"), 1);
+var import_express2 = __toESM(require("express"), 1);
 var import_jiti2 = require("jiti");
+var import_mysql2 = require("mysql2");
+var import_node_path9 = __toESM(require("path"), 1);
+var import_pg = require("pg");
 
 // src/utils/version-utils.ts
 var import_colors8 = __toESM(require("colors"), 1);
@@ -995,7 +999,6 @@ async function getLatestVersion() {
 __name(getLatestVersion, "getLatestVersion");
 
 // src/actions/proxy.ts
-var import_cors = __toESM(require("cors"), 1);
 var import_meta3 = {};
 async function run9(options) {
   const schemaFile = getSchemaFile(options.schema);
@@ -1057,6 +1060,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": {
@@ -1073,12 +1091,17 @@ function createDialect(provider, databaseUrl, outputPath) {
       });
     }
     case "postgresql":
-      console.log(import_colors9.default.gray(`Connecting to PostgreSQL database at: ${databaseUrl}`));
+      console.log(import_colors9.default.gray(`Connecting to PostgreSQL database at: ${redactDatabaseUrl(databaseUrl)}`));
       return new import_postgres.PostgresDialect({
         pool: new import_pg.Pool({
           connectionString: databaseUrl
         })
       });
+    case "mysql":
+      console.log(import_colors9.default.gray(`Connecting to MySQL database at: ${redactDatabaseUrl(databaseUrl)}`));
+      return new import_mysql.MysqlDialect({
+        pool: (0, import_mysql2.createPool)(databaseUrl)
+      });
     default:
       throw new CliError(`Unsupported database provider: ${provider}`);
   }
@@ -1110,6 +1133,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: ${import_colors9.default.blue("https://studio.zenstack.dev")}`);
   });
+  server.on("error", (err) => {
+    if (err.code === "EADDRINUSE") {
+      console.error(import_colors9.default.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");
@@ -1427,7 +1458,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 import_commander.Option("-p, --port <port>", "port to run the proxy server on").default(8008)).addOption(new import_commander.Option("-o, --output <path>", "output directory for `zen generate` command")).addOption(new import_commander.Option("-d, --databaseUrl <url>", "database connection URL")).addOption(new import_commander.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 import_commander.Option("-p, --port <port>", "port to run the proxy server on").default(2311)).addOption(new import_commander.Option("-o, --output <path>", "output directory for `zen generate` command")).addOption(new import_commander.Option("-d, --databaseUrl <url>", "database connection URL")).addOption(new import_commander.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) {