zova-core 5.0.112 → 5.0.114

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.
Files changed (21) hide show
  1. package/dist/bean/beanBaseSimple.d.ts.map +1 -1
  2. package/dist/bean/beanBaseSimple.js +10 -2
  3. package/dist/bean/beanBaseSimple.js.map +1 -1
  4. package/dist/bean/resource/page/type.d.ts +2 -0
  5. package/dist/bean/resource/page/type.d.ts.map +1 -1
  6. package/dist/core/app/config.d.ts +6 -1
  7. package/dist/core/app/config.d.ts.map +1 -1
  8. package/dist/core/app/config.js +4 -0
  9. package/dist/core/app/config.js.map +1 -1
  10. package/dist/core/resource.d.ts +6 -6
  11. package/dist/core/resource.d.ts.map +1 -1
  12. package/dist/core/resource.js +2 -6
  13. package/dist/core/resource.js.map +1 -1
  14. package/dist/decorator/class/use.js +8 -5
  15. package/dist/decorator/class/use.js.map +1 -1
  16. package/package.json +3 -3
  17. package/src/bean/beanBaseSimple.ts +7 -2
  18. package/src/bean/resource/page/type.ts +1 -0
  19. package/src/core/app/config.ts +6 -0
  20. package/src/core/resource.ts +10 -12
  21. package/src/decorator/class/use.ts +10 -7
package/dist/bean/beanBaseSimple.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"beanBaseSimple.d.ts","sourceRoot":"","sources":["../../src/bean/beanBaseSimple.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD,qBAAa,cAAe,SAAQ,UAAU;IAC5C,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAS;IACrC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAS;IAE3C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAY;gBAEtB,YAAY,CAAC,EAAE,MAAM;IASjC,SAAS,KAAK,CAAC,kBAAkB,CAAC,WAEjC;IAED,SAAS,KAAK,CAAC,gBAAgB,CAAC,WAE/B;CACF"}
1
+ {"version":3,"file":"beanBaseSimple.d.ts","sourceRoot":"","sources":["../../src/bean/beanBaseSimple.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD,qBAAa,cAAe,SAAQ,UAAU;IAC5C,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAS;IACrC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAS;IAE3C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAY;gBAEtB,YAAY,CAAC,EAAE,MAAM;IASjC,SAAS,KAAK,CAAC,kBAAkB,CAAC,WAKjC;IAED,SAAS,KAAK,CAAC,gBAAgB,CAAC,WAI/B;CACF"}
package/dist/bean/beanBaseSimple.js CHANGED
@@ -20,10 +20,18 @@ export class BeanBaseSimple extends BeanSimple {
20
20
  this[SymbolInited] = StateLock.create();
21
21
  }
22
22
  get [SymbolModuleBelong]() {
23
- return this[SymbolModuleBelongInner] || appResource._getModuleBelong(this[SymbolBeanFullName]);
23
+ if (this[SymbolModuleBelongInner])
24
+ return this[SymbolModuleBelongInner];
25
+ const moduleBelong = appResource._getModuleBelong(this[SymbolBeanFullName]);
26
+ if (!moduleBelong)
27
+ throw new Error(`not found module belong: ${this[SymbolBeanFullName]}`);
28
+ return moduleBelong;
24
29
  }
25
30
  get [SymbolModuleName]() {
26
- return appResource._getModuleName(this[SymbolBeanFullName]);
31
+ const moduleName = appResource._getModuleName(this[SymbolBeanFullName]);
32
+ if (!moduleName)
33
+ throw new Error(`not found module name: ${this[SymbolBeanFullName]}`);
34
+ return moduleName;
27
35
  }
28
36
  }
29
37
  //# sourceMappingURL=beanBaseSimple.js.map
