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

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @zenstackhq/cli@3.0.0-beta.24 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
+> @zenstackhq/cli@3.0.0-beta.26 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
 > tsc --noEmit && tsup-node
 
 CLI Building entry: {"index":"src/index.ts"}
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-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
+CJS dist/index.cjs     41.99 KB
+CJS dist/index.cjs.map 80.26 KB
+CJS ⚡️ Build success in 130ms
+ESM dist/index.js     37.94 KB
+ESM dist/index.js.map 79.68 KB
+ESM ⚡️ Build success in 132ms
 DTS Build start
-DTS ⚡️ Build success in 3367ms
+DTS ⚡️ Build success in 2493ms
 DTS dist/index.d.ts  13.00 B
 DTS dist/index.d.cts 13.00 B

package/dist/index.cjs

@@ -29,7 +29,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/index.ts
 var import_language3 = require("@zenstackhq/language");
-var import_colors8 = __toESM(require("colors"), 1);
+var import_colors9 = __toESM(require("colors"), 1);
 var import_commander = require("commander");
 
 // src/actions/check.ts
@@ -121,7 +121,8 @@ __name(generateTempPrismaSchema, "generateTempPrismaSchema");
 function getPkgJsonConfig(startPath) {
   const result = {
     schema: void 0,
-    output: void 0
+    output: void 0,
+    seed: void 0
   };
   const pkgJsonFile = findUp([
     "package.json"
@@ -136,8 +137,9 @@ function getPkgJsonConfig(startPath) {
     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);
+    result.schema = pkgJson.zenstack.schema && typeof pkgJson.zenstack.schema === "string" ? import_node_path.default.resolve(import_node_path.default.dirname(pkgJsonFile), pkgJson.zenstack.schema) : void 0;
+    result.output = pkgJson.zenstack.output && typeof pkgJson.zenstack.output === "string" ? import_node_path.default.resolve(import_node_path.default.dirname(pkgJsonFile), pkgJson.zenstack.output) : void 0;
+    result.seed = typeof pkgJson.zenstack.seed === "string" && pkgJson.zenstack.seed ? pkgJson.zenstack.seed : void 0;
   }
   return result;
 }
@@ -160,6 +162,14 @@ function findUp(names, cwd = process.cwd(), multiple = false, result = []) {
   return findUp(names, up, multiple, result);
 }
 __name(findUp, "findUp");
+async function requireDataSourceUrl(schemaFile) {
+  const zmodel = await loadSchemaDocument(schemaFile);
+  const dataSource = zmodel.declarations.find(import_ast.isDataSource);
+  if (!dataSource?.fields.some((f) => f.name === "url")) {
+    throw new CliError(`The schema's "datasource" must have a "url" field to use this command.`);
+  }
+}
+__name(requireDataSourceUrl, "requireDataSourceUrl");
 
 // src/actions/check.ts
 async function run(options) {
@@ -229,6 +239,7 @@ async function run2(command, options) {
 __name(run2, "run");
 async function runPush(options) {
   const schemaFile = getSchemaFile(options.schema);
+  await requireDataSourceUrl(schemaFile);
   const prismaSchemaFile = await generateTempPrismaSchema(schemaFile);
   try {
     const cmd = [
@@ -634,8 +645,38 @@ __name(run6, "run");
 // src/actions/migrate.ts
 var import_node_fs7 = __toESM(require("fs"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
-async function run7(command, options) {
+
+// src/actions/seed.ts
+var import_colors7 = __toESM(require("colors"), 1);
+var import_execa = require("execa");
+async function run7(options, args) {
+  const pkgJsonConfig = getPkgJsonConfig(process.cwd());
+  if (!pkgJsonConfig.seed) {
+    if (!options.noWarnings) {
+      console.warn(import_colors7.default.yellow("No seed script defined in package.json. Skipping seeding."));
+    }
+    return;
+  }
+  const command = `${pkgJsonConfig.seed}${args.length > 0 ? " " + args.join(" ") : ""}`;
+  if (options.printStatus) {
+    console.log(import_colors7.default.gray(`Running seed script "${command}"...`));
+  }
+  try {
+    await (0, import_execa.execaCommand)(command, {
+      stdout: "inherit",
+      stderr: "inherit"
+    });
+  } catch (err) {
+    console.error(import_colors7.default.red(err instanceof Error ? err.message : String(err)));
+    throw new CliError("Failed to seed the database. Please check the error message above for details.");
+  }
+}
+__name(run7, "run");
+
+// src/actions/migrate.ts
+async function run8(command, options) {
   const schemaFile = getSchemaFile(options.schema);
+  await requireDataSourceUrl(schemaFile);
   const prismaSchemaDir = options.migrations ? import_node_path7.default.dirname(options.migrations) : void 0;
   const prismaSchemaFile = await generateTempPrismaSchema(schemaFile, prismaSchemaDir);
   try {
@@ -662,13 +703,14 @@ async function run7(command, options) {
     }
   }
 }
-__name(run7, "run");
+__name(run8, "run");
 function runDev(prismaSchemaFile, options) {
   try {
     const cmd = [
       "migrate dev",
       ` --schema "${prismaSchemaFile}"`,
       " --skip-generate",
+      " --skip-seed",
       options.name ? ` --name "${options.name}"` : "",
       options.createOnly ? " --create-only" : ""
     ].join("");
@@ -678,18 +720,25 @@ function runDev(prismaSchemaFile, options) {
   }
 }
 __name(runDev, "runDev");
-function runReset(prismaSchemaFile, options) {
+async function runReset(prismaSchemaFile, options) {
   try {
     const cmd = [
       "migrate reset",
       ` --schema "${prismaSchemaFile}"`,
       " --skip-generate",
+      " --skip-seed",
       options.force ? " --force" : ""
     ].join("");
     execPrisma(cmd);
   } catch (err) {
     handleSubProcessError2(err);
   }
+  if (!options.skipSeed) {
+    await run7({
+      noWarnings: true,
+      printStatus: true
+    }, []);
+  }
 }
 __name(runReset, "runReset");
 function runDeploy(prismaSchemaFile, _options) {
@@ -876,7 +925,7 @@ function getMachineId() {
 __name(getMachineId, "getMachineId");
 
 // src/utils/version-utils.ts
-var import_colors7 = __toESM(require("colors"), 1);
+var import_colors8 = __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");
@@ -902,7 +951,7 @@ async function checkNewVersion() {
     return;
   }
   if (latestVersion && currVersion && import_semver.default.gt(latestVersion, currVersion)) {
-    console.log(`A newer version ${import_colors7.default.cyan(latestVersion)} is available.`);
+    console.log(`A newer version ${import_colors8.default.cyan(latestVersion)} is available.`);
   }
 }
 __name(checkNewVersion, "checkNewVersion");
@@ -1032,7 +1081,7 @@ var generateAction = /* @__PURE__ */ __name(async (options) => {
   await telemetry.trackCommand("generate", () => run4(options));
 }, "generateAction");
 var migrateAction = /* @__PURE__ */ __name(async (subCommand, options) => {
-  await telemetry.trackCommand(`migrate ${subCommand}`, () => run7(subCommand, options));
+  await telemetry.trackCommand(`migrate ${subCommand}`, () => run8(subCommand, options));
 }, "migrateAction");
 var dbAction = /* @__PURE__ */ __name(async (subCommand, options) => {
   await telemetry.trackCommand(`db ${subCommand}`, () => run2(subCommand, options));
@@ -1049,10 +1098,13 @@ var checkAction = /* @__PURE__ */ __name(async (options) => {
 var formatAction = /* @__PURE__ */ __name(async (options) => {
   await telemetry.trackCommand("format", () => run3(options));
 }, "formatAction");
+var seedAction = /* @__PURE__ */ __name(async (options, args) => {
+  await telemetry.trackCommand("db seed", () => run7(options, args));
+}, "seedAction");
 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_language3.ZModelLanguageMetaData.fileExtensions.join(", ");
-  program.description(`${import_colors8.default.bold.blue("\u03B6")} ZenStack is the data layer for modern TypeScript apps.
+  program.description(`${import_colors9.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.`);
@@ -1061,12 +1113,22 @@ Documentation: https://zenstack.dev/docs/3.x`).showHelpAfterError().showSuggesti
   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("reset").addOption(schemaOption).addOption(new import_commander.Option("--force", "skip the confirmation prompt")).addOption(migrationsOption).addOption(new import_commander.Option("--skip-seed", "skip seeding the database after reset")).addOption(noVersionCheckOption).description("Reset your database and apply all migrations, all data will be lost").addHelpText("after", "\nIf there is a seed script defined in package.json, it will be run after the reset. Use --skip-seed to skip it.").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));
+  dbCommand.command("seed").description("Seed the database").allowExcessArguments(true).addHelpText("after", `
+Seed script is configured under the "zenstack.seed" field in package.json.
+E.g.:
+{
+    "zenstack": {
+        "seed": "ts-node ./zenstack/seed.ts"
+    }
+}
+
+Arguments following -- are passed to the seed script. E.g.: "zen db seed -- --users 10"`).addOption(noVersionCheckOption).action((options, command) => seedAction(options, command.args));
   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);
@@ -1092,10 +1154,10 @@ async function main() {
     if (e instanceof import_commander.CommanderError) {
       exitCode = e.exitCode;
     } else if (e instanceof CliError) {
-      console.error(import_colors8.default.red(e.message));
+      console.error(import_colors9.default.red(e.message));
       exitCode = 1;
     } else {
-      console.error(import_colors8.default.red(`Unhandled error: ${e}`));
+      console.error(import_colors9.default.red(`Unhandled error: ${e}`));
       exitCode = 1;
     }
   }