dinegg 2.6.0 → 2.7.0

package/app/extend/context.js

@@ -33,10 +33,10 @@ exports.default = {
     success(data) {
         this.send(data, 20000, "success");
     },
-    error(msg) {
+    error(msg, data = null) {
         var _a;
         const _msg = ((_a = this.body) === null || _a === void 0 ? void 0 : _a.msg) ? this.body.msg + "," + msg : msg;
-        this.send(null, 50000, _msg);
+        this.send(data, 50000, _msg);
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFVQSxrQkFBZTtJQVFiLElBQUksQ0FBZ0IsSUFBSSxFQUFFLE1BQU0sR0FBRyxLQUFLLEVBQUUsR0FBRyxHQUFHLEVBQUU7UUFDaEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDO1FBQzNDLElBQUksUUFBUSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2hELFFBQVEsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ3JCLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUM7SUFDdkIsQ0FBQztJQVFELElBQUksQ0FBZ0IsR0FBRyxHQUFHLEVBQUUsRUFBRSxNQUFNLEdBQUcsS0FBSyxFQUFFLEdBQUcsR0FBRyxFQUFFO1FBRXBELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQztRQUUzQyxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxpQkFBaUIsRUFBRTtZQUM3RCxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssaUJBQWlCLEVBQUU7Z0JBQ25FLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7b0JBQ2hDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDbkMsQ0FBQyxDQUFDLENBQUM7Z0JBQ0gsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUU7b0JBQ2xCLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQztpQkFDekI7Z0JBQ0QsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLENBQUM7YUFDOUI7aUJBQU07Z0JBQ0wsSUFBSSxRQUFRLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDL0MsUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxRQUFRLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztnQkFDcEIsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUM7YUFDdEI7U0FDRjtJQUNILENBQUM7SUFPRCxPQUFPLENBQWdCLElBQUk7UUFDekIsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFPRCxLQUFLLENBQWdCLEdBQUc7O1FBQ3RCLE1BQU0sSUFBSSxHQUFHLENBQUEsTUFBQSxJQUFJLENBQUMsSUFBSSwwQ0FBRSxHQUFHLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUM5RCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztDQUNGLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFVQSxrQkFBZTtJQVFiLElBQUksQ0FBZ0IsSUFBSSxFQUFFLE1BQU0sR0FBRyxLQUFLLEVBQUUsR0FBRyxHQUFHLEVBQUU7UUFDaEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDO1FBQzNDLElBQUksUUFBUSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2hELFFBQVEsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ3JCLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUM7SUFDdkIsQ0FBQztJQVFELElBQUksQ0FBZ0IsR0FBRyxHQUFHLEVBQUUsRUFBRSxNQUFNLEdBQUcsS0FBSyxFQUFFLEdBQUcsR0FBRyxFQUFFO1FBRXBELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQztRQUUzQyxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxpQkFBaUIsRUFBRTtZQUM3RCxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssaUJBQWlCLEVBQUU7Z0JBQ25FLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7b0JBQ2hDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDbkMsQ0FBQyxDQUFDLENBQUM7Z0JBQ0gsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUU7b0JBQ2xCLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQztpQkFDekI7Z0JBQ0QsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLENBQUM7YUFDOUI7aUJBQU07Z0JBQ0wsSUFBSSxRQUFRLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDL0MsUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxRQUFRLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztnQkFDcEIsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUM7YUFDdEI7U0FDRjtJQUNILENBQUM7SUFPRCxPQUFPLENBQWdCLElBQUk7UUFDekIsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFPRCxLQUFLLENBQWdCLEdBQUcsRUFBQyxPQUFTLElBQUk7O1FBQ3BDLE1BQU0sSUFBSSxHQUFHLENBQUEsTUFBQSxJQUFJLENBQUMsSUFBSSwwQ0FBRSxHQUFHLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUM5RCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztDQUNGLENBQUMifQ==

package/index.d.ts

@@ -3,7 +3,7 @@
  * @Author: ding-cx
  * @Date: 2021-01-29 18:12:25
  * @LastEditors: ding-cx
- * @LastEditTime: 2021-12-05 16:22:11
+ * @LastEditTime: 2021-12-09 11:35:28
  * @Description: file content
  */
 // {framework_root}/index.d.ts
@@ -14,6 +14,12 @@ import * as Egg from "egg";
 import "egg-sequelize";
 import "egg-cors";
 import "egg-jwt";
+
+
+
+
+// interface ControllerDecoratorType extends typeof ControllerDecorator
+
 // import "./typings/sequelize";//不需要自定义的sequelize类型定义了。
 
 // ts 这里可以理解成导入一个类。并将这个类的类型提取给ts作为自定义type。然后这个type就可以放在interface上，或者提供给其他interface等。
@@ -59,11 +65,11 @@ declare module "egg" {
      *ctx发送错误的响应，不携带数据，只提供错误信息描述。
      *
      * @deprecated since 3.0 将移出ctx上的此api，禁止在service上用ctx来响应，只能在`controller`上为http请求响应。如：this.error(data)
-     * 
+     *
      * @param {string} msg
      * @memberof Context
      */
-    error(msg: string): void;
+    error(msg: string, data?: any): void;
   }
 
   interface EggAppConfig {
@@ -166,7 +172,6 @@ declare module "egg" {
         };
       }
     ): Context<T>;
-
   }
 
   interface IHelper {
@@ -194,21 +199,26 @@ declare module "egg" {
     };
   }
 
-  class Controller extends Egg.BaseContextClass {
+  /** 为controller添加响应方法 */
+  interface Controller {
     /**
-    *ctx发送成功的响应
-    *
-    * @param {*} data
-    * @memberof Context
-    */
+     *ctx发送成功的响应
+     * - 不能在router中直接调用
+     * @example {code:20000,msg:"success",data:any}
+     * @param {*} data
+     * @memberof Controller
+     */
     success(data: any): void;
     /**
-     *ctx发送错误的响应，不携带数据，只提供错误信息描述。此方法的msg可叠加
+     *ctx发送错误的响应
+     * - 主要提供错误信息描述。此方法的msg是叠加拼接的字符串。data常为null，特殊情况太多错误信息可传递data
      *
+     * - 不能在router中直接调用
+     * @example {code:50000,msg:string,data:null,is_error:true}
      * @param {string} msg
-     * @memberof Context
+     * @memberof Controller
      */
-    error(msg: string): void;
+    error(msg: string, data?: any): void;
   }
 
   /** restful api 封装的控制器 继承自Egg Controller */
@@ -241,6 +251,19 @@ declare module "egg" {
     /** 批量删除 */
     batchDelete(): void;
   }
+
+
+
+  /** 控制器装饰器 */
+  interface ControllerDecorator {
+    /** 注册get路由 */
+    get: (path: string) => void
+    /** 注册post路由 */
+    post: (path: string) => void
+    /** 在router.ts中调用，绑定router */
+    bindRouter: (app: Application) => void
+  }
+
 }
 
 // 将 Egg 整个 export 出去

package/lib/core/DingAgentWorkerLoader.js

@@ -9,18 +9,24 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
         var _a, _b, _c, _d, _e, _f;
         const importsModulesList = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.imports) || [];
         let match = [];