package/dist/bean/beanBaseSimple.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"beanBaseSimple.js","sourceRoot":"","sources":["../../src/bean/beanBaseSimple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnD,MAAM,OAAO,cAAe,SAAQ,UAAU;IACpC,CAAC,kBAAkB,CAAC,CAAS;IAC7B,CAAC,uBAAuB,CAAC,CAAU;IAC3C,qBAAqB;IACb,CAAC,YAAY,CAAC,CAAY;IAElC,YAAY,YAAqB;QAC/B,KAAK,EAAE,CAAC;QACR,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC,uBAAuB,CAAC,GAAG,YAAY,CAAC;QAC7C,IAAI,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;IAC1C,CAAC;IAED,IAAc,CAAC,kBAAkB,CAAC;QAChC,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACjG,CAAC;IAED,IAAc,CAAC,gBAAgB,CAAC;QAC9B,OAAO,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF"}
1
+ {"version":3,"file":"beanBaseSimple.js","sourceRoot":"","sources":["../../src/bean/beanBaseSimple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AACzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnD,MAAM,OAAO,cAAe,SAAQ,UAAU;IACpC,CAAC,kBAAkB,CAAC,CAAS;IAC7B,CAAC,uBAAuB,CAAC,CAAU;IAC3C,qBAAqB;IACb,CAAC,YAAY,CAAC,CAAY;IAElC,YAAY,YAAqB;QAC/B,KAAK,EAAE,CAAC;QACR,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC,uBAAuB,CAAC,GAAG,YAAY,CAAC;QAC7C,IAAI,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;IAC1C,CAAC;IAED,IAAc,CAAC,kBAAkB,CAAC;QAChC,IAAI,IAAI,CAAC,uBAAuB,CAAC;YAAE,OAAO,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC3F,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAc,CAAC,gBAAgB,CAAC;QAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACvF,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}
package/dist/bean/resource/page/type.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  import { z } from 'zod';
2
+ export interface ZovaConfigRoutes {
3
+ }
2
4
  export interface IPagePathRecord {
3
5
  }
4
6
  export interface IPageNameRecord {
package/dist/bean/resource/page/type.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/bean/resource/page/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,WAAW,eAAe;CAAG;AACnC,MAAM,WAAW,eAAe;CAAG;AAEnC,MAAM,MAAM,mBAAmB,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,IAAI;IAChD,KAAK,CAAC,EAAE,CAAC,CAAC;IACV,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC;IAAC,KAAK,EAAE,CAAC,CAAC,UAAU,CAAA;CAAE,CAAC;AAC5E,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC"}
1
+ {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/bean/resource/page/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,WAAW,gBAAgB;CAAG;AACpC,MAAM,WAAW,eAAe;CAAG;AACnC,MAAM,WAAW,eAAe;CAAG;AAEnC,MAAM,MAAM,mBAAmB,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,IAAI;IAChD,KAAK,CAAC,EAAE,CAAC,CAAC;IACV,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC;IAAC,KAAK,EAAE,CAAC,CAAC,UAAU,CAAA;CAAE,CAAC;AAC5E,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC"}
package/dist/core/app/config.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ZovaConfigEnv, ZovaConfigMeta, IBeanScopeConfig, ILocalInfos, PowerPartial, IComponentLayoutRecord, IBeanScopeRecord } from '../../index.js';
1
+ import { ZovaConfigEnv, ZovaConfigMeta, IBeanScopeConfig, ILocalInfos, PowerPartial, IComponentLayoutRecord, IBeanScopeRecord, ZovaConfigRoutes } from '../../index.js';
2
2
  export declare const configDefault: {
3
3
  meta: {};
4
4
  env: {};
@@ -26,6 +26,10 @@ export declare const configDefault: {
26
26
  empty: string;
27
27
  };
28
28
  };
29
+ routes: {
30
+ path: {};
31
+ name: {};
32
+ };
29
33
  modules: {};
30
34
  };
31
35
  export type ZovaConfig = {
@@ -52,6 +56,7 @@ export type ZovaConfig = {
52
56
  empty: keyof IComponentLayoutRecord;
53
57
  };
54
58
  };
59
+ routes: ZovaConfigRoutes;
55
60
  modules: IBeanScopeConfig;
56
61
  };
57
62
  export type ZovaConfigOptional = PowerPartial<ZovaConfig>;
package/dist/core/app/config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/app/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAExB,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE;QACJ,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,EAAE;QACJ,aAAa,EAAE,MAAM,gBAAgB,CAAC;KACvC,CAAC;IACF,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,WAAW,CAAC;QAC3B,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC,MAAM,WAAW,EAAE,MAAM,CAAC,CAAC;KAC1C,CAAC;IACF,MAAM,EAAE;QACN,SAAS,EAAE;YACT,OAAO,EAAE,MAAM,sBAAsB,CAAC;YACtC,KAAK,EAAE,MAAM,sBAAsB,CAAC;SACrC,CAAC;KACH,CAAC;IACF,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/app/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAExB,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE;QACJ,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,EAAE;QACJ,aAAa,EAAE,MAAM,gBAAgB,CAAC;KACvC,CAAC;IACF,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,WAAW,CAAC;QAC3B,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC,MAAM,WAAW,EAAE,MAAM,CAAC,CAAC;KAC1C,CAAC;IACF,MAAM,EAAE;QACN,SAAS,EAAE;YACT,OAAO,EAAE,MAAM,sBAAsB,CAAC;YACtC,KAAK,EAAE,MAAM,sBAAsB,CAAC;SACrC,CAAC;KACH,CAAC;IACF,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC"}
package/dist/core/app/config.js CHANGED
@@ -25,6 +25,10 @@ export const configDefault = {
25
25
  empty: 'home-layout:layoutEmpty',
26
26
  },
27
27
  },
