opencommit 1.0.2 → 1.0.4

package/out/cli.cjs

@@ -15412,7 +15412,7 @@ function G3(t, e2) {
 // package.json
 var package_default = {
   name: "opencommit",
-  version: "1.0.1",
+  version: "1.0.3",
   description: "AI generates conventional commits with mind-blowing accuracy.",
   keywords: [
     "git",
@@ -17441,12 +17441,16 @@ var generateCommitMessageWithChatCompletion = async (diff) => {
   }
 };
 function getMessagesPromisesByLines(fileDiff, separator) {
-  const [fileHeader, ...fileDiffByLines] = fileDiff.split("\n@@");
-  const lineDiffsWithHeader = fileDiffByLines.map(
-    (d6) => fileHeader + "\n@@" + d6
+  const lineSeparator = "\n@@";
+  const [fileHeader, ...fileDiffByLines] = fileDiff.split(lineSeparator);
+  const mergedLines = mergeStrings(
+    fileDiffByLines.map((line) => lineSeparator + line),
+    MAX_REQ_TOKENS
   );
-  const mergedLines = mergeStrings(lineDiffsWithHeader, MAX_REQ_TOKENS);
-  const commitMsgsFromFileLineDiffs = mergedLines.map((d6) => {
+  const lineDiffsWithHeader = mergedLines.map(
+    (d6) => fileHeader + lineSeparator + d6
+  );
+  const commitMsgsFromFileLineDiffs = lineDiffsWithHeader.map((d6) => {
     const messages = generateCommitMessageChatCompletionPrompt(separator + d6);
     return api.generateCommitMessage(messages);
   });
@@ -17455,9 +17459,9 @@ function getMessagesPromisesByLines(fileDiff, separator) {
 function getCommitMsgsPromisesFromFileDiffs(diff) {
   const separator = "diff --git ";
   const diffByFiles = diff.split(separator).slice(1);
-  const mergedDiffs = mergeStrings(diffByFiles, MAX_REQ_TOKENS);
+  const mergedFilesDiffs = mergeStrings(diffByFiles, MAX_REQ_TOKENS);
   const commitMessagePromises = [];
-  for (const fileDiff of mergedDiffs) {
+  for (const fileDiff of mergedFilesDiffs) {
     if (fileDiff.length >= MAX_REQ_TOKENS) {
       const messagesPromises = getMessagesPromisesByLines(fileDiff, separator);
       commitMessagePromises.push(...messagesPromises);
@@ -17497,8 +17501,11 @@ var prepareCommitMessageHook = async () => {
     );
     if (typeof commitMessage !== "string")
       throw new Error(commitMessage.error);
-    await import_promises2.default.appendFile(messageFilePath, commitMessage);
-    ce(`${source_default.green("\u2714")} commit done`);
+    const fileContent = await import_promises2.default.readFile(messageFilePath);
+    await import_promises2.default.writeFile(
+      messageFilePath,
+      commitMessage + "\n" + fileContent.toString()
+    );
   } catch (error) {
     ce(`${source_default.red("\u2716")} ${error}`);
     process.exit(1);
@@ -17531,8 +17538,9 @@ ${source_default.grey("\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2
     message: "Confirm the commit message"
   });
   if (isCommitConfirmedByUser && !C3(isCommitConfirmedByUser)) {
-    await execa("git", ["commit", "-m", commitMessage]);
+    const { stdout } = await execa("git", ["commit", "-m", commitMessage]);
     ce(`${source_default.green("\u2714")} successfully committed`);
+    ce(stdout);
   } else
     ce(`${source_default.gray("\u2716")} process cancelled`);
 };
@@ -17553,7 +17561,7 @@ async function commit(isStageAllFlag = false) {
     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.`
     );
-    stagedFilesSpinner.stop("Counting staged files");
+    stagedFilesSpinner.stop("No files are staged");
     const isStageAllAndCommitConfirmedByUser = await Q2({
       message: "Do you want to stage all files and generate commit message?"
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "AI generates conventional commits with mind-blowing accuracy.",
   "keywords": [
     "git",