Skip to content

Commit 6def71f

Browse files
committed
docs(changeset): Wire loggerConfig and isolate logger per instance.
1 parent 45d00f4 commit 6def71f

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.changeset/public-icons-poke.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"git-json-resolver": patch
3+
---
4+
5+
Wire loggerConfig and isolate logger per instance.

lib/src/index.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@ import { Config, InbuiltMergeStrategies } from "./types";
77
import { backupFile, listMatchingFiles } from "./utils";
88
import fs from "node:fs/promises";
99
import { reconstructConflict } from "./conflict-helper";
10-
import { globalLogger } from "./logger";
10+
import { createLogger } from "./logger";
1111

1212
export * from "./types";
1313

1414
const _strategyCache = new Map<string, string[]>();
1515

16+
let globalLogger: ReturnType<typeof createLogger>;
17+
1618
export const resolveConflicts = async <T extends string = InbuiltMergeStrategies>(
1719
config: Config<T>,
1820
) => {
19-
const normalizedConfig: NormalizedConfig = await normalizeConfig<T>(config);
21+
globalLogger = createLogger(config.loggerConfig);
22+
const normalizedConfig: NormalizedConfig = await normalizeConfig<T>(config, globalLogger);
2023
const filesEntries = await listMatchingFiles(normalizedConfig);
2124
if (normalizedConfig.debug) {
2225
globalLogger.info("all", JSON.stringify({ normalizedConfig, filesEntries }, null, 2));

lib/src/logger.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,3 @@ export const createLogger = (config: LoggerConfig = {}) => {
7474
flush,
7575
};
7676
};
77-
78-
export const globalLogger = createLogger();

lib/src/normalizer.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* and classifies rules into exact / top-level / glob categories.
55
*/
66

7-
import { globalLogger } from "./logger";
7+
import { createLogger } from "./logger";
88
import { Matcher, basicMatcher, loadMatcher } from "./matcher";
99
import { InbuiltMergeStrategies, Config, RuleTree } from "./types";
1010

@@ -48,6 +48,7 @@ export const DEFAULT_CONFIG = {
4848
*/
4949
export const normalizeConfig = async <T extends string = InbuiltMergeStrategies>(
5050
config: Config<T>,
51+
globalLogger = createLogger(),
5152
): Promise<NormalizedConfig> => {
5253
const { rules, byStrategy, defaultStrategy, matcher, ...userConfig } = {
5354
...DEFAULT_CONFIG,

0 commit comments

Comments
 (0)