Skip to content

Commit 63487fb

Browse files
committed
upgrade deps && docs [skip ci]
1 parent bb35490 commit 63487fb

31 files changed

+159
-255
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,10 @@ export default plugin;
363363
export default async function createPlugin(config?: any): Promise<StrategyPlugin> {
364364
// Initialize with config if needed
365365
console.log("Plugin initialized with:", config);
366-
366+
367367
return {
368368
strategies,
369-
init: async (initConfig) => {
369+
init: async initConfig => {
370370
// Additional initialization if needed
371371
},
372372
};

docs/cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ nav_order: 2
1212

1313
> **findGitRoot**(): `string`
1414
15-
Defined in: [cli.ts:17](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/cli.ts#L17)
15+
Defined in: [cli.ts:17](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/cli.ts#L17)
1616

1717
Find Git root directory
1818

@@ -26,7 +26,7 @@ Find Git root directory
2626

2727
> **initConfig**(`targetDir`: `string`): `void`
2828
29-
Defined in: [cli.ts:47](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/cli.ts#L47)
29+
Defined in: [cli.ts:47](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/cli.ts#L47)
3030

3131
Write a starter config file
3232

@@ -46,7 +46,7 @@ Write a starter config file
4646

4747
> **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`\>\>\>
4848
49-
Defined in: [cli.ts:28](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/cli.ts#L28)
49+
Defined in: [cli.ts:28](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/cli.ts#L28)
5050

5151
Load configuration file (js/ts) from current dir or Git root.
5252

@@ -60,7 +60,7 @@ Load configuration file (js/ts) from current dir or Git root.
6060

6161
> **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`; \}
6262
63-
Defined in: [cli.ts:68](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/cli.ts#L68)
63+
Defined in: [cli.ts:68](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/cli.ts#L68)
6464

6565
CLI argument parser (minimal, no external deps).
6666

docs/cli.test.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/conflict-helper.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
title: Conflict Helper
4-
nav_order: 4
4+
nav_order: 3
55
---
66

77
# conflict-helper
@@ -12,7 +12,7 @@ nav_order: 4
1212

1313
> **reconstructConflict**(`merged`: `any`, `ours`: `any`, `theirs`: `any`, `format`: `string`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`string`\>
1414
15-
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/conflict-helper.ts#L31)
15+
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/conflict-helper.ts#L31)
1616

1717
Build conflict markers into serialized string
1818

docs/conflict-helper.test.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/file-parser.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
title: File Parser
4-
nav_order: 6
4+
nav_order: 4
55
---
66

77
# file-parser
@@ -10,7 +10,7 @@ nav_order: 6
1010

1111
### ParseConflictOptions
1212

13-
Defined in: [file-parser.ts:26](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L26)
13+
Defined in: [file-parser.ts:26](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L26)
1414

1515
Options for parsing conflicted content.
1616

@@ -24,7 +24,7 @@ Options for parsing conflicted content.
2424

2525
> **filename**: `string`
2626
27-
Defined in: [file-parser.ts:35](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L35)
27+
Defined in: [file-parser.ts:35](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L35)
2828

2929
filename hint to prioritize parser choice as well as get base and ours from git.
3030
Example:
@@ -38,7 +38,7 @@ If extension is unknown, falls back to `parsers` or `"json"`.
3838

3939
> `optional` **parsers**: `"auto"` \| [`SupportedParsers`](types/README.md#supportedparsers) \| [`SupportedParsers`](types/README.md#supportedparsers)[]
4040
41-
Defined in: [types.ts:245](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/types.ts#L245)
41+
Defined in: [types.ts:245](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/types.ts#L245)
4242

4343
Parsers to attempt, in order:
4444

@@ -55,7 +55,7 @@ Defaults to `"json"`.
5555

5656
### ParsedConflict\<T\>
5757

58-
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L12)
58+
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L12)
5959

6060
Represents a parsed conflict from a file with `ours` and `theirs` versions.
6161

@@ -73,31 +73,31 @@ The type of the parsed content.
7373

7474
> `optional` **base**: `T`
7575
76-
Defined in: [file-parser.ts:18](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L18)
76+
Defined in: [file-parser.ts:18](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L18)
7777

7878
Parsed content from the "base" side of the conflict (optional).
7979

8080
##### format
8181

8282
> **format**: `string`
8383
84-
Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L20)
84+
Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L20)
8585

8686
Format used to parse the content (`json`, `yaml`, `toml`, `xml`, or `custom`).
8787

8888
##### ours
8989

9090
> **ours**: `T`
9191
92-
Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L14)
92+
Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L14)
9393

9494
Parsed content from the "ours" side of the conflict.
9595

9696
##### theirs
9797

9898
> **theirs**: `T`
9999
100-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L16)
100+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L16)
101101

102102
Parsed content from the "theirs" side of the conflict.
103103

@@ -107,7 +107,7 @@ Parsed content from the "theirs" side of the conflict.
107107

108108
> **normalizeParsers**(`options`: [`ParseConflictOptions`](#parseconflictoptions)): [`SupportedParsers`](types/README.md#supportedparsers)[]
109109
110-
Defined in: [file-parser.ts:144](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L144)
110+
Defined in: [file-parser.ts:144](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L144)
111111

112112
Normalize parsers based on filename + options.
113113

@@ -127,7 +127,7 @@ Normalize parsers based on filename + options.
127127

128128
> **parseConflictContent**\<`T`\>(`content`: `string`, `options`: [`ParseConflictOptions`](#parseconflictoptions)): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`ParsedConflict`](#parsedconflict)\<`T`\>\>
129129
130-
Defined in: [file-parser.ts:55](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L55)
130+
Defined in: [file-parser.ts:55](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L55)
131131

132132
Parses a conflicted file's content into separate `ours` and `theirs` objects.
133133

@@ -177,7 +177,7 @@ If parsing fails or conflict markers are invalid.
177177

178178
> **parseFormat**(`parser`: `"json"` \| `"json5"` \| `"yaml"` \| `"toml"` \| `"xml"`, `raw`: `string`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`unknown`\>
179179
180-
Defined in: [file-parser.ts:183](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L183)
180+
Defined in: [file-parser.ts:183](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L183)
181181

182182
Internal parser dispatcher for supported formats.
183183

@@ -201,7 +201,7 @@ Internal parser dispatcher for supported formats.
201201

202202
> **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)\]\>
203203
204-
Defined in: [file-parser.ts:165](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L165)
204+
Defined in: [file-parser.ts:165](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-parser.ts#L165)
205205

206206
Internal helper to try parsers in order.
207207

docs/file-parser.test.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/file-serializer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
title: File Serializer
4-
nav_order: 8
4+
nav_order: 5
55
---
66

77
# file-serializer
@@ -12,7 +12,7 @@ nav_order: 8
1212

1313
> **serialize**(`format`: `string`, `value`: `unknown`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`string`\>
1414
15-
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-serializer.ts#L1)
15+
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/bb35490ece54a122e412f67ef51d4b2dbeac2ebb/lib/src/file-serializer.ts#L1)
1616

1717
#### Parameters
1818

docs/file-serializer.test.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/index.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -419,27 +419,15 @@ This library is licensed under the MPL-2.0 open-source license.
419419
## Modules
420420

421421
- [cli](cli.md)
422-
- [cli.test](cli.test.md)
423422
- [conflict-helper](conflict-helper.md)
424-
- [conflict-helper.test](conflict-helper.test.md)
425423
- [file-parser](file-parser.md)
426-
- [file-parser.test](file-parser.test.md)
427424
- [file-serializer](file-serializer.md)
428-
- [file-serializer.test](file-serializer.test.md)
429425
- [index](index.md)
430-
- [index.test](index.test.md)
431426
- [logger](logger.md)
432-
- [logger.test](logger.test.md)
433427
- [matcher](matcher.md)
434-
- [matcher.test](matcher.test.md)
435428
- [merge-processor](merge-processor.md)
436-
- [merge-processor.test](merge-processor.test.md)
437429
- [merger](merger/README.md)
438-
- [merger.test](merger.test.md)
439430
- [normalizer](normalizer.md)
440-
- [normalizer.test](normalizer.test.md)
441431
- [strategy-resolver](strategy-resolver.md)
442-
- [strategy-resolver.test](strategy-resolver.test.md)
443432
- [types](types/README.md)
444433
- [utils](utils.md)
445-
- [utils.test](utils.test.md)

0 commit comments

Comments
 (0)