feat: update compatibility with git-json-resolver v1.3.1 API

mayank1513 · mayank1513 · commit 45e062391cc0 · 2025-09-05T18:09:21.000+05:30
diff --git a/lib/package.json b/lib/package.json
@@ -38,7 +38,7 @@
     "@vitest/coverage-v8": "^3.2.4",
     "compare-versions": "^6.1.1",
     "esbuild-plugin-rdi": "^0.0.0",
-    "git-json-resolver": "^1.2.0",
+    "git-json-resolver": "^1.3.1",
     "tsup": "^8.5.0",
     "typescript": "^5.9.2",
     "vite-tsconfig-paths": "^5.1.4",
diff --git a/lib/src/index.test.ts b/lib/src/index.test.ts
@@ -1,6 +1,10 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import plugin, { semverMax, semverMin, semverOurs, semverTheirs } from "./index";
-import { StrategyStatus } from "git-json-resolver";
+import {
+  StrategyStatus_OK,
+  StrategyStatus_CONTINUE,
+  StrategyStatus_FAIL,
+} from "git-json-resolver/utils";
 
 const run = (fn: any, ours: any, theirs: any) => fn({ ours, theirs, base: undefined, path: [] });
 
@@ -20,109 +24,109 @@ describe("git-json-resolver-semver", () => {
   describe("semver-max", () => {
     it("picks higher when both valid", () => {
       const r = run(semverMax, "1.2.3", "1.3.0");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.3.0");
     });
 
     it("prefers valid when only one is valid", () => {
       const r = run(semverMax, "1.2.3", "banana");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.2.3");
     });
 
     it("respects fallback=continue when both invalid", async () => {
       await reset({ preferValid: false, fallback: "continue" });
       const r = run(semverMax, "foo", "bar");
-      expect(r.status).toBe(StrategyStatus.CONTINUE);
+      expect(r.status).toBe(StrategyStatus_CONTINUE);
     });
 
     it("respects fallback=ours/theirs/error", async () => {
       await reset({ preferValid: false, fallback: "ours" });
       let r = run(semverMax, "foo", "bar");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("foo");
 
       await reset({ preferValid: false, fallback: "theirs" });
       r = run(semverMax, "foo", "bar");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("bar");
 
       await reset({ preferValid: false, fallback: "error" });
       r = run(semverMax, "foo", "bar");
-      expect(r.status).toBe(StrategyStatus.FAIL);
+      expect(r.status).toBe(StrategyStatus_FAIL);
     });
 
     it("strict=false allows prereleases/ranges", async () => {
       await reset({ strict: false });
       const r1 = run(semverMax, "1.2.3", "1.2.3-beta.1");
-      expect(r1.status).toBe(StrategyStatus.OK);
+      expect(r1.status).toBe(StrategyStatus_OK);
       expect(r1.value).toBe("1.2.3"); // release > prerelease
 
       const r2 = run(semverMax, "^1.2.3", "1.3.0");
       // validate("^1.2.3") is true in non-strict; compareVersions("^1.2.3", "1.3.0")
       // is not meaningful, so preferValid should push to 1.3.0 only when one side valid.
       // Here both are considered valid, so we trust compareVersions result.
-      expect([StrategyStatus.OK, StrategyStatus.CONTINUE]).toContain(r2.status);
+      expect([StrategyStatus_OK, StrategyStatus_CONTINUE]).toContain(r2.status);
     });
 
     it("strict=true rejects prereleases", async () => {
       await reset({ strict: true });
       const r = run(semverMax, "1.2.3-beta.1", "1.2.3");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.2.3"); // only ours invalid → pick valid theirs via preferValid
     });
   });
 
   describe("semver-min", () => {
     it("picks lower when both valid", () => {
       const r = run(semverMin, "2.0.0", "2.1.0");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("2.0.0");
     });
 
     it("prefers valid when only one is valid", () => {
       const r = run(semverMin, "banana", "2.1.0");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("2.1.0");
     });
 
     it("strict=false handles prerelease ordering", async () => {
       await reset({ strict: false });
       const r = run(semverMin, "1.2.3", "1.2.3-beta.1");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.2.3-beta.1"); // prerelease < release
     });
   });
 
   describe("semver-ours / semver-theirs", () => {
     it("semver-ours returns ours when ours is valid", () => {
       const r = run(semverOurs, "1.0.0", "2.0.0");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.0.0");
     });
 
     it("semver-ours falls back to valid theirs when ours invalid", () => {
       const r = run(semverOurs, "banana", "1.0.1");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.0.1");
     });
 
     it("semver-theirs returns theirs when theirs is valid", () => {
       const r = run(semverTheirs, "1.2.3", "2.0.0");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("2.0.0");
     });
 
     it("semver-theirs falls back to valid ours when theirs invalid", () => {
       const r = run(semverTheirs, "1.2.3", "carrot");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("1.2.3");
     });
 
     it("falls back per config when neither valid", async () => {
       await reset({ preferValid: false, fallback: "theirs" });
       const r = run(semverOurs, "foo", "bar");
-      expect(r.status).toBe(StrategyStatus.OK);
+      expect(r.status).toBe(StrategyStatus_OK);
       expect(r.value).toBe("bar");
     });
   });
diff --git a/lib/src/index.ts b/lib/src/index.ts
@@ -1,5 +1,10 @@
-import { StrategyFn, StrategyPlugin, StrategyStatus } from "git-json-resolver";
+import { StrategyFn, StrategyPlugin } from "git-json-resolver";
 import { compareVersions, validate } from "compare-versions";
+import {
+  StrategyStatus_OK,
+  StrategyStatus_CONTINUE,
+  StrategyStatus_FAIL,
+} from "git-json-resolver/utils";
 
 /**
  * Semver-aware strategies for `git-json-resolver`.
@@ -29,6 +34,14 @@ declare module "git-json-resolver" {
     "semver-ours": string;
     "semver-theirs": string;
   }
+
+  interface PluginConfig {
+    "git-json-resolver-semver": SemverPluginConfig;
+    "json-merge-semver": SemverPluginConfig;
+    "git-semver-resolver": SemverPluginConfig;
+    "semver-merge-driver": SemverPluginConfig;
+    "semver-conflict-resolver": SemverPluginConfig;
+  }
 }
 
 interface SemverPluginConfig {
@@ -65,11 +78,11 @@ const isValidSemver = (val: unknown): val is string => {
 export const semverMax: StrategyFn = ({ ours, theirs }) => {
   if (isValidSemver(ours) && isValidSemver(theirs)) {
     const winner = compareVersions(ours, theirs) >= 0 ? ours : theirs;
-    return { status: StrategyStatus.OK, value: winner };
+    return { status: StrategyStatus_OK, value: winner };
   }
   if (pluginConfig.preferValid) {
-    if (isValidSemver(ours)) return { status: StrategyStatus.OK, value: ours };
-    if (isValidSemver(theirs)) return { status: StrategyStatus.OK, value: theirs };
+    if (isValidSemver(ours)) return { status: StrategyStatus_OK, value: ours };
+    if (isValidSemver(theirs)) return { status: StrategyStatus_OK, value: theirs };
   }
   return handleFallback({ ours, theirs });
 };
@@ -80,11 +93,11 @@ export const semverMax: StrategyFn = ({ ours, theirs }) => {
 export const semverMin: StrategyFn = ({ ours, theirs }) => {
   if (isValidSemver(ours) && isValidSemver(theirs)) {
     const winner = compareVersions(ours, theirs) <= 0 ? ours : theirs;
-    return { status: StrategyStatus.OK, value: winner };
+    return { status: StrategyStatus_OK, value: winner };
   }
   if (pluginConfig.preferValid) {
-    if (isValidSemver(ours)) return { status: StrategyStatus.OK, value: ours };
-    if (isValidSemver(theirs)) return { status: StrategyStatus.OK, value: theirs };
+    if (isValidSemver(ours)) return { status: StrategyStatus_OK, value: ours };
+    if (isValidSemver(theirs)) return { status: StrategyStatus_OK, value: theirs };
   }
   return handleFallback({ ours, theirs });
 };
@@ -93,9 +106,9 @@ export const semverMin: StrategyFn = ({ ours, theirs }) => {
  * Always prefer ours if valid semver, else apply preferValid/fallback rules.
  */
 export const semverOurs: StrategyFn = ({ ours, theirs }) => {
-  if (isValidSemver(ours)) return { status: StrategyStatus.OK, value: ours };
+  if (isValidSemver(ours)) return { status: StrategyStatus_OK, value: ours };
   if (pluginConfig.preferValid && isValidSemver(theirs)) {
-    return { status: StrategyStatus.OK, value: theirs };
+    return { status: StrategyStatus_OK, value: theirs };
   }
   return handleFallback({ ours, theirs });
 };
@@ -104,9 +117,9 @@ export const semverOurs: StrategyFn = ({ ours, theirs }) => {
  * Always prefer theirs if valid semver, else apply preferValid/fallback rules.
  */
 export const semverTheirs: StrategyFn = ({ ours, theirs }) => {
-  if (isValidSemver(theirs)) return { status: StrategyStatus.OK, value: theirs };
+  if (isValidSemver(theirs)) return { status: StrategyStatus_OK, value: theirs };
   if (pluginConfig.preferValid && isValidSemver(ours)) {
-    return { status: StrategyStatus.OK, value: ours };
+    return { status: StrategyStatus_OK, value: ours };
   }
   return handleFallback({ ours, theirs });
 };
@@ -123,14 +136,14 @@ const handleFallback = ({
 }): ReturnType<StrategyFn> => {
   switch (pluginConfig.fallback) {
     case "ours":
-      return { status: StrategyStatus.OK, value: ours };
+      return { status: StrategyStatus_OK, value: ours };
     case "theirs":
-      return { status: StrategyStatus.OK, value: theirs };
+      return { status: StrategyStatus_OK, value: theirs };
     case "error":
-      return { status: StrategyStatus.FAIL, reason: "No valid semver found" };
+      return { status: StrategyStatus_FAIL, reason: "No valid semver found" };
     case "continue":
     default:
-      return { status: StrategyStatus.CONTINUE };
+      return { status: StrategyStatus_CONTINUE };
   }
 };
 
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "pre-commit": "^1.2.2",
     "prettier": "^3.6.2",
     "turbo": "^2.5.6",
-    "turborepo-template-upgrade": "^0.5.1",
+    "turborepo-template-upgrade": "^0.5.2",
     "typedoc": "^0.28.12",
     "typedoc-plugin-markdown": "^4.8.1",
     "typedoc-plugin-mdn-links": "^5.0.9",
