dinegg 2.6.2 → 2.7.3

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/index.d.ts CHANGED
@@ -3,7 +3,7 @@
3
3
  * @Author: ding-cx
4
4
  * @Date: 2021-01-29 18:12:25
5
5
  * @LastEditors: ding-cx
6
- * @LastEditTime: 2021-12-05 22:15:05
6
+ * @LastEditTime: 2021-12-13 09:30:46
7
7
  * @Description: file content
8
8
  */
9
9
  // {framework_root}/index.d.ts
@@ -14,6 +14,9 @@ import * as Egg from "egg";
14
14
  import "egg-sequelize";
15
15
  import "egg-cors";
16
16
  import "egg-jwt";
17
+
18
+ import * as ControllerDecoratorType from "./lib/core/ControllerDecorator";
19
+
17
20
  // import "./typings/sequelize";//不需要自定义的sequelize类型定义了。
18
21
 
19
22
  // ts 这里可以理解成导入一个类。并将这个类的类型提取给ts作为自定义type。然后这个type就可以放在interface上,或者提供给其他interface等。
@@ -63,7 +66,7 @@ declare module "egg" {
63
66
  * @param {string} msg
64
67
  * @memberof Context
65
68
  */
66
- error(msg: string,data?:any): void;
69
+ error(msg: string, data?: any): void;
67
70
  }
68
71
 
69
72
  interface EggAppConfig {
@@ -200,7 +203,7 @@ declare module "egg" {
200
203
  * - 不能在router中直接调用
201
204
  * @example {code:20000,msg:"success",data:any}
202
205
  * @param {*} data
203
- * @memberof Context
206
+ * @memberof Controller
204
207
  */
205
208
  success(data: any): void;
206
209
  /**
@@ -210,7 +213,7 @@ declare module "egg" {
210
213
  * - 不能在router中直接调用
211
214
  * @example {code:50000,msg:string,data:null,is_error:true}
212
215
  * @param {string} msg
213
- * @memberof Context
216
+ * @memberof Controller
214
217
  */
215
218
  error(msg: string, data?: any): void;
216
219
  }
@@ -245,6 +248,12 @@ declare module "egg" {
245
248
  /** 批量删除 */
246
249
  batchDelete(): void;
247
250
  }
251
+
252
+ /** note module中添加egg属性 */
253
+ /** 控制器的路由装饰器 */
254
+ const ControllerDecorator = ControllerDecoratorType;
255
+
256
+ interface ControllerDecorator extends ControllerDecoratorType {}
248
257
  }
249
258
 
250
259
  // 将 Egg 整个 export 出去
package/index.js CHANGED
@@ -7,5 +7,4 @@
7
7
  * @Description: 框架入口文件
8
8
  */
9
9
  "use strict";
10
-
11
10
  module.exports = require('./lib/framework.js').default;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.bindRouter = exports.del = exports.put = exports.post = exports.get = void 0;