28
+ routes: {
29
+ path: {},
30
+ name: {},
31
+ },
28
32
  modules: {},
29
33
  };
30
34
  //# sourceMappingURL=config.js.map
package/dist/core/app/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/app/config.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,IAAI,EAAE,EAAE;IACR,GAAG,EAAE,EAAE;IACP,IAAI,EAAE;QACJ,GAAG,EAAE,KAAK;KACX;IACD,GAAG,EAAE;QACH,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;KACX;IACD,IAAI,EAAE;QACJ,aAAa,EAAE,WAAW;KAC3B;IACD,MAAM,EAAE;QACN,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB;KACF;IACD,MAAM,EAAE;QACN,SAAS,EAAE;YACT,OAAO,EAAE,2BAA2B;YACpC,KAAK,EAAE,yBAAyB;SACjC;KACF;IACD,OAAO,EAAE,EAAE;CACZ,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/app/config.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,IAAI,EAAE,EAAE;IACR,GAAG,EAAE,EAAE;IACP,IAAI,EAAE;QACJ,GAAG,EAAE,KAAK;KACX;IACD,GAAG,EAAE;QACH,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;KACX;IACD,IAAI,EAAE;QACJ,aAAa,EAAE,WAAW;KAC3B;IACD,MAAM,EAAE;QACN,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB;KACF;IACD,MAAM,EAAE;QACN,SAAS,EAAE;YACT,OAAO,EAAE,2BAA2B;YACpC,KAAK,EAAE,yBAAyB;SACjC;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT;IACD,OAAO,EAAE,EAAE;CACZ,CAAC"}
package/dist/core/resource.d.ts CHANGED
@@ -23,12 +23,12 @@ export declare class AppResource extends BeanSimple {
23
23
  name: string;
24
24
  };
25
25
  _parseModuleBelong(module: any, beanClass: any, virtual: any): any;
26
- _getModuleBelong<T>(A: Constructable<T>): string;
27
- _getModuleBelong<K extends keyof IBeanRecord>(beanFullName: K): string;
28
- _getModuleBelong(beanFullName: string): string;
29
- _getModuleName<T>(A: Constructable<T>): string;
30
- _getModuleName<K extends keyof IBeanRecord>(beanFullName: K): string;
31
- _getModuleName(beanFullName: string): string;
26
+ _getModuleBelong<T>(A: Constructable<T>): string | undefined;
27
+ _getModuleBelong<K extends keyof IBeanRecord>(beanFullName: K): string | undefined;
28
+ _getModuleBelong(beanFullName: string): string | undefined;
29
+ _getModuleName<T>(A: Constructable<T>): string | undefined;
30
+ _getModuleName<K extends keyof IBeanRecord>(beanFullName: K): string | undefined;
31
+ _getModuleName(beanFullName: string): string | undefined;
32
32
  findAopsMatched(_beanFullName: string): any[];
33
33
  }
34
34
  export declare const appResource: AppResource;
