zova-core 5.1.21 → 5.1.23
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.
- package/dist/core/sys/resource.d.ts +0 -1
- package/dist/core/sys/resource.d.ts.map +1 -1
- package/dist/decorator/class/use.d.ts.map +1 -1
- package/dist/index.js +10 -8
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
- package/src/core/sys/resource.ts +9 -8
- package/src/decorator/class/use.ts +1 -3
|
@@ -22,7 +22,6 @@ export declare class AppResource {
|
|
|
22
22
|
getBean<T>(A: Constructable<T>): IDecoratorBeanOptionsBase<T> | undefined;
|
|
23
23
|
getBean<K extends keyof IBeanRecord>(beanFullName: K): IDecoratorBeanOptionsBase<IBeanRecord[K]> | undefined;
|
|
24
24
|
getBean<T>(beanFullName: string): IDecoratorBeanOptionsBase<T> | undefined;
|
|
25
|
-
_fixClassName(className: string): string;
|
|
26
25
|
_parseSceneAndBeanName<T>(beanClass: Constructable<T>, scene?: string, name?: string): {
|
|
27
26
|
scene: string;
|
|
28
27
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/core/sys/resource.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EAGZ,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AASjD,eAAO,MAAM,qBAAqB,eAAmC,CAAC;AACtE,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AACjF,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,iCAAiC,eAA+C,CAAC;AAE9F,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;AAE3E,qBAAa,WAAW;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAM;IACtD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAM;IAShE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAWxD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC,GAAG,SAAS;IAIlF,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAsC7D,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IACvE,eAAe,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS;IACxF,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IASrE,2BAA2B,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAQzF,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,CAAC,GAAG,SAAS;IACzE,OAAO,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,EAAE,CAAC,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;IAC5G,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,GAAG,SAAS;IAO1E,
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/core/sys/resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/decorator/class/use.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAEV,oBAAoB,EACpB,wBAAwB,EACxB,mBAAmB,EAGpB,MAAM,aAAa,CAAC;AAMrB,wBAAgB,GAAG,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AACzF,wBAAgB,GAAG,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,iBAAiB,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/decorator/class/use.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAEV,oBAAoB,EACpB,wBAAwB,EACxB,mBAAmB,EAGpB,MAAM,aAAa,CAAC;AAMrB,wBAAgB,GAAG,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AACzF,wBAAgB,GAAG,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,iBAAiB,GAAG,eAAe,CAAC;AA+BxG,wBAAgB,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,GAAG,CAMzG;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,GAAG,CAMlH;AAED,wBAAgB,2BAA2B,CAAC,YAAY,KAAA,EAAE,UAAU,EAAE,wBAAwB,GAAG,mBAAmB,CAenH"}
|
package/dist/index.js
CHANGED
|
@@ -492,12 +492,6 @@ class AppResource {
|
|
|
492
492
|
if (!fullName) return null;
|
|
493
493
|
return this.beans[fullName];
|
|
494
494
|
}
|
|
495
|
-
_fixClassName(className) {
|
|
496
|
-
while (className.endsWith('2')) {
|
|
497
|
-
className = className.substring(0, className.length - 1);
|
|
498
|
-
}
|
|
499
|
-
return className;
|
|
500
|
-
}
|
|
501
495
|
_parseSceneAndBeanName(beanClass, scene, name) {
|
|
502
496
|
if (scene && name) {
|
|
503
497
|
return {
|
|
@@ -506,7 +500,8 @@ class AppResource {
|
|
|
506
500
|
};
|
|
507
501
|
}
|
|
508
502
|
// bean class name
|
|
509
|
-
let beanClassName = this._fixClassName(beanClass.name);
|
|
503
|
+
// let beanClassName = this._fixClassName(beanClass.name);
|
|
504
|
+
let beanClassName = beanClass.name;
|
|
510
505
|
// skip prefix: Bean
|
|
511
506
|
if (beanClassName.toLowerCase().startsWith('bean')) {
|
|
512
507
|
beanClassName = beanClassName.substring('bean'.length);
|
|
@@ -562,6 +557,13 @@ class AppResource {
|
|
|
562
557
|
return deepExtend({}, options, optionsConfig);
|
|
563
558
|
}
|
|
564
559
|
}
|
|
560
|
+
|
|
561
|
+
// _fixClassName(className: string) {
|
|
562
|
+
// while (className.endsWith('2')) {
|
|
563
|
+
// className = className.substring(0, className.length - 1);
|
|
564
|
+
// }
|
|
565
|
+
// return className;
|
|
566
|
+
// }
|
|
565
567
|
}
|
|
566
568
|
const appResource = new AppResource();
|
|
567
569
|
|
|
@@ -1033,7 +1035,7 @@ function Use(options) {
|
|
|
1033
1035
|
window.setTimeout(() => {
|
|
1034
1036
|
const moduleTarget = appResource._getModuleName(target.constructor);
|
|
1035
1037
|
if (moduleSource !== moduleTarget) {
|
|
1036
|
-
console.error(`inject class should be imported by type, such as: import type { ${
|
|
1038
|
+
console.error(`inject class should be imported by type, such as: import type { ${beanClass.name} } from 'zova-module-xxx-xxx'`);
|
|
1037
1039
|
}
|
|
1038
1040
|
}, 0);
|
|
1039
1041
|
}
|