better-commits 1.7.2 → 1.8.1

package/dist/branch.js

@@ -36,6 +36,9 @@ var import_fs = __toESM(require("fs"));
 var import_zod_validation_error = require("zod-validation-error");
 var CONFIG_FILE_NAME = ".better-commits.json";
 var SPACE_TO_SELECT = `${import_picocolors.default.dim("(<space> to select)")}`;
+var A_FOR_ALL = `${import_picocolors.default.dim(
+  "(<space> to select, <a> to select all)"
+)}`;
 var OPTIONAL_PROMPT = `${import_picocolors.default.dim("(optional)")}`;
 var CACHE_PROMPT = `${import_picocolors.default.dim("(value will be saved)")}`;
 var REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);

package/dist/git.js

@@ -0,0 +1,89 @@
+#! /usr/bin/env node
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/git.ts
+var git_exports = {};
+__export(git_exports, {
+  git_add: () => git_add,
+  git_status: () => git_status
+});
+module.exports = __toCommonJS(git_exports);
+var import_child_process = require("child_process");
+var p = __toESM(require("@clack/prompts"));
+var import_picocolors = __toESM(require("picocolors"));
+var porcelain_states = ["M", "T", "R", "D", "A", "C"];
+function git_status() {
+  let status = "";
+  try {
+    status = (0, import_child_process.execSync)("git status --porcelain", { stdio: "pipe" }).toString();
+  } catch (err) {
+    p.log.error(import_picocolors.default.red("Failed to git status"));
+    return { index: [], work_tree: [] };
+  }
+  const lines = status.split("\n");
+  const work_tree = [];
+  const index = [];
+  lines.forEach((v) => {
+    const line = v.trimEnd();
+    if (!line)
+      return;
+    const path_plus_file = line.substring(2).trim();
+    const first_char = line.charAt(0).trim();
+    const second_char = line.charAt(1).trim();
+    if (first_char === "?" || second_char === "?") {
+      work_tree.push(path_plus_file);
+    }
+    if (porcelain_states.includes(first_char)) {
+      index.push(path_plus_file);
+    }
+    if (porcelain_states.includes(second_char)) {
+      work_tree.push(path_plus_file);
+    }
+  });
+  return { index, work_tree };
+}
+function git_add(files) {
+  const space_delimited_files = files.join(" ");
+  if (space_delimited_files) {
+    try {
+      (0, import_child_process.execSync)(`git add ${space_delimited_files}`, {
+        stdio: "pipe"
+      }).toString();
+      p.log.success(import_picocolors.default.green("Changes successfully staged"));
+    } catch (err) {
+      p.log.error(import_picocolors.default.red("Failed to stage changes"));
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  git_add,
+  git_status
+});

package/dist/index.js

@@ -34,10 +34,10 @@ __export(src_exports, {
   main: () => main
 });
 module.exports = __toCommonJS(src_exports);
-var p2 = __toESM(require("@clack/prompts"));
-var import_picocolors2 = __toESM(require("picocolors"));
-var import_simple_git = require("simple-git");
-var import_child_process2 = require("child_process");
+var p3 = __toESM(require("@clack/prompts"));
+var import_picocolors3 = __toESM(require("picocolors"));
+var import_child_process3 = require("child_process");
+var import_process = require("process");
 
 // src/zod-state.ts
 var import_zod2 = require("zod");
@@ -52,6 +52,9 @@ var import_fs = __toESM(require("fs"));
 var import_zod_validation_error = require("zod-validation-error");
 var CONFIG_FILE_NAME = ".better-commits.json";
 var SPACE_TO_SELECT = `${import_picocolors.default.dim("(<space> to select)")}`;
+var A_FOR_ALL = `${import_picocolors.default.dim(
+  "(<space> to select, <a> to select all)"
+)}`;
 var OPTIONAL_PROMPT = `${import_picocolors.default.dim("(optional)")}`;
 var CACHE_PROMPT = `${import_picocolors.default.dim("(value will be saved)")}`;
 var REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);