4
+ const route = Symbol.for("dinegg#Route");
5
+ function createRoute(method = "get", path, middlewares) {
6
+ return function (target, name, descriptor) {
7
+ if (descriptor.value[route]) {
8
+ descriptor.value[route].push({ method: method, path, middlewares });
9
+ }
10
+ else {
11
+ descriptor.value[route] = [{ method: method, path, middlewares }];
12
+ }
13
+ };
14
+ }
15
+ function get(path, middlewares) {
16
+ return createRoute("get", path, middlewares);
17
+ }
18
+ exports.get = get;
19
+ function post(path, middlewares) {
20
+ return createRoute("post", path, middlewares);
21
+ }
22
+ exports.post = post;
23
+ function put(path, middlewares) {
24
+ return createRoute("put", path, middlewares);
25
+ }
26
+ exports.put = put;
27
+ function del(path, middlewares) {
28
+ return createRoute("del", path, middlewares);
29
+ }
30
+ exports.del = del;
31
+ exports.default = {
32
+ get,
33
+ post,
34
+ del,
35
+ put,
36
+ bindRouter,
37
+ };
38
+ function reduceControllerMethod(router, controller) {
39
+ if (Object.prototype.toString.call(controller) !== "[object Object]") {
40
+ return;
41
+ }
42
+ const keys = Object.keys(controller);
43
+ keys.forEach((item) => {
44
+ if (controller[item] instanceof Function) {
45
+ const routeObjArr = controller[item][route];
46
+ if (routeObjArr && Array.isArray(routeObjArr)) {
47
+ for (const routeObj of routeObjArr) {
48
+ if (routeObj.middlewares) {
49
+ router[routeObj.method](routeObj.path, ...routeObj.middlewares, controller[item]);
50
+ }
51
+ else {
52
+ router[routeObj.method](routeObj.path, controller[item]);
53
+ }
54
+ }
55
+ }
56
+ return;
57
+ }
58
+ reduceControllerMethod(router, controller[item]);
59
+ });
60
+ }
61
+ function bindRouter(app) {
62
+ reduceControllerMethod(app.router, app.controller);
63
+ }
64
+ exports.bindRouter = bindRouter;
65
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJvbGxlckRlY29yYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkNvbnRyb2xsZXJEZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUl6QyxTQUFTLFdBQVcsQ0FBQyxTQUFzQixLQUFLLEVBQUUsSUFBWSxFQUFFLFdBQTRFO0lBRTFJLE9BQU8sVUFBVSxNQUFNLEVBQUUsSUFBWSxFQUFFLFVBQThCO1FBQ25FLElBQUksVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUMzQixVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUM7U0FDckU7YUFBTTtZQUNMLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUM7U0FDbkU7SUFDSCxDQUFDLENBQUM7QUFDSixDQUFDO0FBR0QsU0FBZ0IsR0FBRyxDQUFDLElBQVksRUFBRSxXQUE0RTtJQUM1RyxPQUFPLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQy9DLENBQUM7QUFGRCxrQkFFQztBQUdELFNBQWdCLElBQUksQ0FBQyxJQUFZLEVBQUUsV0FBNEU7SUFDN0csT0FBTyxXQUFXLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztBQUNoRCxDQUFDO0FBRkQsb0JBRUM7QUFFRCxTQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLFdBQTRFO0lBQzVHLE9BQU8sV0FBVyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDL0MsQ0FBQztBQUZELGtCQUVDO0FBRUQsU0FBZ0IsR0FBRyxDQUFDLElBQVksRUFBRSxXQUE0RTtJQUM1RyxPQUFPLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQy9DLENBQUM7QUFGRCxrQkFFQztBQUVELGtCQUFlO0lBQ2IsR0FBRztJQUNILElBQUk7SUFDSixHQUFHO0lBQ0gsR0FBRztJQUNILFVBQVU7Q0FDWCxDQUFDO0FBSUYsU0FBUyxzQkFBc0IsQ0FBQyxNQUFjLEVBQUUsVUFBZTtJQUM3RCxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxpQkFBaUIsRUFBRTtRQUVwRSxPQUFPO0tBQ1I7SUFDRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBR3JDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUNwQixJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxRQUFRLEVBQUU7WUFFeEMsTUFBTSxXQUFXLEdBQTRELFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNyRyxJQUFJLFdBQVcsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUM3QyxLQUFLLE1BQU0sUUFBUSxJQUFJLFdBQVcsRUFBRTtvQkFDbEMsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO3dCQUN4QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxRQUFRLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO3FCQUNuRjt5QkFBTTt3QkFDTCxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7cUJBQzFEO2lCQUNGO2FBQ0Y7WUFDRCxPQUFPO1NBQ1I7UUFDRCxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDbkQsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBS0QsU0FBZ0IsVUFBVSxDQUFDLEdBQWdCO0lBQ3pDLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3JELENBQUM7QUFGRCxnQ0FFQyJ9
@@ -9,20 +9,27 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
9
9
  var _a, _b, _c, _d, _e, _f;
