@infly/libs 2.0.44 → 2.0.45

package/module/Uts.js

@@ -9,471 +9,75 @@
  * import Uts from "@infly/libs/module/Uts.js" 不变，所有 Uts.xxx() 不变。
  *
  * 🚫 新增工具函数请提交到 @infly/ts-libs，不得在本文件或 module/ 下新增原创逻辑。
- *    如需向后兼容别名，在本文件添加 re-export 即可。
+ *    @infly/ts-libs 新增的导出会自动聚合到 Uts 对象，无需手动同步。
  */
 
 // ========================
-// 纯逻辑 — 统一来自 @infly/ts-libs
-// ========================
-import {
-  isTrue,
-  isFunction,
-  isDefined,
-  isUndefined,
-  isBoolean,
-  isObject,
-  isArray,
-  isPureObject,
-  isRegExp,
-  isNumber,
-  isNull,
-  isString,
-  isDate,
-  isError,
-  isPresentValue,
-  isNaNValue,
-  notEmptyString,
-  notEmptyArray,
-  notEmptyObject,
-  safeRegString,
-  changeDangerousString,
-  startWith,
-  endWith,
-  toLowerCase,
-  toUpperCase,
-  parse,
-  toJSON,
-  match,
-  notContainReg,
-  getPartStringBySymbolIndex,
-  safeDateString,
-  hadEncode,
-  ifHadEncode,
-  hadWord,
-  encryptString,
-  reorderString,
-  min,
-  float,
-  filterMoney,
-  formatMoney,
-  digitUppercase,
-  exchangeMoneyByUnit,
-  getNumberValueByUnit,
-  splitMoney,
-  formatNumUnit,
-  generateEmptyArray,
-  parseFloatValue,
-  now,
-  daysInMonth,
-  getWeek,
-  getDayStamp,
-  getNumDayBefore,
-  getTimeFromSymbol,
-  getTimeFromMillisecond,
-  formatDate,
-  validateIDCard,
-  validatePhoneNumber,
-  isIntPrice,
-  TR,
-  checkCondition,
-  or,
-  and,
-  pluck,
-  pluckMap,
-  uniqueArray,
-  uniqueObjArray,
-  mergeArrayWithoutDuplicate,
-  sum,
-  countTotalFromArray,
-  findIndex,
-  index,
-  contain,
-  findObjByCondition,
-  filterObjByCondition,
-  filterObjByRegexpCondition,
-  sort,
-  reorderByArrayIndex,
-  getSameBetweenArray,
-  removeItemFromArray,
-  arrayUpdateEachValue,
-  fetchStringArrayToObject,
-  generateArray,
-  join,
-  convertToArray,
-  loop,
-  generatePathByParent,
-  pushArray,
-  mergeArray,
-  unshiftArray,
-  concat,
-  getObjectKeys,
-  DAO,
-  getNestedValue,
-  objectIsEqual,
-  arrayIsEqual,
-  mergeObjectWithReference,
-  extend,
-  toStr,
-  getAutoMatchFromConfig,
-  setListToMap,
-  filterCommaFields,
-  updateObjectByConfig
-} from "@infly/ts-libs";
-
-// ========================
-// 浏览器依赖 — 全部来自 @infly/ts-libs/browser/
+// 聚合所有 @infly/ts-libs 导出（命名空间导入，自动跟随 ts-libs 更新）
 // ========================
+import * as tsLibs from "@infly/ts-libs";
 import * as dom from "@infly/ts-libs/browser/dom";
 import * as st from "@infly/ts-libs/browser/storage";
 import * as rt from "@infly/ts-libs/browser/route";
 import * as env from "@infly/ts-libs/browser/env";
 import * as pm from "@infly/ts-libs/browser/permission";
