@tooee/config 0.11.0 → 0.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/load.d.ts +5 -0
- package/dist/load.d.ts.map +1 -1
- package/dist/load.js +44 -3
- package/dist/load.js.map +1 -1
- package/package.json +1 -1
- package/src/context.tsx +1 -0
- package/src/index.ts +2 -0
- package/src/load.ts +97 -3
package/dist/context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAW9C,eAAO,MAAM,cAAc,6BAGxB;IACD,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,QAAQ,EAAE,SAAS,CAAC;CACrB,KAAG,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAW9C,eAAO,MAAM,cAAc,6BAGxB;IACD,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,QAAQ,EAAE,SAAS,CAAC;CACrB,KAAG,SAIH,CAAC;AAEF,eAAO,MAAM,SAAS,QAAyB,WAE9C,CAAC;AAEF,eAAO,MAAM,cAAc,QAA8B,WAAW,CAAC,OAAO,CAE3E,CAAC;AAEF,eAAO,MAAM,eAAe,QAA+B,MAAM,CAAC,MAAM,EAAE,MAAM,CAE/E,CAAC"}
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,MAAM,QAAQ,GAAgB;IAC5B,KAAK,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,YAAY;KACnB;CACF,CAAC;AAEF,MAAM,aAAa,GAAG,aAAa,CAAc,QAAQ,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,cAAc,CAAC,EACpD,SAAS,EACT,QAAQ,GAIT;IACC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,MAAM,QAAQ,GAAgB;IAC5B,KAAK,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,YAAY;KACnB;CACF,CAAC;AAEF,MAAM,aAAa,GAAG,aAAa,CAAc,QAAQ,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,cAAc,CAAC,EACpD,SAAS,EACT,QAAQ,GAIT;IACC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEjE,OAAO,KAAC,aAAa,CAAC,QAAQ,IAAC,KAAK,EAAE,MAAM,YAAG,QAAQ,GAA0B,CAAC;AACpF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,SAAS;IACzC,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,cAAc;IACnD,OAAO,SAAS,EAAE,CAAC,KAAK,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,eAAe;IACrD,OAAO,SAAS,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC"}
|
package/dist/load.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import type { TooeeConfig } from "./types.js";
|
|
2
2
|
export declare const loadConfig: (overrides?: Partial<TooeeConfig>) => TooeeConfig;
|
|
3
|
+
/**
|
|
4
|
+
* Merge `partial` into the global config file. Each known section merges
|
|
5
|
+
* field by field. Keys that this version does not know, at the top level or
|
|
6
|
+
* inside a section, stay in the file unchanged.
|
|
7
|
+
*/
|
|
3
8
|
export declare const writeGlobalConfig: (partial: Partial<TooeeConfig>) => void;
|
|
4
9
|
//# sourceMappingURL=load.d.ts.map
|
package/dist/load.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA6M9C,eAAO,MAAM,UAAU,eAAmC,OAAO,CAAC,WAAW,CAAC,KAAG,WAUhF,CAAC;AA4CF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,YAAuC,OAAO,CAAC,WAAW,CAAC,KAAG,IA0B3F,CAAC"}
|
package/dist/load.js
CHANGED
|
@@ -146,14 +146,55 @@ export const loadConfig = function loadConfig(overrides) {
|
|
|
146
146
|
}
|
|
147
147
|
return config;
|
|
148
148
|
};
|
|
149
|
+
/**
|
|
150
|
+
* Read the global config document as raw JSON, so a write can keep keys that
|
|
151
|
+
* this version does not decode. Returns `undefined` when the file exists but
|
|
152
|
+
* is not a JSON object: a write must not replace a file the user can still fix.
|
|
153
|
+
*/
|
|
154
|
+
const readRawConfigObject = function readRawConfigObject(configPath) {
|
|
155
|
+
if (!existsSync(configPath)) {
|
|
156
|
+
return {};
|
|
157
|
+
}
|
|
158
|
+
try {
|
|
159
|
+
const json = parseJsonDocument(readFileSync(configPath, "utf-8"));
|
|
160
|
+
return isJsonObject(json) ? json : undefined;
|
|
161
|
+
}
|
|
162
|
+
catch {
|
|
163
|
+
return undefined;
|
|
164
|
+
}
|
|
165
|
+
};
|
|
166
|
+
const SECTION_NAMES = ["theme", "keys", "view"];
|
|
167
|
+
/** Merge a decoded section update over the raw section from the file. */
|
|
168
|
+
const mergeSection = function mergeSection(current, update) {
|
|
169
|
+
const merged = {};
|
|
170
|
+
if (isJsonObject(current)) {
|
|
171
|
+
Object.assign(merged, current);
|
|
172
|
+
}
|
|
173
|
+
Object.assign(merged, update);
|
|
174
|
+
return merged;
|
|
175
|
+
};
|
|
176
|
+
/**
|
|
177
|
+
* Merge `partial` into the global config file. Each known section merges
|
|
178
|
+
* field by field. Keys that this version does not know, at the top level or
|
|
179
|
+
* inside a section, stay in the file unchanged.
|
|
180
|
+
*/
|
|
149
181
|
export const writeGlobalConfig = function writeGlobalConfig(partial) {
|
|
150
182
|
const configPath = getGlobalConfigPath();
|
|
151
183
|
const dir = path.dirname(configPath);
|
|
152
184
|
try {
|
|
153
|
-
const existing =
|
|
154
|
-
|
|
185
|
+
const existing = readRawConfigObject(configPath);
|
|
186
|
+
if (existing === undefined) {
|
|
187
|
+
return;
|
|
188
|
+
}
|
|
189
|
+
const next = { ...existing };
|
|
190
|
+
for (const name of SECTION_NAMES) {
|
|
191
|
+
const update = partial[name];
|
|
192
|
+
if (update !== undefined) {
|
|
193
|
+
next[name] = mergeSection(existing[name], update);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
155
196
|
mkdirSync(dir, { recursive: true });
|
|
156
|
-
writeFileSync(configPath, `${JSON.stringify(
|
|
197
|
+
writeFileSync(configPath, `${JSON.stringify(next, null, 2)}\n`);
|
|
157
198
|
}
|
|
158
199
|
catch {
|
|
159
200
|
// ignore write errors
|
package/dist/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,QAAQ,GAAgB;IAC5B,KAAK,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,YAAY;KACnB;CACF,CAAC;AAcF,MAAM,iBAAiB,GAAG,SAAS,iBAAiB,CAAC,IAAY;IAC/D,kFAAkF;IAClF,iFAAiF;IACjF,oFAAoF;IACpF,wIAAwI;IACxI,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAc,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,KAA4B;IACrE,OAAO,KAAK,YAAY,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,KAA4B;IACrE,mFAAmF;IACnF,6DAA6D;IAC7D,sGAAsG;IACtG,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/context.tsx
CHANGED
|
@@ -21,6 +21,7 @@ export const ConfigProvider = function ConfigProvider({
|
|
|
21
21
|
children: ReactNode;
|
|
22
22
|
}): ReactNode {
|
|
23
23
|
const config = useMemo(() => loadConfig(overrides), [overrides]);
|
|
24
|
+
|
|
24
25
|
return <ConfigContext.Provider value={config}>{children}</ConfigContext.Provider>;
|
|
25
26
|
};
|
|
26
27
|
|
package/src/index.ts
CHANGED
package/src/load.ts
CHANGED
|
@@ -46,44 +46,55 @@ const isJsonString = function isJsonString(value: JsonValue | undefined): value
|
|
|
46
46
|
// ---------------------------------------------------------------------------
|
|
47
47
|
|
|
48
48
|
type ThemeSettings = NonNullable<TooeeConfig["theme"]>;
|
|
49
|
+
|
|
49
50
|
type ViewSettings = NonNullable<TooeeConfig["view"]>;
|
|
50
51
|
|
|
51
52
|
const decodeTheme = function decodeTheme(json: JsonObject): ThemeSettings {
|
|
52
53
|
const theme: ThemeSettings = {};
|
|
53
54
|
const { mode, name } = json;
|
|
55
|
+
|
|
54
56
|
if (isJsonString(name)) {
|
|
55
57
|
theme.name = name;
|
|
56
58
|
}
|
|
59
|
+
|
|
57
60
|
if (mode === "dark" || mode === "light") {
|
|
58
61
|
theme.mode = mode;
|
|
59
62
|
}
|
|
63
|
+
|
|
60
64
|
return theme;
|
|
61
65
|
};
|
|
62
66
|
|
|
63
67
|
/** Every value must be a string; one wrong value rejects the whole map. */
|
|
64
68
|
const decodeKeys = function decodeKeys(json: JsonObject): TooeeConfig["keys"] {
|
|
65
69
|
const entries: [string, string][] = [];
|
|
70
|
+
|
|
66
71
|
for (const [key, value] of Object.entries(json)) {
|
|
67
72
|
if (!isJsonString(value)) {
|
|
68
73
|
return undefined;
|
|
69
74
|
}
|
|
75
|
+
|
|
70
76
|
entries.push([key, value]);
|
|
71
77
|
}
|
|
78
|
+
|
|
72
79
|
return Object.fromEntries(entries);
|
|
73
80
|
};
|
|
74
81
|
|
|
75
82
|
const decodeView = function decodeView(json: JsonObject): ViewSettings {
|
|
76
83
|
const view: ViewSettings = {};
|
|
77
84
|
const { copyOnSelect, diffLayout, gutter, wrap } = json;
|
|
85
|
+
|
|
78
86
|
if (wrap === true || wrap === false) {
|
|
79
87
|
view.wrap = wrap;
|
|
80
88
|
}
|
|
89
|
+
|
|
81
90
|
if (gutter === true || gutter === false) {
|
|
82
91
|
view.gutter = gutter;
|
|
83
92
|
}
|
|
93
|
+
|
|
84
94
|
if (diffLayout === "split" || diffLayout === "stack") {
|
|
85
95
|
view.diffLayout = diffLayout;
|
|
86
96
|
}
|
|
97
|
+
|
|
87
98
|
if (
|
|
88
99
|
copyOnSelect === true ||
|
|
89
100
|
copyOnSelect === false ||
|
|
@@ -92,6 +103,7 @@ const decodeView = function decodeView(json: JsonObject): ViewSettings {
|
|
|
92
103
|
) {
|
|
93
104
|
view.copyOnSelect = copyOnSelect;
|
|
94
105
|
}
|
|
106
|
+
|
|
95
107
|
return view;
|
|
96
108
|
};
|
|
97
109
|
|
|
@@ -104,20 +116,26 @@ const decodeConfig = function decodeConfig(json: JsonValue): Partial<TooeeConfig
|
|
|
104
116
|
if (!isJsonObject(json)) {
|
|
105
117
|
return {};
|
|
106
118
|
}
|
|
119
|
+
|
|
107
120
|
const config: Partial<TooeeConfig> = {};
|
|
108
121
|
const { keys, theme, view } = json;
|
|
122
|
+
|
|
109
123
|
if (isJsonObject(theme)) {
|
|
110
124
|
config.theme = decodeTheme(theme);
|
|
111
125
|
}
|
|
126
|
+
|
|
112
127
|
if (isJsonObject(keys)) {
|
|
113
128
|
const decodedKeys = decodeKeys(keys);
|
|
129
|
+
|
|
114
130
|
if (decodedKeys !== undefined) {
|
|
115
131
|
config.keys = decodedKeys;
|
|
116
132
|
}
|
|
117
133
|
}
|
|
134
|
+
|
|
118
135
|
if (isJsonObject(view)) {
|
|
119
136
|
config.view = decodeView(view);
|
|
120
137
|
}
|
|
138
|
+
|
|
121
139
|
return config;
|
|
122
140
|
};
|
|
123
141
|
|
|
@@ -130,15 +148,19 @@ const mergeConfig = function mergeConfig(
|
|
|
130
148
|
source: Partial<TooeeConfig>
|
|
131
149
|
): TooeeConfig {
|
|
132
150
|
const merged: TooeeConfig = { ...target, ...source };
|
|
151
|
+
|
|
133
152
|
if (target.theme !== undefined || source.theme !== undefined) {
|
|
134
153
|
merged.theme = { ...target.theme, ...source.theme };
|
|
135
154
|
}
|
|
155
|
+
|
|
136
156
|
if (target.keys !== undefined || source.keys !== undefined) {
|
|
137
157
|
merged.keys = { ...target.keys, ...source.keys };
|
|
138
158
|
}
|
|
159
|
+
|
|
139
160
|
if (target.view !== undefined || source.view !== undefined) {
|
|
140
161
|
merged.view = { ...target.view, ...source.view };
|
|
141
162
|
}
|
|
163
|
+
|
|
142
164
|
return merged;
|
|
143
165
|
};
|
|
144
166
|
|
|
@@ -147,6 +169,7 @@ const readJsonFile = function readJsonFile(configPath: string): Partial<TooeeCon
|
|
|
147
169
|
if (!existsSync(configPath)) {
|
|
148
170
|
return {};
|
|
149
171
|
}
|
|
172
|
+
|
|
150
173
|
return decodeConfig(parseJsonDocument(readFileSync(configPath, "utf-8")));
|
|
151
174
|
} catch {
|
|
152
175
|
return {};
|
|
@@ -155,24 +178,31 @@ const readJsonFile = function readJsonFile(configPath: string): Partial<TooeeCon
|
|
|
155
178
|
|
|
156
179
|
const getGlobalConfigPath = function getGlobalConfigPath(): string {
|
|
157
180
|
const xdg = process.env.XDG_CONFIG_HOME ?? path.join(process.env.HOME ?? "", ".config");
|
|
181
|
+
|
|
158
182
|
return path.join(xdg, "tooee", "config.json");
|
|
159
183
|
};
|
|
160
184
|
|
|
161
185
|
const findProjectConfig = function findProjectConfig(): Partial<TooeeConfig> {
|
|
162
186
|
let dir = process.cwd();
|
|
163
187
|
const seen = new Set<string>();
|
|
188
|
+
|
|
164
189
|
while (dir && !seen.has(dir)) {
|
|
165
190
|
seen.add(dir);
|
|
166
191
|
const configPath = path.join(dir, ".tooee", "config.json");
|
|
192
|
+
|
|
167
193
|
if (existsSync(configPath)) {
|
|
168
194
|
return readJsonFile(configPath);
|
|
169
195
|
}
|
|
196
|
+
|
|
170
197
|
const parent = path.dirname(dir);
|
|
198
|
+
|
|
171
199
|
if (parent === dir) {
|
|
172
200
|
break;
|
|
173
201
|
}
|
|
202
|
+
|
|
174
203
|
dir = parent;
|
|
175
204
|
}
|
|
205
|
+
|
|
176
206
|
return {};
|
|
177
207
|
};
|
|
178
208
|
|
|
@@ -180,20 +210,84 @@ export const loadConfig = function loadConfig(overrides?: Partial<TooeeConfig>):
|
|
|
180
210
|
let config: TooeeConfig = { ...DEFAULTS };
|
|
181
211
|
config = mergeConfig(config, readJsonFile(getGlobalConfigPath()));
|
|
182
212
|
config = mergeConfig(config, findProjectConfig());
|
|
213
|
+
|
|
183
214
|
if (overrides) {
|
|
184
215
|
config = mergeConfig(config, overrides);
|
|
185
216
|
}
|
|
217
|
+
|
|
186
218
|
return config;
|
|
187
219
|
};
|
|
188
220
|
|
|
221
|
+
/**
|
|
222
|
+
* Read the global config document as raw JSON, so a write can keep keys that
|
|
223
|
+
* this version does not decode. Returns `undefined` when the file exists but
|
|
224
|
+
* is not a JSON object: a write must not replace a file the user can still fix.
|
|
225
|
+
*/
|
|
226
|
+
const readRawConfigObject = function readRawConfigObject(
|
|
227
|
+
configPath: string
|
|
228
|
+
): JsonObject | undefined {
|
|
229
|
+
if (!existsSync(configPath)) {
|
|
230
|
+
return {};
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
try {
|
|
234
|
+
const json = parseJsonDocument(readFileSync(configPath, "utf-8"));
|
|
235
|
+
|
|
236
|
+
return isJsonObject(json) ? json : undefined;
|
|
237
|
+
} catch {
|
|
238
|
+
return undefined;
|
|
239
|
+
}
|
|
240
|
+
};
|
|
241
|
+
|
|
242
|
+
const SECTION_NAMES = ["theme", "keys", "view"] as const;
|
|
243
|
+
|
|
244
|
+
/** A JSON object that a write can still change. */
|
|
245
|
+
type MutableJsonObject = Record<string, JsonValue | undefined>;
|
|
246
|
+
|
|
247
|
+
/** Merge a decoded section update over the raw section from the file. */
|
|
248
|
+
const mergeSection = function mergeSection(
|
|
249
|
+
current: JsonValue | undefined,
|
|
250
|
+
update: Readonly<MutableJsonObject>
|
|
251
|
+
): JsonObject {
|
|
252
|
+
const merged: MutableJsonObject = {};
|
|
253
|
+
|
|
254
|
+
if (isJsonObject(current)) {
|
|
255
|
+
Object.assign(merged, current);
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
Object.assign(merged, update);
|
|
259
|
+
|
|
260
|
+
return merged;
|
|
261
|
+
};
|
|
262
|
+
|
|
263
|
+
/**
|
|
264
|
+
* Merge `partial` into the global config file. Each known section merges
|
|
265
|
+
* field by field. Keys that this version does not know, at the top level or
|
|
266
|
+
* inside a section, stay in the file unchanged.
|
|
267
|
+
*/
|
|
189
268
|
export const writeGlobalConfig = function writeGlobalConfig(partial: Partial<TooeeConfig>): void {
|
|
190
269
|
const configPath = getGlobalConfigPath();
|
|
191
270
|
const dir = path.dirname(configPath);
|
|
271
|
+
|
|
192
272
|
try {
|
|
193
|
-
const existing =
|
|
194
|
-
|
|
273
|
+
const existing = readRawConfigObject(configPath);
|
|
274
|
+
|
|
275
|
+
if (existing === undefined) {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
const next = { ...existing } satisfies MutableJsonObject;
|
|
280
|
+
|
|
281
|
+
for (const name of SECTION_NAMES) {
|
|
282
|
+
const update = partial[name];
|
|
283
|
+
|
|
284
|
+
if (update !== undefined) {
|
|
285
|
+
next[name] = mergeSection(existing[name], update);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
|
|
195
289
|
mkdirSync(dir, { recursive: true });
|
|
196
|
-
writeFileSync(configPath, `${JSON.stringify(
|
|
290
|
+
writeFileSync(configPath, `${JSON.stringify(next, null, 2)}\n`);
|
|
197
291
|
} catch {
|
|
198
292
|
// ignore write errors
|
|
199
293
|
}
|