@infly/libs 2.0.49 → 2.0.51

package/README.md

@@ -2,7 +2,7 @@
 
 ## 介绍
 
-`@infly/libs` 是不受 Vue、React 等前端框架限制的独立 JavaScript 工具库。包根入口无副作用；HTTP、Token、文件处理、Docker/Compose、通用项目命令等能力可被不同技术栈使用。
+`@infly/libs` 是不受 Vue、React 等前端框架限制的独立 JavaScript 工具库。包根入口无副作用；HTTP、Token、并发、workspace、发布计划、Docker/Compose、通用项目命令等能力可被不同技术栈使用。
 
 Vue 2 专属的 Permission、Vuex store、实例 mixin、Vue CLI 预览和 webpack 配置集中在 `adapters/vue2/`，避免核心入口依赖 Vue 项目约定。
 
@@ -17,8 +17,13 @@ admin-monorepo 的子模块独立构建；Monorepo 根构建不会调用该实
 @infly/libs
 ├── index.js                    # 框架无关、无副作用的包根入口
 ├── module/                     # HTTP、Token、格式化等通用模块
-├── tools/                      # 文件与项目命令等通用工具
+├── core/                       # 无框架、无工程上下文的纯能力
+│   └── async/concurrency.js    # 并发限流
+├── cli/                        # 终端进度、选择与配置驱动命令
+├── workspace/                  # workspace 配置、包发现与依赖图
+├── release/                    # 无副作用的 npm 版本与发布计划
 ├── build/
+│   ├── project-files.js        # 构建生命周期的项目文件处理
 │   ├── docker/                 # Docker/Compose 工具
 │   └── build-dist/             # 构建产物处理
 ├── adapters/vue2/
@@ -30,10 +35,13 @@ admin-monorepo 的子模块独立构建；Monorepo 根构建不会调用该实
 │   ├── vite/                   # Monorepo Vite 定位与兼容入口
 │   ├── webpack5/               # 独立子仓 Webpack 兼容适配器
 │   └── postinstall.js          # 仅 Vue 2 项目执行初始化
-├── bin/cli.js                  # 命令行入口
-└── dataInit/                   # 公共枚举
+├── adapters/webpack/           # require.context 等 Webpack 专属适配
+├── compat/                     # 历史能力与旧语义兼容
+└── bin/cli.js                  # 命令行入口
 ```
 
+实现按职责进入 `core/`、`cli/`、`workspace/`、`release/`、`build/`、`adapters/` 或 `compat/`。`tools/` 混合目录及其通配导出已移除；新代码必须使用包声明的稳定子路径。`module/`、`script/` 为 ADR-002 时代历史层（薄转发与兼容面），只保留既有应用引用，新代码不向其添加实现。
+
 Vue2 文件导出适配：
 
 ```javascript
@@ -129,7 +137,7 @@ infly-libs release:docker --local --health-check --health-timeout=60
 
 ## HTTP 环境保护配置
 
