@infly/libs 2.0.49 → 2.0.51

package/build/docker/compose-command.js

@@ -1,74 +1,74 @@
-const fs = require("node:fs");
-const path = require("node:path");
-
-const {
-  EXIT_SELECTION,
-  selectOption: defaultSelectOption,
-} = require("../../tools/select-option");
-const { composeRelease: defaultComposeRelease } = require("./compose-release");
-
-function loadTargetConfig(configPath) {
-  const resolvedPath = path.resolve(configPath);
-  delete require.cache[require.resolve(resolvedPath)];
-  return {
-    config: require(resolvedPath),
-    configDir: path.dirname(resolvedPath),
-  };
-}
-
-function loadPackageTargetConfig(cwd = process.cwd()) {
-  const packagePath = path.resolve(cwd, "package.json");
-  if (!fs.existsSync(packagePath)) {
-    throw new Error(`Package config not found: ${packagePath}`);
-  }
-  delete require.cache[require.resolve(packagePath)];
-  const packageJson = require(packagePath);
-  return {
-    config: packageJson.infly?.docker,
-    configDir: path.dirname(packagePath),
-  };
-}
-
-async function runComposeCommand(options = {}, dependencies = {}) {
-  const composeRelease = dependencies.composeRelease || defaultComposeRelease;
-  const usesDirectConfig = !options.config
-    && !options.configObject
-    && (options.projectDir || options.file);
-  if (usesDirectConfig) return composeRelease(options);
-
-  const loaded = options.config
-    ? loadTargetConfig(options.config)
-    : options.configObject
-      ? { config: options.configObject, configDir: options.configDir || process.cwd() }
-      : loadPackageTargetConfig(options.cwd || process.cwd());
-  const targets = loaded.config?.targets;
-  if (!targets || Object.keys(targets).length === 0) {
-    throw new Error("Docker target config must define at least one target.");
-  }
-
-  const selectOption = dependencies.selectOption || defaultSelectOption;
-  const log = dependencies.log || console.log;
-  const targetName = options.target || await selectOption(
-    "请选择 Docker 发布目标",
-    Object.entries(targets).map(([value, target]) => ({
-      value,
-      label: target.label || value,
-    })),
-  );
-  if (targetName === EXIT_SELECTION) {
-    log("已退出，未执行任何操作。");
-    return { cancelled: true };
-  }
-  const target = targets[targetName];
-  if (!target) throw new Error(`Unknown Docker target: ${targetName}`);
-
-  return composeRelease({
-    projectDir: loaded.configDir,
-    file: target.file,
-    bump: options.bump || "patch",
-    push: Boolean(options.push),
-    dryRun: Boolean(options.dryRun),
-  });
-}
-
-module.exports = { loadPackageTargetConfig, loadTargetConfig, runComposeCommand };
+const fs = require("node:fs");
+const path = require("node:path");
+
+const {
+  EXIT_SELECTION,
+  selectOption: defaultSelectOption,
+} = require("../../cli/select-option");
+const { composeRelease: defaultComposeRelease } = require("./compose-release");
+
+function loadTargetConfig(configPath) {
+  const resolvedPath = path.resolve(configPath);
+  delete require.cache[require.resolve(resolvedPath)];
+  return {
+    config: require(resolvedPath),
+    configDir: path.dirname(resolvedPath),
+  };
+}
+
+function loadPackageTargetConfig(cwd = process.cwd()) {
+  const packagePath = path.resolve(cwd, "package.json");
+  if (!fs.existsSync(packagePath)) {
+    throw new Error(`Package config not found: ${packagePath}`);
+  }
+  delete require.cache[require.resolve(packagePath)];
+  const packageJson = require(packagePath);
+  return {
+    config: packageJson.infly?.docker,
+    configDir: path.dirname(packagePath),
+  };
+}
+
+async function runComposeCommand(options = {}, dependencies = {}) {
+  const composeRelease = dependencies.composeRelease || defaultComposeRelease;
+  const usesDirectConfig = !options.config
+    && !options.configObject
+    && (options.projectDir || options.file);
+  if (usesDirectConfig) return composeRelease(options);
+
+  const loaded = options.config
+    ? loadTargetConfig(options.config)
+    : options.configObject
+      ? { config: options.configObject, configDir: options.configDir || process.cwd() }
+      : loadPackageTargetConfig(options.cwd || process.cwd());
+  const targets = loaded.config?.targets;
+  if (!targets || Object.keys(targets).length === 0) {
+    throw new Error("Docker target config must define at least one target.");
+  }
+
+  const selectOption = dependencies.selectOption || defaultSelectOption;
+  const log = dependencies.log || console.log;
+  const targetName = options.target || await selectOption(
+    "请选择 Docker 发布目标",
+    Object.entries(targets).map(([value, target]) => ({
+      value,
+      label: target.label || value,
+    })),
+  );
+  if (targetName === EXIT_SELECTION) {
+    log("已退出，未执行任何操作。");
+    return { cancelled: true };
+  }
+  const target = targets[targetName];
+  if (!target) throw new Error(`Unknown Docker target: ${targetName}`);
+
+  return composeRelease({
+    projectDir: loaded.configDir,
+    file: target.file,
+    bump: options.bump || "patch",
+    push: Boolean(options.push),
+    dryRun: Boolean(options.dryRun),
+  });
+}
+
+module.exports = { loadPackageTargetConfig, loadTargetConfig, runComposeCommand };