-        match = ["*/task", "*/schedule"];
+        if (importsModulesList.length > 0) {
+            const match1 = importsModulesList.map(item => {
+                return item + "/**/task";
+            });
+            const match2 = importsModulesList.map(item => {
+                return item + "/**/schedule";
+            });
+            match = [...match1, ...match2];
+        }
+        else {
+            match = ["/**/task", "/**/schedule"];
+        }
         let taskFilesDirs = globby.sync(match, {
             cwd: path.join(this.options.baseDir, "app/modules"),
             onlyDirectories: true,
             onlyFiles: false,
         });
-        if (importsModulesList.length > 0) {
-            taskFilesDirs = taskFilesDirs.filter((item) => {
-                const moduleName = item.split("/")[0];
-                return importsModulesList.includes(moduleName);
-            });
-        }
+        this.options.logger.info("[dinegg] loader loadModuleScheduleTask task list %j", taskFilesDirs);
         for (const filePath of taskFilesDirs) {
             const fullPath = path.join(this.options.baseDir, "app/modules", filePath);
             if (!fs.statSync(fullPath).isDirectory())
@@ -33,11 +39,11 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
         const importsModulesList = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.imports) || [];
         let match;
         if (importsModulesList.length === 0) {
-            match = process.env.EGG_TYPESCRIPT === "true" ? ["*/agent.(js|ts)", "!**/*.d.ts"] : ["*/agent.js"];
+            match = process.env.EGG_TYPESCRIPT === "true" ? ["**/agent.(js|ts)", "!**/*.d.ts"] : ["**/agent.js"];
         }
         else {
             match = importsModulesList.map((item) => {
-                return process.env.EGG_TYPESCRIPT === "true" ? `${item}/agent.(js|ts)` : `${item}/agent.js`;
+                return process.env.EGG_TYPESCRIPT === "true" ? `${item}/**/agent.(js|ts)` : `${item}/**/agent.js`;
             });
             process.env.EGG_TYPESCRIPT === "true" && match.push("!**/*.d.ts");
         }
