@kosdev-code/kos-ui-cli 2.0.12 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kosdev-code/kos-ui-cli",
-  "version": "2.0.12",
+  "version": "2.0.15",
   "bin": {
     "kosui": "./src/lib/cli.mjs"
   },
@@ -20,7 +20,7 @@
   "main": "./src/index.js",
   "kos": {
     "build": {
-      "gitHash": "f7bff7804be08489d28668bf767b5ca447792543"
+      "gitHash": "094801c4dad84a87afcf8b6cbdefd9aa38bfaf78"
     }
   },
   "publishConfig": {

package/src/lib/cli.mjs

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import figlet from "figlet";
 import minimist from "minimist";
+import nodePlop from "node-plop";
 import path, { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { Plop, run } from "plop";
 import { clearCache } from "./utils/cache.mjs";
 import { getGeneratorMetadata } from "./utils/generator-loader.mjs";
 
-// -- Step 1: Sanitize flags early and persist to env
 const originalArgs = process.argv.slice(2);
 const parsedArgs = minimist(originalArgs);
+const command = parsedArgs._[0] || "help";
 
 const customFlags = ["--no-cache", "--refresh"];
 const hasNoCache = originalArgs.includes("--no-cache");
@@ -21,51 +21,62 @@ if (hasNoCache || hasRefresh) {
   clearCache();
 }
 
-// -- Step 2: Strip custom flags from argv so Plop doesn't choke
-process.argv = [
-  ...process.argv.slice(0, 2),
-  ...originalArgs.filter((arg) => !customFlags.includes(arg)),
-];
-
-// -- Step 3: Resolve generator
-const command = parsedArgs._[0] || "help";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const configPath = path.join(__dirname, "plopfile.mjs");
 
 const showBanner =
-  command !== "help" &&
-  command !== "env" &&
-  process.env.DISABLE_CLI_BANNER !== "true";
+  command !== "help" && process.env.DISABLE_CLI_BANNER !== "true";
 
-// -- Step 4: Optional figlet banner
-function launch() {
-  Plop.prepare(
-    {
-      cwd: parsedArgs.cwd,
-      configPath,
-      preload: parsedArgs.preload || [],
-      completion: parsedArgs.completion,
-    },
-    async (env) => {
-      if (command && command !== "help" && command !== "env") {
-        const meta = await getGeneratorMetadata(command);
-        console.log(`--- Running KOS Generator: ${meta?.name || command} ---`);
-      } else if (command === "env") {
-        console.warn("--- Discover Studio Environment Variables ---");
-      } else {
-        console.warn("--- KOS CLI Help ---");
-      }
+async function launch() {
+  const plop = await nodePlop(configPath);
 
-      return run({ ...env, dest: process.cwd() }, undefined, true);
-    }
-  );
+  plop.setActionType("clearCache", (answers, config, plop) => {
+    clearCache();
+    return "[ok] CLI cache cleared successfully.";
+  });
+
+  if (!command || command === "help") {
+    console.warn("--- KOS CLI Help ---");
+    plop.getGeneratorList().forEach((g) => {
+      console.log(`- ${g.name}: ${g.description}`);
+    });
+    return;
+  }
+
+  const generator = plop.getGenerator(command);
+
+  if (!generator) {
+    console.error(`[kos-cli] Generator "${command}" not found.`);
+    process.exit(1);
+  }
+  const meta = await getGeneratorMetadata(command);
+  if (showBanner) {
+    console.log(`--- Running KOS Generator: ${meta?.name || command} ---`);
+  }
+
+  try {
+    const answers = await generator.runPrompts();
+    const results = await generator.runActions(answers);
+
+    console.log("[kos-cli] Generator completed successfully!");
+    results.changes.forEach((result) => {
+      console.log(result.path || result.message);
+    });
+
+    results.failures.forEach((fail) => {
+      console.error(fail.error || fail.message);
+    });
+  } catch (err) {
+    console.error("[kos-cli] Generator run failed:", err.message);
+    process.exit(1);
+  }
 }
 
 if (showBanner) {
   figlet("KOS CLI", function (err, data) {
     if (err) {
       console.error("Figlet failed:", err);
-      return launch();
+      return launch(); // even if figlet fails, run!
     }
     console.log(data);
     launch();

package/src/lib/generators/cache/index.mjs

@@ -1,5 +1,11 @@
 import { clearCache } from "../../utils/cache.mjs";
 
+export const metadata = {
+  name: "cache:clear",
+  description: "Clear the generator context cache",
+  invalidateCache: false,
+  requiresModels: false,
+};
 export default function registerCacheGenerators(plop) {
   plop.setGenerator("cache:clear", {
     description: "Clear the generator context cache",

package/src/lib/generators/component/index.mjs

@@ -1,4 +1,5 @@
 // generators/component/index.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { getAllProjects } from "../../utils/nx-context.mjs";
 import { required } from "../../utils/validators.mjs";
@@ -43,6 +44,6 @@ export default async function (plop) {
         choices: allProjects,
       },
     ],
-    actions: () => [{ type: "createComponent" }],
+    actions: actionFactory("createComponent", metadata),
   });
 }

package/src/lib/generators/env/index.mjs

@@ -12,15 +12,16 @@ export const metadata = {
 export default async function (plop) {
   plop.setPrompt("directory", directoryPrompt);
 
-  const isWorkspace = await detectWorkspace();
-  if (!isWorkspace) {
-    console.warn(
-      "[kos-cli] Not inside an Nx workspace. Skipping env generator."
-    );
-    return;
-  }
-
   plop.setActionType("findEnv", async function () {
+    console.log("[kos-cli] Discovering Studio Environment Variables...");
+    const isWorkspace = await detectWorkspace();
+
+    if (!isWorkspace) {
+      console.warn(
+        "[kos-cli] Not inside an Nx workspace. Skipping env generator."
+      );
+      return "Skipped: Not a workspace";
+    }
     const studioHome = findStudioHome();
     const javaHome = findJavaExecutable();
 
@@ -29,7 +30,7 @@ export default async function (plop) {
       `#  Path to the Java binary\nJAVA_CMD='${javaHome}'\n\n#  Path to the kos installation\nKOS_INSTALL_PATH='${studioHome}'\n`
     );
 
-    return `Studio Home: ${studioHome}\nJava Home: ${javaHome}`;
+    return `\nStudio Home: ${studioHome}\nJava Home: ${javaHome}`;
   });
 
   plop.setGenerator("env", {

package/src/lib/generators/i18n/namespace.mjs

@@ -1,6 +1,7 @@
 // generators/i18n/namespace.mjs
 import fs from "fs";
 import path from "path";
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { getAllProjects, getProjectDetails } from "../../utils/nx-context.mjs";
 import { required } from "../../utils/validators.mjs";
 
@@ -50,6 +51,6 @@ export default async function (plop) {
         choices: allProjects,
       },
     ],
-    actions: () => [{ type: "addNamespace" }],
+    actions: actionFactory("addNamespace", metadata),
   });
 }

package/src/lib/generators/model/companion.mjs

@@ -1,4 +1,5 @@
 // generators/model/companion.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import {
   getAllModels,
@@ -72,6 +73,6 @@ export default async function (plop) {
       },
       ...MODEL_PROMPTS,
     ],
-    actions: () => [{ type: "createCompanionModel" }],
+    actions: actionFactory("createCompanionModel", metadata),
   });
 }

package/src/lib/generators/model/container.mjs

@@ -1,4 +1,5 @@
 // generators/model/container.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import {
   getAllModels,
@@ -61,6 +62,6 @@ export default async function (plop) {
       },
       ...MODEL_PROMPTS,
     ],
