@zenstackhq/cli 3.0.0-alpha.3 → 3.0.0-alpha.30

package/dist/index.cjs

@@ -6,9 +6,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -31,69 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// package.json
-var require_package = __commonJS({
-  "package.json"(exports2, module2) {
-    module2.exports = {
-      name: "@zenstackhq/cli",
-      publisher: "zenstack",
-      displayName: "ZenStack CLI",
-      description: "FullStack database toolkit with built-in access control and automatic API generation.",
-      version: "3.0.0-alpha.3",
-      type: "module",
-      author: {
-        name: "ZenStack Team"
-      },
-      homepage: "https://zenstack.dev",
-      license: "MIT",
-      keywords: [
-        "orm",
-        "fullstack",
-        "react",
-        "typescript",
-        "data modeling"
-      ],
-      bin: {
-        zenstack: "bin/cli"
-      },
-      scripts: {
-        build: "tsup-node",
-        watch: "tsup-node --watch",
-        lint: "eslint src --ext ts",
-        test: "vitest",
-        pack: "pnpm pack"
-      },
-      dependencies: {
-        "@types/node": "^20.0.0",
-        "@zenstackhq/language": "workspace:*",
-        "@zenstackhq/sdk": "workspace:*",
-        "async-exit-hook": "^2.0.1",
-        colors: "1.4.0",
-        commander: "^8.3.0",
-        langium: "~3.3.0",
-        ora: "^5.4.1",
-        "package-manager-detector": "^1.3.0",
-        "tiny-invariant": "^1.3.3",
-        "ts-pattern": "^4.3.0"
-      },
-      peerDependencies: {
-        prisma: "^6.0.0",
-        typescript: "^5.0.0"
-      },
-      devDependencies: {
-        "@types/async-exit-hook": "^2.0.0",
-        "@types/better-sqlite3": "^7.6.13",
-        "@types/semver": "^7.3.13",
-        "@types/tmp": "^0.2.6",
-        "@zenstackhq/runtime": "workspace:*",
-        "@zenstackhq/testtools": "workspace:*",
-        "better-sqlite3": "^11.8.1",
-        tmp: "^0.2.3"
-      }
-    };
-  }
-});
-
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -101,11 +35,11 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_language2 = require("@zenstackhq/language");
-var import_colors5 = __toESM(require("colors"), 1);
+var import_colors6 = __toESM(require("colors"), 1);
 var import_commander = require("commander");
 
 // src/actions/db.ts
-var import_node_path2 = __toESM(require("path"), 1);
+var import_node_fs2 = __toESM(require("fs"), 1);
 
 // src/utils/exec-utils.ts
 var import_child_process = require("child_process");
