@reliverse/rempts 1.7.23 → 1.7.25

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

@@ -628,11 +628,7 @@ async function runCommandWithArgs(command, argv, parserOptions, returnCtx) {
     if (def.type === "boolean") {
       defaultMap[argKey] = def.default !== void 0 ? def.default : false;
     } else if (def.default !== void 0) {
-      if (def.type === "array" && typeof def.default === "string") {
-        defaultMap[argKey] = [def.default];
-      } else {
-        defaultMap[argKey] = def.default;
-      }
+      defaultMap[argKey] = def.type === "array" && typeof def.default === "string" ? [def.default] : def.default;
     }
   }
   const mergedParserOptions = {
@@ -668,38 +664,27 @@ async function runCommandWithArgs(command, argv, parserOptions, returnCtx) {
     if (def.type === "array" && rawVal !== void 0 && !Array.isArray(rawVal)) {
       rawVal = [rawVal];
     }
-    const valueOrDefault = rawVal ?? defaultMap[key];
-    if (valueOrDefault == null && def.required) {
+    const casted = rawVal !== void 0 ? castArgValue(def, rawVal, key) : def.default;
+    const argUsed = rawVal !== void 0 && (def.type === "boolean" ? casted === true : true);
+    if (casted == null && def.required) {
       await showUsage(command, parserOptions);
       relinka("error", `Missing required argument: --${key}`);
       if (autoExit) process.exit(1);
       else throw new Error(`Missing required argument: --${key}`);
     }
-    if (def.dependencies && Array.isArray(def.dependencies)) {
-      const finalValue = parsed[key] ?? defaultMap[key];
-      if (finalValue !== void 0) {
-        const missingDeps = def.dependencies.filter(
-          (dependency) => !(parsed[dependency] ?? defaultMap[dependency])
+    if (argUsed && def.dependencies?.length) {
+      const missingDeps = def.dependencies.filter((d) => {
+        const depVal = parsed[d] ?? defaultMap[d];
+        return !depVal;
+      });
+      if (missingDeps.length > 0) {
+        const depsList = missingDeps.map((d) => `--${d}`).join(", ");
+        throw new Error(
+          `Argument --${key} can only be used when ${depsList} ${missingDeps.length === 1 ? "is" : "are"} set`
         );
-        if (missingDeps.length > 0) {
-          const depsList = missingDeps.map((d) => `--${d}`).join(", ");
-          throw new Error(
-            `Argument --${key} can only be used when ${depsList} ${missingDeps.length === 1 ? "is" : "are"} set`
-          );
-        }
       }
     }
-    try {
-      if (def.type === "boolean") {
-        finalArgs[key] = rawVal !== void 0 ? castArgValue(def, rawVal, key) : false;
-      } else {
-        finalArgs[key] = castArgValue(def, rawVal, key);
-      }
-    } catch (err) {
-      relinka("error", String(err));
-      if (autoExit) process.exit(1);
-      else throw err;
-    }
+    finalArgs[key] = def.type === "boolean" ? Boolean(casted) : casted;
   }
   const ctx = {
     args: finalArgs,
@@ -852,11 +837,7 @@ export async function runCmd(command, argv = [], parserOptions = {}) {
     if (def.type === "boolean") {
       defaultMap[argKey] = def.default !== void 0 ? def.default : false;
     } else if (def.default !== void 0) {
-      if (def.type === "array" && typeof def.default === "string") {
-        defaultMap[argKey] = [def.default];
-      } else {
-        defaultMap[argKey] = def.default;
-      }
+      defaultMap[argKey] = def.type === "array" && typeof def.default === "string" ? [def.default] : def.default;
     }
   }
   const mergedParserOptions = {
@@ -889,34 +870,24 @@ export async function runCmd(command, argv = [], parserOptions = {}) {
     if (def.type === "array" && rawVal !== void 0 && !Array.isArray(rawVal)) {
       rawVal = [rawVal];
     }
-    const valueOrDefault = rawVal ?? defaultMap[key];
-    if (valueOrDefault == null && def.required) {
+    const casted = rawVal !== void 0 ? castArgValue(def, rawVal, key) : def.default;
+    const argUsed = rawVal !== void 0 && (def.type === "boolean" ? casted === true : true);
+    if (casted == null && def.required) {
       throw new Error(`Missing required argument: --${key}`);
     }
-    if (def.dependencies && Array.isArray(def.dependencies)) {
-      const finalValue = parsed[key] ?? defaultMap[key];
-      if (finalValue !== void 0) {
-        const missingDeps = def.dependencies.filter(
-          (dependency) => !(parsed[dependency] ?? defaultMap[dependency])
+    if (argUsed && def.dependencies?.length) {
+      const missingDeps = def.dependencies.filter((d) => {
+        const depVal = parsed[d] ?? defaultMap[d];
+        return !depVal;
+      });
+      if (missingDeps.length) {
+        const depsList = missingDeps.map((d) => `--${d}`).join(", ");
+        throw new Error(
+          `Argument --${key} can only be used when ${depsList} ${missingDeps.length === 1 ? "is" : "are"} set`
         );
-        if (missingDeps.length > 0) {
-          const depsList = missingDeps.map((d) => `--${d}`).join(", ");
-          throw new Error(
-            `Argument --${key} can only be used when ${depsList} ${missingDeps.length === 1 ? "is" : "are"} set`
-          );
-        }
       }
     }
-    try {
-      if (def.type === "boolean") {
-        finalArgs[key] = rawVal !== void 0 ? castArgValue(def, rawVal, key) : false;
-      } else {
-        finalArgs[key] = castArgValue(def, rawVal, key);
-      }
-    } catch (err) {
-      relinka("error", String(err));
-      throw err;
-    }
+    finalArgs[key] = def.type === "boolean" ? Boolean(casted) : casted;
   }
   const ctx = {
     args: finalArgs,
@@ -937,11 +908,7 @@ function getParsedContext(command, argv, parserOptions) {
     if (def.type === "boolean") {
       defaultMap[argKey] = def.default !== void 0 ? def.default : false;
     } else if (def.default !== void 0) {
-      if (def.type === "array" && typeof def.default === "string") {
-        defaultMap[argKey] = [def.default];
-      } else {
-        defaultMap[argKey] = def.default;
-      }
+      defaultMap[argKey] = def.type === "array" && typeof def.default === "string" ? [def.default] : def.default;
     }
   }
   const mergedParserOptions = {

package/bin/components/launcher/run-command.js

@@ -8,58 +8,71 @@ const jiti = createJiti(import.meta.url, {
   fsCache: true,
   sourceMaps: true
 });
+const COMMAND_EXTENSIONS = [".ts", ".js"];
+const COMMAND_FILENAMES = ["cmd.ts", "cmd.js"];
+const getCallerDirectory = () => {
+  const stack = new Error().stack?.split("\n") ?? [];
+  for (const line of stack) {
+    const match = /\((.*):(\d+):(\d+)\)/.exec(line) || /at (.*):(\d+):(\d+)/.exec(line);
+    if (match?.[1] && !match[1].includes("run-command")) {
+      return dirname(match[1]);
+    }
+  }
+  return process.cwd();
+};
+const tryLoadCommand = async (path) => {
+  if (!await fs.pathExists(path)) return null;
+  try {
+    relinka("verbose", `Attempting to load command from: ${path}`);
+    const cmd = await jiti.import(path, { default: true });
+    relinka("verbose", `Successfully loaded command from: ${path}`);
+    return cmd;
+  } catch {
+    relinka("verbose", `Failed to load ${path} as a command file`);
+    return null;
+  }
+};
+const generateCandidatePaths = async (resolvedPath) => {
+  if (!await fs.pathExists(resolvedPath)) {
+    return COMMAND_EXTENSIONS.map((ext) => `${resolvedPath}${ext}`);
+  }
+  if (await fs.isDirectory(resolvedPath)) {
+    return COMMAND_FILENAMES.map((filename) => resolve(resolvedPath, filename));
+  }
+  return [resolvedPath];
+};
+const createCommandNotFoundError = (cmdPath, searchedPaths) => new Error(
+  `No command file found for "${cmdPath}". Expected to find either:
+  - A valid command file at the specified path
+  - A directory containing cmd.ts or cmd.js  
+  - A file path that can be resolved with .ts or .js extension
+Searched paths: ${searchedPaths.join(", ")}
+Please ensure one of these exists and exports a default command.`
+);
+const createLoadError = (cmdPath, originalError) => new Error(
+  `Failed to load command from "${cmdPath}"
+For developers: Ensure the command file:
+  - Exists and is accessible
+  - Exports a default command (e.g., export default defineCommand({...}))
+  - Is a valid TypeScript/JavaScript module
+Original error: ${originalError instanceof Error ? originalError.message : String(originalError)}`
+);
 export async function loadCommand(cmdPath) {
   try {
-    const err = new Error();
-    const stack = err.stack?.split("\n");
-    let callerFile;
-    if (stack) {
-      for (const line of stack) {
-        const match = /\((.*):(\d+):(\d+)\)/.exec(line) || /at (.*):(\d+):(\d+)/.exec(line);
-        if (match?.[1] && !match[1].includes("run-command")) {
-          callerFile = match[1];
-          break;
-        }
-      }
-    }
-    const callerDir = callerFile ? dirname(callerFile) : process.cwd();
+    const callerDir = getCallerDirectory();
     const normalizedPath = cmdPath.replace(/^\.\//, "");
     const resolvedPath = resolve(callerDir, normalizedPath);
-    if (!resolvedPath.endsWith("cmd.ts") && !resolvedPath.endsWith("cmd.js")) {
-      const possiblePaths = [
-        resolve(resolvedPath, "cmd.ts"),
-        resolve(resolvedPath, "cmd.js")
-      ];
-      for (const path of possiblePaths) {
-        if (await fs.pathExists(path)) {
-          relinka("verbose", `Loading command from: ${path}`);
-          const cmd2 = await jiti.import(path, { default: true });
-          relinka("verbose", `Successfully loaded command from: ${path}`);
-          return cmd2;
-        }
-      }
-      throw new Error(
-        `No command file found in ${resolvedPath}. Expected to find either:
-  - ${possiblePaths[0]}
-  - ${possiblePaths[1]}
-Please ensure one of these files exists and exports a default command.`
-      );
+    const candidatePaths = await generateCandidatePaths(resolvedPath);
+    for (const path of candidatePaths) {
+      const command = await tryLoadCommand(path);
+      if (command) return command;
     }
-    relinka("verbose", `Loading command from: ${resolvedPath}`);
-    const cmd = await jiti.import(resolvedPath, { default: true });
-    relinka("verbose", `Successfully loaded command from: ${resolvedPath}`);
-    return cmd;
+    throw createCommandNotFoundError(cmdPath, candidatePaths);
   } catch (error) {
     if (error instanceof Error && error.message.includes("No command file found")) {
       throw error;
     }
     relinka("error", `Failed to load command from ${cmdPath}:`, error);
-    throw new Error(
-      `Failed to load command from ${cmdPath}:
-  - Make sure the file exists and is accessible
-  - Ensure the file exports a default command
-  - Check that the file is a valid TypeScript/JavaScript module
-Original error: ${error instanceof Error ? error.message : String(error)}`
-    );
+    throw createLoadError(cmdPath, error);
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@figliolia/chalk-animation": "^1.0.4",
-    "@reliverse/pathkit": "^1.2.1",
+    "@reliverse/pathkit": "^1.3.3",
     "@reliverse/reliarg": "^1.0.3",
     "@reliverse/relico": "^1.1.2",
     "@reliverse/relifso": "^1.4.5",
@@ -29,7 +29,7 @@
   "license": "MIT",
   "name": "@reliverse/rempts",
   "type": "module",
-  "version": "1.7.23",
+  "version": "1.7.25",
   "author": "reliverse",
   "bugs": {
     "email": "blefnk@gmail.com",