-import { copyObj } from "@infly/ts-libs/browser/clone";
-import {
-  checkValueByExpression,
-  useConfigExpression,
-  conditionFunctionRender,
-  paramsToSearch as _paramsToSearch,
-  setUtsRef as _setExprUtsRef,
-  setStorageRef
-} from "@infly/ts-libs/browser/expression";
-import { each, objEach, setIterateUtsRef } from "@infly/ts-libs/browser/iterate";
-import { loopTree, generatePathForTree, randomOrder, setTreeUtsRef } from "@infly/ts-libs/browser/tree";
-import {
-  highlightKeyWord,
-  autoMatch,
-  textConfig,
-  checkConfig,
-  checkOrgCode,
-  changeLanguage,
-  compressStr,
-  unCompressStr,
-  setAutoState,
-  getAutoState,
-  cleanStateScope,
-  changeDomainWhenExternal,
-  getGatewayDomain,
-  transArrayBufferToObj,
-  removeState as _removeState,
-  copyText,
-  copyHtml,
-  copyImage,
-  blobToDataURI,
-  ce,
-  te,
-  runCode,
-  regHook,
-  back,
-  noHref,
-  generateFlag,
-  setExtraRefs,
-  saveTempStoreList
-} from "@infly/ts-libs/browser/extra";
+import * as cloneMod from "@infly/ts-libs/browser/clone";
+import * as expression from "@infly/ts-libs/browser/expression";
+import * as iterate from "@infly/ts-libs/browser/iterate";
+import * as treeMod from "@infly/ts-libs/browser/tree";
+import * as extra from "@infly/ts-libs/browser/extra";
+import { create$state } from "@infly/ts-libs/browser/state";
 
 // ========================
-// CommonJS
+// CommonJS（page-config 为 CJS 模块）
 // ========================
-const { deepMerge: deepMergeImpl } = require("./cjs/deep-merge.cjs");
-const {
-  mergePageConfig: mergePageConfigImpl,
-  resolvePlatformPageConfig: resolvePlatformPageConfigImpl
-} = require("./cjs/page-config.cjs");
+const { mergePageConfig, resolvePlatformPageConfig } = require("./cjs/page-config.js");
 
 // ========================
