@reliverse/rempts 1.7.2 → 1.7.3

package/README.md

@@ -18,7 +18,7 @@
 - 🚨 Crash-safe (Ctrl+C, SIGINT, errors)
 - 🪄 Minimal API surface, max expressiveness
 - 🧪 Scriptable for testing, stable for production
-- 🆕 Automatic commands creation (via `dler init --cmd my-cool-cmd`)
+- 🆕 Automatic commands creation (via `dler rempts init --cmd my-cool-cmd`)
 - 🏞️ No more hacking together `inquirer`, `citty`, `commander`, `chalk`
 
 ## Installation
@@ -145,6 +145,8 @@ await main();
 
 #### Launcher Usage Example
 
+**Important**: Ensure your commands don't have `await main();`, `await runMain();`, or something like that — to prevent any unexpected behavior. Only main command should have it.
+
 ```ts
 import { relinka } from "@reliverse/relinka";
 
@@ -220,7 +222,7 @@ export default defineCommand({
 **Hint**:
 
 - Install `bun add -D @reliverse/dler`
-- Use `dler init --cmd cmd1 cmd2` to init commands for rempts launcher's automatically
+- Use `dler rempts init --cmd cmd1 cmd2` to init commands for rempts launcher's automatically
 
 ### Advanced Minimal API
 
@@ -287,7 +289,7 @@ await runMain(defineCommand({}));
 
 ```bash
 bun add -D @reliverse/dler # or: bun i -g @reliverse/dler
-bun dler init --cmd my-cmd-1 # or: dler init my-cmd-1 my-cmd-2 --main src/mod.ts
+bun dler rempts init --cmd my-cmd-1 # or: dler rempts init my-cmd-1 my-cmd-2 --main src/mod.ts
 # * `--main` is optional, default is `./src/mod.ts`
 # * you can specify multiple commands at once
 ```

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

@@ -53,6 +53,7 @@ type CommandContext<ARGS> = {
     raw: string[];
 };
 type CommandRun<ARGS> = (ctx: CommandContext<ARGS>) => void | Promise<void>;
+type CommandHook<ARGS> = (ctx: CommandContext<ARGS>) => void | Promise<void>;
 type DefineCommandOptions<A extends ArgDefinitions = EmptyArgs> = {
     meta?: CommandMeta;
     args?: A;
@@ -66,21 +67,21 @@ type DefineCommandOptions<A extends ArgDefinitions = EmptyArgs> = {
      */
     subCommands?: CommandsMap;
     /**
-     * Called before the command runs
+     * Called before the command runs. Receives `{ args, raw }` (parsed args and raw argv).
      */
-    onCmdStart?: () => void | Promise<void>;
+    onCmdStart?: CommandHook<InferArgTypes<A>>;
     /**
-     * Called after the command finishes
+     * Called after the command finishes. Receives `{ args, raw }` (parsed args and raw argv).
      */
-    onCmdEnd?: () => void | Promise<void>;
+    onCmdEnd?: CommandHook<InferArgTypes<A>>;
     /**
      * @deprecated Use onCmdStart instead
      */
-    setup?: () => void | Promise<void>;
+    setup?: CommandHook<InferArgTypes<A>>;
     /**
      * @deprecated Use onCmdEnd instead
      */
-    cleanup?: () => void | Promise<void>;
+    cleanup?: CommandHook<InferArgTypes<A>>;
     /**
      * Called once per CLI process, before any command/run() is executed
      */
@@ -103,21 +104,21 @@ export type Command<A extends ArgDefinitions = EmptyArgs> = {
      */
     subCommands?: CommandsMap;
     /**
-     * Called before the command runs
+     * Called before the command runs. Receives `{ args, raw }` (parsed args and raw argv).
      */
-    onCmdStart?: () => void | Promise<void>;
+    onCmdStart?: CommandHook<InferArgTypes<A>>;
     /**
-     * Called after the command finishes
+     * Called after the command finishes. Receives `{ args, raw }` (parsed args and raw argv).
      */
-    onCmdEnd?: () => void | Promise<void>;
+    onCmdEnd?: CommandHook<InferArgTypes<A>>;
     /**
      * @deprecated Use onCmdStart instead
      */
-    setup?: () => void | Promise<void>;
+    setup?: CommandHook<InferArgTypes<A>>;
     /**
      * @deprecated Use onCmdEnd instead
      */
-    cleanup?: () => void | Promise<void>;
+    cleanup?: CommandHook<InferArgTypes<A>>;
     /**
      * Called once per CLI process, before any command/run() is executed
      */

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

@@ -167,7 +167,7 @@ export async function showUsage(command, parserOptions = {}, displayNotFoundMess
         );
       }
       if (subCommandNames.length > 0) {
-        relinka("log", "Available commands (run with `help` to see more):");
+        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}` : ""}`);
@@ -217,14 +217,14 @@ export async function showUsage(command, parserOptions = {}, displayNotFoundMess
       );
     }
     if (subCommandNames.length > 0) {
-      relinka("log", "Available commands (run with `help` to see more):");
+      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}` : ""}`);
       });
     }
   }
-  relinka("log", "Available options:");
+  relinka("info", "Available options:");
   relinka("log", "\u2022 -h, --help    | Show help");
   relinka("log", "\u2022 -v, --version | Show version");
   relinka("log", "\u2022 --debug       | Enable debug mode");
@@ -334,14 +334,17 @@ This can cause recursion or unexpected behavior.`
     if (fileBasedEnabled && rawArgv.length > 0 && !isFlag(rawArgv[0])) {
       const [subName, ...subCmdArgv] = rawArgv;
       try {
+        const ctx = getParsedContext(command, rawArgv, parserOptions);
         if (typeof command.onCmdStart === "function")
-          await command.onCmdStart();
+          await command.onCmdStart(ctx);
         await runFileBasedSubCmd(
           subName,
           subCmdArgv,
           parserOptions.fileBasedCmds,
           parserOptions,
-          command.onCmdEnd
+          command.onCmdEnd ? async (_subCtx) => {
+            await command.onCmdEnd?.(ctx);
+          } : void 0
         );
         if (autoExit) process.exit(0);
         return;
@@ -371,13 +374,16 @@ This can cause recursion or unexpected behavior.`
       }
       if (subSpec) {
         try {
+          const ctx = getParsedContext(command, rawArgv, parserOptions);
           if (typeof command.onCmdStart === "function")
-            await command.onCmdStart();
+            await command.onCmdStart(ctx);
           await runSubCommand(
             subSpec,
             subCmdArgv,
             parserOptions,
-            command.onCmdEnd
+            command.onCmdEnd ? async (_subCtx) => {
+              await command.onCmdEnd?.(ctx);
+            } : void 0
           );
           if (autoExit) process.exit(0);
           return;
@@ -474,20 +480,32 @@ Info for this CLI's developer: No valid command directory found, expected: ${exp
     );
   }
   try {
-    await runCommandWithArgs(subCommand, argv, parserOptions);
+    const subCtx = await runCommandWithArgs(
+      subCommand,
+      argv,
+      parserOptions,
+      true
+    );
+    if (typeof parentFinish === "function" && subCtx)
+      await parentFinish(subCtx);
   } finally {
-    if (typeof parentFinish === "function") await parentFinish();
   }
 }
 async function runSubCommand(spec, argv, parserOptions, parentFinish) {
   const subCommand = await loadSubCommand(spec);
   try {
-    await runCommandWithArgs(subCommand, argv, parserOptions);
+    const subCtx = await runCommandWithArgs(
+      subCommand,
+      argv,
+      parserOptions,
+      true
+    );
+    if (typeof parentFinish === "function" && subCtx)
+      await parentFinish(subCtx);
   } finally {
-    if (typeof parentFinish === "function") await parentFinish();
   }
 }
-async function runCommandWithArgs(command, argv, parserOptions) {
+async function runCommandWithArgs(command, argv, parserOptions, returnCtx) {
   const autoExit = parserOptions.autoExit !== false;
   const booleanKeys = Object.keys(command.args || {}).filter(
     (k) => command.args[k].type === "boolean"
@@ -593,6 +611,8 @@ ${String(err)}`);
     if (autoExit) process.exit(1);
     else throw err;
   }
