@nsnanocat/util 2.1.3 → 2.1.4
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/README.md +5 -4
- package/getStorage.mjs +14 -9
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -315,10 +315,11 @@ await runScript("$done({})", { timeout: 20 });
|
|
|
315
315
|
- `database: object`(默认数据库)
|
|
316
316
|
- 返回:`{ Settings, Configs, Caches }`
|
|
317
317
|
|
|
318
|
-
合并顺序由 `$argument.Storage` 控制(持久化读取统一使用 `PersistentStore = Storage.getItem(key, {})
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
318
|
+
合并顺序由 `$argument.Storage` 控制(持久化读取统一使用 `PersistentStore = Storage.getItem(key, {})`;支持别名):
|
|
319
|
+
- 可用值(大小写敏感):`undefined` | `Argument` | `$argument` | `PersistentStore` | `BoxJs` | `boxjs` | `$persistentStore` | `database`
|
|
320
|
+
1. `undefined`:`database[name]` -> `$argument` -> `PersistentStore[name]`
|
|
321
|
+
2. `Argument` / `$argument`:`database[name]` -> `PersistentStore[name]` -> `$argument`
|
|
322
|
+
3. `PersistentStore` / `BoxJs` / `$persistentStore`(默认):`database[name]` -> `PersistentStore[name]`
|
|
322
323
|
4. `database`:仅 `database[name]`
|
|
323
324
|
|
|
324
325
|
注意:`Configs` 与 `Caches` 始终按每个 `name` 合并(与 `$argument.Storage` 无关)。
|
package/getStorage.mjs
CHANGED
|
@@ -17,17 +17,19 @@ import { Storage } from "./polyfill/Storage.mjs";
|
|
|
17
17
|
* 读取并合并默认配置、持久化配置与 `$argument`。
|
|
18
18
|
* Read and merge default config, persisted config and `$argument`.
|
|
19
19
|
*
|
|
20
|
-
* 注意:`Configs` 与 `Caches` 始终按每个 profile(`names`)合并;`Settings` 的合并顺序由 `$argument.Storage`
|
|
21
|
-
* Note: `Configs` and `Caches` are always merged per-profile (`names`); the merge order for `Settings` is controlled by `$argument.Storage
|
|
20
|
+
* 注意:`Configs` 与 `Caches` 始终按每个 profile(`names`)合并;`Settings` 的合并顺序由 `$argument.Storage` 控制(支持别名)。
|
|
21
|
+
* Note: `Configs` and `Caches` are always merged per-profile (`names`); the merge order for `Settings` is controlled by `$argument.Storage` (aliases supported).
|
|
22
22
|
*
|
|
23
|
-
* 合并来源与顺序由 `$argument.Storage`
|
|
24
|
-
* Merge source order is controlled by `$argument.Storage
|
|
25
|
-
* - `undefined
|
|
26
|
-
* - `$argument`: `database[name]` -> `PersistentStore[name]` -> `$argument`
|
|
27
|
-
* - `PersistentStore` / `BoxJs
|
|
23
|
+
* 合并来源与顺序由 `$argument.Storage` 控制(支持以下值 / 别名):
|
|
24
|
+
* Merge source order is controlled by `$argument.Storage` (accepted values / aliases):
|
|
25
|
+
* - `undefined`: `database[name]` -> `$argument` -> `PersistentStore[name]`
|
|
26
|
+
* - `Argument` / `$argument`: `database[name]` -> `PersistentStore[name]` -> `$argument`
|
|
27
|
+
* - `PersistentStore` / `BoxJs` / `boxjs` / `$persistentStore`(默认):`database[name]` -> `PersistentStore[name]`
|
|
28
28
|
* - `database`: 仅 `database[name]`
|
|
29
29
|
*
|
|
30
|
-
*
|
|
30
|
+
* 注意:字符串比较为精确匹配(区分大小写)。
|
|
31
|
+
*
|
|
32
|
+
* @since 2.1.3
|
|
31
33
|
* @link https://github.com/NanoCat-Me/utils/blob/main/getStorage.mjs
|
|
32
34
|
* @author VirgilClyne
|
|
33
35
|
* @param {string} key 持久化主键 / Persistent store key.
|
|
@@ -65,14 +67,18 @@ export function getStorage(key, names, database) {
|
|
|
65
67
|
_.merge(Root.Caches, PersistentStore?.[name]?.Caches);
|
|
66
68
|
});
|
|
67
69
|
switch ($argument.Storage) {
|
|
70
|
+
case "Argument":
|
|
68
71
|
case "$argument":
|
|
69
72
|
names.forEach(name => {
|
|
70
73
|
_.merge(Root.Settings, database?.[name]?.Settings, PersistentStore?.[name]?.Settings);
|
|
71
74
|
});
|
|
72
75
|
_.merge(Root.Settings, $argument);
|
|
73
76
|
break;
|
|
77
|
+
default:
|
|
74
78
|
case "BoxJs":
|
|
79
|
+
case "boxjs":
|
|
75
80
|
case "PersistentStore":
|
|
81
|
+
case "$persistentStore":
|
|
76
82
|
names.forEach(name => {
|
|
77
83
|
_.merge(Root.Settings, database?.[name]?.Settings, PersistentStore?.[name]?.Settings);
|
|
78
84
|
});
|
|
@@ -82,7 +88,6 @@ export function getStorage(key, names, database) {
|
|
|
82
88
|
_.merge(Root.Settings, database?.[name]?.Settings);
|
|
83
89
|
});
|
|
84
90
|
break;
|
|
85
|
-
default:
|
|
86
91
|
case undefined:
|
|
87
92
|
names.forEach(name => {
|
|
88
93
|
_.merge(Root.Settings, database?.[name]?.Settings);
|
package/package.json
CHANGED