-// 别名（ts-libs 避免 shadow 全局名）
-// ========================
-const isNaNImpl = isNaNValue;
-const parseFloatImpl = parseFloatValue;
-const getTimeFromSybol = getTimeFromSymbol;
-const paramsToSearch = _paramsToSearch;
-
-import { create$state } from "@infly/ts-libs/browser/state";
-
-// ========================
-// Uts 对象组装
+// Uts 对象组装 — 聚合所有 ts-libs 导出
 // ========================
 let Uts = {
-  // -- check/is --
-  isTrue,
-  isFunction,
-  isDefined,
-  isUndefined,
-  isBoolean,
-  isObject,
-  isArray,
-  isPureObject,
-  isRegExp,
-  isNumber,
-  isNull,
-  isString,
-  isDate,
-  isError,
-  isNaN: isNaNImpl,
-  isPresentValue,
-  notEmptyString,
-  notEmptyArray,
-  notEmptyObject,
-
-  // -- 迭代 (uts/iterate.js) --
-  each,
-  objEach,
-
-  // -- string --
-  safeRegString,
-  changeDangerousString,
-  startWith,
-  endWith,
-  toLowerCase,
-  toUpperCase,
-  parse,
-  toJSON,
-  match,
-  notContainReg,
-  getPartStringBySymbolIndex,
-  safeDateString,
-  hadEncode,
-  ifHadEncode,
-  hadWord,
-  encryptString,
-  reorderString,
-
-  // -- condition / expression --
-  TR,
-  checkCondition,
-  or,
-  and,
-  checkValueByExpression,
-  useConfigExpression,
-  conditionFunctionRender,
-
-  // -- math --
-  min,
-  float,
-  parseFloat: parseFloatImpl,
-  filterMoney,
-  formatMoney,
-  digitUppercase,
-  exchangeMoneyByUnit,
-  getNumberValueByUnit,
-  splitMoney,
-  formatNumUnit,
-  generateEmptyArray,
-
-  // -- date --
-  now,
-  daysInMonth,
-  getWeek,
-  getDayStamp,
-  getNumDayBefore,
-  getTimeFromSybol,
-  getTimeFromMillisecond,
-  formatDate,
-
-  // -- validation --
-  validateIDCard,
-  validatePhoneNumber,
-  isIntPrice,
-
-  // -- array --
-  pluck,
-  pluckMap,
-  uniqueArray,
-  uniqueObjArray,
-  mergeArrayWithoutDuplicate,
-  sum,
-  countTotalFromArray,
-  findIndex,
-  index,
-  contain,
-  findObjByCondition,
-  filterObjByCondition,
-  filterObjByRegexpCondition,
-  sort,
-  reorderByArrayIndex,
-  getSameBetweenArray,
-  removeItemFromArray,
-  arrayUpdateEachValue,
-  fetchObjectArrayToStringArray: pluck,
-  fetchStringArrayToObject,
-  generateArray,
-  join,
-  convertToArray,
-  loop,
-  generatePathByParent,
-  pushArray,
-  mergeArray,
-  unshiftArray,
-  concat,
-  randomOrder,
-  loopTree,
-  generatePathForTree,
-  pluckArray: pluck,
-
-  // -- object --
-  getObjectKeys,
-  DAO,
-  getNestedValue,
-  objectIsEqual,
-  arrayIsEqual,
-  mergeObjectWithReference,
-  extend,
-  toStr,
-  getAutoMatchFromConfig,
-  setListToMap,
-  filterCommaFields,
-  deepMerge: deepMergeImpl,
-  mergePageConfig: mergePageConfigImpl,
-  resolvePlatformPageConfig: resolvePlatformPageConfigImpl,
-  copyObj,
-  paramsToSearch,
-  updateObjectByConfig,
-
-  // -- 业务/杂项 (uts/extra.js) --
-  highlightKeyWord,
-  autoMatch,
-  textConfig,
-  checkConfig,
-  checkOrgCode,
-  changeLanguage,
-  compressStr,
-  unCompressStr,
-  setAutoState,
-  getAutoState,
-  cleanStateScope,
-  changeDomainWhenExternal,
-  getGatewayDomain,
-  transArrayBufferToObj,
-  removeState: _removeState,
-  copyText,
-  copyHtml,
-  copyImage,
-  blobToDataURI,
-  ce,
-  te,
-  runCode,
-  regHook,
-  back,
-  noHref,
-  generateFlag,
-  saveTempStoreList,
-
-  // -- DOM (uts/dom.js) --
-  E: dom.E,
-  createDom: dom.createDom,
-  addDom: dom.addDom,
-  removeDom: dom.removeDom,
-  hasClass: dom.hasClass,
-  addClass: dom.addClass,
-  removeClass: dom.removeClass,
-  toggleClass: dom.toggleClass,
-  closest: dom.closest,
-  hasParentWithPartClass: dom.hasParentWithPartClass,
-  html: dom.html,
-  getTagName: dom.getTagName,
-  getTagValue: dom.getTagValue,
-  setStyle: dom.setStyle,
-  getStyle: dom.getStyle,
-  getPS: dom.getPS,
-  getElementOffset: dom.getElementOffset,
-  getPointAtElement: dom.getPointAtElement,
-  getTextWidth: dom.getTextWidth,
-  setAttr: dom.setAttr,
-  setAttrs: dom.setAttrs,
-  removeAttr: dom.removeAttr,
-  addScript: dom.addScript,
-  loadStyleSheet: dom.loadStyleSheet,
-  loadIframe: dom.loadIframe,
-  stripTag: dom.stripTag,
-  setFavicon: dom.setFavicon,
-  isDom: dom.isDom,
-
-  // -- Storage (uts/storage.js) --
-  getCookie: st.getCookie,
-  setCookie: st.setCookie,
-  removeCookie: st.removeCookie,
-  setCookieMt: st.setCookieMt,
-  cookiesMap: st.cookiesMap,
-  storage: st.storage,
-  ssStorage: st.ssStorage,
-
-  // -- Route (uts/route.js) --
-  $stateTo: rt.$stateTo,
-  $stateGo: rt.$stateGo,
-  href: rt.href,
-  getRouterSearch: rt.getRouterSearch,
-  getParamsFormSearch: rt.getParamsFormSearch,
-  pushState: rt.pushState,
-  repleaceState: rt.repleaceState,
-  initHashCache: rt.initHashCache,
-  cleanState: rt.cleanState,
-
-  // -- Env (uts/env.js) --
-  getEnv: env.getEnv,
-  getOrigin: env.getOrigin,
-  isDevMode: env.isDevMode,
-  isDebugMode: env.isDebugMode,
-  isIe: env.isIe,
-  isWeiXin: env.isWeiXin,
-  initUA: env.initUA,
-  isTablet: env.isTablet,
-  isUA: env.isUA,
-  toggleMobileViewport: env.toggleMobileViewport,
-  getClientPX: env.getClientPX,
-  hasPhysicalHomeKey: env.hasPhysicalHomeKey,
-  getWwwFile: env.getWwwFile,
-  normalizeEnvUrl: env.normalizeEnvUrl,
-  getWapDomain: env.getWapDomain,
-  getUrlParam: env.getUrlParam,
-  removeParamByRegex: env.removeParamByRegex,
-
-  // -- Permission (uts/permission.js) --
-  getCurrentProject: pm.getCurrentProject,
-  getProjectTokenName: pm.getProjectTokenName,
-  getTokenForProject: pm.getTokenForProject,
-  isLogin: pm.isLogin,
-  setPM: pm.setPM,
-  getPM: pm.getPM,
-  getPMBySettings: pm.getPMBySettings,
-  filterPM: pm.filterPM,
-  routeToDomain: pm.routeToDomain,
-  clearCacheForLogout: pm.clearCacheForLogout,
-  clearAllCookiesAndStorage: pm.clearAllCookiesAndStorage,
-
-  // -- 遗留配置 --
-  FINDDOMAINEXP: /[^.]+\.[^.]+$/,
-  TAGNAMEEXP: /<([^\s>]+)(\s|>)+/,
-  allTagEXP: /<[^>]+>/gim,
-  TAGVALUEEXP(tagName) {
-    return new RegExp("^<" + tagName + "[^>]{0,}>|</" + tagName + ">$", "g");
-  },
-  EVERYDAYCACHE: "EveryDayArr",
-  removeHashSiteList: ["bio"],
-  tokenNameConfig: {
-    www: "accrosToken",
-    oms: "omsLoginToken",
-    sp: "SPAccrosToken",
-    hms: "accrosToken",
-    bio: "bioLoginToken",
-    lab: "labLoginToken",
-    exam: "examLoginToken",
-    srs: "srsLoginToken"
-  },
-  permissionsConfig: {},
-  UI6PageLists: [],
-  keeyCookieWhenLogOut: [],
-  keepStoreListWhenLogOut: [],
-  autoKeepSessionWhenLogOut: []
+  // -- 纯逻辑 + 浏览器依赖（spread 自动聚合，ts-libs 新增导出无需手动同步）--
+  ...tsLibs,
+  ...dom,
+  ...st,
+  ...rt,
+  ...env,
+  ...pm,
+  ...cloneMod,
+  ...expression,
+  ...iterate,
+  ...treeMod,
+  ...extra,
+
+  // -- 向后兼容别名（ts-libs 用不同名称避免 shadow 全局名；历史拼写兼容）--
+  isNaN: tsLibs.isNaNValue,
+  parseFloat: tsLibs.parseFloatValue,
+  getTimeFromSybol: tsLibs.getTimeFromSymbol,
+  fetchObjectArrayToStringArray: tsLibs.pluck,
+  pluckArray: tsLibs.pluck,
+
+  // -- CJS page-config --
+  mergePageConfig,
+  resolvePlatformPageConfig,
 };
 
