@ibiz-template/model-helper 0.7.41-alpha.129 → 0.7.41-alpha.130

package/out/locale/en/index.d.ts

@@ -8,6 +8,7 @@ export declare const en: {
             transformNoModelData: string;
             transformException: string;
             tryGetModel: string;
+            invalidPathPattern: string;
         };
         noInitialized: string;
         noFoundEntity: string;

package/out/locale/en/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/en/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;CAqBd,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/en/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;CAuBd,CAAC"}

package/out/locale/en/index.js

@@ -8,6 +8,7 @@ export const en = {
             transformNoModelData: '[{dynaModelFilePath}] model transformation exception, no model data returned',
             transformException: '[{dynaModelFilePath}] model transformation exception',
             tryGetModel: '[Custom extension model data] Try to get the extension model of path [{dynaModelFilePath}]',
+            invalidPathPattern: '[Model handler path validation failed]: wildcards are not allowed in even-position path segments, [{pathPattern}] registration skipped',
         },
         noInitialized: '[{appId}] is not initialized, please call initModelUtil method to initialize it first',
         noFoundEntity: 'Application [{appId}] data entity not found [{tag}]',

package/out/locale/zh-CN/index.d.ts

@@ -8,6 +8,7 @@ export declare const zhCn: {
             transformNoModelData: string;
             transformException: string;
             tryGetModel: string;
+            invalidPathPattern: string;
         };
         noInitialized: string;
         noFoundEntity: string;

package/out/locale/zh-CN/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;CAiBhB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;CAmBhB,CAAC"}

package/out/locale/zh-CN/index.js

@@ -8,6 +8,7 @@ export const zhCn = {
             transformNoModelData: '[{dynaModelFilePath}]模型转化异常，未返回模型数据',
             transformException: '[{dynaModelFilePath}]模型转化异常',
             tryGetModel: '[自定义扩展模型数据] 尝试获取路径[{dynaModelFilePath}]的扩展模型',
+            invalidPathPattern: '[模型处理器校验路径失败]，偶数位路径段不允许使用通配符，[{pathPattern}]已跳过注册',
         },
         noInitialized: '[{appId}]未初始化，请先调用 initModelUtil 方法初始化',
         noFoundEntity: '应用[{appId}]未找到数据实体[{tag}]',

package/out/utils/model-transformer/model-register.d.ts

@@ -2,8 +2,8 @@ import { ModelHandler } from './model-handler';
 /**
  * @description 注册模型处理器
  * @export
- * @param {string} dynaModelFilePath 模型路径
+ * @param {string} pathPattern 路径表达式
  * @param {ModelHandler} handler 模型处理器
  */
-export declare function registerModelHandler(dynaModelFilePath: string, handler: ModelHandler): void;
+export declare function registerModelHandler(pathPattern: string, handler: ModelHandler): void;
 //# sourceMappingURL=model-register.d.ts.map

