@midwayjs/express 3.0.0-beta.7 → 3.0.0-beta.8

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.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+* typeorm EntityView missing connectionName ([#1403](https://github.com/midwayjs/midway/issues/1403)) ([30b2b37](https://github.com/midwayjs/midway/commit/30b2b3711db485cb85d825d56aeabf53b1374cae))
+
+
+
+
+
 # [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
 
 **Note:** Version bump only for package @midwayjs/express

package/README.md

@@ -5,7 +5,7 @@
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/framework.js

@@ -5,9 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayExpressFramework = void 0;
 const core_1 = require("@midwayjs/core");
@@ -20,6 +17,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         return this.configService.getConfiguration('express');
     }
     async applicationInitialize(options) {
+        this.expressMiddlewareService = await this.applicationContext.getAsync(middlewareService_1.MidwayExpressMiddlewareService, [this.applicationContext]);
         this.app = express();
         this.app.use((req, res, next) => {
             const ctx = req;
@@ -149,13 +147,14 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
             // add route
             const routes = routerTable.get(routerInfo.prefix);
             for (const routeInfo of routes) {
+                const routeMiddlewareList = [];
                 // router middleware
                 await this.handlerWebMiddleware(routeInfo.middleware, middlewareImpl => {
-                    newRouter.use(middlewareImpl);
+                    routeMiddlewareList.push(middlewareImpl);
                 });
                 this.logger.debug(`Load Router "${routeInfo.requestMethod.toUpperCase()} ${routeInfo.url}"`);
                 // apply controller from request context
-                newRouter[routeInfo.requestMethod].call(newRouter, routeInfo.url, this.generateController(routeInfo));
+                newRouter[routeInfo.requestMethod].call(newRouter, routeInfo.url, ...routeMiddlewareList, this.generateController(routeInfo));
             }
             this.app.use(routerInfo.prefix, newRouter);
         }
@@ -190,10 +189,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         return logger_1.MidwayExpressContextLogger;
     }
 };
-__decorate([
-    (0, decorator_1.Inject)(),
-    __metadata("design:type", middlewareService_1.MidwayExpressMiddlewareService)
-], MidwayExpressFramework.prototype, "expressMiddlewareService", void 0);
 MidwayExpressFramework = __decorate([
     (0, decorator_1.Framework)()
 ], MidwayExpressFramework);

package/dist/interface.d.ts

@@ -2,6 +2,10 @@
 import { CommonMiddlewareUnion, ContextMiddlewareManager, IConfigurationOptions, IMiddleware, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
 import { Application as ExpressApplication, NextFunction as ExpressNextFunction, Request, Response } from 'express';
 export declare type IMidwayExpressContext = IMidwayContext<Request>;
+/**
+ * @deprecated use IMidwayExpressContext
+ */
+export declare type IMidwayExpressRequest = IMidwayExpressContext;
 export declare type IMidwayExpressMiddleware = IMiddleware<IMidwayExpressContext, Response, ExpressNextFunction>;
 export interface IMidwayExpressApplication extends IMidwayApplication<IMidwayExpressContext, ExpressApplication> {
     /**

package/dist/middlewareService.d.ts

@@ -1,4 +1,4 @@
-import { IMidwayContainer, CommonMiddleware } from '@midwayjs/core';
+import { IMidwayContainer, CommonMiddleware, FunctionMiddleware } from '@midwayjs/core';
 import { IMidwayExpressContext } from './interface';
 import { NextFunction, Response } from 'express';
 export declare class MidwayExpressMiddlewareService {
@@ -9,5 +9,5 @@ export declare class MidwayExpressMiddlewareService {
         _name: string;
     }>;
 }
-export declare function pathMatching(options: any): (ctx?: any) => any;
+export declare function wrapMiddleware(mw: FunctionMiddleware<any, any, any>, options: any): (context: any, next: any, options?: any) => any;
 //# sourceMappingURL=middlewareService.d.ts.map

package/dist/middlewareService.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathMatching = exports.MidwayExpressMiddlewareService = void 0;
+exports.wrapMiddleware = exports.MidwayExpressMiddlewareService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
@@ -38,7 +38,7 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
                     else {
                         // wrap ignore and match
                         const mw = fn;
-                        const match = pathMatching({
+                        const match = (0, core_1.pathMatching)({
                             match: classMiddleware.match,
                             ignore: classMiddleware.ignore,
                         });
@@ -79,41 +79,21 @@ MidwayExpressMiddlewareService = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MidwayExpressMiddlewareService);
 exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService;
-function pathMatching(options) {
-    options = options || {};
-    if (options.match && options.ignore)
-        throw new core_1.MidwayCommonError('options.match and options.ignore can not both present');
+function wrapMiddleware(mw, options) {
+    // support options.enable
+    if (options.enable === false)
+        return null;
+    // support options.match and options.ignore
     if (!options.match && !options.ignore)
-        return () => true;
-    const matchFn = options.match
-        ? toPathMatch(options.match)
-        : toPathMatch(options.ignore);
-    return function pathMatch(ctx) {
-        const matched = matchFn(ctx);
-        return options.match ? matched : !matched;
+        return mw;
+    const match = (0, core_1.pathMatching)(options);
+    const fn = (req, res, next) => {
+        if (!match(req))
+            return next();
+        return mw(req, res, next);
     };
+    fn._name = mw._name + 'middlewareWrapper';
+    return fn;
 }
-exports.pathMatching = pathMatching;
-function toPathMatch(pattern) {
-    if (typeof pattern === 'string') {
-        const reg = (0, core_1.pathToRegexp)(pattern, [], { end: false });
-        if (reg.global)
-            reg.lastIndex = 0;
-        return ctx => reg.test(ctx.path);
-    }
-    if (pattern instanceof RegExp) {
-        return ctx => {
-            if (pattern.global)
-                pattern.lastIndex = 0;
-            return pattern.test(ctx.path);
-        };
-    }
-    if (typeof pattern === 'function')
-        return pattern;
-    if (Array.isArray(pattern)) {
-        const matchs = pattern.map(item => toPathMatch(item));
-        return ctx => matchs.some(match => match(ctx));
-    }
-    throw new core_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
-}
+exports.wrapMiddleware = wrapMiddleware;
 //# sourceMappingURL=middlewareService.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,14 +23,14 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.7",
-    "@midwayjs/mock": "^3.0.0-beta.7",
+    "@midwayjs/decorator": "^3.0.0-beta.8",
+    "@midwayjs/mock": "^3.0.0-beta.8",
     "@types/express": "^4.17.8",
     "fs-extra": "^8.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.7",
-    "@midwayjs/logger": "^3.0.0-beta.7",
+    "@midwayjs/core": "^3.0.0-beta.8",
+    "@midwayjs/logger": "^3.0.0-beta.8",
     "express": "^4.17.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -41,5 +41,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
+  "gitHead": "bfafbdf8798f48d4daac5dd88ad53c6b2f33c110"
 }