@ibiz-template/model-helper 0.1.12 → 0.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -44,6 +44,7 @@ export declare class ModelUtil {
44
44
  * @author chitanda
45
45
  * @date 2023-04-13 21:04:21
46
46
  * @param {string}appId 应用标识
47
+ * @param {string} modelTag
47
48
  * @param {(url: string) => Promise<IModel>} get 模型加载方法
48
49
  * @param {boolean} hub 是否为 hub 应用基座
49
50
  */
@@ -1 +1 @@
1
- {"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtD;;;;;;;GAOG;AACH,qBAAa,SAAS;IAwClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,OAAO;IA1CxB;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;OAQG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,GAAG,EAAE,OAAO;IAGxB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAUpC;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}
1
+ {"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtD;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,OAAO;IA3CxB;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,GAAG,EAAE,OAAO;IAGxB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAUpC;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}
package/out/model-util.js CHANGED
@@ -15,6 +15,7 @@ export class ModelUtil {
15
15
  * @author chitanda
16
16
  * @date 2023-04-13 21:04:21
17
17
  * @param {string}appId 应用标识
18
+ * @param {string} modelTag
18
19
  * @param {(url: string) => Promise<IModel>} get 模型加载方法
19
20
  * @param {boolean} hub 是否为 hub 应用基座
20
21
  */
@@ -1 +1 @@
1
- {"version":3,"file":"plural.d.ts","sourceRoot":"","sources":["../../../src/utils/plural/plural.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C"}
1
+ {"version":3,"file":"plural.d.ts","sourceRoot":"","sources":["../../../src/utils/plural/plural.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C"}
@@ -1,4 +1,6 @@
1
1
  import pluralize from 'pluralize';
2
+ // 补充特殊转换规则
3
+ pluralize.addPluralRule(/(matr|vert|ind)ix|ex$/, '$1ices');
2
4
  /**
3
5
  * 英文转复数写法
4
6
  *
@@ -1 +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;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;IAkCP;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAKpE"}
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;IAyBpD;;;;;;;;;;OAUG;IACH,SAAS,CAAC,YAAY,CACpB,GAAG,EAAE,MAAM,EAAE,EACb,KAAK,EAAE,QAAQ,EAAE,EACjB,GAAG,GAAE,MAAU,GACd,eAAe,EAAE;IAyBpB;;;;;;;;;OASG;IACH,SAAS,CAAC,YAAY,CACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,eAAe,EAAE,GACvB,IAAI;IAkCP;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAKpE"}
@@ -123,9 +123,11 @@ export class ServicePathUtil {
123
123
  ibiz.log.warn('计算资源关系路径出现循环递归引用,触发实体:', rs.majorAppDataEntityId, '当前已计算过实体清单: ', ids);
124
124
  return;
125
125
  }
126
- ids.push(rs.majorAppDataEntityId);
127
126
  const items = this.filterDERSs(rs.majorAppDataEntityId);
128
- arr.push([rs, this.calcDeepPath(ids, items, num)]);
127
+ arr.push([
128
+ rs,
129
+ this.calcDeepPath([...ids, rs.majorAppDataEntityId], items, num),
130
+ ]);
129
131
  });
130
132
  return arr;
131
133
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/model-helper",
3
- "version": "0.1.12",
3
+ "version": "0.1.13",
4
4
  "description": "控制器包",
5
5
  "main": "out/index.js",
6
6
  "types": "out/index.d.ts",
@@ -34,11 +34,11 @@
34
34
  "pluralize": "^8.0.0"
35
35
  },
36
36
  "devDependencies": {
37
- "@ibiz-template/runtime": "^0.1.12",
37
+ "@ibiz-template/runtime": "^0.1.13",
38
38
  "@types/pluralize": "^0.0.30"
39
39
  },
40
40
  "peerDependencies": {
41
41
  "@ibiz-template/runtime": "^0.1.0"
42
42
  },
43
- "gitHead": "980e348c7fa465d0a62e655991c1bb816fca100a"
43
+ "gitHead": "609d58f98989f485823ff7be7ecedf4956d7fad2"
44
44
  }
package/src/model-util.ts CHANGED
@@ -46,6 +46,7 @@ export class ModelUtil {
46
46
  * @author chitanda
47
47
  * @date 2023-04-13 21:04:21
48
48
  * @param {string}appId 应用标识
49
+ * @param {string} modelTag
49
50
  * @param {(url: string) => Promise<IModel>} get 模型加载方法
50
51
  * @param {boolean} hub 是否为 hub 应用基座
51
52
  */
@@ -1,5 +1,8 @@
1
1
  import pluralize from 'pluralize';
2
2
 
3
+ // 补充特殊转换规则
4
+ pluralize.addPluralRule(/(matr|vert|ind)ix|ex$/, '$1ices');
5
+
3
6
  /**
4
7
  * 英文转复数写法
5
8
  *
@@ -175,9 +175,11 @@ export class ServicePathUtil {
175
175
  );
176
176
  return;
177
177
  }
178
- ids.push(rs.majorAppDataEntityId!);
179
178
  const items = this.filterDERSs(rs.majorAppDataEntityId!);
180
- arr.push([rs, this.calcDeepPath(ids, items, num)]);
179
+ arr.push([
180
+ rs,
181
+ this.calcDeepPath([...ids, rs.majorAppDataEntityId!], items, num),
182
+ ]);
181
183
  });
182
184
  return arr;
183
185
  }