@reliverse/rempts 1.7.26 → 1.7.28

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

@@ -318,41 +318,13 @@ export async function runMain(command, parserOptions = {}) {
   }
   try {
     if (!parserOptions.fileBasedCmds && !command.commands) {
-      let callerDir = process.cwd();
-      let callerFile;
-      try {
-        const err = new Error();
-        const stack = err.stack?.split("\n");
-        if (stack) {
-          for (const line of stack) {
-            const match = /\((.*):(\d+):(\d+)\)/.exec(line) || /at (.*):(\d+):(\d+)/.exec(line);
-            if (match?.[1] && !match[1].includes("launcher-mod")) {
-              callerFile = match[1];
-              break;
-            }
-          }
-        }
-        if (callerFile) {
-          callerDir = path.dirname(callerFile);
-          if (parserOptions.fileBasedCmds?.enable) {
-            const rel = path.relative(process.cwd(), callerFile);
-            if (/app[/][^/]+[/]cmd\.(ts|js)$/.test(rel)) {
-              relinka(
-                "error",
-                `runMain() should not be called from a file-based subcommand: ${rel}
-This can cause recursion or unexpected behavior.
-Move your runMain() call to your main CLI entry file.`
-              );
-              process.exit(1);
-            }
-          }
-        }
-      } catch (_e) {
-      }
-      const defaultCmdsRoot = path.resolve(callerDir, "app");
+      const mainEntry = process.argv[1] ? path.dirname(path.resolve(process.argv[1])) : process.cwd();
+      const defaultCmdsRoot = path.join(mainEntry, "src", "app");
+      const exists = await fs.pathExists(defaultCmdsRoot);
+      const finalCmdsRoot = exists ? defaultCmdsRoot : path.join(mainEntry, "app");
       parserOptions.fileBasedCmds = {
         enable: true,
-        cmdsRootPath: defaultCmdsRoot
+        cmdsRootPath: finalCmdsRoot
       };
     }
     const rawArgv = process.argv.slice(2);

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

@@ -11,6 +11,7 @@ export type BaseArgDefinition = {
     default?: any;
     allowed?: any[];
     dependencies?: string[];
+    useTsType?: unknown;
 };
 export type PositionalArgDefinition = BaseArgDefinition & {
     type: "positional";
@@ -138,7 +139,9 @@ export type Command<A extends ArgDefinitions = EmptyArgs> = {
     onLauncherExit?: () => void | Promise<void>;
 };
 export type InferArgTypes<A extends ArgDefinitions> = {
-    [K in keyof A]: A[K] extends PositionalArgDefinition ? string : A[K] extends BooleanArgDefinition ? boolean : A[K] extends StringArgDefinition ? string : A[K] extends NumberArgDefinition ? number : A[K] extends {
+    [K in keyof A]: A[K] extends {
+        useTsType: infer T;
+    } ? T : A[K] extends PositionalArgDefinition ? string : A[K] extends BooleanArgDefinition ? boolean : A[K] extends StringArgDefinition ? string : A[K] extends NumberArgDefinition ? number : A[K] extends {
         type: "array";
     } ? string[] : never;
 };

package/package.json

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