@zenstackhq/cli 3.0.0-beta.23 → 3.0.0-beta.24

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @zenstackhq/cli@3.0.0-beta.23 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
+> @zenstackhq/cli@3.0.0-beta.24 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
 > tsc --noEmit && tsup-node
 
 CLI Building entry: {"index":"src/index.ts"}
@@ -10,31 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-[warn] ▲ [WARNING] "import.meta" is not available with the "cjs" output format and will be empty [empty-import-meta]
-
-    src/utils/exec-utils.ts:28:15:
-      28 │     if (typeof import.meta.resolve === 'function') {
-         ╵                ~~~~~~~~~~~
-
-  You need to set the output format to "esm" for "import.meta" to work correctly.
-
-
-[warn] ▲ [WARNING] "import.meta" is not available with the "cjs" output format and will be empty [empty-import-meta]
-
-    src/utils/exec-utils.ts:30:35:
-      30 │ ...rismaPath = fileURLToPath(import.meta.resolve('prisma/build/ind...
-         ╵                              ~~~~~~~~~~~
-
-  You need to set the output format to "esm" for "import.meta" to work correctly.
-
-
-ESM dist/index.js     33.49 KB
-ESM dist/index.js.map 70.32 KB
-ESM ⚡️ Build success in 195ms
-CJS dist/index.cjs     37.29 KB
-CJS dist/index.cjs.map 70.85 KB
-CJS ⚡️ Build success in 196ms
+ESM dist/index.js     35.39 KB
+ESM dist/index.js.map 74.24 KB
+ESM ⚡️ Build success in 184ms
+CJS dist/index.cjs     39.33 KB
+CJS dist/index.cjs.map 74.81 KB
+CJS ⚡️ Build success in 188ms
 DTS Build start
-DTS ⚡️ Build success in 3661ms
+DTS ⚡️ Build success in 3367ms
 DTS dist/index.d.ts  13.00 B
 DTS dist/index.d.cts 13.00 B

package/dist/index.cjs

@@ -28,41 +28,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var import_language2 = require("@zenstackhq/language");
-var import_colors7 = __toESM(require("colors"), 1);
+var import_language3 = require("@zenstackhq/language");
+var import_colors8 = __toESM(require("colors"), 1);
 var import_commander = require("commander");
 
-// src/actions/db.ts
-var import_node_fs2 = __toESM(require("fs"), 1);
-
-// src/utils/exec-utils.ts
-var import_child_process = require("child_process");
-var import_url = require("url");
-var import_meta = {};
-function execSync(cmd, options) {
-  const { env: env2, ...restOptions } = options ?? {};
-  const mergedEnv = env2 ? {
-    ...process.env,
-    ...env2
-  } : void 0;
-  (0, import_child_process.execSync)(cmd, {
-    encoding: "utf-8",
-    stdio: options?.stdio ?? "inherit",
-    env: mergedEnv,
-    ...restOptions
-  });
-}
-__name(execSync, "execSync");
-function execPrisma(args, options) {
-  let prismaPath;
-  if (typeof import_meta.resolve === "function") {
-    prismaPath = (0, import_url.fileURLToPath)(import_meta.resolve("prisma/build/index.js"));
-  } else {
-    prismaPath = require.resolve("prisma/build/index.js");
-  }
-  execSync(`node ${prismaPath} ${args}`, options);
-}
-__name(execPrisma, "execPrisma");
+// src/actions/check.ts
+var import_colors2 = __toESM(require("colors"), 1);
 
 // src/actions/action-utils.ts
 var import_language = require("@zenstackhq/language");
@@ -102,12 +73,12 @@ function getSchemaFile(file) {
       return pkgJsonConfig.schema;
     }
   }
-  if (import_node_fs.default.existsSync("./zenstack/schema.zmodel")) {
-    return "./zenstack/schema.zmodel";
-  } else if (import_node_fs.default.existsSync("./schema.zmodel")) {
+  if (import_node_fs.default.existsSync("./schema.zmodel")) {
     return "./schema.zmodel";
+  } else if (import_node_fs.default.existsSync("./zenstack/schema.zmodel")) {
+    return "./zenstack/schema.zmodel";
   } else {
-    throw new CliError('Schema file not found in default locations ("./zenstack/schema.zmodel" or "./schema.zmodel").');
+    throw new CliError('Schema file not found in default locations ("./schema.zmodel" or "./zenstack/schema.zmodel").');
   }
 }
 __name(getSchemaFile, "getSchemaFile");
@@ -190,15 +161,72 @@ function findUp(names, cwd = process.cwd(), multiple = false, result = []) {
 }
 __name(findUp, "findUp");
 
+// src/actions/check.ts
+async function run(options) {
+  const schemaFile = getSchemaFile(options.schema);
+  try {
+    await loadSchemaDocument(schemaFile);
+    console.log(import_colors2.default.green("\u2713 Schema validation completed successfully."));
+  } catch (error) {
+    console.error(import_colors2.default.red("\u2717 Schema validation failed."));
+    throw error;
+  }
+}
+__name(run, "run");
+
+// src/actions/db.ts
+var import_node_fs2 = __toESM(require("fs"), 1);
+
+// src/utils/exec-utils.ts
+var import_child_process = require("child_process");
+var import_url = require("url");
+var import_meta = {};
+function execSync(cmd, options) {
+  const { env: env2, ...restOptions } = options ?? {};
+  const mergedEnv = env2 ? {
+    ...process.env,
+    ...env2
+  } : void 0;
+  (0, import_child_process.execSync)(cmd, {
+    encoding: "utf-8",
+    stdio: options?.stdio ?? "inherit",
+    env: mergedEnv,
+    ...restOptions
+  });
+}
+__name(execSync, "execSync");
+function execPackage(cmd, options) {
+  const packageManager = process?.versions?.["bun"] ? "bunx" : "npx";
+  execSync(`${packageManager} ${cmd}`, options);
+}
+__name(execPackage, "execPackage");
+function execPrisma(args, options) {
+  let prismaPath;
+  try {
+    if (typeof import_meta.resolve === "function") {
+      prismaPath = (0, import_url.fileURLToPath)(import_meta.resolve("prisma/build/index.js"));
+    } else {
+      prismaPath = require.resolve("prisma/build/index.js");
+    }
+  } catch {
+  }
+  if (!prismaPath) {
+    execPackage(`prisma ${args}`, options);
+    return;
+  }
+  execSync(`node ${prismaPath} ${args}`, options);
+}
+__name(execPrisma, "execPrisma");
+
 // src/actions/db.ts
-async function run(command, options) {
+async function run2(command, options) {
   switch (command) {
     case "push":
       await runPush(options);
       break;
   }
 }
-__name(run, "run");
+__name(run2, "run");
 async function runPush(options) {
   const schemaFile = getSchemaFile(options.schema);
   const prismaSchemaFile = await generateTempPrismaSchema(schemaFile);
@@ -223,11 +251,29 @@ async function runPush(options) {
 }
 __name(runPush, "runPush");
 
+// src/actions/format.ts
+var import_language2 = require("@zenstackhq/language");
+var import_colors3 = __toESM(require("colors"), 1);
+var import_node_fs3 = __toESM(require("fs"), 1);
+async function run3(options) {
+  const schemaFile = getSchemaFile(options.schema);
+  let formattedContent;
+  try {
+    formattedContent = await (0, import_language2.formatDocument)(import_node_fs3.default.readFileSync(schemaFile, "utf-8"));
+  } catch (error) {
+    console.error(import_colors3.default.red("\u2717 Schema formatting failed."));
+    throw error;
+  }
+  import_node_fs3.default.writeFileSync(schemaFile, formattedContent, "utf-8");
+  console.log(import_colors3.default.green("\u2713 Schema formatting completed successfully."));
+}
+__name(run3, "run");
+
 // src/actions/generate.ts
 var import_common_helpers = require("@zenstackhq/common-helpers");
 var import_ast2 = require("@zenstackhq/language/ast");
 var import_utils = require("@zenstackhq/language/utils");
-var import_colors2 = __toESM(require("colors"), 1);
+var import_colors4 = __toESM(require("colors"), 1);
 var import_node_path4 = __toESM(require("path"), 1);
 var import_ora = __toESM(require("ora"), 1);
 
@@ -240,7 +286,7 @@ __export(plugins_exports, {
 
 // src/plugins/prisma.ts
 var import_sdk2 = require("@zenstackhq/sdk");
-var import_node_fs3 = __toESM(require("fs"), 1);
+var import_node_fs4 = __toESM(require("fs"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
 var plugin = {
   name: "Prisma Schema Generator",
@@ -249,21 +295,21 @@ var plugin = {
     let outFile = import_node_path2.default.join(defaultOutputPath, "schema.prisma");
     if (typeof pluginOptions["output"] === "string") {
       outFile = import_node_path2.default.resolve(defaultOutputPath, pluginOptions["output"]);
-      if (!import_node_fs3.default.existsSync(import_node_path2.default.dirname(outFile))) {
-        import_node_fs3.default.mkdirSync(import_node_path2.default.dirname(outFile), {
+      if (!import_node_fs4.default.existsSync(import_node_path2.default.dirname(outFile))) {
+        import_node_fs4.default.mkdirSync(import_node_path2.default.dirname(outFile), {
           recursive: true
         });
       }
     }
     const prismaSchema = await new import_sdk2.PrismaSchemaGenerator(model).generate();
-    import_node_fs3.default.writeFileSync(outFile, prismaSchema);
+    import_node_fs4.default.writeFileSync(outFile, prismaSchema);
   }
 };
 var prisma_default = plugin;
 
 // src/plugins/typescript.ts
 var import_sdk3 = require("@zenstackhq/sdk");
-var import_node_fs4 = __toESM(require("fs"), 1);
+var import_node_fs5 = __toESM(require("fs"), 1);
 var import_node_path3 = __toESM(require("path"), 1);
 var plugin2 = {
   name: "TypeScript Schema Generator",
@@ -272,32 +318,37 @@ var plugin2 = {
     let outDir = defaultOutputPath;
     if (typeof pluginOptions["output"] === "string") {
       outDir = import_node_path3.default.resolve(defaultOutputPath, pluginOptions["output"]);
-      if (!import_node_fs4.default.existsSync(outDir)) {
-        import_node_fs4.default.mkdirSync(outDir, {
+      if (!import_node_fs5.default.existsSync(outDir)) {
+        import_node_fs5.default.mkdirSync(outDir, {
           recursive: true
         });
       }
     }
     const lite = pluginOptions["lite"] === true;
     const liteOnly = pluginOptions["liteOnly"] === true;
+    const importWithFileExtension = pluginOptions["importWithFileExtension"];
+    if (importWithFileExtension && typeof importWithFileExtension !== "string") {
+      throw new Error('The "importWithFileExtension" option must be a string if specified.');
+    }
     await new import_sdk3.TsSchemaGenerator().generate(model, {
       outDir,
       lite,
-      liteOnly
+      liteOnly,
+      importWithFileExtension
     });
   }
 };
 var typescript_default = plugin2;
 
 // src/actions/generate.ts
-async function run2(options) {
+async function run4(options) {
   const start = Date.now();
   const schemaFile = getSchemaFile(options.schema);
   const model = await loadSchemaDocument(schemaFile);
   const outputPath = getOutputPath(options, schemaFile);
   await runPlugins(schemaFile, model, outputPath, options);
   if (!options.silent) {
-    console.log(import_colors2.default.green(`Generation completed successfully in ${Date.now() - start}ms.
+    console.log(import_colors4.default.green(`Generation completed successfully in ${Date.now() - start}ms.
 `));
     console.log(`You can now create a ZenStack client with it.
 
@@ -313,7 +364,7 @@ const client = new ZenStackClient(schema, {
 Check documentation: https://zenstack.dev/docs/3.x`);
   }
 }
-__name(run2, "run");
+__name(run4, "run");
 function getOutputPath(options, schemaFile) {
   if (options.output) {
     return options.output;
@@ -348,9 +399,18 @@ async function runPlugins(schemaFile, model, outputPath, options) {
       }
     }
     if (cliPlugin) {
+      const pluginOptions = getPluginOptions(plugin3);
+      if (provider === "@core/typescript") {
+        if (pluginOptions["lite"] === void 0) {
+          pluginOptions["lite"] = options.lite;
+        }
+        if (pluginOptions["liteOnly"] === void 0) {
+          pluginOptions["liteOnly"] = options.liteOnly;
+        }
+      }
       processedPlugins.push({
         cliPlugin,
-        pluginOptions: getPluginOptions(plugin3)
+        pluginOptions
       });
     }
   }
@@ -417,9 +477,9 @@ function getPluginOptions(plugin3) {
 __name(getPluginOptions, "getPluginOptions");
 
 // src/actions/info.ts
-var import_colors3 = __toESM(require("colors"), 1);
+var import_colors5 = __toESM(require("colors"), 1);
 var import_node_path5 = __toESM(require("path"), 1);
-async function run3(projectPath) {
+async function run5(projectPath) {
   const packages = await getZenStackPackages(projectPath);
   if (!packages) {
     console.error("Unable to locate package.json. Are you in a valid project directory?");
@@ -431,13 +491,13 @@ async function run3(projectPath) {
     if (version2) {
       versions.add(version2);
     }
-    console.log(`    ${import_colors3.default.green(pkg.padEnd(20))}	${version2}`);
+    console.log(`    ${import_colors5.default.green(pkg.padEnd(20))}	${version2}`);
   }
   if (versions.size > 1) {
-    console.warn(import_colors3.default.yellow("WARNING: Multiple versions of Zenstack packages detected. This may cause issues."));
+    console.warn(import_colors5.default.yellow("WARNING: Multiple versions of Zenstack packages detected. This may cause issues."));
   }
 }
-__name(run3, "run");
+__name(run5, "run");
 async function getZenStackPackages(projectPath) {
   let pkgJson;
   const resolvedPath = import_node_path5.default.resolve(projectPath);
@@ -480,8 +540,8 @@ async function getZenStackPackages(projectPath) {
 __name(getZenStackPackages, "getZenStackPackages");
 
 // src/actions/init.ts
-var import_colors4 = __toESM(require("colors"), 1);
-var import_node_fs5 = __toESM(require("fs"), 1);
+var import_colors6 = __toESM(require("colors"), 1);
+var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
 var import_ora2 = __toESM(require("ora"), 1);
 var import_package_manager_detector = require("package-manager-detector");
@@ -516,7 +576,7 @@ model Post {
 `;
 
 // src/actions/init.ts
-async function run4(projectPath) {
+async function run6(projectPath) {
   const packages = [
     {
       name: "@zenstackhq/cli@next",
@@ -534,7 +594,7 @@ async function run4(projectPath) {
       name: "npm"
     };
   }
-  console.log(import_colors4.default.gray(`Using package manager: ${pm.agent}`));
+  console.log(import_colors6.default.gray(`Using package manager: ${pm.agent}`));
   for (const pkg of packages) {
     const resolved = (0, import_package_manager_detector.resolveCommand)(pm.agent, "install", [
       pkg.name,
@@ -557,24 +617,24 @@ async function run4(projectPath) {
     }
   }
   const generationFolder = "zenstack";
-  if (!import_node_fs5.default.existsSync(import_node_path6.default.join(projectPath, generationFolder))) {
-    import_node_fs5.default.mkdirSync(import_node_path6.default.join(projectPath, generationFolder));
+  if (!import_node_fs6.default.existsSync(import_node_path6.default.join(projectPath, generationFolder))) {
+    import_node_fs6.default.mkdirSync(import_node_path6.default.join(projectPath, generationFolder));
   }
-  if (!import_node_fs5.default.existsSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"))) {
-    import_node_fs5.default.writeFileSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"), STARTER_ZMODEL);
+  if (!import_node_fs6.default.existsSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"))) {
+    import_node_fs6.default.writeFileSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"), STARTER_ZMODEL);
   } else {
-    console.log(import_colors4.default.yellow("Schema file already exists. Skipping generation of sample."));
+    console.log(import_colors6.default.yellow("Schema file already exists. Skipping generation of sample."));
   }
-  console.log(import_colors4.default.green("ZenStack project initialized successfully!"));
-  console.log(import_colors4.default.gray(`See "${generationFolder}/schema.zmodel" for your database schema.`));
-  console.log(import_colors4.default.gray("Run `zenstack generate` to compile the the schema into a TypeScript file."));
+  console.log(import_colors6.default.green("ZenStack project initialized successfully!"));
+  console.log(import_colors6.default.gray(`See "${generationFolder}/schema.zmodel" for your database schema.`));
+  console.log(import_colors6.default.gray("Run `zenstack generate` to compile the the schema into a TypeScript file."));
 }
-__name(run4, "run");
+__name(run6, "run");
 
 // src/actions/migrate.ts
-var import_node_fs6 = __toESM(require("fs"), 1);
+var import_node_fs7 = __toESM(require("fs"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
-async function run5(command, options) {
+async function run7(command, options) {
   const schemaFile = getSchemaFile(options.schema);
   const prismaSchemaDir = options.migrations ? import_node_path7.default.dirname(options.migrations) : void 0;
   const prismaSchemaFile = await generateTempPrismaSchema(schemaFile, prismaSchemaDir);
@@ -597,12 +657,12 @@ async function run5(command, options) {
         break;
     }
   } finally {
-    if (import_node_fs6.default.existsSync(prismaSchemaFile)) {
-      import_node_fs6.default.unlinkSync(prismaSchemaFile);
+    if (import_node_fs7.default.existsSync(prismaSchemaFile)) {
+      import_node_fs7.default.unlinkSync(prismaSchemaFile);
     }
   }
 }
-__name(run5, "run");
+__name(run7, "run");
 function runDev(prismaSchemaFile, options) {
   try {
     const cmd = [
@@ -678,24 +738,10 @@ function handleSubProcessError2(err) {
 }
 __name(handleSubProcessError2, "handleSubProcessError");
 
-// src/actions/check.ts
-var import_colors5 = __toESM(require("colors"), 1);
-async function run6(options) {
-  const schemaFile = getSchemaFile(options.schema);
-  try {
-    await loadSchemaDocument(schemaFile);
-    console.log(import_colors5.default.green("\u2713 Schema validation completed successfully."));
-  } catch (error) {
-    console.error(import_colors5.default.red("\u2717 Schema validation failed."));
-    throw error;
-  }
-}
-__name(run6, "run");
-
 // src/telemetry.ts
 var import_mixpanel = require("mixpanel");
 var import_node_crypto2 = require("crypto");
-var import_node_fs11 = __toESM(require("fs"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
 var os2 = __toESM(require("os"), 1);
 
 // src/constants.ts
@@ -706,14 +752,14 @@ var import_node_process = require("process");
 var isInCi = import_node_process.env["CI"] !== "0" && import_node_process.env["CI"] !== "false" && ("CI" in import_node_process.env || "CONTINUOUS_INTEGRATION" in import_node_process.env || Object.keys(import_node_process.env).some((key) => key.startsWith("CI_")));
 
 // src/utils/is-container.ts
-var import_node_fs8 = __toESM(require("fs"), 1);
+var import_node_fs9 = __toESM(require("fs"), 1);
 
 // src/utils/is-docker.ts
-var import_node_fs7 = __toESM(require("fs"), 1);
+var import_node_fs8 = __toESM(require("fs"), 1);
 var isDockerCached;
 function hasDockerEnv() {
   try {
-    import_node_fs7.default.statSync("/.dockerenv");
+    import_node_fs8.default.statSync("/.dockerenv");
     return true;
   } catch {
     return false;
@@ -722,7 +768,7 @@ function hasDockerEnv() {
 __name(hasDockerEnv, "hasDockerEnv");
 function hasDockerCGroup() {
   try {
-    return import_node_fs7.default.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
+    return import_node_fs8.default.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
   } catch {
     return false;
   }
@@ -740,7 +786,7 @@ __name(isDocker, "isDocker");
 var cachedResult;
 var hasContainerEnv = /* @__PURE__ */ __name(() => {
   try {
-    import_node_fs8.default.statSync("/run/.containerenv");
+    import_node_fs9.default.statSync("/run/.containerenv");
     return true;
   } catch {
     return false;
@@ -757,7 +803,7 @@ __name(isInContainer, "isInContainer");
 // src/utils/is-wsl.ts
 var import_node_process2 = __toESM(require("process"), 1);
 var import_node_os = __toESM(require("os"), 1);
-var import_node_fs9 = __toESM(require("fs"), 1);
+var import_node_fs10 = __toESM(require("fs"), 1);
 var isWsl = /* @__PURE__ */ __name(() => {
   if (import_node_process2.default.platform !== "linux") {
     return false;
@@ -766,7 +812,7 @@ var isWsl = /* @__PURE__ */ __name(() => {
     return true;
   }
   try {
-    return import_node_fs9.default.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft");
+    return import_node_fs10.default.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft");
   } catch {
     return false;
   }
@@ -830,8 +876,8 @@ function getMachineId() {
 __name(getMachineId, "getMachineId");
 
 // src/utils/version-utils.ts
-var import_colors6 = __toESM(require("colors"), 1);
-var import_node_fs10 = __toESM(require("fs"), 1);
+var import_colors7 = __toESM(require("colors"), 1);
+var import_node_fs11 = __toESM(require("fs"), 1);
 var import_node_path8 = __toESM(require("path"), 1);
 var import_node_url = require("url");
 var import_semver = __toESM(require("semver"), 1);
@@ -841,7 +887,7 @@ var VERSION_CHECK_TAG = "next";
 function getVersion() {
   try {
     const _dirname = typeof __dirname !== "undefined" ? __dirname : import_node_path8.default.dirname((0, import_node_url.fileURLToPath)(import_meta2.url));
-    return JSON.parse(import_node_fs10.default.readFileSync(import_node_path8.default.join(_dirname, "../package.json"), "utf8")).version;
+    return JSON.parse(import_node_fs11.default.readFileSync(import_node_path8.default.join(_dirname, "../package.json"), "utf8")).version;
   } catch {
     return void 0;
   }
@@ -856,7 +902,7 @@ async function checkNewVersion() {
     return;
   }
   if (latestVersion && currVersion && import_semver.default.gt(latestVersion, currVersion)) {
-    console.log(`A newer version ${import_colors6.default.cyan(latestVersion)} is available.`);
+    console.log(`A newer version ${import_colors7.default.cyan(latestVersion)} is available.`);
   }
 }
 __name(checkNewVersion, "checkNewVersion");
@@ -972,7 +1018,7 @@ var Telemetry = class {
     try {
       const packageJsonPath = import_meta3.resolve("prisma/package.json");
       const packageJsonUrl = new URL(packageJsonPath);
-      const packageJson = JSON.parse(import_node_fs11.default.readFileSync(packageJsonUrl, "utf8"));
+      const packageJson = JSON.parse(import_node_fs12.default.readFileSync(packageJsonUrl, "utf8"));
       return packageJson.version;
     } catch {
       return void 0;
@@ -983,45 +1029,49 @@ var telemetry = new Telemetry();
 
 // src/index.ts
 var generateAction = /* @__PURE__ */ __name(async (options) => {
-  await telemetry.trackCommand("generate", () => run2(options));
+  await telemetry.trackCommand("generate", () => run4(options));
 }, "generateAction");
 var migrateAction = /* @__PURE__ */ __name(async (subCommand, options) => {
-  await telemetry.trackCommand(`migrate ${subCommand}`, () => run5(subCommand, options));
+  await telemetry.trackCommand(`migrate ${subCommand}`, () => run7(subCommand, options));
 }, "migrateAction");
 var dbAction = /* @__PURE__ */ __name(async (subCommand, options) => {
-  await telemetry.trackCommand(`db ${subCommand}`, () => run(subCommand, options));
+  await telemetry.trackCommand(`db ${subCommand}`, () => run2(subCommand, options));
 }, "dbAction");
 var infoAction = /* @__PURE__ */ __name(async (projectPath) => {
-  await telemetry.trackCommand("info", () => run3(projectPath));
+  await telemetry.trackCommand("info", () => run5(projectPath));
 }, "infoAction");
 var initAction = /* @__PURE__ */ __name(async (projectPath) => {
-  await telemetry.trackCommand("init", () => run4(projectPath));
+  await telemetry.trackCommand("init", () => run6(projectPath));
 }, "initAction");
 var checkAction = /* @__PURE__ */ __name(async (options) => {
-  await telemetry.trackCommand("check", () => run6(options));
+  await telemetry.trackCommand("check", () => run(options));
 }, "checkAction");
+var formatAction = /* @__PURE__ */ __name(async (options) => {
+  await telemetry.trackCommand("format", () => run3(options));
+}, "formatAction");
 function createProgram() {
-  const program = new import_commander.Command("zen");
-  program.version(getVersion(), "-v --version", "display CLI version");
-  const schemaExtensions = import_language2.ZModelLanguageMetaData.fileExtensions.join(", ");
-  program.description(`${import_colors7.default.bold.blue("\u03B6")} ZenStack is the data layer for modern TypeScript apps.
+  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_language3.ZModelLanguageMetaData.fileExtensions.join(", ");
+  program.description(`${import_colors8.default.bold.blue("\u03B6")} ZenStack is the data layer for modern TypeScript apps.
 
 Documentation: https://zenstack.dev/docs/3.x`).showHelpAfterError().showSuggestionAfterError();
   const schemaOption = new import_commander.Option("--schema <file>", `schema file (with extension ${schemaExtensions}). Defaults to "zenstack/schema.zmodel" unless specified in package.json.`);
   const noVersionCheckOption = new import_commander.Option("--no-version-check", "do not check for new version");
-  program.command("generate").description("Run code generation plugins.").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new import_commander.Option("-o, --output <path>", "default output directory for code generation")).addOption(new import_commander.Option("--lite", "also generate a lite version of schema without attributes").default(false)).addOption(new import_commander.Option("--lite-only", "only generate lite version of schema without attributes").default(false)).addOption(new import_commander.Option("--silent", "suppress all output except errors").default(false)).action(generateAction);
+  program.command("generate").description("Run code generation plugins").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new import_commander.Option("-o, --output <path>", "default output directory for code generation")).addOption(new import_commander.Option("--lite", "also generate a lite version of schema without attributes").default(false)).addOption(new import_commander.Option("--lite-only", "only generate lite version of schema without attributes").default(false)).addOption(new import_commander.Option("--silent", "suppress all output except errors").default(false)).action(generateAction);
   const migrateCommand = program.command("migrate").description("Run database schema migration related tasks.");
   const migrationsOption = new import_commander.Option("--migrations <path>", 'path that contains the "migrations" directory');
-  migrateCommand.command("dev").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new import_commander.Option("-n, --name <name>", "migration name")).addOption(new import_commander.Option("--create-only", "only create migration, do not apply")).addOption(migrationsOption).description("Create a migration from changes in schema and apply it to the database.").action((options) => migrateAction("dev", options));
-  migrateCommand.command("reset").addOption(schemaOption).addOption(new import_commander.Option("--force", "skip the confirmation prompt")).addOption(migrationsOption).addOption(noVersionCheckOption).description("Reset your database and apply all migrations, all data will be lost.").action((options) => migrateAction("reset", options));
-  migrateCommand.command("deploy").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).description("Deploy your pending migrations to your production/staging database.").action((options) => migrateAction("deploy", options));
-  migrateCommand.command("status").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).description("Check the status of your database migrations.").action((options) => migrateAction("status", options));
-  migrateCommand.command("resolve").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).addOption(new import_commander.Option("--applied <migration>", "record a specific migration as applied")).addOption(new import_commander.Option("--rolled-back <migration>", "record a specific migration as rolled back")).description("Resolve issues with database migrations in deployment databases.").action((options) => migrateAction("resolve", options));
-  const dbCommand = program.command("db").description("Manage your database schema during development.");
-  dbCommand.command("push").description("Push the state from your schema to your database.").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new import_commander.Option("--accept-data-loss", "ignore data loss warnings")).addOption(new import_commander.Option("--force-reset", "force a reset of the database before push")).action((options) => dbAction("push", options));
-  program.command("info").description("Get information of installed ZenStack packages.").argument("[path]", "project path", ".").addOption(noVersionCheckOption).action(infoAction);
-  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);
+  migrateCommand.command("dev").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new import_commander.Option("-n, --name <name>", "migration name")).addOption(new import_commander.Option("--create-only", "only create migration, do not apply")).addOption(migrationsOption).description("Create a migration from changes in schema and apply it to the database").action((options) => migrateAction("dev", options));
+  migrateCommand.command("reset").addOption(schemaOption).addOption(new import_commander.Option("--force", "skip the confirmation prompt")).addOption(migrationsOption).addOption(noVersionCheckOption).description("Reset your database and apply all migrations, all data will be lost").action((options) => migrateAction("reset", options));
+  migrateCommand.command("deploy").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).description("Deploy your pending migrations to your production/staging database").action((options) => migrateAction("deploy", options));
+  migrateCommand.command("status").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).description("Check the status of your database migrations").action((options) => migrateAction("status", options));
+  migrateCommand.command("resolve").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).addOption(new import_commander.Option("--applied <migration>", "record a specific migration as applied")).addOption(new import_commander.Option("--rolled-back <migration>", "record a specific migration as rolled back")).description("Resolve issues with database migrations in deployment databases").action((options) => migrateAction("resolve", options));
+  const dbCommand = program.command("db").description("Manage your database schema during development");
+  dbCommand.command("push").description("Push the state from your schema to your database").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new import_commander.Option("--accept-data-loss", "ignore data loss warnings")).addOption(new import_commander.Option("--force-reset", "force a reset of the database before push")).action((options) => dbAction("push", options));
+  program.command("info").description("Get information of installed ZenStack packages").argument("[path]", "project path", ".").addOption(noVersionCheckOption).action(infoAction);
+  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.addHelpCommand("help [command]", "Display help for a command");
   program.hook("preAction", async (_thisCommand, actionCommand) => {
     if (actionCommand.getOptionValue("versionCheck") !== false) {
       await checkNewVersion();
@@ -1042,10 +1092,10 @@ async function main() {
     if (e instanceof import_commander.CommanderError) {
       exitCode = e.exitCode;
     } else if (e instanceof CliError) {
-      console.error(import_colors7.default.red(e.message));
+      console.error(import_colors8.default.red(e.message));
       exitCode = 1;
     } else {
-      console.error(import_colors7.default.red(`Unhandled error: ${e}`));
+      console.error(import_colors8.default.red(`Unhandled error: ${e}`));
       exitCode = 1;
     }
   }