@zenstackhq/cli 3.3.1-beta.2 → 3.3.2-beta.1

package/dist/index.cjs

@@ -29,7 +29,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_language4 = require("@zenstackhq/language");
 var import_colors10 = __toESM(require("colors"), 1);
 var import_commander = require("commander");
 
@@ -931,7 +931,6 @@ function handleSubProcessError2(err) {
 __name(handleSubProcessError2, "handleSubProcessError");
 
 // src/actions/proxy.ts
-var import_language4 = require("@zenstackhq/language");
 var import_ast3 = require("@zenstackhq/language/ast");
 var import_utils2 = require("@zenstackhq/language/utils");
 var import_orm = require("@zenstackhq/orm");
@@ -1001,6 +1000,11 @@ __name(getLatestVersion, "getLatestVersion");
 // src/actions/proxy.ts
 var import_meta3 = {};
 async function run9(options) {
+  const allowedLogLevels = [
+    "error",
+    "query"
+  ];
+  const log = options.logLevel?.filter((level) => allowedLogLevels.includes(level));
   const schemaFile = getSchemaFile(options.schema);
   console.log(import_colors9.default.gray(`Loading ZModel schema from: ${schemaFile}`));
   let outputPath = getOutputPath(options, schemaFile);
@@ -1015,19 +1019,12 @@ async function run9(options) {
     if (!schemaUrl) {
       throw new CliError(`The schema's "datasource" does not have a "url" field, please provide it with -d option.`);
     }
-    const zModelGenerator = new import_language4.ZModelCodeGenerator();
-    const url = zModelGenerator.generate(schemaUrl);
-    databaseUrl = evaluateUrl(url);
+    databaseUrl = evaluateUrl(schemaUrl);
   }
   const provider = (0, import_utils2.getStringLiteral)(dataSource?.fields.find((f) => f.name === "provider")?.value);
   const dialect = createDialect(provider, databaseUrl, outputPath);
   const jiti = (0, import_jiti2.createJiti)(import_meta3.url);
   const schemaModule = await jiti.import(import_node_path9.default.join(outputPath, "schema"));
-  const allowedLogLevels = [
-    "error",
-    "query"
-  ];
-  const log = options.logLevel?.filter((level) => allowedLogLevels.includes(level));
   const db = new import_orm.ZenStackClient(schemaModule.schema, {
     dialect,
     log: log && log.length > 0 ? log : void 0
@@ -1040,17 +1037,19 @@ async function run9(options) {
   startServer(db, schemaModule.schema, options);
 }
 __name(run9, "run");
-function evaluateUrl(value) {
-  const envMatch = value.trim().match(/^env\s*\(\s*['"]([^'"]+)['"]\s*\)$/);
-  if (envMatch) {
-    const varName = envMatch[1];
-    const envValue = process.env[varName];
+function evaluateUrl(schemaUrl) {
+  if ((0, import_ast3.isLiteralExpr)(schemaUrl)) {
+    return (0, import_utils2.getStringLiteral)(schemaUrl);
+  } else if ((0, import_ast3.isInvocationExpr)(schemaUrl)) {
+    const envFunction = schemaUrl;
+    const envName = (0, import_utils2.getStringLiteral)(envFunction.args[0]?.value);
+    const envValue = process.env[envName];
     if (!envValue) {
-      throw new CliError(`Environment variable ${varName} is not set`);
+      throw new CliError(`Environment variable ${envName} is not set`);
     }
     return envValue;
   } else {
-    return value;
+    throw new CliError(`Unable to resolve the "url" field value.`);
   }
 }
 __name(evaluateUrl, "evaluateUrl");
@@ -1422,7 +1421,7 @@ var proxyAction = /* @__PURE__ */ __name(async (options) => {
 }, "proxyAction");
 function createProgram() {
   const program = new import_commander.Command("zen").alias("zenstack").helpOption("-h, --help", "Show this help message").version(getVersion(), "-v --version", "Show CLI version");
-  const schemaExtensions = import_language5.ZModelLanguageMetaData.fileExtensions.join(", ");
+  const schemaExtensions = import_language4.ZModelLanguageMetaData.fileExtensions.join(", ");
   program.description(`${import_colors10.default.bold.blue("\u03B6")} ZenStack is the modern data layer for TypeScript apps.
 
 Documentation: https://zenstack.dev/docs`).showHelpAfterError().showSuggestionAfterError();