@midwayjs/express 3.0.0-beta.16 → 3.0.0-beta.17

package/dist/framework.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { BaseFramework, IMidwayBootstrapOptions, MiddlewareRespond, MidwayFrameworkType, RouterInfo } from '@midwayjs/core';
-import { IMidwayExpressApplication, IMidwayExpressConfigurationOptions, IMidwayExpressContext } from './interface';
+import { IMidwayExpressApplication, IMidwayExpressConfigurationOptions, Context } from './interface';
 import type { IRouter, IRouterHandler, Response, NextFunction } from 'express';
 import { Server } from 'net';
 import { MidwayExpressContextLogger } from './logger';
-export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpressApplication, IMidwayExpressContext, IMidwayExpressConfigurationOptions, Response, NextFunction> {
+export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpressApplication, Context, IMidwayExpressConfigurationOptions, Response, NextFunction> {
     app: IMidwayExpressApplication;
     private server;
     private expressMiddlewareService;
@@ -26,9 +26,10 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
     protected createRouter(routerOptions: {
         sensitive: any;
     }): IRouter;
-    applyMiddleware<Response, NextFunction>(): Promise<MiddlewareRespond<IMidwayExpressContext, Response, NextFunction>>;
+    applyMiddleware<Response, NextFunction>(): Promise<MiddlewareRespond<Context, Response, NextFunction>>;
     beforeStop(): Promise<void>;
     getServer(): Server;
+    getPort(): string;
     getFrameworkName(): string;
     getDefaultContextLoggerClass(): typeof MidwayExpressContextLogger;
 }

package/dist/framework.js

@@ -240,6 +240,9 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
     getServer() {
         return this.server;
     }
+    getPort() {
+        return process.env.MIDWAY_HTTP_PORT;
+    }
     getFrameworkName() {
         return 'midway:express';
     }

package/dist/interface.d.ts

@@ -1,23 +1,31 @@
 /// <reference types="node" />
 import { CommonMiddlewareUnion, ContextMiddlewareManager, IConfigurationOptions, IMiddleware, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
-import { Application as ExpressApplication, NextFunction as ExpressNextFunction, Request, Response } from 'express';
+import { Application as ExpressApplication, NextFunction as ExpressNextFunction, Request as ExpressRequest, Response as ExpressResponse } from 'express';
 import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
-export declare type IMidwayExpressContext = IMidwayContext<Request>;
+declare type Request = IMidwayContext<ExpressRequest>;
+export declare type Response = ExpressResponse;
+export declare type NextFunction = ExpressNextFunction;
+export interface Context extends Request {
+}
+/**
+ * @deprecated use Context
+ */
+export declare type IMidwayExpressRequest = Context;
 /**
- * @deprecated use IMidwayExpressContext
+ * @deprecated use Context
  */
-export declare type IMidwayExpressRequest = IMidwayExpressContext;
-export declare type IMidwayExpressMiddleware = IMiddleware<IMidwayExpressContext, Response, ExpressNextFunction>;
-export interface IMidwayExpressApplication extends IMidwayApplication<IMidwayExpressContext, ExpressApplication> {
+export declare type IMidwayExpressContext = Context;
+export declare type IMidwayExpressMiddleware = IMiddleware<Context, ExpressResponse, ExpressNextFunction>;
+export interface IMidwayExpressApplication extends IMidwayApplication<Context, ExpressApplication> {
     /**
      * add global middleware to app
      * @param Middleware
      */
-    useMiddleware<Response, NextFunction>(Middleware: CommonMiddlewareUnion<IMidwayExpressContext, Response, NextFunction>): void;
+    useMiddleware<Response, NextFunction>(Middleware: CommonMiddlewareUnion<Context, Response, NextFunction>): void;
     /**
      * get global middleware
      */
-    getMiddleware<Response, NextFunction>(): ContextMiddlewareManager<IMidwayExpressContext, Response, NextFunction>;
+    getMiddleware<Response, NextFunction>(): ContextMiddlewareManager<Context, Response, NextFunction>;
 }
 export interface IMidwayExpressConfigurationOptions extends IConfigurationOptions {
     /**
@@ -54,9 +62,6 @@ export interface IMidwayExpressConfigurationOptions extends IConfigurationOption
     globalPrefix?: string;
 }
 export declare type Application = IMidwayExpressApplication;
-export declare type NextFunction = ExpressNextFunction;
-export interface Context extends IMidwayExpressContext {
-}
 declare module '@midwayjs/core/dist/interface' {
     interface MidwayConfig {
         express?: IMidwayExpressConfigurationOptions;
@@ -77,4 +82,5 @@ declare module '@midwayjs/core/dist/interface' {
         };
     }
 }
+export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/logger.d.ts

@@ -1,6 +1,6 @@
 import { MidwayContextLogger } from '@midwayjs/logger';
-import { IMidwayExpressContext } from './interface';
-export declare class MidwayExpressContextLogger extends MidwayContextLogger<IMidwayExpressContext> {
+import { Context } from './interface';
+export declare class MidwayExpressContextLogger extends MidwayContextLogger<Context> {
     formatContextLabel(): string;
 }
 //# sourceMappingURL=logger.d.ts.map

package/dist/middlewareService.d.ts

@@ -1,12 +1,12 @@
 import { IMidwayContainer, CommonMiddleware, FunctionMiddleware } from '@midwayjs/core';
-import { IMidwayExpressContext, Application } from './interface';
+import { Context, Application } from './interface';
 import { NextFunction, Response } from 'express';
 export declare function wrapAsyncHandler(fn: any): any;
 export declare class MidwayExpressMiddlewareService {
     readonly applicationContext: IMidwayContainer;
     constructor(applicationContext: IMidwayContainer);
-    compose(middleware: Array<CommonMiddleware<IMidwayExpressContext, Response, NextFunction> | string>, app: Application, name?: string): Promise<{
-        (req: IMidwayExpressContext, res: Response, nextFunction: NextFunction): any;
+    compose(middleware: Array<CommonMiddleware<Context, Response, NextFunction> | string>, app: Application, name?: string): Promise<{
+        (req: Context, res: Response, nextFunction: NextFunction): any;
         _name: string;
     }>;
 }

package/dist/middlewareService.js

@@ -14,7 +14,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const util_1 = require("./util");
 function wrapAsyncHandler(fn) {
-    if (decorator_1.TYPES.isAsyncFunction(fn)) {
+    if (decorator_1.Types.isAsyncFunction(fn)) {
         return (req, res, next) => {
             return fn(req, res, next).catch(err => {
                 next(err);
@@ -36,14 +36,14 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
         }
         const newMiddlewareArr = [];
         for (let fn of middleware) {
-            if (decorator_1.TYPES.isClass(fn) || typeof fn === 'string') {
+            if (decorator_1.Types.isClass(fn) || typeof fn === 'string') {
                 if (typeof fn === 'string' &&
                     !this.applicationContext.hasDefinition(fn)) {
                     throw new core_1.MidwayCommonError('Middleware definition not found in midway container');
                 }
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {
-                    fn = classMiddleware.resolve(app);
+                    fn = await classMiddleware.resolve(app);
                     // wrap async middleware
                     fn = wrapAsyncHandler(fn);
                     if (!classMiddleware.match && !classMiddleware.ignore) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.0-beta.16",
+  "version": "3.0.0-beta.17",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -23,16 +23,16 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.16",
+    "@midwayjs/decorator": "^3.0.0-beta.17",
     "@midwayjs/logger": "2.14.0",
-    "@midwayjs/mock": "^3.0.0-beta.16",
+    "@midwayjs/mock": "^3.0.0-beta.17",
     "@types/body-parser": "1.19.2",
     "@types/express": "4.17.13",
     "fs-extra": "10.0.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.16",
-    "@midwayjs/express-session": "^3.0.0-beta.16",
+    "@midwayjs/core": "^3.0.0-beta.17",
+    "@midwayjs/express-session": "^3.0.0-beta.17",
     "body-parser": "1.19.1",
     "cookie-parser": "^1.4.6",
     "express": "4.17.2"
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "43a32745ac45164dfef1494cba979f9652a6692b"
+  "gitHead": "17a8b5bd3d0b0b21f24dd2f165b5df9097fc3ec4"
 }