@zenstackhq/cli 3.3.0-beta.4 → 3.3.0

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";
@@ -1021,25 +1022,34 @@ async function run9(options) {
 }
 __name(run9, "run");
 function evaluateUrl(value) {
-  const env2 = /* @__PURE__ */ __name((varName) => {
+  const envMatch = value.trim().match(/^env\s*\(\s*['"]([^'"]+)['"]\s*\)$/);
+  if (envMatch) {
+    const varName = envMatch[1];
     const envValue = process.env[varName];
     if (!envValue) {
       throw new CliError(`Environment variable ${varName} is not set`);
     }
     return envValue;
-  }, "env");
+  } else {
+    return value;
+  }
+}
+__name(evaluateUrl, "evaluateUrl");
+function redactDatabaseUrl(url) {
   try {
-    const urlFn = new Function("env", `return ${value}`);
-    const url = urlFn(env2);
-    return url;
-  } catch (err) {
-    if (err instanceof CliError) {
-      throw err;
+    const parsedUrl = new URL(url);
+    if (parsedUrl.password) {
+      parsedUrl.password = "***";
+    }
+    if (parsedUrl.username) {
+      parsedUrl.username = "***";
     }
-    throw new CliError("Could not evaluate datasource url from schema, you could provide it via -d option.");
+    return parsedUrl.toString();
+  } catch {
+    return url;
   }
 }
-__name(evaluateUrl, "evaluateUrl");
+__name(redactDatabaseUrl, "redactDatabaseUrl");
 function createDialect(provider, databaseUrl, outputPath) {
   switch (provider) {
     case "sqlite": {
@@ -1056,14 +1066,14 @@ 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 PgPool({
           connectionString: databaseUrl
         })
       });
     case "mysql":
-      console.log(colors9.gray(`Connecting to MySQL database at: ${databaseUrl}`));
+      console.log(colors9.gray(`Connecting to MySQL database at: ${redactDatabaseUrl(databaseUrl)}`));
       return new MysqlDialect({
         pool: createMysqlPool(databaseUrl)
       });
@@ -1098,6 +1108,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");
@@ -1122,7 +1140,7 @@ import fs13 from "fs";
 import * as os2 from "os";
 
 // src/constants.ts
-var TELEMETRY_TRACKING_TOKEN = "<TELEMETRY_TRACKING_TOKEN>";
+var TELEMETRY_TRACKING_TOKEN = "74944eb779d7d3b4ce185be843fde9fc";
 
 // src/utils/is-ci.ts
 import { env } from "process";
@@ -1414,7 +1432,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) {