@@ -217,9 +220,6 @@ function get_git_root() {
 function get_default_config_path() {
   return (0, import_os.homedir)() + "/" + CONFIG_FILE_NAME;
 }
-function check_missing_stage(stats) {
-  return stats.files.filter((f) => f.index.trim() === "" || f.index === "?").map((f) => f.path);
-}
 function addNewLine(arr, i) {
   return i === arr.length - 1 ? "" : "\n";
 }
@@ -367,37 +367,82 @@ var BranchState = import_zod2.z.object({
   description: import_zod2.z.string().default("")
 }).default({});
 
+// src/git.ts
+var import_child_process2 = require("child_process");
+var p2 = __toESM(require("@clack/prompts"));
+var import_picocolors2 = __toESM(require("picocolors"));
+var porcelain_states = ["M", "T", "R", "D", "A", "C"];
+function git_status() {
+  let status = "";
+  try {
+    status = (0, import_child_process2.execSync)("git status --porcelain", { stdio: "pipe" }).toString();
+  } catch (err) {
+    p2.log.error(import_picocolors2.default.red("Failed to git status"));
+    return { index: [], work_tree: [] };
+  }
+  const lines = status.split("\n");
+  const work_tree = [];
+  const index = [];
+  lines.forEach((v) => {
+    const line = v.trimEnd();
+    if (!line)
+      return;
+    const path_plus_file = line.substring(2).trim();
+    const first_char = line.charAt(0).trim();
+    const second_char = line.charAt(1).trim();
+    if (first_char === "?" || second_char === "?") {
+      work_tree.push(path_plus_file);
+    }
+    if (porcelain_states.includes(first_char)) {
+      index.push(path_plus_file);
+    }
+    if (porcelain_states.includes(second_char)) {
+      work_tree.push(path_plus_file);
+    }
+  });
+  return { index, work_tree };
+}
+function git_add(files) {
+  const space_delimited_files = files.join(" ");
+  if (space_delimited_files) {
+    try {
+      (0, import_child_process2.execSync)(`git add ${space_delimited_files}`, {
+        stdio: "pipe"
+      }).toString();
+      p2.log.success(import_picocolors2.default.green("Changes successfully staged"));
+    } catch (err) {
+      p2.log.error(import_picocolors2.default.red("Failed to stage changes"));
+    }
+  }
+}
+
 // src/index.ts
 main(load_setup());
 async function main(config) {
   let commit_state = CommitState.parse({});
-  const simple_git = (0, import_simple_git.simpleGit)({ baseDir: get_git_root() });
-  let git_status = await simple_git.status();
+  (0, import_process.chdir)(get_git_root());
   if (config.check_status) {
-    p2.log.step(import_picocolors2.default.black(import_picocolors2.default.bgGreen(" Checking Git Status ")));
-    const missing_files = check_missing_stage(git_status);
-    const staged_files = git_status.staged.reduce((acc, curr, i) => import_picocolors2.default.green(acc + curr + addNewLine(git_status.staged, i)), "");
-    p2.log.success("Changes to be committed:\n" + staged_files);
-    if (missing_files.length) {
-      const unstaged_files = missing_files.reduce((acc, curr, i) => import_picocolors2.default.red(acc + curr + addNewLine(missing_files, i)), "");
-      p2.log.error("Changes not staged for commit:\n" + unstaged_files);
-      const selected_for_staging = await p2.multiselect({
+    let { index, work_tree } = git_status();
+    p3.log.step(import_picocolors3.default.black(import_picocolors3.default.bgGreen(" Checking Git Status ")));
+    const staged_files = index.reduce((acc, curr, i) => import_picocolors3.default.green(acc + curr + addNewLine(index, i)), "");
+    p3.log.success("Changes to be committed:\n" + staged_files);
+    if (work_tree.length) {
+      const unstaged_files = work_tree.reduce((acc, curr, i) => import_picocolors3.default.red(acc + curr + addNewLine(work_tree, i)), "");
+      p3.log.error("Changes not staged for commit:\n" + unstaged_files);
+      const selected_for_staging = await p3.multiselect({
         message: `Some files have not been staged, would you like to add them now? ${SPACE_TO_SELECT}`,
-        options: [{ value: ".", label: "." }, ...missing_files.map((v) => ({ value: v, label: v }))],
+        options: [{ value: ".", label: "." }, ...work_tree.map((v) => ({ value: v, label: v }))],
         required: false
       });
-      if (p2.isCancel(selected_for_staging))
+      if (p3.isCancel(selected_for_staging))
         process.exit(0);
-      await simple_git.add(selected_for_staging);
-      git_status = await simple_git.status();
-      if (selected_for_staging?.length) {
-        p2.log.success(import_picocolors2.default.green("Changes successfully staged"));
-      }
+      git_add(selected_for_staging);
+    }
+    let updated_status = git_status();
+    if (!updated_status.index.length) {
+      p3.log.error(import_picocolors3.default.red('no changes added to commit (use "git add" and/or "git commit -a")'));
+      process.exit(0);
     }
-  }
-  if (!git_status.staged.length) {
-    p2.log.error(import_picocolors2.default.red('no changes added to commit (use "git add" and/or "git commit -a")'));
-    process.exit(0);
   }
   if (config.commit_type.enable) {
     let message = "Select a commit type";
@@ -406,7 +451,7 @@ async function main(config) {
       const options = config.commit_type.options.map((o) => o.value);
       const type_from_branch = infer_type_from_branch(options);
       if (type_from_branch) {
-        message = `Commit type inferred from branch ${import_picocolors2.default.dim("(confirm / edit)")}`;
+        message = `Commit type inferred from branch ${import_picocolors3.default.dim("(confirm / edit)")}`;
         initial_value = type_from_branch;
       }
     }
@@ -414,38 +459,38 @@ async function main(config) {
       (acc, curr) => ({ ...acc, [curr.value]: curr.emoji ?? "" }),
       {}
     );
-    const commit_type = await p2.select(
+    const commit_type = await p3.select(
       {
         message,
         initialValue: initial_value,
         options: config.commit_type.options
       }
     );
-    if (p2.isCancel(commit_type))
+    if (p3.isCancel(commit_type))
       process.exit(0);
     commit_state.type = config.commit_type.append_emoji_to_commit ? `${value_to_emoji[commit_type]} ${commit_type}`.trim() : commit_type;
   }
   if (config.commit_scope.enable) {
-    let commit_scope = await p2.select({
+    let commit_scope = await p3.select({
       message: "Select a commit scope",
       initialValue: config.commit_scope.initial_value,
       options: config.commit_scope.options
     });
-    if (p2.isCancel(commit_scope))
+    if (p3.isCancel(commit_scope))
       process.exit(0);
     if (commit_scope === CUSTOM_SCOPE_KEY && config.commit_scope.custom_scope) {
-      commit_scope = await p2.text({
+      commit_scope = await p3.text({
         message: "Write a custom scope",
         placeholder: ""
       });
-      if (p2.isCancel(commit_scope))
+      if (p3.isCancel(commit_scope))
         process.exit(0);
     }
     commit_state.scope = commit_scope;
   }
   if (config.check_ticket.infer_ticket) {
     try {
-      const branch = (0, import_child_process2.execSync)("git branch --show-current", { stdio: "pipe" }).toString();
+      const branch = (0, import_child_process3.execSync)("git branch --show-current", { stdio: "pipe" }).toString();
       const found = [
         branch.match(REGEX_START_UND),
         branch.match(REGEX_SLASH_UND),
@@ -461,16 +506,16 @@ async function main(config) {
     }
   }
   if (config.check_ticket.confirm_ticket) {
-    const user_commit_ticket = await p2.text({
-      message: commit_state.ticket ? `Ticket / issue inferred from branch ${import_picocolors2.default.dim("(confirm / edit)")}` : `Add ticket / issue ${OPTIONAL_PROMPT}`,
+    const user_commit_ticket = await p3.text({
+      message: commit_state.ticket ? `Ticket / issue inferred from branch ${import_picocolors3.default.dim("(confirm / edit)")}` : `Add ticket / issue ${OPTIONAL_PROMPT}`,
       placeholder: "",
       initialValue: commit_state.ticket
     });
-    if (p2.isCancel(user_commit_ticket))
+    if (p3.isCancel(user_commit_ticket))
       process.exit(0);
     commit_state.ticket = user_commit_ticket ?? "";
   }
-  const commit_title = await p2.text(
+  const commit_title = await p3.text(
     {
       message: "Write a brief title describing the commit",
       placeholder: "",
@@ -485,11 +530,11 @@ async function main(config) {
       }
     }
   );
-  if (p2.isCancel(commit_title))
+  if (p3.isCancel(commit_title))
     process.exit(0);
   commit_state.title = clean_commit_title(commit_title);
   if (config.commit_body.enable) {
-    const commit_body = await p2.text({
+    const commit_body = await p3.text({
       message: `Write a detailed description of the changes ${OPTIONAL_PROMPT}`,
       placeholder: "",
       validate: (val) => {
@@ -497,21 +542,21 @@ async function main(config) {
           return "Please enter a description";
       }
     });
-    if (p2.isCancel(commit_body))
+    if (p3.isCancel(commit_body))
       process.exit(0);
     commit_state.body = commit_body ?? "";
   }
   if (config.commit_footer.enable) {
-    const commit_footer = await p2.multiselect({
+    const commit_footer = await p3.multiselect({
       message: `Select optional footers ${SPACE_TO_SELECT}`,
       initialValues: config.commit_footer.initial_value,
       options: COMMIT_FOOTER_OPTIONS,
       required: false
     });
-    if (p2.isCancel(commit_footer))
+    if (p3.isCancel(commit_footer))
       process.exit(0);
     if (commit_footer.includes("breaking-change")) {
-      const breaking_changes_title = await p2.text({
+      const breaking_changes_title = await p3.text({
         message: "Breaking changes: Write a short title / summary",
         placeholder: "",
         validate: (value) => {
@@ -519,19 +564,19 @@ async function main(config) {
             return "Please enter a title / summary";
         }
       });
-      if (p2.isCancel(breaking_changes_title))
+      if (p3.isCancel(breaking_changes_title))
         process.exit(0);
-      const breaking_changes_body = await p2.text({
+      const breaking_changes_body = await p3.text({
         message: `Breaking Changes: Write a description & migration instructions ${OPTIONAL_PROMPT}`,
         placeholder: ""
       });
-      if (p2.isCancel(breaking_changes_body))
+      if (p3.isCancel(breaking_changes_body))
         process.exit(0);
       commit_state.breaking_title = breaking_changes_title;
       commit_state.breaking_body = breaking_changes_body;
     }
     if (commit_footer.includes("deprecated")) {
-      const deprecated_title = await p2.text({
+      const deprecated_title = await p3.text({
         message: "Deprecated: Write a short title / summary",
         placeholder: "",
         validate: (value) => {
@@ -539,13 +584,13 @@ async function main(config) {
             return "Please enter a title / summary";
         }
       });
-      if (p2.isCancel(deprecated_title))
+      if (p3.isCancel(deprecated_title))
         process.exit(0);
-      const deprecated_body = await p2.text({
+      const deprecated_body = await p3.text({
         message: `Deprecated: Write a description ${OPTIONAL_PROMPT}`,
         placeholder: ""
       });
-      if (p2.isCancel(deprecated_body))
+      if (p3.isCancel(deprecated_body))
         process.exit(0);
       commit_state.deprecates_body = deprecated_body;
       commit_state.deprecates_title = deprecated_title;
@@ -554,46 +599,46 @@ async function main(config) {
       commit_state.closes = "Closes:";
     }
     if (commit_footer.includes("custom")) {
-      const custom_footer = await p2.text({
+      const custom_footer = await p3.text({
         message: "Write a custom footer",
         placeholder: ""
       });
-      if (p2.isCancel(custom_footer))
+      if (p3.isCancel(custom_footer))
         process.exit(0);
       commit_state.custom_footer = custom_footer;
     }
   }
   let continue_commit = true;
-  p2.note(build_commit_string(commit_state, config, true), "Commit Preview");
+  p3.note(build_commit_string(commit_state, config, true, false), "Commit Preview");
   if (config.confirm_commit) {
-    continue_commit = await p2.confirm({ message: "Confirm Commit?" });
-    if (p2.isCancel(continue_commit))
+    continue_commit = await p3.confirm({ message: "Confirm Commit?" });
+    if (p3.isCancel(continue_commit))
       process.exit(0);
   }
   if (!continue_commit) {
-    p2.log.info("Exiting without commit");
+    p3.log.info("Exiting without commit");
     process.exit(0);
   }
   try {
     const options = config.overrides.shell ? { shell: config.overrides.shell } : {};
-    const output = (0, import_child_process2.execSync)(`git commit -m "${build_commit_string(commit_state, config, false)}"`, options).toString().trim();
+    const output = (0, import_child_process3.execSync)(`git commit -m "${build_commit_string(commit_state, config, false, true)}"`, options).toString().trim();
     if (config.print_commit_output)
-      p2.log.info(output);
+      p3.log.info(output);
   } catch (err) {
-    p2.log.error("Something went wrong when committing: " + err);
+    p3.log.error("Something went wrong when committing: " + err);
   }
 }
-function build_commit_string(commit_state, config, colorize = false) {
+function build_commit_string(commit_state, config, colorize = false, escape_quotes = false) {
   let commit_string = "";
   if (commit_state.type) {
-    commit_string += colorize ? import_picocolors2.default.blue(commit_state.type) : commit_state.type;
+    commit_string += colorize ? import_picocolors3.default.blue(commit_state.type) : commit_state.type;
   }
   if (commit_state.scope) {
-    const scope = colorize ? import_picocolors2.default.cyan(commit_state.scope) : commit_state.scope;
+    const scope = colorize ? import_picocolors3.default.cyan(commit_state.scope) : commit_state.scope;
     commit_string += `(${scope})`;
   }
   if (commit_state.breaking_title && config.breaking_change.add_exclamation_to_title) {
-    commit_string += colorize ? import_picocolors2.default.red("!") : "!";
+    commit_string += colorize ? import_picocolors3.default.red("!") : "!";
   }
   if (commit_state.scope || commit_state.type) {
     commit_string += ": ";
@@ -601,17 +646,17 @@ function build_commit_string(commit_state, config, colorize = false) {
   const position_start = config.check_ticket.title_position === "start";
   const position_end = config.check_ticket.title_position === "end";
   if (commit_state.ticket && config.check_ticket.add_to_title && position_start) {
-    commit_string += colorize ? import_picocolors2.default.magenta(commit_state.ticket) + " " : commit_state.ticket + " ";
+    commit_string += colorize ? import_picocolors3.default.magenta(commit_state.ticket) + " " : commit_state.ticket + " ";
   }
   if (commit_state.title) {
-    commit_string += colorize ? import_picocolors2.default.reset(commit_state.title) : commit_state.title;
+    commit_string += colorize ? import_picocolors3.default.reset(commit_state.title) : commit_state.title;
   }
   if (commit_state.ticket && config.check_ticket.add_to_title && position_end) {
-    commit_string += " " + (colorize ? import_picocolors2.default.magenta(commit_state.ticket) : commit_state.ticket);
+    commit_string += " " + (colorize ? import_picocolors3.default.magenta(commit_state.ticket) : commit_state.ticket);
   }
   if (commit_state.body) {
     const temp = commit_state.body.split("\\n");
-    const res = temp.map((v) => colorize ? import_picocolors2.default.reset(v.trim()) : v.trim()).join("\n");
+    const res = temp.map((v) => colorize ? import_picocolors3.default.reset(v.trim()) : v.trim()).join("\n");
     commit_string += colorize ? `
 
 ${res}` : `
@@ -619,32 +664,32 @@ ${res}` : `
 ${res}`;
   }
   if (commit_state.breaking_title) {
-    const title = colorize ? import_picocolors2.default.red(`BREAKING CHANGE: ${commit_state.breaking_title}`) : `BREAKING CHANGE: ${commit_state.breaking_title}`;
+    const title = colorize ? import_picocolors3.default.red(`BREAKING CHANGE: ${commit_state.breaking_title}`) : `BREAKING CHANGE: ${commit_state.breaking_title}`;
     commit_string += `
 
 ${title}`;
   }
   if (commit_state.breaking_body) {
-    const body = colorize ? import_picocolors2.default.red(commit_state.breaking_body) : commit_state.breaking_body;
+    const body = colorize ? import_picocolors3.default.red(commit_state.breaking_body) : commit_state.breaking_body;
     commit_string += `
 
 ${body}`;
   }
   if (commit_state.deprecates_title) {
-    const title = colorize ? import_picocolors2.default.yellow(`DEPRECATED: ${commit_state.deprecates_title}`) : `DEPRECATED: ${commit_state.deprecates_title}`;
+    const title = colorize ? import_picocolors3.default.yellow(`DEPRECATED: ${commit_state.deprecates_title}`) : `DEPRECATED: ${commit_state.deprecates_title}`;
     commit_string += `
 
 ${title}`;
   }
   if (commit_state.deprecates_body) {
-    const body = colorize ? import_picocolors2.default.yellow(commit_state.deprecates_body) : commit_state.deprecates_body;
+    const body = colorize ? import_picocolors3.default.yellow(commit_state.deprecates_body) : commit_state.deprecates_body;
     commit_string += `
 
 ${body}`;
   }
   if (commit_state.custom_footer) {
     const temp = commit_state.custom_footer.split("\\n");
-    const res = temp.map((v) => colorize ? import_picocolors2.default.reset(v.trim()) : v.trim()).join("\n");
+    const res = temp.map((v) => colorize ? import_picocolors3.default.reset(v.trim()) : v.trim()).join("\n");
     commit_string += colorize ? `
 
 ${res}` : `
@@ -654,10 +699,13 @@ ${res}`;
   if (commit_state.closes && commit_state.ticket) {
     commit_string += colorize ? `
 
-${import_picocolors2.default.reset(commit_state.closes)} ${import_picocolors2.default.magenta(commit_state.ticket)}` : `
+${import_picocolors3.default.reset(commit_state.closes)} ${import_picocolors3.default.magenta(commit_state.ticket)}` : `
 
 ${commit_state.closes} ${commit_state.ticket}`;
   }
+  if (escape_quotes) {
+    commit_string = commit_string.replaceAll('"', '\\"');
+  }
   return commit_string;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/init.js

@@ -34,6 +34,9 @@ var p = __toESM(require("@clack/prompts"));
 var import_zod_validation_error = require("zod-validation-error");
 var CONFIG_FILE_NAME = ".better-commits.json";
 var SPACE_TO_SELECT = `${import_picocolors.default.dim("(<space> to select)")}`;
+var A_FOR_ALL = `${import_picocolors.default.dim(
+  "(<space> to select, <a> to select all)"
+)}`;
 var OPTIONAL_PROMPT = `${import_picocolors.default.dim("(optional)")}`;
 var CACHE_PROMPT = `${import_picocolors.default.dim("(value will be saved)")}`;
 var REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);

package/dist/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  A_FOR_ALL: () => A_FOR_ALL,
   BRANCH_ACTION_OPTIONS: () => BRANCH_ACTION_OPTIONS,
   CACHE_PROMPT: () => CACHE_PROMPT,
   COMMIT_FOOTER_OPTIONS: () => COMMIT_FOOTER_OPTIONS,
@@ -49,7 +50,6 @@ __export(utils_exports, {
   Z_BRANCH_ACTIONS: () => Z_BRANCH_ACTIONS,
   Z_FOOTER_OPTIONS: () => Z_FOOTER_OPTIONS,
   addNewLine: () => addNewLine,
-  check_missing_stage: () => check_missing_stage,
   clean_commit_title: () => clean_commit_title,
   get_default_config_path: () => get_default_config_path,
   get_git_root: () => get_git_root,
@@ -204,6 +204,9 @@ var BranchState = import_zod.z.object({
 // src/utils.ts
 var CONFIG_FILE_NAME = ".better-commits.json";
 var SPACE_TO_SELECT = `${import_picocolors.default.dim("(<space> to select)")}`;
+var A_FOR_ALL = `${import_picocolors.default.dim(
+  "(<space> to select, <a> to select all)"
+)}`;
 var OPTIONAL_PROMPT = `${import_picocolors.default.dim("(optional)")}`;
 var CACHE_PROMPT = `${import_picocolors.default.dim("(value will be saved)")}`;
 var REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);
@@ -373,9 +376,6 @@ function get_git_root() {
 function get_default_config_path() {
   return (0, import_os.homedir)() + "/" + CONFIG_FILE_NAME;
 }
-function check_missing_stage(stats) {
-  return stats.files.filter((f) => f.index.trim() === "" || f.index === "?").map((f) => f.path);
-}
 function addNewLine(arr, i) {
   return i === arr.length - 1 ? "" : "\n";
 }
@@ -389,6 +389,7 @@ function clean_commit_title(title) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  A_FOR_ALL,
   BRANCH_ACTION_OPTIONS,
   CACHE_PROMPT,
   COMMIT_FOOTER_OPTIONS,
@@ -408,7 +409,6 @@ function clean_commit_title(title) {
   Z_BRANCH_ACTIONS,
   Z_FOOTER_OPTIONS,
   addNewLine,
-  check_missing_stage,
   clean_commit_title,
   get_default_config_path,
   get_git_root,

package/dist/zod-state.js

@@ -43,6 +43,9 @@ var import_picocolors = __toESM(require("picocolors"));
 var p = __toESM(require("@clack/prompts"));
 var import_zod_validation_error = require("zod-validation-error");
 var SPACE_TO_SELECT = `${import_picocolors.default.dim("(<space> to select)")}`;
+var A_FOR_ALL = `${import_picocolors.default.dim(
+  "(<space> to select, <a> to select all)"
+)}`;
 var OPTIONAL_PROMPT = `${import_picocolors.default.dim("(optional)")}`;
 var CACHE_PROMPT = `${import_picocolors.default.dim("(value will be saved)")}`;
 var REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "better-commits",
   "private": false,
-  "version": "1.7.2",
+  "version": "1.8.1",
   "description": "A CLI for creating better commits following the conventional commit guidelines",
   "author": "Erik Verduin (https://github.com/everduin94)",
   "keywords": [
@@ -24,7 +24,6 @@
     "@clack/prompts": "^0.6.2",
     "configstore": "^5.0.1",
     "picocolors": "^1.0.0",
-    "simple-git": "^3.16.1",
     "zod": "^3.21.3",
     "zod-validation-error": "^1.0.1"
   },

package/src/git.ts

@@ -0,0 +1,57 @@
+#! /usr/bin/env node
+import { execSync } from "child_process";
+import * as p from "@clack/prompts";
+import color from "picocolors";
+
+const porcelain_states = ["M", "T", "R", "D", "A", "C"];
+
+export function git_status(): { index: string[]; work_tree: string[] } {
+  let status = "";
+  try {
+    status = execSync("git status --porcelain", { stdio: "pipe" }).toString();
+  } catch (err) {
+    p.log.error(color.red("Failed to git status"));
+    return { index: [], work_tree: [] };
+  }
+
+  const lines = status.split("\n");
+  const work_tree: string[] = [];
+  const index: string[] = [];
+  lines.forEach((v) => {
+    const line = v.trimEnd();
+    if (!line) return;
+
+    const path_plus_file = line.substring(2).trim();
+    const first_char = line.charAt(0).trim();
+    const second_char = line.charAt(1).trim();
+
+    // Untracked, always dirty
+    if (first_char === "?" || second_char === "?") {
+      work_tree.push(path_plus_file);
+    }
+
+    if (porcelain_states.includes(first_char)) {
+      index.push(path_plus_file);
+    }
+
+    if (porcelain_states.includes(second_char)) {
+      work_tree.push(path_plus_file);
+    }
+  });
+
+  return { index, work_tree };
+}
+
+export function git_add(files: string[]) {
+  const space_delimited_files = files.join(" ");
+  if (space_delimited_files) {
+    try {
+      execSync(`git add ${space_delimited_files}`, {
+        stdio: "pipe",
+      }).toString();
+      p.log.success(color.green("Changes successfully staged"));
+    } catch (err) {
+      p.log.error(color.red("Failed to stage changes"));
+    }
+  }
+}

package/src/index.ts

@@ -2,46 +2,43 @@
 
 import * as p from '@clack/prompts';
 import color from 'picocolors';
-import { simpleGit } from "simple-git"
 import { execSync } from 'child_process';
+import { chdir } from "process";
 import { z } from "zod";
 import { CommitState, Config } from './zod-state';
-import { load_setup, check_missing_stage, addNewLine, SPACE_TO_SELECT, REGEX_SLASH_TAG, REGEX_SLASH_NUM, REGEX_START_TAG, REGEX_START_NUM, OPTIONAL_PROMPT, clean_commit_title, COMMIT_FOOTER_OPTIONS, infer_type_from_branch, Z_FOOTER_OPTIONS, CUSTOM_SCOPE_KEY,  get_git_root, REGEX_SLASH_UND, REGEX_START_UND } from './utils';
+import { load_setup,  addNewLine, SPACE_TO_SELECT, REGEX_SLASH_TAG, REGEX_SLASH_NUM, REGEX_START_TAG, REGEX_START_NUM, OPTIONAL_PROMPT, clean_commit_title, COMMIT_FOOTER_OPTIONS, infer_type_from_branch, Z_FOOTER_OPTIONS, CUSTOM_SCOPE_KEY,  get_git_root, REGEX_SLASH_UND, REGEX_START_UND } from './utils';
+import { git_add, git_status } from './git';
 
 main(load_setup());
 
 export async function main(config: z.infer<typeof Config>) {
   let commit_state = CommitState.parse({})
-  const simple_git = simpleGit({ baseDir: get_git_root() })
-  let git_status = await simple_git.status();
+  chdir(get_git_root());
+
   if (config.check_status) {
+    let {index, work_tree} = git_status() 
     p.log.step(color.black(color.bgGreen(' Checking Git Status ')))
-    const missing_files = check_missing_stage(git_status);
-    const staged_files = git_status.staged.reduce((acc,curr,i: number) => color.green(acc+curr+addNewLine(git_status.staged,i)), '');
+    const staged_files = index.reduce((acc,curr,i: number) => color.green(acc+curr+addNewLine(index,i)), '');
     p.log.success('Changes to be committed:\n'+staged_files)
-    if (missing_files.length) {
-    const unstaged_files = missing_files.reduce((acc,curr,i: number) => color.red(acc+curr+addNewLine(missing_files,i)), '');
+    if (work_tree.length) {
+    const unstaged_files = work_tree.reduce((acc,curr,i: number) => color.red(acc+curr+addNewLine(work_tree,i)), '');
      p.log.error('Changes not staged for commit:\n'+unstaged_files)
      const selected_for_staging = await p.multiselect({
        message: `Some files have not been staged, would you like to add them now? ${SPACE_TO_SELECT}`,
-       options: [{value: '.', label: '.'}, ...missing_files.map(v => ({value: v, label: v}))],
+       options: [{value: '.', label: '.'}, ...work_tree.map(v => ({value: v, label: v}))],
        required: false,
      }) as string[]
     if (p.isCancel(selected_for_staging)) process.exit(0)
+      git_add(selected_for_staging);
+    }
 
-     await simple_git.add(selected_for_staging)
-     git_status = await simple_git.status();
-     if (selected_for_staging?.length){
-        p.log.success(color.green('Changes successfully staged'))    
-     }
+    let updated_status = git_status() 
+    if (!updated_status.index.length) {
+      p.log.error(color.red('no changes added to commit (use "git add" and/or "git commit -a")'))
+      process.exit(0);
     }
   } 
 
-  if (!git_status.staged.length) {
-    p.log.error(color.red('no changes added to commit (use "git add" and/or "git commit -a")'))
-    process.exit(0);
-  }
-
   if (config.commit_type.enable) {
     let message = 'Select a commit type';
     let initial_value = config.commit_type.initial_value 
@@ -208,7 +205,7 @@ export async function main(config: z.infer<typeof Config>) {
   
 
   let continue_commit = true;
-  p.note(build_commit_string(commit_state, config, true), 'Commit Preview')
+  p.note(build_commit_string(commit_state, config, true, false), 'Commit Preview')
   if (config.confirm_commit) {
     continue_commit = await p.confirm({message: 'Confirm Commit?'}) as boolean;
     if (p.isCancel(continue_commit)) process.exit(0)
@@ -221,14 +218,14 @@ export async function main(config: z.infer<typeof Config>) {
 
   try {      
     const options = config.overrides.shell ? { shell: config.overrides.shell } : {}
-    const output = execSync(`git commit -m "${build_commit_string(commit_state, config, false)}"`, options).toString().trim();
+    const output = execSync(`git commit -m "${build_commit_string(commit_state, config, false, true)}"`, options).toString().trim();
     if (config.print_commit_output) p.log.info(output)
   } catch(err) {
     p.log.error('Something went wrong when committing: ' + err)
   }
 }
 
-function build_commit_string(commit_state: z.infer<typeof CommitState>, config: z.infer<typeof Config>, colorize: boolean = false): string {
+function build_commit_string(commit_state: z.infer<typeof CommitState>, config: z.infer<typeof Config>, colorize: boolean = false, escape_quotes: boolean = false): string {
   let commit_string = '';
   if (commit_state.type) {
     commit_string += colorize ? color.blue(commit_state.type) : commit_state.type
@@ -298,6 +295,10 @@ function build_commit_string(commit_state: z.infer<typeof CommitState>, config:
     commit_string += colorize ? `\n\n${color.reset(commit_state.closes)} ${color.magenta(commit_state.ticket)}` : `\n\n${commit_state.closes} ${commit_state.ticket}`;
   }
 
+  if (escape_quotes) {
+    commit_string = commit_string.replaceAll('"', '\\"')
+  }
+
   return commit_string;
 }
 

package/src/utils.ts

@@ -1,5 +1,4 @@
 import { homedir } from "os";
-import { StatusResult } from "simple-git";
 import { z } from "zod";
 import color from "picocolors";
 import { execSync } from "child_process";
@@ -10,6 +9,9 @@ import { Config } from "./zod-state";
 
 export const CONFIG_FILE_NAME = ".better-commits.json";
 export const SPACE_TO_SELECT = `${color.dim("(<space> to select)")}`;
+export const A_FOR_ALL = `${color.dim(
+  "(<space> to select, <a> to select all)"
+)}`;
 export const OPTIONAL_PROMPT = `${color.dim("(optional)")}`;
 export const CACHE_PROMPT = `${color.dim("(value will be saved)")}`;
 export const REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);
@@ -206,12 +208,6 @@ export function get_default_config_path(): string {
   return homedir() + "/" + CONFIG_FILE_NAME;
 }
 
-export function check_missing_stage(stats: StatusResult): string[] {
-  return stats.files
-    .filter((f) => f.index.trim() === "" || f.index === "?")
-    .map((f) => f.path);
-}
-
 export function addNewLine(arr: string[], i: number) {
   return i === arr.length - 1 ? "" : "\n";
 }