-`module/REST.js` 不内置任何项目域名。应用如需在测试环境误连正式接口时告警，应由应用显式注入完整的正式 API 基地址：
+`adapters/vue2/module/REST.js` 不内置任何项目域名。应用如需在测试环境误连正式接口时告警，应由应用显式注入完整的正式 API 基地址：
 
 ```javascript
 const service = createService({
@@ -141,6 +149,38 @@ const service = createService({
 
 ## 配置驱动的项目命令
 
+根仓或其他构建编排器需要使用通用构建原语时，只消费稳定入口 `@infly/libs/build`：
+
+```javascript
+const {
+  createBuildContext,
+  run,
+  updateAllSources,
+  postBatchWebhook,
+  startBatchPreviews,
+} = require("@infly/libs/build");
+```
+
+`build/build-utils/*` 是包内实现目录，不作为新的跨仓调用入口。应用选择、产品线、环境和构建顺序仍由调用方负责；该入口不改变 `infly-libs beforeBuild`、`afterBuild` 的现有行为。
+
+通用 workspace 与 Git 原语通过稳定子路径使用：
+
+```javascript
+const { runWithConcurrency } = require("@infly/libs/concurrency");
+const { createProgressReporter } = require("@infly/libs/progress");
+const { getWorkspacePackages } = require("@infly/libs/workspace-config");
+const { configureGitAliases } = require("@infly/libs/git/configure");
+const { inspectSubmodule } = require("@infly/libs/git/submodule-status");
+const { normalizeRelativePath, parseGitmodulesPaths } = require("@infly/libs/git/submodules");
+const {
+  discoverWorkspacePackages,
+  selectAffectedWorkspacePackages,
+} = require("@infly/libs/workspace-packages");
+const { buildReleasePlan, bumpPatch } = require("@infly/libs/npm-release");
+```
+
+这些入口只提供无业务含义的并发、进度、workspace 配置、包发现/依赖图、稳定版本发布计划和 Git 路径能力。`selectAffectedWorkspacePackages` 的全局变更判断由调用方注入；`buildReleasePlan` 只计算版本计划，不登录 npm、不访问 Registry、不写清单，也不提交或推送 Git。产品线解析、应用清单、切换锁、依赖安装指纹、gitlink 工作树治理和发布顺序仍由根仓负责。根仓初始化在 `node_modules` 尚未可用时需要运行，因此 `scripts/workspace` 中允许保留经过合同测试的无依赖自举实现。
+
 `project` 命令将多平台项目的开发和构建目标从 package scripts 移到项目配置：
 
 ```bash

package/adapters/vue2/project-preview.js

@@ -1,152 +1,152 @@
-const fs = require("fs");
-const path = require("path");
-const net = require("net");
-const { execSync } = require("child_process");
-
-const { scriptWrite } = require("../../tools/file-process.js");
-const { previewList } = require("./script-config.js");
-
-const projectRoot = process.cwd().replace(/\\node_modules.*$/g, "");
-const projectPkgPath = path.resolve(projectRoot, "package.json");
-const projectVueConfigPath = path.resolve(projectRoot, "vue.config.js");
-const projectConfig = fs.existsSync(projectVueConfigPath) ? require(projectVueConfigPath) : {};
-const projectPackage = fs.existsSync(projectPkgPath) ? require(projectPkgPath) : {};
-const rawArgv = process.argv.slice(2);
-const args = rawArgv.join(" ");
-
-function getBuildContext() {
-  try {
-    return JSON.parse(process.env.INFLY_BUILD_CONTEXT || "{}");
-  } catch {
-    return {};
-  }
-}
-
-const buildContext = getBuildContext();
-
-global.logColor = global.logColor || {
-  success: "\n\x1b[32m%s\x1b[0m",
-  error: "\n\x1b[31m%s\x1b[0m",
-  warning: "\n\x1b[33m%s\x1b[0m",
-  link: "\x1b[34m%s\x1b[0m",
-  info: "\n\x1b[36m%s\x1b[0m"
-};
-
-const DEFAULT_CONFIG = {
-  port: 9001,
-  publicPath: "/",
-  outputDir: "dist"
-};
-
-function scriptInit() {
-  if (fs.existsSync(projectVueConfigPath)) {
-    return;
-  }
-  scriptWrite(projectPkgPath, previewList);
-}
-
-function isPortAvailable(port) {
-  return new Promise((resolve) => {
-    const server = net.createServer();
-
-    server.listen(port, () => {
-      server.once("close", () => {
-        resolve(true);
-      });
-      server.close();
-    });
-
-    server.on("error", () => {
-      resolve(false);
-    });
-  });
-}
-
-async function findAvailablePort(startPort, maxTries = 10) {
-  for (let i = 0; i < maxTries; i++) {
-    const port = startPort + i;
-    const available = await isPortAvailable(port);
-
-    if (available) {
-      if (i > 0) {
-        console.log(global.logColor.warning, `⚠️  端口 ${startPort} 被占用，使用端口 ${port}`);
-      }
-      return port;
-    }
-  }
-
-  throw new Error(`无法找到可用端口，已尝试从 ${startPort} 到 ${startPort + maxTries - 1}`);
-}
-
-async function init(skipBuild = false) {
-  try {
-    const connect = require("connect");
-    const serveStatic = require("serve-static");
-    const app = connect();
-    const noBuild = skipBuild || rawArgv.includes("--no-build");
-    // Vite 构建：使用 workspace runner 传入的 target 输出目录
-    const useViteOutput = buildContext.outputDir && fs.existsSync(buildContext.outputDir);
-    const { devServer } = projectConfig || {};
-    const { port: devServerPort } = devServer || {};
-    projectConfig.port = devServerPort || DEFAULT_CONFIG.port;
-    const { publicPath, outputDir, port } = {
-      ...DEFAULT_CONFIG,
-      ...projectConfig
-    };
-    const serveDir = useViteOutput ? buildContext.outputDir : outputDir;
-    const baseListenPort = port - 1000;
-
-    if (!noBuild) {
-      buildProject();
-    }
-
-    const listenPort = await findAvailablePort(baseListenPort);
-
-    app.use(
-      publicPath,
-      serveStatic(serveDir, {
-        index: ["index.html", "/"]
-      })
-    );
-
-    const server = app.listen(listenPort, function () {
-      const previewUrl = `http://localhost:${listenPort}${publicPath}`;
-      const targetSuffix = buildContext.targetLabel ? ` (${buildContext.targetLabel})` : '';
-
-      if (buildContext.batchPreview === true || process.env.INFLY_BATCH_PREVIEW === "1") {
-        console.log(global.logColor.link, `${projectPackage.name || path.basename(projectRoot)}${targetSuffix}: ${previewUrl}`);
-        return;
-      }
-
-      console.log(global.logColor.success, `\x1b[42m\x1b[30m DONE \x1b[0m\x1b[32m  项目构建预览，CTRL + C结束：`);
-      console.log(global.logColor.link, previewUrl);
-    });
-
-    server.on("error", (error) => {
-      if (error.code === "EADDRINUSE") {
-        console.log(global.logColor.error, `❌ 端口 ${listenPort} 仍然被占用`);
-      } else {
-        console.log(global.logColor.error, `❌ 服务器启动失败：${error.message}`);
-      }
-    });
-
-    return server;
-  } catch (error) {
-    console.log(global.logColor.error, `❌ 预览项目失败：${error.message}`);
-    throw error;
-  }
-}
-
-function buildProject() {
-  try {
-    execSync(`vue-cli-service build ${args}`, { stdio: "inherit" });
-  } catch (err) {
-    console.error(global.logColor.error, "❌ 构建失败:", err.message);
-    process.exit(1);
-  }
-}
-
-module.exports = {
-  init,
-  scriptInit
-};
+const fs = require("fs");
+const path = require("path");
+const net = require("net");
+const { execSync } = require("child_process");
+
+const { scriptWrite } = require("../../build/project-files.js");
+const { previewList } = require("./script-config.js");
+
+const projectRoot = process.cwd().replace(/\\node_modules.*$/g, "");
+const projectPkgPath = path.resolve(projectRoot, "package.json");
+const projectVueConfigPath = path.resolve(projectRoot, "vue.config.js");
+const projectConfig = fs.existsSync(projectVueConfigPath) ? require(projectVueConfigPath) : {};
+const projectPackage = fs.existsSync(projectPkgPath) ? require(projectPkgPath) : {};
+const rawArgv = process.argv.slice(2);
+const args = rawArgv.join(" ");
+
+function getBuildContext() {
+  try {
+    return JSON.parse(process.env.INFLY_BUILD_CONTEXT || "{}");
+  } catch {
+    return {};
+  }
+}
+
+const buildContext = getBuildContext();
+
+global.logColor = global.logColor || {
+  success: "\n\x1b[32m%s\x1b[0m",
+  error: "\n\x1b[31m%s\x1b[0m",
+  warning: "\n\x1b[33m%s\x1b[0m",
+  link: "\x1b[34m%s\x1b[0m",
+  info: "\n\x1b[36m%s\x1b[0m"
+};
+
+const DEFAULT_CONFIG = {
+  port: 9001,
+  publicPath: "/",
+  outputDir: "dist"
+};
+
+function scriptInit() {
+  if (fs.existsSync(projectVueConfigPath)) {
+    return;
+  }
+  scriptWrite(projectPkgPath, previewList);
+}
+
+function isPortAvailable(port) {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+
+    server.listen(port, () => {
+      server.once("close", () => {
+        resolve(true);
+      });
+      server.close();
+    });
+
+    server.on("error", () => {
+      resolve(false);
+    });
+  });
+}
+
+async function findAvailablePort(startPort, maxTries = 10) {
+  for (let i = 0; i < maxTries; i++) {
+    const port = startPort + i;
+    const available = await isPortAvailable(port);
+
+    if (available) {
+      if (i > 0) {
+        console.log(global.logColor.warning, `⚠️  端口 ${startPort} 被占用，使用端口 ${port}`);
+      }
+      return port;
+    }
+  }
+
+  throw new Error(`无法找到可用端口，已尝试从 ${startPort} 到 ${startPort + maxTries - 1}`);
+}
+
+async function init(skipBuild = false) {
+  try {
+    const connect = require("connect");
+    const serveStatic = require("serve-static");
+    const app = connect();
+    const noBuild = skipBuild || rawArgv.includes("--no-build");
+    // Vite 构建：使用 workspace runner 传入的 target 输出目录
+    const useViteOutput = buildContext.outputDir && fs.existsSync(buildContext.outputDir);
+    const { devServer } = projectConfig || {};
+    const { port: devServerPort } = devServer || {};
+    projectConfig.port = devServerPort || DEFAULT_CONFIG.port;
+    const { publicPath, outputDir, port } = {
+      ...DEFAULT_CONFIG,
+      ...projectConfig
+    };
+    const serveDir = useViteOutput ? buildContext.outputDir : outputDir;
+    const baseListenPort = port - 1000;
+
+    if (!noBuild) {
+      buildProject();
+    }
+
+    const listenPort = await findAvailablePort(baseListenPort);
+
+    app.use(
+      publicPath,
+      serveStatic(serveDir, {
+        index: ["index.html", "/"]
+      })
+    );
+
+    const server = app.listen(listenPort, function () {
+      const previewUrl = `http://localhost:${listenPort}${publicPath}`;
+      const targetSuffix = buildContext.targetLabel ? ` (${buildContext.targetLabel})` : '';
+
+      if (buildContext.batchPreview === true || process.env.INFLY_BATCH_PREVIEW === "1") {
+        console.log(global.logColor.link, `${projectPackage.name || path.basename(projectRoot)}${targetSuffix}: ${previewUrl}`);
+        return;
+      }
+
+      console.log(global.logColor.success, `\x1b[42m\x1b[30m DONE \x1b[0m\x1b[32m  项目构建预览，CTRL + C结束：`);
+      console.log(global.logColor.link, previewUrl);
+    });
+
+    server.on("error", (error) => {
+      if (error.code === "EADDRINUSE") {
+        console.log(global.logColor.error, `❌ 端口 ${listenPort} 仍然被占用`);
+      } else {
+        console.log(global.logColor.error, `❌ 服务器启动失败：${error.message}`);
+      }
+    });
+
+    return server;
+  } catch (error) {
+    console.log(global.logColor.error, `❌ 预览项目失败：${error.message}`);
+    throw error;
+  }
+}
+
+function buildProject() {
+  try {
+    execSync(`vue-cli-service build ${args}`, { stdio: "inherit" });
+  } catch (err) {
+    console.error(global.logColor.error, "❌ 构建失败:", err.message);
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  init,
+  scriptInit
+};

package/{tools → adapters/webpack}/auto-export.js

@@ -1,55 +1,56 @@
-/**
- * 自动导出目录下所有文件
- * @param {Function} requireContext - require.context 返回的函数
- * @returns {Object} 导出对象，key 为文件名（不含扩展名），value 为模块内容
- *
- * @example
- * // 在 components/Dialog/index.js 中使用
- * import { autoExportFiles } from '@infly/libs/tools/auto-export.js';
- * const components = autoExportFiles(require.context('./', false, /\.vue$/));
- * Object.keys(components).forEach(name => {
- *   module.exports[name] = components[name];
- * });
- *
- * // 或者直接一行
- * Object.assign(module.exports, autoExportFiles(require.context('./', false, /\.vue$/)));
- */
-function autoExportFiles(requireContext) {
-  if (!requireContext || typeof requireContext !== 'function') {
-    console.error('autoExportFiles: requireContext 必须是 require.context 返回的函数');
-    return {};
-  }
-
-  const exports = {};
-
-  requireContext.keys().forEach(fileName => {
-    // 跳过 index 文件自身
-    if (fileName.includes('index')) return;
-
-    const componentConfig = requireContext(fileName);
-    const componentName = fileName
-      .replace(/^\.\//, '')        // 移除 './'
-      .replace(/\.\w+$/, '');      // 移除扩展名
-
-    exports[componentName] = componentConfig.default || componentConfig;
-  });
-
-  return exports;
-}
-
-/**
- * 简化版：直接挂载到 module.exports
- * @param {Function} requireContext - require.context 返回的函数
- * @param {Object} targetExports - 目标导出对象（通常是 module.exports）
- *
- * @example
- * // 在 components/Dialog/index.js 中使用
- * import { autoExportToModule } from '@infly/libs/tools/auto-export.js';
- * autoExportToModule(require.context('./', false, /\.vue$/), module.exports);
- */
-function autoExportToModule(requireContext, targetExports) {
-  const files = autoExportFiles(requireContext);
-  Object.assign(targetExports, files);
-}
-
-export { autoExportFiles, autoExportToModule };
+/**
+ * Webpack require.context 适配器。
+ * 自动导出目录下所有文件
+ * @param {Function} requireContext - require.context 返回的函数
+ * @returns {Object} 导出对象，key 为文件名（不含扩展名），value 为模块内容
+ *
+ * @example
+ * // 在 components/Dialog/index.js 中使用
+ * import { autoExportFiles } from '@infly/libs/adapters/webpack/auto-export';
+ * const components = autoExportFiles(require.context('./', false, /\.vue$/));
+ * Object.keys(components).forEach(name => {
+ *   module.exports[name] = components[name];
+ * });
+ *
+ * // 或者直接一行
+ * Object.assign(module.exports, autoExportFiles(require.context('./', false, /\.vue$/)));
+ */
+function autoExportFiles(requireContext) {
+  if (!requireContext || typeof requireContext !== 'function') {
+    console.error('autoExportFiles: requireContext 必须是 require.context 返回的函数');
+    return {};
+  }
+
+  const exports = {};
+
+  requireContext.keys().forEach(fileName => {
+    // 跳过 index 文件自身
+    if (fileName.includes('index')) return;
+
+    const componentConfig = requireContext(fileName);
+    const componentName = fileName
+      .replace(/^\.\//, '')        // 移除 './'
+      .replace(/\.\w+$/, '');      // 移除扩展名
+
+    exports[componentName] = componentConfig.default || componentConfig;
+  });
+
+  return exports;
+}
+
+/**
+ * 简化版：直接挂载到 module.exports
+ * @param {Function} requireContext - require.context 返回的函数
+ * @param {Object} targetExports - 目标导出对象（通常是 module.exports）
+ *
+ * @example
+ * // 在 components/Dialog/index.js 中使用
+ * import { autoExportToModule } from '@infly/libs/adapters/webpack/auto-export';
+ * autoExportToModule(require.context('./', false, /\.vue$/), module.exports);
+ */
+function autoExportToModule(requireContext, targetExports) {
+  const files = autoExportFiles(requireContext);
+  Object.assign(targetExports, files);
+}
+
+export { autoExportFiles, autoExportToModule };

package/bin/cli.js

@@ -125,7 +125,7 @@ async function main(argv = process.argv.slice(2)) {
     project: () => {
       const action = argv[1] && !argv[1].startsWith("--") ? argv[1] : undefined;
       const opts = parseProjectArgs(argv.slice(action ? 2 : 1));
-      return require("../tools/project-command").runProjectCommand({ ...opts, action });
+      return require("../cli/project-command").runProjectCommand({ ...opts, action });
     },
   };