@midwayjs/core 3.0.0-beta.1 → 3.0.0-beta.10

package/dist/util/webRouterParam.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExpressLikeValue = exports.extractKoaLikeValue = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const extractKoaLikeValue = (key, data) => {
+const index_1 = require("./index");
+const extractKoaLikeValue = (key, data, paramType) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
@@ -11,17 +12,15 @@ const extractKoaLikeValue = (key, data) => {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
             case decorator_1.RouteParamTypes.BODY:
-                return data && ctx.request.body
-                    ? ctx.request.body[data]
-                    : ctx.request.body;
+                return (0, index_1.transformRequestObjectByType)(data && ctx.request.body ? ctx.request.body[data] : ctx.request.body, paramType);
             case decorator_1.RouteParamTypes.PARAM:
-                return data ? ctx.params[data] : ctx.params;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.params[data] : ctx.params, paramType);
             case decorator_1.RouteParamTypes.QUERY:
-                return data ? ctx.query[data] : ctx.query;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
             case decorator_1.RouteParamTypes.HEADERS:
-                return data ? ctx.get(data) : ctx.headers;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.get(data) : ctx.headers, paramType);
             case decorator_1.RouteParamTypes.SESSION:
-                return data ? ctx.session[data] : ctx.session;
+                return (0, index_1.transformRequestObjectByType)(data ? ctx.session[data] : ctx.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
                 return ctx.getFileStream && ctx.getFileStream(data);
             case decorator_1.RouteParamTypes.FILESSTREAM:
@@ -32,10 +31,10 @@ const extractKoaLikeValue = (key, data) => {
                 return ctx['ip'];
             case decorator_1.RouteParamTypes.QUERIES:
                 if (ctx.queries) {
-                    return data ? ctx.queries[data] : ctx.queries;
+                    return (0, index_1.transformRequestObjectByType)(data ? ctx.queries[data] : ctx.queries, paramType);
                 }
                 else {
-                    return data ? ctx.query[data] : ctx.query;
+                    return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
                 }
             default:
                 return null;
@@ -43,7 +42,7 @@ const extractKoaLikeValue = (key, data) => {
     };
 };
 exports.extractKoaLikeValue = extractKoaLikeValue;
-const extractExpressLikeValue = (key, data) => {
+const extractExpressLikeValue = (key, data, paramType) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
@@ -52,15 +51,15 @@ const extractExpressLikeValue = (key, data) => {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
             case decorator_1.RouteParamTypes.BODY:
-                return data && req.body ? req.body[data] : req.body;
+                return (0, index_1.transformRequestObjectByType)(data && req.body ? req.body[data] : req.body, paramType);
             case decorator_1.RouteParamTypes.PARAM:
-                return data ? req.params[data] : req.params;
+                return (0, index_1.transformRequestObjectByType)(data ? req.params[data] : req.params, paramType);
             case decorator_1.RouteParamTypes.QUERY:
-                return data ? req.query[data] : req.query;
+                return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
             case decorator_1.RouteParamTypes.HEADERS:
-                return data ? req.get(data) : req.headers;
+                return (0, index_1.transformRequestObjectByType)(data ? req.get(data) : req.headers, paramType);
             case decorator_1.RouteParamTypes.SESSION:
-                return data ? req.session[data] : req.session;
+                return (0, index_1.transformRequestObjectByType)(data ? req.session[data] : req.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
                 return req.getFileStream && req.getFileStream(data);
             case decorator_1.RouteParamTypes.FILESSTREAM:
@@ -71,10 +70,10 @@ const extractExpressLikeValue = (key, data) => {
                 return req['ip'];
             case decorator_1.RouteParamTypes.QUERIES:
                 if (req.queries) {
-                    return data ? req.queries[data] : req.queries;
+                    return (0, index_1.transformRequestObjectByType)(data ? req.queries[data] : req.queries, paramType);
                 }
                 else {
-                    return data ? req.query[data] : req.query;
+                    return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
                 }
             default:
                 return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.10",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.1",
+    "@midwayjs/decorator": "^3.0.0-beta.10",
+    "koa": "^2.13.4",
     "midway-test-component": "*",
     "mm": "3",
     "sinon": "^7.2.2"
@@ -31,11 +32,10 @@
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.1",
-    "class-transformer": "^0.3.1",
+    "@midwayjs/logger": "^3.0.0-beta.10",
+    "class-transformer": "^0.5.1",
     "extend2": "^1.0.0",
-    "picomatch": "^2.2.2",
-    "reflect-metadata": "^0.1.13"
+    "picomatch": "^2.3.0"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "72e4d20c678e65a5440c4e9a6d3b70046daa497c"
+  "gitHead": "153870f2e2dd6b17673ec7591e49224a6bd51b36"
 }

package/dist/util/exceptionFilterManager.d.ts

@@ -1,13 +0,0 @@
-import { CommonExceptionFilterUnion, IMidwayContainer, IMidwayContext } from '../interface';
-export declare class ExceptionFilterManager<T extends IMidwayContext = IMidwayContext, R = any, N = any> {
-    private filterList;
-    private exceptionMap;
-    private defaultFilter;
-    useFilter(Filter: CommonExceptionFilterUnion<T, R, N>): void;
-    init(applicationContext: IMidwayContainer): Promise<void>;
-    run(err: Error, ctx: T, res?: R, next?: N): Promise<{
-        result: any;
-        error: any;
-    }>;
-}
-//# sourceMappingURL=exceptionFilterManager.d.ts.map

package/dist/util/exceptionFilterManager.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExceptionFilterManager = void 0;
-const decorator_1 = require("@midwayjs/decorator");
-class ExceptionFilterManager {
-    constructor() {
-        this.filterList = [];
-        this.exceptionMap = new WeakMap();
-        this.defaultFilter = undefined;
-    }
-    useFilter(Filter) {
-        if (Array.isArray(Filter)) {
-            this.filterList.push(...Filter);
-        }
-        else {
-            this.filterList.push(Filter);
-        }
-    }
-    async init(applicationContext) {
-        for (const FilterClass of this.filterList) {
-            const filter = await applicationContext.getAsync(FilterClass);
-            const exceptionMetadata = (0, decorator_1.getClassMetadata)(decorator_1.CATCH_KEY, FilterClass);
-            if (exceptionMetadata && exceptionMetadata.catchTargets) {
-                for (const Exception of exceptionMetadata.catchTargets) {
-                    this.exceptionMap.set(Exception, filter);
-                }
-            }
-            else {
-                // default filter
-                this.defaultFilter = filter;
-            }
-        }
-    }
-    async run(err, ctx, res, next) {
-        let result, error;
-        if (this.exceptionMap.has(err.constructor)) {
-            const filter = this.exceptionMap.get(err.constructor);
-            result = await filter.catch(err, ctx, res, next);
-        }
-        else if (this.defaultFilter) {
-            result = await this.defaultFilter.catch(err, ctx, res, next);
-        }
-        else {
-            error = err;
-        }
-        return {
-            result,
-            error,
-        };
-    }
-}
-exports.ExceptionFilterManager = ExceptionFilterManager;
-//# sourceMappingURL=exceptionFilterManager.js.map

package/dist/util/middlewareManager.d.ts

@@ -1,11 +0,0 @@
-import { CommonMiddleware, CommonMiddlewareUnion, IMidwayContext } from '../interface';
-export declare class ContextMiddlewareManager<T extends IMidwayContext = IMidwayContext, R = any, N = any> extends Array<CommonMiddleware<T, R, N>> {
-    insertFirst(middleware: CommonMiddlewareUnion<T, R, N>): void;
-    insertBefore(middleware: CommonMiddlewareUnion<T, R, N>, idxOrBeforeMiddleware: number): any;
-    insertBefore(middleware: CommonMiddlewareUnion<T, R, N>, idxOrBeforeMiddleware: CommonMiddlewareUnion<T, R, N>): any;
-    insertAfter(middleware: CommonMiddlewareUnion<T, R, N>, idxOrAfterMiddleware: number): any;
-    insertAfter(middleware: CommonMiddlewareUnion<T, R, N>, idxOrAfterMiddleware: CommonMiddlewareUnion<T, R, N>): any;
-    insertLast(middleware: CommonMiddlewareUnion<T, R, N>): void;
-    private findItemIndex;
-}
-//# sourceMappingURL=middlewareManager.d.ts.map

package/dist/util/middlewareManager.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContextMiddlewareManager = void 0;
-class ContextMiddlewareManager extends Array {
-    insertFirst(middleware) {
-        if (Array.isArray(middleware)) {
-            this.unshift(...middleware);
-        }
-        else {
-            this.unshift(middleware);
-        }
-    }
-    insertBefore(middleware, idxOrBeforeMiddleware) {
-        if (typeof idxOrBeforeMiddleware !== 'number') {
-            idxOrBeforeMiddleware = this.findItemIndex(idxOrBeforeMiddleware);
-        }
-        if (Array.isArray(middleware)) {
-            this.splice(idxOrBeforeMiddleware, 0, ...middleware);
-        }
-        else {
-            this.splice(idxOrBeforeMiddleware, 0, middleware);
-        }
-    }
-    insertAfter(middleware, idxOrAfterMiddleware) {
-        if (typeof idxOrAfterMiddleware !== 'number') {
-            idxOrAfterMiddleware = this.findItemIndex(idxOrAfterMiddleware);
-        }
-        if (Array.isArray(middleware)) {
-            this.splice(idxOrAfterMiddleware + 1, 0, ...middleware);
-        }
-        else {
-            this.splice(idxOrAfterMiddleware + 1, 0, middleware);
-        }
-    }
-    insertLast(middleware) {
-        if (Array.isArray(middleware)) {
-            this.push(...middleware);
-        }
-        else {
-            this.push(middleware);
-        }
-    }
-    findItemIndex(middleware) {
-        return this.findIndex(item => item === middleware);
-    }
-}
-exports.ContextMiddlewareManager = ContextMiddlewareManager;
-//# sourceMappingURL=middlewareManager.js.map

package/dist/util/webGenerator.d.ts

@@ -1,30 +0,0 @@
-/**
- * wrap controller string to middleware function
- * @param controllerMapping like FooController.index
- * @param routeArgsInfo
- * @param routerResponseData
- */
-import { MidwayFrameworkType, RouterParamValue } from '@midwayjs/decorator';
-import { IMidwayContainer } from '../';
-import { ILogger } from '@midwayjs/logger';
-export declare abstract class WebControllerGenerator<Router extends {
-    use: (...args: any[]) => void;
-}> {
-    readonly applicationContext: IMidwayContainer;
-    readonly frameworkType: MidwayFrameworkType;
-    readonly logger?: ILogger;
-    private controllerIds;
-    protected constructor(applicationContext: IMidwayContainer, frameworkType: MidwayFrameworkType, logger?: ILogger);
-    /**
-     * wrap controller string to middleware function
-     * @param controllerMapping like FooController.index
-     * @param routeArgsInfo
-     * @param routerResponseData
-     */
-    generateKoaController(controllerMapping: string, routeArgsInfo?: RouterParamValue[], routerResponseData?: any[]): (ctx: any, next: any) => Promise<void>;
-    loadMidwayController(routerHandler?: (newRouter: Router) => void): Promise<void>;
-    abstract createRouter(routerOptions: any): Router;
-    abstract generateController(controllerMapping: string, routeArgsInfo?: RouterParamValue[], routerResponseData?: any[]): any;
-    protected handlerWebMiddleware(middlewares: any[], handlerCallback: (middlewareImpl: any) => void): Promise<void>;
-}
-//# sourceMappingURL=webGenerator.d.ts.map