@kosdev-code/kos-ui-cli 2.1.39 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kosdev-code/kos-ui-cli",
-  "version": "2.1.39",
+  "version": "3.0.0",
   "bin": {
     "kosui": "./src/lib/cli.mjs"
   },
@@ -15,14 +15,13 @@
     "plop": "^3.1.2",
     "inquirer-directory": "^2.2.0",
     "figlet": "^1.6.0",
-    "create-nx-workspace": "18.0.3",
-    "openapi-typescript": "^7.6.1"
+    "create-nx-workspace": "21.6.10",
+    "openapi-typescript": "^7.6.1",
+    "@kosdev-code/kos-codegen-core": "~3.0.0"
   },
-  "module": "./src/index.js",
-  "main": "./src/index.js",
   "kos": {
     "build": {
-      "gitHash": "a6bf619546c3e6d08d77363dd1493226083a291f"
+      "gitHash": "681d3ed1315f7d905a8749f448fcc230639ed4a5"
     }
   },
   "publishConfig": {

package/src/lib/cli.mjs

@@ -6,9 +6,15 @@ import nodePlop from "node-plop";
 import path, { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { clearCache } from "./utils/cache.mjs";
-import { buildNonInteractiveCommand, isRunningInteractively } from "./utils/command-builder.mjs";
+import {
+  displayGeneralHelp,
+  displayGeneratorHelp,
+} from "./utils/cli-help-display.mjs";
+import {
+  buildNonInteractiveCommand,
+  isRunningInteractively,
+} from "./utils/command-builder.mjs";
 import { getGeneratorMetadata } from "./utils/generator-loader.mjs";
-import { displayGeneralHelp, displayGeneratorHelp } from "./utils/cli-help-display.mjs";
 
 const originalArgs = process.argv.slice(2);
 const parsedArgs = minimist(originalArgs);
@@ -22,7 +28,9 @@ const hasQuiet = originalArgs.includes("--quiet");
 if (hasNoCache || hasRefresh) {
   process.env.DISABLE_CACHE = "true";
   if (!hasQuiet) {
-    console.log("[kos-cli] Cache disabled or refresh forced. Clearing cache...");
+    console.log(
+      "[kos-cli] Cache disabled or refresh forced. Clearing cache..."
+    );
   }
   clearCache();
 }
@@ -35,6 +43,13 @@ if (hasQuiet) {
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const configPath = path.join(__dirname, "plopfile.mjs");
 
+// Point codegen-core's template resolver to the templates bundled with this CLI.
+// Required because template-resolver.ts uses __dirname (a CJS global) which is
+// undefined when its code is bundled into an ESM generator bundle.
+if (!process.env.KOS_TEMPLATE_BASE_DIR) {
+  process.env.KOS_TEMPLATE_BASE_DIR = path.resolve(__dirname, "../..");
+}
+
 const showBanner =
   command !== "help" && process.env.DISABLE_CLI_BANNER !== "true";
 
@@ -49,7 +64,10 @@ function parseArgumentValue(value) {
     return true;
   } else if (value === "false" || value === "n" || value === "no") {
     return false;
-  } else if (typeof value === "string" && (value.startsWith("{") || value.startsWith("["))) {
+  } else if (
+    typeof value === "string" &&
+    (value.startsWith("{") || value.startsWith("["))
+  ) {
     // Try to parse JSON for complex arguments like --app-version='{"ice-app":"v2"}'
     try {
       return JSON.parse(value);
@@ -61,9 +79,9 @@ function parseArgumentValue(value) {
     // Handle repeated arguments like --app-version ice-app=v2 --app-version apc=v3
     // Minimist stores repeated args as arrays
     const parsedObject = {};
-    value.forEach(item => {
-      if (typeof item === 'string' && item.includes('=')) {
-        const [key, val] = item.split('=');
+    value.forEach((item) => {
+      if (typeof item === "string" && item.includes("=")) {
+        const [key, val] = item.split("=");
         parsedObject[key.trim()] = val.trim();
       }
     });
@@ -71,7 +89,7 @@ function parseArgumentValue(value) {
   } else if (typeof value === "string" && value.includes("=")) {
     // Handle single key=value format like --app-version ice-app=v2
     const parsedObject = {};
-    const [key, val] = value.split('=');
+    const [key, val] = value.split("=");
     parsedObject[key.trim()] = val.trim();
     return parsedObject;
   }
@@ -357,10 +375,16 @@ async function launch() {
     });
 
     // Output equivalent non-interactive command when running interactively
-    if (isRunningInteractively(parsedArgs, hasAnyAnswers) && results.failures.length === 0 && !hasQuiet) {
+    if (
+      isRunningInteractively(parsedArgs, hasAnyAnswers) &&
+      results.failures.length === 0 &&
+      !hasQuiet
+    ) {
       const commandString = buildNonInteractiveCommand(command, answers, meta);
       if (commandString) {
-        console.log(chalk.cyan("\n[kos-cli] Equivalent non-interactive command:"));
+        console.log(
+          chalk.cyan("\n[kos-cli] Equivalent non-interactive command:")
+        );
         console.log(chalk.green(`  ${commandString}`));
       }
     }