@eggjs/tegg-plugin 3.5.2 → 3.6.1

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/app.js CHANGED
@@ -19,14 +19,16 @@ class App {
19
19
  configDidLoad() {
20
20
  this.eggContextHandler = new EggContextHandler_1.EggContextHandler(this.app);
21
21
  this.app.eggContextHandler = this.eggContextHandler;
22
- this.eggQualifierProtoHook = new EggQualifierProtoHook_1.EggQualifierProtoHook(this.app);
23
22
  this.eggContextHandler.register();
24
- this.app.loadUnitLifecycleUtil.registerLifecycle(this.eggQualifierProtoHook);
25
23
  this.app.moduleHandler = new ModuleHandler_1.ModuleHandler(this.app);
26
24
  }
27
25
  async didLoad() {
28
26
  (0, run_in_background_1.hijackRunInBackground)(this.app);
29
- await this.app.moduleHandler.ready();
27
+ // wait all file loaded, so app/ctx has all properties
28
+ this.eggQualifierProtoHook = new EggQualifierProtoHook_1.EggQualifierProtoHook(this.app);
29
+ this.app.loadUnitLifecycleUtil.registerLifecycle(this.eggQualifierProtoHook);
30
+ // start load tegg objects
31
+ await this.app.moduleHandler.init();
30
32
  this.compatibleHook = new EggContextCompatibleHook_1.EggContextCompatibleHook(this.app.moduleHandler);
31
33
  this.app.eggContextLifecycleUtil.registerLifecycle(this.compatibleHook);
32
34
  }
@@ -42,4 +44,4 @@ class App {
42
44
  }
43
45
  }
44
46
  exports.default = App;
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQTJCO0FBQzNCLHFDQUFtQztBQUNuQyxxQ0FBbUM7QUFFbkMsNkVBQTBFO0FBQzFFLHlEQUFzRDtBQUN0RCx1REFBb0Q7QUFDcEQsK0RBQTREO0FBQzVELCtEQUFnRTtBQUNoRSx1RUFBb0U7QUFFcEUsTUFBcUIsR0FBRztJQU10QixZQUFZLEdBQWdCO1FBQzFCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxjQUFjO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCxhQUFhO1FBQ1gsSUFBSSxDQUFDLGlCQUFpQixHQUFHLElBQUkscUNBQWlCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDO1FBQ3BELElBQUksQ0FBQyxxQkFBcUIsR0FBRyxJQUFJLDZDQUFxQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUM3RSxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTztRQUNYLElBQUEseUNBQXFCLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2hDLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDckMsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLG1EQUF3QixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXO1FBQ2YsK0JBQWMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN2QixNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3ZDLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRTtZQUN2QixJQUFJLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7U0FDdkU7UUFDRCxJQUFJLElBQUksQ0FBQyxxQkFBcUIsRUFBRTtZQUM5QixJQUFJLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztTQUM1RTtJQUNILENBQUM7Q0FDRjtBQXhDRCxzQkF3Q0MifQ==
47
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQTJCO0FBQzNCLHFDQUFtQztBQUNuQyxxQ0FBbUM7QUFFbkMsNkVBQTBFO0FBQzFFLHlEQUFzRDtBQUN0RCx1REFBb0Q7QUFDcEQsK0RBQTREO0FBQzVELCtEQUFnRTtBQUNoRSx1RUFBb0U7QUFFcEUsTUFBcUIsR0FBRztJQU10QixZQUFZLEdBQWdCO1FBQzFCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxjQUFjO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCxhQUFhO1FBQ1gsSUFBSSxDQUFDLGlCQUFpQixHQUFHLElBQUkscUNBQWlCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDO1FBQ3BELElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTztRQUNYLElBQUEseUNBQXFCLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2hDLHNEQUFzRDtRQUN0RCxJQUFJLENBQUMscUJBQXFCLEdBQUcsSUFBSSw2Q0FBcUIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUM3RSwwQkFBMEI7UUFDMUIsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQyxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksbURBQXdCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzRSxJQUFJLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUMxRSxDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDZiwrQkFBYyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDdkMsSUFBSSxJQUFJLENBQUMsY0FBYyxFQUFFO1lBQ3ZCLElBQUksQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztTQUN2RTtRQUNELElBQUksSUFBSSxDQUFDLHFCQUFxQixFQUFFO1lBQzlCLElBQUksQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1NBQzVFO0lBQ0gsQ0FBQztDQUNGO0FBMUNELHNCQTBDQyJ9
@@ -3,8 +3,6 @@ import { LifecycleHook } from '@eggjs/tegg';
3
3
  import { Application } from 'egg';
