Merge pull request #349 from netease-lcap/merge/test_2026_03_23

Merge/test

Author: YufJi

packages/basic/build/rollup.config.mjs

@@ -2,7 +2,9 @@ import resolve from '@rollup/plugin-node-resolve';
 import typescript from '@rollup/plugin-typescript';
 import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
-import nodePolyfills from 'rollup-plugin-polyfill-node';
+import { visualizer } from 'rollup-plugin-visualizer';
+import terser from '@rollup/plugin-terser';
+import isCI from 'is-ci';
 
 export default {
 	input: 'src/index.ts',
@@ -22,10 +24,27 @@ export default {
   plugins: [
     resolve({
       extensions: ['.ts', '.js', '.json'],
+      browser: true,
+      preferBuiltins: false,
     }),
     json(),
     commonjs(),
     typescript(),
-    nodePolyfills(),
-  ],
+    terser({
+      compress: {
+        drop_console: false,
+        pure_funcs: [],
+      },
+      mangle: false, // 禁用变量名混淆，避免对已压缩代码的二次混淆问题
+      format: {
+        comments: false,
+      },
+    }),
+    !isCI && visualizer({
+      filename: 'dist/stats.html',
+      open: false,
+      gzipSize: true,
+      brotliSize: true,
+    }),
+  ].filter(Boolean),
 };

packages/basic/package.json

@@ -47,19 +47,22 @@
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.13",
     "@types/node": "^20.11.16",
     "@types/safe-json-stringify": "^1.1.5",
     "fast-check": "^3.14.0",
+    "is-ci": "^4.1.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-watch-typeahead": "^2.2.2",
     "minimist": "^1.2.8",
     "nodemon": "^3.0.3",
     "rollup": "^4.19.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
+    "rollup-plugin-visualizer": "^6.0.5",
     "ts-jest": "^29.1.1",
     "typedoc": "^0.26.11",
     "typescript": "^5.3.3",

packages/basic/src/global.ts

@@ -1,5 +1,3 @@
-import _set from 'lodash/set';
-
 // 用来mock Vue的构造函数
 // @ts-ignore
 const GlobalFn = typeof window.Vue === 'function' ? window.Vue : function MockVue() {};

packages/basic/src/index.ts

@@ -1,3 +1,4 @@
+import * as _ from 'lodash';
 import Config, { setConfig } from './config';
 
 export * from './apis';
@@ -8,6 +9,6 @@ export * from './router';
 
 import Global, { global } from './global';
 
-export { Config, setConfig, Global, global };
+export { Config, setConfig, Global, global, _ };
 
 export * from './utils';

packages/basic/src/init/dataTypes/inference.ts

