RELEASING: Releasing 2 package(s)

Releases:
  [email protected]
  @repo/[email protected]

Author: mayank1513

lib/CHANGELOG.md

@@ -0,0 +1,7 @@
+# git-json-resolver
+
+## 0.0.1
+
+### Patch Changes
+
+- Wire generic types through resolveConflicts function for improved type safety with custom strategies

lib/package.json

@@ -2,7 +2,7 @@
   "name": "git-json-resolver",
   "author": "Mayank Kumar Chaudhari (https://mayank-chaudhari.vercel.app)",
   "private": false,
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.",
   "license": "MPL-2.0",
   "main": "./dist/index.js",

lib/src/index.ts

@@ -3,7 +3,7 @@ import { parseConflictContent } from "./file-parser";
 import { serialize } from "./file-serializer";
 import { Conflict, mergeObject } from "./merger";
 import { normalizeConfig, NormalizedConfig } from "./normalizer";
-import { Config } from "./types";
+import { Config, InbuiltMergeStrategies } from "./types";
 import { backupFile, listMatchingFiles } from "./utils";
 import fs from "node:fs/promises";
 import { reconstructConflict } from "./conflict-helper";
@@ -12,8 +12,10 @@ export * from "./types";
 
 const _strategyCache = new Map<string, string[]>();
 
-export const resolveConflicts = async (config: Config) => {
-  const normalizedConfig: NormalizedConfig = await normalizeConfig(config);
+export const resolveConflicts = async <T extends string = InbuiltMergeStrategies>(
+  config: Config<T>,
+) => {
+  const normalizedConfig: NormalizedConfig = await normalizeConfig<T>(config);
   const filesEntries = await listMatchingFiles(normalizedConfig);
   await Promise.all(
     filesEntries.map(async ({ filePath, content }) => {

packages/shared/CHANGELOG.md

@@ -0,0 +1,8 @@
+# @repo/shared
+
+## 0.0.1
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]

packages/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repo/shared",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "private": true,
   "sideEffects": false,
   "main": "./dist/index.js",