@midwayjs/core 3.0.0-beta.11 → 3.0.0-beta.12

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.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* custom error code & add @Files/@Fields ([#1438](https://github.com/midwayjs/midway/issues/1438)) ([b0032af](https://github.com/midwayjs/midway/commit/b0032afd2fa9ea0416fe69f4bd0c1a58bea5314e))
+* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
+
+
+
+
+
 # [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
 
 **Note:** Version bump only for package @midwayjs/core

package/dist/common/middlewareManager.js

@@ -151,8 +151,8 @@ class ContextMiddlewareManager extends Array {
      * @param middleware
      */
     getMiddlewareName(middleware) {
-        var _a;
-        return (_a = middleware._name) !== null && _a !== void 0 ? _a : middleware.name;
+        var _a, _b;
+        return ((_b = (_a = (middleware.getName && middleware.getName())) !== null && _a !== void 0 ? _a : middleware._name) !== null && _b !== void 0 ? _b : middleware.name);
     }
     /**
      * remove a middleware

package/dist/common/webGenerator.js

@@ -57,6 +57,7 @@ class WebControllerGenerator {
         };
     }
     async loadMidwayController(globalPrefix, routerHandler) {
+        var _a, _b;
         const collector = new index_1.WebRouterCollector('', {
             globalPrefix,
         });
@@ -76,6 +77,7 @@ class WebControllerGenerator {
                 ...routerInfo.routerOptions,
             });
             // add router middleware
+            routerInfo.middleware = (_a = routerInfo.middleware) !== null && _a !== void 0 ? _a : [];
             if (routerInfo.middleware.length) {
                 const routerMiddlewareFn = await middlewareService.compose(routerInfo.middleware, this.app);
                 newRouter.use(routerMiddlewareFn);
@@ -85,6 +87,7 @@ class WebControllerGenerator {
             for (const routeInfo of routes) {
                 // get middleware
                 const methodMiddlewares = [];
+                routeInfo.middleware = (_b = routeInfo.middleware) !== null && _b !== void 0 ? _b : [];
                 if (routeInfo.middleware.length) {
                     const routeMiddlewareFn = await middlewareService.compose(routeInfo.middleware, this.app);
                     methodMiddlewares.push(routeMiddlewareFn);

package/dist/common/webRouterCollector.js

@@ -319,7 +319,7 @@ class WebRouterCollector {
                 item.requestMethod === routerInfo.requestMethod);
         });
         if (matched && matched.length) {
-            throw new Error(`Duplicate router "${routerInfo.requestMethod} ${routerInfo.url}" at "${matched[0].handlerName}" and "${routerInfo.handlerName}"`);
+            throw new error_1.MidwayDuplicateRouteError(`${routerInfo.requestMethod} ${routerInfo.url}`, `${matched[0].handlerName}`, `${routerInfo.handlerName}`);
         }
         prefixList.push(routerInfo);
     }

package/dist/context/managedResolverFactory.js

@@ -56,14 +56,14 @@ class ManagedResolverFactory {
     resolveManaged(managed, originPropertyName) {
         const resolver = this.resolvers[managed.type];
         if (!resolver || resolver.type !== managed.type) {
-            throw new Error(`${managed.type} resolver is not exists!`);
+            throw new error_1.MidwayResolverMissingError(managed.type);
         }
         return resolver.resolve(managed, originPropertyName);
     }
     async resolveManagedAsync(managed, originPropertyName) {
         const resolver = this.resolvers[managed.type];
         if (!resolver || resolver.type !== managed.type) {
-            throw new Error(`${managed.type} resolver is not exists!`);
+            throw new error_1.MidwayResolverMissingError(managed.type);
         }
         return resolver.resolveAsync(managed, originPropertyName);
     }
@@ -187,7 +187,7 @@ class ManagedResolverFactory {
         inst = await definition.creator.doConstructAsync(Clzz, constructorArgs, this.context);
         if (!inst) {
             this.removeCreateStatus(definition, false);
-            throw new Error(`${definition.id} construct return undefined`);
+            throw new error_1.MidwayCommonError(`${definition.id} construct return undefined`);
         }
         // binding ctx object
         if (definition.isRequestScope() &&

package/dist/definitions/objectCreator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectCreator = void 0;
 const decorator_1 = require("@midwayjs/decorator");
+const error_1 = require("../error");
 class ObjectCreator {
     constructor(definition) {
         this.definition = definition;
@@ -87,12 +88,12 @@ class ObjectCreator {
         if (this.definition.initMethod && inst[this.definition.initMethod]) {
             if ((0, decorator_1.isGeneratorFunction)(inst[this.definition.initMethod]) ||
                 (0, decorator_1.isAsyncFunction)(inst[this.definition.initMethod])) {
-                throw new Error(`${this.definition.id} not valid by context.get, Use context.getAsync instead!`);
+                throw new error_1.MidwayUseWrongMethodError('context.get', 'context.getAsync', this.definition.id);
             }
             else {
                 const rt = inst[this.definition.initMethod].call(inst);
                 if ((0, decorator_1.isPromise)(rt)) {
-                    throw new Error(`${this.definition.id} not valid by context.get, Use context.getAsync instead!`);
+                    throw new error_1.MidwayUseWrongMethodError('context.get', 'context.getAsync', this.definition.id);
                 }
             }
         }

package/dist/error/base.d.ts

@@ -2,12 +2,31 @@ interface ErrorOption {
     cause?: Error;
     status?: number;
 }
+interface Convertable {
+    [key: string]: string | number;
+}
+declare type ConvertString<T extends Convertable, Group extends string> = {
+    [P in keyof T]: P extends string ? T[P] extends number ? `${Uppercase<Group>}_${T[P]}` : never : never;
+};
+/**
+ * Register error group and code, return the standard ErrorCode
+ * @param errorGroup
+ * @param errorCodeMapping
+ */
+export declare function registerErrorCode<T extends Convertable, G extends string>(errorGroup: G, errorCodeMapping: T): ConvertString<T, G>;
 export declare class MidwayError extends Error {
-    code: number;
-    status: number;
+    code: number | string;
     cause: Error;
     constructor(message: string, options?: ErrorOption);
-    constructor(message: string, code: number, options?: ErrorOption);
+    constructor(message: string, code: string, options?: ErrorOption);
+}
+export declare type ResOrMessage = string | {
+    message: string;
+};
+export declare class MidwayHttpError extends MidwayError {
+    status: number;
+    constructor(resOrMessage: ResOrMessage, status: number);
+    constructor(resOrMessage: ResOrMessage, status: number, code: string, options?: ErrorOption);
 }
 export {};
 //# sourceMappingURL=base.d.ts.map

package/dist/error/base.js

@@ -1,19 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayError = void 0;
-const code_1 = require("./code");
+exports.MidwayHttpError = exports.MidwayError = exports.registerErrorCode = void 0;
+const codeGroup = new Set();
+/**
+ * Register error group and code, return the standard ErrorCode
+ * @param errorGroup
+ * @param errorCodeMapping
+ */
+function registerErrorCode(errorGroup, errorCodeMapping) {
+    if (codeGroup.has(errorGroup)) {
+        throw new MidwayError(`Error group ${errorGroup} is duplicated, please check before adding.`);
+    }
+    else {
+        codeGroup.add(errorGroup);
+    }
+    const newCodeEnum = {};
+    // ERROR => GROUP_10000
+    for (const errKey in errorCodeMapping) {
+        newCodeEnum[errKey] =
+            errorGroup.toUpperCase() +
+                '_' +
+                String(errorCodeMapping[errKey]).toUpperCase();
+    }
+    return newCodeEnum;
+}
+exports.registerErrorCode = registerErrorCode;
 class MidwayError extends Error {
     constructor(message, code, options) {
         super(message);
-        if (typeof code !== 'number') {
+        if (!code || typeof code === 'object') {
             options = code;
-            code = code_1.FrameworkErrorEnum.UNKNOWN;
+            code = 'MIDWAY_10000';
         }
         this.name = this.constructor.name;
         this.code = code;
         this.cause = options === null || options === void 0 ? void 0 : options.cause;
-        this.status = options === null || options === void 0 ? void 0 : options.status;
     }
 }
 exports.MidwayError = MidwayError;
+class MidwayHttpError extends MidwayError {
+    constructor(resOrMessage, status, code, options) {
+        super(typeof resOrMessage === 'string' ? resOrMessage : resOrMessage.message, code !== null && code !== void 0 ? code : String(status), options);
+        this.status = status;
+    }
+}
+exports.MidwayHttpError = MidwayHttpError;
 //# sourceMappingURL=base.js.map

package/dist/error/framework.d.ts

@@ -1,5 +1,17 @@
 import { MidwayError } from './base';
 import { ObjectIdentifier } from '@midwayjs/decorator';
+export declare const FrameworkErrorEnum: {
+    readonly UNKNOWN: "MIDWAY_10000";
+    readonly COMMON: "MIDWAY_10001";
+    readonly PARAM_TYPE: "MIDWAY_10002";
+    readonly DEFINITION_NOT_FOUND: "MIDWAY_10003";
+    readonly FEATURE_NO_LONGER_SUPPORTED: "MIDWAY_10004";
+    readonly FEATURE_NOT_IMPLEMENTED: "MIDWAY_10004";
+    readonly MISSING_CONFIG: "MIDWAY_10006";
+    readonly MISSING_RESOLVER: "MIDWAY_10007";
+    readonly DUPLICATE_ROUTER: "MIDWAY_10008";
+    readonly USE_WRONG_METHOD: "MIDWAY_10009";
+};
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
 }
@@ -15,10 +27,19 @@ export declare class MidwayDefinitionNotFoundError extends MidwayError {
 export declare class MidwayFeatureNoLongerSupportedError extends MidwayError {
     constructor(message?: string);
 }
-export declare class MidwayValidationError extends MidwayError {
-    constructor(message: any, status: any, cause: any);
+export declare class MidwayFeatureNotImplementedError extends MidwayError {
+    constructor(message?: string);
 }
 export declare class MidwayConfigMissingError extends MidwayError {
     constructor(configKey: string);
 }
+export declare class MidwayResolverMissingError extends MidwayError {
+    constructor(type: string);
+}
+export declare class MidwayDuplicateRouteError extends MidwayError {
+    constructor(routerUrl: string, existPos: string, existPosOther: string);
+}
+export declare class MidwayUseWrongMethodError extends MidwayError {
+    constructor(wrongMethod: string, replacedMethod: string, describeKey?: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,23 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayConfigMissingError = exports.MidwayValidationError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
+exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
 const base_1 = require("./base");
-const code_1 = require("./code");
+exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
+    UNKNOWN: 10000,
+    COMMON: 10001,
+    PARAM_TYPE: 10002,
+    DEFINITION_NOT_FOUND: 10003,
+    FEATURE_NO_LONGER_SUPPORTED: 10004,
+    FEATURE_NOT_IMPLEMENTED: 10004,
+    MISSING_CONFIG: 10006,
+    MISSING_RESOLVER: 10007,
+    DUPLICATE_ROUTER: 10008,
+    USE_WRONG_METHOD: 10009,
+});
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
-        super(message, code_1.FrameworkErrorEnum.COMMON);
+        super(message, exports.FrameworkErrorEnum.COMMON);
     }
 }
 exports.MidwayCommonError = MidwayCommonError;
 class MidwayParameterError extends base_1.MidwayError {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Parameter type not match', code_1.FrameworkErrorEnum.PARAM_TYPE);
+        super(message !== null && message !== void 0 ? message : 'Parameter type not match', exports.FrameworkErrorEnum.PARAM_TYPE);
     }
 }
 exports.MidwayParameterError = MidwayParameterError;
 class MidwayDefinitionNotFoundError extends base_1.MidwayError {
     constructor(identifier) {
-        super(`${identifier} is not valid in current context`, code_1.FrameworkErrorEnum.DEFINITION_NOT_FOUND);
+        super(`${identifier} is not valid in current context`, exports.FrameworkErrorEnum.DEFINITION_NOT_FOUND);
         this[MidwayDefinitionNotFoundError.type] =
             MidwayDefinitionNotFoundError.type;
     }
@@ -36,23 +47,41 @@ exports.MidwayDefinitionNotFoundError = MidwayDefinitionNotFoundError;
 MidwayDefinitionNotFoundError.type = Symbol.for('#NotFoundError');
 class MidwayFeatureNoLongerSupportedError extends base_1.MidwayError {
     constructor(message) {
-        super('This feature no longer supported \n' + message, code_1.FrameworkErrorEnum.FEATURE_NO_LONGER_SUPPORTED);
+        super('This feature no longer supported \n' + message, exports.FrameworkErrorEnum.FEATURE_NO_LONGER_SUPPORTED);
     }
 }
 exports.MidwayFeatureNoLongerSupportedError = MidwayFeatureNoLongerSupportedError;
-class MidwayValidationError extends base_1.MidwayError {
-    constructor(message, status, cause) {
-        super(message, code_1.FrameworkErrorEnum.VALIDATE_FAIL, {
-            status,
-            cause,
-        });
+class MidwayFeatureNotImplementedError extends base_1.MidwayError {
+    constructor(message) {
+        super('This feature not implemented \n' + message, exports.FrameworkErrorEnum.FEATURE_NOT_IMPLEMENTED);
     }
 }
-exports.MidwayValidationError = MidwayValidationError;
+exports.MidwayFeatureNotImplementedError = MidwayFeatureNotImplementedError;
 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);
+        super(`Can't found config key "${configKey}" in your config, please set it first`, exports.FrameworkErrorEnum.MISSING_CONFIG);
     }
 }
 exports.MidwayConfigMissingError = MidwayConfigMissingError;
+class MidwayResolverMissingError extends base_1.MidwayError {
+    constructor(type) {
+        super(`${type} resolver is not exists!`, exports.FrameworkErrorEnum.MISSING_RESOLVER);
+    }
+}
+exports.MidwayResolverMissingError = MidwayResolverMissingError;
+class MidwayDuplicateRouteError extends base_1.MidwayError {
+    constructor(routerUrl, existPos, existPosOther) {
+        super(`Duplicate router "${routerUrl}" at "${existPos}" and "${existPosOther}"`, exports.FrameworkErrorEnum.DUPLICATE_ROUTER);
+    }
+}
+exports.MidwayDuplicateRouteError = MidwayDuplicateRouteError;
+class MidwayUseWrongMethodError extends base_1.MidwayError {
+    constructor(wrongMethod, replacedMethod, describeKey) {
+        const text = describeKey
+            ? `${describeKey} not valid by ${wrongMethod}, Use ${replacedMethod} instead!`
+            : `You should not invoked by ${wrongMethod}, Use ${replacedMethod} instead!`;
+        super(text, exports.FrameworkErrorEnum.USE_WRONG_METHOD);
+    }
+}
+exports.MidwayUseWrongMethodError = MidwayUseWrongMethodError;
 //# sourceMappingURL=framework.js.map

package/dist/error/http.d.ts

@@ -1,42 +1,103 @@
-import { MidwayError } from './base';
-export declare class HttpError extends MidwayError {
-    status: number;
-    constructor(response: any, status: any);
-}
-export declare class BadRequestError extends HttpError {
-    constructor(response: any);
-}
-export declare class UnauthorizedError extends HttpError {
-}
-export declare class NotFoundError extends HttpError {
-}
-export declare class ForbiddenError extends HttpError {
-}
-export declare class NotAcceptableError extends HttpError {
-}
-export declare class RequestTimeoutError extends HttpError {
-}
-export declare class ConflictError extends HttpError {
-}
-export declare class GoneError extends HttpError {
-}
-export declare class PayloadTooLargeError extends HttpError {
-}
-export declare class UnsupportedMediaTypeError extends HttpError {
-}
-export declare class UnprocessableError extends HttpError {
-}
-export declare class InternalServerErrorError extends HttpError {
-}
-declare class NotImplementedError extends HttpError {
-}
-export declare class BadGatewayError extends HttpError {
-}
-export declare class ServiceUnavailableError extends HttpError {
-}
-export declare class GatewayTimeoutError extends HttpError {
-}
-export declare const http: {
+import { MidwayHttpError, ResOrMessage } from './base';
+export declare enum HttpStatus {
+    CONTINUE = 100,
+    SWITCHING_PROTOCOLS = 101,
+    PROCESSING = 102,
+    EARLYHINTS = 103,
+    OK = 200,
+    CREATED = 201,
+    ACCEPTED = 202,
+    NON_AUTHORITATIVE_INFORMATION = 203,
+    NO_CONTENT = 204,
+    RESET_CONTENT = 205,
+    PARTIAL_CONTENT = 206,
+    AMBIGUOUS = 300,
+    MOVED_PERMANENTLY = 301,
+    FOUND = 302,
+    SEE_OTHER = 303,
+    NOT_MODIFIED = 304,
+    TEMPORARY_REDIRECT = 307,
+    PERMANENT_REDIRECT = 308,
+    BAD_REQUEST = 400,
+    UNAUTHORIZED = 401,
+    PAYMENT_REQUIRED = 402,
+    FORBIDDEN = 403,
+    NOT_FOUND = 404,
+    METHOD_NOT_ALLOWED = 405,
+    NOT_ACCEPTABLE = 406,
+    PROXY_AUTHENTICATION_REQUIRED = 407,
+    REQUEST_TIMEOUT = 408,
+    CONFLICT = 409,
+    GONE = 410,
+    LENGTH_REQUIRED = 411,
+    PRECONDITION_FAILED = 412,
+    PAYLOAD_TOO_LARGE = 413,
+    URI_TOO_LONG = 414,
+    UNSUPPORTED_MEDIA_TYPE = 415,
+    REQUESTED_RANGE_NOT_SATISFIABLE = 416,
+    EXPECTATION_FAILED = 417,
+    I_AM_A_TEAPOT = 418,
+    MISDIRECTED = 421,
+    UNPROCESSABLE_ENTITY = 422,
+    FAILED_DEPENDENCY = 424,
+    PRECONDITION_REQUIRED = 428,
+    TOO_MANY_REQUESTS = 429,
+    INTERNAL_SERVER_ERROR = 500,
+    NOT_IMPLEMENTED = 501,
+    BAD_GATEWAY = 502,
+    SERVICE_UNAVAILABLE = 503,
+    GATEWAY_TIMEOUT = 504,
+    HTTP_VERSION_NOT_SUPPORTED = 505
+}
+export declare class BadRequestError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class UnauthorizedError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class NotFoundError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class ForbiddenError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class NotAcceptableError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class RequestTimeoutError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class ConflictError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class GoneError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class PayloadTooLargeError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class UnsupportedMediaTypeError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class UnprocessableError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class InternalServerErrorError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+declare class NotImplementedError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class BadGatewayError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class ServiceUnavailableError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare class GatewayTimeoutError extends MidwayHttpError {
+    constructor(resOrMessage: ResOrMessage);
+}
+export declare const httpError: {
     BadRequestError: typeof BadRequestError;
     UnauthorizedError: typeof UnauthorizedError;
     NotFoundError: typeof NotFoundError;

package/dist/error/http.js

@@ -1,67 +1,154 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.http = exports.GatewayTimeoutError = exports.ServiceUnavailableError = exports.BadGatewayError = exports.InternalServerErrorError = exports.UnprocessableError = exports.UnsupportedMediaTypeError = exports.PayloadTooLargeError = exports.GoneError = exports.ConflictError = exports.RequestTimeoutError = exports.NotAcceptableError = exports.ForbiddenError = exports.NotFoundError = exports.UnauthorizedError = exports.BadRequestError = exports.HttpError = void 0;
-const code_1 = require("./code");
+exports.httpError = exports.GatewayTimeoutError = exports.ServiceUnavailableError = exports.BadGatewayError = exports.InternalServerErrorError = exports.UnprocessableError = exports.UnsupportedMediaTypeError = exports.PayloadTooLargeError = exports.GoneError = exports.ConflictError = exports.RequestTimeoutError = exports.NotAcceptableError = exports.ForbiddenError = exports.NotFoundError = exports.UnauthorizedError = exports.BadRequestError = exports.HttpStatus = void 0;
 const base_1 = require("./base");
-class HttpError extends base_1.MidwayError {
-    constructor(response, status) {
-        super(typeof response === 'string' ? response : response.message);
-        this.status = status;
-        this.name = this.constructor.name;
-    }
-}
-exports.HttpError = HttpError;
-class BadRequestError extends HttpError {
-    constructor(response) {
-        super(response, code_1.HttpStatus.BAD_REQUEST);
+var HttpStatus;
+(function (HttpStatus) {
+    HttpStatus[HttpStatus["CONTINUE"] = 100] = "CONTINUE";
+    HttpStatus[HttpStatus["SWITCHING_PROTOCOLS"] = 101] = "SWITCHING_PROTOCOLS";
+    HttpStatus[HttpStatus["PROCESSING"] = 102] = "PROCESSING";
+    HttpStatus[HttpStatus["EARLYHINTS"] = 103] = "EARLYHINTS";
+    HttpStatus[HttpStatus["OK"] = 200] = "OK";
+    HttpStatus[HttpStatus["CREATED"] = 201] = "CREATED";
+    HttpStatus[HttpStatus["ACCEPTED"] = 202] = "ACCEPTED";
+    HttpStatus[HttpStatus["NON_AUTHORITATIVE_INFORMATION"] = 203] = "NON_AUTHORITATIVE_INFORMATION";
+    HttpStatus[HttpStatus["NO_CONTENT"] = 204] = "NO_CONTENT";
+    HttpStatus[HttpStatus["RESET_CONTENT"] = 205] = "RESET_CONTENT";
+    HttpStatus[HttpStatus["PARTIAL_CONTENT"] = 206] = "PARTIAL_CONTENT";
+    HttpStatus[HttpStatus["AMBIGUOUS"] = 300] = "AMBIGUOUS";
+    HttpStatus[HttpStatus["MOVED_PERMANENTLY"] = 301] = "MOVED_PERMANENTLY";
+    HttpStatus[HttpStatus["FOUND"] = 302] = "FOUND";
+    HttpStatus[HttpStatus["SEE_OTHER"] = 303] = "SEE_OTHER";
+    HttpStatus[HttpStatus["NOT_MODIFIED"] = 304] = "NOT_MODIFIED";
+    HttpStatus[HttpStatus["TEMPORARY_REDIRECT"] = 307] = "TEMPORARY_REDIRECT";
+    HttpStatus[HttpStatus["PERMANENT_REDIRECT"] = 308] = "PERMANENT_REDIRECT";
+    HttpStatus[HttpStatus["BAD_REQUEST"] = 400] = "BAD_REQUEST";
+    HttpStatus[HttpStatus["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
+    HttpStatus[HttpStatus["PAYMENT_REQUIRED"] = 402] = "PAYMENT_REQUIRED";
+    HttpStatus[HttpStatus["FORBIDDEN"] = 403] = "FORBIDDEN";
+    HttpStatus[HttpStatus["NOT_FOUND"] = 404] = "NOT_FOUND";
+    HttpStatus[HttpStatus["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
+    HttpStatus[HttpStatus["NOT_ACCEPTABLE"] = 406] = "NOT_ACCEPTABLE";
+    HttpStatus[HttpStatus["PROXY_AUTHENTICATION_REQUIRED"] = 407] = "PROXY_AUTHENTICATION_REQUIRED";
+    HttpStatus[HttpStatus["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
+    HttpStatus[HttpStatus["CONFLICT"] = 409] = "CONFLICT";
+    HttpStatus[HttpStatus["GONE"] = 410] = "GONE";
+    HttpStatus[HttpStatus["LENGTH_REQUIRED"] = 411] = "LENGTH_REQUIRED";
+    HttpStatus[HttpStatus["PRECONDITION_FAILED"] = 412] = "PRECONDITION_FAILED";
+    HttpStatus[HttpStatus["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
+    HttpStatus[HttpStatus["URI_TOO_LONG"] = 414] = "URI_TOO_LONG";
+    HttpStatus[HttpStatus["UNSUPPORTED_MEDIA_TYPE"] = 415] = "UNSUPPORTED_MEDIA_TYPE";
+    HttpStatus[HttpStatus["REQUESTED_RANGE_NOT_SATISFIABLE"] = 416] = "REQUESTED_RANGE_NOT_SATISFIABLE";
+    HttpStatus[HttpStatus["EXPECTATION_FAILED"] = 417] = "EXPECTATION_FAILED";
+    HttpStatus[HttpStatus["I_AM_A_TEAPOT"] = 418] = "I_AM_A_TEAPOT";
+    HttpStatus[HttpStatus["MISDIRECTED"] = 421] = "MISDIRECTED";
+    HttpStatus[HttpStatus["UNPROCESSABLE_ENTITY"] = 422] = "UNPROCESSABLE_ENTITY";
+    HttpStatus[HttpStatus["FAILED_DEPENDENCY"] = 424] = "FAILED_DEPENDENCY";
+    HttpStatus[HttpStatus["PRECONDITION_REQUIRED"] = 428] = "PRECONDITION_REQUIRED";
+    HttpStatus[HttpStatus["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
+    HttpStatus[HttpStatus["INTERNAL_SERVER_ERROR"] = 500] = "INTERNAL_SERVER_ERROR";
+    HttpStatus[HttpStatus["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
+    HttpStatus[HttpStatus["BAD_GATEWAY"] = 502] = "BAD_GATEWAY";
+    HttpStatus[HttpStatus["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
+    HttpStatus[HttpStatus["GATEWAY_TIMEOUT"] = 504] = "GATEWAY_TIMEOUT";
+    HttpStatus[HttpStatus["HTTP_VERSION_NOT_SUPPORTED"] = 505] = "HTTP_VERSION_NOT_SUPPORTED";
+})(HttpStatus = exports.HttpStatus || (exports.HttpStatus = {}));
+class BadRequestError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.BAD_REQUEST);
     }
 }
 exports.BadRequestError = BadRequestError;
-class UnauthorizedError extends HttpError {
+class UnauthorizedError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.UNAUTHORIZED);
+    }
 }
 exports.UnauthorizedError = UnauthorizedError;
-class NotFoundError extends HttpError {
+class NotFoundError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.NOT_FOUND);
+    }
 }
 exports.NotFoundError = NotFoundError;
-class ForbiddenError extends HttpError {
+class ForbiddenError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.FORBIDDEN);
+    }
 }
 exports.ForbiddenError = ForbiddenError;
-class NotAcceptableError extends HttpError {
+class NotAcceptableError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.NOT_ACCEPTABLE);
+    }
 }
 exports.NotAcceptableError = NotAcceptableError;
-class RequestTimeoutError extends HttpError {
+class RequestTimeoutError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.REQUEST_TIMEOUT);
+    }
 }
 exports.RequestTimeoutError = RequestTimeoutError;
-class ConflictError extends HttpError {
+class ConflictError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.CONFLICT);
+    }
 }
 exports.ConflictError = ConflictError;
-class GoneError extends HttpError {
+class GoneError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.GONE);
+    }
 }
 exports.GoneError = GoneError;
-class PayloadTooLargeError extends HttpError {
+class PayloadTooLargeError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.PAYLOAD_TOO_LARGE);
+    }
 }
 exports.PayloadTooLargeError = PayloadTooLargeError;
-class UnsupportedMediaTypeError extends HttpError {
+class UnsupportedMediaTypeError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+    }
 }
 exports.UnsupportedMediaTypeError = UnsupportedMediaTypeError;