@@ -1,5 +1,5 @@
-import { sortBy } from "lodash";
-import { genSortedTypeKey, getTypeDefinition } from "./tools";
+import { sortBy } from 'lodash';
+import { genSortedTypeKey, getTypeDefinition } from './tools';
 
 /**
  * 根据如下优先级排序类型：Enum Reference > Primitives > Tagged References > Entity > Structure > AnonymousStructure > Map > List
@@ -9,17 +9,17 @@ import { genSortedTypeKey, getTypeDefinition } from "./tools";
 export function sortTypeArgumentsBasedOnTypePriority(typeArguments: TypeAnnotation[]): TypeAnnotation[] {
   const firstPass = sortBy(typeArguments, (arg) => {
     // 应用优先级排序规则 Primitives > Tagged References > Entity > Structure > AnonymousStructure > Map > List
-    const typeKindListOrderedByPriority = ["primitive", "reference", "anonymousStructure", "generic"] as const;
-    if (arg.typeKind === "union") {
-      throw new Error("Union类型的typeArguments不能再为union");
+    const typeKindListOrderedByPriority = ['primitive', 'reference', 'anonymousStructure', 'generic'] as const;
+    if (arg.typeKind === 'union') {
+      throw new Error('Union类型的typeArguments不能再为union');
     }
     const priority = typeKindListOrderedByPriority.indexOf(arg.typeKind);
     return [priority, isTaggedReferenceType(arg) ? 0 : 1, isEntityReferenceType(arg) ? 0 : 1];
   });
   const secondPass = sortBy(firstPass, (arg) => {
     // 应用优先级排序规则：Enum Reference > Others
     const argTypeDef = getTypeDefinition(genSortedTypeKey(arg));
-    if (argTypeDef?.concept === "Enum") {
+    if (argTypeDef?.concept === 'Enum') {
       return 0;
     }
     return 1;
@@ -30,16 +30,16 @@ export function sortTypeArgumentsBasedOnTypePriority(typeArguments: TypeAnnotati
     // @ts-expect-error FIXME
     const properties = getTypeDefinition(genSortedTypeKey(typeAnnotation))?.properties;
     return (
-      typeAnnotation.typeKind === "reference" &&
-      properties?.filter((prop) => prop.name === "errorType" && prop.expression?.concept === "StringLiteral")
+      typeAnnotation.typeKind === 'reference' &&
+      properties?.filter((prop) => prop.name === 'errorType' && prop.expression?.concept === 'StringLiteral')
     );
   }
 
   function isEntityReferenceType(typeAnnotation: TypeAnnotation): boolean {
     return (
-      typeAnnotation.typeKind === "reference" &&
+      typeAnnotation.typeKind === 'reference' &&
       // @ts-expect-error FIXME
-      getTypeDefinition(genSortedTypeKey(typeAnnotation))?.concept === "Entity"
+      getTypeDefinition(genSortedTypeKey(typeAnnotation))?.concept === 'Entity'
     );
   }
 }

packages/basic/src/init/service/index.ts

@@ -1,8 +1,8 @@
-import isPlainObject from "lodash/isPlainObject";
+import { isPlainObject } from 'lodash';
 
-import { createService } from "../../utils";
-import Global from "../../global";
-import Config from "../../config";
+import { createService } from '../../utils';
+import Global from '../../global';
+import Config from '../../config';
 
 let $services;
 
@@ -16,7 +16,7 @@ function initService(
 
   keys.forEach((key) => {
     if ($services && $services[key]) {
-      throw new Error("services repeat:" + key);
+      throw new Error('services repeat:' + key);
     }
 
     const service = services[key];
@@ -27,9 +27,9 @@ function initService(
   });
 
   if (keys.length) {
-    $services = Object.assign({}, Config.globalProperties.get("$services"), services);
+    $services = Object.assign({}, Config.globalProperties.get('$services'), services);
 
-    Config.globalProperties.set("$services", $services);
+    Config.globalProperties.set('$services', $services);
   }
 
   return {

packages/basic/src/sdk/modules/utils.ts

@@ -39,7 +39,7 @@ import {
   isSunday,
 } from 'date-fns';
 import { formatInTimeZone } from 'date-fns-tz';
-import { isObject, isEqual, set, cloneDeep } from 'lodash';
+import { isObject, set, isEqual, cloneDeep } from 'lodash';
 import Decimal from 'decimal.js';
 import {
   isInputValidNaslDateTime,
@@ -71,7 +71,14 @@ export class Utils {
     this.helpers = optinos;
   }
 
-  private isArrayInBounds<T>(arr: T[], index: number): boolean {
+  /**
+   * 判断数组访问是否越界
+   * @param arr
+   * @param index
+   * @param boundaryChecker
+   * @returns
+   */
+  private isArrayInBounds<T>(arr: T[], index: number, boundaryChecker?: (index: number, arr: T[]) => boolean): boolean {
     if (!Array.isArray(arr)) {
       this.helpers.throwError('传入内容不是数组');
       return false;
@@ -82,7 +89,10 @@ export class Utils {
       return false;
     }
 
-    if (index < 0 || index >= arr.length) {
+    const defaultBoundaryChecker = (idx: number, array: T[]) => idx >= 0 && idx < array.length;
+    const checker = boundaryChecker ?? defaultBoundaryChecker;
+
+    if (!checker(index, arr)) {
       this.helpers.throwError(`列表访问越界，访问下标 ${index}，列表长度 ${arr.length}`);
       return false;
     }
@@ -316,7 +326,8 @@ export class Utils {
   }
 
   Insert<T>(arr: T[], index: number, item: T) {
-    if (this.isArrayInBounds(arr, index)) {
+    const boundaryChecker = (idx: number, array: T[]) => idx >= 0 && idx <= array.length;
+    if (this.isArrayInBounds(arr, index, boundaryChecker)) {
       arr.splice(index, 0, item);
     }
   }
@@ -889,16 +900,16 @@ export class Utils {
   }
 
   AddDays(date = new Date(), amount = 1, converter = 'json') {
-    return toValue(addDays(safeNewDate(date), amount), converter);
+    return toValue.call(this, addDays(safeNewDate(date), amount), converter);
   }
 
   AddMonths(date = new Date(), amount = 1, converter = 'json') {
     /** 传入的值为标准的时间格式 */
-    return toValue(addMonths(safeNewDate(date), amount), converter);
+    return toValue.call(this, addMonths(safeNewDate(date), amount), converter);
   }
 
   SubDays(date = new Date(), amount = 1, converter = 'json') {
-    return toValue(subDays(safeNewDate(date), amount), converter);
+    return toValue.call(this, subDays(safeNewDate(date), amount), converter);
   }
 
   // 兼容性策略：老应用升级到 3.10，保持老行为不变

packages/basic/src/utils/create/add.configs.ts

@@ -1,6 +1,5 @@
-import camelCase from 'lodash/camelCase';
-import upperFirst from 'lodash/upperFirst';
-import lowerFirst from 'lodash/lowerFirst';
+import { camelCase, upperFirst, lowerFirst } from 'lodash';
+
 import errHandles from './errHandles';
 
 export const isPromise = function (func) {

packages/basic/src/utils/create/index.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import type { AxiosRequestConfig, Method } from 'axios';
-import pick from 'lodash/pick';
+import { pick } from 'lodash';
 
 import Service from '../request-pre';
 import { formatMicroFrontUrl } from '../../init/router/microFrontUrl'; // 微前端路由方法

packages/basic/src/utils/create/interceptors.ts

@@ -1,5 +1,5 @@
-import isPlainObject from "lodash/isPlainObject";
-import { stringifyWithLoopProtection } from "./utils";
+import { isPlainObject } from 'lodash';
+import { stringifyWithLoopProtection } from './utils';
 
 const interceptors: Array<{
   request?: {
@@ -21,7 +21,7 @@ const loopProtection = (config) => {
       }
     }
   } catch (e) {
-    console.warn("loopProtection json control error");
+    console.warn('loopProtection json control error');
   }
 
   return config;