@infly/libs 2.0.53 → 2.1.0

package/cli/select-option.js

@@ -1,46 +1,77 @@
 // CLI 交互选择适配，业务选项由调用方注入。
 const EXIT_SELECTION = "__exit__";
-
-function isReadlineClosedError(error) {
-  return error?.code === "ERR_USE_AFTER_CLOSE";
-}
-
-function makePromptCancellationSafe(prompt) {
-  const unsafeStop = prompt.stop;
-  if (typeof unsafeStop !== "function") return;
-
-  prompt.removeListener("close", unsafeStop);
-  const safeStop = () => {
-    try {
-      unsafeStop();
-    } catch (error) {
-      if (!isReadlineClosedError(error)) throw error;
-    }
-  };
-  prompt.stop = safeStop;
-  prompt.once("close", safeStop);
+
+function isReadlineClosedError(error) {
+  return error?.code === "ERR_USE_AFTER_CLOSE";
+}
+
+function makePromptCancellationSafe(prompt) {
+  const unsafeStop = prompt.stop;
+  if (typeof unsafeStop !== "function") return;
+
+  prompt.removeListener("close", unsafeStop);
+  const safeStop = () => {
+    try {
+      unsafeStop();
+    } catch (error) {
+      if (!isReadlineClosedError(error)) throw error;
+    }
+  };
+  prompt.stop = safeStop;
+  prompt.once("close", safeStop);
+}
+
+async function selectOption(message, choices, dependencies = {}) {
+  const stdin = dependencies.stdin || process.stdin;
+  const stdout = dependencies.stdout || process.stdout;
+  if (!stdin.isTTY || !stdout.isTTY) {
+    throw new Error(`${message}: interactive selection requires a TTY; pass an explicit option.`);
+  }
+
+  const Select = dependencies.Select || require("enquirer").Select;
+  const prompt = new Select({
+    name: "selection",
+    message,
+    stdin,
+    stdout,
+    choices: [
+      ...choices.map((choice) => ({
+        name: choice.value,
+        message: choice.label,
+      })),
+      { name: EXIT_SELECTION, message: "退出" },
+    ],
+  });
+
+  prompt.once("start", makePromptCancellationSafe);
+  try {
+    return await prompt.run();
+  } catch (error) {
+    if (!error || error.name === "CancelPromptError" || isReadlineClosedError(error)) {
+      return EXIT_SELECTION;
+    }
+    throw error;
+  }
 }
 
-async function selectOption(message, choices, dependencies = {}) {
+async function selectOptions(message, choices, dependencies = {}) {
   const stdin = dependencies.stdin || process.stdin;
   const stdout = dependencies.stdout || process.stdout;
   if (!stdin.isTTY || !stdout.isTTY) {
     throw new Error(`${message}: interactive selection requires a TTY; pass an explicit option.`);
   }
 
-  const Select = dependencies.Select || require("enquirer").Select;
-  const prompt = new Select({
-    name: "selection",
+  const MultiSelect = dependencies.MultiSelect || require("enquirer").MultiSelect;
+  const prompt = new MultiSelect({
+    name: "selections",
     message,
     stdin,
     stdout,
-    choices: [
-      ...choices.map((choice) => ({
-        name: choice.value,
-        message: choice.label,
-      })),
-      { name: EXIT_SELECTION, message: "退出" },
-    ],
+    min: 1,
+    choices: choices.map((choice) => ({
+      name: choice.value,
+      message: choice.label,
+    })),
   });
 
   prompt.once("start", makePromptCancellationSafe);
@@ -58,4 +89,5 @@ module.exports = {
   EXIT_SELECTION,
   makePromptCancellationSafe,
   selectOption,
+  selectOptions,
 };

package/core/async/concurrency.js

@@ -1,31 +1,31 @@
 /**
  * 框架无关的异步并发控制。
- * 异步并发限流器。
- * 对 items 数组中的每一项执行 worker，同时最多运行 concurrency 个 worker。
- *
- * @param {Array} items - 待处理项
- * @param {number} concurrency - 最大并发数
- * @param {Function} worker - 处理函数 (item, index) => Promise
- * @returns {Promise<Array>} 结果数组，索引与 items 一一对应
- */
-async function runWithConcurrency(items, concurrency, worker) {
-  if (!Number.isInteger(concurrency) || concurrency < 1) {
-    throw new TypeError("concurrency must be a positive integer");
-  }
-
-  const results = new Array(items.length);
-  let nextIndex = 0;
-  const runWorker = async () => {
-    while (nextIndex < items.length) {
-      const index = nextIndex;
-      nextIndex += 1;
-      results[index] = await worker(items[index], index);
-    }
-  };
-
-  const workerCount = Math.min(concurrency, items.length);
-  await Promise.all(Array.from({ length: workerCount }, runWorker));
-  return results;
-}
-
-module.exports = { runWithConcurrency };
+ * 异步并发限流器。
+ * 对 items 数组中的每一项执行 worker，同时最多运行 concurrency 个 worker。
+ *
+ * @param {Array} items - 待处理项
+ * @param {number} concurrency - 最大并发数
+ * @param {Function} worker - 处理函数 (item, index) => Promise
+ * @returns {Promise<Array>} 结果数组，索引与 items 一一对应
+ */
+async function runWithConcurrency(items, concurrency, worker) {
+  if (!Number.isInteger(concurrency) || concurrency < 1) {
+    throw new TypeError("concurrency must be a positive integer");
+  }
+
+  const results = new Array(items.length);
+  let nextIndex = 0;
+  const runWorker = async () => {
+    while (nextIndex < items.length) {
+      const index = nextIndex;
+      nextIndex += 1;
+      results[index] = await worker(items[index], index);
+    }
+  };
+
+  const workerCount = Math.min(concurrency, items.length);
+  await Promise.all(Array.from({ length: workerCount }, runWorker));
+  return results;
+}
+
+module.exports = { runWithConcurrency };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infly/libs",
-  "version": "2.0.53",
+  "version": "2.1.0",
   "description": "不受前端框架限制的独立工具库",
   "main": "index.js",
   "types": "index.d.ts",
@@ -59,7 +59,7 @@
   "author": "Kahal",
   "license": "ISC",
   "dependencies": {
-    "@infly/ts-libs": "^0.1.12",
+    "@infly/ts-libs": "^0.1.15",
     "connect": "^3.7.0",
     "dotenv": "16.6.1",
     "enquirer": "^2.4.1",

package/script/git-automation/submodule-utils.js

@@ -3,20 +3,20 @@ const fs = require("fs");
 function normalizeRelativePath(value) {
   return String(value).replace(/\\/g, "/");
 }
-
-/**
- * 从 .gitmodules 中解析所有子模块路径
- */
-function parseGitmodulesPaths(rootDir) {
-  const p = require("path").join(rootDir, ".gitmodules");
-  if (!fs.existsSync(p)) return [];
-  const content = fs.readFileSync(p, "utf8");
-  const paths = [];
-  content.split(/\[submodule/).forEach((block) => {
-    const m = block.match(/path\s*=\s*(.+)/);
-    if (m) paths.push(m[1].trim());
-  });
-  return paths;
-}
-
+
+/**
+ * 从 .gitmodules 中解析所有子模块路径
+ */
+function parseGitmodulesPaths(rootDir) {
+  const p = require("path").join(rootDir, ".gitmodules");
+  if (!fs.existsSync(p)) return [];
+  const content = fs.readFileSync(p, "utf8");
+  const paths = [];
+  content.split(/\[submodule/).forEach((block) => {
+    const m = block.match(/path\s*=\s*(.+)/);
+    if (m) paths.push(m[1].trim());
+  });
+  return paths;
+}
+
 module.exports = { normalizeRelativePath, parseGitmodulesPaths };

package/workspace/config.js

@@ -1,146 +1,146 @@
 // workspace 配置读取与模式展开。
 const fs = require("fs");
-const path = require("path");
-const YAML = require("yaml");
-
-function readJson(filePath) {
-  return JSON.parse(fs.readFileSync(filePath, "utf8"));
-}
-
-function readWorkspaceList(content, sectionName) {
-  let workspaceConfig;
-
-  try {
-    workspaceConfig = YAML.parse(content);
-  } catch (error) {
-    throw new Error(`无法解析 pnpm-workspace.yaml: ${error.message}`, { cause: error });
-  }
-
-  if (workspaceConfig == null) {
-    return [];
-  }
-
-  if (typeof workspaceConfig !== "object" || Array.isArray(workspaceConfig)) {
-    throw new TypeError("pnpm-workspace.yaml 的根节点必须是对象");
-  }
-
-  const patterns = workspaceConfig[sectionName];
-
-  if (patterns == null) {
-    return [];
-  }
-
-  if (
-    !Array.isArray(patterns)
-    || patterns.some((pattern) => typeof pattern !== "string" || pattern.trim().length === 0)
-  ) {
-    throw new TypeError(`pnpm-workspace.yaml 的 ${sectionName} 必须是非空字符串数组`);
-  }
-
-  return patterns;
-}
-
-function readWorkspaceSection(workspaceFile, sectionName) {
-  return readWorkspaceList(fs.readFileSync(workspaceFile, "utf8"), sectionName);
-}
-
-function readWorkspaceSectionWithFallback(workspaceFile, sectionName, fallbackSectionName) {
-  const patterns = readWorkspaceSection(workspaceFile, sectionName);
-
-  if (patterns.length > 0) {
-    return patterns;
-  }
-
-  return readWorkspaceSection(workspaceFile, fallbackSectionName);
-}
-
-function expandWorkspacePattern(rootDir, pattern) {
-  const normalizedPattern = pattern.replace(/\\/g, "/");
-
-  if (!normalizedPattern.includes("*")) {
-    return [path.join(rootDir, normalizedPattern)];
-  }
-
-  const starIndex = normalizedPattern.indexOf("*");
-  const basePart = normalizedPattern.slice(0, starIndex);
-  const suffixPart = normalizedPattern.slice(starIndex + 1);
-  const baseDir = path.join(rootDir, basePart);
-
-  if (!fs.existsSync(baseDir)) {
-    return [];
-  }
-
-  const suffixIsNamePattern = suffixPart && !suffixPart.startsWith("/");
-
-  return fs
-    .readdirSync(baseDir, { withFileTypes: true })
-    .filter((entry) => entry.isDirectory())
-    .filter((entry) => !suffixIsNamePattern || entry.name.endsWith(suffixPart))
-    .map((entry) => (suffixIsNamePattern
-      ? path.join(baseDir, entry.name)
-      : path.join(baseDir, entry.name, suffixPart)))
-    .filter((packageDir) => fs.existsSync(path.join(packageDir, "package.json")));
-}
-
-function getWorkspacePackages(rootDir, workspaceFile, sectionName, fallbackSectionName, scriptName) {
-  const patterns = fallbackSectionName
-    ? readWorkspaceSectionWithFallback(workspaceFile, sectionName, fallbackSectionName)
-    : readWorkspaceSection(workspaceFile, sectionName);
-  const included = new Set();
-  patterns.forEach((pattern) => {
-    const excluded = pattern.startsWith("!");
-    const resolvedPattern = excluded ? pattern.slice(1) : pattern;
-    expandWorkspacePattern(rootDir, resolvedPattern).forEach((packageDir) => {
-      const resolvedDir = path.resolve(packageDir);
-      if (excluded) included.delete(resolvedDir);
-      else included.add(resolvedDir);
-    });
-  });
-  const packageDirs = [...included];
-  const seen = new Set();
-
-  return packageDirs
-    .map((packageDir) => {
-      const packageJsonPath = path.join(packageDir, "package.json");
-
-      if (!fs.existsSync(packageJsonPath)) {
-        return null;
-      }
-
-      const packageJson = readJson(packageJsonPath);
-      const scripts = packageJson.scripts || {};
-
-      if (!packageJson.name || seen.has(packageJson.name) || (scriptName && !scripts[scriptName])) {
-        return null;
-      }
-
-      seen.add(packageJson.name);
-
-      return {
-        name: packageJson.name,
-        dir: path.relative(rootDir, packageDir),
-        packageJson,
-      };
-    })
-    .filter(Boolean);
-}
-
-function toTurboFilter(value) {
-  const normalized = value.replace(/\\/g, "/");
-
-  if (normalized.includes("/") && !normalized.startsWith("./") && !normalized.startsWith("../")) {
-    return `./${normalized}`;
-  }
-
-  return normalized;
-}
-
-module.exports = {
-  expandWorkspacePattern,
-  getWorkspacePackages,
-  readJson,
-  readWorkspaceList,
-  readWorkspaceSection,
-  readWorkspaceSectionWithFallback,
-  toTurboFilter,
-};
+const path = require("path");
+const YAML = require("yaml");
+
+function readJson(filePath) {
+  return JSON.parse(fs.readFileSync(filePath, "utf8"));
+}
+
+function readWorkspaceList(content, sectionName) {
+  let workspaceConfig;
+
+  try {
+    workspaceConfig = YAML.parse(content);
+  } catch (error) {
+    throw new Error(`无法解析 pnpm-workspace.yaml: ${error.message}`, { cause: error });
+  }
+
+  if (workspaceConfig == null) {
+    return [];
+  }
+
+  if (typeof workspaceConfig !== "object" || Array.isArray(workspaceConfig)) {
+    throw new TypeError("pnpm-workspace.yaml 的根节点必须是对象");
+  }
+
+  const patterns = workspaceConfig[sectionName];
+
+  if (patterns == null) {
+    return [];
+  }
+
+  if (
+    !Array.isArray(patterns)
+    || patterns.some((pattern) => typeof pattern !== "string" || pattern.trim().length === 0)
+  ) {
+    throw new TypeError(`pnpm-workspace.yaml 的 ${sectionName} 必须是非空字符串数组`);
+  }
+
+  return patterns;
+}
+
+function readWorkspaceSection(workspaceFile, sectionName) {
+  return readWorkspaceList(fs.readFileSync(workspaceFile, "utf8"), sectionName);
+}
+
+function readWorkspaceSectionWithFallback(workspaceFile, sectionName, fallbackSectionName) {
+  const patterns = readWorkspaceSection(workspaceFile, sectionName);
+
+  if (patterns.length > 0) {
+    return patterns;
+  }
+
+  return readWorkspaceSection(workspaceFile, fallbackSectionName);
+}
+
+function expandWorkspacePattern(rootDir, pattern) {
+  const normalizedPattern = pattern.replace(/\\/g, "/");
+
+  if (!normalizedPattern.includes("*")) {
+    return [path.join(rootDir, normalizedPattern)];
+  }
+
+  const starIndex = normalizedPattern.indexOf("*");
+  const basePart = normalizedPattern.slice(0, starIndex);
+  const suffixPart = normalizedPattern.slice(starIndex + 1);
+  const baseDir = path.join(rootDir, basePart);
+
+  if (!fs.existsSync(baseDir)) {
+    return [];
+  }
+
+  const suffixIsNamePattern = suffixPart && !suffixPart.startsWith("/");
+
+  return fs
+    .readdirSync(baseDir, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory())
+    .filter((entry) => !suffixIsNamePattern || entry.name.endsWith(suffixPart))
+    .map((entry) => (suffixIsNamePattern
+      ? path.join(baseDir, entry.name)
+      : path.join(baseDir, entry.name, suffixPart)))
+    .filter((packageDir) => fs.existsSync(path.join(packageDir, "package.json")));
+}
+
+function getWorkspacePackages(rootDir, workspaceFile, sectionName, fallbackSectionName, scriptName) {
+  const patterns = fallbackSectionName
+    ? readWorkspaceSectionWithFallback(workspaceFile, sectionName, fallbackSectionName)
+    : readWorkspaceSection(workspaceFile, sectionName);
+  const included = new Set();
+  patterns.forEach((pattern) => {
+    const excluded = pattern.startsWith("!");
+    const resolvedPattern = excluded ? pattern.slice(1) : pattern;
+    expandWorkspacePattern(rootDir, resolvedPattern).forEach((packageDir) => {
+      const resolvedDir = path.resolve(packageDir);
+      if (excluded) included.delete(resolvedDir);
+      else included.add(resolvedDir);
+    });
+  });
+  const packageDirs = [...included];
+  const seen = new Set();
+
+  return packageDirs
+    .map((packageDir) => {
+      const packageJsonPath = path.join(packageDir, "package.json");
+
+      if (!fs.existsSync(packageJsonPath)) {
+        return null;
+      }
+
+      const packageJson = readJson(packageJsonPath);
+      const scripts = packageJson.scripts || {};
+
+      if (!packageJson.name || seen.has(packageJson.name) || (scriptName && !scripts[scriptName])) {
+        return null;
+      }
+
+      seen.add(packageJson.name);
+
+      return {
+        name: packageJson.name,
+        dir: path.relative(rootDir, packageDir),
+        packageJson,
+      };
+    })
+    .filter(Boolean);
+}
+
+function toTurboFilter(value) {
+  const normalized = value.replace(/\\/g, "/");
+
+  if (normalized.includes("/") && !normalized.startsWith("./") && !normalized.startsWith("../")) {
+    return `./${normalized}`;
+  }
+
+  return normalized;
+}
+
+module.exports = {
+  expandWorkspacePattern,
+  getWorkspacePackages,
+  readJson,
+  readWorkspaceList,
+  readWorkspaceSection,
+  readWorkspaceSectionWithFallback,
+  toTurboFilter,
+};