package/out/utils/model-transformer/model-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-register.d.ts","sourceRoot":"","sources":["../../../src/utils/model-transformer/model-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN"}
+{"version":3,"file":"model-register.d.ts","sourceRoot":"","sources":["../../../src/utils/model-transformer/model-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN"}

package/out/utils/model-transformer/model-register.js

@@ -2,9 +2,9 @@ import { ModelTransformer } from './model-transformer';
 /**
  * @description 注册模型处理器
  * @export
- * @param {string} dynaModelFilePath 模型路径
+ * @param {string} pathPattern 路径表达式
  * @param {ModelHandler} handler 模型处理器
  */
-export function registerModelHandler(dynaModelFilePath, handler) {
-    ModelTransformer.getInstance().registerHandler(dynaModelFilePath, handler);
+export function registerModelHandler(pathPattern, handler) {
+    ModelTransformer.getInstance().registerHandler(pathPattern, handler);
 }

package/out/utils/model-transformer/model-transformer.d.ts

@@ -30,19 +30,27 @@ export declare class ModelTransformer {
      */
     private handlerMap;
     /**
-     * @description 模型缓存Map
+     * @description 路径匹配器（支持通配符路径匹配）
      * @private
-     * @type {Map<string, IModel>}
+     * @type {ReturnType<typeof AntPathMatcher>}
      * @memberof ModelTransformer
      */
-    private modelCacheMap;
+    private pathMatcher;
     /**
      * @description 注册模型处理器
-     * @param {string} dynaModelFilePath 模型路径
+     * @param {string} pathPattern 路径表达式（奇数位路径段支持通配符）
      * @param {IModelHandler} handler 执行器
      * @memberof ModelTransformer
      */
-    registerHandler(dynaModelFilePath: string, handler: ModelHandler): void;
+    registerHandler(pathPattern: string, handler: ModelHandler): void;
+    /**
+     * @description 校验模型路径，从0开始数，偶数位路径段（如PSSYSAPPS、PSAPPDATAENTITIES等类型段）不允许使用通配符，奇数位路径段可使用
+     * @private
+     * @param {string} pathPattern 路径表达式
+     * @returns {*}  {boolean}
+     * @memberof ModelTransformer
+     */
+    private validatePattern;
     /**
      * @description 变换模型
      * @param {string} dynaModelFilePath 模型路径

package/out/utils/model-transformer/model-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-transformer.d.ts","sourceRoot":"","sources":["../../../src/utils/model-transformer/model-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAmB;IAElD;;;;;OAKG;WACW,WAAW,IAAI,gBAAgB;IAO7C;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAA0C;IAE5D;;;;;OAKG;IACH,OAAO,CAAC,aAAa,CAAkC;IAEvD;;;;;OAKG;IACI,eAAe,CACpB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,YAAY,GACpB,IAAI;IAWP;;;;;;OAMG;IACI,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAgDnE"}
+{"version":3,"file":"model-transformer.d.ts","sourceRoot":"","sources":["../../../src/utils/model-transformer/model-transformer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAmB;IAElD;;;;;OAKG;WACW,WAAW,IAAI,gBAAgB;IAO7C;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAA0C;IAE5D;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAoB;IAEvC;;;;;OAKG;IACI,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAYxE;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;OAMG;IACI,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAiDnE"}

package/out/utils/model-transformer/model-transformer.js

@@ -1,3 +1,4 @@
+import AntPathMatcher from '@maxbilbow/ant-path-matcher';
 /**
  * @description 模型变换器
  * @author tony001
@@ -15,12 +16,12 @@ export class ModelTransformer {
          */
         this.handlerMap = new Map();
         /**
-         * @description 模型缓存Map
+         * @description 路径匹配器（支持通配符路径匹配）
          * @private
-         * @type {Map<string, IModel>}
+         * @type {ReturnType<typeof AntPathMatcher>}
          * @memberof ModelTransformer
          */
-        this.modelCacheMap = new Map();
+        this.pathMatcher = AntPathMatcher();
     }
     /**
      * @description 获取 ModelTransformer 单例对象
@@ -36,20 +37,41 @@ export class ModelTransformer {
     }
     /**
      * @description 注册模型处理器
-     * @param {string} dynaModelFilePath 模型路径
+     * @param {string} pathPattern 路径表达式（奇数位路径段支持通配符）
      * @param {IModelHandler} handler 执行器
      * @memberof ModelTransformer
      */
-    registerHandler(dynaModelFilePath, handler) {
-        const handlers = this.handlerMap.get(dynaModelFilePath);
+    registerHandler(pathPattern, handler) {
+        if (!this.validatePattern(pathPattern)) {
+            return;
+        }
+        const handlers = this.handlerMap.get(pathPattern);
         if (handlers) {
             handlers.push(handler);
         }
         else {
-            this.handlerMap.set(dynaModelFilePath, [handler]);
+            this.handlerMap.set(pathPattern, [handler]);
         }
-        // 注册新处理器后清除该路径的模型缓存，确保新处理器能生效
-        this.modelCacheMap.delete(dynaModelFilePath);
+    }
+    /**
+     * @description 校验模型路径，从0开始数，偶数位路径段（如PSSYSAPPS、PSAPPDATAENTITIES等类型段）不允许使用通配符，奇数位路径段可使用
+     * @private
+     * @param {string} pathPattern 路径表达式
+     * @returns {*}  {boolean}
+     * @memberof ModelTransformer
+     */
+    validatePattern(pathPattern) {
+        const segments = pathPattern.split('/');
+        const isValid = segments.every((segment, index) => {
+            // 偶数位不允许出现通配符，奇数位有无通配符均可
+            return index % 2 === 1 || !/[*?]/.test(segment);
+        });
+        if (!isValid) {
+            ibiz.log.error(ibiz.i18n.t('modelHelper.utils.invalidPathPattern', {
+                pathPattern,
+            }));
+        }
+        return isValid;
     }
     /**
      * @description 变换模型
@@ -62,16 +84,18 @@ export class ModelTransformer {
         ibiz.log.debug(ibiz.i18n.t('modelHelper.utils.tryGetModel', {
             dynaModelFilePath,
         }));
-        if (this.modelCacheMap.has(dynaModelFilePath)) {
-            return this.modelCacheMap.get(dynaModelFilePath);
-        }
-        const handlers = this.handlerMap.get(dynaModelFilePath);
-        if (!handlers || handlers.length === 0) {
-            this.modelCacheMap.set(dynaModelFilePath, model);
+        // 收集所有匹配当前路径的处理器（支持通配符路径）
+        const matchedHandlers = [];
+        this.handlerMap.forEach((handlers, pattern) => {
+            if (this.pathMatcher.match(pattern, dynaModelFilePath)) {
+                matchedHandlers.push(...handlers);
+            }
+        });
+        if (matchedHandlers.length === 0) {
             return model;
         }
         // 按照优先级升序排序，优先级高的后执行
-        const sortedHandlers = [...handlers].sort((a, b) => a.priority - b.priority);
+        const sortedHandlers = [...matchedHandlers].sort((a, b) => a.priority - b.priority);
         // 模型处理
         let result = model;
         for (const handler of sortedHandlers) {
@@ -96,7 +120,6 @@ export class ModelTransformer {
                 return model;
             }
         }
-        this.modelCacheMap.set(dynaModelFilePath, result);
         return result;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.7.41-alpha.129",
+  "version": "0.7.41-alpha.130",
   "description": "模型辅助库",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -33,12 +33,13 @@
   "dependencies": {
     "@ibiz-template/core": "^0.7.41-alpha.119",
     "@ibiz/model-core": "^0.1.89",
-    "@ibiz/rt-model-api": "0.2.89",
+    "@ibiz/rt-model-api": "0.2.90",
+    "@maxbilbow/ant-path-matcher": "0.0.2",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.41-alpha.128",
+    "@ibiz-template/runtime": "^0.7.41-alpha.130",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },
@@ -46,5 +47,5 @@
     "@ibiz-template/runtime": "^0.6.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "9b81ee754ee4d247e69c2d5eca54b0b95586b67c"
+  "gitHead": "884c135f203cf1a0ae3977442b559b757acd6b47"
 }

package/src/locale/en/index.ts

@@ -12,6 +12,8 @@ export const en = {
         '[{dynaModelFilePath}] model transformation exception',
       tryGetModel:
         '[Custom extension model data] Try to get the extension model of path [{dynaModelFilePath}]',
+      invalidPathPattern:
+        '[Model handler path validation failed]: wildcards are not allowed in even-position path segments, [{pathPattern}] registration skipped',
     },
     noInitialized:
       '[{appId}] is not initialized, please call initModelUtil method to initialize it first',

package/src/locale/zh-CN/index.ts

@@ -9,6 +9,8 @@ export const zhCn = {
       transformException: '[{dynaModelFilePath}]模型转化异常',
       tryGetModel:
         '[自定义扩展模型数据] 尝试获取路径[{dynaModelFilePath}]的扩展模型',
+      invalidPathPattern:
+        '[模型处理器校验路径失败]，偶数位路径段不允许使用通配符，[{pathPattern}]已跳过注册',
     },
     noInitialized: '[{appId}]未初始化，请先调用 initModelUtil 方法初始化',
     noFoundEntity: '应用[{appId}]未找到数据实体[{tag}]',

package/src/utils/model-transformer/model-register.ts

@@ -4,12 +4,12 @@ import { ModelTransformer } from './model-transformer';
 /**
  * @description 注册模型处理器
  * @export
- * @param {string} dynaModelFilePath 模型路径
+ * @param {string} pathPattern 路径表达式
  * @param {ModelHandler} handler 模型处理器
  */
 export function registerModelHandler(
-  dynaModelFilePath: string,
+  pathPattern: string,
   handler: ModelHandler,
 ): void {
-  ModelTransformer.getInstance().registerHandler(dynaModelFilePath, handler);
+  ModelTransformer.getInstance().registerHandler(pathPattern, handler);
 }

package/src/utils/model-transformer/model-transformer.ts

@@ -1,3 +1,4 @@
+import AntPathMatcher from '@maxbilbow/ant-path-matcher';
 import { ModelHandler } from './model-handler';
 
 /**
@@ -39,31 +40,52 @@ export class ModelTransformer {
   private handlerMap: Map<string, ModelHandler[]> = new Map();
 
   /**
-   * @description 模型缓存Map
+   * @description 路径匹配器（支持通配符路径匹配）
    * @private
-   * @type {Map<string, IModel>}
+   * @type {ReturnType<typeof AntPathMatcher>}
    * @memberof ModelTransformer
    */
-  private modelCacheMap: Map<string, IModel> = new Map();
+  private pathMatcher = AntPathMatcher();
 
   /**
    * @description 注册模型处理器
-   * @param {string} dynaModelFilePath 模型路径
+   * @param {string} pathPattern 路径表达式（奇数位路径段支持通配符）
    * @param {IModelHandler} handler 执行器
    * @memberof ModelTransformer
    */
-  public registerHandler(
-    dynaModelFilePath: string,
-    handler: ModelHandler,
-  ): void {
-    const handlers = this.handlerMap.get(dynaModelFilePath);
+  public registerHandler(pathPattern: string, handler: ModelHandler): void {
+    if (!this.validatePattern(pathPattern)) {
+      return;
+    }
+    const handlers = this.handlerMap.get(pathPattern);
     if (handlers) {
       handlers.push(handler);
     } else {
-      this.handlerMap.set(dynaModelFilePath, [handler]);
+      this.handlerMap.set(pathPattern, [handler]);
     }
-    // 注册新处理器后清除该路径的模型缓存，确保新处理器能生效
-    this.modelCacheMap.delete(dynaModelFilePath);
+  }
+
+  /**
+   * @description 校验模型路径，从0开始数，偶数位路径段（如PSSYSAPPS、PSAPPDATAENTITIES等类型段）不允许使用通配符，奇数位路径段可使用
+   * @private
+   * @param {string} pathPattern 路径表达式
+   * @returns {*}  {boolean}
+   * @memberof ModelTransformer
+   */
+  private validatePattern(pathPattern: string): boolean {
+    const segments = pathPattern.split('/');
+    const isValid = segments.every((segment: string, index: number) => {
+      // 偶数位不允许出现通配符，奇数位有无通配符均可
+      return index % 2 === 1 || !/[*?]/.test(segment);
+    });
+    if (!isValid) {
+      ibiz.log.error(
+        ibiz.i18n.t('modelHelper.utils.invalidPathPattern', {
+          pathPattern,
+        }),
+      );
+    }
+    return isValid;
   }
 
   /**
@@ -79,16 +101,18 @@ export class ModelTransformer {
         dynaModelFilePath,
       }),
     );
-    if (this.modelCacheMap.has(dynaModelFilePath)) {
-      return this.modelCacheMap.get(dynaModelFilePath)!;
-    }
-    const handlers = this.handlerMap.get(dynaModelFilePath);
-    if (!handlers || handlers.length === 0) {
-      this.modelCacheMap.set(dynaModelFilePath, model);
+    // 收集所有匹配当前路径的处理器（支持通配符路径）
+    const matchedHandlers: ModelHandler[] = [];
+    this.handlerMap.forEach((handlers: ModelHandler[], pattern: string) => {
+      if (this.pathMatcher.match(pattern, dynaModelFilePath)) {
+        matchedHandlers.push(...handlers);
+      }
+    });
+    if (matchedHandlers.length === 0) {
       return model;
     }
     // 按照优先级升序排序，优先级高的后执行
-    const sortedHandlers = [...handlers].sort(
+    const sortedHandlers = [...matchedHandlers].sort(
       (a: ModelHandler, b: ModelHandler) => a.priority - b.priority,
     );
     // 模型处理
@@ -118,7 +142,6 @@ export class ModelTransformer {
         return model;
       }
     }
-    this.modelCacheMap.set(dynaModelFilePath, result);
     return result;
   }
 }