-    actions: () => [{ type: "createContainer" }],
+    actions: actionFactory("createContainer", metadata),
   });
 }

package/src/lib/generators/model/context.mjs

@@ -1,4 +1,5 @@
 // generators/model/context.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { getAllModels, getAllProjects } from "../../utils/nx-context.mjs";
 export const metadata = {
@@ -49,6 +50,6 @@ export default async function (plop) {
         choices: allProjects,
       },
     ],
-    actions: () => [{ type: "createContext" }],
+    actions: actionFactory("createContext", metadata),
   });
 }

package/src/lib/generators/model/hook.mjs

@@ -1,4 +1,5 @@
 // generators/model/hook.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { getAllModels, getAllProjects } from "../../utils/nx-context.mjs";
 export const metadata = {
@@ -49,6 +50,6 @@ export default async function (plop) {
         choices: allProjects,
       },
     ],
-    actions: () => [{ type: "createHook" }],
+    actions: actionFactory("createHook", metadata),
   });
 }

package/src/lib/generators/model/model.mjs

@@ -1,4 +1,5 @@
 // generators/model/model.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import {
   getAllProjects,
@@ -58,6 +59,7 @@ export default async function (plop) {
       },
       ...MODEL_PROMPTS,
     ],
-    actions: () => [{ type: "createModel" }],
+
+    actions: actionFactory("createModel", metadata),
   });
 }

