@snelusha/noto 0.3.3 → 0.3.5

package/README.md

@@ -1,10 +1,6 @@
 <h1 align="center">noto ✨</h1>
 <p align="center"><sup>(/nōto/, <em>notebook</em> in Japanese)</sup></p>
-<img src="https://github.com/snelusha/static/blob/main/noto/banner.png?raw=true" align="center"></img>
-
-<pre align="center">
-  <p>npm install -g <b>@snelusha/noto</b></p>
-</pre>
+<img src="https://github.com/snelusha/static/blob/main/noto/banner-minimal.png?raw=true" align="center"></img>
 
 ## Features
 

package/dist/cli.cjs

@@ -12,9 +12,10 @@ const os = require('node:os');
 const process$1 = require('node:process');
 require('which');
 const ora = require('ora');
-const tinyexec = require('tinyexec');
+const simpleGit = require('simple-git');
 const ai = require('ai');
 const zod = require('zod');
+const dedent = require('dedent');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -26,6 +27,8 @@ const clipboardy__default = /*#__PURE__*/_interopDefaultCompat(clipboardy);
 const os__default = /*#__PURE__*/_interopDefaultCompat(os);
 const process__default = /*#__PURE__*/_interopDefaultCompat(process$1);
 const ora__default = /*#__PURE__*/_interopDefaultCompat(ora);
+const simpleGit__default = /*#__PURE__*/_interopDefaultCompat(simpleGit);
+const dedent__default = /*#__PURE__*/_interopDefaultCompat(dedent);
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -3225,21 +3228,24 @@ async function dump() {
   }
 }
 
