@zenstackhq/cli 3.0.0-alpha.0 → 3.0.0-alpha.10

package/.turbo/turbo-build.log

@@ -1,23 +1,22 @@
-
-
-> @zenstackhq/cli@3.0.0-alpha.1 build /Users/yiming/git/zenstack/zenstack-v3/packages/cli
-> tsup-node
-
-CLI Building entry: {"index":"src/index.ts"}
-CLI Using tsconfig: tsconfig.json
-CLI tsup v8.3.5
-CLI Using tsup config: /Users/yiming/git/zenstack/zenstack-v3/packages/cli/tsup.config.ts
-CLI Target: esnext
-CLI Cleaning output folder
-ESM Build start
-CJS Build start
-ESM dist/index.js     14.02 KB
-ESM dist/index.js.map 27.76 KB
-ESM ⚡️ Build success in 51ms
-CJS dist/index.cjs     15.95 KB
-CJS dist/index.cjs.map 27.84 KB
-CJS ⚡️ Build success in 51ms
-DTS Build start
-DTS ⚡️ Build success in 1226ms
-DTS dist/index.d.ts  108.00 B
-DTS dist/index.d.cts 108.00 B
+
+> @zenstackhq/cli@3.0.0-alpha.10 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
+> tsup-node
+
+CLI Building entry: {"index":"src/index.ts"}
+CLI Using tsconfig: tsconfig.json
+CLI tsup v8.5.0
+CLI Using tsup config: /home/runner/work/zenstack-v3/zenstack-v3/packages/cli/tsup.config.ts
+CLI Target: esnext
+CLI Cleaning output folder
+ESM Build start
+CJS Build start
+ESM dist/index.js     17.39 KB
+ESM dist/index.js.map 35.93 KB
+ESM ⚡️ Build success in 91ms
+CJS dist/index.cjs     20.63 KB
+CJS dist/index.cjs.map 36.14 KB
+CJS ⚡️ Build success in 91ms
+DTS Build start
+DTS ⚡️ Build success in 3366ms
+DTS dist/index.d.ts  108.00 B
+DTS dist/index.d.cts 108.00 B

package/bin/cli

@@ -1,3 +1,3 @@
-#!/usr/bin/env node --no-warnings
+#!/usr/bin/env node
 
 import '../dist/index.js';

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.0",
-      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, {
@@ -105,7 +39,7 @@ var import_colors5 = __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_common_helpers = require("@zenstackhq/common-helpers");
+var import_language = require("@zenstackhq/language");
+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")) {
@@ -178,42 +122,130 @@ function handleSubProcessError(err) {
   }
 }
 __name(handleSubProcessError, "handleSubProcessError");
+async function generateTempPrismaSchema(zmodelPath) {
+  const model = await loadSchemaDocument(zmodelPath);
+  const prismaSchema = await new import_sdk.PrismaSchemaGenerator(model).generate();
+  const prismaSchemaFile = import_node_path.default.resolve(import_node_path.default.dirname(zmodelPath), "~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 = (0, import_common_helpers.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");
+
+// 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_common_helpers2 = require("@zenstackhq/common-helpers");
 var import_ast = require("@zenstackhq/language/ast");
-var import_sdk = require("@zenstackhq/sdk");
+var import_sdk2 = require("@zenstackhq/sdk");
 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_fs3 = __toESM(require("fs"), 1);
+var import_node_path2 = __toESM(require("path"), 1);
+async function run2(options) {
   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);
+  const outputPath = getOutputPath(options, schemaFile);
+  const tsSchemaFile = import_node_path2.default.join(outputPath, "schema.ts");
+  await new import_sdk2.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.savePrismaSchema) {
+    const prismaSchema = await new import_sdk2.PrismaSchemaGenerator(model).generate();
+    let prismaSchemaFile = import_node_path2.default.join(outputPath, "schema.prisma");
+    if (typeof options.savePrismaSchema === "string") {
+      prismaSchemaFile = import_node_path2.default.resolve(outputPath, options.savePrismaSchema);
+      import_node_fs3.default.mkdirSync(import_node_path2.default.dirname(prismaSchemaFile), {
+        recursive: true
+      });
+    }
+    import_node_fs3.default.writeFileSync(prismaSchemaFile, prismaSchema);
+  }
   if (!options.silent) {
     console.log(import_colors2.default.green("Generation completed successfully."));
     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);
