@ibiz-template/model-helper 0.1.9 → 0.1.10

package/out/utils/service-path-util/service-path-util.d.ts

@@ -95,12 +95,14 @@ export declare class ServicePathUtil {
      * 计算递归资源路径
      *
      * @author chitanda
-     * @date 2022-08-22 22:08:32
+     * @date 2023-08-23 14:08:39
      * @protected
+     * @param {string[]} ids
      * @param {IAppDERS[]} deRss
+     * @param {number} [num=0]
      * @return {*}  {ServicePathDeep[]}
      */
-    protected calcDeepPath(deRss: IAppDERS[], num?: number): ServicePathDeep[];
+    protected calcDeepPath(ids: string[], deRss: IAppDERS[], num?: number): ServicePathDeep[];
     /**
      * 递归填充计算所有资源路径
      *

package/out/utils/service-path-util/service-path-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-path-util.d.ts","sourceRoot":"","sources":["../../../src/utils/service-path-util/service-path-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,eAAe;IAsBxB,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE;IACnC,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE;IAtBhC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CAAa;gBAG5D,eAAe,EAAE,MAAM,EAAE,EACzB,QAAQ,EAAE,QAAQ,EAAE;IAGhC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,EAAE;IAgB7C;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAOtC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,EAAE,EAAE;IAuBpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,KAAK,EAAE,QAAQ,EAAE,EACjB,GAAG,GAAE,MAAU,GACd,eAAe,EAAE;IAapB;;;;;;;;;OASG;IACH,SAAS,CAAC,YAAY,CACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,eAAe,EAAE,GACvB,IAAI;IAmCP;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAKpE"}
+{"version":3,"file":"service-path-util.d.ts","sourceRoot":"","sources":["../../../src/utils/service-path-util/service-path-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,eAAe;IAsBxB,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE;IACnC,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE;IAtBhC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CAAa;gBAG5D,eAAe,EAAE,MAAM,EAAE,EACzB,QAAQ,EAAE,QAAQ,EAAE;IAGhC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,EAAE;IAgB7C;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAOtC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,EAAE,EAAE;IAyBpD;;;;;;;;;;OAUG;IACH,SAAS,CAAC,YAAY,CACpB,GAAG,EAAE,MAAM,EAAE,EACb,KAAK,EAAE,QAAQ,EAAE,EACjB,GAAG,GAAE,MAAU,GACd,eAAe,EAAE;IAuBpB;;;;;;;;;OASG;IACH,SAAS,CAAC,YAAY,CACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,eAAe,EAAE,GACvB,IAAI;IAmCP;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAKpE"}

package/out/utils/service-path-util/service-path-util.js

@@ -88,7 +88,9 @@ export class ServicePathUtil {
         }
         const deRss = this.filterDERSs(id);
         if (deRss) {
-            const arr = this.calcDeepPath(deRss);
+            // 已经计算过的应用实体标识
+            const ids = [id];
+            const arr = this.calcDeepPath(ids, deRss);
             this.deepFillPath(codeName, [codeName], arr);
             let paths = this.entityRsPathMap.get(codeName);
             if (paths) {
@@ -103,20 +105,27 @@ export class ServicePathUtil {
      * 计算递归资源路径
      *
      * @author chitanda
-     * @date 2022-08-22 22:08:32
+     * @date 2023-08-23 14:08:39
      * @protected
+     * @param {string[]} ids
      * @param {IAppDERS[]} deRss
+     * @param {number} [num=0]
      * @return {*}  {ServicePathDeep[]}
      */
-    calcDeepPath(deRss, num = 0) {
+    calcDeepPath(ids, deRss, num = 0) {
         if (num > 10) {
             throw new Error('服务路径计算超过最大层级 10');
         }
         num += 1;
         const arr = [];
         deRss.forEach(rs => {
+            if (ids.includes(rs.majorAppDataEntityId)) {
+                ibiz.log.warn('计算资源关系路径出现循环递归引用，触发实体：', rs.majorAppDataEntityId, '当前已计算过实体清单: ', ids);
+                return;
+            }
+            ids.push(rs.majorAppDataEntityId);
             const items = this.filterDERSs(rs.majorAppDataEntityId);
-            arr.push([rs, this.calcDeepPath(items, num)]);
+            arr.push([rs, this.calcDeepPath(ids, items, num)]);
         });
         return arr;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -29,16 +29,16 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz/model-core": "^0.0.14",
-    "@ibiz/rt-model-api": "^0.1.9",
+    "@ibiz/model-core": "^0.0.15",
+    "@ibiz/rt-model-api": "^0.1.10",
     "pluralize": "^8.0.0"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.1.9",
+    "@ibiz-template/runtime": "^0.1.10",
     "@types/pluralize": "^0.0.30"
   },
   "peerDependencies": {
     "@ibiz-template/runtime": "^0.1.0"
   },
-  "gitHead": "996ad2a8bc9cd856f5a672ebdc97748124c07da1"
+  "gitHead": "24e2a2f4b050fbb3a3b9f5deeee97f98985913e4"
 }

package/src/utils/service-path-util/service-path-util.ts

@@ -130,7 +130,9 @@ export class ServicePathUtil {
     }
     const deRss = this.filterDERSs(id);
     if (deRss) {
-      const arr = this.calcDeepPath(deRss);
+      // 已经计算过的应用实体标识
+      const ids: string[] = [id];
+      const arr = this.calcDeepPath(ids, deRss);
       this.deepFillPath(codeName, [codeName], arr);
       let paths = this.entityRsPathMap.get(codeName);
       if (paths) {
@@ -146,12 +148,15 @@ export class ServicePathUtil {
    * 计算递归资源路径
    *
    * @author chitanda
-   * @date 2022-08-22 22:08:32
+   * @date 2023-08-23 14:08:39
    * @protected
+   * @param {string[]} ids
    * @param {IAppDERS[]} deRss
+   * @param {number} [num=0]
    * @return {*}  {ServicePathDeep[]}
    */
   protected calcDeepPath(
+    ids: string[],
     deRss: IAppDERS[],
     num: number = 0,
   ): ServicePathDeep[] {
@@ -161,8 +166,18 @@ export class ServicePathUtil {
     num += 1;
     const arr: ServicePathDeep[] = [];
     deRss.forEach(rs => {
+      if (ids.includes(rs.majorAppDataEntityId!)) {
+        ibiz.log.warn(
+          '计算资源关系路径出现循环递归引用，触发实体：',
+          rs.majorAppDataEntityId,
+          '当前已计算过实体清单: ',
+          ids,
+        );
+        return;
+      }
+      ids.push(rs.majorAppDataEntityId!);
       const items = this.filterDERSs(rs.majorAppDataEntityId!);
-      arr.push([rs, this.calcDeepPath(items, num)]);
+      arr.push([rs, this.calcDeepPath(ids, items, num)]);
     });
     return arr;
   }