opencommit 1.1.11 → 1.1.12

package/README.md

@@ -20,7 +20,7 @@ All the commits in this repo are done with OpenCommit — look into [the commits
 
 ## Setup
 
-1. Install opencommit globally to use in any repository:
+1. Install OpenCommit globally to use in any repository:
 
    ```sh
    npm install -g opencommit
@@ -28,7 +28,7 @@ All the commits in this repo are done with OpenCommit — look into [the commits
 
 2. Get your API key from [OpenAI](https://platform.openai.com/account/api-keys). Make sure you add payment details, so API works.
 
-3. Set the key to opencommit config:
+3. Set the key to OpenCommit config:
 
    ```sh
    opencommit config set OPENAI_API_KEY=<your_api_key>
@@ -38,7 +38,7 @@ All the commits in this repo are done with OpenCommit — look into [the commits
 
 ## Usage
 
-You can call `opencommit` directly to generate a commit message for your staged changes:
+You can call OpenCommit directly to generate a commit message for your staged changes:
 
 ```sh
 git add <files...>
@@ -86,7 +86,7 @@ oc config set description=false
 
 ## Git hook
 
-You can set opencommit as Git [`prepare-commit-msg`](https://git-scm.com/docs/githooks#_prepare_commit_msg) hook. Hook integrates with you IDE Source Control and allows you edit the message before commit.
+You can set OpenCommit as Git [`prepare-commit-msg`](https://git-scm.com/docs/githooks#_prepare_commit_msg) hook. Hook integrates with you IDE Source Control and allows you edit the message before commit.
 
 To set the hook:
 

package/out/cli.cjs

@@ -75,13 +75,13 @@ var require_ini = __commonJS({
       const out = /* @__PURE__ */ Object.create(null);
       let p4 = out;
       let section = null;
-      const re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i;
+      const re2 = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i;
       const lines = str.split(/[\r\n]+/g);
       for (const line of lines) {
         if (!line || line.match(/^\s*[;#]/)) {
           continue;
         }
-        const match = line.match(re);
+        const match = line.match(re2);
         if (!match) {
           continue;
         }
@@ -15482,7 +15482,7 @@ function G3(t, e2) {
 // package.json
 var package_default = {
   name: "opencommit",
-  version: "1.1.10",
+  version: "1.1.11",
   description: "GPT CLI to auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}",
   keywords: [
     "git",
@@ -15524,7 +15524,8 @@ var package_default = {
     dev: "ts-node ./src/cli.ts",
     build: "rimraf out && esbuild ./src/cli.ts --bundle --outfile=out/cli.cjs --format=cjs --platform=node",
     deploy: "npm run build && npm version patch && npm publish --tag latest",
-    lint: "eslint src --ext ts && tsc --noEmit"
+    lint: "eslint src --ext ts && tsc --noEmit",
+    format: "prettier --write src"
   },
   devDependencies: {
     "@types/ini": "^1.3.31",
@@ -15535,6 +15536,7 @@ var package_default = {
     dotenv: "^16.0.3",
     esbuild: "^0.15.18",
     eslint: "^8.28.0",
+    prettier: "^2.8.4",
     "ts-node": "^10.9.1",
     typescript: "^4.9.3"
   },
@@ -15880,6 +15882,38 @@ var sD2 = class extends h2 {
     });
   }
 };
+var iD2 = class extends h2 {
+  constructor(u2) {
+    super(u2, false), this.cursor = 0, this.options = u2.options, this.value = [...u2.initialValues ?? []], this.cursor = Math.max(this.options.findIndex(({ value: F4 }) => F4 === u2.cursorAt), 0), this.on("key", (F4) => {
+      F4 === "a" && this.toggleAll();
+    }), this.on("cursor", (F4) => {
+      switch (F4) {
+        case "left":
+        case "up":
+          this.cursor = this.cursor === 0 ? this.options.length - 1 : this.cursor - 1;
+          break;
+        case "down":
+        case "right":
+          this.cursor = this.cursor === this.options.length - 1 ? 0 : this.cursor + 1;
+          break;
+        case "space":
+          this.toggleValue();
+          break;
+      }
+    });
+  }
+  get _value() {
+    return this.options[this.cursor].value;
+  }
+  toggleAll() {
+    const u2 = this.value.length === this.options.length;
+    this.value = u2 ? [] : this.options.map((F4) => F4.value);
+  }
+  toggleValue() {
+    const u2 = this.value.includes(this._value);
+    this.value = u2 ? this.value.filter((F4) => F4 !== this._value) : [...this.value, this._value];
+  }
+};
 function aD2({ input: t = import_node_process.stdin, output: u2 = import_node_process.stdout, overwrite: F4 = true, hideCursor: e2 = true } = {}) {
   const s = f.createInterface({ input: t, output: u2, prompt: "", tabSize: 1 });
   f.emitKeypressEvents(t, s), t.isTTY && t.setRawMode(true);
@@ -15960,6 +15994,50 @@ ${import_picocolors.default.cyan(o)}
     }
   } }).prompt();
 };
+var re = (r2) => {
+  const n = (s, t) => {
+    const i2 = s.label ?? String(s.value);
+    return t === "active" ? `${import_picocolors.default.cyan(_5)} ${i2} ${s.hint ? import_picocolors.default.dim(`(${s.hint})`) : ""}` : t === "selected" ? `${import_picocolors.default.green(y4)} ${import_picocolors.default.dim(i2)}` : t === "cancelled" ? `${import_picocolors.default.strikethrough(import_picocolors.default.dim(i2))}` : t === "active-selected" ? `${import_picocolors.default.green(y4)} ${i2} ${s.hint ? import_picocolors.default.dim(`(${s.hint})`) : ""}` : t === "submitted" ? `${import_picocolors.default.dim(i2)}` : `${import_picocolors.default.dim(A2)} ${import_picocolors.default.dim(i2)}`;
+  };
+  return new iD2({ options: r2.options, initialValues: r2.initialValues, required: r2.required ?? true, cursorAt: r2.cursorAt, validate(s) {
+    if (this.required && s.length === 0)
+      return `Please select at least one option.
+${import_picocolors.default.reset(import_picocolors.default.dim(`Press ${import_picocolors.default.gray(import_picocolors.default.bgWhite(import_picocolors.default.inverse(" space ")))} to select, ${import_picocolors.default.gray(import_picocolors.default.bgWhite(import_picocolors.default.inverse(" enter ")))} to submit`))}`;
+  }, render() {
+    let s = `${import_picocolors.default.gray(a)}
+${h3(this.state)}  ${r2.message}
+`;
+    switch (this.state) {
+      case "submit":
+        return `${s}${import_picocolors.default.gray(a)}  ${this.options.filter(({ value: t }) => this.value.includes(t)).map((t) => n(t, "submitted")).join(import_picocolors.default.dim(", ")) || import_picocolors.default.dim("none")}`;
+      case "cancel": {
+        const t = this.options.filter(({ value: i2 }) => this.value.includes(i2)).map((i2) => n(i2, "cancelled")).join(import_picocolors.default.dim(", "));
+        return `${s}${import_picocolors.default.gray(a)}  ${t.trim() ? `${t}
+${import_picocolors.default.gray(a)}` : ""}`;
+      }
+      case "error": {
+        const t = this.error.split(`
+`).map((i2, c3) => c3 === 0 ? `${import_picocolors.default.yellow(o)}  ${import_picocolors.default.yellow(i2)}` : `   ${i2}`).join(`
+`);
+        return s + import_picocolors.default.yellow(a) + "  " + this.options.map((i2, c3) => {
+          const l = this.value.includes(i2.value), $4 = c3 === this.cursor;
+          return $4 && l ? n(i2, "active-selected") : l ? n(i2, "selected") : n(i2, $4 ? "active" : "inactive");
+        }).join(`
+${import_picocolors.default.yellow(a)}  `) + `
+` + t + `
+`;
+      }
+      default:
+        return `${s}${import_picocolors.default.cyan(a)}  ${this.options.map((t, i2) => {
+          const c3 = this.value.includes(t.value), l = i2 === this.cursor;
+          return l && c3 ? n(t, "active-selected") : c3 ? n(t, "selected") : n(t, l ? "active" : "inactive");
+        }).join(`
+${import_picocolors.default.cyan(a)}  `)}
+${import_picocolors.default.cyan(o)}
+`;
+    }
+  } }).prompt();
+};
 var ae = (r2 = "") => {
   process.stdout.write(`${import_picocolors.default.gray(L5)}  ${r2}
 `);
@@ -16471,6 +16549,100 @@ var chalk = createChalk();
 var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
+// src/i18n/en.json
+var en_default = {
+  localLanguage: "english",
+  commitFix: "fix(server.ts): change port variable case from lowercase port to uppercase PORT",
+  commitFeat: "feat(server.ts): add support for process.env.PORT environment variable",
+  commitDescription: "The port variable is now named PORT, which improves consistency with the naming conventions as PORT is a constant. Support for an environment variable allows the application to be more flexible as it can now run on any available port specified via the process.env.PORT environment variable."
+};
+
+// src/i18n/de.json
+var de_default = {
+  localLanguage: "Deutsch",
+  commitFix: "fix(server.ts): \xC4ndere die Gro\xDF- und Kleinschreibung der Port-Variable von Kleinbuchstaben auf Gro\xDFbuchstaben PORT.",
+  commitFeat: "Funktion(server.ts): Unterst\xFCtzung f\xFCr die Umgebungsvariable process.env.PORT hinzuf\xFCgen",
+  commitDescription: "Die Port-Variable hei\xDFt jetzt PORT, was die Konsistenz mit den Namenskonventionen verbessert, da PORT eine Konstante ist. Die Unterst\xFCtzung f\xFCr eine Umgebungsvariable erm\xF6glicht es der Anwendung, flexibler zu sein, da sie jetzt auf jedem verf\xFCgbaren Port laufen kann, der \xFCber die Umgebungsvariable process.env.PORT angegeben wird."
+};
+
+// src/i18n/fr.json
+var fr_default = {
+  localLanguage: "fran\xE7aise",
+  commitFix: "corriger(server.ts) : changer la casse de la variable de port de minuscules \xE0 majuscules (PORT)",
+  commitFeat: "fonctionnalit\xE9(server.ts) : ajouter la prise en charge de la variable d'environnement process.env.PORT",
+  commitDescription: "La variable de port est maintenant nomm\xE9e PORT, ce qui am\xE9liore la coh\xE9rence avec les conventions de nommage car PORT est une constante. La prise en charge d'une variable d'environnement permet \xE0 l'application d'\xEAtre plus flexible car elle peut maintenant s'ex\xE9cuter sur n'importe quel port disponible sp\xE9cifi\xE9 via la variable d'environnement process.env.PORT."
+};
+
+// src/i18n/it.json
+var it_default = {
+  localLanguage: "italiano",
+  commitFix: "fix(server.ts): cambia il caso della variabile di porta da minuscolo port a maiuscolo PORT",
+  commitFeat: "funzionalit\xE0(server.ts): aggiungi supporto per la variabile di ambiente process.env.PORT",
+  commitDescription: "La variabile di porta \xE8 ora chiamata PORT, il che migliora la coerenza con le convenzioni di denominazione in quanto PORT \xE8 una costante. Il supporto per una variabile di ambiente consente all'applicazione di essere pi\xF9 flessibile poich\xE9 ora pu\xF2 essere eseguita su qualsiasi porta disponibile specificata tramite la variabile di ambiente process.env.PORT."
+};
+
+// src/i18n/ko.json
+var ko_default = {
+  localLanguage: "\uD55C\uAD6D\uC5B4",
+  commitFix: "fix(server.ts): \uD3EC\uD2B8 \uBCC0\uC218\uB97C \uC18C\uBB38\uC790 port\uC5D0\uC11C \uB300\uBB38\uC790 PORT\uB85C \uBCC0\uACBD",
+  commitFeat: "\uD53C\uD2B8(server.ts): process.env.PORT \uD658\uACBD \uBCC0\uC218 \uC9C0\uC6D0 \uCD94\uAC00",
+  commitDescription: "\uD3EC\uD2B8 \uBCC0\uC218\uB294 \uC774\uC81C PORT\uB85C \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC5B4 \uC0C1\uC218\uC778 PORT\uC640 \uC77C\uAD00\uC131 \uC788\uB294 \uC774\uB984 \uADDC\uCE59\uC744 \uB530\uB985\uB2C8\uB2E4. \uD658\uACBD \uBCC0\uC218 \uC9C0\uC6D0\uC744 \uD1B5\uD574 \uC560\uD50C\uB9AC\uCF00\uC774\uC158\uC740 \uC774\uC81C process.env.PORT \uD658\uACBD \uBCC0\uC218\uB85C \uC9C0\uC815\uB41C \uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uD3EC\uD2B8\uC5D0\uC11C \uC2E4\uD589\uD560 \uC218 \uC788\uC73C\uBBC0\uB85C \uB354 \uC720\uC5F0\uD574\uC84C\uC2B5\uB2C8\uB2E4."
+};
+
+// src/i18n/zh_CN.json
+var zh_CN_default = {
+  localLanguage: "\u7B80\u4F53\u4E2D\u6587",
+  commitFix: "\u4FEE\u590D(server.ts)\uFF1A\u5C06\u7AEF\u53E3\u53D8\u91CF\u4ECE\u5C0F\u5199port\u6539\u4E3A\u5927\u5199PORT",
+  commitFeat: "\u529F\u80FD(server.ts)\uFF1A\u6DFB\u52A0\u5BF9process.env.PORT\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301",
+  commitDescription: "\u73B0\u5728\u7AEF\u53E3\u53D8\u91CF\u88AB\u547D\u540D\u4E3APORT\uFF0C\u8FD9\u63D0\u9AD8\u4E86\u547D\u540D\u7EA6\u5B9A\u7684\u4E00\u81F4\u6027\uFF0C\u56E0\u4E3APORT\u662F\u4E00\u4E2A\u5E38\u91CF\u3002\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301\u4F7F\u5E94\u7528\u7A0B\u5E8F\u66F4\u52A0\u7075\u6D3B\uFF0C\u56E0\u4E3A\u5B83\u73B0\u5728\u53EF\u4EE5\u901A\u8FC7process.env.PORT\u73AF\u5883\u53D8\u91CF\u5728\u4EFB\u4F55\u53EF\u7528\u7AEF\u53E3\u4E0A\u8FD0\u884C\u3002"
+};
+
+// src/i18n/zh_TW.json
+var zh_TW_default = {
+  localLanguage: "\u7E41\u9AD4\u4E2D\u6587",
+  commitFix: "\u4FEE\u6B63(server.ts)\uFF1A\u5C07\u7AEF\u53E3\u8B8A\u6578\u5F9E\u5C0F\u5BEB\u7AEF\u53E3\u6539\u70BA\u5927\u5BEBPORT",
+  commitFeat: "\u529F\u80FD(server.ts)\uFF1A\u65B0\u589E\u5C0Dprocess.env.PORT\u74B0\u5883\u8B8A\u6578\u7684\u652F\u63F4",
+  commitDescription: "\u73FE\u5728port\u8B8A\u6578\u5DF2\u66F4\u540D\u70BAPORT\uFF0C\u4EE5\u7B26\u5408\u547D\u540D\u6163\u4F8B\uFF0C\u56E0\u70BAPORT\u662F\u4E00\u500B\u5E38\u91CF\u3002\u652F\u63F4\u74B0\u5883\u8B8A\u6578\u53EF\u4EE5\u4F7F\u61C9\u7528\u7A0B\u5E8F\u66F4\u9748\u6D3B\uFF0C\u56E0\u70BA\u5B83\u73FE\u5728\u53EF\u4EE5\u901A\u904Eprocess.env.PORT\u74B0\u5883\u8B8A\u6578\u904B\u884C\u5728\u4EFB\u4F55\u53EF\u7528\u7AEF\u53E3\u4E0A\u3002"
+};
+
+// src/i18n/ja.json
+var ja_default = {
+  localLanguage: "\u306B\u307B\u3093\u3054",
+  commitFix: "\u4FEE\u6B63(server.ts): \u30DD\u30FC\u30C8\u5909\u6570\u306E\u30B1\u30FC\u30B9\u3092\u5C0F\u6587\u5B57\u306E\u30DD\u30FC\u30C8\u304B\u3089\u5927\u6587\u5B57\u306EPORT\u306B\u5909\u66F4",
+  commitFeat: "\u65B0\u6A5F\u80FD(server.ts): process.env.PORT\u74B0\u5883\u5909\u6570\u306E\u30B5\u30DD\u30FC\u30C8\u3092\u8FFD\u52A0\u3059\u308B",
+  commitDescription: "\u30DD\u30FC\u30C8\u5909\u6570\u306F\u73FE\u5728PORT\u3068\u3044\u3046\u540D\u524D\u306B\u306A\u3063\u3066\u304A\u308A\u3001PORT\u306F\u5B9A\u6570\u3067\u3042\u308B\u305F\u3081\u547D\u540D\u898F\u5247\u306B\u4E00\u8CAB\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u74B0\u5883\u5909\u6570\u306E\u30B5\u30DD\u30FC\u30C8\u306B\u3088\u308A\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u3088\u308A\u67D4\u8EDF\u306B\u306A\u308A\u3001process.env.PORT\u74B0\u5883\u5909\u6570\u3067\u6307\u5B9A\u3055\u308C\u305F\u4EFB\u610F\u306E\u5229\u7528\u53EF\u80FD\u306A\u30DD\u30FC\u30C8\u3067\u5B9F\u884C\u3067\u304D\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3057"
+};
+
+// src/i18n/index.ts
+var i18n = {
+  en: en_default,
+  zh_CN: zh_CN_default,
+  zh_TW: zh_TW_default,
+  ja: ja_default,
+  de: de_default,
+  fr: fr_default,
+  it: it_default,
+  ko: ko_default
+};
+var I18N_CONFIG_ALIAS = {
+  zh_CN: ["zh_CN", "\u7B80\u4F53\u4E2D\u6587", "\u4E2D\u6587", "\u7B80\u4F53"],
+  zh_TW: ["zh_TW", "\u7E41\u9AD4\u4E2D\u6587", "\u7E41\u9AD4"],
+  ja: ["ja", "Japanese", "\u306B\u307B\u3093\u3054"],
+  ko: ["ko", "Korean", "\uD55C\uAD6D\uC5B4"],
+  de: ["de", "German", "Deutsch"],
+  fr: ["fr", "French", "fran\xE7aise"],
+  it: ["it", "Italian", "italiano"]
+};
+function getI18nLocal(value) {
+  for (const key in I18N_CONFIG_ALIAS) {
+    const aliases2 = I18N_CONFIG_ALIAS[key];
+    if (aliases2.includes(value)) {
+      return key;
+    }
+  }
+  return false;
+}
+
 // src/commands/config.ts
 var validateConfig = (key, condition, validationMessage) => {
   if (!condition) {
@@ -16510,6 +16682,14 @@ var configValidators = {
       "Must be true or false"
     );
     return value;
+  },
+  ["language" /* language */](value) {
+    validateConfig(
+      "language" /* language */,
+      getI18nLocal(value),
+      `${value} is not supported yet`
+    );
+    return getI18nLocal(value);
   }
 };
 var configPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit");
@@ -17498,32 +17678,55 @@ var assertGitRepo = async () => {
     throw new Error(error);
   }
 };
-var excludeBigFilesFromDiff = ["*-lock.*", "*.lock"].map(
-  (file) => `:(exclude)${file}`
-);
-var getStagedGitDiff = async (isStageAllFlag = false) => {
-  if (isStageAllFlag) {
-    const stageAllSpinner = le();
-    stageAllSpinner.start("Staging all changes");
-    await execa("git", ["add", "."]);
-    stageAllSpinner.stop("Done");
-  }
-  const diffStaged = ["diff", "--staged"];
+var getStagedFiles = async () => {
   const { stdout: files } = await execa("git", [
-    ...diffStaged,
+    "diff",
     "--name-only",
-    ...excludeBigFilesFromDiff
+    "--cached"
   ]);
   if (!files)
-    return null;
+    return [];
+  return files.split("\n").sort();
+};
+var getChangedFiles = async () => {
+  const { stdout: modified } = await execa("git", ["ls-files", "--modified"]);
+  const { stdout: others } = await execa("git", [
+    "ls-files",
+    "--others",
+    "--exclude-standard"
+  ]);
+  const files = [...modified.split("\n"), ...others.split("\n")].filter(
+    (file) => !!file
+  );
+  return files.sort();
+};
+var gitAdd = async ({ files }) => {
+  const gitAddSpinner = le();
+  gitAddSpinner.start("Adding files to commit");
+  await execa("git", ["add", ...files]);
+  gitAddSpinner.stop("Done");
+};
+var getDiff = async ({ files }) => {
+  const lockFiles = files.filter(
+    (file) => file.includes(".lock") || file.includes("-lock.")
+  );
+  if (lockFiles.length) {
+    ce(
+      `Some files are '.lock' files which are excluded by default from 'git diff'. No commit messages are generated for this files:
+${lockFiles.join(
+        "\n"
+      )}`
+    );
+  }
+  const filesWithoutLocks = files.filter(
+    (file) => !file.includes(".lock") && !file.includes("-lock.")
+  );
   const { stdout: diff } = await execa("git", [
-    ...diffStaged,
-    ...excludeBigFilesFromDiff
+    "diff",
+    "--staged",
+    ...filesWithoutLocks
   ]);
-  return {
-    files: files.split("\n").sort(),
-    diff
-  };
+  return diff;
 };
 
 // src/commands/githook.ts
@@ -20480,10 +20683,11 @@ function mergeStrings(arr, maxStringLength) {
 
 // src/generateCommitMessageFromGitDiff.ts
 var config2 = getConfig();
+var translation = i18n[config2?.language || "en"];
 var INIT_MESSAGES_PROMPT = [
   {
     role: import_openai2.ChatCompletionRequestMessageRoleEnum.System,
-    content: `You are to act as the author of a commit message in git. Your mission is to create clean and comprehensive commit messages in the conventional commit convention. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message. ${config2?.emoji ? "Use Gitmoji convention to preface the commit" : "Do not preface the commit with anything"}, use the present tense. ${config2?.description ? `Add a short description of what commit is about after the commit message. Don't start it with "This commit", just describe the changes.` : "Don't add any descriptions to the commit, only commit message."}`
+    content: `You are to act as the author of a commit message in git. Your mission is to create clean and comprehensive commit messages in the conventional commit convention. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message. ${config2?.emoji ? "Use Gitmoji convention to preface the commit" : "Do not preface the commit with anything"}, use the present tense. ${config2?.description ? `Add a short description of what commit is about after the commit message. Don't start it with "This commit", just describe the changes.` : "Don't add any descriptions to the commit, only commit message."} Use ${translation.localLanguage} to answer.}`
   },
   {
     role: import_openai2.ChatCompletionRequestMessageRoleEnum.User,
@@ -20512,9 +20716,9 @@ var INIT_MESSAGES_PROMPT = [
   },
   {
     role: import_openai2.ChatCompletionRequestMessageRoleEnum.Assistant,
-    content: `${config2?.emoji ? "\u{1F41B} " : ""}fix(server.ts): change port variable case from lowercase port to uppercase PORT
-${config2?.emoji ? "\u2728 " : ""}feat(server.ts): add support for process.env.PORT environment variable
-${config2?.description ? "The port variable is now named PORT, which improves consistency with the naming conventions as PORT is a constant. Support for an environment variable allows the application to be more flexible as it can now run on any available port specified via the process.env.PORT environment variable." : ""}`
+    content: `${config2?.emoji ? "\u{1F41B} " : ""}${translation.commitFix}
+${config2?.emoji ? "\u2728 " : ""}${translation.commitFeat}
+${config2?.description ? translation.commitDescription : ""}`
   }
 ];
 var generateCommitMessageChatCompletionPrompt = (diff) => {
@@ -20592,7 +20796,14 @@ var prepareCommitMessageHook = async () => {
     }
     if (commitSource)
       return;
-    const staged = await getStagedGitDiff();
+    const changedFiles = await getChangedFiles();
+    if (changedFiles)
+      await gitAdd({ files: changedFiles });
+    else {
+      ce("No changes detected, write some code and run `oc` again");
+      process.exit(1);
+    }
+    const staged = await getStagedFiles();
     if (!staged)
       return;
     ae("opencommit");
@@ -20603,7 +20814,7 @@ var prepareCommitMessageHook = async () => {
       );
     }
     const commitMessage = await generateCommitMessageWithChatCompletion(
-      staged.diff
+      await getDiff({ files: staged })
     );
     if (typeof commitMessage !== "string")
       throw new Error(commitMessage.error);
@@ -20618,6 +20829,18 @@ var prepareCommitMessageHook = async () => {
   }
 };
 
+// src/utils/trytm.ts
+var trytm = async (promise) => {
+  try {
+    const data = await promise;
+    return [data, null];
+  } catch (throwable) {
+    if (throwable instanceof Error)
+      return [null, throwable];
+    throw throwable;
+  }
+};
+
 // src/commands/commit.ts
 var generateCommitMessageFromGitDiff = async (diff) => {
   await assertGitRepo();
@@ -20662,36 +20885,64 @@ ${source_default.grey("\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2
     ce(`${source_default.gray("\u2716")} process cancelled`);
 };
 async function commit(isStageAllFlag = false) {
+  if (isStageAllFlag) {
+    const changedFiles2 = await getChangedFiles();
+    if (changedFiles2)
+      await gitAdd({ files: changedFiles2 });
+    else {
+      ce("No changes detected, write some code and run `oc` again");
+      process.exit(1);
+    }
+  }
+  const [stagedFiles, errorStagedFiles] = await trytm(getStagedFiles());
+  const [changedFiles, errorChangedFiles] = await trytm(getChangedFiles());
+  if (!changedFiles?.length && !stagedFiles?.length) {
+    ce(source_default.red("No changes detected"));
+    process.exit(1);
+  }
   ae("open-commit");
-  const stagedFilesSpinner = le();
-  stagedFilesSpinner.start("Counting staged files");
-  const staged = await getStagedGitDiff(isStageAllFlag);
-  if (!staged && isStageAllFlag) {
-    ce(
-      `${source_default.red(
-        "No changes detected"
-      )} \u2014 write some code, stage the files ${source_default.hex("0000FF").bold("`git add .`")} and rerun ${source_default.hex("0000FF").bold("`oc`")} command.`
-    );
+  if (errorChangedFiles ?? errorStagedFiles) {
+    ce(`${source_default.red("\u2716")} ${errorChangedFiles ?? errorStagedFiles}`);
     process.exit(1);
   }
-  if (!staged) {
-    ce(
-      `${source_default.red("Nothing to commit")} \u2014 stage the files ${source_default.hex("0000FF").bold("`git add .`")} and rerun ${source_default.hex("0000FF").bold("`oc`")} command.`
-    );
+  const stagedFilesSpinner = le();
+  stagedFilesSpinner.start("Counting staged files");
+  if (!stagedFiles.length) {
     stagedFilesSpinner.stop("No files are staged");
     const isStageAllAndCommitConfirmedByUser = await Q3({
       message: "Do you want to stage all files and generate commit message?"
     });
     if (isStageAllAndCommitConfirmedByUser && !eD2(isStageAllAndCommitConfirmedByUser)) {
       await commit(true);
+      process.exit(1);
     }
+    if (stagedFiles.length === 0 && changedFiles.length > 0) {
+      const files = await re({
+        message: source_default.cyan("Select the files you want to add to the commit:"),
+        options: changedFiles.map((file) => ({
+          value: file,
+          label: file
+        }))
+      });
+      if (eD2(files))
+        process.exit(1);
+      await gitAdd({ files });
+    }
+    await commit(false);
     process.exit(1);
   }
   stagedFilesSpinner.stop(
-    `${staged.files.length} staged files:
-${staged.files.map((file) => `  ${file}`).join("\n")}`
+    `${stagedFiles.length} staged files:
+${stagedFiles.map((file) => `  ${file}`).join("\n")}`
   );
-  await generateCommitMessageFromGitDiff(staged.diff);
+  const [, generateCommitError] = await trytm(
+    generateCommitMessageFromGitDiff(await getDiff({ files: stagedFiles }))
+  );
+  if (generateCommitError) {
+    ce(`${source_default.red("\u2716")} ${generateCommitError}`);
+    process.exit(1);
+  }
+  process.exit(0);
 }
 
 // src/cli.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "description": "GPT CLI to auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
   "keywords": [
     "git",
@@ -42,7 +42,8 @@
     "dev": "ts-node ./src/cli.ts",
     "build": "rimraf out && esbuild ./src/cli.ts --bundle --outfile=out/cli.cjs --format=cjs --platform=node",
     "deploy": "npm run build && npm version patch && npm publish --tag latest",
-    "lint": "eslint src --ext ts && tsc --noEmit"
+    "lint": "eslint src --ext ts && tsc --noEmit",
+    "format": "prettier --write src"
   },
   "devDependencies": {
     "@types/ini": "^1.3.31",
@@ -53,6 +54,7 @@
     "dotenv": "^16.0.3",
     "esbuild": "^0.15.18",
     "eslint": "^8.28.0",
+    "prettier": "^2.8.4",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.3"
   },