10
10
  const importsModulesList = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.imports) || [];
11
11
  let match = [];
12
- match = ["*/task", "*/schedule"];
12
+ if (importsModulesList.length > 0) {
13
+ const match1 = importsModulesList.map(item => {
14
+ return "modules/" + item + "/**/task";
15
+ });
16
+ const match2 = importsModulesList.map(item => {
17
+ return "modules/" + item + "/**/schedule";
18
+ });
19
+ match = [...match1, ...match2];
20
+ }
21
+ else {
22
+ match = ["modules/**/task", "modules/**/schedule"];
23
+ }
24
+ console.log(match);
13
25
  let taskFilesDirs = globby.sync(match, {
14
- cwd: path.join(this.options.baseDir, "app/modules"),
26
+ cwd: path.join(this.options.baseDir, "app"),
15
27
  onlyDirectories: true,
16
28
  onlyFiles: false,
17
29
  });
18
- if (importsModulesList.length > 0) {
19
- taskFilesDirs = taskFilesDirs.filter((item) => {
20
- const moduleName = item.split("/")[0];
21
- return importsModulesList.includes(moduleName);
22
- });
23
- }
30
+ this.options.logger.info("[dinegg] loader loadModuleScheduleTask task list %j", taskFilesDirs);
24
31
  for (const filePath of taskFilesDirs) {
25
- const fullPath = path.join(this.options.baseDir, "app/modules", filePath);
32
+ const fullPath = path.join(this.options.baseDir, "app", filePath);
26
33
  if (!fs.statSync(fullPath).isDirectory())
27
34
  continue;
28
35
  (_f = (_e = (_d = (_c = this.config) === null || _c === void 0 ? void 0 : _c.schedule) === null || _d === void 0 ? void 0 : _d.directory) === null || _e === void 0 ? void 0 : _e.push) === null || _f === void 0 ? void 0 : _f.call(_e, fullPath);
@@ -65,4 +72,4 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
65
72
  }
66
73
  }
67
74
  exports.default = DingAppWorkerLoader;
68
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZ0FnZW50V29ya2VyTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGluZ0FnZW50V29ya2VyTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsMkJBQTJCO0FBQzNCLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRWpDLE1BQXFCLG1CQUFvQixTQUFRLEdBQUcsQ0FBQyxpQkFBaUI7SUFFcEUsc0JBQXNCOztRQUNwQixNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQUssR0FBYSxFQUFFLENBQUM7UUFDekIsS0FBSyxHQUFHLENBQUMsUUFBUSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBRWpDLElBQUksYUFBYSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ3JDLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLGFBQWEsQ0FBQztZQUNuRCxlQUFlLEVBQUUsSUFBSTtZQUNyQixTQUFTLEVBQUUsS0FBSztTQUNqQixDQUFDLENBQUM7UUFHSCxJQUFJLGtCQUFrQixDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDakMsYUFBYSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDNUMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDdEMsT0FBTyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDakQsQ0FBQyxDQUFDLENBQUM7U0FDSjtRQUVELEtBQUssTUFBTSxRQUFRLElBQUksYUFBYSxFQUFFO1lB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
75
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZ0FnZW50V29ya2VyTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGluZ0FnZW50V29ya2VyTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsMkJBQTJCO0FBQzNCLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRWpDLE1BQXFCLG1CQUFvQixTQUFRLEdBQUcsQ0FBQyxpQkFBaUI7SUFFcEUsc0JBQXNCOztRQUNwQixNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQUssR0FBYSxFQUFFLENBQUM7UUFFekIsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBR2pDLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxVQUFVLEdBQUcsSUFBSSxHQUFHLFVBQVUsQ0FBQTtZQUN2QyxDQUFDLENBQUMsQ0FBQTtZQUNGLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxVQUFVLEdBQUcsSUFBSSxHQUFHLGNBQWMsQ0FBQTtZQUMzQyxDQUFDLENBQUMsQ0FBQTtZQUNGLEtBQUssR0FBRyxDQUFDLEdBQUcsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLENBQUE7U0FDL0I7YUFBTTtZQUNMLEtBQUssR0FBRyxDQUFDLGlCQUFpQixFQUFFLHFCQUFxQixDQUFDLENBQUM7U0FDcEQ7UUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLElBQUksYUFBYSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ3JDLEdBQUcsRUFBRSxJ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
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const egg = require("egg");
4
4
  const path = require("path");