package/build/docker/release-docker.js

@@ -1,6 +1,6 @@
 const fs = require("node:fs");
 const path = require("node:path");
-const { execFileSync, spawnSync } = require("node:child_process");
+const { execFileSync, spawn, spawnSync } = require("node:child_process");
 const dotenv = require("dotenv");
 const { dockerBuildPush } = require("./docker-build-push");
 
@@ -45,6 +45,25 @@ function run(command, args, label, cwd) {
   if (result.status !== 0) throw new Error(`${label}失败，退出码: ${result.status}`);
 }
 
+function runAsync(command, args, label, cwd) {
+  return new Promise((resolve, reject) => {
+    console.log(`\n>>> ${label}`);
+    const child = spawn(command, args, {
+      cwd,
+      env: process.env,
+      stdio: "inherit",
+      shell: false,
+    });
+    child.once("error", (error) => {
+      reject(new Error(`${label}无法启动: ${error.message}`));
+    });
+    child.once("close", (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`${label}失败，退出码: ${code}`));
+    });
+  });
+}
+
 function runShellCommand(command, label, cwd) {
   if (/[\r\n&|<>^]/.test(command)) {
     throw new Error(`${label}包含不安全的 Windows shell 字符`);
@@ -52,16 +71,59 @@ function runShellCommand(command, label, cwd) {
   run(process.env.ComSpec || "cmd.exe", ["/d", "/s", "/c", command], label, cwd);
 }
 
-function runPnpmScript(scriptName, cwd) {
+function runShellCommandAsync(command, label, cwd) {
+  if (/[\r\n&|<>^]/.test(command)) {
+    throw new Error(`${label}包含不安全的 Windows shell 字符`);
+  }
+  return runAsync(
+    process.env.ComSpec || "cmd.exe",
+    ["/d", "/s", "/c", command],
+    label,
+    cwd
+  );
+}
+
+function buildPnpmScriptSpawn(scriptName) {
   if (!SAFE_SCRIPT_NAME.test(scriptName)) {
     throw new Error(`dockerRelease.checks 包含非法脚本名: ${scriptName}`);
   }
   const label = `项目检查: pnpm run ${scriptName}`;
   if (process.platform === "win32") {
-    runShellCommand(`pnpm run ${scriptName}`, label, cwd);
-  } else {
-    run("pnpm", ["run", scriptName], label, cwd);
+    const command = `pnpm run ${scriptName}`;
+    if (/[\r\n&|<>^]/.test(command)) {
+      throw new Error(`${label}包含不安全的 Windows shell 字符`);
+    }
+    return {
+      command: process.env.ComSpec || "cmd.exe",
+      args: ["/d", "/s", "/c", command],
+      label,
+    };
   }
+  return { command: "pnpm", args: ["run", scriptName], label };
+}
+
+function runPnpmScript(scriptName, cwd) {
+  const { command, args, label } = buildPnpmScriptSpawn(scriptName);
+  run(command, args, label, cwd);
+}
+
+async function runPnpmScriptAsync(scriptName, cwd) {
+  const { command, args, label } = buildPnpmScriptSpawn(scriptName);
+  return runAsync(command, args, label, cwd);
+}
+
+async function runProjectChecks(scriptNames, cwd) {
+  const results = await Promise.allSettled(
+    scriptNames.map((scriptName) => runPnpmScriptAsync(scriptName, cwd))
+  );
+  const failures = results
+    .map((result, index) => ({ result, scriptName: scriptNames[index] }))
+    .filter(({ result }) => result.status === "rejected");
+  if (failures.length === 0) return;
+  const lines = failures.map(({ result }) => `  - ${result.reason.message}`);
+  throw new Error(
+    `项目检查未全部通过（失败 ${failures.length}/${scriptNames.length}）:\n${lines.join("\n")}`
+  );
 }
 
 function runSonarScanner(cwd, projectVersion) {
@@ -168,7 +230,7 @@ async function releaseDocker(options = {}) {
     console.warn(`紧急原因: ${emergency.emergencyReason}`);
     console.warn(`目标 commit: ${projectVersion.fullCommit}`);
   } else {
-    for (const scriptName of config.checks) runPnpmScript(scriptName, projectRoot);
+    await runProjectChecks(config.checks, projectRoot);
   }
 
   if (!emergency.emergency && config.coverageReport) {
@@ -190,10 +252,12 @@ async function releaseDocker(options = {}) {
 
 module.exports = {
   assertCleanProject,
+  buildPnpmScriptSpawn,
   loadLocalReleaseEnv,
   normalizeEmergencyOptions,
   readReleaseConfig,
   releaseDocker,
   resolveInsideProject,
   resolveProjectVersion,
+  runProjectChecks,
 };

package/build/index.js

@@ -0,0 +1,34 @@
+const { run, spawnBackground } = require("./build-utils/command.js");
+const { createBuildContext, parseBuildContext, ENV } = require("./build-utils/env.js");
+const {
+  getTargetBranch,
+  updatePackageSources,
+  updateAppAndDistSources,
+  updateAllSources,
+  getDistRepoTasks,
+  printDryRunSourceUpdatePlan,
+} = require("./build-utils/git.js");
+const { postBatchWebhook } = require("./build-utils/webhook.js");
+const { startBatchPreviews } = require("./build-utils/preview.js");
+
+/**
+ * Stable public entry for repository-level build orchestration.
+ *
+ * Keep application selection and build ordering in the caller. This module only
+ * exposes framework-neutral lifecycle primitives owned by @infly/libs.
+ */
+module.exports = {
+  ENV,
+  createBuildContext,
+  getDistRepoTasks,
+  getTargetBranch,
+  parseBuildContext,
+  postBatchWebhook,
+  printDryRunSourceUpdatePlan,
+  run,
+  spawnBackground,
+  startBatchPreviews,
+  updateAllSources,
+  updateAppAndDistSources,
+  updatePackageSources,
+};

package/{tools/file-process.js → build/project-files.js}

@@ -1,52 +1,55 @@
-const fs = require("fs");
-const path = require("path");
-
-/**
- * 覆盖写入构建脚本
- * @param {String} filePath - 覆盖文件路径
- * @param {Array | Object} scriptsList - 写入脚本配置
- * @param {String} 更新字段值
- */
-function scriptWrite(filePath, scriptsList, updateKey = "scripts") {
-  const pkg = JSON.parse(fs.readFileSync(filePath));
-  pkg[updateKey] = pkg[updateKey] || {};
-  if (Array.isArray(scriptsList)) {
-    scriptsList.forEach(item => {
-      if (pkg[updateKey][item.key]) {
-        pkg[updateKey][`origin:${item.key}`] = pkg[updateKey][item.key];
-      }
-      pkg[updateKey][item.key] = item.value;
-    });
-  } else if (typeof scriptsList === "object") {
-    pkg[updateKey] = scriptsList;
-  }
-
-  fs.writeFileSync(filePath, JSON.stringify(pkg, null, 2));
-}
-
-/**
- * 获取文件绝对路径
- * @param {String} filePath - 文件路径
- * @returns
- */
-function targetProjectFileResolve(filePath) {
-  // 初始脚本自动执行路径会自动读取node_modules
-  const projectRoot = process.cwd();
-  const absoluteProjectRoot = projectRoot.replace(/\\node_modules.*$/g, "");
-  return path.resolve(absoluteProjectRoot, filePath);
-}
-
-/**
- * 获取文件绝对路径
- * @param {String} filePath - 文件路径
- * @returns
- */
-function currentProjectFileResolve(filePath) {
-  return path.join(__dirname, filePath);
-}
-
-module.exports = {
-  scriptWrite,
-  targetProjectFileResolve,
-  currentProjectFileResolve
-};
+const fs = require("fs");
+const path = require("path");
+
+// 兼容旧 tools/file-process.js 的 __dirname 路径语义。
+const legacyToolsDir = path.resolve(__dirname, "../tools");
+
+/**
+ * 覆盖写入构建脚本
+ * @param {String} filePath - 覆盖文件路径
+ * @param {Array | Object} scriptsList - 写入脚本配置
+ * @param {String} 更新字段值
+ */
+function scriptWrite(filePath, scriptsList, updateKey = "scripts") {
+  const pkg = JSON.parse(fs.readFileSync(filePath));
+  pkg[updateKey] = pkg[updateKey] || {};
+  if (Array.isArray(scriptsList)) {
+    scriptsList.forEach(item => {
+      if (pkg[updateKey][item.key]) {
+        pkg[updateKey][`origin:${item.key}`] = pkg[updateKey][item.key];
+      }
+      pkg[updateKey][item.key] = item.value;
+    });
+  } else if (typeof scriptsList === "object") {
+    pkg[updateKey] = scriptsList;
+  }
+
+  fs.writeFileSync(filePath, JSON.stringify(pkg, null, 2));
+}
+
+/**
+ * 获取文件绝对路径
+ * @param {String} filePath - 文件路径
+ * @returns
+ */
+function targetProjectFileResolve(filePath) {
+  // 初始脚本自动执行路径会自动读取node_modules
+  const projectRoot = process.cwd();
+  const absoluteProjectRoot = projectRoot.replace(/\\node_modules.*$/g, "");
+  return path.resolve(absoluteProjectRoot, filePath);
+}
+
+/**
+ * 获取文件绝对路径
+ * @param {String} filePath - 文件路径
+ * @returns
+ */
+function currentProjectFileResolve(filePath) {
+  return path.join(legacyToolsDir, filePath);
+}
+
+module.exports = {
+  scriptWrite,
+  targetProjectFileResolve,
+  currentProjectFileResolve
+};

package/{tools → cli}/progress.js

@@ -1,63 +1,67 @@
-function formatProgressLine({ label, completed, total, path = "" }) {
-  const safeTotal = Math.max(total, 1);
-  const percentage = total === 0 ? 100 : Math.round((completed / safeTotal) * 100);
-  const filled = Math.round(percentage / 5);
-  const bar = `${"█".repeat(filled)}${"░".repeat(20 - filled)}`;
-  return `${label} [${bar}] ${percentage}% (${completed}/${total})${path ? ` ${path}` : ""}`;
-}
-
-function createProgressReporter(options = {}) {
-  const stream = options.stream || process.stdout;
-  const quiet = Boolean(options.quiet);
-  const defaultLabels = {
-    status: "检查状态",
-    deinit: "停用模块",
-    init: "模块加载",
-  };
-  const labels = { ...defaultLabels, ...options.labels };
-  return (event) => {
-    if (quiet || !labels[event.phase] || event.total === 0) return;
-    const line = formatProgressLine({
-      ...event,
-      label: labels[event.phase],
-    });
-    if (stream.isTTY) {
-      stream.write(`\r${line}\x1b[K${event.done || event.completed >= event.total ? "\n" : ""}`);
-      return;
-    }
-    if (event.completed === 0 || event.done || event.completed >= event.total) stream.write(`${line}\n`);
-  };
-}
-
-function formatSwitchSummary(name, totalMs, dependencyResult, timings) {
-  const seconds = (totalMs / 1000).toFixed(1);
-  const dependencyLabel = dependencyResult.installed ? "，依赖已更新" : "";
-  const summary = `\n✅ ${name}（${seconds}s${dependencyLabel}）`;
-  if (!timings) return summary;
-  const labels = {
-    analyze: "分析",
-    precheck: "预检",
-    status: "状态",
-    deinit: "停用",
-    init: "加载",
-    install: "依赖",
-  };
-  const phases = Object.entries(labels)
-    .filter(([phase]) => Number.isFinite(timings[phase]))
-    .map(([phase, label]) => `${label} ${(timings[phase] / 1000).toFixed(1)}s`);
-  return phases.length > 0 ? `${summary}\n   阶段: ${phases.join(" | ")}` : summary;
-}
-
-function formatSlowStatusDetails(details, thresholdMs = 2000) {
-  return details
-    .filter((detail) => detail.durationMs > thresholdMs)
-    .sort((left, right) => right.durationMs - left.durationMs)
-    .map((detail) => `${detail.path} ${detail.durationMs}ms`);
-}
-
-module.exports = {
-  createProgressReporter,
-  formatProgressLine,
-  formatSlowStatusDetails,
-  formatSwitchSummary,
-};
+// CLI 与终端流程的进度呈现能力。
+function formatProgressLine({ label, completed, total, path = "" }) {
+  const safeTotal = Math.max(total, 1);
+  const percentage = total === 0 ? 100 : Math.round((completed / safeTotal) * 100);
+  const filled = Math.round(percentage / 5);
+  const bar = `${"█".repeat(filled)}${"░".repeat(20 - filled)}`;
+  return `${label} [${bar}] ${percentage}% (${completed}/${total})${path ? ` ${path}` : ""}`;
+}
+
+function createProgressReporter(options = {}) {
+  const stream = options.stream || process.stdout;
+  const quiet = Boolean(options.quiet);
+  const defaultLabels = {
+    status: "检查状态",
+    deinit: "停用模块",
+    init: "模块加载",
+  };
+  const labels = { ...defaultLabels, ...options.labels };
+  return (event) => {
+    if (quiet || !labels[event.phase] || event.total === 0) return;
+    const line = formatProgressLine({
+      ...event,
+      label: labels[event.phase],
+    });
+    if (stream.isTTY) {
+      stream.write(`\r${line}\x1b[K${event.done || event.completed >= event.total ? "\n" : ""}`);
+      return;
+    }
+    if (event.completed === 0 || event.done || event.completed >= event.total) stream.write(`${line}\n`);
+  };
+}
+
+function formatSwitchSummary(name, totalMs, dependencyResult, timings) {
+  const seconds = (totalMs / 1000).toFixed(1);
+  const dependencyLabel = dependencyResult.installed ? "，依赖已更新" : "";
+  const skipWarning = dependencyResult.reason === "skipped"
+    ? "\n⚠️ 已跳过依赖安装，后续 dev 缺依赖时请手动 pnpm install"
+    : "";
+  const summary = `\n✅ ${name}（${seconds}s${dependencyLabel}）${skipWarning}`;
+  if (!timings) return summary;
+  const labels = {
+    analyze: "分析",
+    precheck: "预检",
+    status: "状态",
+    deinit: "停用",
+    init: "加载",
+    install: "依赖",
+  };
+  const phases = Object.entries(labels)
+    .filter(([phase]) => Number.isFinite(timings[phase]))
+    .map(([phase, label]) => `${label} ${(timings[phase] / 1000).toFixed(1)}s`);
+  return phases.length > 0 ? `${summary}\n   阶段: ${phases.join(" | ")}` : summary;
+}
+
+function formatSlowStatusDetails(details, thresholdMs = 2000) {
+  return details
+    .filter((detail) => detail.durationMs > thresholdMs)
+    .sort((left, right) => right.durationMs - left.durationMs)
+    .map((detail) => `${detail.path} ${detail.durationMs}ms`);
+}
+
+module.exports = {
+  createProgressReporter,
+  formatProgressLine,
+  formatSlowStatusDetails,
+  formatSwitchSummary,
+};