@@ -65,4 +71,4 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
     }
 }
 exports.default = DingAppWorkerLoader;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZ0FnZW50V29ya2VyTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGluZ0FnZW50V29ya2VyTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsMkJBQTJCO0FBQzNCLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRWpDLE1BQXFCLG1CQUFvQixTQUFRLEdBQUcsQ0FBQyxpQkFBaUI7SUFFcEUsc0JBQXNCOztRQUNwQixNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQUssR0FBYSxFQUFFLENBQUM7UUFDekIsS0FBSyxHQUFHLENBQUMsUUFBUSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBRWpDLElBQUksYUFBYSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ3JDLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLGFBQWEsQ0FBQztZQUNuRCxlQUFlLEVBQUUsSUFBSTtZQUNyQixTQUFTLEVBQUUsS0FBSztTQUNqQixDQUFDLENBQUM7UUFHSCxJQUFJLGtCQUFrQixDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDakMsYUFBYSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDNUMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDdEMsT0FBTyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDakQsQ0FBQyxDQUFDLENBQUM7U0FDSjtRQUVELEtBQUssTUFBTSxRQUFRLElBQUksYUFBYSxFQUFFO1lBQ3BDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsYUFBYSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBQzFFLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFdBQVcsRUFBRTtnQkFBRSxTQUFTO1lBQ25ELE1BQUEsTUFBQSxNQUFBLE1BQUEsSUFBSSxDQUFDLE1BQU0sMENBQUUsUUFBUSwwQ0FBRSxTQUFTLDBDQUFFLElBQUksbURBQUcsUUFBUSxDQUFDLENBQUM7U0FDcEQ7SUFFSCxDQUFDO0lBR0QsV0FBVzs7UUFDVCxNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQWUsQ0FBQztRQUNwQixJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7WUFDbkMsS0FBSyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxpQkFBaUIsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQztTQUNwRzthQUFNO1lBQ0wsS0FBSyxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUN0QyxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksV0FBVyxDQUFDO1lBQzlGLENBQUMsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssTUFBTSxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7U0FDbkU7UUFFRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNuQyxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUM7U0FDcEQsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG9DQUFvQyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBRXpFLElBQUksQ0FBQyxHQUFXLENBQUMsaUNBQWlDLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQzNFLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUV0RixPQUFPLElBQUksU0FBUyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqQyxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFLRCxVQUFVO1FBQ1IsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2xCLEtBQUssQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNyQixDQUFDO0lBRUQsSUFBSTs7UUFDRixNQUFNLGNBQWMsR0FBRyxDQUFDLENBQUMsQ0FBQSxNQUFBLE1BQUEsSUFBSSxDQUFDLE1BQU0sMENBQUUsT0FBTywwQ0FBRSxNQUFNLENBQUEsQ0FBQztRQUV0RCxjQUFjLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRXJDLGNBQWMsSUFBSSxJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUVoRCxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7UUFDdkIsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7UUFFekIsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7Q0FDRjtBQTNFRCxzQ0EyRUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZ0FnZW50V29ya2VyTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGluZ0FnZW50V29ya2VyTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsMkJBQTJCO0FBQzNCLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRWpDLE1BQXFCLG1CQUFvQixTQUFRLEdBQUcsQ0FBQyxpQkFBaUI7SUFFcEUsc0JBQXNCOztRQUNwQixNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQUssR0FBYSxFQUFFLENBQUM7UUFFekIsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBR2pDLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxJQUFJLEdBQUcsVUFBVSxDQUFBO1lBQzFCLENBQUMsQ0FBQyxDQUFBO1lBQ0YsTUFBTSxNQUFNLEdBQUcsa0JBQWtCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUMzQyxPQUFPLElBQUksR0FBRyxjQUFjLENBQUE7WUFDOUIsQ0FBQyxDQUFDLENBQUE7WUFDRixLQUFLLEdBQUcsQ0FBQyxHQUFHLE1BQU0sRUFBRSxHQUFHLE1BQU0sQ0FBQyxDQUFBO1NBQy9CO2FBQU07WUFDTCxLQUFLLEdBQUcsQ0FBQyxVQUFVLEVBQUUsY0FBYyxDQUFDLENBQUM7U0FDdEM7UUFFRCxJQUFJLGFBQWEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNyQyxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUM7WUFDbkQs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

