upgrade deps && docs [skip ci]

Author: mayank1513

PLUGIN_GUIDE.md

@@ -29,9 +29,9 @@ const plugin: StrategyPlugin = {
   strategies: {
     "my-strategy": myStrategy,
   },
-  init: async (config) => {
+  init: async config => {
     // Optional initialization
-  }
+  },
 };
 
 export default plugin;
@@ -56,8 +56,8 @@ await resolveConflicts({
     "my-strategy": myStrategy,
   },
   rules: {
-    version: ["my-strategy"]
-  }
+    version: ["my-strategy"],
+  },
 });
 ```
 
@@ -86,11 +86,11 @@ import type { Config } from "git-json-resolver";
 const config: Config = {
   plugins: ["my-plugin"],
   pluginConfig: {
-    "my-plugin": { customOption: "value" }
+    "my-plugin": { customOption: "value" },
   },
   rules: {
-    version: ["my-strategy"] // TypeScript will know about this strategy
-  }
+    version: ["my-strategy"], // TypeScript will know about this strategy
+  },
 };
 
 export default config;
@@ -110,4 +110,4 @@ export default config;
 - `timestamp-latest`: Choose most recent timestamp
 - `array-union`: Merge arrays with unique values
 - `file-size-larger`: Choose larger file content
-- `priority-field`: Use priority-based resolution
+- `priority-field`: Use priority-based resolution

README.md

@@ -180,6 +180,7 @@ module.exports = {
 ```
 
 **⚠️ JSON Config Limitations:**
+
 - No TypeScript intellisense for plugin strategies
 - Limited validation for custom strategy names
 - No compile-time type checking
@@ -268,8 +269,8 @@ await resolveConflicts({
     // or "semantic-version": semanticVersion,
   },
   rules: {
-    version: ["semantic-version", "theirs"]
-  }
+    version: ["semantic-version", "theirs"],
+  },
 });
 ```
 
@@ -280,11 +281,11 @@ await resolveConflicts({
 const config = {
   plugins: ["my-plugin"],
   pluginConfig: {
-    "my-plugin": { option: "value" }
+    "my-plugin": { option: "value" },
   },
   rules: {
-    version: ["semantic-version", "theirs"]
-  }
+    version: ["semantic-version", "theirs"],
+  },
 };
 ```
 
@@ -338,7 +339,7 @@ export const timestampLatest: StrategyFn = ({ ours, theirs }) => {
   const theirsTime = new Date(theirs as string).getTime();
   return {
     status: StrategyStatus.OK,
-    value: oursTime > theirsTime ? ours : theirs
+    value: oursTime > theirsTime ? ours : theirs,
   };
 };
 