4
4
  export declare class EggQualifierProtoHook implements LifecycleHook<LoadUnitLifecycleContext, LoadUnit> {
5
5
  private readonly app;
6
- private readonly appProperties;
7
- private readonly ctxProperties;
8
6
  constructor(app: Application);
9
7
  preCreate(ctx: LoadUnitLifecycleContext): Promise<void>;
10
8
  private isAppObject;
@@ -7,11 +7,11 @@ const tegg_common_util_1 = require("@eggjs/tegg-common-util");
7
7
  class EggQualifierProtoHook {
8
8
  constructor(app) {
9
9
  this.app = app;
10
- this.appProperties = tegg_common_util_1.ObjectUtils.getProperties(this.app);
11
- this.ctxProperties = tegg_common_util_1.ObjectUtils.getProperties(this.app.context);
12
10
  }
13
11
  async preCreate(ctx) {
14
12
  const clazzList = ctx.loader.load();
13
+ const appProperties = tegg_common_util_1.ObjectUtils.getProperties(this.app);
14
+ const ctxProperties = tegg_common_util_1.ObjectUtils.getProperties(this.app.context);
15
15
  for (const clazz of clazzList) {
16
16
  for (const injectObject of tegg_1.PrototypeUtil.getInjectObjects(clazz) || []) {
17
17
  const propertyQualifiers = tegg_1.QualifierUtil.getProperQualifiers(clazz, injectObject.refName);
@@ -19,16 +19,16 @@ class EggQualifierProtoHook {
19
19
  if (hasEggQualifier) {
20
20
  continue;
21
21
  }
22
- if (this.isCtxObject(injectObject.objName)) {
22
+ if (this.isCtxObject(injectObject.objName, ctxProperties)) {
23
23
  tegg_1.QualifierUtil.addProperQualifier(clazz, injectObject.refName, tegg_1.EggQualifierAttribute, tegg_1.EggType.CONTEXT);
24
24
  }
25
- else if (this.isAppObject(injectObject.objName)) {
25
+ else if (this.isAppObject(injectObject.objName, appProperties)) {
26
26
  tegg_1.QualifierUtil.addProperQualifier(clazz, injectObject.refName, tegg_1.EggQualifierAttribute, tegg_1.EggType.APP);
27
27
  }
28
28
  }
29
29
  }
30
30
  }
31
- isAppObject(name) {
31
+ isAppObject(name, appProperties) {
32
32
  name = String(name);
33
33
  if (EggAppLoader_1.APP_CLAZZ_BLACK_LIST.includes(name)) {
34
34
  return false;
@@ -36,9 +36,9 @@ class EggQualifierProtoHook {
36
36
  if (EggAppLoader_1.DEFAULT_APP_CLAZZ.includes(name)) {
37
37
  return true;
38
38
  }
39
- return this.appProperties.includes(name);
39
+ return appProperties.includes(name);
40
40
  }
41
- isCtxObject(name) {
41
+ isCtxObject(name, ctxProperties) {
42
42
  name = String(name);
43
43
  if (EggAppLoader_1.CONTEXT_CLAZZ_BLACK_LIST.includes(name)) {
44
44
  return false;
@@ -46,8 +46,8 @@ class EggQualifierProtoHook {
46
46
  if (EggAppLoader_1.DEFAULT_CONTEXT_CLAZZ.includes(name)) {
47
47
  return true;
48
48
  }
49
- return this.ctxProperties.includes(name);
49
+ return ctxProperties.includes(name);
50
50
  }
51
51
  }
52
52
  exports.EggQualifierProtoHook = EggQualifierProtoHook;
53
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHNDQU1xQjtBQUVyQixpREFLd0I7QUFDeEIsOERBQXNEO0FBRXRELE1BQWEscUJBQXFCO0lBS2hDLFlBQVksR0FBZ0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsYUFBYSxHQUFHLDhCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsYUFBYSxHQUFHLDhCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkUsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBNkI7UUFDM0MsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQyxLQUFLLE1BQU0sS0FBSyxJQUFJLFNBQVMsRUFBRTtZQUM3QixLQUFLLE1BQU0sWUFBWSxJQUFJLG9CQUFhLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUN0RSxNQUFNLGtCQUFrQixHQUFHLG9CQUFhLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDMUYsTUFBTSxlQUFlLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsS0FBSyw0QkFBcUIsQ0FBQyxDQUFDO2dCQUM1RixJQUFJLGVBQWUsRUFBRTtvQkFDbkIsU0FBUztpQkFDVjtnQkFDRCxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxFQUFFO29CQUMxQyxvQkFBYSxDQUFDLGtCQUFrQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsT0FBTyxFQUFFLDRCQUFxQixFQUFFLGNBQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztpQkFDdkc7cUJBQU0sSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsRUFBRTtvQkFDakQsb0JBQWEsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLE9BQU8sRUFBRSw0QkFBcUIsRUFBRSxjQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQ25HO2FBQ0Y7U0FDRjtJQUNILENBQUM7SUFFTyxXQUFXLENBQUMsSUFBaUI7UUFDbkMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwQixJQUFJLG1DQUFvQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsSUFBSSxnQ0FBaUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDcEMsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQjtRQUNuQyxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BCLElBQUksdUNBQXdCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzNDLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxJQUFJLG9DQUFxQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN4QyxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMzQyxDQUFDO0NBQ0Y7QUFsREQsc0RBa0RDIn0=
53
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHNDQU1xQjtBQUVyQixpREFLd0I7QUFDeEIsOERBQXNEO0FBRXRELE1BQWEscUJBQXFCO0lBR2hDLFlBQVksR0FBZ0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7SUFDakIsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBNkI7UUFDM0MsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQyxNQUFNLGFBQWEsR0FBRyw4QkFBVyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDMUQsTUFBTSxhQUFhLEdBQUcsOEJBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsRSxLQUFLLE1BQU0sS0FBSyxJQUFJLFNBQVMsRUFBRTtZQUM3QixLQUFLLE1BQU0sWUFBWSxJQUFJLG9CQUFhLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUN0RSxNQUFNLGtCQUFrQixHQUFHLG9CQUFhLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDMUYsTUFBTSxlQUFlLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsS0FBSyw0QkFBcUIsQ0FBQyxDQUFDO2dCQUM1RixJQUFJLGVBQWUsRUFBRTtvQkFDbkIsU0FBUztpQkFDVjtnQkFDRCxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsRUFBRTtvQkFDekQsb0JBQWEsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLE9BQU8sRUFBRSw0QkFBcUIsRUFBRSxjQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7aUJBQ3ZHO3FCQUFNLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUMsT0FBTyxFQUFFLGFBQWEsQ0FBQyxFQUFFO29CQUNoRSxvQkFBYSxDQUFDLGtCQUFrQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsT0FBTyxFQUFFLDRCQUFxQixFQUFFLGNBQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFDbkc7YUFDRjtTQUNGO0lBQ0gsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQixFQUFFLGFBQXVCO1FBQzVELElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEIsSUFBSSxtQ0FBb0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDdkMsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELElBQUksZ0NBQWlCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3BDLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFDRCxPQUFPLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQixFQUFFLGFBQXVCO1FBQzVELElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEIsSUFBSSx1Q0FBd0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDM0MsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELElBQUksb0NBQXFCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3hDLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFDRCxPQUFPLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdEMsQ0FBQztDQUNGO0FBaERELHNEQWdEQyJ9
@@ -8,6 +8,6 @@ export declare class ModuleHandler extends Base {
8
8
  private readonly loadUnitLoader;
9
9
  private readonly app;
10
10
  constructor(app: Application);
11
- _init(): Promise<void>;
11
+ init(): Promise<void>;
12
12
  destroy(): Promise<void>;
13
13
  }
@@ -12,27 +12,34 @@ const CompatibleUtil_1 = require("./CompatibleUtil");
12
12
  const EggCompatibleProtoImpl_1 = require("./EggCompatibleProtoImpl");
13
13
  class ModuleHandler extends sdk_base_1.default {
14
14
  constructor(app) {
15
- super({ initMethod: '_init' });
15
+ super();
16
16
  this.loadUnits = [];
17
17
  this.loadUnitInstances = [];
18
18
  this.app = app;
19
19
  this.loadUnitLoader = new EggModuleLoader_1.EggModuleLoader(this.app);
20
20
  }
21
- async _init() {
22
- this.app.eggPrototypeCreatorFactory.registerPrototypeCreator(EggCompatibleProtoImpl_1.COMPATIBLE_PROTO_IMPLE_TYPE, EggCompatibleProtoImpl_1.EggCompatibleProtoImpl.create);
23
- await this.loadUnitLoader.load();
24
- const instances = [];
25
- // TODO fixtures dts broken the module defintion
26
- this.app.module = {};
27
- for (const loadUnit of this.loadUnits) {
28
- const instance = await tegg_runtime_1.LoadUnitInstanceFactory.createLoadUnitInstance(loadUnit);
29
- if (instance.loadUnit.type !== tegg_metadata_1.EggLoadUnitType.APP) {
30
- CompatibleUtil_1.CompatibleUtil.appCompatible(this.app, instance);
21
+ async init() {
22
+ try {
23
+ this.app.eggPrototypeCreatorFactory.registerPrototypeCreator(EggCompatibleProtoImpl_1.COMPATIBLE_PROTO_IMPLE_TYPE, EggCompatibleProtoImpl_1.EggCompatibleProtoImpl.create);
24
+ await this.loadUnitLoader.load();
25
+ const instances = [];
26
+ // TODO fixtures dts broken the module defintion
27
+ this.app.module = {};
28
+ for (const loadUnit of this.loadUnits) {
29
+ const instance = await tegg_runtime_1.LoadUnitInstanceFactory.createLoadUnitInstance(loadUnit);
30
+ if (instance.loadUnit.type !== tegg_metadata_1.EggLoadUnitType.APP) {
31
+ CompatibleUtil_1.CompatibleUtil.appCompatible(this.app, instance);
32
+ }
33
+ instances.push(instance);
31
34
  }
32
- instances.push(instance);
35
+ CompatibleUtil_1.CompatibleUtil.contextModuleCompatible(this.app.context, instances);
36
+ this.loadUnitInstances = instances;
37
+ this.ready(true);
38
+ }
39
+ catch (e) {
40
+ this.ready(e);
41
+ throw e;
33
42
  }
34
- CompatibleUtil_1.CompatibleUtil.contextModuleCompatible(this.app.context, instances);
35
- this.loadUnitInstances = instances;
36
43
  }
37
44
  async destroy() {
38
45
  if (this.loadUnitInstances) {
@@ -48,4 +55,4 @@ class ModuleHandler extends sdk_base_1.default {
48
55
  }
49
56
  }
50
57
  exports.ModuleHandler = ModuleHandler;
51
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kdWxlSGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIk1vZHVsZUhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsd0RBQTRCO0FBRTVCLHdEQUk4QjtBQUM5QixzREFBZ0Y7QUFDaEYsdURBQW9EO0FBQ3BELHFEQUFrRDtBQUNsRCxxRUFBK0Y7QUFFL0YsTUFBYSxhQUFjLFNBQVEsa0JBQUk7SUFPckMsWUFBWSxHQUFnQjtRQUMxQixLQUFLLENBQUMsRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQVBqQyxjQUFTLEdBQWUsRUFBRSxDQUFDO1FBQzNCLHNCQUFpQixHQUF1QixFQUFFLENBQUM7UUFPekMsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksaUNBQWUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLO1FBQ1QsSUFBSSxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsQ0FBQyx3QkFBd0IsQ0FDMUQsb0RBQTJCLEVBQUUsK0NBQXNCLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFOUQsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2pDLE1BQU0sU0FBUyxHQUF1QixFQUFFLENBQUM7UUFDekMsZ0RBQWdEO1FBQy9DLElBQUksQ0FBQyxHQUFXLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUU5QixLQUFLLE1BQU0sUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDckMsTUFBTSxRQUFRLEdBQUcsTUFBTSxzQ0FBdUIsQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNoRixJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxLQUFLLCtCQUFlLENBQUMsR0FBRyxFQUFFO2dCQUNsRCwrQkFBYyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQ2xEO1lBQ0QsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUMxQjtRQUNELCtCQUFjLENBQUMsdUJBQXVCLENBQUUsSUFBSSxDQUFDLEdBQVcsQ0FBQyxPQUFrQixFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3hGLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUM7SUFDckMsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEVBQUU7WUFDMUIsS0FBSyxNQUFNLFFBQVEsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEVBQUU7Z0JBQzdDLE1BQU0sc0NBQXVCLENBQUMsdUJBQXVCLENBQUMsUUFBUSxDQUFDLENBQUM7YUFDakU7U0FDRjtRQUNELElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRTtZQUNsQixLQUFLLE1BQU0sUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUU7Z0JBQ3JDLE1BQU0sK0JBQWUsQ0FBQyxlQUFlLENBQUMsUUFBUSxDQUFDLENBQUM7YUFDakQ7U0FDRjtJQUNILENBQUM7Q0FDRjtBQTdDRCxzQ0E2Q0MifQ==
58
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kdWxlSGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIk1vZHVsZUhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsd0RBQTRCO0FBRTVCLHdEQUk4QjtBQUM5QixzREFBZ0Y7QUFDaEYsdURBQW9EO0FBQ3BELHFEQUFrRDtBQUNsRCxxRUFBK0Y7QUFFL0YsTUFBYSxhQUFjLFNBQVEsa0JBQUk7SUFPckMsWUFBWSxHQUFnQjtRQUMxQixLQUFLLEVBQUUsQ0FBQztRQVBWLGNBQVMsR0FBZSxFQUFFLENBQUM7UUFDM0Isc0JBQWlCLEdBQXVCLEVBQUUsQ0FBQztRQU96QyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxpQ0FBZSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQUk7UUFDUixJQUFJO1lBQ0YsSUFBSSxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsQ0FBQyx3QkFBd0IsQ0FDMUQsb0RBQTJCLEVBQUUsK0NBQXNCLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFOUQsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2pDLE1BQU0sU0FBUyxHQUF1QixFQUFFLENBQUM7WUFDekMsZ0RBQWdEO1lBQy9DLElBQUksQ0FBQyxHQUFXLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQztZQUU5QixLQUFLLE1BQU0sUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUU7Z0JBQ3JDLE1BQU0sUUFBUSxHQUFHLE1BQU0sc0NBQXVCLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQ2hGLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEtBQUssK0JBQWUsQ0FBQyxHQUFHLEVBQUU7b0JBQ2xELCtCQUFjLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUM7aUJBQ2xEO2dCQUNELFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7YUFDMUI7WUFDRCwrQkFBYyxDQUFDLHVCQUF1QixDQUFFLElBQUksQ0FBQyxHQUFXLENBQUMsT0FBa0IsRUFBRSxTQUFTLENBQUMsQ0FBQztZQUN4RixJQUFJLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDO1lBQ25DLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbEI7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDZCxNQUFNLENBQUMsQ0FBQztTQUNUO0lBRUgsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEVBQUU7WUFDMUIsS0FBSyxNQUFNLFFBQVEsSUFBSSxJQUFJLENBQUMsaUJBQWlCLEVBQUU7Z0JBQzdDLE1BQU0sc0NBQXVCLENBQUMsdUJBQXVCLENBQUMsUUFBUSxDQUFDLENBQUM7YUFDakU7U0FDRjtRQUNELElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRTtZQUNsQixLQUFLLE1BQU0sUUFBUSxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUU7Z0JBQ3JDLE1BQU0sK0JBQWUsQ0FBQyxlQUFlLENBQUMsUUFBUSxDQUFDLENBQUM7YUFDakQ7U0FDRjtJQUNILENBQUM7Q0FDRjtBQXBERCxzQ0FvREMifQ==
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  "teggConfig"
7
7
  ]
8
8
  },
9
- "version": "3.5.2",
9
+ "version": "3.6.1",
10
10
  "description": "module plugin for egg",
11
11
  "keywords": [
12
12
  "egg",
@@ -46,8 +46,8 @@
46
46
  },
47
47
  "dependencies": {
48
48
  "@eggjs/egg-module-common": "^3.2.3",
49
- "@eggjs/tegg": "^3.5.2",
50
- "@eggjs/tegg-background-task": "^3.5.0",
49
+ "@eggjs/tegg": "^3.6.0",
50
+ "@eggjs/tegg-background-task": "^3.6.0",
51
51
  "@eggjs/tegg-common-util": "^3.2.3",
52
52
  "@eggjs/tegg-dynamic-inject-runtime": "^3.5.0",
53
53
  "@eggjs/tegg-loader": "^3.5.0",
@@ -73,5 +73,5 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "961a1e12f78050b620edf8fe1a2c9a34ded2ff83"
76
+ "gitHead": "91c3627f7f942daea889a1c97b3953aee1464ff7"
77
77
  }