@midwayjs/core 3.0.0-beta.6 → 3.0.0-beta.7

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* add app.keys ([#1395](https://github.com/midwayjs/midway/issues/1395)) ([c44afc6](https://github.com/midwayjs/midway/commit/c44afc6cc6764a959d1fa7ae04d60099282d156a))
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
 # [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
 
 

package/dist/baseFramework.js

@@ -215,7 +215,10 @@ class BaseFramework {
                 catch (err) {
                     returnResult = await this.filterManager.runErrorFilter(err, ctx);
                 }
-                return returnResult;
+                if (returnResult.error) {
+                    throw returnResult.error;
+                }
+                return returnResult.result;
             }));
             this.composeMiddleware = await this.middlewareService.compose(this.middlewareManager);
             await this.filterManager.init(this.applicationContext);

package/dist/error/code.d.ts

@@ -54,6 +54,7 @@ export declare enum FrameworkErrorEnum {
     PARAM_TYPE = 10002,
     DEFINITION_NOT_FOUND = 10003,
     FEATURE_NO_LONGER_SUPPORTED = 10004,
-    VALIDATE_FAIL = 10005
+    VALIDATE_FAIL = 10005,
+    MISSING_CONFIG = 10006
 }
 //# sourceMappingURL=code.d.ts.map

package/dist/error/code.js

@@ -60,5 +60,6 @@ var FrameworkErrorEnum;
     FrameworkErrorEnum[FrameworkErrorEnum["DEFINITION_NOT_FOUND"] = 10003] = "DEFINITION_NOT_FOUND";
     FrameworkErrorEnum[FrameworkErrorEnum["FEATURE_NO_LONGER_SUPPORTED"] = 10004] = "FEATURE_NO_LONGER_SUPPORTED";
     FrameworkErrorEnum[FrameworkErrorEnum["VALIDATE_FAIL"] = 10005] = "VALIDATE_FAIL";
+    FrameworkErrorEnum[FrameworkErrorEnum["MISSING_CONFIG"] = 10006] = "MISSING_CONFIG";
 })(FrameworkErrorEnum = exports.FrameworkErrorEnum || (exports.FrameworkErrorEnum = {}));
 //# sourceMappingURL=code.js.map

package/dist/error/framework.d.ts

@@ -18,4 +18,7 @@ export declare class MidwayFeatureNoLongerSupportedError extends MidwayError {
 export declare class MidwayValidationError extends MidwayError {
     constructor(message: any, status: any, cause: any);
 }
+export declare class MidwayConfigMissingError extends MidwayError {
+    constructor(configKey: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayValidationError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
+exports.MidwayConfigMissingError = exports.MidwayValidationError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
 const base_1 = require("./base");
 const code_1 = require("./code");
 class MidwayCommonError extends base_1.MidwayError {
@@ -49,4 +49,10 @@ class MidwayValidationError extends base_1.MidwayError {
     }
 }
 exports.MidwayValidationError = MidwayValidationError;
+class MidwayConfigMissingError extends base_1.MidwayError {
+    constructor(configKey) {
+        super(`Can't found config key "${configKey}" in your config, please set it first`, code_1.FrameworkErrorEnum.MISSING_CONFIG);
+    }
+}
+exports.MidwayConfigMissingError = MidwayConfigMissingError;
 //# sourceMappingURL=framework.js.map

package/dist/service/middlewareService.js

@@ -67,6 +67,7 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
          * @api public
          */
         const composeFn = (context, next) => {
+            const supportBody = (0, util_1.isIncludeProperty)(context, 'body');
             // last called middleware #
             let index = -1;
             return dispatch(0);
@@ -80,9 +81,25 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                 if (!fn)
                     return Promise.resolve();
                 try {
-                    return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
-                        index,
-                    }));
+                    if (supportBody) {
+                        return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
+                            index,
+                        })).then(result => {
+                            // need to set body
+                            if (context.body && !result) {
+                                result = context.body;
+                            }
+                            else if (result && context.body !== result) {
+                                context.body = result;
+                            }
+                            return result;
+                        });
+                    }
+                    else {
+                        return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
+                            index,
+                        }));
+                    }
                 }
                 catch (err) {
                     return Promise.reject(err);

package/dist/util/index.d.ts

@@ -73,4 +73,5 @@ export declare const deprecatedOutput: (message: string) => void;
  */
 export declare const transformRequestObjectByType: (originValue: any, targetType?: any) => any;
 export declare function toPathMatch(pattern: any): any;
+export declare function isIncludeProperty(obj: any, prop: string): boolean;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.isIncludeProperty = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -237,4 +237,21 @@ function toPathMatch(pattern) {
     throw new error_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
 }
 exports.toPathMatch = toPathMatch;
+function isOwnPropertyWritable(obj, prop) {
+    if (obj == null)
+        return false;
+    const type = typeof obj;
+    if (type !== 'object' && type !== 'function')
+        return false;
+    return !!Object.getOwnPropertyDescriptor(obj, prop);
+}
+function isIncludeProperty(obj, prop) {
+    while (obj) {
+        if (isOwnPropertyWritable(obj, prop))
+            return true;
+        obj = Object.getPrototypeOf(obj);
+    }
+    return false;
+}
+exports.isIncludeProperty = isIncludeProperty;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.7",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.6",
+    "@midwayjs/decorator": "^3.0.0-beta.7",
+    "koa": "^2.13.4",
     "midway-test-component": "*",
     "mm": "3",
     "sinon": "^7.2.2"
@@ -31,7 +32,7 @@
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.6",
+    "@midwayjs/logger": "^3.0.0-beta.7",
     "class-transformer": "^0.5.1",
     "extend2": "^1.0.0",
     "picomatch": "^2.2.2",
@@ -45,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "e4595d30b369e36bef21b36f2b3737d8bc2f802d"
+  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
 }