docs(changeset): Fix types - keep types in types.ts file and reuse to ensure type collisions.

Author: mayank1513

.changeset/pretty-showers-do.md

@@ -0,0 +1,5 @@
+---
+"git-json-resolver": patch
+---
+
+Fix types - keep types in types.ts file and reuse to ensure type collisions.

lib/src/merger.test.ts

@@ -5,7 +5,6 @@ import {
   MergeContext,
   mergeObject,
   BuiltInStrategies,
-  StrategyStatus,
   statusToString,
 } from "./merger";
 
@@ -14,6 +13,7 @@ vi.mock("./strategy-resolver", () => ({
   resolveStrategies: vi.fn(() => ["ours", "theirs", "merge"]),
 }));
 import { resolveStrategies } from "./strategy-resolver";
+import { StrategyStatus } from "./types";
 
 const makeCtx = (): MergeContext => ({
   config: { debug: false, strictArrays: false } as any,

lib/src/merger.ts

@@ -1,6 +1,6 @@
 import { NormalizedConfig } from "./normalizer";
 import { resolveStrategies } from "./strategy-resolver";
-import { StrategyFn } from "./types";
+import { StrategyFn, StrategyResult, StrategyStatus } from "./types";
 
 /** Sentinel used to explicitly drop a value. */
 export const DROP = Symbol("MERGE_DROP");
@@ -22,14 +22,6 @@ export interface MergeResult {
   conflicts: Conflict[];
 }
 
-/** Strategy status codes. */
-export enum StrategyStatus {
-  OK = 0,
-  CONTINUE = 1,
-  FAIL = 2,
-  SKIP = 3,
-}
-
 /** Helper: stringify status for logs. */
 export const statusToString = (s: StrategyStatus): string => {
   switch (s) {
@@ -46,13 +38,6 @@ export const statusToString = (s: StrategyStatus): string => {
   }
 };
 
-/** Strategy result contract. */
-export type StrategyResult =
-  | { status: StrategyStatus.OK; value: unknown }
-  | { status: StrategyStatus.CONTINUE; reason?: string }
-  | { status: StrategyStatus.SKIP; reason: string }
-  | { status: StrategyStatus.FAIL; reason: string };
-
 /** Merge context (runtime state + config). */
 export interface MergeContext<TContext = unknown> {
   config: NormalizedConfig;

lib/src/types.ts

@@ -25,19 +25,20 @@ export type InbuiltMergeStrategies =
   | "non-empty"
   | "update";
 
+/** Strategy status codes. */
 export enum StrategyStatus {
-  OK = "ok", // resolved successfully
-  CONTINUE = "continue", // couldn't resolve, try next strategy
-  FAIL = "fail", // unrecoverable fail, log + stop
-  SKIP = "skip", // explicitly skip -> adds conflict + return undefined
+  OK = 0,
+  CONTINUE = 1,
+  FAIL = 2,
+  SKIP = 3,
 }
 
-/**
- * Result contract for a strategy function.
- * - `ok: true` → merge produced a value
- * - `ok: false` → merge failed (with optional reason)
- */
-export type StrategyResult = { ok: true; value: unknown } | { ok: false; reason?: string };
+/** Strategy result contract. */
+export type StrategyResult =
+  | { status: StrategyStatus.OK; value: unknown }
+  | { status: StrategyStatus.CONTINUE; reason?: string }
+  | { status: StrategyStatus.SKIP; reason: string }
+  | { status: StrategyStatus.FAIL; reason: string };
 
 /**
  * Strategy function signature.