-class UnprocessableError extends HttpError {
+class UnprocessableError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.UNPROCESSABLE_ENTITY);
+    }
 }
 exports.UnprocessableError = UnprocessableError;
-class InternalServerErrorError extends HttpError {
+class InternalServerErrorError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.INTERNAL_SERVER_ERROR);
+    }
 }
 exports.InternalServerErrorError = InternalServerErrorError;
-class NotImplementedError extends HttpError {
+class NotImplementedError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.NOT_IMPLEMENTED);
+    }
 }
-class BadGatewayError extends HttpError {
+class BadGatewayError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.BAD_GATEWAY);
+    }
 }
 exports.BadGatewayError = BadGatewayError;
-class ServiceUnavailableError extends HttpError {
+class ServiceUnavailableError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.SERVICE_UNAVAILABLE);
+    }
 }
 exports.ServiceUnavailableError = ServiceUnavailableError;
-class GatewayTimeoutError extends HttpError {
+class GatewayTimeoutError extends base_1.MidwayHttpError {
+    constructor(resOrMessage) {
+        super(resOrMessage, HttpStatus.GATEWAY_TIMEOUT);
+    }
 }
 exports.GatewayTimeoutError = GatewayTimeoutError;
-exports.http = {
+exports.httpError = {
     BadRequestError,
     UnauthorizedError,
     NotFoundError,

package/dist/service/middlewareService.d.ts

@@ -6,6 +6,5 @@ export declare class MidwayMiddlewareService<T, R, N = unknown> {
         (context: any, next?: any): Promise<any>;
         _name: string;
     }>;
-    getMiddlewareName(mw: any): any;
 }
 //# sourceMappingURL=middlewareService.d.ts.map

package/dist/service/middlewareService.js

@@ -113,10 +113,6 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         }
         return composeFn;
     }