@@ -130,7 +64,12 @@ function execPackage(cmd, options) {
 __name(execPackage, "execPackage");
 
 // src/actions/action-utils.ts
+var import_language = require("@zenstackhq/language");
+var import_ast = require("@zenstackhq/language/ast");
+var import_sdk = require("@zenstackhq/sdk");
+var import_colors = __toESM(require("colors"), 1);
 var import_node_fs = __toESM(require("fs"), 1);
+var import_node_path = __toESM(require("path"), 1);
 
 // src/cli-error.ts
 var CliError = class extends Error {
@@ -140,8 +79,6 @@ var CliError = class extends Error {
 };
 
 // src/actions/action-utils.ts
-var import_language = require("@zenstackhq/language");
-var import_colors = __toESM(require("colors"), 1);
 function getSchemaFile(file) {
   if (file) {
     if (!import_node_fs.default.existsSync(file)) {
@@ -149,6 +86,13 @@ function getSchemaFile(file) {
     }
     return file;
   }
+  const pkgJsonConfig = getPkgJsonConfig(process.cwd());
+  if (pkgJsonConfig.schema) {
+    if (!import_node_fs.default.existsSync(pkgJsonConfig.schema)) {
+      throw new CliError(`Schema file not found: ${pkgJsonConfig.schema}`);
+    }
+    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")) {
@@ -161,12 +105,14 @@ __name(getSchemaFile, "getSchemaFile");
 async function loadSchemaDocument(schemaFile) {
   const loadResult = await (0, import_language.loadDocument)(schemaFile);
   if (!loadResult.success) {
-    console.error(import_colors.default.red("Error loading schema:"));
     loadResult.errors.forEach((err) => {
       console.error(import_colors.default.red(err));
     });
-    throw new CliError("Failed to load schema");
+    throw new CliError("Schema contains errors. See above for details.");
   }
+  loadResult.warnings.forEach((warn) => {
+    console.warn(import_colors.default.yellow(warn));
+  });
   return loadResult.model;
 }
 __name(loadSchemaDocument, "loadSchemaDocument");
@@ -178,90 +124,272 @@ function handleSubProcessError(err) {
   }
 }
 __name(handleSubProcessError, "handleSubProcessError");
+async function generateTempPrismaSchema(zmodelPath, folder) {
+  const model = await loadSchemaDocument(zmodelPath);
+  if (!model.declarations.some(import_ast.isDataSource)) {
+    throw new CliError("Schema must define a datasource");
+  }
+  const prismaSchema = await new import_sdk.PrismaSchemaGenerator(model).generate();
+  if (!folder) {
+    folder = import_node_path.default.dirname(zmodelPath);
+  }
+  const prismaSchemaFile = import_node_path.default.resolve(folder, "~schema.prisma");
+  import_node_fs.default.writeFileSync(prismaSchemaFile, prismaSchema);
+  return prismaSchemaFile;
+}
+__name(generateTempPrismaSchema, "generateTempPrismaSchema");
+function getPkgJsonConfig(startPath) {
+  const result = {
+    schema: void 0,
+    output: void 0
+  };
+  const pkgJsonFile = findUp([
+    "package.json"
+  ], startPath, false);
+  if (!pkgJsonFile) {
+    return result;
+  }
+  let pkgJson = void 0;
+  try {
+    pkgJson = JSON.parse(import_node_fs.default.readFileSync(pkgJsonFile, "utf8"));
+  } catch {
+    return result;
+  }
+  if (pkgJson.zenstack && typeof pkgJson.zenstack === "object") {
+    result.schema = pkgJson.zenstack.schema && import_node_path.default.resolve(import_node_path.default.dirname(pkgJsonFile), pkgJson.zenstack.schema);
+    result.output = pkgJson.zenstack.output && import_node_path.default.resolve(import_node_path.default.dirname(pkgJsonFile), pkgJson.zenstack.output);
+  }
+  return result;
+}
+__name(getPkgJsonConfig, "getPkgJsonConfig");
+function findUp(names, cwd = process.cwd(), multiple = false, result = []) {
+  if (!names.some((name) => !!name)) {
+    return void 0;
+  }
+  const target = names.find((name) => import_node_fs.default.existsSync(import_node_path.default.join(cwd, name)));
+  if (multiple === false && target) {
+    return import_node_path.default.join(cwd, target);
+  }
+  if (target) {
+    result.push(import_node_path.default.join(cwd, target));
+  }
+  const up = import_node_path.default.resolve(cwd, "..");
+  if (up === cwd) {
+    return multiple && result.length > 0 ? result : void 0;
+  }
+  return findUp(names, up, multiple, result);
+}
+__name(findUp, "findUp");
+
+// src/actions/db.ts
+async function run(command, options) {
+  switch (command) {
+    case "push":
+      await runPush(options);
+      break;
+  }
+}
+__name(run, "run");
+async function runPush(options) {
+  const schemaFile = getSchemaFile(options.schema);
+  const prismaSchemaFile = await generateTempPrismaSchema(schemaFile);
+  try {
+    const cmd = [
+      "prisma db push",
+      ` --schema "${prismaSchemaFile}"`,
+      options.acceptDataLoss ? " --accept-data-loss" : "",
+      options.forceReset ? " --force-reset" : "",
+      " --skip-generate"
+    ].join("");
+    try {
+      await execPackage(cmd);
+    } catch (err) {
+      handleSubProcessError(err);
+    }
+  } finally {
+    if (import_node_fs2.default.existsSync(prismaSchemaFile)) {
+      import_node_fs2.default.unlinkSync(prismaSchemaFile);
+    }
+  }
+}
+__name(runPush, "runPush");
 
 // src/actions/generate.ts
-var import_ast = require("@zenstackhq/language/ast");
-var import_sdk = require("@zenstackhq/sdk");
+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_node_fs2 = __toESM(require("fs"), 1);
-var import_node_path = __toESM(require("path"), 1);
-var import_tiny_invariant = __toESM(require("tiny-invariant"), 1);
-async function run(options) {
+var import_node_path4 = __toESM(require("path"), 1);
+var import_ora = __toESM(require("ora"), 1);
+
+// src/plugins/index.ts
+var plugins_exports = {};
+__export(plugins_exports, {
+  prisma: () => prisma_default,
+  typescript: () => typescript_default
+});
+
+// src/plugins/prisma.ts
+var import_sdk2 = require("@zenstackhq/sdk");
+var import_node_fs3 = __toESM(require("fs"), 1);
+var import_node_path2 = __toESM(require("path"), 1);
+var plugin = {
+  name: "Prisma Schema Generator",
+  statusText: "Generating Prisma schema",
+  async generate({ model, schemaFile, defaultOutputPath, pluginOptions }) {
+    let outFile = import_node_path2.default.join(defaultOutputPath, "schema.prisma");
+    if (typeof pluginOptions["output"] === "string") {
+      outFile = import_node_path2.default.resolve(import_node_path2.default.dirname(schemaFile), 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), {
+          recursive: true
+        });
+      }
+    }
+    const prismaSchema = await new import_sdk2.PrismaSchemaGenerator(model).generate();
+    import_node_fs3.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_path3 = __toESM(require("path"), 1);
+var plugin2 = {
+  name: "TypeScript Schema Generator",
+  statusText: "Generating TypeScript schema",
+  async generate({ model, defaultOutputPath, pluginOptions }) {
+    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, {
+          recursive: true
+        });
+      }
+    }
+    await new import_sdk3.TsSchemaGenerator().generate(model, outDir);
+  }
+};
+var typescript_default = plugin2;
+
+// src/actions/generate.ts
+async function run2(options) {
+  const start = Date.now();
   const schemaFile = getSchemaFile(options.schema);
   const model = await loadSchemaDocument(schemaFile);
-  const outputPath = options.output ?? import_node_path.default.dirname(schemaFile);
-  const tsSchemaFile = import_node_path.default.join(outputPath, "schema.ts");
-  await new import_sdk.TsSchemaGenerator().generate(schemaFile, [], tsSchemaFile);
-  await runPlugins(model, outputPath, tsSchemaFile);
-  const prismaSchema = await new import_sdk.PrismaSchemaGenerator(model).generate();
-  import_node_fs2.default.writeFileSync(import_node_path.default.join(outputPath, "schema.prisma"), prismaSchema);
-  if (!options.silent) {
-    console.log(import_colors2.default.green("Generation completed successfully."));
-    console.log(`You can now create a ZenStack client with it.
+  const outputPath = getOutputPath(options, schemaFile);
+  await runPlugins(schemaFile, model, outputPath);
+  console.log(import_colors2.default.green(`Generation completed successfully in ${Date.now() - start}ms.
+`));
+  console.log(`You can now create a ZenStack client with it.
 
 \`\`\`ts
 import { ZenStackClient } from '@zenstackhq/runtime';
 import { schema } from '${outputPath}/schema';
 
 const client = new ZenStackClient(schema, {
-    dialectConfig: { ... } 
+    dialect: { ... }
 });
-\`\`\`
-`);
+\`\`\``);
+}
+__name(run2, "run");
+function getOutputPath(options, schemaFile) {
+  if (options.output) {
+    return options.output;
+  }
+  const pkgJsonConfig = getPkgJsonConfig(process.cwd());
+  if (pkgJsonConfig.output) {
+    return pkgJsonConfig.output;
+  } else {
+    return import_node_path4.default.dirname(schemaFile);
   }
 }
-__name(run, "run");
-async function runPlugins(model, outputPath, tsSchemaFile) {
-  const plugins = model.declarations.filter(import_ast.isPlugin);
-  for (const plugin of plugins) {
-    const providerField = plugin.fields.find((f) => f.name === "provider");
-    (0, import_tiny_invariant.default)(providerField, `Plugin ${plugin.name} does not have a provider field`);
-    const provider = providerField.value.value;
-    let useProvider = provider;
-    if (useProvider.startsWith("@core/")) {
-      useProvider = `@zenstackhq/runtime/plugins/${useProvider.slice(6)}`;
+__name(getOutputPath, "getOutputPath");
+async function runPlugins(schemaFile, model, outputPath) {
+  const plugins = model.declarations.filter(import_ast2.isPlugin);
+  const processedPlugins = [];
+  for (const plugin3 of plugins) {
+    const provider = getPluginProvider(plugin3);
+    let cliPlugin;
+    if (provider.startsWith("@core/")) {
+      cliPlugin = plugins_exports[provider.slice("@core/".length)];
+      if (!cliPlugin) {
+        throw new CliError(`Unknown core plugin: ${provider}`);
+      }
+    } else {
+      let moduleSpec = provider;
+      if (moduleSpec.startsWith(".")) {
+        moduleSpec = import_node_path4.default.resolve(import_node_path4.default.dirname(schemaFile), moduleSpec);
+      }
+      try {
+        cliPlugin = (await import(moduleSpec)).default;
+      } catch (error) {
+        throw new CliError(`Failed to load plugin ${provider}: ${error}`);
+      }
     }
-    const generator = (await import(useProvider)).default;
-    console.log("Running generator:", provider);
-    await generator({
-      model,
-      outputPath,
-      tsSchemaFile
+    processedPlugins.push({
+      cliPlugin,
+      pluginOptions: getPluginOptions(plugin3)
     });
   }
-}
-__name(runPlugins, "runPlugins");
-
-// src/actions/db.ts
-async function run2(command, options) {
-  const schemaFile = getSchemaFile(options.schema);
-  await run({
-    schema: schemaFile,
-    silent: true
+  const defaultPlugins = [
+    typescript_default
+  ].reverse();
+  defaultPlugins.forEach((d) => {
+    if (!processedPlugins.some((p) => p.cliPlugin === d)) {
+      processedPlugins.push({
+        cliPlugin: d,
+        pluginOptions: {}
+      });
+    }
   });
-  const prismaSchemaFile = import_node_path2.default.join(import_node_path2.default.dirname(schemaFile), "schema.prisma");
-  switch (command) {
-    case "push":
-      await runPush(prismaSchemaFile, options);
-      break;
+  for (const { cliPlugin, pluginOptions } of processedPlugins) {
+    (0, import_common_helpers.invariant)(typeof cliPlugin.generate === "function", `Plugin ${cliPlugin.name} does not have a generate function`);
+    const spinner = (0, import_ora.default)(cliPlugin.statusText ?? `Running plugin ${cliPlugin.name}`).start();
+    try {
+      await cliPlugin.generate({
+        schemaFile,
+        model,
+        defaultOutputPath: outputPath,
+        pluginOptions
+      });
+      spinner.succeed();
+    } catch (err) {
+      spinner.fail();
+      console.error(err);
+    }
   }
 }
-__name(run2, "run");
-async function runPush(prismaSchemaFile, options) {
-  const cmd = `prisma db push --schema "${prismaSchemaFile}"${options.acceptDataLoss ? " --accept-data-loss" : ""}${options.forceReset ? " --force-reset" : ""} --skip-generate`;
-  try {
-    await execPackage(cmd, {
-      stdio: "inherit"
-    });
-  } catch (err) {
-    handleSubProcessError(err);
+__name(runPlugins, "runPlugins");
+function getPluginProvider(plugin3) {
+  const providerField = plugin3.fields.find((f) => f.name === "provider");
+  (0, import_common_helpers.invariant)(providerField, `Plugin ${plugin3.name} does not have a provider field`);
+  const provider = providerField.value.value;
+  return provider;
+}
+__name(getPluginProvider, "getPluginProvider");
+function getPluginOptions(plugin3) {
+  const result = {};
+  for (const field of plugin3.fields) {
+    if (field.name === "provider") {
+      continue;
+    }
+    const value = (0, import_utils.getLiteral)(field.value) ?? (0, import_utils.getLiteralArray)(field.value);
+    if (value === void 0) {
+      console.warn(`Plugin "${plugin3.name}" option "${field.name}" has unsupported value, skipping`);
+      continue;
+    }
+    result[field.name] = value;
   }
+  return result;
 }
-__name(runPush, "runPush");
+__name(getPluginOptions, "getPluginOptions");
 
 // src/actions/info.ts
 var import_colors3 = __toESM(require("colors"), 1);
-var import_node_path3 = __toESM(require("path"), 1);
+var import_node_path5 = __toESM(require("path"), 1);
 async function run3(projectPath) {
   const packages = await getZenStackPackages(projectPath);
   if (!packages) {
@@ -283,14 +411,14 @@ async function run3(projectPath) {
 __name(run3, "run");
 async function getZenStackPackages(projectPath) {
   let pkgJson;
-  const resolvedPath = import_node_path3.default.resolve(projectPath);
+  const resolvedPath = import_node_path5.default.resolve(projectPath);
   try {
-    pkgJson = (await import(import_node_path3.default.join(resolvedPath, "package.json"), {
+    pkgJson = (await import(import_node_path5.default.join(resolvedPath, "package.json"), {
       with: {
         type: "json"
       }
     })).default;
-  } catch (err) {
+  } catch {
     return [];
   }
   const packages = Array.from(new Set([
@@ -321,9 +449,9 @@ __name(getZenStackPackages, "getZenStackPackages");
 
 // src/actions/init.ts
 var import_colors4 = __toESM(require("colors"), 1);
-var import_node_fs3 = __toESM(require("fs"), 1);
-var import_node_path4 = __toESM(require("path"), 1);
-var import_ora = __toESM(require("ora"), 1);
+var import_node_fs5 = __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");
 
 // src/actions/templates.ts
@@ -385,7 +513,7 @@ async function run4(projectPath) {
     if (!resolved) {
       throw new CliError(`Unable to determine how to install package "${pkg.name}". Please install it manually.`);
     }
-    const spinner = (0, import_ora.default)(`Installing "${pkg.name}"`).start();
+    const spinner = (0, import_ora2.default)(`Installing "${pkg.name}"`).start();
     try {
       execSync(`${resolved.command} ${resolved.args.join(" ")}`, {
         cwd: projectPath
@@ -397,11 +525,11 @@ async function run4(projectPath) {
     }
   }
   const generationFolder = "zenstack";
-  if (!import_node_fs3.default.existsSync(import_node_path4.default.join(projectPath, generationFolder))) {
-    import_node_fs3.default.mkdirSync(import_node_path4.default.join(projectPath, generationFolder));
+  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_fs3.default.existsSync(import_node_path4.default.join(projectPath, generationFolder, "schema.zmodel"))) {
-    import_node_fs3.default.writeFileSync(import_node_path4.default.join(projectPath, generationFolder, "schema.zmodel"), STARTER_ZMODEL);
+  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);
   } else {
     console.log(import_colors4.default.yellow("Schema file already exists. Skipping generation of sample."));
   }
@@ -412,35 +540,47 @@ async function run4(projectPath) {
 __name(run4, "run");
 
 // src/actions/migrate.ts
-var import_node_path5 = __toESM(require("path"), 1);
+var import_node_fs6 = __toESM(require("fs"), 1);
+var import_node_path7 = __toESM(require("path"), 1);
 async function run5(command, options) {
   const schemaFile = getSchemaFile(options.schema);
-  await run({
-    schema: schemaFile,
-    silent: true
-  });
-  const prismaSchemaFile = import_node_path5.default.join(import_node_path5.default.dirname(schemaFile), "schema.prisma");
-  switch (command) {
-    case "dev":
-      await runDev(prismaSchemaFile, options);
-      break;
-    case "reset":
-      await runReset(prismaSchemaFile, options);
-      break;
-    case "deploy":
-      await runDeploy(prismaSchemaFile, options);
-      break;
-    case "status":
-      await runStatus(prismaSchemaFile, options);
-      break;
+  const prismaSchemaDir = options.migrations ? import_node_path7.default.dirname(options.migrations) : void 0;
+  const prismaSchemaFile = await generateTempPrismaSchema(schemaFile, prismaSchemaDir);
+  try {
+    switch (command) {
+      case "dev":
+        await runDev(prismaSchemaFile, options);
+        break;
+      case "reset":
+        await runReset(prismaSchemaFile, options);
+        break;
+      case "deploy":
+        await runDeploy(prismaSchemaFile, options);
+        break;
+      case "status":
+        await runStatus(prismaSchemaFile, options);
+        break;
+      case "resolve":
+        await runResolve(prismaSchemaFile, options);
+        break;
+    }
+  } finally {
+    if (import_node_fs6.default.existsSync(prismaSchemaFile)) {
+      import_node_fs6.default.unlinkSync(prismaSchemaFile);
+    }
   }
 }
 __name(run5, "run");
-async function runDev(prismaSchemaFile, _options) {
+async function runDev(prismaSchemaFile, options) {
   try {
-    await execPackage(`prisma migrate dev --schema "${prismaSchemaFile}" --skip-generate`, {
-      stdio: "inherit"
-    });
+    const cmd = [
+      "prisma migrate dev",
+      ` --schema "${prismaSchemaFile}"`,
+      " --skip-generate",
+      options.name ? ` --name ${options.name}` : "",
+      options.createOnly ? " --create-only" : ""
+    ].join("");
+    await execPackage(cmd);
   } catch (err) {
     handleSubProcessError2(err);
   }
@@ -448,9 +588,12 @@ async function runDev(prismaSchemaFile, _options) {
 __name(runDev, "runDev");
 async function runReset(prismaSchemaFile, options) {
   try {
-    await execPackage(`prisma migrate reset --schema "${prismaSchemaFile}"${options.force ? " --force" : ""}`, {
-      stdio: "inherit"
-    });
+    const cmd = [
+      "prisma migrate reset",
+      ` --schema "${prismaSchemaFile}"`,
+      options.force ? " --force" : ""
+    ].join("");
+    await execPackage(cmd);
   } catch (err) {
     handleSubProcessError2(err);
   }
@@ -458,9 +601,11 @@ async function runReset(prismaSchemaFile, options) {
 __name(runReset, "runReset");
 async function runDeploy(prismaSchemaFile, _options) {
   try {
-    await execPackage(`prisma migrate deploy --schema "${prismaSchemaFile}"`, {
-      stdio: "inherit"
-    });
+    const cmd = [
+      "prisma migrate deploy",
+      ` --schema "${prismaSchemaFile}"`
+    ].join("");
+    await execPackage(cmd);
   } catch (err) {
     handleSubProcessError2(err);
   }
@@ -468,14 +613,29 @@ async function runDeploy(prismaSchemaFile, _options) {
 __name(runDeploy, "runDeploy");
 async function runStatus(prismaSchemaFile, _options) {
   try {
-    await execPackage(`prisma migrate status --schema "${prismaSchemaFile}"`, {
-      stdio: "inherit"
-    });
+    await execPackage(`prisma migrate status --schema "${prismaSchemaFile}"`);
   } catch (err) {
     handleSubProcessError2(err);
   }
 }
 __name(runStatus, "runStatus");
+async function runResolve(prismaSchemaFile, options) {
+  if (!options.applied && !options.rolledBack) {
+    throw new CliError("Either --applied or --rolled-back option must be provided");
+  }
+  try {
+    const cmd = [
+      "prisma migrate resolve",
+      ` --schema "${prismaSchemaFile}"`,
+      options.applied ? ` --applied ${options.applied}` : "",
+      options.rolledBack ? ` --rolled-back ${options.rolledBack}` : ""
+    ].join("");
+    await execPackage(cmd);
+  } catch (err) {
+    handleSubProcessError2(err);
+  }
+}
+__name(runResolve, "runResolve");
 function handleSubProcessError2(err) {
   if (err instanceof Error && "status" in err && typeof err.status === "number") {
     process.exit(err.status);
@@ -485,29 +645,44 @@ 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/utils/version-utils.ts
+var import_node_fs7 = __toESM(require("fs"), 1);
+var import_node_path8 = __toESM(require("path"), 1);
+var import_node_url = require("url");
+var import_meta = {};
 function getVersion() {
   try {
-    return require("../package.json").version;
+    const _dirname = typeof __dirname !== "undefined" ? __dirname : import_node_path8.default.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    return JSON.parse(import_node_fs7.default.readFileSync(import_node_path8.default.join(_dirname, "../package.json"), "utf8")).version;
   } catch {
-    try {
-      return require_package().version;
-    } catch {
-      return void 0;
-    }
+    return void 0;
   }
 }
 __name(getVersion, "getVersion");
 
 // src/index.ts
 var generateAction = /* @__PURE__ */ __name(async (options) => {
-  await run(options);
+  await run2(options);
 }, "generateAction");
 var migrateAction = /* @__PURE__ */ __name(async (command, options) => {
   await run5(command, options);
 }, "migrateAction");
 var dbAction = /* @__PURE__ */ __name(async (command, options) => {
-  await run2(command, options);
+  await run(command, options);
 }, "dbAction");
 var infoAction = /* @__PURE__ */ __name(async (projectPath) => {
   await run3(projectPath);
@@ -515,29 +690,46 @@ var infoAction = /* @__PURE__ */ __name(async (projectPath) => {
 var initAction = /* @__PURE__ */ __name(async (projectPath) => {
   await run4(projectPath);
 }, "initAction");
+var checkAction = /* @__PURE__ */ __name(async (options) => {
+  await run6(options);
+}, "checkAction");
 function createProgram() {
   const program2 = new import_commander.Command("zenstack");
   program2.version(getVersion(), "-v --version", "display CLI version");
   const schemaExtensions = import_language2.ZModelLanguageMetaData.fileExtensions.join(", ");
-  program2.description(`${import_colors5.default.bold.blue("\u03B6")} ZenStack is a Prisma power pack for building full-stack apps.
+  program2.description(`${import_colors6.default.bold.blue("\u03B6")} ZenStack is the data layer for modern TypeScript apps.
 
 Documentation: https://zenstack.dev.`).showHelpAfterError().showSuggestionAfterError();
-  const schemaOption = new import_commander.Option("--schema <file>", `schema file (with extension ${schemaExtensions}). Defaults to "schema.zmodel" unless specified in package.json.`);
-  program2.command("generate").description("Run code generation.").addOption(schemaOption).addOption(new import_commander.Option("-o, --output <path>", "default output directory for core plugins")).action(generateAction);
-  const migrateCommand = program2.command("migrate").description("Update the database schema with migrations.");
-  migrateCommand.command("dev").addOption(schemaOption).addOption(new import_commander.Option("-n, --name <name>", "migration name")).addOption(new import_commander.Option("--create-only", "only create migration, do not apply")).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")).description("Reset your database and apply all migrations, all data will be lost.").action((options) => migrateAction("reset", options));
-  migrateCommand.command("deploy").addOption(schemaOption).description("Deploy your pending migrations to your production/staging database.").action((options) => migrateAction("deploy", options));
-  migrateCommand.command("status").addOption(schemaOption).description("check the status of your database migrations.").action((options) => migrateAction("status", options));
+  const schemaOption = new import_commander.Option("--schema <file>", `schema file (with extension ${schemaExtensions}). Defaults to "zenstack/schema.zmodel" unless specified in package.json.`);
+  program2.command("generate").description("Run code generation plugins.").addOption(schemaOption).addOption(new import_commander.Option("-o, --output <path>", "default output directory for code generation")).action(generateAction);
+  const migrateCommand = program2.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(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).description("Reset your database and apply all migrations, all data will be lost.").action((options) => migrateAction("reset", options));
+  migrateCommand.command("deploy").addOption(schemaOption).addOption(migrationsOption).description("Deploy your pending migrations to your production/staging database.").action((options) => migrateAction("deploy", options));
+  migrateCommand.command("status").addOption(schemaOption).addOption(migrationsOption).description("Check the status of your database migrations.").action((options) => migrateAction("status", options));
+  migrateCommand.command("resolve").addOption(schemaOption).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 = program2.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(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));
-  program2.command("info").description("Get information of installed ZenStack and related packages.").argument("[path]", "project path", ".").action(infoAction);
+  dbCommand.command("push").description("Push the state from your schema to your database.").addOption(schemaOption).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));
+  program2.command("info").description("Get information of installed ZenStack packages.").argument("[path]", "project path", ".").action(infoAction);
   program2.command("init").description("Initialize an existing project for ZenStack.").argument("[path]", "project path", ".").action(initAction);
+  program2.command("check").description("Check a ZModel schema for syntax or semantic errors.").addOption(schemaOption).action(checkAction);
   return program2;
 }
 __name(createProgram, "createProgram");
 var program = createProgram();
-program.parse(process.argv);
+program.parseAsync().catch((err) => {
+  if (err instanceof CliError) {
+    console.error(import_colors6.default.red(err.message));
+    process.exit(1);
+  } else if (err instanceof import_commander.CommanderError) {
+    process.exit(err.exitCode);
+  } else {
+    console.error(import_colors6.default.red("An unexpected error occurred:"));
+    console.error(err);
+    process.exit(1);
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createProgram