1.1.32

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.32",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "opencommit",
-      "version": "1.1.25",
+      "version": "1.1.32",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "^0.6.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "1.1.25",
+  "version": "1.1.32",
   "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/generateCommitMessageFromGitDiff.ts

@@ -16,8 +16,8 @@ const INIT_MESSAGES_PROMPT: Array<ChatCompletionRequestMessage> = [
     role: ChatCompletionRequestMessageRoleEnum.System,
     // prettier-ignore
     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 and explain why a change was done. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message.
-${config?.emoji? 'Use Gitmoji convention to preface the commit.': 'Do not preface the commit with anything.'}
-${config?.description  ? 'Add a short description of why the commit is done 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."}
+${config?.emoji? 'Use GitMoji convention to preface the commit.': 'Do not preface the commit with anything.'}
+${config?.description  ? 'Add a short description of WHY the changes are done 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 the present tense. Lines must not be longer than 74 characters. Use ${translation.localLanguage} to answer.`
   },
   {

src/i18n/index.ts

@@ -10,6 +10,7 @@ import pt_br from '../i18n/pt_br.json' assert { type: 'json' };
 import vi_VN from '../i18n/vi_VN.json' assert { type: 'json' };
 import es_ES from '../i18n/es_ES.json' assert { type: 'json' };
 import sv from '../i18n/sv.json' assert { type: 'json' };
+import ru from '../i18n/ru.json' assert { type: 'json' };
 
 export enum I18nLocals {
   'en' = 'en',
@@ -23,6 +24,7 @@ export enum I18nLocals {
   'pt_br' = 'pt_br',
   'es_ES' = 'es_ES',
   'sv' = 'sv',
+  'ru' = 'ru',
 };
 
 export const i18n = {
@@ -37,7 +39,8 @@ export const i18n = {
   pt_br,
   vi_VN,
   es_ES,
-  sv
+  sv,
+  ru,
 };
 
 export const I18N_CONFIG_ALIAS: { [key: string]: string[] } = {
@@ -53,6 +56,7 @@ export const I18N_CONFIG_ALIAS: { [key: string]: string[] } = {
   en: ['en', 'English', 'english'],
   es_ES: ['es_ES', 'Spanish', 'español'],
   sv: ['sv', 'Swedish', 'Svenska'],
+  ru: ['ru', 'Russian', 'русский'],
 };
 
 export function getI18nLocal(value: string): string | boolean {

src/i18n/ru.json

@@ -0,0 +1,6 @@
+{
+  "localLanguage": "русский",
+  "commitFix": "fix(server.ts): изменение регистра переменной порта с нижнего регистра port на верхний регистр PORT",
+  "commitFeat": "feat(server.ts): добавлена поддержка переменной окружения process.env.PORT",
+  "commitDescription": "Переменная port теперь называется PORT, что улучшает согласованность с соглашениями об именовании констант. Поддержка переменной окружения позволяет приложению быть более гибким, запускаясь на любом доступном порту, указанном с помощью переменной окружения process.env.PORT."
+}

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",