better-commits 1.19.0 → 1.20.0-cli-flags

package/src/utils.ts

@@ -3,10 +3,9 @@ import { execSync } from "child_process";
 import fs from "fs";
 import { homedir } from "os";
 import color from "picocolors";
-import { Output, ValiError, parse } from "valibot";
+import { InferOutput, ValiError, parse } from "valibot";
 import { Config } from "./valibot-state";
 import { V_BRANCH_ACTIONS } from "./valibot-consts";
-import { argv } from "process";
 import { flags } from "./args";
 import Configstore from "configstore";
 
@@ -16,19 +15,6 @@ export const A_FOR_ALL = `${color.dim(
   "(<space> to select, <a> to select all)",
 )}`;
 export const OPTIONAL_PROMPT = `${color.dim("(optional)")}`;
-export const CACHE_PROMPT = `${color.dim("(value will be saved)")}`;
-export const REGEX_SLASH_TAG = new RegExp(/\/(\w+-\d+)/);
-export const REGEX_START_TAG = new RegExp(/^(\w+-\d+)/);
-export const REGEX_START_UND = new RegExp(/^([A-Z]+-[\[a-zA-Z\]\d]+)_/);
-export const REGEX_SLASH_UND = new RegExp(/\/([A-Z]+-[\[a-zA-Z\]\d]+)_/);
-
-// TODO: This might conflict with version from better-branch
-// - Maybe negative lookup against .
-// - Maybe check the order
-// - Maybe use order to split and check values
-export const REGEX_SLASH_NUM = new RegExp(/\/(\d+)/);
-export const REGEX_START_NUM = new RegExp(/^(\d+)/);
-
 export const COMMIT_FOOTER_OPTIONS = [
   {
     value: "closes",
@@ -49,7 +35,7 @@ export const COMMIT_FOOTER_OPTIONS = [
   { value: "custom", label: "custom", hint: "Add a custom footer" },
 ];
 export const BRANCH_ACTION_OPTIONS: {
-  value: Output<typeof V_BRANCH_ACTIONS>;
+  value: InferOutput<typeof V_BRANCH_ACTIONS>;
   label: string;
   hint?: string;
 }[] = [
@@ -63,47 +49,64 @@ export const NOOP_PROMPT_CACHE = {
   clear: () => {},
 } as unknown as Configstore;
 
+export type ConfigSource = "repository" | "global" | "none";
+
+export type LoadedSetup = {
+  config: InferOutput<typeof Config>;
+  config_source: ConfigSource;
+};
+
 /* LOAD */
 export function load_setup(
   cli_name = " better-commits ",
-): Output<typeof Config> {
+  git_args = flags.git_args,
+): LoadedSetup {
   console.clear();
   p.intro(`${color.bgCyan(color.black(cli_name))}`);
 
-  set_non_configuration_arguments();
-
   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 = get_git_root(git_args);
   const root_path = `${root}/${CONFIG_FILE_NAME}`;
   if (fs.existsSync(root_path)) {
-    p.log.step("Found repository config");
+    p.log.step("Reading from 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,
-          cache_last_value: global_config.cache_last_value,
-        }
-      : repo_config;
+    return {
+      config: global_config
+        ? {
+            ...repo_config,
+            overrides: global_config.overrides.shell
+              ? global_config.overrides
+              : repo_config.overrides,
+            confirm_with_editor: global_config.confirm_with_editor,
+            cache_last_value: global_config.cache_last_value,
+          }
+        : repo_config,
+      config_source: "repository",
+    };
   }
 
-  if (global_config) return global_config;
+  if (global_config) {
+    p.log.step("Reading from Global Config");
+    return {
+      config: global_config,
+      config_source: "global",
+    };
+  }
 
   const default_config = parse(Config, {});
   p.log.step(
     "Config not found. Generating default .better-commit.json at $HOME",
   );
   fs.writeFileSync(home_path, JSON.stringify(default_config, null, 4));
-  return default_config;
+  return {
+    config: default_config,
+    config_source: "none",
+  };
 }
 
 function read_config_from_path(config_path: string) {
@@ -118,13 +121,19 @@ function read_config_from_path(config_path: string) {
   return validate_config(res);
 }
 
-function validate_config(config: Output<typeof Config>): Output<typeof Config> {
+function validate_config(config: unknown): InferOutput<typeof Config> {
   try {
     return parse(Config, config);
   } catch (err: any) {
     if (err instanceof ValiError) {
       const first_issue_path = err.issues[0].path ?? [];
-      const dot_path = first_issue_path.map((item) => item.key).join(".");
+      const dot_path = first_issue_path
+        .map((item: { key?: unknown }) => item.key)
+        .filter(
+          (key: unknown): key is string | number =>
+            typeof key === "string" || typeof key === "number",
+        )
+        .join(".");
       p.log.error(
         `Invalid Configuration: ${color.red(dot_path)}\n` + err.message,
       );
@@ -134,37 +143,13 @@ function validate_config(config: Output<typeof Config>): Output<typeof Config> {
 }
 /* END LOAD */
 
-export function infer_type_from_branch(types: string[]): string {
-  let branch = "";
-  try {
-    branch = execSync(`git ${flags.git_args} branch --show-current`, {
-      stdio: "pipe",
-    }).toString();
-  } catch (err) {
-    return "";
-  }
-  const found = types.find((t) => {
-    const start_dash = new RegExp(`^${t}-`);
-    const between_dash = new RegExp(`-${t}-`);
-    const before_slash = new RegExp(`${t}\/`);
-    const re = [
-      branch.match(start_dash),
-      branch.match(between_dash),
-      branch.match(before_slash),
-    ].filter((v) => v != null);
-    return re?.length;
-  });
-
-  return found ?? "";
-}
-
 /*
 rev-parse will fail in a --bare repository root
 */
-export function get_git_root(): string {
+export function get_git_root(git_args = flags.git_args): string {
   let path = ".";
   try {
-    path = execSync(`git ${flags.git_args} rev-parse --show-toplevel`)
+    path = execSync(`git ${git_args} rev-parse --show-toplevel`)
       .toString()
       .trim();
   } catch (err) {
@@ -179,6 +164,18 @@ export function get_default_config_path(): string {
   return homedir() + "/" + CONFIG_FILE_NAME;
 }
 
+export function get_package_version(): string {
+  try {
+    const package_json = JSON.parse(
+      fs.readFileSync(new URL("../package.json", import.meta.url), "utf8"),
+    ) as { version?: string };
+
+    return package_json.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
 export function addNewLine(arr: string[], i: number) {
   return i === arr.length - 1 ? "" : "\n";
 }
@@ -192,10 +189,6 @@ export function clean_commit_title(title: string): string {
   return title.trim();
 }
 
-function set_non_configuration_arguments() {
-  flags.git_args = `${argv[2] ?? ""} ${argv[3] ?? ""}`.trim();
-}
-
 export function get_value_from_cache(
   config_store: Configstore,
   key: string,

package/src/valibot-consts.ts

@@ -1,7 +1,7 @@
 import * as v from "valibot";
 
 export const CUSTOM_SCOPE_KEY: "custom" = "custom";
-export const FOOTER_OPTION_VALUES: v.Output<typeof V_FOOTER_OPTIONS>[] = [
+export const FOOTER_OPTION_VALUES: v.InferOutput<typeof V_FOOTER_OPTIONS>[] = [
   "closes",
   "trailer",
   "breaking-change",
@@ -30,7 +30,7 @@ export const V_BRANCH_CONFIG_FIELDS = v.picklist([
   "branch_ticket",
   "branch_description",
 ]);
-export const BRANCH_ORDER_DEFAULTS: v.Output<typeof V_BRANCH_FIELDS>[] = [
+export const BRANCH_ORDER_DEFAULTS: v.InferOutput<typeof V_BRANCH_FIELDS>[] = [
   "user",
   "version",
   "type",

package/src/valibot-state.test.ts

@@ -0,0 +1,48 @@
+import { describe, expect, it } from "vitest";
+import { ValiError, parse } from "valibot";
+import { Config } from "./valibot-state";
+
+describe("Config", () => {
+  it("parses a defaulted config from empty input", () => {
+    const config = parse(Config, {});
+
+    expect(config.commit_type.initial_value).toBe("feat");
+    expect(config.commit_scope.initial_value).toBe("app");
+    expect(config.commit_type.options.length).toBeGreaterThan(0);
+    expect(config.commit_scope.options.length).toBeGreaterThan(0);
+  });
+
+  it("adds the custom scope option when custom_scope is enabled", () => {
+    const config = parse(Config, {
+      commit_scope: {
+        custom_scope: true,
+        initial_value: "custom",
+        options: [{ value: "app", label: "app" }],
+      },
+    });
+
+    expect(config.commit_scope.options.map((option) => option.value)).toContain(
+      "custom",
+    );
+  });
+
+  it("rejects commit_type.initial_value values outside options", () => {
+    expect(() =>
+      parse(Config, {
+        commit_type: {
+          initial_value: "unknown",
+          options: [{ value: "feat", label: "feat" }],
+        },
+      }),
+    ).toThrowError(ValiError);
+
+    expect(() =>
+      parse(Config, {
+        commit_type: {
+          initial_value: "unknown",
+          options: [{ value: "feat", label: "feat" }],
+        },
+      }),
+    ).toThrow(/must exist in options/);
+  });
+});

package/src/valibot-state.ts

@@ -10,113 +10,114 @@ import {
   V_FOOTER_OPTIONS,
 } from "./valibot-consts";
 
-export const Config = v.object({
-  check_status: v.optional(v.boolean(), true),
-  commit_type: v.transform(
-    v.optional(
-      v.object(
-        {
-          enable: v.optional(v.boolean(), true),
-          initial_value: v.optional(v.string(), "feat"),
-          max_items: v.optional(v.number([v.minValue(1)]), 20),
-          infer_type_from_branch: v.optional(v.boolean(), true),
-          append_emoji_to_label: v.optional(v.boolean(), false),
-          append_emoji_to_commit: v.optional(v.boolean(), false),
-          emoji_commit_position: v.optional(
-            v.picklist(["Start", "After-Colon"]),
-            "Start",
-          ),
-          options: v.optional(
-            v.array(
-              v.object({
-                value: v.string(),
-                label: v.optional(v.string()),
-                hint: v.optional(v.string()),
-                emoji: v.optional(v.string([v.emoji()]), undefined),
-                trailer: v.optional(v.string()),
-              }),
-            ),
-            DEFAULT_TYPE_OPTIONS,
-          ),
-        },
-        [
-          v.custom(
-            (val) =>
-              val.options.map((v) => v.value).includes(val.initial_value),
-            (val) => {
-              const input = val.input as { initial_value: string };
-              return `Type: initial_value "${input.initial_value}" must exist in options`;
-            },
-          ),
-        ],
+const CommitTypeConfig = v.pipe(
+  v.optional(
+    v.object({
+      enable: v.optional(v.boolean(), true),
+      initial_value: v.optional(v.string(), "feat"),
+      max_items: v.optional(v.pipe(v.number(), v.minValue(1)), 20),
+      infer_type_from_branch: v.optional(v.boolean(), true),
+      append_emoji_to_label: v.optional(v.boolean(), false),
+      append_emoji_to_commit: v.optional(v.boolean(), false),
+      emoji_commit_position: v.optional(
+        v.picklist(["Start", "After-Colon"]),
+        "Start",
+      ),
+      options: v.optional(
+        v.array(
+          v.object({
+            value: v.string(),
+            label: v.optional(v.string()),
+            hint: v.optional(v.string()),
+            emoji: v.optional(v.pipe(v.string(), v.emoji())),
+            trailer: v.optional(v.string()),
+          }),
+        ),
+        DEFAULT_TYPE_OPTIONS,
       ),
-      {},
-    ),
-    (val) => {
-      const options =
-        val.options.map((v) => ({
-          ...v,
-          label:
-            v.emoji && val.append_emoji_to_label
-              ? `${v.emoji} ${v.label}`
-              : v.label,
-        })) ?? [];
-      return { ...val, options };
-    },
+    }),
+    {},
   ),
-  commit_scope: v.transform(
-    v.optional(
-      v.object(
-        {
-          enable: v.optional(v.boolean(), true),
-          custom_scope: v.optional(v.boolean(), false),
-          max_items: v.optional(v.number([v.minValue(1)]), 20),
-          initial_value: v.optional(v.string(), "app"),
-          options: v.optional(
-            v.array(
-              v.object({
-                value: v.string(),
-                label: v.optional(v.string()),
-                hint: v.optional(v.string()),
-              }),
-            ),
-            DEFAULT_SCOPE_OPTIONS,
-          ),
-        },
-        [
-          v.custom(
-            (val) => {
-              const options = val.options.map((v) => v.value);
-              if (val.custom_scope) options.push(CUSTOM_SCOPE_KEY);
-              return options.includes(val.initial_value);
-            },
-            (val) => {
-              const input = val.input as { initial_value: string };
-              return `Scope: initial_value "${input.initial_value}" must exist in options`;
-            },
-          ),
-        ],
+  v.rawCheck(({ dataset, addIssue }) => {
+    if (
+      dataset.typed &&
+      !dataset.value.options.some(
+        (option) => option.value === dataset.value.initial_value,
+      )
+    ) {
+      addIssue({
+        message: `Type: initial_value "${dataset.value.initial_value}" must exist in options`,
+      });
+    }
+  }),
+  v.transform((value) => ({
+    ...value,
+    options: value.options.map((option) => ({
+      ...option,
+      label:
+        option.emoji && value.append_emoji_to_label
+          ? `${option.emoji} ${option.label}`
+          : option.label,
+    })),
+  })),
+);
+
+const CommitScopeConfig = v.pipe(
+  v.optional(
+    v.object({
+      enable: v.optional(v.boolean(), true),
+      custom_scope: v.optional(v.boolean(), false),
+      max_items: v.optional(v.pipe(v.number(), v.minValue(1)), 20),
+      initial_value: v.optional(v.string(), "app"),
+      options: v.optional(
+        v.array(
+          v.object({
+            value: v.string(),
+            label: v.optional(v.string()),
+            hint: v.optional(v.string()),
+          }),
+        ),
+        DEFAULT_SCOPE_OPTIONS,
       ),
-      {},
-    ),
-    (val) => {
-      const options = val.options.map((v) => v.value);
-      if (val.custom_scope && !options.includes(CUSTOM_SCOPE_KEY)) {
-        return {
-          ...val,
-          options: [
-            ...val.options,
-            {
-              label: CUSTOM_SCOPE_KEY,
-              value: CUSTOM_SCOPE_KEY,
-              hint: "Write a custom scope",
-            },
-          ],
-        };
-      }
-      return val;
-    },
+    }),
+    {},
   ),
+  v.rawCheck(({ dataset, addIssue }) => {
+    if (!dataset.typed) return;
+
+    const option_values = dataset.value.options.map((option) => option.value);
+    if (dataset.value.custom_scope) option_values.push(CUSTOM_SCOPE_KEY);
+
+    if (!option_values.includes(dataset.value.initial_value)) {
+      addIssue({
+        message: `Scope: initial_value "${dataset.value.initial_value}" must exist in options`,
+      });
+    }
+  }),
+  v.transform((value) => {
+    const option_values = value.options.map((option) => option.value);
+    if (value.custom_scope && !option_values.includes(CUSTOM_SCOPE_KEY)) {
+      return {
+        ...value,
+        options: [
+          ...value.options,
+          {
+            label: CUSTOM_SCOPE_KEY,
+            value: CUSTOM_SCOPE_KEY,
+            hint: "Write a custom scope",
+          },
+        ],
+      };
+    }
+
+    return value;
+  }),
+);
+
+export const Config = v.object({
+  check_status: v.optional(v.boolean(), true),
+  commit_type: CommitTypeConfig,
+  commit_scope: CommitScopeConfig,
   check_ticket: v.optional(
     v.object({
       infer_ticket: v.optional(v.boolean(), true),
@@ -137,7 +138,7 @@ export const Config = v.object({
   ),
   commit_title: v.optional(
     v.object({
-      max_size: v.optional(v.number([v.minValue(1)]), 70),
+      max_size: v.optional(v.pipe(v.number(), v.minValue(1)), 70),
     }),
     {},
   ),
@@ -204,7 +205,7 @@ export const Config = v.object({
   ),
   branch_description: v.optional(
     v.object({
-      max_length: v.optional(v.number([v.minValue(1)]), 70),
+      max_length: v.optional(v.pipe(v.number(), v.minValue(1)), 70),
       separator: v.optional(v.picklist(["", "/", "-", "_"]), ""),
     }),
     {},
@@ -231,32 +232,34 @@ export const Config = v.object({
   ),
 });
 
-export const CommitState = v.optional(
-  v.object({
-    type: v.optional(v.string(), ""),
-    scope: v.optional(v.string(), ""),
-    title: v.optional(v.string(), ""),
-    body: v.optional(v.string(), ""),
-    closes: v.optional(v.string(), ""),
-    ticket: v.optional(v.string(), ""),
-    breaking_title: v.optional(v.string(), ""),
-    breaking_body: v.optional(v.string(), ""),
-    deprecates: v.optional(v.string(), ""),
-    deprecates_title: v.optional(v.string(), ""),
-    deprecates_body: v.optional(v.string(), ""),
-    custom_footer: v.optional(v.string(), ""),
-    trailer: v.optional(v.string(), ""),
-  }),
-  {},
-);
+export const COMMIT_STATE_ENTRIES = {
+  type: v.optional(v.string(), ""),
+  scope: v.optional(v.string(), ""),
+  title: v.optional(v.string(), ""),
+  body: v.optional(v.string(), ""),
+  closes: v.optional(v.string(), ""),
+  ticket: v.optional(v.string(), ""),
+  breaking_title: v.optional(v.string(), ""),
+  breaking_body: v.optional(v.string(), ""),
+  deprecates: v.optional(v.string(), ""),
+  deprecates_title: v.optional(v.string(), ""),
+  deprecates_body: v.optional(v.string(), ""),
+  custom_footer: v.optional(v.string(), ""),
+  trailer: v.optional(v.string(), ""),
+};
+
+export const CommitState = v.optional(v.object(COMMIT_STATE_ENTRIES), {});
+
+export const BRANCH_STATE_ENTRIES = {
+  user: v.optional(v.string(), ""),
+  type: v.optional(v.string(), ""),
+  ticket: v.optional(v.string(), ""),
+  description: v.optional(v.string(), ""),
+  version: v.optional(v.string(), ""),
+  checkout: v.optional(V_BRANCH_ACTIONS, "branch"),
+};
 
 export const BranchState = v.optional(
-  v.object({
-    user: v.optional(v.string(), ""),
-    type: v.optional(v.string(), ""),
-    ticket: v.optional(v.string(), ""),
-    description: v.optional(v.string(), ""),
-    version: v.optional(v.string(), ""),
-  }),
+  v.object(BRANCH_STATE_ENTRIES),
   {},
 );

package/tsconfig.json

@@ -3,12 +3,13 @@
     "module": "ESNext",
     "target": "ESNext",
     "declaration": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "emitDeclarationOnly": true,
     "strict": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "allowJs": true,
     "types": ["node"]
-  }
+  },
+  "exclude": ["dist", "node_modules", ".svelte-kit", ".opencode"]
 }

package/vitest.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    environment: "node",
+    include: ["src/**/*.test.ts"],
+  },
+});

package/dist/chunk-K2RPF2JY.js

@@ -1,4 +0,0 @@
-import*as p from"valibot";var c="custom",f=["closes","trailer","breaking-change","deprecated","custom"],h=p.picklist(["branch","worktree"]),g=p.picklist(["closes","trailer","breaking-change","deprecated","custom"]),d=p.picklist(["user","version","type","ticket","description"]),$=p.picklist(["branch_user","branch_version","branch_type","branch_ticket","branch_description"]),O=["user","version","type","ticket","description"],x=[{value:"app",label:"app"},{value:"shared",label:"shared"},{value:"server",label:"server"},{value:"tools",label:"tools"},{value:"",label:"none"}],C=[{value:"feat",label:"feat",hint:"A new feature",emoji:"\u{1F31F}",trailer:"Changelog: feature"},{value:"fix",label:"fix",hint:"A bug fix",emoji:"\u{1F41B}",trailer:"Changelog: fix"},{value:"docs",label:"docs",hint:"Documentation only changes",emoji:"\u{1F4DA}",trailer:"Changelog: documentation"},{value:"refactor",label:"refactor",hint:"A code change that neither fixes a bug nor adds a feature",emoji:"\u{1F528}",trailer:"Changelog: refactor"},{value:"perf",label:"perf",hint:"A code change that improves performance",emoji:"\u{1F680}",trailer:"Changelog: performance"},{value:"test",label:"test",hint:"Adding missing tests or correcting existing tests",emoji:"\u{1F6A8}",trailer:"Changelog: test"},{value:"build",label:"build",hint:"Changes that affect the build system or external dependencies",emoji:"\u{1F6A7}",trailer:"Changelog: build"},{value:"ci",label:"ci",hint:"Changes to our CI configuration files and scripts",emoji:"\u{1F916}",trailer:"Changelog: ci"},{value:"chore",label:"chore",hint:"Other changes that do not modify src or test files",emoji:"\u{1F9F9}",trailer:"Changelog: chore"},{value:"",label:"none"}];import*as t from"valibot";var m=t.object({check_status:t.optional(t.boolean(),!0),commit_type:t.transform(t.optional(t.object({enable:t.optional(t.boolean(),!0),initial_value:t.optional(t.string(),"feat"),max_items:t.optional(t.number([t.minValue(1)]),20),infer_type_from_branch:t.optional(t.boolean(),!0),append_emoji_to_label:t.optional(t.boolean(),!1),append_emoji_to_commit:t.optional(t.boolean(),!1),emoji_commit_position:t.optional(t.picklist(["Start","After-Colon"]),"Start"),options:t.optional(t.array(t.object({value:t.string(),label:t.optional(t.string()),hint:t.optional(t.string()),emoji:t.optional(t.string([t.emoji()]),void 0),trailer:t.optional(t.string())})),C)},[t.custom(e=>e.options.map(o=>o.value).includes(e.initial_value),e=>`Type: initial_value "${e.input.initial_value}" must exist in options`)]),{}),e=>{let o=e.options.map(n=>({...n,label:n.emoji&&e.append_emoji_to_label?`${n.emoji} ${n.label}`:n.label}))??[];return{...e,options:o}}),commit_scope:t.transform(t.optional(t.object({enable:t.optional(t.boolean(),!0),custom_scope:t.optional(t.boolean(),!1),max_items:t.optional(t.number([t.minValue(1)]),20),initial_value:t.optional(t.string(),"app"),options:t.optional(t.array(t.object({value:t.string(),label:t.optional(t.string()),hint:t.optional(t.string())})),x)},[t.custom(e=>{let o=e.options.map(n=>n.value);return e.custom_scope&&o.push(c),o.includes(e.initial_value)},e=>`Scope: initial_value "${e.input.initial_value}" must exist in options`)]),{}),e=>{let o=e.options.map(n=>n.value);return e.custom_scope&&!o.includes(c)?{...e,options:[...e.options,{label:c,value:c,hint:"Write a custom scope"}]}:e}),check_ticket:t.optional(t.object({infer_ticket:t.optional(t.boolean(),!0),confirm_ticket:t.optional(t.boolean(),!0),add_to_title:t.optional(t.boolean(),!0),append_hashtag:t.optional(t.boolean(),!1),prepend_hashtag:t.optional(t.picklist(["Never","Always","Prompt"]),"Never"),surround:t.optional(t.picklist(["","()","[]","{}"]),""),title_position:t.optional(t.picklist(["start","end","before-colon","beginning"]),"start")}),{}),commit_title:t.optional(t.object({max_size:t.optional(t.number([t.minValue(1)]),70)}),{}),commit_body:t.optional(t.object({enable:t.optional(t.boolean(),!0),required:t.optional(t.boolean(),!1),split_by_period:t.optional(t.boolean(),!1)}),{}),commit_footer:t.optional(t.object({enable:t.optional(t.boolean(),!0),initial_value:t.optional(t.array(g),[]),options:t.optional(t.array(g),f)}),{}),breaking_change:t.optional(t.object({add_exclamation_to_title:t.optional(t.boolean(),!0)}),{}),cache_last_value:t.optional(t.boolean(),!0),confirm_with_editor:t.optional(t.boolean(),!1),confirm_commit:t.optional(t.boolean(),!0),print_commit_output:t.optional(t.boolean(),!0),branch_pre_commands:t.optional(t.array(t.string()),[]),branch_post_commands:t.optional(t.array(t.string()),[]),worktree_pre_commands:t.optional(t.array(t.string()),[]),worktree_post_commands:t.optional(t.array(t.string()),[]),branch_user:t.optional(t.object({enable:t.optional(t.boolean(),!0),required:t.optional(t.boolean(),!1),separator:t.optional(t.picklist(["/","-","_"]),"/")}),{}),branch_type:t.optional(t.object({enable:t.optional(t.boolean(),!0),separator:t.optional(t.picklist(["/","-","_"]),"/")}),{}),branch_version:t.optional(t.object({enable:t.optional(t.boolean(),!1),required:t.optional(t.boolean(),!1),separator:t.optional(t.picklist(["/","-","_"]),"/")}),{}),branch_ticket:t.optional(t.object({enable:t.optional(t.boolean(),!0),required:t.optional(t.boolean(),!1),separator:t.optional(t.picklist(["/","-","_"]),"-")}),{}),branch_description:t.optional(t.object({max_length:t.optional(t.number([t.minValue(1)]),70),separator:t.optional(t.picklist(["","/","-","_"]),"")}),{}),branch_action_default:t.optional(h,"branch"),branch_order:t.optional(t.array(d),O),enable_worktrees:t.optional(t.boolean(),!0),worktrees:t.optional(t.object({enable:t.optional(t.boolean(),!0),base_path:t.optional(t.string(),".."),folder_template:t.optional(t.string(),"{{repo_name}}-{{ticket}}-{{branch_description}}")}),{}),overrides:t.optional(t.object({shell:t.optional(t.string())}),{})}),H=t.optional(t.object({type:t.optional(t.string(),""),scope:t.optional(t.string(),""),title:t.optional(t.string(),""),body:t.optional(t.string(),""),closes:t.optional(t.string(),""),ticket:t.optional(t.string(),""),breaking_title:t.optional(t.string(),""),breaking_body:t.optional(t.string(),""),deprecates:t.optional(t.string(),""),deprecates_title:t.optional(t.string(),""),deprecates_body:t.optional(t.string(),""),custom_footer:t.optional(t.string(),""),trailer:t.optional(t.string(),"")}),{}),D=t.optional(t.object({user:t.optional(t.string(),""),type:t.optional(t.string(),""),ticket:t.optional(t.string(),""),description:t.optional(t.string(),""),version:t.optional(t.string(),"")}),{});var b=class{#t="";constructor(){}get git_args(){return this.#t}set git_args(o){this.#t=o}},_=new b;import*as i from"@clack/prompts";import{execSync as S}from"child_process";import u from"fs";import{homedir as R}from"os";import a from"picocolors";import{ValiError as N,parse as y}from"valibot";import{argv as E}from"process";var T=".better-commits.json",K=`${a.dim("(<space> to select)")}`,Q=`${a.dim("(<space> to select, <a> to select all)")}`,tt=`${a.dim("(optional)")}`,ot=`${a.dim("(value will be saved)")}`,et=new RegExp(/\/(\w+-\d+)/),nt=new RegExp(/^(\w+-\d+)/),it=new RegExp(/^([A-Z]+-[\[a-zA-Z\]\d]+)_/),rt=new RegExp(/\/([A-Z]+-[\[a-zA-Z\]\d]+)_/),at=new RegExp(/\/(\d+)/),lt=new RegExp(/^(\d+)/),st=[{value:"closes",label:"closes <issue/ticket>",hint:"Attempts to infer ticket from branch"},{value:"trailer",label:"trailer",hint:"Appends trailer based on commit type"},{value:"breaking-change",label:"breaking change",hint:"Add breaking change"},{value:"deprecated",label:"deprecated",hint:"Add deprecated change"},{value:"custom",label:"custom",hint:"Add a custom footer"}],pt=[{value:"branch",label:"Branch"},{value:"worktree",label:"Worktree"}],ct={get:()=>"",set:(e,o)=>{},clear:()=>{}};function vt(e=" better-commits "){console.clear(),i.intro(`${a.bgCyan(a.black(e))}`),P();let o=null,n=I();u.existsSync(n)&&(i.log.step("Found global config"),o=A(n));let l=`${w()}/${T}`;if(u.existsSync(l)){i.log.step("Found repository config");let s=A(l);return o?{...s,overrides:o.overrides.shell?o.overrides:s.overrides,confirm_with_editor:o.confirm_with_editor,cache_last_value:o.cache_last_value}:s}if(o)return o;let v=y(m,{});return i.log.step("Config not found. Generating default .better-commit.json at $HOME"),u.writeFileSync(n,JSON.stringify(v,null,4)),v}function A(e){let o=null;try{o=JSON.parse(u.readFileSync(e,"utf8"))}catch(n){i.log.error(`Invalid JSON file. Exiting.
-`+n),process.exit(0)}return j(o)}function j(e){try{return y(m,e)}catch(o){if(o instanceof N){let r=(o.issues[0].path??[]).map(l=>l.key).join(".");i.log.error(`Invalid Configuration: ${a.red(r)}
-`+o.message)}process.exit(0)}}function _t(e){let o="";try{o=S(`git ${_.git_args} branch --show-current`,{stdio:"pipe"}).toString()}catch{return""}return e.find(r=>{let l=new RegExp(`^${r}-`),v=new RegExp(`-${r}-`),s=new RegExp(`${r}/`);return[o.match(l),o.match(v),o.match(s)].filter(k=>k!=null)?.length})??""}function w(){let e=".";try{e=S(`git ${_.git_args} rev-parse --show-toplevel`).toString().trim()}catch{i.log.warn("Could not find git root. If in a --bare repository, ignore this warning.")}return e}function I(){return R()+"/"+T}function ut(e,o){return o===e.length-1?"":`
-`}function gt(e){let o=e.trim();return o.endsWith(".")?o.substring(0,o.length-1).trim():e.trim()}function P(){_.git_args=`${E[2]??""} ${E[3]??""}`.trim()}function mt(e,o){try{return e.get(o)??""}catch{i.log.warn(`Could not access ${o} from cache. Check that "~/.config" exists. Set "cache_last_value" to false to disable.`)}return""}function bt(e,o,n){try{e.set(o,n)}catch{i.log.warn(`Could not access ${o} from cache. Check that "~/.config" exists. Set "cache_last_value" to false to disable.`)}}export{c as a,m as b,H as c,D as d,_ as e,T as f,K as g,tt as h,ot as i,et as j,nt as k,it as l,rt as m,at as n,lt as o,st as p,pt as q,ct as r,vt as s,_t as t,w as u,ut as v,gt as w,mt as x,bt as y};