1.1.29

The conditional statements in the prepareCommitMessageHook function have been simplified to improve readability. The first conditional statement now checks if there are no staged files and no changed files, and if so, it will output a message and exit the process. The second conditional statement now checks if there are no staged files but there are changed files, and if so, it will add the changed files to the staging area.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "opencommit",
-  "version": "1.1.25",
+  "version": "1.1.29",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "opencommit",
-      "version": "1.1.25",
+      "version": "1.1.29",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "^0.6.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "1.1.25",
+  "version": "1.1.29",
   "description": "GPT CLI to auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
   "keywords": [
     "git",
@@ -60,7 +60,6 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.6.1",
-    "@dqbd/tiktoken": "^1.0.2",
     "axios": "^1.3.4",
     "chalk": "^5.2.0",
     "cleye": "^1.3.2",

src/commands/githook.ts

@@ -6,6 +6,7 @@ import { existsSync } from 'fs';
 import chalk from 'chalk';
 import { intro, outro } from '@clack/prompts';
 import { COMMANDS } from '../CommandsEnum.js';
+import { fileURLToPath } from 'url';
 
 const HOOK_NAME = 'prepare-commit-msg';
 const SYMLINK_URL = `.git/hooks/${HOOK_NAME}`;
@@ -28,7 +29,7 @@ export const hookCommand = command(
       const { setUnset: mode } = argv._;
 
       if (mode === 'set') {
-        intro(`setting opencommit as '${HOOK_NAME}' hook`);
+        intro(`setting OpenCommit as '${HOOK_NAME}' hook`);
 
         if (isHookExists) {
           let realPath;
@@ -40,7 +41,7 @@ export const hookCommand = command(
           }
 
           if (realPath === HOOK_URL)
-            return outro(`opencommit is already set as '${HOOK_NAME}'`);
+            return outro(`OpenCommit is already set as '${HOOK_NAME}'`);
 
           throw new Error(
             `Different ${HOOK_NAME} is already set. Remove it before setting opencommit as '${HOOK_NAME}' hook.`

src/commands/prepare-commit-msg-hook.ts

@@ -20,12 +20,13 @@ export const prepareCommitMessageHook = async () => {
     const stagedFiles = await getStagedFiles();
     const changedFiles = await getChangedFiles();
 
-    if (!stagedFiles && changedFiles) await gitAdd({ files: changedFiles });
-    else {
+    if (!stagedFiles && !changedFiles) {
       outro('No changes detected, write some code and run `oc` again');
       process.exit(1);
     }
 
+    if (!stagedFiles && changedFiles) await gitAdd({ files: changedFiles });
+
     const staged = await getStagedFiles();
 
     if (!staged) return;

src/utils/tokenCount.ts

@@ -1,14 +1,14 @@
-import { Tiktoken } from "@dqbd/tiktoken/lite"
-import cl100k_base from "@dqbd/tiktoken/encoders/cl100k_base.json" assert{type: "json"}
+// import { Tiktoken } from '@dqbd/tiktoken/lite';
+// import cl100k_base from '@dqbd/tiktoken/encoders/cl100k_base.json' assert { type: 'json' };
 
 export function tokenCount(content: string): number {
-    const encoding = new Tiktoken(
-        cl100k_base.bpe_ranks,
-        cl100k_base.special_tokens,
-        cl100k_base.pat_str
-    );
-    const tokens = encoding.encode(content);
-    encoding.free();
+  //   const encoding = new Tiktoken(
+  //     cl100k_base.bpe_ranks,
+  //     cl100k_base.special_tokens,
+  //     cl100k_base.pat_str
+  //   );
+  //   const tokens = encoding.encode(content);
+  //   encoding.free();
 
-    return tokens.length;
+  return content.length / 2.7;
 }

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ESNext",
     "lib": ["ES5", "ES6"],
 
     "module": "ESNext",