@eggjs/tegg-plugin 1.1.1 → 1.3.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/CHANGELOG.md +8 -0
- package/app.js +1 -8
- package/lib/AppLoadUnitInstance.js +7 -7
- package/lib/EggContextCompatibleHook.js +8 -1
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.3.0](https://github.com/eggjs/tegg/compare/v1.2.0...v1.3.0) (2022-07-01)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @eggjs/tegg-plugin
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
# [0.2.0](https://github.com/eggjs/tegg/compare/v0.1.19...v0.2.0) (2022-01-20)
|
|
7
15
|
|
|
8
16
|
|
package/app.js
CHANGED
|
@@ -11,13 +11,6 @@ class App {
|
|
|
11
11
|
this.app = app;
|
|
12
12
|
}
|
|
13
13
|
configWillLoad() {
|
|
14
|
-
// Hack middleware order
|
|
15
|
-
// Obj may create in core middleware,
|
|
16
|
-
// so `teggCtxLifecycleMiddleware` should be last of core middlewares.
|
|
17
|
-
// Middleware config should set in configWillLoad,
|
|
18
|
-
// but tegg plugin is not the last plugin,
|
|
19
|
-
// other plugin after tegg may modify middleware order,
|
|
20
|
-
// so add teggCtxLifecycleMiddleware in configDidLoad
|
|
21
14
|
this.app.config.coreMiddleware.push('teggCtxLifecycleMiddleware');
|
|
22
15
|
}
|
|
23
16
|
configDidLoad() {
|
|
@@ -37,4 +30,4 @@ class App {
|
|
|
37
30
|
}
|
|
38
31
|
}
|
|
39
32
|
exports.default = App;
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQTJCO0FBQzNCLHFDQUFtQztBQUNuQyxxQ0FBbUM7QUFFbkMsNkVBQTBFO0FBQzFFLHlEQUFzRDtBQUN0RCx1REFBb0Q7QUFFcEQsTUFBcUIsR0FBRztJQUl0QixZQUFZLEdBQWdCO1FBQzFCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxjQUFjO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCxhQUFhO1FBQ1gsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLEdBQUcsSUFBSSw2QkFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3JDLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxtREFBd0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzFFLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNmLCtCQUFjLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDdkIsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUN2QyxJQUFJLElBQUksQ0FBQyxjQUFjLEVBQUU7WUFDdkIsSUFBSSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ3ZFO0lBQ0gsQ0FBQztDQUNGO0FBN0JELHNCQTZCQyJ9
|
|
@@ -37,12 +37,12 @@ class AppLoadUnitInstance {
|
|
|
37
37
|
}
|
|
38
38
|
async destroy(ctx) {
|
|
39
39
|
await tegg_runtime_1.LoadUnitInstanceLifecycleUtil.objectPreDestroy(ctx, this);
|
|
40
|
-
const objs =
|
|
41
|
-
|
|
42
|
-
.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
40
|
+
const objs = [];
|
|
41
|
+
for (const protoObjMap of this.eggObjectMap.values()) {
|
|
42
|
+
for (const protoObj of protoObjMap.values()) {
|
|
43
|
+
objs.push(protoObj);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
46
|
this.eggObjectMap.clear();
|
|
47
47
|
await Promise.all(objs.map(async (obj) => {
|
|
48
48
|
await tegg_runtime_1.EggObjectFactory.destroyObject(obj);
|
|
@@ -81,4 +81,4 @@ class AppLoadUnitInstance {
|
|
|
81
81
|
}
|
|
82
82
|
exports.AppLoadUnitInstance = AppLoadUnitInstance;
|
|
83
83
|
tegg_runtime_1.LoadUnitInstanceFactory.registerLoadUnitInstanceClass(tegg_metadata_1.EggLoadUnitType.APP, AppLoadUnitInstance.createModuleLoadUnitInstance);
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwTG9hZFVuaXRJbnN0YW5jZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkFwcExvYWRVbml0SW5zdGFuY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsd0RBQStFO0FBQy9FLHNDQUFpRztBQUNqRyw4REFBa0Q7QUFDbEQsc0RBSzZCO0FBRTdCLE1BQWEsbUJBQW1CO0lBUTlCLFlBQVksUUFBa0I7UUFKdEIscUJBQWdCLEdBQXdDLElBQUksR0FBRyxFQUFFLENBQUM7UUFDbEUsaUJBQVksR0FBOEMsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNwRSx3QkFBbUIsR0FBdUQsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUcxRixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUM7UUFDMUIsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBQ3JELEtBQUssTUFBTSxLQUFLLElBQUksUUFBUSxFQUFFO1lBQzVCLElBQUksS0FBSyxDQUFDLFFBQVEsS0FBSyxxQkFBYyxDQUFDLFNBQVMsRUFBRTtnQkFDL0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO2FBQzlDO1NBQ0Y7UUFDRCxJQUFJLENBQUMsRUFBRSxHQUFHLG9CQUFhLENBQUMsd0JBQXdCLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFFRCxvQkFBb0I7UUFDbEIsT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDekMsQ0FBQztJQUVELGdCQUFnQixDQUFDLElBQVksRUFBRSxLQUFtQjtRQUNoRCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN6QyxDQUFD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
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EggContextCompatibleHook = void 0;
|
|
4
4
|
const tegg_1 = require("@eggjs/tegg");
|
|
5
5
|
const egg_module_common_1 = require("@eggjs/egg-module-common");
|
|
6
|
+
const EggCompatibleProtoImpl_1 = require("./EggCompatibleProtoImpl");
|
|
6
7
|
class EggContextCompatibleHook {
|
|
7
8
|
constructor(moduleHandler) {
|
|
8
9
|
this.requestProtoList = [];
|
|
@@ -11,6 +12,12 @@ class EggContextCompatibleHook {
|
|
|
11
12
|
const iterator = loadUnitInstance.loadUnit.iterateEggPrototype();
|
|
12
13
|
for (const proto of iterator) {
|
|
13
14
|
if (proto.initType === tegg_1.ObjectInitType.CONTEXT) {
|
|
15
|
+
// skip the egg compatible object
|
|
16
|
+
// If the egg compatible object has beed used with inject,
|
|
17
|
+
// it will be refer by inject info. And it can not be used
|
|
18
|
+
// with ctx.module.${moduleName} so skip it is safe.
|
|
19
|
+
if (proto instanceof EggCompatibleProtoImpl_1.EggCompatibleProtoImpl)
|
|
20
|
+
continue;
|
|
14
21
|
this.requestProtoList.push(proto);
|
|
15
22
|
}
|
|
16
23
|
}
|
|
@@ -26,4 +33,4 @@ class EggContextCompatibleHook {
|
|
|
26
33
|
}
|
|
27
34
|
}
|
|
28
35
|
exports.EggContextCompatibleHook = EggContextCompatibleHook;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQ29udGV4dENvbXBhdGlibGVIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnQ29udGV4dENvbXBhdGlibGVIb29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUE0RDtBQUk1RCxnRUFBc0Q7QUFDdEQscUVBQWtFO0FBRWxFLE1BQWEsd0JBQXdCO0lBSW5DLFlBQVksYUFBNEI7UUFGaEMscUJBQWdCLEdBQXdCLEVBQUUsQ0FBQztRQUdqRCxJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxLQUFLLE1BQU0sZ0JBQWdCLElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxpQkFBaUIsRUFBRTtZQUNuRSxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUNqRSxLQUFLLE1BQU0sS0FBSyxJQUFJLFFBQVEsRUFBRTtnQkFDNUIsSUFBSSxLQUFLLENBQUMsUUFBUSxLQUFLLHFCQUFjLENBQUMsT0FBTyxFQUFFO29CQUM3QyxpQ0FBaUM7b0JBQ2pDLDBEQUEwRDtvQkFDMUQsMERBQTBEO29CQUMxRCxvREFBb0Q7b0JBQ3BELElBQUksS0FBSyxZQUFZLCtDQUFzQjt3QkFBRSxTQUFTO29CQUN0RCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO2lCQUNuQzthQUNGO1NBQ0Y7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsR0FBZTtRQUNoQyw2Q0FBNkM7UUFDN0MsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsOEJBQVUsQ0FBQyxFQUFFO1lBQ3hCLEtBQUssTUFBTSxLQUFLLElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFO2dCQUN6QyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQzthQUN6QztTQUNGO0lBQ0gsQ0FBQztDQUNGO0FBN0JELDREQTZCQyJ9
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"teggConfig"
|
|
7
7
|
]
|
|
8
8
|
},
|
|
9
|
-
"version": "1.
|
|
9
|
+
"version": "1.3.1",
|
|
10
10
|
"description": "module plugin for egg",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"egg",
|
|
@@ -46,13 +46,13 @@
|
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@eggjs/egg-module-common": "^1.0.0",
|
|
49
|
-
"@eggjs/tegg": "^1.
|
|
50
|
-
"@eggjs/tegg-background-task": "^1.
|
|
49
|
+
"@eggjs/tegg": "^1.3.1",
|
|
50
|
+
"@eggjs/tegg-background-task": "^1.3.0",
|
|
51
51
|
"@eggjs/tegg-common-util": "^1.1.1",
|
|
52
|
-
"@eggjs/tegg-dynamic-inject-runtime": "^1.
|
|
53
|
-
"@eggjs/tegg-loader": "^1.
|
|
54
|
-
"@eggjs/tegg-metadata": "^1.
|
|
55
|
-
"@eggjs/tegg-runtime": "^1.
|
|
52
|
+
"@eggjs/tegg-dynamic-inject-runtime": "^1.3.0",
|
|
53
|
+
"@eggjs/tegg-loader": "^1.3.0",
|
|
54
|
+
"@eggjs/tegg-metadata": "^1.3.0",
|
|
55
|
+
"@eggjs/tegg-runtime": "^1.3.0",
|
|
56
56
|
"sdk-base": "^3.6.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"publishConfig": {
|
|
66
66
|
"access": "public"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "f387ec87692607ac61e4fd40871f3694ca373993"
|
|
69
69
|
}
|