+// 删除浏览器模块的内部函数（仅用于引用注入，不应暴露给消费者）
+delete Uts.setIterateUtsRef; // iterate 模块
+delete Uts.setTreeUtsRef; // tree 模块
+delete Uts.setUtsRef; // expression 模块
+delete Uts.setStorageRef; // expression 模块
+delete Uts.setExtraRefs; // extra 模块
+
 // ========================
 // 注入引用链（解除循环依赖）
 // ========================
 global.Uts = Uts;
 create$state(Uts);
-setIterateUtsRef(Uts);
-setTreeUtsRef(Uts);
-_setExprUtsRef(Uts);
-setStorageRef(st);
-setExtraRefs(Uts, st, env);
+iterate.setIterateUtsRef(Uts);
+treeMod.setTreeUtsRef(Uts);
+expression.setUtsRef(Uts);
+expression.setStorageRef(st);
+extra.setExtraRefs(Uts, st, env);
 
 export default Uts;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@infly/libs",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "description": "不受前端框架限制的独立工具库",
   "main": "index.js",
+  "types": "index.d.ts",
   "files": [
     "index.js",
     "bin/",
@@ -10,22 +11,20 @@
     "adapters/vue2/",
     "build/",
     "module/",
-    "script/build/",
     "script/git-automation/",
     "script/index.js",
-    "script/webhook/",
-    "store/",
     "tools/",
     "README.md",
     "LICENSE",
     "!**/*.test.js",
-    "!**/*.test.cjs",
     "!**/*.test.mjs"
   ],
   "scripts": {
-    "test": "node --test --test-timeout=30000 core-entry.test.js adapters/vue2/compatibility.test.js build/build-dist/script-management.test.js build/docker/compose-command.test.js build/docker/compose-release.test.js build/docker/docker-build-push.test.js build/webpack5/webpack.base.test.js tools/project-command.test.js tools/select-option.test.js module/cjs/request-url-rules.test.cjs module/cjs/rest-error-rules.test.cjs script/build/webhook.test.js script/pts/generate-cloud-params.test.mjs",
-    "test:coverage": "node --test --test-timeout=30000 --experimental-test-coverage core-entry.test.js adapters/vue2/compatibility.test.js build/build-dist/script-management.test.js build/docker/compose-command.test.js build/docker/compose-release.test.js build/docker/docker-build-push.test.js build/webpack5/webpack.base.test.js tools/project-command.test.js tools/select-option.test.js module/cjs/request-url-rules.test.cjs module/cjs/rest-error-rules.test.cjs script/build/webhook.test.js script/pts/generate-cloud-params.test.mjs",
-    "check": "node --test --test-timeout=30000 core-entry.test.js",
+    "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",
@@ -43,14 +42,15 @@
     "./adapters/vue2/*": "./adapters/vue2/*",
     "./adapters/vue2/build/*": "./adapters/vue2/build/*",
     "./module/*": "./module/*",
+    "./store/*": "./adapters/vue2/store/*",
     "./tools/*": "./tools/*",
-    "./store/*": "./store/*",
     "./build/*": "./build/*",
-    "./script/build/*": "./script/build/*"
+    "./build/build-utils/*": "./build/build-utils/*",
+    "./script/git-automation/*": "./script/git-automation/*"
   },
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/kahal/npm-package"
+    "url": "https://gitee.com/gdinfly_1/admin-monorepo.git"
   },
   "keywords": [
     "infly",
@@ -64,16 +64,19 @@
     "connect": "^3.7.0",
     "enquirer": "^2.4.1",
     "path-browserify": "^1.0.1",
-    "serve-static": "^1.15.0"
+    "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",
-    "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4",
-    "webpack-node-externals": "^3.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",

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 }];