@eggjs/tegg-plugin 3.5.1 → 3.6.0

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
@@ -27,10 +27,14 @@ class CompatibleUtil {
27
27
  return this.requestProtoCache.get(name);
28
28
  }
29
29
  static singletonModuleProxyFactory(app, loadUnitInstance) {
30
+ let deprecated = false;
30
31
  return function (_, p) {
31
32
  const proto = CompatibleUtil.getSingletonProto(p);
32
33
  const eggObj = tegg_runtime_1.EggContainerFactory.getEggObject(proto);
33
- app.deprecate(`[egg/module] Please use await app.getEggObject(clazzName) instead of app.${loadUnitInstance.name}.${String(p)}`);
34
+ if (!deprecated) {
35
+ deprecated = true;
36
+ app.deprecate(`[egg/module] Please use await app.getEggObject(clazzName) instead of app.${loadUnitInstance.name}.${String(p)}`);
37
+ }
34
38
  return eggObj.obj;
35
39
  };
36
40
  }
@@ -44,10 +48,14 @@ class CompatibleUtil {
44
48
  static contextModuleProxyFactory(holder, ctx, loadUnitInstance) {
45
49
  const cacheKey = `_${loadUnitInstance.name}Proxy`;
46
50
  if (!holder[cacheKey]) {
51
+ let deprecated = false;
47
52
  const getter = function (_, p) {
48
53
  const proto = CompatibleUtil.getRequestProto(p);
49
54
  const eggObj = tegg_runtime_1.EggContainerFactory.getEggObject(proto, p);
50
- ctx.app.deprecate(`[egg/module] Please use await ctx.getEggObject(clazzName) instead of ctx.${loadUnitInstance.name}.${String(p)}`);
55
+ if (!deprecated) {
56
+ deprecated = true;
57
+ ctx.app.deprecate(`[egg/module] Please use await ctx.getEggObject(clazzName) instead of ctx.${loadUnitInstance.name}.${String(p)}`);
58
+ }
51
59
  return eggObj.obj;
52
60
  };
53
61
  holder[cacheKey] = tegg_common_util_1.ProxyUtil.safeProxy(loadUnitInstance, getter);
@@ -87,4 +95,4 @@ class CompatibleUtil {
87
95
  exports.CompatibleUtil = CompatibleUtil;
88
96
  CompatibleUtil.singletonProtoCache = new Map();
89
97
  CompatibleUtil.requestProtoCache = new Map();
90
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcGF0aWJsZVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJDb21wYXRpYmxlVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFBeUU7QUFDekUsc0NBQXlFO0FBQ3pFLHNEQUE0RTtBQUM1RSw4REFBb0Q7QUFFcEQsTUFBYSxjQUFjO0lBSXpCLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFpQjtRQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsU0FBUztpQkFDaEMsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUMzQztRQUNELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUUsQ0FBQztJQUM3QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFpQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNyQyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsT0FBTztpQkFDOUIsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUN6QztRQUNELE9BQU8s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
98
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcGF0aWJsZVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJDb21wYXRpYmxlVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFBeUU7QUFDekUsc0NBQXlFO0FBQ3pFLHNEQUE0RTtBQUM1RSw4REFBb0Q7QUFFcEQsTUFBYSxjQUFjO0lBSXpCLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFpQjtRQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsU0FBUztpQkFDaEMsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUMzQztRQUNELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUUsQ0FBQztJQUM3QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFpQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNyQyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsT0FBTztpQkFDOUIsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUN6QztRQUNELE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUUsQ0FBQztJQUMzQyxDQUFDO0lBRU8sTUFBTSxDQUFDLDJCQUEyQixDQUFDLEdBQWdCLEVBQUUsZ0JBQWtDO1FBQzdGLElBQUksVUFBVSxHQUFHLEtBQUssQ0FBQztRQUN2QixPQUFPLFVBQVMsQ0FBQyxFQUFFLENBQWM7WUFDL0IsTUFBTSxLQUFLLEdBQUcsY0FBYyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2xELE1BQU0sTUFBTSxHQUFHLGtDQUFtQixDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN2RCxJQUFJLENBQUMsVUFBVSxFQUFFO2dCQUNmLFVBQVUsR0FBRyxJQUFJLENBQUM7Z0JBQ2xCLEdBQUcsQ0FBQyxTQUFTLENBQ1gsNEVBQTRFLGdCQUFnQixDQUFDLElBQUksSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO2FBQ3JIO1lBQ0QsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3BCLENBQUMsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLEdBQWdCLEVBQUUsZ0JBQWtDO1FBQ3ZFLE1BQU0sbUJBQW1CLEdBQUcsNEJBQVMsQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLEVBQUUsY0FBYyxDQUFDLDJCQUEyQixDQUFDLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7UUFDckksT0FBTyxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGdCQUFnQixDQUFDLElBQUksRUFBRTtZQUN4RCxZQUFZLEVBQUUsSUFBSTtZQUNsQixLQUFLLEVBQUUsbUJBQW1CO1NBQzNCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMseUJBQXlCLENBQUMsTUFBYyxFQUFFLEdBQVksRUFBRSxnQkFBa0M7UUFDL0YsTUFBTSxRQUFRLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxJQUFJLE9BQU8sQ0FBQztRQUNsRCxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ3JCLElBQUksVUFBVSxHQUFHLEtBQUssQ0FBQztZQUN2QixNQUFNLE1BQU0sR0FBRyxVQUFTLENBQUMsRUFBRSxDQUFjO2dCQUN2QyxNQUFNLEtBQUssR0FBRyxjQUFjLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxNQUFNLE1BQU0sR0FBRyxrQ0FBbUIsQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDO2dCQUMxRCxJQUFJLENBQUMsVUFBVSxFQUFFO29CQUNmLFVBQVUsR0FBRyxJQUFJLENBQUM7b0JBQ2xCLEdBQUcsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUNmLDRFQUE0RSxnQkFBZ0IsQ0FBQyxJQUFJLElBQUksTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztpQkFDckg7Z0JBQ0QsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDO1lBQ3BCLENBQUMsQ0FBQztZQUNGLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyw0QkFBUyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsQ0FBQztTQUNsRTtRQUNELE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzFCLENBQUM7SUFFRCxNQUFNLENBQUMsdUJBQXVCLENBQUMsT0FBZ0IsRUFBRSxpQkFBcUM7UUFDcEYsTUFBTSxtQkFBbUIsR0FBMEMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ25HLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2QsT0FBTyxDQUFDLENBQUM7UUFDWCxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFUCxPQUFPLENBQUMsY0FBYyxDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUU7WUFDeEMsWUFBWSxFQUFFLElBQUk7WUFDbEIsVUFBVSxFQUFFLElBQUk7WUFDaEIsR0FBRztnQkFDRCw0REFBNEQ7Z0JBQzVELE1BQU0sR0FBRyxHQUFZLElBQUksQ0FBQztnQkFDMUIsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUU7b0JBQ3RCLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQUMsQ0FBQztvQkFDckQsSUFBSSxDQUFDLFlBQVksR0FBRyw0QkFBUyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBYyxFQUFFLEVBQUU7d0JBQ3ZFLE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUM7d0JBQ25ELElBQUksQ0FBQyxnQkFBZ0IsRUFBRTs0QkFDckIsT0FBTzt5QkFDUjt3QkFDRCxPQUFPLGNBQWMsQ0FBQyx5QkFBeUIsQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFLGdCQUFnQixDQUFDLENBQUM7b0JBQ3BGLENBQUMsQ0FBQyxDQUFDO2lCQUNKO2dCQUNELE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQztZQUMzQixDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLO1FBQ1YsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQyxDQUFDOztBQWpHSCx3Q0FrR0M7QUFqR1Esa0NBQW1CLEdBQW1DLElBQUksR0FBRyxFQUFFLENBQUM7QUFDaEUsZ0NBQWlCLEdBQW1DLElBQUksR0FBRyxFQUFFLENBQUMifQ==
@@ -1,6 +1,7 @@
1
1
  import { Loader } from '@eggjs/tegg-metadata';
2
2
  import { EggProtoImplClass } from '@eggjs/tegg';
3
3
  export declare const APP_CLAZZ_BLACK_LIST: string[];
4
+ export declare const CONTEXT_CLAZZ_BLACK_LIST: string[];
4
5
  export declare const DEFAULT_APP_CLAZZ: string[];
5
6
  export declare const DEFAULT_CONTEXT_CLAZZ: string[];
6
7
  export declare class EggAppLoader implements Loader {
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EggAppLoader = exports.DEFAULT_CONTEXT_CLAZZ = exports.DEFAULT_APP_CLAZZ = exports.APP_CLAZZ_BLACK_LIST = void 0;
3
+ exports.EggAppLoader = exports.DEFAULT_CONTEXT_CLAZZ = exports.DEFAULT_APP_CLAZZ = exports.CONTEXT_CLAZZ_BLACK_LIST = exports.APP_CLAZZ_BLACK_LIST = void 0;
4
4
  const tegg_metadata_1 = require("@eggjs/tegg-metadata");
5
5
  const tegg_1 = require("@eggjs/tegg");
6
6
  const tegg_common_util_1 = require("@eggjs/tegg-common-util");
@@ -8,6 +8,10 @@ const EggCompatibleProtoImpl_1 = require("./EggCompatibleProtoImpl");
8
8
  const tegg_background_task_1 = require("@eggjs/tegg-background-task");
9
9
  const tegg_dynamic_inject_runtime_1 = require("@eggjs/tegg-dynamic-inject-runtime");
10
10
  exports.APP_CLAZZ_BLACK_LIST = ['eggObjectFactory'];
11
+ exports.CONTEXT_CLAZZ_BLACK_LIST = [
12
+ // just use the app.logger, ctx logger is deprecated.
13
+ 'logger',
14
+ ];
11
15
  exports.DEFAULT_APP_CLAZZ = [];
12
16
  exports.DEFAULT_CONTEXT_CLAZZ = [
13
17
  'user',
@@ -77,10 +81,10 @@ class EggAppLoader {
77
81
  tegg_1.QualifierUtil.addProtoQualifier(func, tegg_1.EggQualifierAttribute, tegg_1.EggType.APP);
78
82
  return func;
79
83
  }
80
- getLoggerNames(ctxClazzNames) {
84
+ getLoggerNames(ctxClazzNames, singletonClazzNames) {
81
85
  const loggerNames = Array.from(this.app.loggers.keys());
82
86
  // filter logger/coreLogger
83
- return loggerNames.filter(t => !ctxClazzNames.includes(t));
87
+ return loggerNames.filter(t => !ctxClazzNames.includes(t) && !singletonClazzNames.includes(t));
84
88
  }
85
89
  load() {
86
90
  const app = this.app;
@@ -93,11 +97,13 @@ class EggAppLoader {
93
97
  ]);
94
98
  exports.APP_CLAZZ_BLACK_LIST.forEach(t => allSingletonClazzNameSet.delete(t));
95
99
  const allSingletonClazzNames = Array.from(allSingletonClazzNameSet);
96
- const allContextClazzNames = Array.from(new Set([
100
+ const allContextClazzNamesSet = new Set([
97
101
  ...contextProperties,
98
102
  ...exports.DEFAULT_CONTEXT_CLAZZ,
99
- ]));
100
- const loggerNames = this.getLoggerNames(allContextClazzNames);
103
+ ]);
104
+ exports.CONTEXT_CLAZZ_BLACK_LIST.forEach(t => allContextClazzNamesSet.delete(t));
105
+ const allContextClazzNames = Array.from(allContextClazzNamesSet);
106
+ const loggerNames = this.getLoggerNames(allContextClazzNames, allSingletonClazzNames);
101
107
  const allSingletonClazzs = allSingletonClazzNames.map(name => this.buildClazz(name, tegg_1.EggType.APP));
102
108
  const allContextClazzs = allContextClazzNames.map(name => this.buildClazz(name, tegg_1.EggType.CONTEXT));
103
109
  const appLoggerClazzs = loggerNames.map(name => this.buildAppLoggerClazz(name));
@@ -113,4 +119,4 @@ class EggAppLoader {
113
119
  }
114
120
  }
115
121
  exports.EggAppLoader = EggAppLoader;
116
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQXBwTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnQXBwTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHdEQUF5RDtBQUN6RCxzQ0FVcUI7QUFDckIsOERBQXNEO0FBQ3RELHFFQUF1RTtBQUN2RSxzRUFBbUU7QUFDbkUsb0ZBQXNFO0FBRXpELFFBQUEsb0JBQW9CLEdBQUcsQ0FBRSxrQkFBa0IsQ0FBRSxDQUFDO0FBQzlDLFFBQUEsaUJBQWlCLEdBQWEsRUFBRSxDQUFDO0FBQ2pDLFFBQUEscUJBQXFCLEdBQUc7SUFDbkMsTUFBTTtDQUNQLENBQUM7QUFFRixNQUFhLFlBQVk7SUFHdkIsWUFBWSxHQUFHO1FBQ2IsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7SUFDakIsQ0FBQztJQUVPLFVBQVUsQ0FBQyxJQUFZLEVBQUUsT0FBZ0I7UUFDL0MsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQztRQUNyQixJQUFJLElBQXVCLENBQUM7UUFDNUIsSUFBSSxPQUFPLEtBQUssY0FBTyxDQUFDLEdBQUcsRUFBRTtZQUMzQixJQUFJLEdBQUc7Z0JBQ0wsT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsQ0FBUSxDQUFDO1NBQ1Y7YUFBTTtZQUNMLElBQUksR0FBRztnQkFDTCxNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsY0FBYyxDQUFDO2dCQUMvQixJQUFJLENBQUMsR0FBRyxFQUFFO29CQUNSLG9EQUFvRDtvQkFDcEQsTUFBTSx5QkFBUyxDQUFDLE1BQU0sQ0FBQywyQkFBMkIsSUFBSSx1Q0FBdUMsRUFBRSwwQkFBMEIsQ0FBQyxDQUFDO2lCQUM1SDtnQkFFRCxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixDQUFRLENBQUM7U0FDVjtRQUNELE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRTtZQUNsQyxLQUFLLEVBQUUsSUFBSTtZ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
122
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQXBwTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnQXBwTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHdEQUF5RDtBQUN6RCxzQ0FVcUI7QUFDckIsOERBQXNEO0FBQ3RELHFFQUF1RTtBQUN2RSxzRUFBbUU7QUFDbkUsb0ZBQXNFO0FBRXpELFFBQUEsb0JBQW9CLEdBQUcsQ0FBRSxrQkFBa0IsQ0FBRSxDQUFDO0FBRTlDLFFBQUEsd0JBQXdCLEdBQUc7SUFDdEMscURBQXFEO0lBQ3JELFFBQVE7Q0FDVCxDQUFDO0FBQ1csUUFBQSxpQkFBaUIsR0FBYSxFQUFFLENBQUM7QUFDakMsUUFBQSxxQkFBcUIsR0FBRztJQUNuQyxNQUFNO0NBQ1AsQ0FBQztBQUVGLE1BQWEsWUFBWTtJQUd2QixZQUFZLEdBQUc7UUFDYixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0lBRU8sVUFBVSxDQUFDLElBQVksRUFBRSxPQUFnQjtRQUMvQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQ3JCLElBQUksSUFBdUIsQ0FBQztRQUM1QixJQUFJLE9BQU8sS0FBSyxjQUFPLENBQUMsR0FBRyxFQUFFO1lBQzNCLElBQUksR0FBRztnQkFDTCxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQixDQUFRLENBQUM7U0FDVjthQUFNO1lBQ0wsSUFBSSxHQUFHO2dCQUNMLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxjQUFjLENBQUM7Z0JBQy9CLElBQUksQ0FBQyxHQUFHLEVBQUU7b0JBQ1Isb0RBQW9EO29CQUNwRCxNQUFNLHlCQUFTLENBQUMsTUFBTSxDQUFDLDJCQUEyQixJQUFJLHVDQUF1QyxFQUFFLDBCQUEwQixDQUFDLENBQUM7aUJBQzVIO2dCQUVELE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ25CLENBQVEsQ0FBQztTQUNWO1FBQ0QsTUFBTSxD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
@@ -3,6 +3,8 @@ 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;
6
8
  constructor(app: Application);
7
9
  preCreate(ctx: LoadUnitLifecycleContext): Promise<void>;
8
10
  private isAppObject;
@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EggQualifierProtoHook = void 0;
4
4
  const tegg_1 = require("@eggjs/tegg");
5
5
  const EggAppLoader_1 = require("./EggAppLoader");
6
+ const tegg_common_util_1 = require("@eggjs/tegg-common-util");
6
7
  class EggQualifierProtoHook {
7
8
  constructor(app) {
8
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);
9
12
  }
10
13
  async preCreate(ctx) {
11
14
  const clazzList = ctx.loader.load();
@@ -26,20 +29,25 @@ class EggQualifierProtoHook {
26
29
  }
27
30
  }
28
31
  isAppObject(name) {
29
- if (EggAppLoader_1.APP_CLAZZ_BLACK_LIST.includes(String(name))) {
32
+ name = String(name);
33
+ if (EggAppLoader_1.APP_CLAZZ_BLACK_LIST.includes(name)) {
30
34
  return false;
31
35
  }
32
- if (EggAppLoader_1.DEFAULT_APP_CLAZZ.includes(String(name))) {
36
+ if (EggAppLoader_1.DEFAULT_APP_CLAZZ.includes(name)) {
33
37
  return true;
34
38
  }
35
- return this.app.hasOwnProperty(name);
39
+ return this.appProperties.includes(name);
36
40
  }
37
41
  isCtxObject(name) {
38
- if (EggAppLoader_1.DEFAULT_CONTEXT_CLAZZ.includes(String(name))) {
42
+ name = String(name);
43
+ if (EggAppLoader_1.CONTEXT_CLAZZ_BLACK_LIST.includes(name)) {
44
+ return false;
45
+ }
46
+ if (EggAppLoader_1.DEFAULT_CONTEXT_CLAZZ.includes(name)) {
39
47
  return true;
40
48
  }
41
- return this.app.context.hasOwnProperty(name);
49
+ return this.ctxProperties.includes(name);
42
50
  }
43
51
  }
44
52
  exports.EggQualifierProtoHook = EggQualifierProtoHook;
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHNDQU1xQjtBQUVyQixpREFBZ0c7QUFFaEcsTUFBYSxxQkFBcUI7SUFHaEMsWUFBWSxHQUFnQjtRQUMxQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUE2QjtRQUMzQyxNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3BDLEtBQUssTUFBTSxLQUFLLElBQUksU0FBUyxFQUFFO1lBQzdCLEtBQUssTUFBTSxZQUFZLElBQUksb0JBQWEsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEVBQUU7Z0JBQ3RFLE1BQU0sa0JBQWtCLEdBQUcsb0JBQWEsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUMxRixNQUFNLGVBQWUsR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxLQUFLLDRCQUFxQixDQUFDLENBQUM7Z0JBQzVGLElBQUksZUFBZSxFQUFFO29CQUNuQixTQUFTO2lCQUNWO2dCQUNELElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEVBQUU7b0JBQzFDLG9CQUFhLENBQUMsa0JBQWtCLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxPQUFPLEVBQUUsNEJBQXFCLEVBQUUsY0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2lCQUN2RztxQkFBTSxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxFQUFFO29CQUNqRCxvQkFBYSxDQUFDLGtCQUFrQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsT0FBTyxFQUFFLDRCQUFxQixFQUFFLGNBQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFDbkc7YUFDRjtTQUNGO0lBQ0gsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQjtRQUNuQyxJQUFJLG1DQUFvQixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRTtZQUMvQyxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsSUFBSSxnQ0FBaUIsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUU7WUFDNUMsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQjtRQUNuQyxJQUFJLG9DQUFxQixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRTtZQUNoRCxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsQ0FBQztDQUNGO0FBekNELHNEQXlDQyJ9
53
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnUXVhbGlmaWVyUHJvdG9Ib29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHNDQU1xQjtBQUVyQixpREFLd0I7QUFDeEIsOERBQXNEO0FBRXRELE1BQWEscUJBQXFCO0lBS2hDLFlBQVksR0FBZ0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsYUFBYSxHQUFHLDhCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsYUFBYSxHQUFHLDhCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkUsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBNkI7UUFDM0MsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQyxLQUFLLE1BQU0sS0FBSyxJQUFJLFNBQVMsRUFBRTtZQUM3QixLQUFLLE1BQU0sWUFBWSxJQUFJLG9CQUFhLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUN0RSxNQUFNLGtCQUFrQixHQUFHLG9CQUFhLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDMUYsTUFBTSxlQUFlLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsS0FBSyw0QkFBcUIsQ0FBQyxDQUFDO2dCQUM1RixJQUFJLGVBQWUsRUFBRTtvQkFDbkIsU0FBUztpQkFDVjtnQkFDRCxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxFQUFFO29CQUMxQyxvQkFBYSxDQUFDLGtCQUFrQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsT0FBTyxFQUFFLDRCQUFxQixFQUFFLGNBQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztpQkFDdkc7cUJBQU0sSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsRUFBRTtvQkFDakQsb0JBQWEsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLE9BQU8sRUFBRSw0QkFBcUIsRUFBRSxjQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQ25HO2FBQ0Y7U0FDRjtJQUNILENBQUM7SUFFTyxXQUFXLENBQUMsSUFBaUI7UUFDbkMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwQixJQUFJLG1DQUFvQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsSUFBSSxnQ0FBaUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDcEMsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVPLFdBQVcsQ0FBQyxJQUFpQjtRQUNuQyxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BCLElBQUksdUNBQXdCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzNDLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxJQUFJLG9DQUFxQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN4QyxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMzQyxDQUFDO0NBQ0Y7QUFsREQsc0RBa0RDIn0=
@@ -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.1",
9
+ "version": "3.6.0",
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.0",
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": "9fb155b326afe632142259f126199714a71ce38c"
76
+ "gitHead": "580106114be88a976ebac7d7964545f006742a2c"
77
77
  }