-    getMiddlewareName(mw) {
-        var _a;
-        return mw.getName ? mw.getName() : (_a = mw.name) !== null && _a !== void 0 ? _a : mw._name;
-    }
 };
 MidwayMiddlewareService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/util/webRouterParam.js

@@ -22,9 +22,25 @@ const extractKoaLikeValue = (key, data, paramType) => {
             case decorator_1.RouteParamTypes.SESSION:
                 return (0, index_1.transformRequestObjectByType)(data ? ctx.session[data] : ctx.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
-                return ctx.getFileStream && ctx.getFileStream(data);
+                if (ctx.getFileStream) {
+                    return ctx.getFileStream(data);
+                }
+                else if (ctx.files) {
+                    return ctx.files[0];
+                }
+                else {
+                    return undefined;
+                }
             case decorator_1.RouteParamTypes.FILESSTREAM:
-                return ctx.multipart && ctx.multipart(data);
+                if (ctx.multipart) {
+                    return ctx.multipart(data);
+                }
+                else if (ctx.files) {
+                    return ctx.files;
+                }
+                else {
+                    return undefined;
+                }
             case decorator_1.RouteParamTypes.REQUEST_PATH:
                 return ctx['path'];
             case decorator_1.RouteParamTypes.REQUEST_IP:
@@ -36,6 +52,8 @@ const extractKoaLikeValue = (key, data, paramType) => {
                 else {
                     return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
                 }
+            case decorator_1.RouteParamTypes.FIELDS:
+                return data ? ctx.fields[data] : ctx.fields;
             default:
                 return null;
         }
@@ -61,9 +79,9 @@ const extractExpressLikeValue = (key, data, paramType) => {
             case decorator_1.RouteParamTypes.SESSION:
                 return (0, index_1.transformRequestObjectByType)(data ? req.session[data] : req.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
-                return req.getFileStream && req.getFileStream(data);
+                return req.files ? req.files[0] : undefined;
             case decorator_1.RouteParamTypes.FILESSTREAM:
-                return req.multipart && req.multipart(data);
+                return req.files;
             case decorator_1.RouteParamTypes.REQUEST_PATH:
                 return req['baseUrl'];
             case decorator_1.RouteParamTypes.REQUEST_IP:
@@ -75,6 +93,8 @@ const extractExpressLikeValue = (key, data, paramType) => {
                 else {
                     return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
                 }
+            case decorator_1.RouteParamTypes.FIELDS:
+                return data ? req.fields[data] : req.fields;
             default:
                 return null;
         }

package/package.json

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

package/dist/error/code.d.ts

@@ -1,60 +0,0 @@
-export declare enum HttpStatus {
-    CONTINUE = 100,
-    SWITCHING_PROTOCOLS = 101,
-    PROCESSING = 102,
-    EARLYHINTS = 103,
-    OK = 200,
-    CREATED = 201,
-    ACCEPTED = 202,
-    NON_AUTHORITATIVE_INFORMATION = 203,
-    NO_CONTENT = 204,
-    RESET_CONTENT = 205,
-    PARTIAL_CONTENT = 206,
-    AMBIGUOUS = 300,
-    MOVED_PERMANENTLY = 301,
-    FOUND = 302,
-    SEE_OTHER = 303,
-    NOT_MODIFIED = 304,
-    TEMPORARY_REDIRECT = 307,
-    PERMANENT_REDIRECT = 308,
-    BAD_REQUEST = 400,
-    UNAUTHORIZED = 401,
-    PAYMENT_REQUIRED = 402,
-    FORBIDDEN = 403,
-    NOT_FOUND = 404,
-    METHOD_NOT_ALLOWED = 405,
-    NOT_ACCEPTABLE = 406,
-    PROXY_AUTHENTICATION_REQUIRED = 407,
-    REQUEST_TIMEOUT = 408,
-    CONFLICT = 409,
-    GONE = 410,
-    LENGTH_REQUIRED = 411,
-    PRECONDITION_FAILED = 412,
-    PAYLOAD_TOO_LARGE = 413,
-    URI_TOO_LONG = 414,
-    UNSUPPORTED_MEDIA_TYPE = 415,
-    REQUESTED_RANGE_NOT_SATISFIABLE = 416,
-    EXPECTATION_FAILED = 417,
-    I_AM_A_TEAPOT = 418,
-    MISDIRECTED = 421,
-    UNPROCESSABLE_ENTITY = 422,
-    FAILED_DEPENDENCY = 424,
-    PRECONDITION_REQUIRED = 428,
-    TOO_MANY_REQUESTS = 429,
-    INTERNAL_SERVER_ERROR = 500,
-    NOT_IMPLEMENTED = 501,
-    BAD_GATEWAY = 502,
-    SERVICE_UNAVAILABLE = 503,
-    GATEWAY_TIMEOUT = 504,
-    HTTP_VERSION_NOT_SUPPORTED = 505
-}
-export declare enum FrameworkErrorEnum {
-    UNKNOWN = 10000,
-    COMMON = 10001,
-    PARAM_TYPE = 10002,
-    DEFINITION_NOT_FOUND = 10003,
-    FEATURE_NO_LONGER_SUPPORTED = 10004,
-    VALIDATE_FAIL = 10005,
-    MISSING_CONFIG = 10006
-}
-//# sourceMappingURL=code.d.ts.map

package/dist/error/code.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FrameworkErrorEnum = exports.HttpStatus = void 0;
-var HttpStatus;
-(function (HttpStatus) {
-    HttpStatus[HttpStatus["CONTINUE"] = 100] = "CONTINUE";
-    HttpStatus[HttpStatus["SWITCHING_PROTOCOLS"] = 101] = "SWITCHING_PROTOCOLS";
-    HttpStatus[HttpStatus["PROCESSING"] = 102] = "PROCESSING";
-    HttpStatus[HttpStatus["EARLYHINTS"] = 103] = "EARLYHINTS";
-    HttpStatus[HttpStatus["OK"] = 200] = "OK";
-    HttpStatus[HttpStatus["CREATED"] = 201] = "CREATED";
-    HttpStatus[HttpStatus["ACCEPTED"] = 202] = "ACCEPTED";
-    HttpStatus[HttpStatus["NON_AUTHORITATIVE_INFORMATION"] = 203] = "NON_AUTHORITATIVE_INFORMATION";
-    HttpStatus[HttpStatus["NO_CONTENT"] = 204] = "NO_CONTENT";
-    HttpStatus[HttpStatus["RESET_CONTENT"] = 205] = "RESET_CONTENT";
-    HttpStatus[HttpStatus["PARTIAL_CONTENT"] = 206] = "PARTIAL_CONTENT";
-    HttpStatus[HttpStatus["AMBIGUOUS"] = 300] = "AMBIGUOUS";
-    HttpStatus[HttpStatus["MOVED_PERMANENTLY"] = 301] = "MOVED_PERMANENTLY";
-    HttpStatus[HttpStatus["FOUND"] = 302] = "FOUND";
-    HttpStatus[HttpStatus["SEE_OTHER"] = 303] = "SEE_OTHER";
-    HttpStatus[HttpStatus["NOT_MODIFIED"] = 304] = "NOT_MODIFIED";
-    HttpStatus[HttpStatus["TEMPORARY_REDIRECT"] = 307] = "TEMPORARY_REDIRECT";
-    HttpStatus[HttpStatus["PERMANENT_REDIRECT"] = 308] = "PERMANENT_REDIRECT";
-    HttpStatus[HttpStatus["BAD_REQUEST"] = 400] = "BAD_REQUEST";
-    HttpStatus[HttpStatus["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
-    HttpStatus[HttpStatus["PAYMENT_REQUIRED"] = 402] = "PAYMENT_REQUIRED";
-    HttpStatus[HttpStatus["FORBIDDEN"] = 403] = "FORBIDDEN";
-    HttpStatus[HttpStatus["NOT_FOUND"] = 404] = "NOT_FOUND";
-    HttpStatus[HttpStatus["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
-    HttpStatus[HttpStatus["NOT_ACCEPTABLE"] = 406] = "NOT_ACCEPTABLE";
-    HttpStatus[HttpStatus["PROXY_AUTHENTICATION_REQUIRED"] = 407] = "PROXY_AUTHENTICATION_REQUIRED";
-    HttpStatus[HttpStatus["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
-    HttpStatus[HttpStatus["CONFLICT"] = 409] = "CONFLICT";
-    HttpStatus[HttpStatus["GONE"] = 410] = "GONE";
-    HttpStatus[HttpStatus["LENGTH_REQUIRED"] = 411] = "LENGTH_REQUIRED";
-    HttpStatus[HttpStatus["PRECONDITION_FAILED"] = 412] = "PRECONDITION_FAILED";
-    HttpStatus[HttpStatus["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
-    HttpStatus[HttpStatus["URI_TOO_LONG"] = 414] = "URI_TOO_LONG";
-    HttpStatus[HttpStatus["UNSUPPORTED_MEDIA_TYPE"] = 415] = "UNSUPPORTED_MEDIA_TYPE";
-    HttpStatus[HttpStatus["REQUESTED_RANGE_NOT_SATISFIABLE"] = 416] = "REQUESTED_RANGE_NOT_SATISFIABLE";
-    HttpStatus[HttpStatus["EXPECTATION_FAILED"] = 417] = "EXPECTATION_FAILED";
-    HttpStatus[HttpStatus["I_AM_A_TEAPOT"] = 418] = "I_AM_A_TEAPOT";
-    HttpStatus[HttpStatus["MISDIRECTED"] = 421] = "MISDIRECTED";
-    HttpStatus[HttpStatus["UNPROCESSABLE_ENTITY"] = 422] = "UNPROCESSABLE_ENTITY";
-    HttpStatus[HttpStatus["FAILED_DEPENDENCY"] = 424] = "FAILED_DEPENDENCY";
-    HttpStatus[HttpStatus["PRECONDITION_REQUIRED"] = 428] = "PRECONDITION_REQUIRED";
-    HttpStatus[HttpStatus["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
-    HttpStatus[HttpStatus["INTERNAL_SERVER_ERROR"] = 500] = "INTERNAL_SERVER_ERROR";
-    HttpStatus[HttpStatus["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
-    HttpStatus[HttpStatus["BAD_GATEWAY"] = 502] = "BAD_GATEWAY";
-    HttpStatus[HttpStatus["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
-    HttpStatus[HttpStatus["GATEWAY_TIMEOUT"] = 504] = "GATEWAY_TIMEOUT";
-    HttpStatus[HttpStatus["HTTP_VERSION_NOT_SUPPORTED"] = 505] = "HTTP_VERSION_NOT_SUPPORTED";
-})(HttpStatus = exports.HttpStatus || (exports.HttpStatus = {}));
-var FrameworkErrorEnum;
-(function (FrameworkErrorEnum) {
-    FrameworkErrorEnum[FrameworkErrorEnum["UNKNOWN"] = 10000] = "UNKNOWN";
-    FrameworkErrorEnum[FrameworkErrorEnum["COMMON"] = 10001] = "COMMON";
-    FrameworkErrorEnum[FrameworkErrorEnum["PARAM_TYPE"] = 10002] = "PARAM_TYPE";
-    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