package/dist/core/resource.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/core/resource.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAe,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,eAAO,MAAM,qBAAqB,eAAuC,CAAC;AAC1E,eAAO,MAAM,YAAY,eAA8B,CAAC;AACxD,eAAO,MAAM,iCAAiC,eAAmD,CAAC;AAElG,qBAAa,WAAY,SAAQ,UAAU;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAM;IACtD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAM;IAErD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAUxD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC,GAAG,SAAS;IAIlF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IASxD,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAkCzD,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS;IAI3D,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;IAY1E,aAAa,CAAC,SAAS,EAAE,MAAM;IAM/B,sBAAsB,CAAC,CAAC,EACtB,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAC3B,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,GACZ;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlC,kBAAkB,CAAC,MAAM,KAAA,EAAE,SAAS,KAAA,EAAE,OAAO,KAAA;IAqB7C,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM;IAChD,gBAAgB,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM;IACtE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAO9C,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM;IAC9C,cAAc,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM;IACpE,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAO5C,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG,EAAE;CAG9C;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
1
+ {"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/core/resource.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAe,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,eAAO,MAAM,qBAAqB,eAAuC,CAAC;AAC1E,eAAO,MAAM,YAAY,eAA8B,CAAC;AACxD,eAAO,MAAM,iCAAiC,eAAmD,CAAC;AAElG,qBAAa,WAAY,SAAQ,UAAU;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAM;IACtD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAM;IAErD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAUxD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC,GAAG,SAAS;IAIlF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IASxD,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAkCzD,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS;IAI3D,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;IAY1E,aAAa,CAAC,SAAS,EAAE,MAAM;IAM/B,sBAAsB,CAAC,CAAC,EACtB,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAC3B,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,GACZ;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlC,kBAAkB,CAAC,MAAM,KAAA,EAAE,SAAS,KAAA,EAAE,OAAO,KAAA;IAqB7C,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS;IAC5D,gBAAgB,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM,GAAG,SAAS;IAClF,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAM1D,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS;IAC1D,cAAc,CAAC,CAAC,SAAS,MAAM,WAAW,EAAE,YAAY,EAAE,CAAC,GAAG,MAAM,GAAG,SAAS;IAChF,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG,EAAE;CAG9C;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
package/dist/core/resource.js CHANGED
@@ -145,15 +145,11 @@ export class AppResource extends BeanSimple {
145
145
  }
146
146
  _getModuleBelong(beanFullName) {
147
147
  const beanOptions = this.getBean(beanFullName);
148
- if (!beanOptions || !beanOptions.moduleBelong)
149
- throw new Error(`not found module belong: ${beanFullName}`);
150
- return beanOptions.moduleBelong;
148
+ return beanOptions?.moduleBelong;
151
149
  }
152
150
  _getModuleName(beanFullName) {
153
151
  const beanOptions = this.getBean(beanFullName);
154
- if (!beanOptions || !beanOptions.module)
155
- throw new Error(`not found module name: ${beanFullName}`);
156
- return beanOptions.module;
152
+ return beanOptions?.module;
157
153
  }
158
154
  findAopsMatched(_beanFullName) {
159
155
  return [];
package/dist/core/resource.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/core/resource.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/core/resource.ts"],"names":[],"mappings":"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"}
package/dist/decorator/class/use.js CHANGED
@@ -17,11 +17,14 @@ export function Use(options) {
17
17
  });
18
18
  // chech beanClass
19
19
  if (process.env.NODE_ENV === 'development') {
20
- if (options.beanFullName || options.name) {
21
- const beanFullName = appResource.getBeanFullName(beanClass);
22
- if (beanFullName) {
23
- console.error(`inject class should be imported by type, such as: import type { ${appResource._fixClassName(beanClass.name)} } from 'xxx'`);
24
- }
20
+ const moduleSource = appResource._getModuleName(beanClass);
21
+ if (moduleSource) {
22
+ window.setTimeout(() => {
23
+ const moduleTarget = appResource._getModuleName(target.constructor);
24
+ if (moduleSource !== moduleTarget) {
25
+ console.error(`inject class should be imported by type, such as: import type { ${appResource._fixClassName(beanClass.name)} } from 'zova-module-xxx-xxx'`);
26
+ }
27
+ }, 0);
25
28
  }
26
29
  }
27
30
  };
package/dist/decorator/class/use.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"use.js","sourceRoot":"","sources":["../../../src/decorator/class/use.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAe,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,MAAM,UAAU,GAAG,CAAC,OAAuC;IACzD,OAAO,UAAU,MAAc,EAAE,IAAiB;QAChD,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,EAAE,CAAC;QAC3B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,GAAG,EAAE,YAAY,EAAE,OAAO,EAAqC,CAAC;QACzE,CAAC;QACD,YAAY;QACZ,MAAM,SAAS,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAkB,CAAC;QAC3E,SAAS;QACT,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE;YACzB,GAAG,OAAO;YACV,IAAI;YACJ,SAAS;SACV,CAAC,CAAC;QACH,kBAAkB;QAClB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzC,MAAM,YAAY,GAAG,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAC5D,IAAI,YAAY,EAAE,CAAC;oBACjB,OAAO,CAAC,KAAK,CACX,mEAAmE,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAC5H,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"use.js","sourceRoot":"","sources":["../../../src/decorator/class/use.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAe,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,MAAM,UAAU,GAAG,CAAC,OAAuC;IACzD,OAAO,UAAU,MAAc,EAAE,IAAiB;QAChD,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,EAAE,CAAC;QAC3B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,GAAG,EAAE,YAAY,EAAE,OAAO,EAAqC,CAAC;QACzE,CAAC;QACD,YAAY;QACZ,MAAM,SAAS,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAkB,CAAC;QAC3E,SAAS;QACT,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE;YACzB,GAAG,OAAO;YACV,IAAI;YACJ,SAAS;SACV,CAAC,CAAC;QACH,kBAAkB;QAClB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC3D,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;oBACrB,MAAM,YAAY,GAAG,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,WAAkB,CAAC,CAAC;oBAC3E,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;wBAClC,OAAO,CAAC,KAAK,CACX,mEAAmE,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,+BAA+B,CAC5I,CAAC;oBACJ,CAAC;gBACH,CAAC,EAAE,CAAC,CAAC,CAAC;YACR,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zova-core",
3
- "version": "5.0.112",
3
+ "version": "5.0.114",
4
4
  "description": "A vue3 framework with ioc",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -45,7 +45,7 @@
45
45
  "@cabloy/localeutil": "^1.0.4",
46
46
  "@cabloy/module-info": "^1.0.20",
47
47
  "@cabloy/vue-reactivity": "^3.4.35",
48
- "@cabloy/vue-router": "^4.4.5",
48
+ "@cabloy/vue-router": "^4.4.6",
49
49
  "@cabloy/vue-runtime-core": "^3.4.35",
50
50
  "@types/js-cookie": "^3.0.6",
51
51
  "@vue/reactivity": "^3.4.27",
@@ -54,5 +54,5 @@
54
54
  "vue": "^3.4.27",
55
55
  "zod": "^3.23.8"
56
56
  },
57
- "gitHead": "61b1b2ac3c9466f18a8a19ed50020a365d8ea405"
57
+ "gitHead": "92063336519fdf4aef8bfb1ca920dd6421d1a7da"
58
58
  }
