@eggjs/tegg-plugin 3.0.0 → 3.2.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/extend/application.unittest.d.ts +1 -1
- package/app/extend/application.unittest.js +6 -17
- package/lib/CompatibleUtil.d.ts +1 -1
- package/lib/CompatibleUtil.js +7 -11
- package/lib/EggContextCompatibleHook.d.ts +1 -0
- package/lib/EggContextCompatibleHook.js +15 -7
- package/lib/EggContextHandler.js +2 -3
- package/package.json +10 -10
- package/typings/index.d.ts +3 -3
|
@@ -3,6 +3,6 @@ import { Context } from 'egg';
|
|
|
3
3
|
declare const _default: {
|
|
4
4
|
mockModuleContext(this: MockApplication, data?: any): Promise<Context>;
|
|
5
5
|
destroyModuleContext(ctx: Context): Promise<void>;
|
|
6
|
-
|
|
6
|
+
mockModuleContextScope<R = any>(this: MockApplication, fn: (ctx: Context) => Promise<R>, data?: any): Promise<R>;
|
|
7
7
|
};
|
|
8
8
|
export default _default;
|
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const egg_mock_1 = __importDefault(require("egg-mock"));
|
|
7
3
|
const EggContextImpl_1 = require("../../lib/EggContextImpl");
|
|
8
|
-
const tegg_runtime_1 = require("@eggjs/tegg-runtime");
|
|
9
|
-
const egg_module_common_1 = require("@eggjs/egg-module-common");
|
|
10
4
|
const TEGG_LIFECYCLE_CACHE = new Map();
|
|
11
5
|
let hasMockModuleContext = false;
|
|
12
6
|
exports.default = {
|
|
@@ -16,9 +10,6 @@ exports.default = {
|
|
|
16
10
|
}
|
|
17
11
|
const ctx = this.mockContext(data);
|
|
18
12
|
const teggCtx = new EggContextImpl_1.EggContextImpl(ctx);
|
|
19
|
-
(0, egg_mock_1.default)(tegg_runtime_1.ContextHandler, 'getContext', () => {
|
|
20
|
-
return teggCtx;
|
|
21
|
-
});
|
|
22
13
|
const lifecycle = {};
|
|
23
14
|
TEGG_LIFECYCLE_CACHE.set(teggCtx, lifecycle);
|
|
24
15
|
if (teggCtx.init) {
|
|
@@ -28,8 +19,7 @@ exports.default = {
|
|
|
28
19
|
},
|
|
29
20
|
async destroyModuleContext(ctx) {
|
|
30
21
|
hasMockModuleContext = false;
|
|
31
|
-
const
|
|
32
|
-
const teggCtx = teggPluginCtx[egg_module_common_1.TEGG_CONTEXT];
|
|
22
|
+
const teggCtx = ctx.teggContext;
|
|
33
23
|
if (!teggCtx) {
|
|
34
24
|
return;
|
|
35
25
|
}
|
|
@@ -38,13 +28,12 @@ exports.default = {
|
|
|
38
28
|
await teggCtx.destroy(lifecycle);
|
|
39
29
|
}
|
|
40
30
|
},
|
|
41
|
-
async
|
|
31
|
+
async mockModuleContextScope(fn, data) {
|
|
42
32
|
if (hasMockModuleContext) {
|
|
43
33
|
throw new Error('mockModuleContextScope can not use with mockModuleContext, should use mockModuleContextScope only.');
|
|
44
34
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return await tegg_runtime_1.ContextHandler.run(teggCtx, async () => {
|
|
35
|
+
return this.mockContextScope(async (ctx) => {
|
|
36
|
+
const teggCtx = new EggContextImpl_1.EggContextImpl(ctx);
|
|
48
37
|
const lifecycle = {};
|
|
49
38
|
if (teggCtx.init) {
|
|
50
39
|
await teggCtx.init(lifecycle);
|
|
@@ -55,7 +44,7 @@ exports.default = {
|
|
|
55
44
|
finally {
|
|
56
45
|
await teggCtx.destroy(lifecycle);
|
|
57
46
|
}
|
|
58
|
-
});
|
|
47
|
+
}, data);
|
|
59
48
|
},
|
|
60
49
|
};
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbGljYXRpb24udW5pdHRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhcHBsaWNhdGlvbi51bml0dGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLDZEQUEwRDtBQUcxRCxNQUFNLG9CQUFvQixHQUFnRCxJQUFJLEdBQUcsRUFBRSxDQUFDO0FBRXBGLElBQUksb0JBQW9CLEdBQUcsS0FBSyxDQUFDO0FBRWpDLGtCQUFlO0lBQ2IsS0FBSyxDQUFDLGlCQUFpQixDQUF3QixJQUFVO1FBQ3ZELElBQUksb0JBQW9CLEVBQUU7WUFDeEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw2RUFBNkUsQ0FBQyxDQUFDO1NBQ2hHO1FBQ0QsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxNQUFNLE9BQU8sR0FBRyxJQUFJLCtCQUFjLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDeEMsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDO1FBQ3JCLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDN0MsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFO1lBQ2hCLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMvQjtRQUNELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztJQUVELEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxHQUFZO1FBQ3JDLG9CQUFvQixHQUFHLEtBQUssQ0FBQztRQUU3QixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxPQUFPLEVBQUU7WUFDWixPQUFPO1NBQ1I7UUFDRCxNQUFNLFNBQVMsR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDcEQsSUFBSSxPQUFPLENBQUMsT0FBTyxJQUFJLFNBQVMsRUFBRTtZQUNoQyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7U0FDbEM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLHNCQUFzQixDQUErQixFQUFnQyxFQUFFLElBQVU7UUFDckcsSUFBSSxvQkFBb0IsRUFBRTtZQUN4QixNQUFNLElBQUksS0FBSyxDQUFDLG9HQUFvRyxDQUFDLENBQUM7U0FDdkg7UUFDRCxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUMsR0FBRyxFQUFDLEVBQUU7WUFDdkMsTUFBTSxPQUFPLEdBQUcsSUFBSSwrQkFBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3hDLE1BQU0sU0FBUyxHQUFHLEVBQUUsQ0FBQztZQUNyQixJQUFJLE9BQU8sQ0FBQyxJQUFJLEVBQUU7Z0JBQ2hCLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQzthQUMvQjtZQUNELElBQUk7Z0JBQ0YsT0FBTyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUN0QjtvQkFBUztnQkFDUixNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDbEM7UUFDSCxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDWCxDQUFDO0NBQ0YsQ0FBQyJ9
|
package/lib/CompatibleUtil.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export declare class CompatibleUtil {
|
|
|
8
8
|
static getRequestProto(name: PropertyKey): EggPrototype;
|
|
9
9
|
private static singletonModuleProxyFactory;
|
|
10
10
|
static appCompatible(app: Application, loadUnitInstance: LoadUnitInstance): void;
|
|
11
|
-
static contextModuleProxyFactory(holder: object, ctx: Context, loadUnitInstance: LoadUnitInstance
|
|
11
|
+
static contextModuleProxyFactory(holder: object, ctx: Context, loadUnitInstance: LoadUnitInstance): any;
|
|
12
12
|
static contextModuleCompatible(context: Context, loadUnitInstances: LoadUnitInstance[]): void;
|
|
13
13
|
static clean(): void;
|
|
14
14
|
}
|
package/lib/CompatibleUtil.js
CHANGED
|
@@ -26,32 +26,28 @@ class CompatibleUtil {
|
|
|
26
26
|
}
|
|
27
27
|
return this.requestProtoCache.get(name);
|
|
28
28
|
}
|
|
29
|
-
static singletonModuleProxyFactory(app, loadUnitInstance
|
|
29
|
+
static singletonModuleProxyFactory(app, loadUnitInstance) {
|
|
30
30
|
return function (_, p) {
|
|
31
31
|
const proto = CompatibleUtil.getSingletonProto(p);
|
|
32
32
|
const eggObj = tegg_runtime_1.EggContainerFactory.getEggObject(proto);
|
|
33
|
-
|
|
34
|
-
app.deprecate(`[egg/module] Please use app.module.${loadUnitInstance.name}.${String(p)} instead of app.${loadUnitInstance.name}.${String(p)}`);
|
|
35
|
-
}
|
|
33
|
+
app.deprecate(`[egg/module] Please use await app.getEggObject(clazzName) instead of app.${loadUnitInstance.name}.${String(p)}`);
|
|
36
34
|
return eggObj.obj;
|
|
37
35
|
};
|
|
38
36
|
}
|
|
39
37
|
static appCompatible(app, loadUnitInstance) {
|
|
40
|
-
const moduleLoadUnitProxy = tegg_common_util_1.ProxyUtil.safeProxy(loadUnitInstance, CompatibleUtil.singletonModuleProxyFactory(app, loadUnitInstance
|
|
38
|
+
const moduleLoadUnitProxy = tegg_common_util_1.ProxyUtil.safeProxy(loadUnitInstance, CompatibleUtil.singletonModuleProxyFactory(app, loadUnitInstance));
|
|
41
39
|
Reflect.defineProperty(app.module, loadUnitInstance.name, {
|
|
42
40
|
configurable: true,
|
|
43
41
|
value: moduleLoadUnitProxy,
|
|
44
42
|
});
|
|
45
43
|
}
|
|
46
|
-
static contextModuleProxyFactory(holder, ctx, loadUnitInstance
|
|
44
|
+
static contextModuleProxyFactory(holder, ctx, loadUnitInstance) {
|
|
47
45
|
const cacheKey = `_${loadUnitInstance.name}Proxy`;
|
|
48
46
|
if (!holder[cacheKey]) {
|
|
49
47
|
const getter = function (_, p) {
|
|
50
48
|
const proto = CompatibleUtil.getRequestProto(p);
|
|
51
49
|
const eggObj = tegg_runtime_1.EggContainerFactory.getEggObject(proto, p);
|
|
52
|
-
|
|
53
|
-
ctx.app.deprecate(`[egg/module] Please use ctx.module.${loadUnitInstance.name}.${String(p)} instead of ctx.${loadUnitInstance.name}.${String(p)}`);
|
|
54
|
-
}
|
|
50
|
+
ctx.app.deprecate(`[egg/module] Please use await ctx.getEggObject(clazzName) instead of ctx.${loadUnitInstance.name}.${String(p)}`);
|
|
55
51
|
return eggObj.obj;
|
|
56
52
|
};
|
|
57
53
|
holder[cacheKey] = tegg_common_util_1.ProxyUtil.safeProxy(loadUnitInstance, getter);
|
|
@@ -76,7 +72,7 @@ class CompatibleUtil {
|
|
|
76
72
|
if (!loadUnitInstance) {
|
|
77
73
|
return;
|
|
78
74
|
}
|
|
79
|
-
return CompatibleUtil.contextModuleProxyFactory(ctxModule, ctx, loadUnitInstance
|
|
75
|
+
return CompatibleUtil.contextModuleProxyFactory(ctxModule, ctx, loadUnitInstance);
|
|
80
76
|
});
|
|
81
77
|
}
|
|
82
78
|
return this._moduleProxy;
|
|
@@ -91,4 +87,4 @@ class CompatibleUtil {
|
|
|
91
87
|
exports.CompatibleUtil = CompatibleUtil;
|
|
92
88
|
CompatibleUtil.singletonProtoCache = new Map();
|
|
93
89
|
CompatibleUtil.requestProtoCache = new Map();
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcGF0aWJsZVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJDb21wYXRpYmxlVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx3REFBeUU7QUFDekUsc0NBQXlFO0FBQ3pFLHNEQUE0RTtBQUM1RSw4REFBb0Q7QUFFcEQsTUFBYSxjQUFjO0lBSXpCLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFpQjtRQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsU0FBUztpQkFDaEMsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUMzQztRQUNELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUUsQ0FBQztJQUM3QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFpQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNyQyxNQUFNLEtBQUssR0FBRyxtQ0FBbUIsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFDeEUsU0FBUyxFQUFFLGlDQUEwQjtvQkFDckMsS0FBSyxFQUFFLHFCQUFjLENBQUMsT0FBTztpQkFDOUIsQ0FBQyxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUN6QztRQUNELE9BQU8s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
|
|
@@ -4,6 +4,7 @@ import { ModuleHandler } from './ModuleHandler';
|
|
|
4
4
|
export declare class EggContextCompatibleHook implements LifecycleHook<EggContextLifecycleContext, EggContext> {
|
|
5
5
|
private readonly moduleHandler;
|
|
6
6
|
private requestProtoList;
|
|
7
|
+
private initProtoList;
|
|
7
8
|
constructor(moduleHandler: ModuleHandler);
|
|
8
9
|
preCreate(_: any, ctx: EggContext): Promise<void>;
|
|
9
10
|
}
|
|
@@ -2,24 +2,29 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EggContextCompatibleHook = void 0;
|
|
4
4
|
const tegg_1 = require("@eggjs/tegg");
|
|
5
|
+
const tegg_runtime_1 = require("@eggjs/tegg-runtime");
|
|
5
6
|
const egg_module_common_1 = require("@eggjs/egg-module-common");
|
|
6
7
|
const EggCompatibleProtoImpl_1 = require("./EggCompatibleProtoImpl");
|
|
7
8
|
class EggContextCompatibleHook {
|
|
8
9
|
constructor(moduleHandler) {
|
|
9
10
|
this.requestProtoList = [];
|
|
11
|
+
this.initProtoList = [];
|
|
10
12
|
this.moduleHandler = moduleHandler;
|
|
11
13
|
for (const loadUnitInstance of this.moduleHandler.loadUnitInstances) {
|
|
12
14
|
const iterator = loadUnitInstance.loadUnit.iterateEggPrototype();
|
|
13
15
|
for (const proto of iterator) {
|
|
16
|
+
// skip the egg compatible object
|
|
17
|
+
// If the egg compatible object has beed used with inject,
|
|
18
|
+
// it will be refer by inject info. And it can not be used
|
|
19
|
+
// with ctx.module.${moduleName} so skip it is safe.
|
|
20
|
+
if (proto instanceof EggCompatibleProtoImpl_1.EggCompatibleProtoImpl)
|
|
21
|
+
continue;
|
|
14
22
|
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;
|
|
21
23
|
this.requestProtoList.push(proto);
|
|
22
24
|
}
|
|
25
|
+
else if (proto.initType === tegg_1.ObjectInitType.SINGLETON) {
|
|
26
|
+
this.initProtoList.push(proto);
|
|
27
|
+
}
|
|
23
28
|
}
|
|
24
29
|
}
|
|
25
30
|
}
|
|
@@ -29,8 +34,11 @@ class EggContextCompatibleHook {
|
|
|
29
34
|
for (const proto of this.requestProtoList) {
|
|
30
35
|
ctx.addProtoToCreate(proto.name, proto);
|
|
31
36
|
}
|
|
37
|
+
await Promise.all(this.initProtoList.map(async (proto) => {
|
|
38
|
+
await tegg_runtime_1.EggContainerFactory.getOrCreateEggObject(proto);
|
|
39
|
+
}));
|
|
32
40
|
}
|
|
33
41
|
}
|
|
34
42
|
}
|
|
35
43
|
exports.EggContextCompatibleHook = EggContextCompatibleHook;
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQ29udGV4dENvbXBhdGlibGVIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRWdnQ29udGV4dENvbXBhdGlibGVIb29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUE0RDtBQUM1RCxzREFBa0c7QUFHbEcsZ0VBQXNEO0FBQ3RELHFFQUFrRTtBQUVsRSxNQUFhLHdCQUF3QjtJQUtuQyxZQUFZLGFBQTRCO1FBSGhDLHFCQUFnQixHQUF3QixFQUFFLENBQUM7UUFDM0Msa0JBQWEsR0FBd0IsRUFBRSxDQUFDO1FBRzlDLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO1FBQ25DLEtBQUssTUFBTSxnQkFBZ0IsSUFBSSxJQUFJLENBQUMsYUFBYSxDQUFDLGlCQUFpQixFQUFFO1lBQ25FLE1BQU0sUUFBUSxHQUFHLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQ2pFLEtBQUssTUFBTSxLQUFLLElBQUksUUFBUSxFQUFFO2dCQUM1QixpQ0FBaUM7Z0JBQ2pDLDBEQUEwRDtnQkFDMUQsMERBQTBEO2dCQUMxRCxvREFBb0Q7Z0JBQ3BELElBQUksS0FBSyxZQUFZLCtDQUFzQjtvQkFBRSxTQUFTO2dCQUN0RCxJQUFJLEtBQUssQ0FBQyxRQUFRLEtBQUsscUJBQWMsQ0FBQyxPQUFPLEVBQUU7b0JBQzdDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7aUJBQ25DO3FCQUFNLElBQUksS0FBSyxDQUFDLFFBQVEsS0FBSyxxQkFBYyxDQUFDLFNBQVMsRUFBRTtvQkFDdEQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7aUJBQ2hDO2FBQ0Y7U0FDRjtJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxHQUFlO1FBQ2hDLDZDQUE2QztRQUM3QyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyw4QkFBVSxDQUFDLEVBQUU7WUFDeEIsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVBQUU7Z0JBQ3pDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO2FBQ3pDO1lBQ0QsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBQyxLQUFLLEVBQUMsRUFBRTtnQkFDckQsTUFBTSxrQ0FBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN4RCxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ0w7SUFDSCxDQUFDO0NBQ0Y7QUFuQ0QsNERBbUNDIn0=
|
package/lib/EggContextHandler.js
CHANGED
|
@@ -8,9 +8,8 @@ class EggContextHandler {
|
|
|
8
8
|
this.app = app;
|
|
9
9
|
}
|
|
10
10
|
getContextCallback() {
|
|
11
|
-
// TODO
|
|
12
11
|
const ctx = this.app.currentContext;
|
|
13
|
-
return ctx && ctx
|
|
12
|
+
return ctx && ctx.teggContext;
|
|
14
13
|
}
|
|
15
14
|
async run(eggContext, fn) {
|
|
16
15
|
const ctx = eggContext.get(egg_module_common_1.EGG_CONTEXT);
|
|
@@ -26,4 +25,4 @@ class EggContextHandler {
|
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
27
|
exports.EggContextHandler = EggContextHandler;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQ29udGV4dEhhbmRsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJFZ2dDb250ZXh0SGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxzREFBaUU7QUFDakUsZ0VBQXVEO0FBRXZELE1BQWEsaUJBQWlCO0lBRzVCLFlBQVksR0FBZ0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7SUFDakIsQ0FBQztJQUVELGtCQUFrQjtRQUNoQixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztRQUNwQyxPQUFPLEdBQUcsSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDO0lBQ2hDLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBRyxDQUFJLFVBQXNCLEVBQUUsRUFBb0I7UUFDdkQsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLEdBQUcsQ0FBQywrQkFBVyxDQUFDLENBQUM7UUFDeEMsT0FBTyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVELFFBQVE7UUFDTiw2QkFBYyxDQUFDLGtCQUFrQixHQUFHLEdBQUcsRUFBRTtZQUN2QyxPQUFPLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQ25DLENBQUMsQ0FBQztRQUNGLDZCQUFjLENBQUMsb0JBQW9CLEdBQUcsS0FBSyxFQUFFLE9BQW1CLEVBQUUsRUFBc0IsRUFBRSxFQUFFO1lBQzFGLE9BQU8sTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNyQyxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUF6QkQsOENBeUJDIn0=
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"teggConfig"
|
|
7
7
|
]
|
|
8
8
|
},
|
|
9
|
-
"version": "3.
|
|
9
|
+
"version": "3.2.0",
|
|
10
10
|
"description": "module plugin for egg",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"egg",
|
|
@@ -46,19 +46,19 @@
|
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@eggjs/egg-module-common": "^1.0.0",
|
|
49
|
-
"@eggjs/tegg": "^3.
|
|
50
|
-
"@eggjs/tegg-background-task": "^3.
|
|
49
|
+
"@eggjs/tegg": "^3.1.0",
|
|
50
|
+
"@eggjs/tegg-background-task": "^3.1.0",
|
|
51
51
|
"@eggjs/tegg-common-util": "^1.2.3",
|
|
52
|
-
"@eggjs/tegg-dynamic-inject-runtime": "^3.
|
|
53
|
-
"@eggjs/tegg-loader": "^3.
|
|
54
|
-
"@eggjs/tegg-metadata": "^3.
|
|
55
|
-
"@eggjs/tegg-runtime": "^3.
|
|
52
|
+
"@eggjs/tegg-dynamic-inject-runtime": "^3.1.0",
|
|
53
|
+
"@eggjs/tegg-loader": "^3.1.0",
|
|
54
|
+
"@eggjs/tegg-metadata": "^3.1.0",
|
|
55
|
+
"@eggjs/tegg-runtime": "^3.1.0",
|
|
56
56
|
"sdk-base": "^4.2.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@eggjs/tegg-config": "^3.
|
|
59
|
+
"@eggjs/tegg-config": "^3.1.0",
|
|
60
60
|
"egg": "^3.9.1",
|
|
61
|
-
"egg-mock": "^5.
|
|
61
|
+
"egg-mock": "^5.5.0",
|
|
62
62
|
"egg-schedule": "^4.0.0",
|
|
63
63
|
"egg-tracer": "^1.1.0",
|
|
64
64
|
"mz-modules": "^2.1.0"
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "24d04ee8cd9f1618209fb31f67703d6bef63b2de"
|
|
70
70
|
}
|
package/typings/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Context } from 'egg';
|
|
2
2
|
import '@eggjs/tegg-config';
|
|
3
3
|
import { ModuleHandler } from '../lib/ModuleHandler';
|
|
4
4
|
import { EggPrototypeCreatorFactory } from '@eggjs/tegg-metadata';
|
|
@@ -48,11 +48,11 @@ declare module 'egg' {
|
|
|
48
48
|
eggPrototypeLifecycleUtil: typeof EggPrototypeLifecycleUtil;
|
|
49
49
|
eggContextLifecycleUtil: typeof EggContextLifecycleUtil;
|
|
50
50
|
eggObjectLifecycleUtil: typeof EggObjectLifecycleUtil;
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
teggContext: EggContext;
|
|
53
52
|
moduleHandler: ModuleHandler;
|
|
54
53
|
|
|
55
54
|
mockModuleContext(data?: any): Promise<Context>;
|
|
55
|
+
mockModuleContextScope<R=any>(fn: (ctx: Context) => Promise<R>, data?: any): Promise<R>;
|
|
56
56
|
destroyModuleContext(context: Context): Promise<void>;
|
|
57
57
|
// 兼容现有 module 的定义
|
|
58
58
|
module: EggModule & EggApplicationModule;
|