@infly/libs 2.0.43 → 2.0.45

package/module/cjs/{request-url-rules.cjs → request-url-rules.js}

@@ -16,6 +16,11 @@ function normalizePathIncludes(pathIncludes) {
   return pathIncludes.filter(Boolean).map((path) => String(path));
 }
 
+function matchesConfiguredBaseURL(baseURL, configuredBaseURLs) {
+  const normalizedBaseURL = String(baseURL || "").trim().replace(/\/+$/, "");
+  return normalizeRuleDomains(configuredBaseURLs).includes(normalizedBaseURL);
+}
+
 function resolveInternalServiceURL(url, rules = []) {
   if (!url || !Array.isArray(rules) || rules.length === 0) {
     return null;
@@ -51,5 +56,6 @@ function resolveInternalServiceURL(url, rules = []) {
 }
 
 module.exports = {
+  matchesConfiguredBaseURL,
   resolveInternalServiceURL
 };

package/module/cjs/rest-error-rules.js

@@ -0,0 +1,33 @@
+function normalizeErrorPayload(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+    return undefined;
+  }
+
+  const message = payload.error || payload.detail || payload.message || payload.msg;
+  if (message && !payload.error) {
+    payload.error = message;
+  }
+
+  return message;
+}
+
+function resolveStatusErrorMessage(status, payload) {
+  const backendMessage = normalizeErrorPayload(payload);
+  const fallbackMessage = `请求失败(${status})`;
+  const statusMessages = {
+    400: backendMessage || fallbackMessage,
+    401: backendMessage || "登录信息已过期，请重新登录",
+    403: "您没有权限访问，请联系管理员",
+    500: backendMessage || fallbackMessage,
+    502: "网关错误，请稍后重试或联系开发人员",
+    503: "服务暂时不可用，请稍后重试",
+    504: "网关超时，请稍后重试或联系开发人员",
+  };
+
+  return statusMessages[status];
+}
+
+module.exports = {
+  normalizeErrorPayload,
+  resolveStatusErrorMessage,
+};

package/package.json

@@ -1,92 +1,124 @@
-{
-  "name": "@infly/libs",
-  "version": "2.0.43",
-  "description": "工具组件库",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node index.js",
-    "publishPkg": "npm version patch && npm publish --access=public --registry=https://registry.npmjs.org/",
-    "preview": "infly-libs --preview",
-    "preview:no-build": "infly-libs --preview --no-build",
-    "origin:preview": "infly-libs --preview",
-    "origin:preview:no-build": "infly-libs --preview --no-build"
-  },
-  "bin": {
-    "infly-libs": "bin/cli.js"
-  },
-  "exports": {
-    "./module/*": "./module/*",
-    "./dataInit/*": "./dataInit/*",
-    "./tools/*": "./tools/*",
-    "./store/*": "./store/*",
-    "./build/*": "./build/*",
-    "./script/build/*": "./script/build/*"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/kahal/npm-package"
-  },
-  "keywords": [
-    "infly",
-    "infly-libs",
-    "libs"
-  ],
-  "author": "Kahal",
-  "license": "ISC",
-  "dependencies": {
-    "enquirer": "^2.4.1",
-    "path-browserify": "^1.0.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "babel-loader": "^10.0.0",
-    "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4",
-    "webpack-node-externals": "^3.0.0"
-  },
-  "peerDependencies": {
-    "axios": "^0.27.2",
-    "html-webpack-plugin": "^5.5.3"
-  },
-  "optionalDependencies": {
-    "axios": "^0.27.2",
-    "html-webpack-plugin": "^5.5.3"
-  },
-  "infly": {
-    "buildConfigs": {
-      "buildFoldName": "[构建后目录名] 可选, 默认取值vue.config.js的outputDir, 配置化 eg: postal-benefits-level-pc",
-      "outputPath": "[输出文件目录链接] eg: ./ ",
-      "enabled": "[是否启用压缩] eg: true",
-      "gitAuto": "[是否自动提交git] eg: true",
-      "gitAutoPushReposBranchMap": {
-        "release-eg": "develop-eg [自动提交推送项目构建分支和构建仓库推送分支对应配置，必须]"
-      },
-      "gitAutoCommitText": "[自动提交文案] eg: build: 更新版本为v{version}, 推送构建文件与zip压缩包  --build by infly-libs",
-      "enablePreview": "[是否启用项目预览] eg: true",
-      "enableClipboard": "[是否启用粘贴板粘贴git信息] eg: true",
-      "openExplorer": "[是否自动打开资源管理器] eg: true",
-      "webhookUrl": "[消息推送机器人链接配置] eg: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=",
-      "webhookAtUser": [
-        "@人手机号"
-      ],
-      "webhookExtraText": "[消息推送额外文案] eg: 麻烦发下版",
-      "compressionLevel": 9
-    },
-    "versionConfig": {
-      "mainVersion": "[主版本号] 可选, 默认取值项目package version, eg: 1",
-      "links": {
-        "master": "[master分支构建文件推送地址] eg: https://e.sutpay.com",
-        "release": "[release分支构建文件推送地址] eg: http://114.132.55.214:8081/"
-      },
-      "platformName": "[用以split的项目平台名称] eg: 邮惠权益平台-运营端",
-      "baseName": "v{version}-{timestamp}.zip",
-      "versionList": [],
-      "disableUpdateVersionEnv": [
-        "development",
-        "staging  [禁用更新版本号的环境， 比如测试环境构建不需要更新version, 不配置默认禁用stage测试环境]"
-      ]
-    }
-  }
-}
+{
+  "name": "@infly/libs",
+  "version": "2.0.45",
+  "description": "不受前端框架限制的独立工具库",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "files": [
+    "index.js",
+    "bin/",
+    "compat/",
+    "adapters/vue2/",
+    "build/",
+    "module/",
+    "script/git-automation/",
+    "script/index.js",
+    "tools/",
+    "README.md",
+    "LICENSE",
+    "!**/*.test.js",
+    "!**/*.test.mjs"
+  ],
+  "scripts": {
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "test:watch": "vitest",
+    "check": "vitest run core-entry.test.js",
+    "prepublishOnly": "pnpm test",
+    "lint": "eslint .",
+    "lint:strict": "eslint . --max-warnings 0",
+    "postinstall": "node adapters/vue2/postinstall.js",
+    "publishPkg": "npm publish --access=public --registry=https://registry.npmjs.org/",
+    "preview": "infly-libs --preview",
+    "preview:no-build": "infly-libs --preview --no-build",
+    "origin:preview": "infly-libs --preview",
+    "origin:preview:no-build": "infly-libs --preview --no-build"
+  },
+  "bin": {
+    "infly-libs": "bin/cli.js"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./adapters/vue2/*": "./adapters/vue2/*",
+    "./adapters/vue2/build/*": "./adapters/vue2/build/*",
+    "./module/*": "./module/*",
+    "./store/*": "./adapters/vue2/store/*",
+    "./tools/*": "./tools/*",
+    "./build/*": "./build/*",
+    "./build/build-utils/*": "./build/build-utils/*",
+    "./script/git-automation/*": "./script/git-automation/*"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/gdinfly_1/admin-monorepo.git"
+  },
+  "keywords": [
+    "infly",
+    "infly-libs",
+    "libs"
+  ],
+  "author": "Kahal",
+  "license": "ISC",
+  "dependencies": {
+    "@infly/ts-libs": "workspace:*",
+    "connect": "^3.7.0",
+    "enquirer": "^2.4.1",
+    "path-browserify": "^1.0.1",
+    "serve-static": "^1.15.0",
+    "yaml": "^2.3.4"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-typescript": "^7.23.3",
+    "babel-loader": "^10.0.0",
+    "vite": "7.0.0",
+    "vitest": "^4.0.0",
+    "eslint": "^9.0.0",
+    "@eslint/js": "^9.0.0",
+    "globals": "^15.0.0"
+  },
+  "peerDependencies": {
+    "axios": "^0.27.2",
+    "html-webpack-plugin": "^5.5.3"
+  },
+  "optionalDependencies": {
+    "axios": "^0.27.2",
+    "html-webpack-plugin": "^5.5.3"
+  },
+  "infly": {
+    "buildConfigs": {
+      "buildFoldName": "[构建后目录名] 可选, 默认取值vue.config.js的outputDir, 配置化 eg: example-admin",
+      "outputPath": "[输出文件目录链接] eg: ./ ",
+      "enabled": "[是否启用压缩] eg: true",
+      "gitAuto": "[是否自动提交git] eg: true",
+      "gitAutoPushReposBranchMap": {
+        "release-eg": "develop-eg [自动提交推送项目构建分支和构建仓库推送分支对应配置，必须]"
+      },
+      "gitAutoCommitText": "[自动提交文案] eg: build: 更新版本为v{version}, 推送构建文件与zip压缩包  --build by infly-libs",
+      "enablePreview": "[是否启用项目预览] eg: true",
+      "enableClipboard": "[是否启用粘贴板粘贴git信息] eg: true",
+      "openExplorer": "[是否自动打开资源管理器] eg: true",
+      "webhookUrl": "[消息推送机器人链接配置] eg: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=",
+      "webhookAtUser": [
+        "@人手机号"
+      ],
+      "webhookExtraText": "[消息推送额外文案] eg: 麻烦发下版",
+      "compressionLevel": 9
+    },
+    "versionConfig": {
+      "mainVersion": "[主版本号] 可选, 默认取值项目package version, eg: 1",
+      "links": {
+        "master": "[master分支构建文件推送地址] eg: https://example.com",
+        "release": "[release分支构建文件推送地址] eg: https://staging.example.com"
+      },
+      "platformName": "[用以split的项目平台名称] eg: 示例平台-运营端",
+      "baseName": "v{version}-{timestamp}.zip",
+      "versionList": [],
+      "disableUpdateVersionEnv": [
+        "development",
+        "staging  [禁用更新版本号的环境， 比如测试环境构建不需要更新version, 不配置默认禁用stage测试环境]"
+      ]
+    }
+  }
+}

package/script/git-automation/git-clone.js

@@ -25,7 +25,7 @@ function cloneRepository(url, branch, targetDir) {
  * @description
  * eg: package.json
  *  {
-        "name": "postal-benefits-monorepo",
+        "name": "example-monorepo",
         "version": "1.0.0",
         "private": true,
         "projectConfig": {
@@ -34,9 +34,8 @@ function cloneRepository(url, branch, targetDir) {
             "baseGitUrl": "https://gitee.com/gdinfly_1/"
         },
         "workspaces": [
-            "apps/postal-benefits-platform",
-            "apps/postal-benefits-platform-merchant",
-            "apps/postal-benefits-platform-level"
+            "apps/example-admin",
+            "apps/example-portal"
         ]
     }
  *  

package/script/git-automation/git-configure.js

@@ -0,0 +1,29 @@
+const { execSync } = require("node:child_process");
+
+function configureMergeDriver() {
+  try {
+    const current = execSync("git config --global merge.ours.driver").toString().trim();
+    if (current) {
+      console.log("    -> merge.ours.driver 已配置:", current);
+      return true;
+    }
+  } catch (_) {
+    // 未配置，继续设置。
+  }
+
+  try {
+    execSync("git config --global merge.ours.driver true");
+    console.log("    √  merge.ours.driver 配置成功");
+    return true;
+  } catch (error) {
+    console.error("    ×  merge.ours.driver 配置失败:", error.message);
+    return false;
+  }
+}
+
+function configureGitAliases() {
+  // 预留：后续可在此配置 git alias
+  console.log("    -> git aliases 配置完成");
+}
+
+module.exports = { configureGitAliases, configureMergeDriver };

package/script/git-automation/index.js

@@ -521,20 +521,6 @@ function checkAndUpdateRootPackages(packagesDir, targetBranch = "master") {
     stdio: "inherit"
   });
 
-  // 只同步共享内容，保留当前分支配置和子模块集合
-  const mergeScriptPath = path.join(rootDir, "script", "sync-from-branch.sh");
-  if (fs.existsSync(mergeScriptPath)) {
-    execSync(`bash "${mergeScriptPath}" ${targetBranch}`, {
-      cwd: rootDir,
-      stdio: "inherit"
-    });
-  } else {
-    // 如果脚本不存在，使用基本的 merge 命令
-    execSync(`git merge origin/${targetBranch} --no-edit`, {
-      cwd: rootDir,
-      stdio: "inherit"
-    });
-  }
 
   console.log(global.logColor.success, `✅ admin-monorepo[${currentBranch}]: 已合并 ${targetBranch} 的最新更改到 packages、docs 等目录`);
   return [{ module: "admin-monorepo", success: true }];

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

@@ -0,0 +1,113 @@
+const path = require("node:path");
+const { spawnSync } = require("node:child_process");
+
+/**
+ * 在指定目录执行 git 命令，自动处理 safe.directory
+ */
+function runGit(cwd, args, { allowFailure = false } = {}) {
+  const absoluteCwd = path.resolve(cwd);
+  const safeDirectory = absoluteCwd.replaceAll("\\", "/");
+  const result = spawnSync(
+    "git",
+    ["-c", `safe.directory=${safeDirectory}`, "-C", absoluteCwd, ...args],
+    { encoding: "utf8", windowsHide: true },
+  );
+
+  if (result.status !== 0 && !allowFailure) {
+    const detail = (result.stderr || result.stdout || "Git command failed").trim();
+    throw new Error(detail);
+  }
+  if (result.status !== 0 && allowFailure) {
+    const detail = String(result.stderr || result.stdout || "").trim();
+    if (detail) {
+      process.stderr.write(`[submodule:status] git ${args.join(" ")}: ${detail}\n`);
+    }
+  }
+
+  return result.status === 0 ? result.stdout.trim() : "";
+}
+
+/**
+ * 从 .gitmodules 中读取所有已配置的子模块（名称、路径、配置分支）
+ */
+function getConfiguredSubmodules(rootDir) {
+  const output = runGit(rootDir, [
+    "config",
+    "--file",
+    ".gitmodules",
+    "--get-regexp",
+    "^submodule\\..*\\.path$",
+  ]);
+
+  return output.split(/\r?\n/).filter(Boolean).map((line) => {
+    const separator = line.search(/\s/);
+    const key = line.slice(0, separator);
+    const submodulePath = line.slice(separator).trim();
+    const name = key.slice("submodule.".length, -".path".length);
+    const configuredBranch = runGit(
+      rootDir,
+      ["config", "--file", ".gitmodules", "--get", `submodule.${name}.branch`],
+      { allowFailure: true },
+    );
+
+    return { name, path: submodulePath, configuredBranch };
+  });
+}
+
+/**
+ * 获取主仓 HEAD 中记录的某个子模块指针 commit
+ */
+function getParentPointer(rootDir, submodulePath) {
+  const treeEntry = runGit(rootDir, ["ls-tree", "HEAD", "--", submodulePath]);
+  return treeEntry ? treeEntry.split(/\s+/)[2] : "";
+}
+
+/**
+ * 检查单个子模块的状态：当前分支、HEAD、指针漂移、远程漂移、是否 dirty
+ */
+function inspectSubmodule(rootDir, submodule) {
+  const worktree = path.join(rootDir, submodule.path);
+  const pointer = getParentPointer(rootDir, submodule.path);
+  const head = runGit(worktree, ["rev-parse", "HEAD"], { allowFailure: true });
+
+  if (!head) {
+    return {
+      path: submodule.path,
+      branch: "-",
+      head: "-",
+      pointer: pointer ? pointer.slice(0, 8) : "-",
+      originMaster: "-",
+      state: "not-initialized",
+    };
+  }
+
+  const branch = runGit(worktree, ["branch", "--show-current"], { allowFailure: true });
+  const remoteBranch = submodule.configuredBranch || branch || "master";
+  const originHead = runGit(
+    worktree,
+    ["rev-parse", "--verify", `origin/${remoteBranch}`],
+    { allowFailure: true },
+  );
+  const dirty = Boolean(runGit(worktree, ["status", "--porcelain"], { allowFailure: true }));
+  const states = [];
+
+  if (dirty) states.push("dirty");
+  if (pointer && head !== pointer) states.push("pointer-drift");
+  if (originHead && head !== originHead) states.push("remote-drift");
+
+  return {
+    path: submodule.path,
+    branch: branch || "DETACHED",
+    head: head.slice(0, 8),
+    pointer: pointer ? pointer.slice(0, 8) : "-",
+    originMaster: originHead ? originHead.slice(0, 8) : "-",
+    state: states.length > 0 ? states.join(",") : "ok",
+  };
+}
+
+module.exports = {
+  getConfiguredSubmodules,
+  getParentPointer,
+  inspectSubmodule,
+  runGit,
+};

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

@@ -0,0 +1,18 @@
+const fs = require("fs");
+
+/**
+ * 从 .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 = { parseGitmodulesPaths };

package/script/index.js

@@ -1,26 +1 @@
-module.exports = {
-  previewList: [
-    {
-      key: "preview",
-      value: "infly-libs --preview"
-    },
-    {
-      key: "preview:no-build",
-      value: "infly-libs --preview --no-build"
-    }
-  ],
-  buildList: [
-    {
-      key: "build:prod",
-      value: "infly-libs beforeBuild && vue-cli-service build && infly-libs afterBuild"
-    },
-    {
-      key: "build:stage",
-      value: "infly-libs beforeBuild && vue-cli-service build --mode staging && infly-libs afterBuild"
-    },
-    {
-      key: "build:test",
-      value: "infly-libs beforeBuild && infly-libs afterBuild"
-    }
-  ]
-};
+module.exports = require("../adapters/vue2/script-config.js");

package/tools/auto-export.js

@@ -1,7 +1,6 @@
 /**
  * 自动导出目录下所有文件
  * @param {Function} requireContext - require.context 返回的函数
- * @param {RegExp} [filePattern=/\.vue$/] - 文件匹配正则
  * @returns {Object} 导出对象，key 为文件名（不含扩展名），value 为模块内容
  *
  * @example
@@ -15,7 +14,7 @@
  * // 或者直接一行
  * Object.assign(module.exports, autoExportFiles(require.context('./', false, /\.vue$/)));
  */
-function autoExportFiles(requireContext, filePattern = /\.vue$/) {
+function autoExportFiles(requireContext) {
   if (!requireContext || typeof requireContext !== 'function') {
     console.error('autoExportFiles: requireContext 必须是 require.context 返回的函数');
     return {};

package/tools/concurrency.js

@@ -0,0 +1,30 @@
+/**
+ * 异步并发限流器。
+ * 对 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/tools/progress.js

@@ -0,0 +1,63 @@
+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,
+};