-function isGitRepository(path) {
-  return node_fs.existsSync(node_path.join(path, ".git"));
+async function isGitRepository() {
+  try {
+    return await simpleGit__default().checkIsRepo();
+  } catch {
+    return false;
+  }
 }
 async function getStagedDiff() {
   try {
-    const diff = (await tinyexec.x("git", ["diff", "--cached"])).stdout.toString();
-    return diff;
+    return await simpleGit__default().diff(["--cached"]);
   } catch {
     return null;
   }
 }
 async function commit(message) {
   try {
-    const result = await tinyexec.x("git", ["commit", "-m", message]);
-    return /file(s)? changed/i.test(result.stdout.toString());
+    const result = await simpleGit__default().commit(message);
+    return result.summary.changes > 0;
   } catch {
     return false;
   }
@@ -5002,7 +5008,7 @@ async function generateCommitMessage(diff) {
     messages: [
       {
         role: "system",
-        content: `
+        content: dedent__default`
         You are a state-of-the-art AI model tasked with generating a precise Git commit message based on staged changes.
         Adhere strictly to the following instructions, ranked by priority:
     
@@ -5018,15 +5024,14 @@ async function generateCommitMessage(diff) {
       },
       {
         role: "user",
-        content: `generate a commit message for the following staged changes:
-${diff}`
+        content: dedent__default`generate a commit message for the following staged changes:\n${diff}`
       }
     ]
   });
   return object.message.trim();
 }
 
-const version = "0.3.3";
+const version = "0.3.5";
 
 yargs__default(helpers.hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
   "config",
@@ -5052,7 +5057,7 @@ yargs__default(helpers.hideBin(process.argv)).scriptName("noto").usage("$0 [args
             c__default.bold("`noto`")
           )} to generate your commit message!`
         );
-        return process.exit(0);
+        process.exit(0);
       }
     }
     const response = await prompts({
@@ -5063,8 +5068,8 @@ yargs__default(helpers.hideBin(process.argv)).scriptName("noto").usage("$0 [args
     });
     if (response.apiKey) {
       storage.apiKey = response.apiKey;
-      dump();
-      console.log("API key saved successfully!");
+      await dump();
+      console.log("API key configured successfully!");
       console.log(
         `Use ${c__default.greenBright(
           c__default.bold("`noto`")
@@ -5100,16 +5105,13 @@ yargs__default(helpers.hideBin(process.argv)).scriptName("noto").usage("$0 [args
       process.exit(1);
     }
     const message = storage.lastGeneratedMessage;
-    const copy = args.copy;
-    const apply = args.apply;
     spin.success(`Previous Commit Message: ${c__default.dim(c__default.bold(message))}`);
-    if (copy) {
+    if (args.copy) {
       clipboardy__default.writeSync(message);
       spin.success("Message copied to clipboard!");
     }
-    if (apply) {
-      const cwd = process.cwd();
-      if (!isGitRepository(cwd)) {
+    if (args.apply) {
+      if (!await isGitRepository()) {
         console.log(
           c__default.red("Oops! No Git repository found in the current directory.")
         );
@@ -5164,8 +5166,7 @@ yargs__default(helpers.hideBin(process.argv)).scriptName("noto").usage("$0 [args
       );
       process.exit(1);
     }
-    const cwd = process.cwd();
-    if (!isGitRepository(cwd)) {
+    if (!await isGitRepository()) {
       console.log(
         c__default.red("Oops! No Git repository found in the current directory.")
       );
@@ -5194,14 +5195,12 @@ yargs__default(helpers.hideBin(process.argv)).scriptName("noto").usage("$0 [args
       const message = await generateCommitMessage(diff);
       storage.lastGeneratedMessage = message;
       await dump();
-      const copy = args.copy;
-      const apply = args.apply;
       spin.success(`Commit Message: ${c__default.dim(c__default.bold(message))}`);
-      if (copy) {
+      if (args.copy) {
         clipboardy__default.writeSync(message);
         spin.success("Message copied to clipboard!");
       }
-      if (apply) {
+      if (args.apply) {
         if (!await commit(message)) {
           spin.fail("Failed to commit staged changes.");
           process.exit(1);

package/dist/cli.mjs

@@ -10,9 +10,10 @@ import os from 'node:os';
 import process$1 from 'node:process';
 import 'which';
 import ora from 'ora';
-import { x } from 'tinyexec';
+import simpleGit from 'simple-git';
 import { generateObject } from 'ai';
 import { z } from 'zod';
+import dedent from 'dedent';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -3212,21 +3213,24 @@ async function dump() {
   }
 }
 
-function isGitRepository(path) {
-  return existsSync(join(path, ".git"));
+async function isGitRepository() {
+  try {
+    return await simpleGit().checkIsRepo();
+  } catch {
+    return false;
+  }
 }
 async function getStagedDiff() {
   try {
-    const diff = (await x("git", ["diff", "--cached"])).stdout.toString();
-    return diff;
+    return await simpleGit().diff(["--cached"]);
   } catch {
     return null;
   }
 }
 async function commit(message) {
   try {
-    const result = await x("git", ["commit", "-m", message]);
-    return /file(s)? changed/i.test(result.stdout.toString());
+    const result = await simpleGit().commit(message);
+    return result.summary.changes > 0;
   } catch {
     return false;
   }
@@ -4989,7 +4993,7 @@ async function generateCommitMessage(diff) {
     messages: [
       {
         role: "system",
-        content: `
+        content: dedent`
         You are a state-of-the-art AI model tasked with generating a precise Git commit message based on staged changes.
         Adhere strictly to the following instructions, ranked by priority:
     
@@ -5005,15 +5009,14 @@ async function generateCommitMessage(diff) {
       },
       {
         role: "user",
-        content: `generate a commit message for the following staged changes:
-${diff}`
+        content: dedent`generate a commit message for the following staged changes:\n${diff}`
       }
     ]
   });
   return object.message.trim();
 }
 
-const version = "0.3.3";
+const version = "0.3.5";
 
 yargs(hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
   "config",
@@ -5039,7 +5042,7 @@ yargs(hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
             c.bold("`noto`")
           )} to generate your commit message!`
         );
-        return process.exit(0);
+        process.exit(0);
       }
     }
     const response = await prompts({
@@ -5050,8 +5053,8 @@ yargs(hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
     });
     if (response.apiKey) {
       storage.apiKey = response.apiKey;
-      dump();
-      console.log("API key saved successfully!");
+      await dump();
+      console.log("API key configured successfully!");
       console.log(
         `Use ${c.greenBright(
           c.bold("`noto`")
@@ -5087,16 +5090,13 @@ yargs(hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
       process.exit(1);
     }
     const message = storage.lastGeneratedMessage;
-    const copy = args.copy;
-    const apply = args.apply;
     spin.success(`Previous Commit Message: ${c.dim(c.bold(message))}`);
-    if (copy) {
+    if (args.copy) {
       clipboardy.writeSync(message);
       spin.success("Message copied to clipboard!");
     }
-    if (apply) {
-      const cwd = process.cwd();
-      if (!isGitRepository(cwd)) {
+    if (args.apply) {
+      if (!await isGitRepository()) {
         console.log(
           c.red("Oops! No Git repository found in the current directory.")
         );
@@ -5151,8 +5151,7 @@ yargs(hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
       );
       process.exit(1);
     }
-    const cwd = process.cwd();
-    if (!isGitRepository(cwd)) {
+    if (!await isGitRepository()) {
       console.log(
         c.red("Oops! No Git repository found in the current directory.")
       );
@@ -5181,14 +5180,12 @@ yargs(hideBin(process.argv)).scriptName("noto").usage("$0 [args]").command(
       const message = await generateCommitMessage(diff);
       storage.lastGeneratedMessage = message;
       await dump();
-      const copy = args.copy;
-      const apply = args.apply;
       spin.success(`Commit Message: ${c.dim(c.bold(message))}`);
-      if (copy) {
+      if (args.copy) {
         clipboardy.writeSync(message);
         spin.success("Message copied to clipboard!");
       }
-      if (apply) {
+      if (args.apply) {
         if (!await commit(message)) {
           spin.fail("Failed to commit staged changes.");
           process.exit(1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@snelusha/noto",
   "type": "module",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "generate clean commit messages in a snap! ✨",
   "license": "MIT",
   "author": {
@@ -43,12 +43,13 @@
   "dependencies": {
     "@ai-sdk/google": "^1.0.12",
     "@posva/prompts": "^2.4.4",
-    "ai": "^4.0.22",
+    "ai": "^4.0.26",
     "clipboardy": "^4.0.0",
+    "dedent": "^1.5.3",
     "ora": "^8.1.1",
     "picocolors": "^1.1.1",
-    "tinyexec": "^0.3.1",
-    "unbuild": "^3.0.1",
+    "simple-git": "^3.27.0",
+    "unbuild": "^3.2.0",
     "which": "^5.0.0",
     "yargs": "^17.7.2",
     "zod": "^3.24.1"