@eggjs/tegg-plugin 3.1.0 → 3.2.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.
@@ -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
- moduleModuleContextScope<R = any>(this: MockApplication, fn: (ctx: Context) => Promise<R>, data?: any): Promise<R>;
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 teggPluginCtx = ctx;
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 moduleModuleContextScope(fn, data) {
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
- const ctx = this.mockContext(data);
46
- const teggCtx = new EggContextImpl_1.EggContextImpl(ctx);
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbGljYXRpb24udW5pdHRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhcHBsaWNhdGlvbi51bml0dGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdEQUErQztBQUUvQyw2REFBMEQ7QUFDMUQsc0RBQTZGO0FBQzdGLGdFQUF3RDtBQUd4RCxNQUFNLG9CQUFvQixHQUFnRCxJQUFJLEdBQUcsRUFBRSxDQUFDO0FBRXBGLElBQUksb0JBQW9CLEdBQUcsS0FBSyxDQUFDO0FBRWpDLGtCQUFlO0lBQ2IsS0FBSyxDQUFDLGlCQUFpQixDQUF3QixJQUFVO1FBQ3ZELElBQUksb0JBQW9CLEVBQUU7WUFDeEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw2RUFBNkUsQ0FBQyxDQUFDO1NBQ2hHO1FBQ0QsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQXNCLENBQUM7UUFDeEQsTUFBTSxPQUFPLEdBQUcsSUFBSSwrQkFBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hDLElBQUEsa0JBQUUsRUFBQyw2QkFBYyxFQUFFLFlBQVksRUFBRSxHQUFHLEVBQUU7WUFDcEMsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQyxDQUFDLENBQUM7UUFDSCxNQUFNLFNBQVMsR0FBRyxFQUFFLENBQUM7UUFDckIsb0JBQW9CLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxTQUFTLENBQUMsQ0FBQztRQUM3QyxJQUFJLE9BQU8sQ0FBQyxJQUFJLEVBQUU7WUFDaEIsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQy9CO1FBQ0QsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDO0lBRUQsS0FBSyxDQUFDLG9CQUFvQixDQUFDLEdBQVk7UUFDckMsb0JBQW9CLEdBQUcsS0FBSyxDQUFDO1FBRTdCLE1BQU0sYUFBYSxHQUFHLEdBQXdCLENBQUM7UUFDL0MsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLGdDQUFZLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1osT0FBTztTQUNSO1FBQ0QsTUFBTSxTQUFTLEdBQUcsb0JBQW9CLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3BELElBQUksT0FBTyxDQUFDLE9BQU8sSUFBSSxTQUFTLEVBQUU7WUFDaEMsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQ2xDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyx3QkFBd0IsQ0FBK0IsRUFBZ0MsRUFBRSxJQUFVO1FBQ3ZHLElBQUksb0JBQW9CLEVBQUU7WUFDeEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxvR0FBb0csQ0FBQyxDQUFDO1NBQ3ZIO1FBQ0QsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxNQUFNLE9BQU8sR0FBRyxJQUFJLCtCQUFjLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDeEMsT0FBTyxNQUFNLDZCQUFjLENBQUMsR0FBRyxDQUFJLE9BQU8sRUFBRSxLQUFLLElBQUksRUFBRTtZQUNyRCxNQUFNLFNBQVMsR0FBRyxFQUFFLENBQUM7WUFDckIsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFO2dCQUNoQixNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDL0I7WUFDRCxJQUFJO2dCQUNGLE9BQU8sTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUM7YUFDdEI7b0JBQVM7Z0JBQ1IsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO2FBQ2xDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YsQ0FBQyJ9
50
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbGljYXRpb24udW5pdHRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhcHBsaWNhdGlvbi51bml0dGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLDZEQUEwRDtBQUcxRCxNQUFNLG9CQUFvQixHQUFnRCxJQUFJLEdBQUcsRUFBRSxDQUFDO0FBRXBGLElBQUksb0JBQW9CLEdBQUcsS0FBSyxDQUFDO0FBRWpDLGtCQUFlO0lBQ2IsS0FBSyxDQUFDLGlCQUFpQixDQUF3QixJQUFVO1FBQ3ZELElBQUksb0JBQW9CLEVBQUU7WUFDeEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw2RUFBNkUsQ0FBQyxDQUFDO1NBQ2hHO1FBQ0QsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxNQUFNLE9BQU8sR0FBRyxJQUFJLCtCQUFjLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDeEMsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDO1FBQ3JCLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDN0MsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFO1lBQ2hCLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMvQjtRQUNELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztJQUVELEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxHQUFZO1FBQ3JDLG9CQUFvQixHQUFHLEtBQUssQ0FBQztRQUU3QixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxPQUFPLEVBQUU7WUFDWixPQUFPO1NBQ1I7UUFDRCxNQUFNLFNBQVMsR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDcEQsSUFBSSxPQUFPLENBQUMsT0FBTyxJQUFJLFNBQVMsRUFBRTtZQUNoQyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7U0FDbEM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLHNCQUFzQixDQUErQixFQUFnQyxFQUFFLElBQVU7UUFDckcsSUFBSSxvQkFBb0IsRUFBRTtZQUN4QixNQUFNLElBQUksS0FBSyxDQUFDLG9HQUFvRyxDQUFDLENBQUM7U0FDdkg7UUFDRCxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUMsR0FBRyxFQUFDLEVBQUU7WUFDdkMsTUFBTSxPQUFPLEdBQUcsSUFBSSwrQkFBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3hDLE1BQU0sU0FBUyxHQUFHLEVBQUUsQ0FBQztZQUNyQixJQUFJLE9BQU8sQ0FBQyxJQUFJLEVBQUU7Z0JBQ2hCLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQzthQUMvQjtZQUNELElBQUk7Z0JBQ0YsT0FBTyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUN0QjtvQkFBUztnQkFDUixNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDbEM7UUFDSCxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDWCxDQUFDO0NBQ0YsQ0FBQyJ9
@@ -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[egg_module_common_1.TEGG_CONTEXT];
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnQ29udGV4dEhhbmRsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJFZ2dDb250ZXh0SGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxzREFBaUU7QUFDakUsZ0VBQXFFO0FBRXJFLE1BQWEsaUJBQWlCO0lBRzVCLFlBQVksR0FBZ0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7SUFDakIsQ0FBQztJQUVELGtCQUFrQjtRQUNoQixPQUFPO1FBQ1AsTUFBTSxHQUFHLEdBQUksSUFBSSxDQUFDLEdBQVcsQ0FBQyxjQUFjLENBQUM7UUFDN0MsT0FBTyxHQUFHLElBQUksR0FBRyxDQUFDLGdDQUFZLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQUcsQ0FBSSxVQUFzQixFQUFFLEVBQW9CO1FBQ3ZELE1BQU0sR0FBRyxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUMsK0JBQVcsQ0FBQyxDQUFDO1FBQ3hDLE9BQU8sTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFRCxRQUFRO1FBQ04sNkJBQWMsQ0FBQyxrQkFBa0IsR0FBRyxHQUFHLEVBQUU7WUFDdkMsT0FBTyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUNuQyxDQUFDLENBQUM7UUFDRiw2QkFBYyxDQUFDLG9CQUFvQixHQUFHLEtBQUssRUFBRSxPQUFtQixFQUFFLEVBQXNCLEVBQUUsRUFBRTtZQUMxRixPQUFPLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDckMsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBMUJELDhDQTBCQyJ9
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.1.0",
9
+ "version": "3.2.1",
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.1.0",
50
- "@eggjs/tegg-background-task": "^3.1.0",
49
+ "@eggjs/tegg": "^3.2.1",
50
+ "@eggjs/tegg-background-task": "^3.2.1",
51
51
  "@eggjs/tegg-common-util": "^1.2.3",
52
- "@eggjs/tegg-dynamic-inject-runtime": "^3.1.0",
52
+ "@eggjs/tegg-dynamic-inject-runtime": "^3.2.1",
53
53
  "@eggjs/tegg-loader": "^3.1.0",
54
54
  "@eggjs/tegg-metadata": "^3.1.0",
55
- "@eggjs/tegg-runtime": "^3.1.0",
55
+ "@eggjs/tegg-runtime": "^3.2.1",
56
56
  "sdk-base": "^4.2.0"
57
57
  },
58
58
  "devDependencies": {
59
59
  "@eggjs/tegg-config": "^3.1.0",
60
60
  "egg": "^3.9.1",
61
- "egg-mock": "^5.4.0",
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": "19ff0ca1dc6286fc54445c30ccff64b582c59fd0"
69
+ "gitHead": "5591645a1e1e58b112cbb130d4700e1560cbfa62"
70
70
  }
@@ -1,4 +1,4 @@
1
- import { Application, Context } from 'egg';
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
- teggContextStorage(): AsyncLocalStorage<EggContext>
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;