@tooee/config 0.7.3 → 0.9.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/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export type { TooeeConfig, Mode } from "./types.js";
1
+ export type { ColorMode, TooeeConfig } from "./types.js";
2
2
  export { loadConfig, writeGlobalConfig } from "./load.js";
3
3
  export { ConfigProvider, useConfig, useThemeConfig, useKeymapConfig } from "./context.js";
4
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,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;AACzD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA2H9C,eAAO,MAAM,UAAU,eAAmC,OAAO,CAAC,WAAW,CAAC,KAAG,WAQhF,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAuC,OAAO,CAAC,WAAW,CAAC,KAAG,IAW3F,CAAC"}
1
+ {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA+K9C,eAAO,MAAM,UAAU,eAAmC,OAAO,CAAC,WAAW,CAAC,KAAG,WAQhF,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAuC,OAAO,CAAC,WAAW,CAAC,KAAG,IAW3F,CAAC"}
package/dist/load.js CHANGED
@@ -6,76 +6,111 @@ const DEFAULTS = {
6
6
  name: "tokyonight",
7
7
  },
8
8
  };
9
- const isRecord = function isRecord(value) {
10
- return typeof value === "object" && value !== null && !Array.isArray(value);
9
+ const parseJsonDocument = function parseJsonDocument(text) {
10
+ // SAFETY: `JSON.parse` without a reviver produces only the JSON grammar: strings,
11
+ // finite numbers, booleans, null, arrays, and plain objects. `JsonValue` is that
12
+ // grammar, so the assertion restates the parser's own contract and narrows nothing.
13
+ // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- JSON.parse is typed `any`; the SAFETY note above states the invariant
14
+ return JSON.parse(text);
11
15
  };
12
- const readStringRecord = function readStringRecord(value) {
13
- if (!isRecord(value) || Object.values(value).some((entry) => typeof entry !== "string")) {
14
- return undefined;
16
+ const isJsonObject = function isJsonObject(value) {
17
+ return value instanceof Object && !Array.isArray(value);
18
+ };
19
+ const isJsonString = function isJsonString(value) {
20
+ // The config decoder is the one place that inspects a JSON value's representation;
21
+ // every caller branches on the decoded domain value instead.
22
+ // oxlint-disable-next-line anti-slop/no-runtime-typeof -- primitive check inside the boundary decoder
23
+ return typeof value === "string";
24
+ };
25
+ const decodeTheme = function decodeTheme(json) {
26
+ const theme = {};
27
+ const { mode, name } = json;
28
+ if (isJsonString(name)) {
29
+ theme.name = name;
30
+ }
31
+ if (mode === "dark" || mode === "light") {
32
+ theme.mode = mode;
33
+ }
34
+ return theme;
35
+ };
36
+ /** Every value must be a string; one wrong value rejects the whole map. */
37
+ const decodeKeys = function decodeKeys(json) {
38
+ const entries = [];
39
+ for (const [key, value] of Object.entries(json)) {
40
+ if (!isJsonString(value)) {
41
+ return undefined;
42
+ }
43
+ entries.push([key, value]);
44
+ }
45
+ return Object.fromEntries(entries);
46
+ };
47
+ const decodeView = function decodeView(json) {
48
+ const view = {};
49
+ const { copyOnSelect, diffLayout, gutter, wrap } = json;
50
+ if (wrap === true || wrap === false) {
51
+ view.wrap = wrap;
52
+ }
53
+ if (gutter === true || gutter === false) {
54
+ view.gutter = gutter;
55
+ }
56
+ if (diffLayout === "split" || diffLayout === "stack") {
57
+ view.diffLayout = diffLayout;
58
+ }
59
+ if (copyOnSelect === true ||
60
+ copyOnSelect === false ||
61
+ copyOnSelect === "primary" ||
62
+ copyOnSelect === "clipboard") {
63
+ view.copyOnSelect = copyOnSelect;
15
64
  }
16
- return Object.fromEntries(Object.entries(value).filter((entry) => typeof entry[1] === "string"));
65
+ return view;
17
66
  };
18
- const validateConfig = function validateConfig(value) {
19
- if (!isRecord(value)) {
67
+ /**
68
+ * Decode one config document. A section that is present as an object is kept
69
+ * even when none of its fields decode, so `{ "view": {} }` yields `view: {}`;
70
+ * a section with the wrong representation is dropped as if it were absent.
71
+ */
72
+ const decodeConfig = function decodeConfig(json) {
73
+ if (!isJsonObject(json)) {
20
74
  return {};
21
75
  }
22
76
  const config = {};
23
- if (isRecord(value.theme)) {
24
- const theme = {};
25
- if (typeof value.theme.name === "string") {
26
- theme.name = value.theme.name;
27
- }
28
- if (value.theme.mode === "dark" || value.theme.mode === "light") {
29
- theme.mode = value.theme.mode;
30
- }
31
- config.theme = theme;
32
- }
33
- const keys = readStringRecord(value.keys);
34
- if (keys !== undefined) {
35
- config.keys = keys;
77
+ const { keys, theme, view } = json;
78
+ if (isJsonObject(theme)) {
79
+ config.theme = decodeTheme(theme);
36
80
  }
37
- if (isRecord(value.view)) {
38
- const view = {};
39
- if (typeof value.view.wrap === "boolean") {
40
- view.wrap = value.view.wrap;
41
- }
42
- if (typeof value.view.gutter === "boolean") {
43
- view.gutter = value.view.gutter;
44
- }
45
- if (value.view.diffLayout === "split" || value.view.diffLayout === "stack") {
46
- view.diffLayout = value.view.diffLayout;
81
+ if (isJsonObject(keys)) {
82
+ const decodedKeys = decodeKeys(keys);
83
+ if (decodedKeys !== undefined) {
84
+ config.keys = decodedKeys;
47
85
  }
48
- if (typeof value.view.copyOnSelect === "boolean" ||
49
- value.view.copyOnSelect === "primary" ||
50
- value.view.copyOnSelect === "clipboard") {
51
- view.copyOnSelect = value.view.copyOnSelect;
52
- }
53
- config.view = view;
86
+ }
87
+ if (isJsonObject(view)) {
88
+ config.view = decodeView(view);
54
89
  }
55
90
  return config;
56
91
  };
92
+ // ---------------------------------------------------------------------------
93
+ // Layering
94
+ // ---------------------------------------------------------------------------
57
95
  const mergeConfig = function mergeConfig(target, source) {
58
- return {
59
- ...target,
60
- ...source,
61
- ...(target.theme === undefined && source.theme === undefined
62
- ? {}
63
- : { theme: { ...target.theme, ...source.theme } }),
64
- ...(target.keys === undefined && source.keys === undefined
65
- ? {}
66
- : { keys: { ...target.keys, ...source.keys } }),
67
- ...(target.view === undefined && source.view === undefined
68
- ? {}
69
- : { view: { ...target.view, ...source.view } }),
70
- };
96
+ const merged = { ...target, ...source };
97
+ if (target.theme !== undefined || source.theme !== undefined) {
98
+ merged.theme = { ...target.theme, ...source.theme };
99
+ }
100
+ if (target.keys !== undefined || source.keys !== undefined) {
101
+ merged.keys = { ...target.keys, ...source.keys };
102
+ }
103
+ if (target.view !== undefined || source.view !== undefined) {
104
+ merged.view = { ...target.view, ...source.view };
105
+ }
106
+ return merged;
71
107
  };
72
108
  const readJsonFile = function readJsonFile(configPath) {
73
109
  try {
74
110
  if (!existsSync(configPath)) {
75
111
  return {};
76
112
  }
77
- const parsed = JSON.parse(readFileSync(configPath, "utf-8"));
78
- return validateConfig(parsed);
113
+ return decodeConfig(parseJsonDocument(readFileSync(configPath, "utf-8")));
79
114
  }
80
115
  catch {
81
116
  return {};
package/dist/load.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"load.js","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"load.js","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import type { ColorMode, Mode } from "./index.js";
2
+ export type ConfigPublicContractChecks = [ColorMode, Mode];
3
+ //# sourceMappingURL=public-contract.typecheck.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"public-contract.typecheck.d.ts","sourceRoot":"","sources":["../src/public-contract.typecheck.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,MAAM,0BAA0B,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=public-contract.typecheck.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"public-contract.typecheck.js","sourceRoot":"","sources":["../src/public-contract.typecheck.ts"],"names":[],"mappings":""}
package/dist/types.d.ts CHANGED
@@ -1,8 +1,8 @@
1
- export type Mode = "dark" | "light";
1
+ export type ColorMode = "dark" | "light";
2
2
  export interface TooeeConfig {
3
3
  theme?: {
4
4
  name?: string;
5
- mode?: Mode;
5
+ mode?: ColorMode;
6
6
  };
7
7
  keys?: Record<string, string>;
8
8
  view?: {
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpC,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,IAAI,CAAC;KACb,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;QACjD,sEAAsE;QACtE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;KAChC,CAAC;CACH"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAEzC,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;QACjD,sEAAsE;QACtE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;KAChC,CAAC;CACH"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tooee/config",
3
- "version": "0.7.3",
3
+ "version": "0.9.0",
4
4
  "description": "Layered configuration system for Tooee apps",
5
5
  "keywords": [
6
6
  "cli",
package/src/index.ts CHANGED
@@ -1,3 +1,3 @@
1
- export type { TooeeConfig, Mode } from "./types.js";
1
+ export type { ColorMode, TooeeConfig } from "./types.js";
2
2
  export { loadConfig, writeGlobalConfig } from "./load.js";
3
3
  export { ConfigProvider, useConfig, useThemeConfig, useKeymapConfig } from "./context.js";
package/src/load.ts CHANGED
@@ -9,83 +9,136 @@ const DEFAULTS: TooeeConfig = {
9
9
  },
10
10
  };
11
11
 
12
- const isRecord = function isRecord(value: unknown): value is Record<string, unknown> {
13
- return typeof value === "object" && value !== null && !Array.isArray(value);
12
+ // ---------------------------------------------------------------------------
13
+ // JSON boundary
14
+ // ---------------------------------------------------------------------------
15
+
16
+ /** The JSON grammar, exactly as `JSON.parse` produces it without a reviver. */
17
+ type JsonValue = string | number | boolean | null | readonly JsonValue[] | JsonObject;
18
+
19
+ /** A JSON object. A key that is absent from the document reads as `undefined`. */
20
+ interface JsonObject {
21
+ readonly [key: string]: JsonValue | undefined;
22
+ }
23
+
24
+ const parseJsonDocument = function parseJsonDocument(text: string): JsonValue {
25
+ // SAFETY: `JSON.parse` without a reviver produces only the JSON grammar: strings,
26
+ // finite numbers, booleans, null, arrays, and plain objects. `JsonValue` is that
27
+ // grammar, so the assertion restates the parser's own contract and narrows nothing.
28
+ // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- JSON.parse is typed `any`; the SAFETY note above states the invariant
29
+ return JSON.parse(text) as JsonValue;
14
30
  };
15
31
 
16
- const readStringRecord = function readStringRecord(
17
- value: unknown,
18
- ): Record<string, string> | undefined {
19
- if (!isRecord(value) || Object.values(value).some((entry) => typeof entry !== "string")) {
20
- return undefined;
21
- }
22
- return Object.fromEntries(
23
- Object.entries(value).filter(
24
- (entry): entry is [string, string] => typeof entry[1] === "string",
25
- ),
26
- );
32
+ const isJsonObject = function isJsonObject(value: JsonValue | undefined): value is JsonObject {
33
+ return value instanceof Object && !Array.isArray(value);
27
34
  };
28
35
 
29
- const validateConfig = function validateConfig(value: unknown): Partial<TooeeConfig> {
30
- if (!isRecord(value)) {
31
- return {};
36
+ const isJsonString = function isJsonString(value: JsonValue | undefined): value is string {
37
+ // The config decoder is the one place that inspects a JSON value's representation;
38
+ // every caller branches on the decoded domain value instead.
39
+ // oxlint-disable-next-line anti-slop/no-runtime-typeof -- primitive check inside the boundary decoder
40
+ return typeof value === "string";
41
+ };
42
+
43
+ // ---------------------------------------------------------------------------
44
+ // Config decoding
45
+ // ---------------------------------------------------------------------------
46
+
47
+ type ThemeSettings = NonNullable<TooeeConfig["theme"]>;
48
+ type ViewSettings = NonNullable<TooeeConfig["view"]>;
49
+
50
+ const decodeTheme = function decodeTheme(json: JsonObject): ThemeSettings {
51
+ const theme: ThemeSettings = {};
52
+ const { mode, name } = json;
53
+ if (isJsonString(name)) {
54
+ theme.name = name;
32
55
  }
56
+ if (mode === "dark" || mode === "light") {
57
+ theme.mode = mode;
58
+ }
59
+ return theme;
60
+ };
33
61
 
34
- const config: Partial<TooeeConfig> = {};
35
- if (isRecord(value.theme)) {
36
- const theme: NonNullable<TooeeConfig["theme"]> = {};
37
- if (typeof value.theme.name === "string") {
38
- theme.name = value.theme.name;
39
- }
40
- if (value.theme.mode === "dark" || value.theme.mode === "light") {
41
- theme.mode = value.theme.mode;
62
+ /** Every value must be a string; one wrong value rejects the whole map. */
63
+ const decodeKeys = function decodeKeys(json: JsonObject): TooeeConfig["keys"] {
64
+ const entries: [string, string][] = [];
65
+ for (const [key, value] of Object.entries(json)) {
66
+ if (!isJsonString(value)) {
67
+ return undefined;
42
68
  }
43
- config.theme = theme;
69
+ entries.push([key, value]);
44
70
  }
45
- const keys = readStringRecord(value.keys);
46
- if (keys !== undefined) {
47
- config.keys = keys;
71
+ return Object.fromEntries(entries);
72
+ };
73
+
74
+ const decodeView = function decodeView(json: JsonObject): ViewSettings {
75
+ const view: ViewSettings = {};
76
+ const { copyOnSelect, diffLayout, gutter, wrap } = json;
77
+ if (wrap === true || wrap === false) {
78
+ view.wrap = wrap;
48
79
  }
49
- if (isRecord(value.view)) {
50
- const view: NonNullable<TooeeConfig["view"]> = {};
51
- if (typeof value.view.wrap === "boolean") {
52
- view.wrap = value.view.wrap;
53
- }
54
- if (typeof value.view.gutter === "boolean") {
55
- view.gutter = value.view.gutter;
56
- }
57
- if (value.view.diffLayout === "split" || value.view.diffLayout === "stack") {
58
- view.diffLayout = value.view.diffLayout;
59
- }
60
- if (
61
- typeof value.view.copyOnSelect === "boolean" ||
62
- value.view.copyOnSelect === "primary" ||
63
- value.view.copyOnSelect === "clipboard"
64
- ) {
65
- view.copyOnSelect = value.view.copyOnSelect;
80
+ if (gutter === true || gutter === false) {
81
+ view.gutter = gutter;
82
+ }
83
+ if (diffLayout === "split" || diffLayout === "stack") {
84
+ view.diffLayout = diffLayout;
85
+ }
86
+ if (
87
+ copyOnSelect === true ||
88
+ copyOnSelect === false ||
89
+ copyOnSelect === "primary" ||
90
+ copyOnSelect === "clipboard"
91
+ ) {
92
+ view.copyOnSelect = copyOnSelect;
93
+ }
94
+ return view;
95
+ };
96
+
97
+ /**
98
+ * Decode one config document. A section that is present as an object is kept
99
+ * even when none of its fields decode, so `{ "view": {} }` yields `view: {}`;
100
+ * a section with the wrong representation is dropped as if it were absent.
101
+ */
102
+ const decodeConfig = function decodeConfig(json: JsonValue): Partial<TooeeConfig> {
103
+ if (!isJsonObject(json)) {
104
+ return {};
105
+ }
106
+ const config: Partial<TooeeConfig> = {};
107
+ const { keys, theme, view } = json;
108
+ if (isJsonObject(theme)) {
109
+ config.theme = decodeTheme(theme);
110
+ }
111
+ if (isJsonObject(keys)) {
112
+ const decodedKeys = decodeKeys(keys);
113
+ if (decodedKeys !== undefined) {
114
+ config.keys = decodedKeys;
66
115
  }
67
- config.view = view;
116
+ }
117
+ if (isJsonObject(view)) {
118
+ config.view = decodeView(view);
68
119
  }
69
120
  return config;
70
121
  };
71
122
 
123
+ // ---------------------------------------------------------------------------
124
+ // Layering
125
+ // ---------------------------------------------------------------------------
126
+
72
127
  const mergeConfig = function mergeConfig(
73
128
  target: Partial<TooeeConfig>,
74
129
  source: Partial<TooeeConfig>,
75
130
  ): TooeeConfig {
76
- return {
77
- ...target,
78
- ...source,
79
- ...(target.theme === undefined && source.theme === undefined
80
- ? {}
81
- : { theme: { ...target.theme, ...source.theme } }),
82
- ...(target.keys === undefined && source.keys === undefined
83
- ? {}
84
- : { keys: { ...target.keys, ...source.keys } }),
85
- ...(target.view === undefined && source.view === undefined
86
- ? {}
87
- : { view: { ...target.view, ...source.view } }),
88
- };
131
+ const merged: TooeeConfig = { ...target, ...source };
132
+ if (target.theme !== undefined || source.theme !== undefined) {
133
+ merged.theme = { ...target.theme, ...source.theme };
134
+ }
135
+ if (target.keys !== undefined || source.keys !== undefined) {
136
+ merged.keys = { ...target.keys, ...source.keys };
137
+ }
138
+ if (target.view !== undefined || source.view !== undefined) {
139
+ merged.view = { ...target.view, ...source.view };
140
+ }
141
+ return merged;
89
142
  };
90
143
 
91
144
  const readJsonFile = function readJsonFile(configPath: string): Partial<TooeeConfig> {
@@ -93,8 +146,7 @@ const readJsonFile = function readJsonFile(configPath: string): Partial<TooeeCon
93
146
  if (!existsSync(configPath)) {
94
147
  return {};
95
148
  }
96
- const parsed: unknown = JSON.parse(readFileSync(configPath, "utf-8"));
97
- return validateConfig(parsed);
149
+ return decodeConfig(parseJsonDocument(readFileSync(configPath, "utf-8")));
98
150
  } catch {
99
151
  return {};
100
152
  }
@@ -0,0 +1,4 @@
1
+ // @ts-expect-error Mode was removed from @tooee/config in 0.9; use ColorMode.
2
+ import type { ColorMode, Mode } from "./index.js";
3
+
4
+ export type ConfigPublicContractChecks = [ColorMode, Mode];
package/src/types.ts CHANGED
@@ -1,9 +1,9 @@
1
- export type Mode = "dark" | "light";
1
+ export type ColorMode = "dark" | "light";
2
2
 
3
3
  export interface TooeeConfig {
4
4
  theme?: {
5
5
  name?: string;
6
- mode?: Mode;
6
+ mode?: ColorMode;
7
7
  };
8
8
  keys?: Record<string, string>;
9
9
  view?: {