@nsnanocat/util 2.1.2 → 2.1.4

package/README.md

@@ -315,12 +315,15 @@ await runScript("$done({})", { timeout: 20 });
   - `database: object`（默认数据库）
 - 返回：`{ Settings, Configs, Caches }`
 
-合并顺序由 `$argument.Storage` 控制（持久化读取统一使用 `PersistentStore = Storage.getItem(key, {})`）：
-1. 默认（`undefined`）：`database[name]` -> `$argument` -> `PersistentStore[name]`
-2. `$argument`：`database[name]` -> `PersistentStore[name]` -> `$argument`
-3. `PersistentStore` / `BoxJs`：`database[name]` -> `PersistentStore[name]`
+合并顺序由 `$argument.Storage` 控制（持久化读取统一使用 `PersistentStore = Storage.getItem(key, {})`；支持别名）：
+- 可用值（大小写敏感）：`undefined` | `Argument` | `$argument` | `PersistentStore` | `BoxJs` | `boxjs` | `$persistentStore` | `database`
+1. `undefined`：`database[name]` -> `$argument` -> `PersistentStore[name]`
+2. `Argument` / `$argument`：`database[name]` -> `PersistentStore[name]` -> `$argument`
+3. `PersistentStore` / `BoxJs` / `$persistentStore`（默认）：`database[name]` -> `PersistentStore[name]`
 4. `database`：仅 `database[name]`
 
+注意：`Configs` 与 `Caches` 始终按每个 `name` 合并（与 `$argument.Storage` 无关）。
+
 自动类型转换（`Root.Settings`）：
 - 字符串 `"true"/"false"` -> `boolean`
 - 纯数字字符串 -> `number`

package/getStorage.mjs

@@ -17,13 +17,19 @@ import { Storage } from "./polyfill/Storage.mjs";
  * 读取并合并默认配置、持久化配置与 `$argument`。
  * Read and merge default config, persisted config and `$argument`.
  *
- * 合并来源与顺序由 `$argument.Storage` 控制:
- * Merge source order is controlled by `$argument.Storage`:
- * - `undefined`(默认): `database[name]` -> `$argument` -> `PersistentStore[name]`
- * - `$argument`: `database[name]` -> `PersistentStore[name]` -> `$argument`
- * - `PersistentStore` / `BoxJs`: `database[name]` -> `PersistentStore[name]`
+ * 注意：`Configs` 与 `Caches` 始终按每个 profile（`names`）合并；`Settings` 的合并顺序由 `$argument.Storage` 控制（支持别名）。
+ * Note: `Configs` and `Caches` are always merged per-profile (`names`); the merge order for `Settings` is controlled by `$argument.Storage` (aliases supported).
+ *
+ * 合并来源与顺序由 `$argument.Storage` 控制（支持以下值 / 别名）：
+ * Merge source order is controlled by `$argument.Storage` (accepted values / aliases):
+ * - `undefined`: `database[name]` -> `$argument` -> `PersistentStore[name]`
+ * - `Argument` / `$argument`: `database[name]` -> `PersistentStore[name]` -> `$argument`
+ * - `PersistentStore` / `BoxJs` / `boxjs` / `$persistentStore`（默认）：`database[name]` -> `PersistentStore[name]`
  * - `database`: 仅 `database[name]`
  *
+ * 注意：字符串比较为精确匹配（区分大小写）。
+ *
+ * @since 2.1.3
  * @link https://github.com/NanoCat-Me/utils/blob/main/getStorage.mjs
  * @author VirgilClyne
  * @param {string} key 持久化主键 / Persistent store key.
@@ -57,25 +63,41 @@ export function getStorage(key, names, database) {
 	}
 	/***************** Merge *****************/
 	names.forEach(name => {
-		switch ($argument.Storage) {
-			case "$argument":
-				_.merge(Root.Settings, database?.[name]?.Settings, PersistentStore?.[name]?.Settings, $argument);
-				break;
-			case "BoxJs":
-			case "PersistentStore":
-				_.merge(Root.Settings, database?.[name]?.Settings, PersistentStore?.[name]?.Settings);
-				break;
-			case "database":
-				_.merge(Root.Settings, database?.[name]?.Settings);
-				break;
-			default:
-			case undefined:
-				_.merge(Root.Settings, database?.[name]?.Settings, $argument, PersistentStore?.[name]?.Settings);
-				break;
-		}
 		_.merge(Root.Configs, database?.[name]?.Configs);
 		_.merge(Root.Caches, PersistentStore?.[name]?.Caches);
 	});
+	switch ($argument.Storage) {
+		case "Argument":
+		case "$argument":
+			names.forEach(name => {
+				_.merge(Root.Settings, database?.[name]?.Settings, PersistentStore?.[name]?.Settings);
+			});
+			_.merge(Root.Settings, $argument);
+			break;
+		default:
+		case "BoxJs":
+		case "boxjs":
+		case "PersistentStore":
+		case "$persistentStore":
+			names.forEach(name => {
+				_.merge(Root.Settings, database?.[name]?.Settings, PersistentStore?.[name]?.Settings);
+			});
+			break;
+		case "database":
+			names.forEach(name => {
+				_.merge(Root.Settings, database?.[name]?.Settings);
+			});
+			break;
+		case undefined:
+			names.forEach(name => {
+				_.merge(Root.Settings, database?.[name]?.Settings);
+			});
+			_.merge(Root.Settings, $argument);
+			names.forEach(name => {
+				_.merge(Root.Settings, PersistentStore?.[name]?.Settings);
+			});
+			break;
+	}
 	if (Root.Settings.LogLevel) Console.logLevel = Root.Settings.LogLevel;
 	Console.debug("✅ Merge", `Root.Settings类型: ${typeof Root.Settings}`, `Root.Settings: ${JSON.stringify(Root.Settings)}`);
 	/***************** traverseObject *****************/

package/package.json

@@ -39,5 +39,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "version": "2.1.2"
+  "version": "2.1.4"
 }