package/src/bean/beanBaseSimple.ts CHANGED
@@ -24,10 +24,15 @@ export class BeanBaseSimple extends BeanSimple {
24
24
  }
25
25
 
26
26
  protected get [SymbolModuleBelong]() {
27
- return this[SymbolModuleBelongInner] || appResource._getModuleBelong(this[SymbolBeanFullName]);
27
+ if (this[SymbolModuleBelongInner]) return this[SymbolModuleBelongInner];
28
+ const moduleBelong = appResource._getModuleBelong(this[SymbolBeanFullName]);
29
+ if (!moduleBelong) throw new Error(`not found module belong: ${this[SymbolBeanFullName]}`);
30
+ return moduleBelong;
28
31
  }
29
32
 
30
33
  protected get [SymbolModuleName]() {
31
- return appResource._getModuleName(this[SymbolBeanFullName]);
34
+ const moduleName = appResource._getModuleName(this[SymbolBeanFullName]);
35
+ if (!moduleName) throw new Error(`not found module name: ${this[SymbolBeanFullName]}`);
36
+ return moduleName;
32
37
  }
33
38
  }
package/src/bean/resource/page/type.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { z } from 'zod';
2
2
 
3
+ export interface ZovaConfigRoutes {}
3
4
  export interface IPagePathRecord {}
4
5
  export interface IPageNameRecord {}
5
6
 