5
5
  const fs = require("fs");
6
+ const dineggControllerInitializer_1 = require("./controller/dineggControllerInitializer");
6
7
  const globby = require("globby");
7
8
  class DingAppWorkerLoader extends egg.AppWorkerLoader {
8
9
  creadModuleServiceOptions(outOption = {}) {
@@ -59,6 +60,7 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
59
60
  directory: [path.join(this.options.baseDir, "app/modules"), path.join(this.options.baseDir, "app/controller")],
60
61
  match: match,
61
62
  property: "controller_module",
63
+ initializer: dineggControllerInitializer_1.default,
62
64
  caseStyle(filePath) {
63
65
  let fpath = filePath.substring(0, filePath.lastIndexOf(".")).split("/");
64
66
  fpath[fpath.length - 1] = fpath[fpath.length - 1].replace(/.controller$/, "");
@@ -104,25 +106,25 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
104
106
  const importsModulesList = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.imports) || [];
105
107
  let match = [];
106
108
  if (importsModulesList.length > 0) {
107
- const match1 = importsModulesList.map(item => {
108
- return item + "/**/task";
109
+ const match1 = importsModulesList.map((item) => {
110
+ return "modules/" + item + "/**/task";
109
111
  });
110
- const match2 = importsModulesList.map(item => {
111
- return item + "/**/schedule";
112
+ const match2 = importsModulesList.map((item) => {
113
+ return "modules/" + item + "/**/schedule";
112
114
  });
113
115
  match = [...match1, ...match2];
114
116
  }
115
117
  else {
116
- match = ["*/task", "*/schedule"];
118
+ match = ["modules/**/task", "modules/**/schedule"];
117
119
  }
118
120
  let taskFilesDirs = globby.sync(match, {
119
- cwd: path.join(this.options.baseDir, "app/modules"),
121
+ cwd: path.join(this.options.baseDir, "app"),
120
122
  onlyDirectories: true,
121
123
  onlyFiles: false,
122
124
  });
123
125
  this.options.logger.info("[dinegg] loader loadModuleScheduleTask task list %j", taskFilesDirs);
124
126
  for (const filePath of taskFilesDirs) {
125
- const fullPath = path.join(this.options.baseDir, "app/modules", filePath);
127
+ const fullPath = path.join(this.options.baseDir, "app", filePath);
126
128
  if (!fs.statSync(fullPath).isDirectory())
127
129
  continue;
128
130
  (_f = (_e = (_d = (_c = this.config) === null || _c === void 0 ? void 0 : _c.schedule) === null || _d === void 0 ? void 0 : _d.directory) === null || _e === void 0 ? void 0 : _e.push) === null || _f === void 0 ? void 0 : _f.call(_e, fullPath);
@@ -175,4 +177,4 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
175
177
  }
176
178
  }
177
179
  exports.default = DingAppWorkerLoader;
178
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}
180
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,86 @@
1
+ 'use strict';
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const path = require('path');
4
+ const is = require('is-type-of');
5
+ const utility = require('utility');
6
+ const utils = require('egg-core/lib/utils');
7
+ const FULLPATH = require('egg-core/lib/loader/file_loader').FULLPATH;
8
+ const touteSymbol = Symbol.for('dinegg#Route');
9
+ function default_1(obj, opt) {
10
+ if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj)) {
11
+ obj = obj(this.app);
12
+ }
13
+ if (is.class(obj)) {
14
+ obj.prototype.pathName = opt.pathName;
15
+ obj.prototype.fullPath = opt.path;
16
+ return wrapClass(obj);
17
+ }
18
+ if (is.object(obj)) {
19
+ return wrapObject(obj, opt.path);
20
+ }
21
+ if (is.generatorFunction(obj) || is.asyncFunction(obj)) {
22
+ return wrapObject({ 'module.exports': obj }, opt.path)['module.exports'];
23
+ }
24
+ return obj;
25
+ }
26
+ exports.default = default_1;
27
+ function wrapClass(Controller) {
28
+ let proto = Controller.prototype;
29
+ const ret = {};
30
+ while (proto !== Object.prototype) {
31
+ const keys = Object.getOwnPropertyNames(proto);
32
+ for (const key of keys) {
33
+ if (key === 'constructor') {
34
+ continue;
35
+ }
36
+ const d = Object.getOwnPropertyDescriptor(proto, key);
37
+ if (is.function(d.value) && !ret.hasOwnProperty(key)) {
38
+ ret[key] = methodToMiddleware(Controller, key);
39
+ ret[key][FULLPATH] = Controller.prototype.fullPath + '#' + Controller.name + '.' + key + '()';
40
+ ret[key][touteSymbol] = d === null || d === void 0 ? void 0 : d.value[touteSymbol];
41
+ }
42
+ }
43
+ proto = Object.getPrototypeOf(proto);
44
+ }
45
+ return ret;
46
+ function methodToMiddleware(Controller, key) {
47
+ return function classControllerMiddleware(...args) {
48
+ const controller = new Controller(this);
49
+ if (!this.app.config.controller || !this.app.config.controller.supportParams) {
50
+ args = [this];
51
+ }
52
+ return utils.callFn(controller[key], args, controller);
53
+ };
54
+ }
55
+ }
56
+ function wrapObject(obj, path, prefix) {
57
+ const keys = Object.keys(obj);
58
+ const ret = {};
59
+ for (const key of keys) {
60
+ if (is.function(obj[key])) {
61
+ const names = utility.getParamNames(obj[key]);
62
+ if (names[0] === 'next') {
63
+ throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
64
+ }
65
+ ret[key] = functionToMiddleware(obj[key]);
66
+ ret[key][FULLPATH] = `${path}#${prefix || ''}${key}()`;
67
+ }
68
+ else if (is.object(obj[key])) {
69
+ ret[key] = wrapObject(obj[key], path, `${prefix || ''}${key}.`);
70
+ }
71
+ }
72
+ return ret;
73
+ function functionToMiddleware(func) {
74
+ const objectControllerMiddleware = async function (...args) {
75
+ if (!this.app.config.controller || !this.app.config.controller.supportParams) {
76
+ args = [this];
77
+ }
78
+ return await utils.callFn(func, args, this);
79
+ };
80
+ for (const key in func) {
81
+ objectControllerMiddleware[key] = func[key];
82
+ }
83
+ return objectControllerMiddleware;
84
+ }
85
+ }
86
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGluZWdnQ29udHJvbGxlckluaXRpYWxpemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGluZWdnQ29udHJvbGxlckluaXRpYWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLFlBQVksQ0FBQzs7QUFRYixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDN0IsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBQ2pDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUNuQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUM1QyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsaUNBQWlDLENBQUMsQ0FBQyxRQUFRLENBQUM7QUFFckUsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQTtBQUU5QyxtQkFBeUIsR0FBRyxFQUFFLEdBQUc7SUFPN0IsSUFBSSxFQUFFLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDNUYsR0FBRyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7S0FDdkI7SUFDRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDZixHQUFHLENBQUMsU0FBUyxDQUFDLFFBQVEsR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3RDLEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDbEMsT0FBTyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUM7S0FD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
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.bindRouter = exports.post = exports.get = void 0;
4
+ const route = Symbol.for("dinegg#Route");
5
+ function get(path) {
6
+ return function (target, name, descriptor) {
7
+ if (descriptor.value[route]) {
8
+ descriptor.value[route].push({ method: "get", path, });
9
+ }
10
+ else {
11
+ descriptor.value[route] = [{ method: "get", path }];
12
+ }
13
+ };
14
+ }
15
+ exports.get = get;
16
+ function post(path) {
17
+ return function (target, name, descriptor) {
18
+ if (descriptor.value[route]) {
19
+ descriptor.value[route].push({ method: "post", path, });
20
+ }
21
+ else {
22
+ descriptor.value[route] = [{ method: "post", path }];
23
+ }
24
+ };
25
+ }
26
+ exports.post = post;
27
+ exports.default = {
28
+ get
29
+ };
30
+ function reduceControllerMethod(router, controller) {
31
+ if (Object.prototype.toString.call(controller) !== "[object Object]") {
32
+ return;
33
+ }
34
+ const keys = Object.keys(controller);
35
+ keys.forEach(item => {
36
+ if (controller[item] instanceof Function) {
37
+ const routeObjArr = controller[item][route];
38
+ if (routeObjArr && Array.isArray(routeObjArr)) {
39
+ for (const routeObj of routeObjArr) {
40
+ router[routeObj.method](routeObj.path, controller[item]);
41
+ }
42
+ }
43
+ return;
44
+ }
45
+ reduceControllerMethod(router, controller[item]);
46
+ });
47
+ }
48
+ function bindRouter(app) {
49
+ reduceControllerMethod(app.router, app.controller);
50
+ }
51
+ exports.bindRouter = bindRouter;
52
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVjb3JhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUE7QUFJeEMsU0FBZ0IsR0FBRyxDQUFDLElBQVk7SUFFNUIsT0FBTyxVQUFVLE1BQU0sRUFBRSxJQUFZLEVBQUUsVUFBOEI7UUFDakUsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3pCLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxJQUFJLEdBQUcsQ0FBQyxDQUFBO1NBQ3pEO2FBQU07WUFDSCxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7U0FDdEQ7SUFDTCxDQUFDLENBQUE7QUFDTCxDQUFDO0FBVEQsa0JBU0M7QUFJRCxTQUFnQixJQUFJLENBQUMsSUFBWTtJQUU3QixPQUFPLFVBQVUsTUFBTSxFQUFFLElBQVksRUFBRSxVQUE4QjtRQUNqRSxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDekIsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRyxDQUFDLENBQUE7U0FDMUQ7YUFBTTtZQUNILFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtTQUN2RDtJQUNMLENBQUMsQ0FBQTtBQUNMLENBQUM7QUFURCxvQkFTQztBQUVELGtCQUFlO0lBQ1gsR0FBRztDQUNOLENBQUE7QUFRRCxTQUFTLHNCQUFzQixDQUFDLE1BQWMsRUFBRSxVQUFlO0lBQzNELElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLGlCQUFpQixFQUFFO1FBQ2xFLE9BQU87S0FDVjtJQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7SUFHcEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUNoQixJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxRQUFRLEVBQUU7WUFDdEMsTUFBTSxXQUFXLEdBQXVDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUMvRSxJQUFJLFdBQVcsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUMzQyxLQUFLLE1BQU0sUUFBUSxJQUFJLFdBQVcsRUFBRTtvQkFDaEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO2lCQUMzRDthQUNKO1lBQ0QsT0FBTztTQUNWO1FBQ0Qsc0JBQXNCLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQ3BELENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUtELFNBQWdCLFVBQVUsQ0FBQyxHQUFnQjtJQUN2QyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQTtBQUN0RCxDQUFDO0FBRkQsZ0NBRUMifQ==
package/lib/framework.js CHANGED
@@ -7,6 +7,7 @@ const path = require("path");
7
7
  const Rest_1 = require("./core/controller/Rest");
8
8
  const Func_1 = require("./core/controller/Func");
9
9
  const Controller_1 = require("./core/controller/Controller");
10
+ const ControllerDecorator = require("./core/ControllerDecorator");
10
11
  const EGG_PATH = Symbol.for("egg#eggPath");
11
12
  const EGG_LOADER = Symbol.for("egg#loader");
12
13
  class Application extends egg.Application {
@@ -32,6 +33,7 @@ exports.default = Object.assign(egg, {
32
33
  AgentWorkerLoader: DingAgentWorkerLoader_1.default,
33
34
  RestController: Rest_1.default,
34
35
  FuncController: Func_1.default,
35
- Controller: Controller_1.default
36
+ Controller: Controller_1.default,
37
+ ControllerDecorator
36
38
  });
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFHNUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUMzQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBRzVDLE1BQU0sV0FBWSxTQUFRLEdBQUcsQ0FBQyxXQUFXO0lBQ3ZDLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDWixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUdELElBQUksQ0FBQyxVQUFVLENBQUM7UUFDZCxPQUFPLDZCQUFtQixDQUFDO0lBQzdCLENBQUM7Q0FDRjtBQUVELE1BQU0sS0FBTSxTQUFRLEdBQUcsQ0FBQyxLQUFLO0lBQzNCLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDWixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUNELElBQUksQ0FBQyxVQUFVLENBQUM7UUFDZCxPQUFPLCtCQUFxQixDQUFDO0lBQy9CLENBQUM7Q0FDRjtBQUlELGtCQUFlLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO0lBQ2hDLFdBQVc7SUFDWCxLQUFLO0lBQ0wsZUFBZSxFQUFFLDZCQUFtQjtJQUNwQyxpQkFBaUIsRUFBRSwrQkFBcUI7SUFDeEMsY0FBYyxFQUFkLGNBQWM7SUFDZCxjQUFjLEVBQWQsY0FBYztJQUNkLFVBQVUsRUFBQyxvQkFBZ0I7Q0FDNUIsQ0FBQyxDQUFDIn0=
39
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFDNUQsa0VBQWlFO0FBSWpFLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUc1QyxNQUFNLFdBQVksU0FBUSxHQUFHLENBQUMsV0FBVztJQUN2QyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFHRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTyw2QkFBbUIsQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEtBQU0sU0FBUSxHQUFHLENBQUMsS0FBSztJQUMzQixJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTywrQkFBcUIsQ0FBQztJQUMvQixDQUFDO0NBQ0Y7QUFJRCxrQkFBZSxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRTtJQUNoQyxXQUFXO0lBQ1gsS0FBSztJQUNMLGVBQWUsRUFBRSw2QkFBbUI7SUFDcEMsaUJBQWlCLEVBQUUsK0JBQXFCO0lBQ3hDLGNBQWMsRUFBZCxjQUFjO0lBQ2QsY0FBYyxFQUFkLGNBQWM7SUFDZCxVQUFVLEVBQUMsb0JBQWdCO0lBQzNCLG1CQUFtQjtDQUNwQixDQUFDLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dinegg",
3
- "version": "2.6.2",
3
+ "version": "2.7.3",
4
4
  "description": "egg framework dinegg.",
5
5
  "dependencies": {
6
6
  "egg": "^2.31.0",
@@ -27,6 +27,8 @@
27
27
  "scripts": {
28
28
  "test": "npm run lint -- --fix && egg-bin pkgfiles && npm run test-local",
29
29
  "test-local": "tsc && egg-bin test && npm run clean:js",
30
+ "test-module": "tsc && egg-bin test ./test/module.test.js && npm run clean:js",
31
+ "test-decorator": "tsc && egg-bin test ./test/decorator.test.js && npm run clean:js",
30
32
  "tsc": "tsc",
31
33
  "clean:js": "ets clean",
32
34
  "publish:clean": "tsc && npm publish && npm run clean:js",