better-commits 1.13.0 → 1.15.0

package/dist/branch.js

@@ -140,17 +140,25 @@ var BRANCH_ACTION_OPTIONS = [
 function load_setup(cli_name = " better-commits ") {
   console.clear();
   p.intro(`${import_picocolors.default.bgCyan(import_picocolors.default.black(cli_name))}`);
+  let global_config = null;
+  const home_path = get_default_config_path();
+  if (import_fs.default.existsSync(home_path)) {
+    p.log.step("Found global config");
+    global_config = read_config_from_path(home_path);
+  }
   const root = get_git_root();
   const root_path = `${root}/${CONFIG_FILE_NAME}`;
   if (import_fs.default.existsSync(root_path)) {
     p.log.step("Found repository config");
-    return read_config_from_path(root_path);
-  }
-  const home_path = get_default_config_path();
-  if (import_fs.default.existsSync(home_path)) {
-    p.log.step("Found global config");
-    return read_config_from_path(home_path);
+    const repo_config = read_config_from_path(root_path);
+    return global_config ? {
+      ...repo_config,
+      overrides: global_config.overrides.shell ? global_config.overrides : repo_config.overrides,
+      confirm_with_editor: global_config.confirm_with_editor
+    } : repo_config;
   }
+  if (global_config)
+    return global_config;
   const default_config = Config.parse({});
   p.log.step(
     "Config not found. Generating default .better-commit.json at $HOME"
@@ -264,7 +272,7 @@ var Config = import_zod2.z.object({
     append_hashtag: import_zod2.z.boolean().default(false),
     prepend_hashtag: import_zod2.z.enum(["Never", "Always", "Prompt"]).default("Never"),
     surround: import_zod2.z.enum(["", "()", "[]", "{}"]).default(""),
-    title_position: import_zod2.z.enum(["start", "end", "before-colon"]).default("start")
+    title_position: import_zod2.z.enum(["start", "end", "before-colon", "beginning"]).default("start")
   }).default({}),
   commit_title: import_zod2.z.object({
     max_size: import_zod2.z.number().positive().default(70)

package/dist/index.js

@@ -171,17 +171,25 @@ var FOOTER_OPTION_VALUES = [
 function load_setup(cli_name = " better-commits ") {
   console.clear();
   p.intro(`${import_picocolors.default.bgCyan(import_picocolors.default.black(cli_name))}`);
-  const root = get_git_root();
-  const root_path = `${root}/${CONFIG_FILE_NAME}`;
-  if (import_fs.default.existsSync(root_path)) {
-    p.log.step("Found repository config");
-    return read_config_from_path(root_path);
-  }
+  let global_config = null;
   const home_path = get_default_config_path();
   if (import_fs.default.existsSync(home_path)) {
     p.log.step("Found global config");
-    return read_config_from_path(home_path);
+    global_config = read_config_from_path(home_path);
   }
+  const root = get_git_root();
+  const root_path = `${root}/${CONFIG_FILE_NAME}`;
+  if (import_fs.default.existsSync(root_path)) {
+    p.log.step("Found repository config");
+    const repo_config = read_config_from_path(root_path);
+    return global_config ? {
+      ...repo_config,
+      overrides: global_config.overrides.shell ? global_config.overrides : repo_config.overrides,
+      confirm_with_editor: global_config.confirm_with_editor
+    } : repo_config;
+  }
+  if (global_config)
+    return global_config;
   const default_config = Config.parse({});
   p.log.step(
     "Config not found. Generating default .better-commit.json at $HOME"
@@ -328,7 +336,7 @@ var Config = import_zod2.z.object({
     append_hashtag: import_zod2.z.boolean().default(false),
     prepend_hashtag: import_zod2.z.enum(["Never", "Always", "Prompt"]).default("Never"),
     surround: import_zod2.z.enum(["", "()", "[]", "{}"]).default(""),
-    title_position: import_zod2.z.enum(["start", "end", "before-colon"]).default("start")
+    title_position: import_zod2.z.enum(["start", "end", "before-colon", "beginning"]).default("start")
   }).default({}),
   commit_title: import_zod2.z.object({
     max_size: import_zod2.z.number().positive().default(70)
@@ -694,6 +702,10 @@ function build_commit_string(commit_state, config, colorize = false, escape_quot
     const close_token = surround.charAt(1);
     title_ticket = `${open_token}${commit_state.ticket}${close_token}`;
   }
+  const position_beginning = config.check_ticket.title_position === "beginning";
+  if (title_ticket && config.check_ticket.add_to_title && position_beginning) {
+    commit_string = `${colorize ? import_picocolors3.default.magenta(title_ticket) : title_ticket} ${commit_string}`;
+  }
   const position_before_colon = config.check_ticket.title_position === "before-colon";
   if (title_ticket && config.check_ticket.add_to_title && position_before_colon) {
     const spacing = commit_state.scope || commit_state.type && !config.check_ticket.surround ? " " : "";

package/dist/init.js

@@ -216,7 +216,7 @@ var Config = import_zod2.z.object({
     append_hashtag: import_zod2.z.boolean().default(false),
     prepend_hashtag: import_zod2.z.enum(["Never", "Always", "Prompt"]).default("Never"),
     surround: import_zod2.z.enum(["", "()", "[]", "{}"]).default(""),
-    title_position: import_zod2.z.enum(["start", "end", "before-colon"]).default("start")
+    title_position: import_zod2.z.enum(["start", "end", "before-colon", "beginning"]).default("start")
   }).default({}),
   commit_title: import_zod2.z.object({
     max_size: import_zod2.z.number().positive().default(70)

package/dist/utils.js

@@ -142,7 +142,7 @@ var Config = import_zod.z.object({
     append_hashtag: import_zod.z.boolean().default(false),
     prepend_hashtag: import_zod.z.enum(["Never", "Always", "Prompt"]).default("Never"),
     surround: import_zod.z.enum(["", "()", "[]", "{}"]).default(""),
-    title_position: import_zod.z.enum(["start", "end", "before-colon"]).default("start")
+    title_position: import_zod.z.enum(["start", "end", "before-colon", "beginning"]).default("start")
   }).default({}),
   commit_title: import_zod.z.object({
     max_size: import_zod.z.number().positive().default(70)
@@ -343,17 +343,25 @@ var BRANCH_ACTION_OPTIONS = [
 function load_setup(cli_name = " better-commits ") {
   console.clear();
   p.intro(`${import_picocolors.default.bgCyan(import_picocolors.default.black(cli_name))}`);
+  let global_config = null;
+  const home_path = get_default_config_path();
+  if (import_fs.default.existsSync(home_path)) {
+    p.log.step("Found global config");
+    global_config = read_config_from_path(home_path);
+  }
   const root = get_git_root();
   const root_path = `${root}/${CONFIG_FILE_NAME}`;
   if (import_fs.default.existsSync(root_path)) {
     p.log.step("Found repository config");
-    return read_config_from_path(root_path);
-  }
-  const home_path = get_default_config_path();
-  if (import_fs.default.existsSync(home_path)) {
-    p.log.step("Found global config");
-    return read_config_from_path(home_path);
+    const repo_config = read_config_from_path(root_path);
+    return global_config ? {
+      ...repo_config,
+      overrides: global_config.overrides.shell ? global_config.overrides : repo_config.overrides,
+      confirm_with_editor: global_config.confirm_with_editor
+    } : repo_config;
   }
+  if (global_config)
+    return global_config;
   const default_config = Config.parse({});
   p.log.step(
     "Config not found. Generating default .better-commit.json at $HOME"

package/dist/zod-state.js

@@ -214,7 +214,7 @@ var Config = import_zod2.z.object({
     append_hashtag: import_zod2.z.boolean().default(false),
     prepend_hashtag: import_zod2.z.enum(["Never", "Always", "Prompt"]).default("Never"),
     surround: import_zod2.z.enum(["", "()", "[]", "{}"]).default(""),
-    title_position: import_zod2.z.enum(["start", "end", "before-colon"]).default("start")
+    title_position: import_zod2.z.enum(["start", "end", "before-colon", "beginning"]).default("start")
   }).default({}),
   commit_title: import_zod2.z.object({
     max_size: import_zod2.z.number().positive().default(70)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "better-commits",
   "private": false,
-  "version": "1.13.0",
+  "version": "1.15.0",
   "description": "A CLI for creating better commits following the conventional commits specification",
   "author": "Erik Verduin (https://github.com/everduin94)",
   "keywords": [

package/readme.md

@@ -4,9 +4,7 @@
 	
 [![better commits is enabled](https://img.shields.io/badge/better--commits-enabled?style=for-the-badge&logo=git&color=a6e3a1&logoColor=D9E0EE&labelColor=302D41)](https://github.com/Everduin94/better-commits)
 [![downloads](https://img.shields.io/npm/dt/better-commits.svg?style=for-the-badge&logo=npm&color=74c7ec&logoColor=D9E0EE&labelColor=302D41)](https://www.npmjs.com/package/better-commits)
-<a href="https://github.com/everduin94/better-commits/issues">
-		<img alt="Issues" src="https://img.shields.io/github/issues/everduin94/better-commits?style=for-the-badge&logo=gitbook&color=cba6f7&logoColor=D9E0EE&labelColor=302D41"></a>
-	
+[![discord](https://img.shields.io/badge/discord-join--discord?style=for-the-badge&logo=discord&color=cba6f7&logoColor=D9E0EE&labelColor=302D41)](https://discord.gg/grHVnZwYup)
 </h3>
 
 <p align="center">
@@ -65,8 +63,9 @@ Your first time running `better-commits`, a default config will be generated in
 ### Repository
 
 To create a **repository-specific config**, navigate to the root of your project.
-- run `better-commits-init`
+- Run `better-commits-init`
 - This will create a default config named `.better-commits.json`
+- Properties such as `confirm_with_editor` and `overrides` will prefer the global config
 
 ### Options
 
@@ -265,8 +264,8 @@ Better-commits (& better-branch) are highly flexible with sane defaults. These o
 </details>
 
 > [!NOTE]<br>
-> Some properties use sets of string values
-> See *confile file explanations* for possible values
+> Some properties allow a set of specifc string values
+> - See *config file explanations* for possible values
 
 ### 🔭 Config File Explanations
 
@@ -306,7 +305,7 @@ Expand to see explanations and possible values
 | `check_ticket.add_to_title`                | If true add ticket to title                                 |
 | `check_ticket.append_hashtag`              | **Deprecated**: see prepend_hashtag                         |
 | `check_ticket.prepend_hashtag`             | "Never" (default), "Prompt", or "Always"                    |
-| `check_ticket.title_position`              | "start" (of description) (default), "end", "before-colon"   |
+| `check_ticket.title_position`              | "start" (of description) (default), "end", "before-colon", "beginning" (of the entire commit title)   |
 | `check_ticket.surround`                    | "" (default), "[]", "()", "{}" - Wraps ticket in title      |
 | `commit_title.max_size`                    | Max size of title including scope, type, etc...             |
 | `commit_body.enable`                       | If true include body                                        |
@@ -419,6 +418,9 @@ Setting `confirm_with_editor=true` will allow you to edit/confirm a commit with
 - For example, to edit with Neovim: `git config --global core.editor "nvim"`
 - For VS Code, `git config --global core.editor "code -n --wait"`
 
+> [!NOTE]<br>
+> Enjoy learning, open source technology, and note-taking? [Join our Discord!](https://discord.gg/grHVnZwYup) 
+
 You can add this badge to your repository to display that you're using a better-commits repository config 
 
 | Markdown | Result |

package/src/index.ts

@@ -268,6 +268,11 @@ function build_commit_string(commit_state: z.infer<typeof CommitState>,
     const close_token = surround.charAt(1);
     title_ticket = `${open_token}${commit_state.ticket}${close_token}` 
   }
+  
+  const position_beginning = config.check_ticket.title_position === 'beginning';
+  if (title_ticket && config.check_ticket.add_to_title && position_beginning) {
+    commit_string = `${colorize ? color.magenta(title_ticket) : title_ticket} ${commit_string}`;
+  }
 
   const position_before_colon = config.check_ticket.title_position === "before-colon"
   if (title_ticket && config.check_ticket.add_to_title && position_before_colon) {
@@ -343,4 +348,3 @@ function build_commit_string(commit_state: z.infer<typeof CommitState>,
 
   return commit_string;
 }
-

package/src/utils.ts

@@ -148,18 +148,26 @@ export function load_setup(
   console.clear();
   p.intro(`${color.bgCyan(color.black(cli_name))}`);
 
+  let global_config = null
+  const home_path = get_default_config_path();
+  if (fs.existsSync(home_path)) {
+    p.log.step("Found global config");
+    global_config = read_config_from_path(home_path);
+  }
+
   const root = get_git_root();
   const root_path = `${root}/${CONFIG_FILE_NAME}`;
   if (fs.existsSync(root_path)) {
     p.log.step("Found repository config");
-    return read_config_from_path(root_path);
+    const repo_config = read_config_from_path(root_path);
+    return global_config ? {
+      ...repo_config,
+      overrides: global_config.overrides.shell ? global_config.overrides : repo_config.overrides,
+      confirm_with_editor: global_config.confirm_with_editor
+    } : repo_config
   }
 
-  const home_path = get_default_config_path();
-  if (fs.existsSync(home_path)) {
-    p.log.step("Found global config");
-    return read_config_from_path(home_path);
-  }
+  if (global_config) return global_config
 
   const default_config = Config.parse({});
   p.log.step(

package/src/zod-state.ts

@@ -99,7 +99,7 @@ export const Config = z
         append_hashtag: z.boolean().default(false),
         prepend_hashtag: z.enum(['Never', 'Always', 'Prompt']).default("Never"),
         surround: z.enum(["", "()", "[]", "{}"]).default(""),
-        title_position: z.enum(["start", "end", "before-colon"]).default("start"),
+        title_position: z.enum(["start", "end", "before-colon", "beginning"]).default("start"),
       })
       .default({}),
     commit_title: z