@reliverse/rempts 1.7.22 → 1.7.24

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 isArgUsed = rawVal !== void 0 || def.default !== void 0;
-      if (isArgUsed) {
-        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 isArgUsed = rawVal !== void 0 || def.default !== void 0;
-      if (isArgUsed) {
-        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/package.json

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