package/src/lib/generators/project/app.mjs

@@ -1,4 +1,5 @@
 // generators/project/app.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { required } from "../../utils/validators.mjs";
 
@@ -32,6 +33,6 @@ export default async function (plop) {
         validate: required,
       },
     ],
-    actions: () => [{ type: "createUiProject" }],
+    actions: actionFactory("createUiProject", metadata),
   });
 }

package/src/lib/generators/project/i18n.mjs

@@ -1,4 +1,5 @@
 // generators/i18n/index.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { required } from "../../utils/validators.mjs";
 export const metadata = {
@@ -31,6 +32,6 @@ export default async function (plop) {
         validate: required,
       },
     ],
-    actions: () => [{ type: "createI18nProject" }],
+    actions: actionFactory("createI18nProject", metadata),
   });
 }

package/src/lib/generators/project/plugin.mjs

@@ -1,4 +1,5 @@
 // generators/project/plugin.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { required } from "../../utils/validators.mjs";
 export const metadata = {
@@ -31,6 +32,6 @@ export default async function (plop) {
         validate: required,
       },
     ],
-    actions: () => [{ type: "createPluginProject" }],
+    actions: actionFactory("createPluginProject", metadata),
   });
 }

package/src/lib/generators/project/splash.mjs

@@ -1,4 +1,5 @@
 // generators/project/splash.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { required } from "../../utils/validators.mjs";
 
@@ -32,6 +33,6 @@ export default async function (plop) {
         validate: required,
       },
     ],
-    actions: () => [{ type: "createSplashProject" }],
+    actions: actionFactory("createSplashProject", metadata),
   });
 }

package/src/lib/generators/project/theme.mjs

@@ -1,4 +1,5 @@
 // generators/project/theme.mjs
+import { actionFactory } from "../../utils/action-factory.mjs";
 import { execute } from "../../utils/exec.mjs";
 import { required } from "../../utils/validators.mjs";
 export const metadata = {
@@ -31,6 +32,6 @@ export default async function (plop) {
         validate: required,
       },
     ],
-    actions: () => [{ type: "createThemeProject" }],
+    actions: actionFactory("createThemeProject", metadata),
   });
 }

package/src/lib/plopfile.mjs

@@ -21,7 +21,14 @@ import registerSplashProject from "./generators/project/splash.mjs";
 import registerTheme from "./generators/project/theme.mjs";
 import registerWorkspace from "./generators/workspace/index.mjs";
 