+const client = new ZenStackClient(schema, {
+    dialectConfig: { ... }
+});
 \`\`\`
 `);
   }
 }
-__name(run, "run");
+__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_path2.default.dirname(schemaFile);
+  }
+}
+__name(getOutputPath, "getOutputPath");
 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`);
+    (0, import_common_helpers2.invariant)(providerField, `Plugin ${plugin.name} does not have a provider field`);
     const provider = providerField.value.value;
     let useProvider = provider;
     if (useProvider.startsWith("@core/")) {
@@ -230,33 +262,6 @@ async function runPlugins(model, outputPath, tsSchemaFile) {
 }
 __name(runPlugins, "runPlugins");
 
-// src/actions/db.ts
-async function run2(command, options) {
-  const schemaFile = getSchemaFile(options.schema);
-  await run({
-    schema: schemaFile,
-    silent: true
-  });
-  const prismaSchemaFile = import_node_path2.default.join(import_node_path2.default.dirname(schemaFile), "schema.prisma");
-  switch (command) {
-    case "push":
-      await runPush(prismaSchemaFile, options);
-      break;
-  }
-}
-__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(runPush, "runPush");
-
 // src/actions/info.ts
 var import_colors3 = __toESM(require("colors"), 1);
 var import_node_path3 = __toESM(require("path"), 1);
@@ -288,7 +293,7 @@ async function getZenStackPackages(projectPath) {
         type: "json"
       }
     })).default;
-  } catch (err) {
+  } catch {
     return [];
   }
   const packages = Array.from(new Set([
@@ -319,7 +324,7 @@ __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_fs4 = __toESM(require("fs"), 1);
 var import_node_path4 = __toESM(require("path"), 1);
 var import_ora = __toESM(require("ora"), 1);
 var import_package_manager_detector = require("package-manager-detector");
@@ -357,11 +362,11 @@ model Post {
 async function run4(projectPath) {
   const packages = [
     {
-      name: "@zenstackhq/cli",
+      name: "@zenstackhq/cli@next",
       dev: true
     },
     {
-      name: "@zenstackhq/runtime",
+      name: "@zenstackhq/runtime@next",
       dev: false
     }
   ];
@@ -395,11 +400,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_fs4.default.existsSync(import_node_path4.default.join(projectPath, generationFolder))) {
+    import_node_fs4.default.mkdirSync(import_node_path4.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_fs4.default.existsSync(import_node_path4.default.join(projectPath, generationFolder, "schema.zmodel"))) {
+    import_node_fs4.default.writeFileSync(import_node_path4.default.join(projectPath, generationFolder, "schema.zmodel"), STARTER_ZMODEL);
   } else {
     console.log(import_colors4.default.yellow("Schema file already exists. Skipping generation of sample."));
   }
@@ -410,35 +415,42 @@ async function run4(projectPath) {
 __name(run4, "run");
 
 // src/actions/migrate.ts
-var import_node_path5 = __toESM(require("path"), 1);
+var import_node_fs5 = __toESM(require("fs"), 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 prismaSchemaFile = await generateTempPrismaSchema(schemaFile);
+  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;
+    }
+  } finally {
+    if (import_node_fs5.default.existsSync(prismaSchemaFile)) {
+      import_node_fs5.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);
   }
@@ -446,9 +458,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);
   }
@@ -456,9 +471,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);
   }
@@ -466,9 +483,7 @@ 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);
   }
@@ -484,28 +499,29 @@ function handleSubProcessError2(err) {
 __name(handleSubProcessError2, "handleSubProcessError");
 
 // src/utils/version-utils.ts
+var import_node_fs6 = __toESM(require("fs"), 1);
+var import_node_path5 = __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_path5.default.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    return JSON.parse(import_node_fs6.default.readFileSync(import_node_path5.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);
@@ -521,7 +537,7 @@ function createProgram() {
 
 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);
+  program2.command("generate").description("Run code generation.").addOption(schemaOption).addOption(new import_commander.Option("--silent", "do not print any output")).addOption(new import_commander.Option("--save-prisma-schema [path]", "save a Prisma schema file, by default into the output directory")).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));