@jannael/glinter 1.0.5 → 1.1.1

package/README.md

@@ -4,7 +4,7 @@ Glinter is a high-performance, transparent Git wrapper built with **Bun**. It en
 
 ## Preview
 
-<video src="https://github.com/user-attachments/assets/f488ac07-f36a-4a56-a533-9598c46596ed" controls="false" autoplay="true" loop="true" muted="true" style="max-width: 100%;">
+<video src="https://github.com/user-attachments/assets/7c7cddef-d656-45e7-82e3-452cf669bbfc" controls="false" autoplay="true" loop="true" muted="true" style="max-width: 100%;">
 Your browser does not support the video tag.
 </video>
 

package/dist/index.js

@@ -91,17 +91,58 @@ var require_src = __commonJS((exports, module) => {
 });
 
 // src/utils/colors.ts
-var GREEN = "\x1B[32m";
-var YELLOW = "\x1B[33m";
-var RED = "\x1B[31m";
-var MAGENTA = "\x1B[35m";
-var BLUE = "\x1B[34m";
-var BLACK = "\x1B[30m";
-var BG_YELLOW = "\x1B[43m";
 var RESET = "\x1B[0m";
+var GREEN = ({ text }) => `\x1B[32m${text}${RESET}`;
+var YELLOW = ({ text }) => `\x1B[33m${text}${RESET}`;
+var RED = ({ text }) => `\x1B[31m${text}${RESET}`;
+var MAGENTA = ({ text }) => `\x1B[35m${text}${RESET}`;
+var BLUE = ({ text }) => `\x1B[34m${text}${RESET}`;
+var BLACK = ({ text }) => `\x1B[30m${text}${RESET}`;
+var BG_YELLOW = ({ text }) => `\x1B[43m${text}${RESET}`;
 
-// src/utils/check.ts
-var CHECK = `${GREEN}\u2714${RESET}`;
+// src/utils/icons-terminal.ts
+var X = ({ text }) => RED({ text: `\u2716 ${text}` });
+var CHECK = ({ text }) => `${GREEN({ text: "\u2714" })}  ${text}`;
+var WARNING = ({ text }) => BG_YELLOW({ text: BLACK({ text: ` \u26A0 ${text}` }) });
+
+// src/error/error-constructor.ts
+function CreateError(name) {
+  const capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
+  return class extends Error {
+    description;
+    constructor(message, description) {
+      super(capitalize(message));
+      this.name = name;
+      this.description = description !== undefined ? capitalize(description) : undefined;
+    }
+  };
+}
+
+// src/error/error-instance.ts
+var NotFound = CreateError("NotFound");
+var Forbidden = CreateError("Forbidden");
+var Conflict = CreateError("Conflict");
+var ServerError = CreateError("ServerError");
+var BadRequest = CreateError("BadRequest");
+
+// src/error/error-handler.ts
+function errorHandler(error) {
+  if (error instanceof ServerError) {
+    console.error(X({ text: error.message }));
+    if (error.description) {
+      console.error(`  ${error.description}`);
+    }
+    return;
+  }
+  if (error instanceof NotFound) {
+    console.error(WARNING({ text: error.message }));
+    return;
+  }
+  console.error(X({ text: "An unexpected error occurred" }));
+  if (error instanceof Error) {
+    console.error(`  ${error.message}`);
+  }
+}
 
 // node_modules/@clack/core/dist/index.mjs
 import { styleText as y } from "util";
@@ -744,9 +785,9 @@ var H = class extends p {
     }
   }
 };