+import { clearCache } from "./utils/cache.mjs";
+
 export default async function (plop) {
+  plop.setActionType("clearCache", (answers, config, plop) => {
+    clearCache();
+    return "[ok] CLI cache cleared successfully.";
+  });
+
   await registerWorkspace(plop);
 
   const isWorkspace = await detectWorkspace();
@@ -30,16 +37,13 @@ export default async function (plop) {
     return;
   }
 
-  // Register all generators
   await registerKosModel(plop);
   await registerHook(plop);
   await registerCompanion(plop);
   await registerContainer(plop);
   await registerContext(plop);
-
   await registerComponent(plop);
   await registerPluginComponent(plop);
-
   await registerTheme(plop);
   await registerUiProject(plop);
   await registerPluginProject(plop);
@@ -47,6 +51,5 @@ export default async function (plop) {
   await registerI18n(plop);
   await registerI18nNamespace(plop);
   await registerEnv(plop);
-
   await registerCacheGenerators(plop);
 }

package/src/lib/utils/action-factory.mjs

@@ -0,0 +1,9 @@
+export const actionFactory = (action, metadata) => {
+  return () => {
+    const _actions = [{ type: action }];
+    if (metadata.invalidateCache) {
+      _actions.push({ type: "clearCache" });
+    }
+    return _actions;
+  };
+};

package/src/lib/utils/cache.mjs

@@ -6,7 +6,7 @@ import path from "path";
 
 // Default to project-local cache; can swap to global using `getGlobalCachePath()`
 const CACHE_PATH = path.resolve(".nx/cli-cache.json");
-const CACHE_TTL = 60 * 1000; // 1 minute
+const CACHE_TTL = 600 * 1000;
 const ARGS = process.argv;
 const DISABLE_CACHE =
   process.env.DISABLE_CACHE === "true" || process.env.REFRESH === "true";

package/src/lib/utils/nx-context.mjs

@@ -1,6 +1,6 @@
 // utils/nx-context.mjs
 import { execSync } from "child_process";
-import { existsSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 import { getCached, setCached } from "./cache.mjs";
@@ -64,26 +64,38 @@ export async function getPluginProjects() {
 export async function getAllModels() {
   const cached = getCached("allModels");
   if (cached) return cached;
-
-  const json = execJson("npx nx show projects --all --json");
-  const allModels = [];
-
-  for (const proj of json) {
-    const modelPath = path.join(__dirname, `../../${proj.root}/models`);
-    if (existsSync(modelPath)) {
-      const models = execSync(`ls ${modelPath}`, { encoding: "utf-8" })
-        .split("\n")
-        .filter(Boolean)
-        .map((file) => ({
-          model: file.replace(/\.ts$/, ""),
-          project: proj.name,
-        }));
-      allModels.push(...models);
+  console.warn(`parsing projects for models...`);
+  const allProjects = await getAllProjects();
+  const models = await allProjects.reduce(async (acc, curr) => {
+    console.warn(`[kos-cli] Pulling modles from project: ${curr}`);
+    const project = await getProjectDetails(curr);
+    const list = await acc;
+
+    const kosConfigPath = path.join(project.root, ".kos.json");
+
+    if (!existsSync(kosConfigPath)) {
+      console.warn(
+        `[kos-cli] No .kos.json found in project ${curr}, skipping...`
+      );
+      return list;
+    }
+    const kosConfig = JSON.parse(readFileSync(kosConfigPath, "utf-8"));
+    if (kosConfig.models) {
+      Object.keys(kosConfig.models).forEach((model) => {
+        list.push({ model: model, project: project.name });
+      });
     }
-  }
 
-  setCached("allModels", allModels);
-  return allModels;
+    return list.sort((a, b) => {
+      if (a.project === b.project) {
+        return a.model.localeCompare(b.model);
+      } else {
+        return a.project.localeCompare(b.project);
+      }
+    });
+  }, []);
+  setCached("allModels", models);
+  return models;
 }
 
 export async function getProjectDetails(projectName) {