package/src/core/app/config.ts CHANGED
@@ -6,6 +6,7 @@ import {
6
6
  PowerPartial,
7
7
  IComponentLayoutRecord,
8
8
  IBeanScopeRecord,
9
+ ZovaConfigRoutes,
9
10
  } from '../../index.js';
10
11
 
11
12
  export const configDefault = {
@@ -35,6 +36,10 @@ export const configDefault = {
35
36
  empty: 'home-layout:layoutEmpty',
36
37
  },
37
38
  },
39
+ routes: {
40
+ path: {},
41
+ name: {},
42
+ },
38
43
  modules: {},
39
44
  };
40
45
 
@@ -62,6 +67,7 @@ export type ZovaConfig = {
62
67
  empty: keyof IComponentLayoutRecord;
63
68
  };
64
69
  };
70
+ routes: ZovaConfigRoutes;
65
71
  modules: IBeanScopeConfig;
66
72
  };
67
73
 
package/src/core/resource.ts CHANGED
@@ -162,22 +162,20 @@ export class AppResource extends BeanSimple {
162
162
  return moduleBelong;
163
163
  }
164
164
 
165
- _getModuleBelong<T>(A: Constructable<T>): string;
166
- _getModuleBelong<K extends keyof IBeanRecord>(beanFullName: K): string;
167
- _getModuleBelong(beanFullName: string): string;
168
- _getModuleBelong<T>(beanFullName: Constructable<T> | string): string {
165
+ _getModuleBelong<T>(A: Constructable<T>): string | undefined;
166
+ _getModuleBelong<K extends keyof IBeanRecord>(beanFullName: K): string | undefined;
167
+ _getModuleBelong(beanFullName: string): string | undefined;
168
+ _getModuleBelong<T>(beanFullName: Constructable<T> | string): string | undefined {
169
169
  const beanOptions = this.getBean(beanFullName as any);
170
- if (!beanOptions || !beanOptions.moduleBelong) throw new Error(`not found module belong: ${beanFullName}`);
171
- return beanOptions.moduleBelong;
170
+ return beanOptions?.moduleBelong;
172
171
  }
173
172
 
174
- _getModuleName<T>(A: Constructable<T>): string;
175
- _getModuleName<K extends keyof IBeanRecord>(beanFullName: K): string;
176
- _getModuleName(beanFullName: string): string;
177
- _getModuleName<T>(beanFullName: Constructable<T> | string): string {
173
+ _getModuleName<T>(A: Constructable<T>): string | undefined;
174
+ _getModuleName<K extends keyof IBeanRecord>(beanFullName: K): string | undefined;
175
+ _getModuleName(beanFullName: string): string | undefined;
176
+ _getModuleName<T>(beanFullName: Constructable<T> | string): string | undefined {
178
177
  const beanOptions = this.getBean(beanFullName as any);
179
- if (!beanOptions || !beanOptions.module) throw new Error(`not found module name: ${beanFullName}`);
180
- return beanOptions.module;
178
+ return beanOptions?.module;
181
179
  }
182
180
 
183
181
  findAopsMatched(_beanFullName: string): any[] {
package/src/decorator/class/use.ts CHANGED
@@ -21,13 +21,16 @@ export function Use(options?: IDecoratorUseOptions | string): PropertyDecorator
21
21
  });
22
22
  // chech beanClass
23
23
  if (process.env.NODE_ENV === 'development') {
24
- if (options.beanFullName || options.name) {
25
- const beanFullName = appResource.getBeanFullName(beanClass);
26
- if (beanFullName) {
27
- console.error(
28
- `inject class should be imported by type, such as: import type { ${appResource._fixClassName(beanClass.name)} } from 'xxx'`,
29
- );
30
- }
24
+ const moduleSource = appResource._getModuleName(beanClass);
25
+ if (moduleSource) {
26
+ window.setTimeout(() => {
27
+ const moduleTarget = appResource._getModuleName(target.constructor as any);
28
+ if (moduleSource !== moduleTarget) {
29
+ console.error(
30
+ `inject class should be imported by type, such as: import type { ${appResource._fixClassName(beanClass.name)} } from 'zova-module-xxx-xxx'`,
31
+ );
32
+ }
33
+ }, 0);
31
34
  }
32
35
  }
33
36
  };