package/lib/core/DingAppWorkerLoader.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const egg = require("egg");
 const path = require("path");
 const fs = require("fs");
+const dineggControllerInitializer_1 = require("./controller/dineggControllerInitializer");
 const globby = require("globby");
 class DingAppWorkerLoader extends egg.AppWorkerLoader {
     creadModuleServiceOptions(outOption = {}) {
@@ -59,6 +60,7 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
             directory: [path.join(this.options.baseDir, "app/modules"), path.join(this.options.baseDir, "app/controller")],
             match: match,
             property: "controller_module",
+            initializer: dineggControllerInitializer_1.default,
             caseStyle(filePath) {
                 let fpath = filePath.substring(0, filePath.lastIndexOf(".")).split("/");
                 fpath[fpath.length - 1] = fpath[fpath.length - 1].replace(/.controller$/, "");
@@ -113,7 +115,7 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
             match = [...match1, ...match2];
         }
         else {
-            match = ["*/task", "*/schedule"];
+            match = ["/**/task", "/**/schedule"];
         }
         let taskFilesDirs = globby.sync(match, {
             cwd: path.join(this.options.baseDir, "app/modules"),
@@ -133,11 +135,11 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
         const importsModulesList = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.imports) || [];
         let match;
         if (importsModulesList.length === 0) {
-            match = process.env.EGG_TYPESCRIPT === "true" ? ["*/app.(js|ts)", "!**/*.d.ts"] : ["*/app.js"];
+            match = process.env.EGG_TYPESCRIPT === "true" ? ["**/app.(js|ts)", "!**/*.d.ts"] : ["**/app.js"];
         }
         else {
             match = importsModulesList.map((item) => {
-                return process.env.EGG_TYPESCRIPT === "true" ? `${item}/app.(js|ts)` : `${item}/app.js`;
+                return process.env.EGG_TYPESCRIPT === "true" ? `${item}/**/app.(js|ts)` : `${item}/**/app.js`;
             });
             process.env.EGG_TYPESCRIPT === "true" && match.push("!**/*.d.ts");
         }
@@ -175,4 +177,4 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
     }
 }
 exports.default = DingAppWorkerLoader;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}

package/lib/core/controller/dineggControllerInitializer.js

