gflows 0.1.12 → 0.1.14

package/src/config.ts

@@ -6,6 +6,7 @@
 
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { DEFAULT_DEV, DEFAULT_MAIN, DEFAULT_PREFIXES, DEFAULT_REMOTE } from "./constants.js";
 import type {
   BranchPrefixes,
   BranchType,
@@ -13,12 +14,6 @@ import type {
   GflowsConfigFile,
   ResolvedConfig,
 } from "./types.js";
-import {
-  DEFAULT_DEV,
-  DEFAULT_MAIN,
-  DEFAULT_PREFIXES,
-  DEFAULT_REMOTE,
-} from "./constants.js";
 
 const CONFIG_FILE = ".gflows.json";
 const PACKAGE_JSON = "package.json";
@@ -99,10 +94,22 @@ function normalizeConfigFile(data: unknown): GflowsConfigFile | null {
   if (typeof obj.remote === "string" && obj.remote.trim() !== "") {
     out.remote = obj.remote.trim();
   }
-  if (obj.prefixes !== undefined && obj.prefixes !== null && typeof obj.prefixes === "object" && !Array.isArray(obj.prefixes)) {
+  if (
+    obj.prefixes !== undefined &&
+    obj.prefixes !== null &&
+    typeof obj.prefixes === "object" &&
+    !Array.isArray(obj.prefixes)
+  ) {
     const prefs = obj.prefixes as Record<string, unknown>;
     const prefixes: BranchPrefixes = {};
-    const keys: (keyof BranchPrefixes)[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
+    const keys: (keyof BranchPrefixes)[] = [
+      "feature",
+      "bugfix",
+      "chore",
+      "release",
+      "hotfix",
+      "spike",
+    ];
     for (const k of keys) {
       const v = prefs[k];
       if (typeof v === "string" && v.trim() !== "") {
@@ -123,10 +130,17 @@ function normalizeConfigFile(data: unknown): GflowsConfigFile | null {
 function mergePrefixes(overrides?: BranchPrefixes): Required<BranchPrefixes> {
   const result: Required<BranchPrefixes> = { ...DEFAULT_PREFIXES };
   if (!overrides) return result;
-  const keys: (keyof BranchPrefixes)[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
+  const keys: (keyof BranchPrefixes)[] = [
+    "feature",
+    "bugfix",
+    "chore",
+    "release",
+    "hotfix",
+    "spike",
+  ];
   for (const k of keys) {
-    if (typeof overrides[k] === "string" && overrides[k]!.trim() !== "") {
-      result[k] = overrides[k]!.trim();
+    if (typeof overrides[k] === "string" && overrides[k]?.trim() !== "") {
+      result[k] = overrides[k]?.trim();
     }
   }
   return result;
@@ -144,7 +158,7 @@ function mergePrefixes(overrides?: BranchPrefixes): Required<BranchPrefixes> {
 export function resolveConfig(
   dir: string,
   cliOverrides?: ConfigCliOverrides,
-  options?: ResolveConfigOptions
+  options?: ResolveConfigOptions,
 ): ResolvedConfig {
   const verbose = options?.verbose === true;
 
@@ -180,10 +194,7 @@ export function resolveConfig(
  * @param dir - Repo root directory.
  * @param partial - Keys to set (main, dev, remote, prefixes); omitted keys are left unchanged.
  */
-export function writeConfigFile(
-  dir: string,
-  partial: Partial<GflowsConfigFile>
-): void {
+export function writeConfigFile(dir: string, partial: Partial<GflowsConfigFile>): void {
   const path = join(dir, CONFIG_FILE);
   let existing: GflowsConfigFile = {};
   if (existsSync(path)) {
@@ -206,10 +217,22 @@ export function writeConfigFile(
   if (typeof partial.remote === "string" && partial.remote.trim() !== "") {
     merged.remote = partial.remote.trim();
   }
-  if (partial.prefixes !== undefined && partial.prefixes !== null && typeof partial.prefixes === "object" && !Array.isArray(partial.prefixes)) {
+  if (
+    partial.prefixes !== undefined &&
+    partial.prefixes !== null &&
+    typeof partial.prefixes === "object" &&
+    !Array.isArray(partial.prefixes)
+  ) {
     const prefs = partial.prefixes as Record<string, unknown>;
     const prefixes: BranchPrefixes = { ...(merged.prefixes ?? {}) };
-    const keys: (keyof BranchPrefixes)[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
+    const keys: (keyof BranchPrefixes)[] = [
+      "feature",
+      "bugfix",
+      "chore",
+      "release",
+      "hotfix",
+      "spike",
+    ];
     for (const k of keys) {
       const v = prefs[k];
       if (typeof v === "string" && v.trim() !== "") {
@@ -218,16 +241,13 @@ export function writeConfigFile(
     }
     merged.prefixes = prefixes;
   }
-  writeFileSync(path, JSON.stringify(merged, null, 2) + "\n", "utf-8");
+  writeFileSync(path, `${JSON.stringify(merged, null, 2)}\n`, "utf-8");
 }
 
 /**
  * Returns the branch name prefix for a given branch type from resolved config.
  */
-export function getPrefixForType(
-  config: ResolvedConfig,
-  type: BranchType
-): string {
+export function getPrefixForType(config: ResolvedConfig, type: BranchType): string {
   return config.prefixes[type] ?? DEFAULT_PREFIXES[type];
 }
 

package/src/constants.ts

@@ -35,4 +35,4 @@ export const DEFAULT_PREFIXES = {
 export const VERSION_REGEX = /^v?\d+\.\d+\.\d+$/;
 
 /** Characters invalid in Git ref names (branch names). */
-export const INVALID_BRANCH_CHARS = /\.\.|[\s~^?:*\[\]\\]/;
+export const INVALID_BRANCH_CHARS = /\.\.|[\s~^?:*[\]\\]/;

package/src/errors.ts

@@ -36,7 +36,9 @@ export class BranchNotFoundError extends GflowsError {
 
 /** Thrown when start is run with uncommitted changes and without --force. */
 export class DirtyWorkingTreeError extends GflowsError {
-  constructor(message = "Working tree has uncommitted changes. Commit or stash them, or use --force.") {
+  constructor(
+    message = "Working tree has uncommitted changes. Commit or stash them, or use --force.",
+  ) {
     super(message, EXIT_GIT);
   }
 }
@@ -51,7 +53,7 @@ export class DetachedHeadError extends GflowsError {
 /** Thrown when a rebase or merge is in progress; user must complete or abort first. */
 export class RebaseMergeInProgressError extends GflowsError {
   constructor(
-    message = "A rebase or merge is in progress. Complete or abort it before running this command."
+    message = "A rebase or merge is in progress. Complete or abort it before running this command.",
   ) {
     super(message, EXIT_GIT);
   }

package/src/git.ts

@@ -45,10 +45,7 @@ export interface GitRunResult {
  * @param options - cwd, dryRun, verbose.
  * @returns Promise with stdout, stderr, and exitCode.
  */
-export async function runGit(
-  args: string[],
-  options: GitOptions
-): Promise<GitRunResult> {
+export async function runGit(args: string[], options: GitOptions): Promise<GitRunResult> {
   const { cwd, dryRun = false, verbose = false } = options;
   const cmd = ["git", ...args].join(" ");
 
@@ -133,7 +130,7 @@ export async function revParse(
   cwd: string,
   ref: string,
   extraArgs: string[] = [],
-  options: Pick<GitOptions, "dryRun" | "verbose"> = {}
+  options: Pick<GitOptions, "dryRun" | "verbose"> = {},
 ): Promise<string> {
   const result = await runGit(["rev-parse", ...extraArgs, ref], { cwd, ...options });
   if (result.exitCode !== 0) {
@@ -151,7 +148,7 @@ export async function revParse(
  */
 export async function branchList(
   cwd: string,
-  options: GitRunOptions & { includeRemote?: boolean } = {}
+  options: GitRunOptions & { includeRemote?: boolean } = {},
 ): Promise<string[]> {
   const { includeRemote = false, ...opts } = options;
   const args = includeRemote
@@ -182,7 +179,7 @@ export async function branchList(
 export async function checkout(
   cwd: string,
   branch: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<void> {
   const result = await runGit(["checkout", branch], { cwd, ...options });
   if (result.exitCode !== 0) {
@@ -201,7 +198,7 @@ export async function checkout(
 export async function merge(
   cwd: string,
   ref: string,
-  options: GitRunOptions & { noFf?: boolean } = {}
+  options: GitRunOptions & { noFf?: boolean } = {},
 ): Promise<void> {
   const { noFf = false, ...opts } = options;
   const args = noFf ? ["merge", "--no-ff", ref] : ["merge", ref];
@@ -229,7 +226,7 @@ export async function push(
   remote: string,
   refs: string[],
   pushTags: boolean,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<number> {
   const pushArgs = ["push", remote, ...refs];
   const result = await runGit(pushArgs, { cwd, ...options });
@@ -254,7 +251,7 @@ export async function push(
 export async function tag(
   cwd: string,
   name: string,
-  options: GitRunOptions & { sign?: boolean; tagMessage?: string } = {}
+  options: GitRunOptions & { sign?: boolean; tagMessage?: string } = {},
 ): Promise<void> {
   const { sign = false, tagMessage, ...opts } = options;
   const args = ["tag", name];
@@ -280,7 +277,7 @@ export async function tag(
 export async function tagExists(
   cwd: string,
   name: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<boolean> {
   const result = await runGit(["tag", "-l", name], { cwd, ...options });
   return result.exitCode === 0 && result.stdout.trim() === name;
@@ -297,13 +294,11 @@ export async function tagExists(
 export async function deleteBranch(
   cwd: string,
   branch: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<void> {
   const result = await runGit(["branch", "-d", branch], { cwd, ...options });
   if (result.exitCode !== 0) {
-    throw new BranchNotFoundError(
-      result.stderr.trim() || `Could not delete branch '${branch}'.`
-    );
+    throw new BranchNotFoundError(result.stderr.trim() || `Could not delete branch '${branch}'.`);
   }
 }
 
@@ -313,10 +308,7 @@ export async function deleteBranch(
  * @param cwd - Repo root.
  * @param options - dryRun, verbose (verbose has no effect for this read-only call).
  */
-export async function isClean(
-  cwd: string,
-  options: GitRunOptions = {}
-): Promise<boolean> {
+export async function isClean(cwd: string, options: GitRunOptions = {}): Promise<boolean> {
   const result = await runGit(["status", "--porcelain"], { cwd, ...options });
   if (result.exitCode !== 0) return false;
   return result.stdout.trim() === "";
@@ -330,7 +322,7 @@ export async function isClean(
  */
 export async function getCurrentBranch(
   cwd: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<string | null> {
   const result = await runGit(["rev-parse", "--abbrev-ref", "HEAD"], {
     cwd,
@@ -404,7 +396,7 @@ export function validateBranchName(name: string): void {
   }
   if (INVALID_BRANCH_CHARS.test(name)) {
     throw new InvalidBranchNameError(
-      "Branch name contains invalid characters (e.g. .., ~, ^, ?, *, [, ], :, \\, space)."
+      "Branch name contains invalid characters (e.g. .., ~, ^, ?, *, [, ], :, \\, space).",
     );
   }
 }
@@ -420,7 +412,7 @@ export function validateBranchName(name: string): void {
 export async function fetch(
   cwd: string,
   remote: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<number> {
   const result = await runGit(["fetch", remote], { cwd, ...options });
   return result.exitCode;
@@ -442,7 +434,7 @@ export async function hasRemoteRef(
   cwd: string,
   remote: string,
   ref: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<boolean> {
   const result = await runGit(["ls-remote", "--exit-code", remote, ref], {
     cwd,
@@ -465,12 +457,12 @@ export async function getAheadBehind(
   cwd: string,
   baseRef: string,
   headRef: string,
-  options: GitRunOptions = {}
+  options: GitRunOptions = {},
 ): Promise<{ ahead: number; behind: number }> {
-  const result = await runGit(
-    ["rev-list", "--left-right", "--count", `${baseRef}...${headRef}`],
-    { cwd, ...options }
-  );
+  const result = await runGit(["rev-list", "--left-right", "--count", `${baseRef}...${headRef}`], {
+    cwd,
+    ...options,
+  });
   if (result.exitCode !== 0 || !result.stdout.trim()) {
     return { ahead: 0, behind: 0 };
   }

package/src/index.ts

@@ -5,80 +5,76 @@
  */
 
 export type {
-  BranchType,
-  BranchTypeBase,
-  BranchPrefixes,
-  BumpDirection,
-  BumpType,
-  Command,
-  GflowsConfigFile,
-  MergeTarget,
-  ParsedArgs,
-  ResolvedConfig,
-  BranchTypeMeta,
-} from "./types.js";
-export { BRANCH_TYPE_SHORTS } from "./types.js";
-
+  ConfigCliOverrides,
+  ReadConfigResult,
+  ResolveConfigOptions,
+} from "./config.js";
 export {
+  getBranchTypeMeta,
+  getPrefixForType,
   readConfigFile,
   resolveConfig,
   writeConfigFile,
-  getPrefixForType,
-  getBranchTypeMeta,
 } from "./config.js";
-export type {
-  ConfigCliOverrides,
-  ReadConfigResult,
-  ResolveConfigOptions,
-} from "./config.js";
-
 export {
-  runGit,
-  resolveRepoRoot,
-  ensureGitRepo,
-  revParse,
+  DEFAULT_DEV,
+  DEFAULT_MAIN,
+  DEFAULT_PREFIXES,
+  DEFAULT_REMOTE,
+  EXIT_GIT,
+  EXIT_OK,
+  EXIT_USER,
+  INVALID_BRANCH_CHARS,
+  VERSION_REGEX,
+} from "./constants.js";
+export {
+  BranchNotFoundError,
+  CannotDeleteMainOrDevError,
+  DetachedHeadError,
+  DirtyWorkingTreeError,
+  exitCodeForError,
+  GflowsError,
+  InvalidBranchNameError,
+  InvalidVersionError,
+  MergeConflictError,
+  NotRepoError,
+  RebaseMergeInProgressError,
+} from "./errors.js";
+export type { GitOptions, GitRunOptions, GitRunResult } from "./git.js";
+export {
+  assertNoRebaseOrMerge,
+  assertNotDetached,
   branchList,
   checkout,
-  merge,
-  push,
-  tag,
-  tagExists,
   deleteBranch,
-  isClean,
+  ensureGitRepo,
+  fetch,
+  getAheadBehind,
   getCurrentBranch,
+  hasRemoteRef,
+  isClean,
   isDetachedHead,
   isRebaseOrMergeInProgress,
-  assertNotDetached,
-  assertNoRebaseOrMerge,
+  merge,
+  push,
+  resolveRepoRoot,
+  revParse,
+  runGit,
+  tag,
+  tagExists,
   validateBranchName,
-  fetch,
-  hasRemoteRef,
-  getAheadBehind,
 } from "./git.js";
-export type { GitOptions, GitRunOptions, GitRunResult } from "./git.js";
-
-export {
-  GflowsError,
-  NotRepoError,
-  BranchNotFoundError,
-  DirtyWorkingTreeError,
-  DetachedHeadError,
-  RebaseMergeInProgressError,
-  MergeConflictError,
-  InvalidVersionError,
-  InvalidBranchNameError,
-  CannotDeleteMainOrDevError,
-  exitCodeForError,
-} from "./errors.js";
-
-export {
-  EXIT_OK,
-  EXIT_USER,
-  EXIT_GIT,
-  DEFAULT_MAIN,
-  DEFAULT_DEV,
-  DEFAULT_REMOTE,
-  DEFAULT_PREFIXES,
-  VERSION_REGEX,
-  INVALID_BRANCH_CHARS,
-} from "./constants.js";
+export type {
+  BranchPrefixes,
+  BranchType,
+  BranchTypeBase,
+  BranchTypeMeta,
+  BumpDirection,
+  BumpType,
+  Command,
+  GflowsConfigFile,
+  MergeTarget,
+  ParsedArgs,
+  ResolvedConfig,
+} from "./types.js";
+export { BRANCH_TYPE_SHORTS } from "./types.js";

package/src/out.ts

@@ -66,11 +66,19 @@ export function banner(title: string, lines?: string[]): void {
   const top = `  ${c(BOX.TL)}${c(BOX.H.repeat(BANNER_INNER_WIDTH))}${c(BOX.TR)}`;
   const bottom = `  ${c(BOX.BL)}${c(BOX.H.repeat(BANNER_INNER_WIDTH))}${c(BOX.BR)}`;
   const row = (text: string) =>
-    "  " + c(BOX.V) + "  " + text + " ".repeat(Math.max(0, inner - text.length)) + "  " + c(BOX.V);
+    `  ${c(BOX.V)}  ${text}${" ".repeat(Math.max(0, inner - text.length))}  ${c(BOX.V)}`;
   const titleDisplay = color ? `${CYAN}${BOLD}${title}${RESET}` : title;
   console.log("");
   console.log(top);
-  console.log("  " + c(BOX.V) + "  " + titleDisplay + " ".repeat(Math.max(0, inner - title.length)) + "  " + c(BOX.V));
+  console.log(
+    "  " +
+      c(BOX.V) +
+      "  " +
+      titleDisplay +
+      " ".repeat(Math.max(0, inner - title.length)) +
+      "  " +
+      c(BOX.V),
+  );
   if (lines?.length) {
     for (const line of lines) {
       console.log(line === "" ? row("") : row(line));

package/src/types.ts

@@ -4,13 +4,7 @@
  */
 
 /** Supported workflow branch types (core + optional spike). */
-export type BranchType =
-  | "feature"
-  | "bugfix"
-  | "chore"
-  | "release"
-  | "hotfix"
-  | "spike";
+export type BranchType = "feature" | "bugfix" | "chore" | "release" | "hotfix" | "spike";
 
 /** Short flag for each branch type when used as CLI type selector. */
 export const BRANCH_TYPE_SHORTS: Record<BranchType, string> = {