-var X = { Y: { type: "year", len: 4 }, M: { type: "month", len: 2 }, D: { type: "day", len: 2 } };
+var X2 = { Y: { type: "year", len: 4 }, M: { type: "month", len: 2 }, D: { type: "day", len: 2 } };
 function L(r) {
-  return [...r].map((t) => X[t]);
+  return [...r].map((t) => X2[t]);
 }
 function Z(r) {
   const t = new Intl.DateTimeFormat(r, { year: "numeric", month: "2-digit", day: "2-digit" }).formatToParts(new Date(2000, 0, 15)), e = [];
@@ -1280,32 +1321,41 @@ class AddCommand {
     this.stageChangesUseCase = stageChangesUseCase;
   }
   async execute() {
-    const { changes, warnings } = await this.getChangesUseCase.execute();
-    if (changes.length === 0) {
-      console.log(`${CHECK}  All changes are either staged or sensitive (like .env).`);
-      return;
-    }
-    const options = [
-      ...changes.map((c2) => ({ value: c2.value, label: c2.label }))
-    ];
-    const selectedChanges = await MultiSelect({
-      message: `Select the changes you want to commit. ${BLUE}[space] to select and${RESET} ${GREEN}[enter] to confirm${RESET} ${MAGENTA}[a] to select all${RESET} ${RED}[esc] to cancel${RESET}`,
-      options
-    });
-    let selected = selectedChanges.map((file) => file.trim());
-    if (selected.includes("all")) {
-      selected = changes.map((c2) => c2.value);
-    }
-    if (selected.length > 0) {
-      await this.stageChangesUseCase.execute(selected);
-      if (warnings.size > 0) {
-        console.log(`
-${BG_YELLOW}${BLACK} WARNING ${RESET}`);
-        for (const warning of warnings) {
-          console.log(warning);
+    try {
+      const { changes, warnings } = await this.getChangesUseCase.execute();
+      if (changes.length === 0) {
+        console.log(`${CHECK({ text: "All changes are either staged or sensitive (like .env)." })}`);
+        return;
+      }
+      const options = [
+        ...changes.map((c2) => ({ value: c2.value, label: c2.label }))
+      ];
+      const selectedChanges = await MultiSelect({
+        message: `Select the changes you want to commit. 
+` + BLUE({ text: "[space] to select and" }) + `
+` + GREEN({ text: "[enter] to confirm" }) + `
+` + MAGENTA({ text: "[a] to select all" }) + `
+` + RED({ text: "[esc] to cancel" }) + `
+`,
+        options
+      });
+      let selected = selectedChanges.map((file) => file.trim());
+      if (selected.includes("all")) {
+        selected = changes.map((c2) => c2.value);
+      }
+      if (selected.length > 0) {
+        await this.stageChangesUseCase.execute(selected);
+        if (warnings.size > 0) {
+          console.log(`
+${WARNING({ text: " WARNING " })}`);
+          for (const warning of warnings) {
+            console.log(warning);
+          }
+          console.log("");
         }
-        console.log("");
       }
+    } catch (error) {
+      errorHandler(error);
     }
   }
 }
@@ -1329,16 +1379,16 @@ class Change {
     const { status, displayPath } = this.props;
     let label = `${status}: ${displayPath}`;
     if (status.includes("M")) {
-      label = `${YELLOW}modified:${RESET} ${displayPath}`;
+      label = YELLOW({ text: `modified: ${displayPath}` });
     }
     if (status.includes("A") || status.includes("?")) {
-      label = `${GREEN}new file:${RESET} ${displayPath}`;
+      label = GREEN({ text: `new file: ${displayPath}` });
     }
     if (status.includes("D")) {
-      label = `${RED}deleted:${RESET} ${displayPath}`;
+      label = RED({ text: `deleted: ${displayPath}` });
     }
     if (status.includes("R")) {
-      label = `${MAGENTA}renamed:${RESET} ${displayPath}`;
+      label = MAGENTA({ text: `renamed: ${displayPath}` });
     }
     return label;
   }
@@ -1347,10 +1397,10 @@ class Change {
   }
   getWarning() {
     if (this.value.includes(".env")) {
-      return `${YELLOW} .env file hidden${RESET} (Add to .gitignore to avoid leaks)`;
+      return YELLOW({ text: " .env file hidden" }) + " (Add to .gitignore to avoid leaks)";
     }
     if (this.value.includes("node_modules")) {
-      return `${YELLOW} node_modules hidden${RESET} (Add to .gitignore to save space)`;
+      return YELLOW({ text: " node_modules hidden" }) + " (Add to .gitignore to save space)";
     }
     return null;
   }
@@ -1419,14 +1469,17 @@ class StageChangesUseCase {
 
 // src/modules/add/infra/bun-git.repository.ts
 var {$: $2 } = globalThis.Bun;
-
 class BunGitRepository {
   async getEntries() {
-    const output = await $2`git status --porcelain -z`.quiet().text();
-    if (!output.trim()) {
-      return [];
+    try {
+      const output = await $2`git status --porcelain -z`.quiet().text();
+      if (!output.trim()) {
+        return [];
+      }
+      return output.split("\x00").filter(Boolean);
+    } catch {
+      throw new ServerError("Git status failed", "Could not retrieve repository status");
     }
-    return output.split("\x00").filter(Boolean);
   }
   async stageFiles(files) {
     if (files.length === 0)
@@ -1436,7 +1489,7 @@ class BunGitRepository {
     });
     const exitCode = await proc.exited;
     if (exitCode !== 0) {
-      throw new Error(`Git add failed with exit code ${exitCode}`);
+      throw new ServerError("Git add failed", `Failed to stage ${files.length} file(s)`);
     }
   }
 }
@@ -1535,49 +1588,56 @@ class SwitchCommand {
     this.switchBranch = switchBranch;
   }
   async execute() {
-    const branches = await this.getBranchesUseCase.execute();
-    if (branches.length === 0) {
-      console.log(`${CHECK}  No branches found.`);
-      return;
-    }
-    const options = [];
-    for (const branch of branches) {
-      let label = branch.name;
-      let value = branch.name;
-      if (branch.isHeadBranch)
-        continue;
-      if (branch.isCurrentBranch) {
-        console.log(`${CHECK}  Current branch: ${branch.name}`);
-        continue;
+    try {
+      const branches = await this.getBranchesUseCase.execute();
+      if (branches.length === 0) {
+        console.log(`${CHECK({ text: "No branches found." })}`);
+        return;
       }
-      if (branch.isRemoteBranch) {
-        label = branch.name.replace("remotes/origin/", `${GREEN}remote branch:${RESET} `);
-        value = branch.name.replace("remotes/origin/", "");
+      const options = [];
+      for (const branch of branches) {
+        let label = branch.name;
+        let value = branch.name;
+        if (branch.isHeadBranch)
+          continue;
+        if (branch.isCurrentBranch) {
+          console.log(`${CHECK({ text: `Current branch: ${branch.name}` })}`);
+          continue;
+        }
+        if (branch.isRemoteBranch) {
+          label = branch.name.replace("remotes/origin/", GREEN({ text: "remote branch: " }));
+          value = branch.name.replace("remotes/origin/", "");
+        }
+        options.push({
+          value,
+          label
+        });
       }
-      options.push({
-        value,
-        label
+      const selectedBranch = await Select({
+        message: "Select the branch you want to switch to.",
+        options
       });
+      await this.switchBranch.execute({ branch: selectedBranch });
+    } catch (error) {
+      errorHandler(error);
     }
-    const selectedBranch = await Select({
-      message: "Select the branch you want to switch to.",
-      options
-    });
-    await this.switchBranch.execute({ branch: selectedBranch });
   }
 }
 
 // src/modules/switch/infra/bun-switch-repository.ts
 var {$: $3 } = globalThis.Bun;
-
 class BunSwitchRepository {
   async getBranches() {
-    const output = await $3`git branch -a`.quiet().text();
-    if (!output.trim()) {
-      return [];
-    }
-    return output.split(`
+    try {
+      const output = await $3`git branch -a`.quiet().text();
+      if (!output.trim()) {
+        return [];
+      }
+      return output.split(`
 `).map((branch) => branch.trim());
+    } catch {
+      throw new ServerError("Git branch failed", "Could not retrieve branches");
+    }
   }
   async switchBranch({ branch }) {
     const proc = Bun.spawn(["git", "checkout", branch], {
@@ -1585,7 +1645,7 @@ class BunSwitchRepository {
     });
     const exitCode = await proc.exited;
     if (exitCode !== 0) {
-      throw new Error(`Git checkout failed with exit code ${exitCode}`);
+      throw new ServerError("Git checkout failed", `Failed to switch to branch ${branch}`);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jannael/glinter",
-	"version": "1.0.5",
+	"version": "1.1.1",
 	"description": "A high-performance, transparent Git wrapper with interactive staging",
 	"type": "module",
 	"private": false,