@reliverse/dler 2.1.4 → 2.1.6

package/dist/cmds/senv/cmd.js

@@ -1,8 +1,4 @@
-import {
-  defineCmd,
-  defineCmdArgs,
-  defineCmdCfg
-} from "@reliverse/dler-launcher";
+import { defineArgs, defineCommand } from "@reliverse/dler-launcher";
 import { logger } from "@reliverse/dler-logger";
 import fs from "fs/promises";
 const isWindows = () => globalThis.Bun?.platform?.() === "win32" || process.platform === "win32";
@@ -156,229 +152,234 @@ export ${name}="${newVal}"
   await fs.writeFile(profile, next);
   logger.info(`Persisted ${name} in ${profile}`);
 };
-const senvCmdArgs = defineCmdArgs({
-  action: {
-    type: "string",
-    required: true,
-    description: "Operation to perform: list|get|set|append|remove|contains"
+export default defineCommand({
+  meta: {
+    name: "senv",
+    description: "Inspect and modify environment variables (process and user-level)",
+    examples: [
+      "dler senv --action list",
+      "dler senv --action list --name Path",
+      "dler senv --action get --name Path",
+      "dler senv --action set --name Path --value C\\\\bin",
+      "dler senv --action append --name Path --value C\\\\msys64\\\\ucrt64\\\\bin --yes",
+      "dler senv --action contains --name Path --value C\\\\bin"
+    ]
   },
-  name: {
-    type: "string",
-    description: "Environment variable name (optional for list)"
-  },
-  value: {
-    type: "string",
-    description: "Value for set/append/remove/contains"
-  },
-  persist: {
-    type: "boolean",
-    description: "Persist change to user environment (default: true)"
-  },
-  yes: {
-    type: "boolean",
-    description: "Skip interactive confirmation message"
-  }
-});
-const senvCmdCfg = defineCmdCfg({
-  name: "senv",
-  description: "Inspect and modify environment variables (process and user-level)",
-  examples: [
-    "dler senv --action list",
-    "dler senv --action list --name Path",
-    "dler senv --action get --name Path",
-    "dler senv --action set --name Path --value C\\\\bin",
-    "dler senv --action append --name Path --value C\\\\msys64\\\\ucrt64\\\\bin --yes",
-    "dler senv --action contains --name Path --value C\\\\bin"
-  ]
-});
-const senvCmd = async (args) => {
-  try {
-    if (typeof process.versions.bun === "undefined") {
-      logger.error("\u274C This command requires Bun runtime. Sorry.");
-      process.exit(1);
-    }
-    const { action, name, value } = args;
-    const persist = args.persist ?? true;
-    const yes = args.yes ?? false;
-    const allowed = /* @__PURE__ */ new Set([
-      "list",
-      "get",
-      "set",
-      "append",
-      "remove",
-      "contains"
-    ]);
-    if (!allowed.has(action)) {
-      logger.error(
-        "Unknown action. Allowed: list, get, set, append, remove, contains"
-      );
-      process.exit(2);
-    }
-    if (action === "list") {
-      if (name) {
-        logger.log(`${name}=${process.env[name] ?? ""}`);
-      } else {
-        for (const k of Object.keys(process.env).sort()) {
-          logger.log(`${k}=${process.env[k]}`);
-        }
-      }
-      return;
-    }
-    if (!name) {
-      logger.error("Name is required for this action");
-      process.exit(2);
-    }
-    if (action === "get") {
-      logger.log(process.env[name] ?? "");
-      return;
+  args: defineArgs({
+    action: {
+      type: "string",
+      required: true,
+      description: "Operation to perform: list|get|set|append|remove|contains"
+    },
+    name: {
+      type: "string",
+      description: "Environment variable name (optional for list)"
+    },
+    value: {
+      type: "string",
+      description: "Value for set/append/remove/contains"
+    },
+    persist: {
+      type: "boolean",
+      description: "Persist change to user environment (default: true)"
+    },
+    yes: {
+      type: "boolean",
+      description: "Skip interactive confirmation message"
     }
-    if (action === "contains") {
-      if (!value) {
-        logger.error("Value required for contains");
-        process.exit(2);
+  }),
+  run: async ({ args }) => {
+    try {
+      if (typeof process.versions.bun === "undefined") {
+        logger.error("\u274C This command requires Bun runtime. Sorry.");
+        process.exit(1);
       }
-      const cur2 = process.env[name] ?? "";
-      const entries2 = normalizePathEntries(cur2).map(normalizeEntry);
-      const keys = new Set(entries2.map(toComparable));
-      process.exit(keys.has(toComparable(value)) ? 0 : 1);
-    }
-    if (action === "set") {
-      if (typeof value === "undefined") {
-        logger.error("Value required for set");
+      const { action, name, value } = args;
+      const persist = args.persist ?? true;
+      const yes = args.yes ?? false;
+      const allowed = /* @__PURE__ */ new Set([
+        "list",
+        "get",
+        "set",
+        "append",
+        "remove",
+        "contains"
+      ]);
+      if (!allowed.has(action)) {
+        logger.error(
+          "Unknown action. Allowed: list, get, set, append, remove, contains"
+        );
         process.exit(2);
       }
-      process.env[name] = value;
-      logger.info(`Set ${name} for current process.`);
-      if (persist) {
-        if (!yes) {
-          logger.info(
-            "Persisting to user environment (will create backup). Use --yes to skip this message."
-          );
-        }
-        if (isWindows()) {
-          try {
-            await runPowerShellSetUser(name, value);
-            logger.success(`Persisted ${name} to User environment (Windows).`);
-          } catch (e) {
-            logger.error("Failed to persist via PowerShell:");
-            logger.error(String(e));
-          }
+      if (action === "list") {
+        if (name) {
+          logger.log(`${name}=${process.env[name] ?? ""}`);
         } else {
-          try {
-            await persistPosix(name, value);
-          } catch (e) {
-            logger.error("Failed to persist on POSIX:");
-            logger.error(String(e));
+          for (const k of Object.keys(process.env).sort()) {
+            logger.log(`${k}=${process.env[k]}`);
           }
         }
+        return;
       }
-      return;
-    }
-    if (!value) {
-      logger.error("Value required for append/remove");
-      process.exit(2);
-    }
-    const cur = process.env[name] ?? "";
-    const normalizedValue = normalizeEntry(value);
-    let entries = normalizePathEntries(cur).map(normalizeEntry);
-    if (action === "append") {
-      const keySet = new Set(entries.map(toComparable));
-      const targetKey = toComparable(normalizedValue);
-      if (keySet.has(targetKey)) {
-        logger.info("Entry already present \u2014 nothing to do.");
-      } else {
-        entries.push(normalizedValue);
-        entries = uniqueByComparable(entries);
-        const newVal = joinPathEntries(entries);
-        process.env[name] = newVal;
-        logger.info(`Appended to ${name} for current process.`);
+      if (!name) {
+        logger.error("Name is required for this action");
+        process.exit(2);
+      }
+      if (action === "get") {
+        logger.log(process.env[name] ?? "");
+        return;
+      }
+      if (action === "contains") {
+        if (!value) {
+          logger.error("Value required for contains");
+          process.exit(2);
+        }
+        const cur2 = process.env[name] ?? "";
+        const entries2 = normalizePathEntries(cur2).map(normalizeEntry);
+        const keys = new Set(entries2.map(toComparable));
+        process.exit(keys.has(toComparable(value)) ? 0 : 1);
+      }
+      if (action === "set") {
+        if (typeof value === "undefined") {
+          logger.error("Value required for set");
+          process.exit(2);
+        }
+        process.env[name] = value;
+        logger.info(`Set ${name} for current process.`);
         if (persist) {
+          if (!yes) {
+            logger.info(
+              "Persisting to user environment (will create backup). Use --yes to skip this message."
+            );
+          }
           if (isWindows()) {
             try {
-              const userVal = (await runPowerShellGetUser(name)).trim();
-              const userEntries = normalizePathEntries(userVal || "").map(
-                normalizeEntry
+              await runPowerShellSetUser(name, value);
+              logger.success(
+                `Persisted ${name} to User environment (Windows).`
               );
-              const uSet = new Set(userEntries.map(toComparable));
-              if (!uSet.has(targetKey)) {
-                userEntries.push(normalizedValue);
-                const uniqueEntries = uniqueByComparable(userEntries);
-                const joined = joinPathEntries(uniqueEntries);
-                await runPowerShellSetUser(name, joined);
-                logger.success(`Persisted append to User ${name} (Windows).`);
-              } else {
-                logger.info(
-                  "User-level already contains the entry \u2014 no change."
-                );
-              }
             } catch (e) {
-              logger.error("Failed to persist append on Windows:");
+              logger.error("Failed to persist via PowerShell:");
               logger.error(String(e));
             }
           } else {
             try {
-              await persistPosixEditPath(name, value, "append");
+              await persistPosix(name, value);
             } catch (e) {
-              logger.error("Failed to persist append on POSIX:");
+              logger.error("Failed to persist on POSIX:");
               logger.error(String(e));
             }
           }
         }
+        return;
       }
-      return;
-    }
-    if (action === "remove") {
-      const targetKey = toComparable(normalizedValue);
-      const idx = entries.findIndex((e) => toComparable(e) === targetKey);
-      if (idx === -1) {
-        logger.info("Entry not present \u2014 nothing to remove.");
-      } else {
-        entries.splice(idx, 1);
-        entries = uniqueByComparable(entries);
-        const newVal = joinPathEntries(entries);
-        process.env[name] = newVal;
-        logger.info(`Removed entry from ${name} for current process.`);
-        if (persist) {
-          if (isWindows()) {
-            try {
-              const userVal = (await runPowerShellGetUser(name)).trim();
-              const userEntries = normalizePathEntries(userVal || "").map(
-                normalizeEntry
-              );
-              const i2 = userEntries.findIndex(
-                (e) => toComparable(e) === targetKey
-              );
-              if (i2 >= 0) {
-                userEntries.splice(i2, 1);
-                const uniqueEntries = uniqueByComparable(userEntries);
-                await runPowerShellSetUser(
-                  name,
-                  joinPathEntries(uniqueEntries)
+      if (!value) {
+        logger.error("Value required for append/remove");
+        process.exit(2);
+      }
+      const cur = process.env[name] ?? "";
+      const normalizedValue = normalizeEntry(value);
+      let entries = normalizePathEntries(cur).map(normalizeEntry);
+      if (action === "append") {
+        const keySet = new Set(entries.map(toComparable));
+        const targetKey = toComparable(normalizedValue);
+        if (keySet.has(targetKey)) {
+          logger.info("Entry already present \u2014 nothing to do.");
+        } else {
+          entries.push(normalizedValue);
+          entries = uniqueByComparable(entries);
+          const newVal = joinPathEntries(entries);
+          process.env[name] = newVal;
+          logger.info(`Appended to ${name} for current process.`);
+          if (persist) {
+            if (isWindows()) {
+              try {
+                const userVal = (await runPowerShellGetUser(name)).trim();
+                const userEntries = normalizePathEntries(userVal || "").map(
+                  normalizeEntry
                 );
-                logger.success(`Persisted removal to User ${name} (Windows).`);
-              } else {
-                logger.info("User-level did not contain entry \u2014 no change.");
+                const uSet = new Set(userEntries.map(toComparable));
+                if (!uSet.has(targetKey)) {
+                  userEntries.push(normalizedValue);
+                  const uniqueEntries = uniqueByComparable(userEntries);
+                  const joined = joinPathEntries(uniqueEntries);
+                  await runPowerShellSetUser(name, joined);
+                  logger.success(`Persisted append to User ${name} (Windows).`);
+                } else {
+                  logger.info(
+                    "User-level already contains the entry \u2014 no change."
+                  );
+                }
+              } catch (e) {
+                logger.error("Failed to persist append on Windows:");
+                logger.error(String(e));
+              }
+            } else {
+              try {
+                await persistPosixEditPath(name, value, "append");
+              } catch (e) {
+                logger.error("Failed to persist append on POSIX:");
+                logger.error(String(e));
               }
-            } catch (e) {
-              logger.error("Failed to persist removal on Windows:");
-              logger.error(String(e));
             }
-          } else {
-            try {
-              await persistPosixEditPath(name, value, "remove");
-            } catch (e) {
-              logger.error("Failed to persist removal on POSIX:");
-              logger.error(String(e));
+          }
+        }
+        return;
+      }
+      if (action === "remove") {
+        const targetKey = toComparable(normalizedValue);
+        const idx = entries.findIndex((e) => toComparable(e) === targetKey);
+        if (idx === -1) {
+          logger.info("Entry not present \u2014 nothing to remove.");
+        } else {
+          entries.splice(idx, 1);
+          entries = uniqueByComparable(entries);
+          const newVal = joinPathEntries(entries);
+          process.env[name] = newVal;
+          logger.info(`Removed entry from ${name} for current process.`);
+          if (persist) {
+            if (isWindows()) {
+              try {
+                const userVal = (await runPowerShellGetUser(name)).trim();
+                const userEntries = normalizePathEntries(userVal || "").map(
+                  normalizeEntry
+                );
+                const i2 = userEntries.findIndex(
+                  (e) => toComparable(e) === targetKey
+                );
+                if (i2 >= 0) {
+                  userEntries.splice(i2, 1);
+                  const uniqueEntries = uniqueByComparable(userEntries);
+                  await runPowerShellSetUser(
+                    name,
+                    joinPathEntries(uniqueEntries)
+                  );
+                  logger.success(
+                    `Persisted removal to User ${name} (Windows).`
+                  );
+                } else {
+                  logger.info("User-level did not contain entry \u2014 no change.");
+                }
+              } catch (e) {
+                logger.error("Failed to persist removal on Windows:");
+                logger.error(String(e));
+              }
+            } else {
+              try {
+                await persistPosixEditPath(name, value, "remove");
+              } catch (e) {
+                logger.error("Failed to persist removal on POSIX:");
+                logger.error(String(e));
+              }
             }
           }
         }
+        return;
       }
-      return;
+    } catch (e) {
+      logger.error("Fatal:");
+      logger.error(String(e));
+      process.exit(3);
     }
-  } catch (e) {
-    logger.error("Fatal:");
-    logger.error(String(e));
-    process.exit(3);
   }
-};
-export default defineCmd(senvCmd, senvCmdArgs, senvCmdCfg);
+});

package/dist/cmds/shell/cmd.d.ts

@@ -1,3 +1,2 @@
-#!/usr/bin/env bun
 declare const _default: any;
 export default _default;

package/dist/cmds/shell/cmd.js

@@ -1,50 +1,46 @@
-#!/usr/bin/env bun
-import {
-  defineCmd,
-  defineCmdArgs,
-  defineCmdCfg
-} from "@reliverse/dler-launcher";
+import { defineArgs, defineCommand } from "@reliverse/dler-launcher";
 import { logger } from "@reliverse/dler-logger";
 import { $ } from "bun";
-const shellCmd = async (args) => {
-  try {
-    const commandParts = args.x.split(/\s+/);
-    const [command, ...commandArgs] = commandParts;
-    await $`${command} ${commandArgs.join(" ")}`;
-  } catch (error) {
-    logger.error("\n\u274C Command failed:");
-    if (error instanceof Error) {
-      if ("exitCode" in error) {
-        logger.error(`Exit code: ${error.exitCode}`);
-        if (error.stdout) {
-          logger.error(`STDOUT: ${error.stdout.toString()}`);
-        }
-        if (error.stderr) {
-          logger.error(`STDERR: ${error.stderr.toString()}`);
+export default defineCommand({
+  meta: {
+    name: "shell",
+    description: "Execute shell commands using Bun Shell API",
+    examples: [
+      'dler shell --x "echo Hello World"',
+      'dler shell --x "ls -la"',
+      'dler shell --x "cat package.json | grep name"'
+    ]
+  },
+  args: defineArgs({
+    x: {
+      type: "string",
+      required: true,
+      description: "Shell command to execute"
+    }
+  }),
+  run: async ({ args }) => {
+    try {
+      const commandParts = args.x.split(/\s+/);
+      const [command, ...commandArgs] = commandParts;
+      await $`${command} ${commandArgs.join(" ")}`;
+    } catch (error) {
+      logger.error("\n\u274C Command failed:");
+      if (error instanceof Error) {
+        if ("exitCode" in error) {
+          logger.error(`Exit code: ${error.exitCode}`);
+          if (error.stdout) {
+            logger.error(`STDOUT: ${error.stdout.toString()}`);
+          }
+          if (error.stderr) {
+            logger.error(`STDERR: ${error.stderr.toString()}`);
+          }
+        } else {
+          logger.error(error.message);
         }
       } else {
-        logger.error(error.message);
+        logger.error(String(error));
       }
-    } else {
-      logger.error(String(error));
+      process.exit(1);
     }
-    process.exit(1);
   }
-};
-const shellCmdArgs = defineCmdArgs({
-  x: {
-    type: "string",
-    required: true,
-    description: "Shell command to execute"
-  }
-});
-const shellCmdCfg = defineCmdCfg({
-  name: "shell",
-  description: "Execute shell commands using Bun Shell API",
-  examples: [
-    'dler shell --x "echo Hello World"',
-    'dler shell --x "ls -la"',
-    'dler shell --x "cat package.json | grep name"'
-  ]
 });
-export default defineCmd(shellCmd, shellCmdArgs, shellCmdCfg);