@reliverse/rempts 1.7.5 → 1.7.7

package/bin/components/launcher/launcher-mod.d.ts

@@ -163,7 +163,10 @@ export declare function showUsage<A extends ArgDefinitions>(command: Command<A>,
     metaSettings?: {
         showDescriptionOnMain?: boolean;
     };
-}, displayNotFoundMessage?: boolean): Promise<void>;
+    _fileBasedCurrentDir?: string;
+    _fileBasedPathSegments?: string[];
+    _isSubcommand?: boolean;
+}): Promise<void>;
 /**
  * Primary entry point to run a command. This function supports:
  *

package/bin/components/launcher/launcher-mod.js

@@ -105,11 +105,34 @@ async function getDefaultCliNameAndVersion() {
     return { name: "cli", version: void 0 };
   }
 }
-export async function showUsage(command, parserOptions = {}, displayNotFoundMessage) {
+async function findDirectFileBasedSubcommands(currentDir) {
+  const results = [];
+  const items = await fs.readdir(currentDir, { withFileTypes: true });
+  for (const dirent of items) {
+    if (dirent.isDirectory()) {
+      for (const fname of ["cmd.ts", "cmd.js"]) {
+        const fpath = path.join(currentDir, dirent.name, fname);
+        if (await fs.pathExists(fpath)) {
+          try {
+            const imported = await import(path.resolve(fpath));
+            if (imported.default && !imported.default.meta?.hidden) {
+              results.push({ name: dirent.name, def: imported.default });
+            }
+          } catch (err) {
+            debugLog(`Skipping file-based subcommand in ${fpath}:`, err);
+          }
+          break;
+        }
+      }
+    }
+  }
+  return results;
+}
+export async function showUsage(command, parserOptions = {}) {
   const { name: fallbackName, version: fallbackVersion } = await getDefaultCliNameAndVersion();
   const cliName = command.meta?.name || fallbackName;
   const cliVersion = command.meta?.version || fallbackVersion;
-  relinka("log", `${cliName}${cliVersion ? ` v${cliVersion}` : ""}`);
+  relinka("info", `${cliName}${cliVersion ? ` v${cliVersion}` : ""}`);
   if (parserOptions.metaSettings?.showDescriptionOnMain) {
     let description = command.meta?.description;
     if (!description) {
@@ -123,64 +146,40 @@ export async function showUsage(command, parserOptions = {}, displayNotFoundMess
       relinka("log", description);
     }
   }
+  const { name: pkgName } = await getDefaultCliNameAndVersion();
   const fileCmds = parserOptions.fileBasedCmds;
   if (fileCmds?.enable) {
-    const usageLine = `Usage: ${cliName} <command> [command's options]`;
-    relinka("log", usageLine);
-    try {
-      const commandsDir = path.resolve(fileCmds.cmdsRootPath);
-      const items = await fs.readdir(commandsDir, {
-        withFileTypes: true
-      });
-      const subCommandNames = [];
-      const subCommandDefs = [];
-      for (const dirent of items) {
-        if (dirent.isDirectory()) {
-          const name = dirent.name;
-          const cmdTs = path.join(commandsDir, name, "cmd.ts");
-          const cmdJs = path.join(commandsDir, name, "cmd.js");
-          let imported;
-          try {
-            if (await fs.pathExists(cmdTs)) {
-              imported = await import(path.resolve(cmdTs));
-            } else if (await fs.pathExists(cmdJs)) {
-              imported = await import(path.resolve(cmdJs));
-            } else {
-              continue;
-            }
-            if (imported.default && !imported.default.meta?.hidden) {
-              subCommandNames.push(name);
-              subCommandDefs.push({ name, def: imported.default });
-            }
-          } catch (err) {
-            debugLog(`Skipping file-based subcommand in ${name}:`, err);
-          }
-        }
-      }
-      if (subCommandDefs.length > 0) {
-        const randomIdx = Math.floor(Math.random() * subCommandDefs.length);
-        const { name: exampleCmd, def: exampleDef } = subCommandDefs[randomIdx];
-        const exampleArgs = buildExampleArgs(exampleDef.args || {});
+    const commandsDir = path.resolve(fileCmds.cmdsRootPath);
+    const currentDir = parserOptions._fileBasedCurrentDir || commandsDir;
+    const pathSegments = parserOptions._fileBasedPathSegments || [];
+    let usageLine = [pkgName, ...pathSegments].join(" ");
+    const directSubs = await findDirectFileBasedSubcommands(currentDir);
+    if (directSubs.length > 0) {
+      usageLine += " <command> [command's options]";
+    } else {
+      usageLine += " [command's options]";
+      const pos = renderPositional(command.args);
+      if (pos) usageLine += ` ${pos}`;
+    }
+    relinka("log", `Usage: ${usageLine}`);
+    if (directSubs.length > 0) {
+      const randomIdx = Math.floor(Math.random() * directSubs.length);
+      const { name: exampleCmd, def: exampleDef } = directSubs[randomIdx];
+      const exampleArgs = buildExampleArgs(exampleDef.args || {});
+      relinka(
+        "log",
+        `Example: ${pkgName} ${[...pathSegments, exampleCmd].join(" ")}${exampleArgs ? ` ${exampleArgs}` : ""}`
+      );
+    }
+    if (directSubs.length > 0) {
+      relinka("info", "Available commands (run with `help` to see more):");
+      directSubs.forEach(({ name, def }) => {
+        const desc = def?.meta?.description ?? "";
         relinka(
           "log",
-          `Example: ${cliName} ${exampleCmd}${exampleArgs ? ` ${exampleArgs}` : ""}`
-        );
-      }
-      if (subCommandNames.length > 0) {
-        relinka("info", "Available commands (run with `help` to see more):");
-        subCommandDefs.forEach(({ name, def }) => {
-          const desc = def?.meta?.description ?? "";
-          relinka("log", `\u2022 ${name}${desc ? ` | ${desc}` : ""}`);
-        });
-      }
-    } catch (err) {
-      if (displayNotFoundMessage) {
-        relinka(
-          "warn",
-          `No file-based subcommands found in ${fileCmds.cmdsRootPath}`
+          `\u2022 ${[...pathSegments, name].join(" ")}${desc ? ` | ${desc}` : ""}`
         );
-      }
-      debugLog("Error reading file-based commands:", err);
+      });
     }
   } else {
     const subCommandNames = [];
@@ -200,7 +199,10 @@ export async function showUsage(command, parserOptions = {}, displayNotFoundMess
         }
       }
     }
-    let usageLine = cliName;
+    let usageLine = pkgName;
+    if (parserOptions._isSubcommand) {
+      usageLine += ` ${cliName}`;
+    }
     if (subCommandNames.length > 0) {
       usageLine += " <command> [command's options]";
     } else {
@@ -213,7 +215,7 @@ export async function showUsage(command, parserOptions = {}, displayNotFoundMess
       const exampleArgs = buildExampleArgs(exampleDef.args || {});
       relinka(
         "log",
-        `Example: ${cliName} ${exampleCmd}${exampleArgs ? ` ${exampleArgs}` : ""}`
+        `Example: ${pkgName}${parserOptions._isSubcommand ? ` ${cliName}` : ""} ${exampleCmd}${exampleArgs ? ` ${exampleArgs}` : ""}`
       );
     }
     if (subCommandNames.length > 0) {
@@ -309,26 +311,26 @@ This can cause recursion or unexpected behavior.`
       );
       process.exit(1);
     }
-    if (rawArgv[0] === "help") {
-      await showUsage(command, parserOptions);
-      if (autoExit) process.exit(0);
-      return;
-    }
-    await relinkaConfig;
-    if (checkHelp(rawArgv)) {
-      await showUsage(command, parserOptions);
-      if (autoExit) process.exit(0);
-      return;
-    }
-    if (checkVersion(rawArgv)) {
-      if (command.meta?.name) {
-        relinka(
-          "log",
-          `${command.meta?.name} ${command.meta?.version ? `v${command.meta?.version}` : ""}`
+    if (parserOptions.fileBasedCmds?.enable && rawArgv.length > 0) {
+      const commandsDir = path.resolve(
+        parserOptions.fileBasedCmds.cmdsRootPath
+      );
+      const resolved = await resolveFileBasedCommandPath(commandsDir, rawArgv);
+      if (resolved) {
+        const { def: subCommand, leftoverArgv, path: pathSegments } = resolved;
+        const helpIdx = leftoverArgv.findIndex(
+          (arg) => arg === "help" || arg === "--help" || arg === "-h"
         );
+        if (helpIdx !== -1) {
+          await showUsage(subCommand, {
+            ...parserOptions,
+            _fileBasedCurrentDir: pathSegments.length ? path.join(commandsDir, ...pathSegments) : commandsDir,
+            _fileBasedPathSegments: pathSegments
+          });
+          if (autoExit) process.exit(0);
+          return;
+        }
       }
-      if (autoExit) process.exit(0);
-      return;
     }
     const fileBasedEnabled = parserOptions.fileBasedCmds?.enable;
     if (fileBasedEnabled && rawArgv.length > 0 && !isFlag(rawArgv[0])) {
@@ -373,6 +375,18 @@ This can cause recursion or unexpected behavior.`
         }
       }
       if (subSpec) {
+        const helpIdx = subCmdArgv.findIndex(
+          (arg) => arg === "help" || arg === "--help" || arg === "-h"
+        );
+        if (helpIdx !== -1) {
+          const subCommandDef = await loadSubCommand(subSpec);
+          await showUsage(subCommandDef, {
+            ...parserOptions,
+            _isSubcommand: true
+          });
+          if (autoExit) process.exit(0);
+          return;
+        }
         try {
           const ctx = getParsedContext(command, rawArgv, parserOptions);
           if (typeof command.onCmdInit === "function")
@@ -380,7 +394,7 @@ This can cause recursion or unexpected behavior.`
           await runSubCommand(
             subSpec,
             subCmdArgv,
-            parserOptions,
+            { ...parserOptions, _isSubcommand: true },
             command.onCmdExit ? async (_subCtx) => {
               await command.onCmdExit?.(ctx);
             } : void 0
@@ -394,6 +408,22 @@ This can cause recursion or unexpected behavior.`
         }
       }
     }
+    await relinkaConfig;
+    if (rawArgv[0] === "help" || checkHelp(rawArgv)) {
+      await showUsage(command, parserOptions);
+      if (autoExit) process.exit(0);
+      return;
+    }
+    if (checkVersion(rawArgv)) {
+      if (command.meta?.name) {
+        relinka(
+          "info",
+          `${command.meta?.name} ${command.meta?.version ? `v${command.meta?.version}` : ""}`
+        );
+      }
+      if (autoExit) process.exit(0);
+      return;
+    }
     try {
       await runCommandWithArgs(command, rawArgv, parserOptions);
     } finally {
@@ -500,6 +530,14 @@ Info for this CLI's developer: No valid command directory found, expected: ${exp
 async function runSubCommand(spec, argv, parserOptions, parentFinish) {
   const subCommand = await loadSubCommand(spec);
   try {
+    const helpIdx = argv.findIndex(
+      (arg) => arg === "help" || arg === "--help" || arg === "-h"
+    );
+    if (helpIdx !== -1) {
+      await showUsage(subCommand, { ...parserOptions, _isSubcommand: true });
+      if (parserOptions.autoExit !== false) process.exit(0);
+      return;
+    }
     const subCtx = await runCommandWithArgs(
       subCommand,
       argv,
@@ -603,7 +641,7 @@ async function runCommandWithArgs(command, argv, parserOptions, returnCtx) {
       const noSubcommandArgInCurrentCall = !argv.some((arg) => !isFlag(arg));
       if (isDispatcher && noSubcommandArgInCurrentCall) {
         relinka("warn", "Please specify a command");
-        await showUsage(command, parserOptions, true);
+        await showUsage(command, parserOptions);
         if (autoExit) process.exit(0);
         return;
       }
@@ -792,3 +830,32 @@ function getParsedContext(command, argv, parserOptions) {
   }
   return { args: finalArgs, raw: argv };
 }
+async function resolveFileBasedCommandPath(cmdsRoot, argv) {
+  let currentDir = cmdsRoot;
+  const pathSegments = [];
+  let leftover = [...argv];
+  while (leftover.length > 0 && !isFlag(leftover[0])) {
+    const nextDir = path.join(currentDir, leftover[0]);
+    if (await fs.pathExists(nextDir) && (await fs.stat(nextDir)).isDirectory()) {
+      currentDir = nextDir;
+      pathSegments.push(leftover[0]);
+      leftover = leftover.slice(1);
+    } else {
+      break;
+    }
+  }
+  for (const fname of ["cmd.ts", "cmd.js"]) {
+    const fpath = path.join(currentDir, fname);
+    if (await fs.pathExists(fpath)) {
+      const imported = await import(path.resolve(fpath));
+      if (imported.default) {
+        return {
+          def: imported.default,
+          path: pathSegments,
+          leftoverArgv: leftover
+        };
+      }
+    }
+  }
+  return null;
+}

package/bin/mod.d.ts

@@ -5,7 +5,7 @@ export { mainSymbols, fallbackSymbols, } from "./components/figures/figures-mod.
 export { confirmPrompt } from "./components/input/confirm-prompt.js";
 export { inputPrompt } from "./components/input/input-prompt.js";
 export type { ArgDefinition, ArgDefinitions, CommandsMap, Command, InferArgTypes, FileBasedCmdsOptions, } from "./components/launcher/launcher-mod.js";
-export { defineCommand, defineArgs, showUsage, runMain, } from "./components/launcher/launcher-mod.js";
+export { defineCommand, defineArgs, showUsage, runMain, runCmd, } from "./components/launcher/launcher-mod.js";
 export { toBaseColor, toSolidColor } from "./components/msg-fmt/colors.js";
 export { relinkaByRemptsDeprecated, relinkaAsyncByRemptsDeprecated, throwError, } from "./components/msg-fmt/logger.js";
 export { colorMap, typographyMap } from "./components/msg-fmt/mapping.js";

package/bin/mod.js

@@ -11,7 +11,8 @@ export {
   defineCommand,
   defineArgs,
   showUsage,
-  runMain
+  runMain,
+  runCmd
 } from "./components/launcher/launcher-mod.js";
 export { toBaseColor, toSolidColor } from "./components/msg-fmt/colors.js";
 export {

package/package.json

@@ -28,7 +28,7 @@
   "license": "MIT",
   "name": "@reliverse/rempts",
   "type": "module",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "author": "reliverse",
   "bugs": {
     "email": "blefnk@gmail.com",