+  if (returnCtx) return ctx;
+  return void 0;
 }
 function castArgValue(def, rawVal, argName) {
   if (rawVal == null) {
@@ -708,3 +728,47 @@ export async function runCmd(command, argv = [], parserOptions = {}) {
     throw new Error("Command has no run() handler.");
   }
 }
+function getParsedContext(command, argv, parserOptions) {
+  const booleanKeys = Object.keys(command.args || {}).filter(
+    (k) => command.args[k].type === "boolean"
+  );
+  const defaultMap = {};
+  for (const [argKey, def] of Object.entries(command.args || {})) {
+    if (def.default !== void 0) {
+      if (def.type === "array" && typeof def.default === "string") {
+        defaultMap[argKey] = [def.default];
+      } else {
+        defaultMap[argKey] = def.default;
+      }
+    }
+  }
+  const mergedParserOptions = {
+    ...parserOptions,
+    boolean: [...parserOptions.boolean || [], ...booleanKeys],
+    defaults: { ...defaultMap, ...parserOptions.defaults || {} }
+  };
+  const parsed = reliArgParser(argv, mergedParserOptions);
+  const finalArgs = {};
+  const positionalKeys = Object.keys(command.args || {}).filter(
+    (k) => command.args[k].type === "positional"
+  );
+  const leftoverPositionals = [...parsed._ || []];
+  for (let i = 0; i < positionalKeys.length; i++) {
+    const key = positionalKeys[i];
+    const def = command.args?.[key];
+    const val = leftoverPositionals[i];
+    finalArgs[key] = val != null ? castArgValue(def, val, key) : def.default;
+  }
+  const otherKeys = Object.keys(command.args || {}).filter(
+    (k) => command.args[k].type !== "positional"
+  );
+  for (const key of otherKeys) {
+    const def = command.args?.[key];
+    let rawVal = parsed[key];
+    if (def.type === "array" && rawVal !== void 0 && !Array.isArray(rawVal)) {
+      rawVal = [rawVal];
+    }
+    finalArgs[key] = castArgValue(def, rawVal, key);
+  }
+  return { args: finalArgs, raw: argv };
+}

package/package.json

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