@@ -351,9 +352,9 @@ export const strategies = {
 // Plugin interface for dynamic loading
 const plugin: StrategyPlugin = {
   strategies,
-  init: async (config) => {
-    console.log('Plugin initialized with:', config);
-  }
+  init: async config => {
+    console.log("Plugin initialized with:", config);
+  },
 };
 
 export default plugin;

docs/cli.md

@@ -12,7 +12,7 @@ nav_order: 2
 
 > **findGitRoot**(): `string`
 
-Defined in: [cli.ts:17](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/cli.ts#L17)
+Defined in: [cli.ts:17](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/cli.ts#L17)
 
 Find Git root directory
 
@@ -26,7 +26,7 @@ Find Git root directory
 
 > **initConfig**(`targetDir`: `string`): `void`
 
-Defined in: [cli.ts:47](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/cli.ts#L47)
+Defined in: [cli.ts:47](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/cli.ts#L47)
 
 Write a starter config file
 
@@ -44,23 +44,23 @@ Write a starter config file
 
 ### loadConfigFile()
 
-> **loadConfigFile**(): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\<[`InbuiltMergeStrategies`](types/README.md#inbuiltmergestrategies), `unknown`\>\>\>
+> **loadConfigFile**(): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\<[`AllStrategies`](types/README.md#allstrategies), `unknown`\>\>\>
 
-Defined in: [cli.ts:28](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/cli.ts#L28)
+Defined in: [cli.ts:28](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/cli.ts#L28)
 
 Load configuration file (js/ts) from current dir or Git root.
 
 #### Returns
 
-[`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\<[`InbuiltMergeStrategies`](types/README.md#inbuiltmergestrategies), `unknown`\>\>\>
+[`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\<[`AllStrategies`](types/README.md#allstrategies), `unknown`\>\>\>
 
 ---
 
 ### parseArgs()
 
 > **parseArgs**(`argv`: `string`[]): \{ `gitMergeFiles?`: \[`string`, `string`, `string`\]; `init?`: `boolean`; `overrides`: [`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\>; `restore?`: `string`; \}
 
-Defined in: [cli.ts:68](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/cli.ts#L68)
+Defined in: [cli.ts:68](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/cli.ts#L68)
 
 CLI argument parser (minimal, no external deps).
 

docs/conflict-helper.md

@@ -12,7 +12,7 @@ nav_order: 4
 
 > **reconstructConflict**(`merged`: `any`, `ours`: `any`, `theirs`: `any`, `format`: `string`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`string`\>
 
-Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/conflict-helper.ts#L31)
+Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/conflict-helper.ts#L31)
 
 Build conflict markers into serialized string
 

docs/file-parser.md

@@ -10,7 +10,7 @@ nav_order: 6
 
 ### ParseConflictOptions
 
-Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L20)
+Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L20)
 
 Options for parsing conflicted content.
 
@@ -24,7 +24,7 @@ Options for parsing conflicted content.
 
 > `optional` **filename**: `string`
 
-Defined in: [file-parser.ts:29](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L29)
+Defined in: [file-parser.ts:29](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L29)
 
 Optional filename hint to prioritize parser choice.
 Example:
@@ -38,7 +38,7 @@ If extension is unknown, falls back to `parsers` or `"json"`.
 
 > `optional` **parsers**: [`SupportedParsers`](types/README.md#supportedparsers) \| `"auto"` \| [`SupportedParsers`](types/README.md#supportedparsers)[]
 
-Defined in: [types.ts:191](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/types.ts#L191)
+Defined in: [types.ts:231](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/types.ts#L231)
 
 Parsers to attempt, in order:
 
@@ -55,7 +55,7 @@ Defaults to `"json"`.
 
 ### ParsedConflict\<T\>
 
-Defined in: [file-parser.ts:8](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L8)
+Defined in: [file-parser.ts:8](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L8)
 
 Represents a parsed conflict from a file with `ours` and `theirs` versions.
 
@@ -73,23 +73,23 @@ The type of the parsed content.
 
 > **format**: `string`
 
-Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L14)
+Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L14)
 
 Format used to parse the content (`json`, `yaml`, `toml`, `xml`, or `custom`).
 
 ##### ours
 
 > **ours**: `T`
 
-Defined in: [file-parser.ts:10](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L10)
+Defined in: [file-parser.ts:10](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L10)
 
 Parsed content from the "ours" side of the conflict.
 
 ##### theirs
 
 > **theirs**: `T`
 
-Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L12)
+Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L12)
 
 Parsed content from the "theirs" side of the conflict.
 
@@ -99,7 +99,7 @@ Parsed content from the "theirs" side of the conflict.
 
 > **normalizeParsers**(`options`: [`ParseConflictOptions`](#parseconflictoptions)): [`SupportedParsers`](types/README.md#supportedparsers)[]
 
-Defined in: [file-parser.ts:120](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L120)
+Defined in: [file-parser.ts:120](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L120)
 
 Normalize parsers based on filename + options.
 
@@ -119,7 +119,7 @@ Normalize parsers based on filename + options.
 
 > **parseConflictContent**\<`T`\>(`content`: `string`, `options`: [`ParseConflictOptions`](#parseconflictoptions)): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`ParsedConflict`](#parsedconflict)\<`T`\>\>
 
-Defined in: [file-parser.ts:49](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L49)
+Defined in: [file-parser.ts:49](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L49)
 
 Parses a conflicted file's content into separate `ours` and `theirs` objects.
 
@@ -169,7 +169,7 @@ If parsing fails or conflict markers are invalid.
 
 > **parseFormat**(`parser`: `"json"` \| `"json5"` \| `"yaml"` \| `"toml"` \| `"xml"`, `raw`: `string`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`unknown`\>
 
-Defined in: [file-parser.ts:159](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L159)
+Defined in: [file-parser.ts:159](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L159)
 
 Internal parser dispatcher for supported formats.
 
@@ -193,7 +193,7 @@ Internal parser dispatcher for supported formats.
 
 > **runParser**(`raw`: `string`, `parsers`: [`SupportedParsers`](types/README.md#supportedparsers)[]): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<\[`unknown`, [`SupportedParsers`](types/README.md#supportedparsers)\]\>
 
-Defined in: [file-parser.ts:141](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-parser.ts#L141)
+Defined in: [file-parser.ts:141](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-parser.ts#L141)
 
 Internal helper to try parsers in order.
 

docs/file-serializer.md

@@ -12,7 +12,7 @@ nav_order: 8
 
 > **serialize**(`format`: `string`, `value`: `unknown`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`string`\>
 
-Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/f4a78307ca1912fa18ae0a9600625f9d3b3c8372/lib/src/file-serializer.ts#L1)
+Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/d66fea6d97a1504766ed9007635bb4e3c057eb5c/lib/src/file-serializer.ts#L1)
 
 #### Parameters