aicommits 0.1.1 → 0.1.4

package/README.md

@@ -25,6 +25,7 @@ Now:
 - Rewrite this in node to publish as an npm package
 - Fix screenshot on npm
 - add an npm ignore and add demo to README as well
+- make CLI looks nicer
 
 Future tasks:
 

package/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import chalk from "chalk";
 import { execSync } from "child_process";
 import inquirer from "inquirer";
 import fetch from "node-fetch";
@@ -7,11 +8,12 @@ import fetch from "node-fetch";
 let OPENAI_API_KEY = process.env.OPENAI_API_KEY;
 
 async function main() {
-  console.log("▲ Welcome to AICommit!");
+  console.log(chalk.white("▲ ") + chalk.green("Welcome to AICommit!"));
 
   if (!OPENAI_API_KEY) {
     console.error(
-      "▲ Please specify an OpenAI key using export OPEN_AI_KEY='YOUR_API_KEY'"
+      chalk.white("▲ ") +
+        "Please specify an OpenAI key using export OPEN_AI_KEY='YOUR_API_KEY'"
     );
     process.exit(1);
   }
@@ -21,37 +23,38 @@ async function main() {
       stdio: "ignore",
     });
   } catch (e) {
-    console.error("▲ This is not a git repository");
+    console.error(chalk.white("▲ ") + "This is not a git repository");
     process.exit(1);
   }
 
-  let conventionalCommit = false;
-
   const diff = execSync("git diff --cached", { encoding: "utf8" });
 
   if (!diff) {
     console.log(
-      "▲ No staged changes found. Make sure there are changes and run `git add .`"
+      chalk.white("▲ ") +
+        "No staged changes found. Make sure there are changes and run `git add .`"
     );
     process.exit(1);
   }
 
   // Accounting for GPT-3's input req of 4k tokens (approx 8k chars)
   if (diff.length > 8000) {
-    console.log("▲ The diff is too large to write a commit message.");
+    console.log(
+      chalk.white("▲ ") + "The diff is too large to write a commit message."
+    );
     process.exit(1);
   }
 
-  let prompt = `I want you to act like a git commit message writer. I will input a git diff and your job is to convert it into a useful commit message. ${
-    conventionalCommit
-      ? "Preface the commit with 'feat:' if it is a feature or 'fix:' if it is a bug."
-      : "Do not preface the commit with anything."
-  } Return a complete sentence and do not repeat yourself: ${diff}`;
+  let prompt = `I want you to act like a git commit message writer. I will input a git diff and your job is to convert it into a useful commit message. Do not preface the commit with anything, return a complete sentence, and do not repeat yourself: ${diff}`;
 
-  console.log("▲ Generating your AI commit message...\n");
+  console.log(
+    chalk.white("▲ ") + chalk.gray("Generating your AI commit message...\n")
+  );
   const aiCommitMessage = await generateCommitMessage(prompt);
 
-  console.log(aiCommitMessage);
+  console.log(
+    chalk.white("▲ ") + chalk.bold("Commit message: ") + aiCommitMessage + "\n"
+  );
 
   const confirmationMessage = await inquirer.prompt([
     {
@@ -63,7 +66,7 @@ async function main() {
   ]);
 
   if (confirmationMessage.useCommitMessage === "n") {
-    console.log("▲ Commit message has not been commited.`");
+    console.log(chalk.white("▲ ") + "Commit message has not been commited.");
     process.exit(1);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicommits",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "Writes your git commit messages for you with AI",
   "main": "index.js",
   "bin": {
@@ -11,6 +11,7 @@
   "author": "Hassan El Mghari (@nutlope)",
   "license": "MIT",
   "dependencies": {
+    "chalk": "^5.2.0",
     "inquirer": "^9.1.4",
     "node-fetch": "^3.3.0"
   }

package/aicommit.js

@@ -1,80 +0,0 @@
-#!/usr/bin/env zx
-
-void (async function () {
-  $.verbose = false;
-
-  let conventionalCommit = false;
-
-  console.log(chalk.white("▲ ") + chalk.green("Welcome to AICommit!"));
-
-  let pwd = await $`cd ~ && pwd;`;
-
-  let { OPENAI_API_KEY } = await fs.readJson(
-    `${pwd.stdout.trim()}/ai-commit/.env.json`
-  );
-  let diff = await $`git diff --cached`;
-
-  // Accounting for GPT-3's input req of 4k tokens (approx 8k chars)
-  if (diff.stdout.length > 8000) {
-    console.log("The diff is too large to write a commit message.");
-    await $`exit 1`;
-  }
-
-  if (diff.stdout.length === 0) {
-    console.log(
-      "No staged changes found. Make sure there are changes and run `git add .`"
-    );
-    await $`exit 1`;
-  }
-
-  let prompt = `I want you to act like a git commit message writer. I will input a git diff and your job is to convert it into a useful commit message. ${
-    conventionalCommit
-      ? "Preface the commit with 'feat:' if it is a feature or 'fix:' if it is a bug."
-      : "Do not preface the commit with anything."
-  } Return a complete sentence and do not repeat yourself: ${diff}`;
-
-  const payload = {
-    model: "text-davinci-003",
-    prompt,
-    temperature: 0.7,
-    top_p: 1,
-    frequency_penalty: 0,
-    presence_penalty: 0,
-    max_tokens: 200,
-    stream: false,
-    n: 1,
-  };
-
-  console.log(
-    chalk.white("▲ ") + chalk.gray("Generating your AI commit message...")
-  );
-
-  const response = await fetch("https://api.openai.com/v1/completions", {
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${OPENAI_API_KEY ?? ""}`,
-    },
-    method: "POST",
-    body: JSON.stringify(payload),
-  });
-
-  const json = await response.json();
-  const aiCommit = json.choices[0].text;
-  let cleanedUpAiCommit = aiCommit.replace(/(\r\n|\n|\r)/gm, "");
-
-  echo(cleanedUpAiCommit);
-
-  let confirmationMessage = await question(
-    "\nWould you like to use this commit message? " + chalk.yellow("(Y/n) "),
-    {
-      choices: ["Y", "n"],
-    }
-  );
-
-  $.verbose = true;
-  echo("\n");
-
-  if (confirmationMessage !== "n") {
-    await $`git commit -m ${cleanedUpAiCommit}`;
-  }
-})();