upgrade deps && docs [skip ci]

Author: mayank1513

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/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/cli.ts#L17)
+Defined in: [cli.ts:17](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/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/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/cli.ts#L47)
+Defined in: [cli.ts:47](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/cli.ts#L47)
 
 Write a starter config file
 
@@ -46,7 +46,7 @@ Write a starter config file
 
 > **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/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/cli.ts#L28)
+Defined in: [cli.ts:28](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/cli.ts#L28)
 
 Load configuration file (js/ts) from current dir or Git root.
 
@@ -60,7 +60,7 @@ Load configuration file (js/ts) from current dir or Git root.
 
 > **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/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/cli.ts#L68)
+Defined in: [cli.ts:68](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/cli.ts#L68)
 
 CLI argument parser (minimal, no external deps).
 

docs/conflict-helper.md

@@ -12,7 +12,7 @@ nav_order: 3
 
 > **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/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/conflict-helper.ts#L31)
+Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/conflict-helper.ts#L31)
 
 Build conflict markers into serialized string
 

docs/file-parser.md

@@ -10,7 +10,7 @@ nav_order: 4
 
 ### ParseConflictOptions
 
-Defined in: [file-parser.ts:26](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L26)
+Defined in: [file-parser.ts:26](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L26)
 
 Options for parsing conflicted content.
 
@@ -24,7 +24,7 @@ Options for parsing conflicted content.
 
 > **filename**: `string`
 
-Defined in: [file-parser.ts:35](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L35)
+Defined in: [file-parser.ts:35](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L35)
 
 filename hint to prioritize parser choice as well as get base and ours from git.
 Example:
@@ -38,7 +38,7 @@ If extension is unknown, falls back to `parsers` or `"json"`.
 
 > `optional` **parsers**: `"auto"` \| [`SupportedParsers`](types/README.md#supportedparsers) \| [`SupportedParsers`](types/README.md#supportedparsers)[]
 
-Defined in: [types.ts:245](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/types.ts#L245)
+Defined in: [types.ts:245](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/types.ts#L245)
 
 Parsers to attempt, in order:
 
@@ -55,7 +55,7 @@ Defaults to `"json"`.
 
 ### ParsedConflict\<T\>
 
-Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L12)
+Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L12)
 
 Represents a parsed conflict from a file with `ours` and `theirs` versions.
 
@@ -73,31 +73,31 @@ The type of the parsed content.
 
 > `optional` **base**: `T`
 
-Defined in: [file-parser.ts:18](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L18)
+Defined in: [file-parser.ts:18](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L18)
 
 Parsed content from the "base" side of the conflict (optional).
 
 ##### format
 
 > **format**: `string`
 
-Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L20)
+Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L20)
 
 Format used to parse the content (`json`, `yaml`, `toml`, `xml`, or `custom`).
 
 ##### ours
 
 > **ours**: `T`
 
-Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L14)
+Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L14)
 
 Parsed content from the "ours" side of the conflict.
 
 ##### theirs
 
 > **theirs**: `T`
 
-Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L16)
+Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L16)
 
 Parsed content from the "theirs" side of the conflict.
 
@@ -107,7 +107,7 @@ Parsed content from the "theirs" side of the conflict.
 
 > **normalizeParsers**(`options`: [`ParseConflictOptions`](#parseconflictoptions)): [`SupportedParsers`](types/README.md#supportedparsers)[]
 
-Defined in: [file-parser.ts:144](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L144)
+Defined in: [file-parser.ts:144](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L144)
 
 Normalize parsers based on filename + options.
 
@@ -127,7 +127,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:55](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L55)
+Defined in: [file-parser.ts:55](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L55)
 
 Parses a conflicted file's content into separate `ours` and `theirs` objects.
 
@@ -177,7 +177,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:183](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L183)
+Defined in: [file-parser.ts:183](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L183)
 
 Internal parser dispatcher for supported formats.
 