@@ -0,0 +1,86 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require('path');
+const is = require('is-type-of');
+const utility = require('utility');
+const utils = require('egg-core/lib/utils');
+const FULLPATH = require('egg-core/lib/loader/file_loader').FULLPATH;
+const touteSymbol = Symbol.for('dinegg#Route');
+function default_1(obj, opt) {
+    if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj)) {
+        obj = obj(this.app);
+    }
+    if (is.class(obj)) {
+        obj.prototype.pathName = opt.pathName;
+        obj.prototype.fullPath = opt.path;
+        return wrapClass(obj);
+    }
+    if (is.object(obj)) {
+        return wrapObject(obj, opt.path);
+    }
+    if (is.generatorFunction(obj) || is.asyncFunction(obj)) {
+        return wrapObject({ 'module.exports': obj }, opt.path)['module.exports'];
+    }
+    return obj;
+}
+exports.default = default_1;
+function wrapClass(Controller) {
+    let proto = Controller.prototype;
+    const ret = {};
+    while (proto !== Object.prototype) {
+        const keys = Object.getOwnPropertyNames(proto);
+        for (const key of keys) {
+            if (key === 'constructor') {
+                continue;
+            }
+            const d = Object.getOwnPropertyDescriptor(proto, key);
+            if (is.function(d.value) && !ret.hasOwnProperty(key)) {
+                ret[key] = methodToMiddleware(Controller, key);
+                ret[key][FULLPATH] = Controller.prototype.fullPath + '#' + Controller.name + '.' + key + '()';
+                ret[key][touteSymbol] = d === null || d === void 0 ? void 0 : d.value[touteSymbol];
+            }
+        }
+        proto = Object.getPrototypeOf(proto);
+    }
+    return ret;
+    function methodToMiddleware(Controller, key) {
+        return function classControllerMiddleware(...args) {
+            const controller = new Controller(this);
+            if (!this.app.config.controller || !this.app.config.controller.supportParams) {
+                args = [this];
+            }
+            return utils.callFn(controller[key], args, controller);
+        };
+    }
+}
+function wrapObject(obj, path, prefix) {
+    const keys = Object.keys(obj);
+    const ret = {};
+    for (const key of keys) {
+        if (is.function(obj[key])) {
+            const names = utility.getParamNames(obj[key]);
+            if (names[0] === 'next') {
+                throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
+            }
+            ret[key] = functionToMiddleware(obj[key]);
+            ret[key][FULLPATH] = `${path}#${prefix || ''}${key}()`;
+        }
+        else if (is.object(obj[key])) {
+            ret[key] = wrapObject(obj[key], path, `${prefix || ''}${key}.`);
+        }
+    }
+    return ret;
+    function functionToMiddleware(func) {
+        const objectControllerMiddleware = async function (...args) {
+            if (!this.app.config.controller || !this.app.config.controller.supportParams) {
+                args = [this];
+            }
+            return await utils.callFn(func, args, this);
+        };
+        for (const key in func) {
+            objectControllerMiddleware[key] = func[key];
+        }
+        return objectControllerMiddleware;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGluZWdnQ29udHJvbGxlckluaXRpYWxpemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGluZWdnQ29udHJvbGxlckluaXRpYWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLFlBQVksQ0FBQzs7QUFRYixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDN0IsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBQ2pDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUNuQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUM1QyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsaUNBQWlDLENBQUMsQ0FBQyxRQUFRLENBQUM7QUFFckUsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQTtBQUU5QyxtQkFBeUIsR0FBRyxFQUFFLEdBQUc7SUFPN0IsSUFBSSxFQUFFLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDNUYsR0FBRyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7S0FDdkI7SUFDRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDZixHQUFHLENBQUMsU0FBUyxDQUFDLFFBQVEsR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3RDLEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDbEMsT0FBTyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUM7S0FD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

package/lib/core/decorator.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bindRouter = exports.post = exports.get = void 0;
+const route = Symbol.for("dinegg#Route");
+function get(path) {
+    return function (target, name, descriptor) {
+        if (descriptor.value[route]) {
+            descriptor.value[route].push({ method: "get", path, });
+        }
+        else {
+            descriptor.value[route] = [{ method: "get", path }];
+        }
+    };
+}
+exports.get = get;
+function post(path) {
+    return function (target, name, descriptor) {
+        if (descriptor.value[route]) {
+            descriptor.value[route].push({ method: "post", path, });
+        }
+        else {
+            descriptor.value[route] = [{ method: "post", path }];
+        }
+    };
+}
+exports.post = post;
+exports.default = {
+    get
+};
+function reduceControllerMethod(router, controller) {
+    if (Object.prototype.toString.call(controller) !== "[object Object]") {
+        return;
+    }
+    const keys = Object.keys(controller);
+    keys.forEach(item => {
+        if (controller[item] instanceof Function) {
+            const routeObjArr = controller[item][route];
+            if (routeObjArr && Array.isArray(routeObjArr)) {
+                for (const routeObj of routeObjArr) {
+                    router[routeObj.method](routeObj.path, controller[item]);
+                }
+            }
+            return;
+        }
+        reduceControllerMethod(router, controller[item]);
+    });
+}
+function bindRouter(app) {
+    reduceControllerMethod(app.router, app.controller);
+}
+exports.bindRouter = bindRouter;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVjb3JhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUE7QUFJeEMsU0FBZ0IsR0FBRyxDQUFDLElBQVk7SUFFNUIsT0FBTyxVQUFVLE1BQU0sRUFBRSxJQUFZLEVBQUUsVUFBOEI7UUFDakUsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3pCLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxJQUFJLEdBQUcsQ0FBQyxDQUFBO1NBQ3pEO2FBQU07WUFDSCxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7U0FDdEQ7SUFDTCxDQUFDLENBQUE7QUFDTCxDQUFDO0FBVEQsa0JBU0M7QUFJRCxTQUFnQixJQUFJLENBQUMsSUFBWTtJQUU3QixPQUFPLFVBQVUsTUFBTSxFQUFFLElBQVksRUFBRSxVQUE4QjtRQUNqRSxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDekIsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRyxDQUFDLENBQUE7U0FDMUQ7YUFBTTtZQUNILFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtTQUN2RDtJQUNMLENBQUMsQ0FBQTtBQUNMLENBQUM7QUFURCxvQkFTQztBQUVELGtCQUFlO0lBQ1gsR0FBRztDQUNOLENBQUE7QUFRRCxTQUFTLHNCQUFzQixDQUFDLE1BQWMsRUFBRSxVQUFlO0lBQzNELElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLGlCQUFpQixFQUFFO1FBQ2xFLE9BQU87S0FDVjtJQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7SUFHcEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUNoQixJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxRQUFRLEVBQUU7WUFDdEMsTUFBTSxXQUFXLEdBQXVDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUMvRSxJQUFJLFdBQVcsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUMzQyxLQUFLLE1BQU0sUUFBUSxJQUFJLFdBQVcsRUFBRTtvQkFDaEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO2lCQUMzRDthQUNKO1lBQ0QsT0FBTztTQUNWO1FBQ0Qsc0JBQXNCLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQ3BELENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUtELFNBQWdCLFVBQVUsQ0FBQyxHQUFnQjtJQUN2QyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQTtBQUN0RCxDQUFDO0FBRkQsZ0NBRUMifQ==

package/lib/framework.js

@@ -7,6 +7,7 @@ const path = require("path");
 const Rest_1 = require("./core/controller/Rest");
 const Func_1 = require("./core/controller/Func");
 const Controller_1 = require("./core/controller/Controller");
+const ControllerDecorator = require("./core/decorator");
 const EGG_PATH = Symbol.for("egg#eggPath");
 const EGG_LOADER = Symbol.for("egg#loader");
 class Application extends egg.Application {
@@ -32,6 +33,7 @@ exports.default = Object.assign(egg, {
     AgentWorkerLoader: DingAgentWorkerLoader_1.default,
     RestController: Rest_1.default,
     FuncController: Func_1.default,
-    Controller: Controller_1.default
+    Controller: Controller_1.default,
+    ControllerDecorator: ControllerDecorator
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFHNUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUMzQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBRzVDLE1BQU0sV0FBWSxTQUFRLEdBQUcsQ0FBQyxXQUFXO0lBQ3ZDLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDWixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUdELElBQUksQ0FBQyxVQUFVLENBQUM7UUFDZCxPQUFPLDZCQUFtQixDQUFDO0lBQzdCLENBQUM7Q0FDRjtBQUVELE1BQU0sS0FBTSxTQUFRLEdBQUcsQ0FBQyxLQUFLO0lBQzNCLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDWixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUNELElBQUksQ0FBQyxVQUFVLENBQUM7UUFDZCxPQUFPLCtCQUFxQixDQUFDO0lBQy9CLENBQUM7Q0FDRjtBQUlELGtCQUFlLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO0lBQ2hDLFdBQVc7SUFDWCxLQUFLO0lBQ0wsZUFBZSxFQUFFLDZCQUFtQjtJQUNwQyxpQkFBaUIsRUFBRSwrQkFBcUI7SUFDeEMsY0FBYyxFQUFkLGNBQWM7SUFDZCxjQUFjLEVBQWQsY0FBYztJQUNkLFVBQVUsRUFBQyxvQkFBZ0I7Q0FDNUIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFDNUQsd0RBQXVEO0FBR3ZELE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUc1QyxNQUFNLFdBQVksU0FBUSxHQUFHLENBQUMsV0FBVztJQUN2QyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFHRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTyw2QkFBbUIsQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEtBQU0sU0FBUSxHQUFHLENBQUMsS0FBSztJQUMzQixJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTywrQkFBcUIsQ0FBQztJQUMvQixDQUFDO0NBQ0Y7QUFJRCxrQkFBZSxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRTtJQUNoQyxXQUFXO0lBQ1gsS0FBSztJQUNMLGVBQWUsRUFBRSw2QkFBbUI7SUFDcEMsaUJBQWlCLEVBQUUsK0JBQXFCO0lBQ3hDLGNBQWMsRUFBZCxjQUFjO0lBQ2QsY0FBYyxFQUFkLGNBQWM7SUFDZCxVQUFVLEVBQUMsb0JBQWdCO0lBQzNCLG1CQUFtQixFQUFDLG1CQUFtQjtDQUN4QyxDQUFDLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinegg",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "egg framework dinegg.",
   "dependencies": {
     "egg": "^2.31.0",
@@ -27,6 +27,7 @@
   "scripts": {
     "test": "npm run lint -- --fix && egg-bin pkgfiles && npm run test-local",
     "test-local": "tsc && egg-bin test && npm run clean:js",
+    "test-module": "tsc && egg-bin test ./test/module.test.js && npm run clean:js",
     "tsc": "tsc",
     "clean:js": "ets clean",
     "publish:clean": "tsc && npm publish && npm run clean:js",