@laabroms/alias-cli 0.1.2 → 0.1.4

package/dist/cli.js

@@ -13,6 +13,7 @@ import { render } from "ink";
 // src/App.tsx
 import React8, { useState as useState4, useEffect, useCallback } from "react";
 import { Box as Box8, Text as Text8, useInput as useInput5, useApp } from "ink";
+import fs2 from "fs";
 import os2 from "os";
 
 // src/aliases.ts
@@ -53,7 +54,8 @@ function loadAliases() {
   try {
     const configPath = getShellConfigPath();
     const content = fs.readFileSync(configPath, "utf-8");
-    return parseAliases(content);
+    const allAliases = parseAliases(content);
+    return allAliases.filter((a) => a.name !== "alias-cli");
   } catch (error) {
     console.error("Failed to load aliases:", error);
     return [];
@@ -67,14 +69,15 @@ function saveAliases(aliases) {
       content = fs.readFileSync(configPath, "utf-8");
     }
     const lines = content.split("\n");
-    const nonAliasLines = lines.filter((line) => {
+    const MARKER = "# Aliases managed by alias-cli";
+    const filteredLines = lines.filter((line) => {
       const trimmed = line.trim();
-      return !trimmed.startsWith("alias ");
+      return !trimmed.startsWith("alias ") && trimmed !== MARKER;
     });
     const newContent = [
-      ...nonAliasLines,
+      ...filteredLines,
       "",
-      "# Aliases managed by alias-cli",
+      MARKER,
       serializeAliases(aliases)
     ].join("\n");
     const backupPath = `${configPath}.backup`;
@@ -142,10 +145,11 @@ function AliasList({ aliases, selectedIndex, isSearchMode }) {
 import React4, { useState } from "react";
 import { Box as Box4, Text as Text4, useInput } from "ink";
 import TextInput from "ink-text-input";
-function AddAliasModal({ onSave, onCancel }) {
+function AddAliasModal({ onSave, onCancel, existingAliases }) {
   const [name, setName] = useState("");
   const [command, setCommand] = useState("");
   const [focusedField, setFocusedField] = useState("name");
+  const isDuplicate = name && existingAliases.some((a) => a.name === name);
   useInput((input, key) => {
     if (key.tab || key.downArrow) {
       setFocusedField((prev) => prev === "name" ? "command" : "name");
@@ -153,7 +157,7 @@ function AddAliasModal({ onSave, onCancel }) {
       setFocusedField((prev) => prev === "command" ? "name" : "command");
     } else if (key.escape) {
       onCancel();
-    } else if (key.return && name && command) {
+    } else if (key.return && name && command && !isDuplicate) {
       onSave(name, command);
     }
   });
@@ -168,7 +172,7 @@ function AddAliasModal({ onSave, onCancel }) {
       width: 50
     },
     isFocusedName ? /* @__PURE__ */ React4.createElement(TextInput, { value: name, onChange: setName, placeholder: "e.g., gc" }) : /* @__PURE__ */ React4.createElement(Text4, { color: name ? "white" : "gray" }, name || "e.g., gc")
-  )), /* @__PURE__ */ React4.createElement(Box4, { flexDirection: "column" }, /* @__PURE__ */ React4.createElement(Box4, { marginBottom: 0 }, /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: isFocusedCommand ? "cyan" : "gray" }, isFocusedCommand && "\u25B6 ", "Command:")), /* @__PURE__ */ React4.createElement(
+  ), isDuplicate && /* @__PURE__ */ React4.createElement(Box4, { marginTop: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "red" }, "\u26A0 Alias '", name, "' already exists"))), /* @__PURE__ */ React4.createElement(Box4, { flexDirection: "column" }, /* @__PURE__ */ React4.createElement(Box4, { marginBottom: 0 }, /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: isFocusedCommand ? "cyan" : "gray" }, isFocusedCommand && "\u25B6 ", "Command:")), /* @__PURE__ */ React4.createElement(
     Box4,
     {
       borderStyle: "round",
@@ -328,7 +332,7 @@ function App() {
       );
     } else if (input === "a") {
       setMode("add");
-    } else if (input === "e" && filteredAliases.length > 0) {
+    } else if ((input === "e" || key.return) && filteredAliases.length > 0) {
       setMode("edit");
     } else if ((input === "d" || key.delete) && filteredAliases.length > 0) {
       setMode("delete");
@@ -341,28 +345,39 @@ function App() {
         const configPath = getShellConfigPath();
         const fileName = configPath.replace(os2.homedir(), "~");
         const sourceCommand = `source ${fileName}`;
+        const configContent = fs2.readFileSync(configPath, "utf-8");
+        const hasAutoReload = configContent.includes("alias-cli()") && configContent.includes("command alias-cli");
         exit();
-        console.log("\n\x1B[32m\u2728 Changes saved!\x1B[0m\n");
-        console.log("\x1B[33m\u{1F4CB} To apply your aliases, run:\x1B[0m");
-        console.log(`  \x1B[36;1m${sourceCommand}\x1B[0m
+        console.log("\n\x1B[32;1m\u2728 Changes saved!\x1B[0m\n");
+        if (hasAutoReload) {
+          console.log(
+            "\x1B[2;32m\u26A1 Auto-reload is set up! Your aliases are now applied.\x1B[0m\n"
+          );
+        } else {
+          console.log("\x1B[2m\u{1F4CB} To apply your aliases, run:\x1B[0m");
+          console.log(`\x1B[7;36;1m ${sourceCommand} \x1B[0m
 `);
-        try {
-          const { execSync } = __require("child_process");
           try {
-            execSync(`echo '${sourceCommand}' | pbcopy`, { stdio: "ignore" });
-            console.log("\x1B[2m\u2713 Copied to clipboard! Just paste and run.\x1B[0m\n");
+            const { execSync } = __require("child_process");
+            try {
+              execSync(`echo '${sourceCommand}' | pbcopy`, { stdio: "ignore" });
+              console.log("\x1B[2;32m\u2713 Copied to clipboard!\x1B[0m\n");
+            } catch {
+              execSync(`echo '${sourceCommand}' | xclip -selection clipboard`, {
+                stdio: "ignore"
+              });
+              console.log("\x1B[2;32m\u2713 Copied to clipboard!\x1B[0m\n");
+            }
           } catch {
-            execSync(`echo '${sourceCommand}' | xclip -selection clipboard`, { stdio: "ignore" });
-            console.log("\x1B[2m\u2713 Copied to clipboard! Just paste and run.\x1B[0m\n");
           }
-        } catch {
+          console.log(
+            "\x1B[2m\u26A1 Want aliases to auto-reload when you quit? Run this once:\x1B[0m\n"
+          );
+          console.log(
+            `\x1B[7;36m echo '\\nalias-cli() { command alias-cli; ${sourceCommand}; }' >> ${fileName} && ${sourceCommand} \x1B[0m
+`
+          );
         }
-        console.log("\x1B[33m\u26A1 Want auto-reload on quit?\x1B[0m");
-        console.log(`\x1B[2m  Add this wrapper to your ${fileName}:\x1B[0m`);
-        console.log(`\x1B[2m  alias-cli-reload() { command alias-cli && [ -f ~/.alias-cli-reload ] && source "$(cat ~/.alias-cli-reload)" && rm ~/.alias-cli-reload; }\x1B[0m`);
-        console.log(`\x1B[2m  alias alias-cli='alias-cli-reload'\x1B[0m`);
-        console.log(`\x1B[2m  Then run: source ${fileName}\x1B[0m
-`);
       } else {
         exit();
       }
@@ -420,7 +435,9 @@ function App() {
       if (direction === "up") {
         setSelectedIndex((prev) => Math.max(0, prev - 1));
       } else {
-        setSelectedIndex((prev) => Math.min(filteredAliases.length - 1, prev + 1));
+        setSelectedIndex(
+          (prev) => Math.min(filteredAliases.length - 1, prev + 1)
+        );
       }
     },
     [filteredAliases.length]
@@ -462,7 +479,14 @@ function App() {
             }
           );
         case "add":
-          return /* @__PURE__ */ React8.createElement(AddAliasModal, { onSave: handleAdd, onCancel: handleCancel });
+          return /* @__PURE__ */ React8.createElement(
+            AddAliasModal,
+            {
+              onSave: handleAdd,
+              onCancel: handleCancel,
+              existingAliases: aliases
+            }
+          );
         case "edit":
           return filteredAliases[selectedIndex] ? /* @__PURE__ */ React8.createElement(
             EditAliasModal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laabroms/alias-cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Interactive TUI for managing shell aliases",
   "type": "module",
   "main": "dist/cli.js",