@@ -201,7 +201,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:165](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-parser.ts#L165)
+Defined in: [file-parser.ts:165](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-parser.ts#L165)
 
 Internal helper to try parsers in order.
 

docs/file-serializer.md

@@ -12,7 +12,7 @@ nav_order: 5
 
 > **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/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/file-serializer.ts#L1)
+Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/file-serializer.ts#L1)
 
 #### Parameters
 

docs/index.md

@@ -6,6 +6,8 @@ nav_order: 1
 
 # Git Json Resolver <img src="https://raw.githubusercontent.com/mayank1513/mayank1513/main/popper.png" style="height: 40px"/>
 
+![Git JSON Resolver Banner](./banner.jpg)
+
 [![test](https://github.com/react18-tools/git-json-resolver/actions/workflows/test.yml/badge.svg)](https://github.com/react18-tools/git-json-resolver/actions/workflows/test.yml)
 [![Maintainability](https://qlty.sh/gh/react18-tools/projects/git-json-resolver/maintainability.svg)](https://qlty.sh/gh/react18-tools/projects/git-json-resolver)
 [![codecov](https://codecov.io/gh/react18-tools/git-json-resolver/graph/badge.svg)](https://codecov.io/gh/react18-tools/git-json-resolver)
@@ -355,7 +357,7 @@ export const strategies = {
   "timestamp-latest": timestampLatest,
 };
 
-// Plugin interface for dynamic loading
+// Plugin interface for dynamic loading (object-based)
 const plugin: StrategyPlugin = {
   strategies,
   init: async config => {
@@ -364,6 +366,19 @@ const plugin: StrategyPlugin = {
 };
 
 export default plugin;
+
+// Alternative: Function-based plugin (NEW)
+export default async function createPlugin(config?: any): Promise<StrategyPlugin> {
+  // Initialize with config if needed
+  console.log("Plugin initialized with:", config);
+
+  return {
+    strategies,
+    init: async initConfig => {
+      // Additional initialization if needed
+    },
+  };
+}
 ```
 
 ### Custom Strategies (Inline)

docs/logger.md

@@ -12,7 +12,7 @@ nav_order: 6
 
 > **createLogger**(`config`: [`LoggerConfig`](types/README.md#loggerconfig-1), `debug?`: `boolean`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<\{ `debug`: (`fileId`: `string`, `msg`: `string`) => `void`; `error`: (`fileId`: `string`, `msg`: `string`) => `void`; `flush`: () => [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`void`\>; `info`: (`fileId`: `string`, `msg`: `string`) => `void`; `warn`: (`fileId`: `string`, `msg`: `string`) => `void`; \}\>
 
-Defined in: [logger.ts:12](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/logger.ts#L12)
+Defined in: [logger.ts:12](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/logger.ts#L12)
 
 #### Parameters
 

docs/matcher.md

@@ -10,7 +10,7 @@ nav_order: 7
 
 ### Matcher
 
-Defined in: [matcher.ts:17](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/matcher.ts#L17)
+Defined in: [matcher.ts:17](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/matcher.ts#L17)
 
 Matcher abstraction + adapters for micromatch/picomatch (optional).
 
@@ -29,7 +29,7 @@ Micromatch/Picomatch can be loaded at runtime as optional peers.
 
 > **isMatch**: (`str`: `string`, `patterns`: `string`[]) => `boolean`
 
-Defined in: [matcher.ts:21](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/matcher.ts#L21)
+Defined in: [matcher.ts:21](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/matcher.ts#L21)
 
 Returns true if `str` matches at least one of the provided glob `patterns`.
 
@@ -53,7 +53,7 @@ Returns true if `str` matches at least one of the provided glob `patterns`.
 
 > `const` **basicMatcher**: [`Matcher`](#matcher)
 
-Defined in: [matcher.ts:32](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/matcher.ts#L32)
+Defined in: [matcher.ts:32](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/matcher.ts#L32)
 
 Minimal homegrown matcher (default).
 Supports:
@@ -69,7 +69,7 @@ Supports:
 
 > `const` **ESCAPED_DOT**: "\u0000" = `"\u0000"`
 
-Defined in: [matcher.ts:2](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/matcher.ts#L2)
+Defined in: [matcher.ts:2](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/matcher.ts#L2)
 
 Escape sequence for literal dots in field names
 
@@ -79,7 +79,7 @@ Escape sequence for literal dots in field names
 
 > `const` **ESCAPED_SLASH**: "\u0001" = `"\u0001"`
 
-Defined in: [matcher.ts:4](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/matcher.ts#L4)
+Defined in: [matcher.ts:4](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/matcher.ts#L4)
 
 Escape sequence for literal slashes in field names
 
@@ -89,7 +89,7 @@ Escape sequence for literal slashes in field names
 
 > **loadMatcher**(`name`: `"micromatch"` \| `"picomatch"`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Matcher`](#matcher)\>
 
-Defined in: [matcher.ts:45](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/matcher.ts#L45)
+Defined in: [matcher.ts:45](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/matcher.ts#L45)
 
 Attempts to load a named matcher adapter.
 

docs/merge-processor.md

@@ -12,7 +12,7 @@ nav_order: 8
 
 > **processMerge**\<`T`\>(`__namedParameters`: \{ `autoStage?`: `boolean`; `base?`: `unknown`; `config`: [`Config`](types/README.md#config)\<`T`\>; `filePath`: `string`; `format`: `string`; `logger`: \{ `debug`: (`fileId`: `string`, `msg`: `string`) => `void`; `error`: (`fileId`: `string`, `msg`: `string`) => `void`; `flush`: () => [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`void`\>; `info`: (`fileId`: `string`, `msg`: `string`) => `void`; `warn`: (`fileId`: `string`, `msg`: `string`) => `void`; \}; `normalizedConfig`: [`NormalizedConfig`](normalizer.md#normalizedconfig); `ours`: `unknown`; `theirs`: `unknown`; \}): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<\{ `conflicts`: [`Conflict`](merger/README.md#conflict)[]; `success`: `boolean`; \}\>
 
-Defined in: [merge-processor.ts:17](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/merge-processor.ts#L17)
+Defined in: [merge-processor.ts:17](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/merge-processor.ts#L17)
 
 Common merge logic for processing a single file with ours/theirs/base data
 
@@ -92,7 +92,7 @@ Common merge logic for processing a single file with ours/theirs/base data
 
 > **resolveGitMergeFiles**\<`T`\>(`oursPath`: `string`, `basePath`: `string`, `theirsPath`: `string`, `config`: [`Config`](types/README.md#config)\<`T`\>): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`never`\>
 
-Defined in: [merge-processor.ts:92](https://github.com/react18-tools/git-json-resolver/blob/d61d9369fb47648a20fc0be0040b2aaa41b03a8c/lib/src/merge-processor.ts#L92)
+Defined in: [merge-processor.ts:92](https://github.com/react18-tools/git-json-resolver/blob/9b3eafde93c5cdd7078466539ccff7dff2a4fc0c/lib/src/merge-processor.ts#L92)
 
 Resolves Git merge conflicts for a single file using the three-way merge approach.
 This function is designed to work as a Git merge driver.