@zenstackhq/cli 3.3.1-beta.1 → 3.3.1

package/dist/index.js

@@ -914,8 +914,7 @@ function handleSubProcessError2(err) {
 __name(handleSubProcessError2, "handleSubProcessError");
 
 // src/actions/proxy.ts
-import { ZModelCodeGenerator } from "@zenstackhq/language";
-import { isDataSource as isDataSource2 } from "@zenstackhq/language/ast";
+import { isDataSource as isDataSource2, isInvocationExpr, isLiteralExpr } from "@zenstackhq/language/ast";
 import { getStringLiteral } from "@zenstackhq/language/utils";
 import { ZenStackClient } from "@zenstackhq/orm";
 import { MysqlDialect } from "@zenstackhq/orm/dialects/mysql";
@@ -982,6 +981,11 @@ __name(getLatestVersion, "getLatestVersion");
 
 // src/actions/proxy.ts
 async function run9(options) {
+  const allowedLogLevels = [
+    "error",
+    "query"
+  ];
+  const log = options.logLevel?.filter((level) => allowedLogLevels.includes(level));
   const schemaFile = getSchemaFile(options.schema);
   console.log(colors9.gray(`Loading ZModel schema from: ${schemaFile}`));
   let outputPath = getOutputPath(options, schemaFile);
@@ -996,19 +1000,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 ZModelCodeGenerator();
-    const url = zModelGenerator.generate(schemaUrl);
-    databaseUrl = evaluateUrl(url);
+    databaseUrl = evaluateUrl(schemaUrl);
   }
   const provider = getStringLiteral(dataSource?.fields.find((f) => f.name === "provider")?.value);
   const dialect = createDialect(provider, databaseUrl, outputPath);
   const jiti = createJiti2(import.meta.url);
   const schemaModule = await jiti.import(path9.join(outputPath, "schema"));
-  const allowedLogLevels = [
-    "error",
-    "query"
-  ];
-  const log = options.logLevel?.filter((level) => allowedLogLevels.includes(level));
   const db = new ZenStackClient(schemaModule.schema, {
     dialect,
     log: log && log.length > 0 ? log : void 0
@@ -1021,17 +1018,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 (isLiteralExpr(schemaUrl)) {
+    return getStringLiteral(schemaUrl);
+  } else if (isInvocationExpr(schemaUrl)) {
+    const envFunction = schemaUrl;
+    const envName = 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");
@@ -1140,7 +1139,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";