@dforge-core/dforge-cli 0.2.1 → 0.2.3

package/dist/cli.js

@@ -1050,12 +1050,16 @@ var init_templates = __esm({
 
 // src/init/module.ts
 async function runInitModule(argv2) {
-  const rawPath = argv2[0];
-  if (!rawPath) {
-    console.error("Usage: dforge-cli init module <path>");
+  const args = parseArgs(argv2);
+  if (args.help) {
+    printModuleHelp();
+    return 0;
+  }
+  if (!args.path) {
+    printModuleHelp();
     return 2;
   }
-  const absPath = path2.resolve(rawPath);
+  const absPath = path2.resolve(args.path);
   if (fs2.existsSync(absPath)) {
     const stat = fs2.statSync(absPath);
     if (!stat.isDirectory()) {
@@ -1067,29 +1071,180 @@ async function runInitModule(argv2) {
       return 1;
     }
   }
-  Ie("dforge-cli init module");
-  const opts = await collectOpts(absPath);
-  if (opts === null) {
-    xe("Aborted.");
-    return CANCEL_EXIT;
-  }
-  const s = Y2();
-  s.start("Writing files");
-  try {
-    writeAll(opts);
-    s.stop("Files written.");
-  } catch (err) {
-    s.stop("Write failed.");
-    console.error(err.message);
-    return 1;
+  const nonInteractive = args.yes || args.code !== void 0 || !process.stdin.isTTY;
+  let opts;
+  if (nonInteractive) {
+    if (args.code === void 0) {
+      console.error(
+        "dforge-cli init module: no TTY for interactive prompts and no --code given.\nPass --code <code> (plus optional --display-name, --entity, --preset, \u2026) to scaffold\nnon-interactively, or run in a real terminal. See `dforge-cli init module --help`."
+      );
+      return 2;
+    }
+    opts = buildOptsFromArgs(absPath, args);
+    if (opts === null) return 1;
+    try {
+      writeAll(opts);
+    } catch (err) {
+      console.error(err.message);
+      return 1;
+    }
+    console.log(`Created module ${opts.code} at ${opts.path}`);
+  } else {
+    Ie("dforge-cli init module");
+    opts = await collectOpts(absPath);
+    if (opts === null) {
+      xe("Aborted.");
+      return CANCEL_EXIT;
+    }
+    const s = Y2();
+    s.start("Writing files");
+    try {
+      writeAll(opts);
+      s.stop("Files written.");
+    } catch (err) {
+      s.stop("Write failed.");
+      console.error(err.message);
+      return 1;
+    }
+    Se(`Created module ${opts.code} at ${opts.path}`);
   }
-  Se(`Created module ${opts.code} at ${opts.path}`);
   console.log("");
   console.log("Next steps:");
   console.log(`  cd ${path2.relative(process.cwd(), opts.path) || "."}`);
   console.log(`  dforge-cli module install --path . --code <tenant>`);
   return 0;
 }
+function parseArgs(argv2) {
+  const out = {};
+  const list = (prev, v2) => [
+    ...prev ?? [],
+    ...v2.split(",").map((s) => s.trim()).filter(Boolean)
+  ];
+  for (let i = 0; i < argv2.length; i++) {
+    const tok = argv2[i];
+    if (tok === "--help" || tok === "-h") {
+      out.help = true;
+      continue;
+    }
+    if (tok === "--yes" || tok === "-y") {
+      out.yes = true;
+      continue;
+    }
+    if (!tok.startsWith("-")) {
+      if (out.path === void 0) out.path = tok;
+      continue;
+    }
+    const eq = tok.indexOf("=");
+    const flag = eq === -1 ? tok : tok.slice(0, eq);
+    const inlineVal = eq === -1 ? void 0 : tok.slice(eq + 1);
+    const value = () => inlineVal !== void 0 ? inlineVal : argv2[++i] ?? "";
+    switch (flag) {
+      case "--code":
+        out.code = value();
+        break;
+      case "--display-name":
+      case "--name":
+        out.displayName = value();
+        break;
+      case "--description":
+        out.description = value();
+        break;
+      case "--author":
+        out.author = value();
+        break;
+      case "--license":
+        out.license = value();
+        break;
+      case "--version":
+        out.version = value();
+        break;
+      case "--db-schema-version":
+        out.dbSchemaVersion = value();
+        break;
+      case "--dependencies":
+        out.dependencies = list(out.dependencies, value());
+        break;
+      case "--preset":
+        out.preset = value();
+        break;
+      case "--entity":
+        out.entities = list(out.entities, value());
+        break;
+      case "--traits":
+        out.traits = value();
+        break;
+      default:
+        console.error(`dforge-cli init module: unknown flag "${flag}" (ignored)`);
+    }
+  }
+  return out;
+}
+function buildOptsFromArgs(absPath, args) {
+  const fail = (msg) => {
+    console.error(`dforge-cli init module: ${msg}`);
+    return null;
+  };
+  const code = args.code;
+  const codeErr = validateCode(code);
+  if (codeErr) return fail(`--code ${codeErr}`);
+  const version = args.version ?? "0.1.0";
+  const versionErr = validateSemver(version);
+  if (versionErr) return fail(`--version ${versionErr}`);
+  const dbSchemaVersion = args.dbSchemaVersion ?? "0.0.1";
+  const dbErr = validateSemver(dbSchemaVersion);
+  if (dbErr) return fail(`--db-schema-version ${dbErr}`);
+  const preset = args.preset ?? "minimal";
+  if (!PRESETS.has(preset)) {
+    return fail(`--preset must be one of: ${[...PRESETS].join(", ")}.`);
+  }
+  const traits = args.traits ?? "identity+audit";
+  if (!TRAITS_VALUES.has(traits)) {
+    return fail(`--traits must be one of: ${[...TRAITS_VALUES].join(", ")}.`);
+  }
+  const names = args.entities && args.entities.length > 0 ? args.entities : ["item"];
+  const entities = [];
+  for (const name of names) {
+    const nameErr = validateEntityName(name);
+    if (nameErr) return fail(`--entity "${name}": ${nameErr}`);
+    entities.push({ name, label: titlecase(name), traits });
+  }
+  const displayName = args.displayName ?? titlecase(code);
+  if (validateNonEmpty(displayName)) return fail("--display-name cannot be empty.");
+  return {
+    path: absPath,
+    code,
+    displayName,
+    description: args.description ?? "",
+    author: args.author ?? tryGitUserName() ?? "",
+    license: args.license ?? "MIT",
+    version,
+    dbSchemaVersion,
+    dependencies: args.dependencies ?? ["admin", "metadata"],
+    preset,
+    entities
+  };
+}
+function printModuleHelp() {
+  console.log("Usage: dforge-cli init module <path> [options]");
+  console.log("");
+  console.log("Scaffold a new dForge module. With a TTY and no flags, runs interactively.");
+  console.log("With --code (or when there's no TTY), runs non-interactively from flags + defaults.");
+  console.log("");
+  console.log("Options:");
+  console.log("  --code <code>              Module code (required when non-interactive)");
+  console.log("  --display-name <name>      Default: title-cased code");
+  console.log("  --description <text>       Default: empty");
+  console.log("  --author <name>            Default: git user.name");
+  console.log("  --license <id>             Default: MIT");
+  console.log("  --version <semver>         Default: 0.1.0");
+  console.log("  --db-schema-version <ver>  Default: 0.0.1");
+  console.log("  --dependencies <a,b>       Default: admin,metadata");
+  console.log("  --preset <p>               minimal | minimal-plus | full  (default: minimal)");
+  console.log("  --entity <name[,name\u2026]>    Entities to scaffold (default: item). Repeatable.");
+  console.log("  --traits <t>               identity+audit | identity  (default: identity+audit)");
+  console.log("  -y, --yes                  Force non-interactive even with a TTY");
+  console.log("  -h, --help                 Show this help");
+}
 async function collectOpts(absPath) {
   const gitName = tryGitUserName();
   const meta = await Ce(
@@ -1278,7 +1433,7 @@ function tryGitUserName() {
     return void 0;
   }
 }
-var fs2, path2, import_node_child_process2, import_node_crypto, CANCEL_EXIT;
+var fs2, path2, import_node_child_process2, import_node_crypto, CANCEL_EXIT, PRESETS, TRAITS_VALUES;
 var init_module = __esm({
   "src/init/module.ts"() {
     "use strict";
@@ -1290,6 +1445,8 @@ var init_module = __esm({
     init_prompts();
     init_templates();
     CANCEL_EXIT = 130;
+    PRESETS = /* @__PURE__ */ new Set(["minimal", "minimal-plus", "full"]);
+    TRAITS_VALUES = /* @__PURE__ */ new Set(["identity+audit", "identity"]);
   }
 });
 
@@ -1318,7 +1475,8 @@ function printHelp() {
   console.log("Usage: dforge-cli init <subcommand>");
   console.log("");
   console.log("Subcommands:");
-  console.log("  module <path>    Scaffold a new dForge module (interactive)");
+  console.log("  module <path>    Scaffold a new dForge module. Interactive with a TTY;");
+  console.log("                   non-interactive with --code (see `init module --help`).");
 }
 var init_init = __esm({
   "src/init/index.ts"() {
@@ -1327,110 +1485,6 @@ var init_init = __esm({
   }
 });
 
-// src/pack.ts
-var pack_exports = {};
-__export(pack_exports, {
-  runPack: () => runPack
-});
-async function runPack(argv2) {
-  const positional = [];
-  let outPath;
-  for (let i = 0; i < argv2.length; i++) {
-    const a = argv2[i];
-    if (a === "-o" || a === "--output") {
-      outPath = argv2[++i];
-    } else if (a === "-h" || a === "--help") {
-      printHelp2();
-      return 0;
-    } else {
-      positional.push(a);
-    }
-  }
-  if (positional.length === 0) {
-    console.error("Usage: dforge-cli module pack <module-dir> [-o <output>]");
-    return 2;
-  }
-  const moduleDir = path3.resolve(positional[0]);
-  const manifestPath = path3.join(moduleDir, "manifest.json");
-  if (!fs3.existsSync(manifestPath)) {
-    console.error(`No manifest.json at ${manifestPath}`);
-    return 1;
-  }
-  let manifest;
-  try {
-    manifest = JSON.parse(fs3.readFileSync(manifestPath, "utf8"));
-  } catch (e2) {
-    console.error(`manifest.json: ${e2.message}`);
-    return 1;
-  }
-  if (!manifest.code || !manifest.version) {
-    console.error("manifest.json missing required `code` or `version`");
-    return 1;
-  }
-  const defaultName = `${manifest.code}-${manifest.version}.dforge`;
-  let finalOut;
-  if (!outPath) {
-    finalOut = path3.resolve(process.cwd(), defaultName);
-  } else {
-    const abs = path3.resolve(outPath);
-    if (abs.endsWith(".dforge")) {
-      finalOut = abs;
-    } else {
-      fs3.mkdirSync(abs, { recursive: true });
-      finalOut = path3.join(abs, defaultName);
-    }
-  }
-  fs3.mkdirSync(path3.dirname(finalOut), { recursive: true });
-  if (fs3.existsSync(finalOut)) fs3.rmSync(finalOut);
-  const zip = (0, import_node_child_process3.spawnSync)(
-    "zip",
-    ["-r", "-q", finalOut, "."],
-    {
-      cwd: moduleDir,
-      stdio: ["ignore", "inherit", "inherit"]
-    }
-  );
-  if (zip.error) {
-    console.error(
-      `pack: failed to run \`zip\`: ${zip.error.message}. Install zip (brew install zip / apt install zip / git-for-windows ships it).`
-    );
-    return 1;
-  }
-  if (zip.status !== 0) {
-    console.error(`pack: zip exited ${zip.status}`);
-    return zip.status ?? 1;
-  }
-  const size = fs3.statSync(finalOut).size;
-  const kib = (size / 1024).toFixed(1);
-  console.log(`\u2713 ${finalOut} (${kib} KB)`);
-  void import_promises.pipeline;
-  void import_node_zlib.createGzip;
-  return 0;
-}
-function printHelp2() {
-  console.log("Usage: dforge-cli module pack <module-dir> [-o <output>]");
-  console.log("");
-  console.log(
-    "Packages a module directory into a .dforge archive (zip with .dforge extension)."
-  );
-  console.log("");
-  console.log("Examples:");
-  console.log("  dforge-cli module pack ./my-module                # \u2192 ./<code>-<version>.dforge");
-  console.log("  dforge-cli module pack ./my-module -o ./dist/     # \u2192 ./dist/<code>-<version>.dforge");
-  console.log("  dforge-cli module pack ./my-module -o pkg.dforge  # \u2192 ./pkg.dforge");
-}
-var fs3, path3, import_node_zlib, import_promises, import_node_child_process3;
-var init_pack = __esm({
-  "src/pack.ts"() {
-    "use strict";
-    fs3 = __toESM(require("fs"));
-    path3 = __toESM(require("path"));
-    import_node_zlib = require("zlib");
-    import_promises = require("stream/promises");
-    import_node_child_process3 = require("child_process");
-  }
-});
-
 // src/native.ts
 var import_node_child_process = require("child_process");
 var path = __toESM(require("path"));
@@ -1524,8 +1578,6 @@ function jsCommand(loader, rest) {
 }
 if (argv[0] === "init") {
   jsCommand(() => Promise.resolve().then(() => (init_init(), init_exports)).then((m2) => m2.runInit), argv.slice(1));
-} else if (argv[0] === "module" && argv[1] === "pack") {
-  jsCommand(() => Promise.resolve().then(() => (init_pack(), pack_exports)).then((m2) => m2.runPack), argv.slice(2));
 } else {
   spawnNative(argv);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dforge-core/dforge-cli",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"description": "dForge CLI - validate, pack, publish, and install dForge modules. Distributes a single-file native binary per platform via optionalDependencies (esbuild-style).",
 	"license": "MIT",
 	"homepage": "https://github.com/iash44/dForge-core",
@@ -41,11 +41,11 @@
 		"typescript": "^6.0.3"
 	},
 	"optionalDependencies": {
-		"@dforge-core/dforge-cli-darwin-arm64": "0.2.1",
-		"@dforge-core/dforge-cli-darwin-x64": "0.2.1",
-		"@dforge-core/dforge-cli-linux-arm64": "0.2.1",
-		"@dforge-core/dforge-cli-linux-x64": "0.2.1",
-		"@dforge-core/dforge-cli-win32-arm64": "0.2.1",
-		"@dforge-core/dforge-cli-win32-x64": "0.2.1"
+		"@dforge-core/dforge-cli-darwin-arm64": "0.2.3",
+		"@dforge-core/dforge-cli-darwin-x64": "0.2.3",
+		"@dforge-core/dforge-cli-linux-arm64": "0.2.3",
+		"@dforge-core/dforge-cli-linux-x64": "0.2.3",
+		"@dforge-core/dforge-cli-win32-arm64": "0.2.3",
+		"@dforge-core/dforge-cli-win32-x64": "0.2.3"
 	}
 }