@wwkit/shared 1.0.30 → 1.0.31

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 bluesliu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2025 bluesliu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,35 +1,35 @@
-# @wwkit/shared
-
-Shared utilities for @wwkit packages.
-
-## config-loader
-
-多层配置加载器：内置 `config.json5` + 环境变量注入内容 + 用户 `config.json5` 合并（用户优先）。
-
-**默认行为（无需配置）**：
-- **深合并**（`deepMerge`），嵌套配置只覆盖用户改写的字段，保留其余默认
-- 结果默认解析 `{env:XXX}` 占位符（安全实践：密钥用环境变量引用，不落盘明文）
-
-**可选层（通过选项开启）**：
-- `envContentVar`：指定环境变量名，其内容作为"注入配置"这一层参与合并（同样走深合并+占位符解析）
-- `envDirVar`：指定环境变量名，其值覆盖用户配置目录
-
-```js
-import { createConfigLoader, getXdgConfigDir } from '@wwkit/shared'
-
-const loader = createConfigLoader({
-  builtinConfigPath: path.join(__dirname, 'config.json5'),
-  userConfigDir: getXdgConfigDir('cft'),
-  envContentVar: 'MY_CONFIG_CONTENT',   // 可选
-  envDirVar: 'MY_CONFIG_DIR',           // 可选
-})
-
-loader.copyBuiltinConfig()  // 复制内置→用户目录（不覆盖已存在）
-const cfg = loader.getConfig()  // 深合并 + 占位符解析
-```
-
-### 导出的工具函数
-
-- `deepMerge(base, override)` — 深合并（嵌套对象合并，数组/标量覆盖）
-- `resolveEnvVars(value, env?)` — 递归解析 `{env:XXX}` 占位符
+# @wwkit/shared
+
+Shared utilities for @wwkit packages.
+
+## config-loader
+
+多层配置加载器：内置 `config.json5` + 环境变量注入内容 + 用户 `config.json5` 合并（用户优先）。
+
+**默认行为（无需配置）**：
+- **深合并**（`deepMerge`），嵌套配置只覆盖用户改写的字段，保留其余默认
+- 结果默认解析 `{env:XXX}` 占位符（安全实践：密钥用环境变量引用，不落盘明文）
+
+**可选层（通过选项开启）**：
+- `envContentVar`：指定环境变量名，其内容作为"注入配置"这一层参与合并（同样走深合并+占位符解析）
+- `envDirVar`：指定环境变量名，其值覆盖用户配置目录
+
+```js
+import { createConfigLoader, getXdgConfigDir } from '@wwkit/shared'
+
+const loader = createConfigLoader({
+  builtinConfigPath: path.join(__dirname, 'config.json5'),
+  userConfigDir: getXdgConfigDir('cft'),
+  envContentVar: 'MY_CONFIG_CONTENT',   // 可选
+  envDirVar: 'MY_CONFIG_DIR',           // 可选
+})
+
+loader.copyBuiltinConfig()  // 复制内置→用户目录（不覆盖已存在）
+const cfg = loader.getConfig()  // 深合并 + 占位符解析
+```
+
+### 导出的工具函数
+
+- `deepMerge(base, override)` — 深合并（嵌套对象合并，数组/标量覆盖）
+- `resolveEnvVars(value, env?)` — 递归解析 `{env:XXX}` 占位符
 - `getXdgConfigDir(subdir)` — `~/.config/<subdir>` 或 `$XDG_CONFIG_HOME/<subdir>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/shared",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Shared utilities for @wwkit packages — config loader, platform detection",
   "type": "module",

package/src/args.js

@@ -1,79 +1,79 @@
-/**
- * 共享命令行参数解析器 — @wwkit/shared 统一参数解析
- *
- * 支持以下格式的参数：
- *   --flag value        长标志（空格分隔）
- *   --flag=value        长标志（等号形式）
- *   -f value           短标志（空格分隔）
- *   -f=value           短标志（等号形式）
- *   positional         位置参数（不以 - 开头）
- *
- * 布尔标志（见 DEFAULT_BOOLEAN_FLAGS 与 opts.booleans）不消费下一个参数：
- *   --json、-g、-y 等后跟普通 token 时，token 保持为位置参数/值参数，
- *   避免 `opm npm install -g typescript` 将 typescript 吞为 -g 的值。
- * 上下文相关的布尔标志（如 proc 的 -f/--force）由
- * 调用方通过 opts.booleans 声明。
- *
- * @param {string[]} argv - 原始参数数组
- * @param {{ booleans?: string[] }} [opts] - 上下文布尔标志名（不含 -/-- 前缀）
- * @returns {{ flags: Record<string, string>, positional: string[] }}
- */
-export const DEFAULT_BOOLEAN_FLAGS = new Set([
-  'h', 'help',
-  'g', 'global',
-  'y', 'yes',
-  'a', 'all',
-  'j', 'json',
-  'exact',
-  'dry-run',
-  'backup',
-  'delete',
-])
-
-export function parseFlags(argv, opts = {}) {
-  const booleans = new Set([...DEFAULT_BOOLEAN_FLAGS, ...(opts.booleans || [])])
-  const flags = {}
-  const positional = []
-
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i]
-
-    if (arg.startsWith('--') && arg.includes('=')) {
-      const idx = arg.indexOf('=')
-      flags[arg.slice(2, idx)] = arg.slice(idx + 1)
-    } else if (arg.startsWith('--')) {
-      const name = arg.slice(2)
-      if (booleans.has(name)) {
-        flags[name] = 'true'
-      } else {
-        const next = argv[i + 1]
-        if (next !== undefined && !next.startsWith('-')) {
-          flags[name] = next
-          i++
-        } else {
-          flags[name] = 'true'
-        }
-      }
-    } else if (arg.startsWith('-') && arg.includes('=')) {
-      const idx = arg.indexOf('=')
-      flags[arg.slice(1, idx)] = arg.slice(idx + 1)
-    } else if (arg.startsWith('-') && arg.length > 1) {
-      const name = arg.slice(1)
-      if (booleans.has(name)) {
-        flags[name] = 'true'
-      } else {
-        const next = argv[i + 1]
-        if (next !== undefined && !next.startsWith('-')) {
-          flags[name] = next
-          i++
-        } else {
-          flags[name] = 'true'
-        }
-      }
-    } else {
-      positional.push(arg)
-    }
-  }
-
-  return { flags, positional }
-}
+/**
+ * 共享命令行参数解析器 — @wwkit/shared 统一参数解析
+ *
+ * 支持以下格式的参数：
+ *   --flag value        长标志（空格分隔）
+ *   --flag=value        长标志（等号形式）
+ *   -f value           短标志（空格分隔）
+ *   -f=value           短标志（等号形式）
+ *   positional         位置参数（不以 - 开头）
+ *
+ * 布尔标志（见 DEFAULT_BOOLEAN_FLAGS 与 opts.booleans）不消费下一个参数：
+ *   --json、-g、-y 等后跟普通 token 时，token 保持为位置参数/值参数，
+ *   避免 `opm npm install -g typescript` 将 typescript 吞为 -g 的值。
+ * 上下文相关的布尔标志（如 proc 的 -f/--force）由
+ * 调用方通过 opts.booleans 声明。
+ *
+ * @param {string[]} argv - 原始参数数组
+ * @param {{ booleans?: string[] }} [opts] - 上下文布尔标志名（不含 -/-- 前缀）
+ * @returns {{ flags: Record<string, string>, positional: string[] }}
+ */
+export const DEFAULT_BOOLEAN_FLAGS = new Set([
+  'h', 'help',
+  'g', 'global',
+  'y', 'yes',
+  'a', 'all',
+  'j', 'json',
+  'exact',
+  'dry-run',
+  'backup',
+  'delete',
+])
+
+export function parseFlags(argv, opts = {}) {
+  const booleans = new Set([...DEFAULT_BOOLEAN_FLAGS, ...(opts.booleans || [])])
+  const flags = {}
+  const positional = []
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i]
+
+    if (arg.startsWith('--') && arg.includes('=')) {
+      const idx = arg.indexOf('=')
+      flags[arg.slice(2, idx)] = arg.slice(idx + 1)
+    } else if (arg.startsWith('--')) {
+      const name = arg.slice(2)
+      if (booleans.has(name)) {
+        flags[name] = 'true'
+      } else {
+        const next = argv[i + 1]
+        if (next !== undefined && !next.startsWith('-')) {
+          flags[name] = next
+          i++
+        } else {
+          flags[name] = 'true'
+        }
+      }
+    } else if (arg.startsWith('-') && arg.includes('=')) {
+      const idx = arg.indexOf('=')
+      flags[arg.slice(1, idx)] = arg.slice(idx + 1)
+    } else if (arg.startsWith('-') && arg.length > 1) {
+      const name = arg.slice(1)
+      if (booleans.has(name)) {
+        flags[name] = 'true'
+      } else {
+        const next = argv[i + 1]
+        if (next !== undefined && !next.startsWith('-')) {
+          flags[name] = next
+          i++
+        } else {
+          flags[name] = 'true'
+        }
+      }
+    } else {
+      positional.push(arg)
+    }
+  }
+
+  return { flags, positional }
+}