@midwayjs/koa 3.19.2 → 4.0.0-alpha.1

package/dist/config/config.default.js

@@ -6,11 +6,10 @@ exports.siteFile = exports.bodyParser = exports.onerror = exports.cookies = expo
  */
 exports.koa = {
     contextLoggerFormat: info => {
-        var _a, _b, _c;
         const ctx = info.ctx;
         // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
         const userId = ctx.userId || '-';
-        const traceId = (_c = (_a = ctx.traceId) !== null && _a !== void 0 ? _a : (_b = ctx.tracer) === null || _b === void 0 ? void 0 : _b.traceId) !== null && _c !== void 0 ? _c : '-';
+        const traceId = ctx.traceId ?? ctx.tracer?.traceId ?? '-';
         const use = Date.now() - ctx.startTime;
         const label = userId +
             '/' +

package/dist/configuration.js

@@ -27,6 +27,7 @@ let KoaConfiguration = class KoaConfiguration {
         this.koaFramework.useMiddleware([fav_middleware_1.SiteFileMiddleware, bodyparser_middleware_1.BodyParserMiddleware]);
     }
 };
+exports.KoaConfiguration = KoaConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
@@ -45,7 +46,7 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], KoaConfiguration.prototype, "init", null);
-KoaConfiguration = __decorate([
+exports.KoaConfiguration = KoaConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'koa',
         imports: [session],
@@ -56,5 +57,4 @@ KoaConfiguration = __decorate([
         ],
     })
 ], KoaConfiguration);
-exports.KoaConfiguration = KoaConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { BaseFramework, CommonFilterUnion, CommonMiddlewareUnion, IMidwayBootstrapOptions, MidwayFrameworkType, RouterInfo } from '@midwayjs/core';
+import { BaseFramework, CommonFilterUnion, CommonMiddlewareUnion, IMidwayBootstrapOptions, RouterInfo } from '@midwayjs/core';
 import { IMidwayKoaApplication, IMidwayKoaConfigurationOptions, IMidwayKoaContext } from './interface';
 import type { DefaultState, Middleware, Next } from 'koa';
 import { Server } from 'http';
@@ -21,7 +21,6 @@ export declare class MidwayKoaFramework extends BaseFramework<IMidwayKoaApplicat
     generateMiddleware(middlewareId: any): Promise<Middleware<DefaultState, IMidwayKoaContext, any>>;
     run(): Promise<void>;
     beforeStop(): Promise<void>;
-    getFrameworkType(): MidwayFrameworkType;
     getFrameworkName(): string;
     getServer(): Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
     getPort(): string;

package/dist/framework.js

@@ -160,9 +160,8 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
     }
     async loadMidwayController() {
         await this.generator.loadMidwayController(newRouter => {
-            var _a;
             const dispatchFn = newRouter.middleware();
-            dispatchFn._name = `midwayController(${((_a = newRouter === null || newRouter === void 0 ? void 0 : newRouter.opts) === null || _a === void 0 ? void 0 : _a.prefix) || '/'})`;
+            dispatchFn._name = `midwayController(${newRouter?.opts?.prefix || '/'})`;
             this.app.use(dispatchFn);
         });
     }
@@ -181,7 +180,6 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         return mwIns.resolve();
     }
     async run() {
-        var _a;
         // load controller
         await this.loadMidwayController();
         // restore use method
@@ -218,7 +216,7 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
             this.server.setTimeout(this.configurationOptions.serverTimeout);
         }
         // set port and listen server
-        const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : this.configurationOptions.port;
+        const customPort = process.env.MIDWAY_HTTP_PORT ?? this.configurationOptions.port;
         if (customPort) {
             new Promise(resolve => {
                 const args = [customPort];
@@ -240,11 +238,8 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
             });
         }
     }
-    getFrameworkType() {
-        return core_1.MidwayFrameworkType.WEB_KOA;
-    }
     getFrameworkName() {
-        return 'web:koa';
+        return 'koa';
     }
     getServer() {
         return this.server;
@@ -259,8 +254,8 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         this.filterManager.useFilter(Filter);
     }
 };
-MidwayKoaFramework = __decorate([
+exports.MidwayKoaFramework = MidwayKoaFramework;
+exports.MidwayKoaFramework = MidwayKoaFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayKoaFramework);
-exports.MidwayKoaFramework = MidwayKoaFramework;
 //# sourceMappingURL=framework.js.map

package/dist/interface.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
 import * as koa from 'koa';
 import { Context as KoaContext, DefaultState, Middleware, Next } from 'koa';

package/dist/middleware/bodyparser.middleware.js

@@ -23,12 +23,12 @@ let BodyParserMiddleware = class BodyParserMiddleware {
         return 'bodyParser';
     }
 };
+exports.BodyParserMiddleware = BodyParserMiddleware;
 __decorate([
     (0, core_1.Config)('bodyParser'),
     __metadata("design:type", Object)
 ], BodyParserMiddleware.prototype, "bodyparserConfig", void 0);
-BodyParserMiddleware = __decorate([
+exports.BodyParserMiddleware = BodyParserMiddleware = __decorate([
     (0, core_1.Middleware)()
 ], BodyParserMiddleware);
-exports.BodyParserMiddleware = BodyParserMiddleware;
 //# sourceMappingURL=bodyparser.middleware.js.map

package/dist/middleware/fav.middleware.js

@@ -51,12 +51,12 @@ let SiteFileMiddleware = class SiteFileMiddleware {
         return 'siteFile';
     }
 };
+exports.SiteFileMiddleware = SiteFileMiddleware;
 __decorate([
     (0, core_1.Config)('siteFile'),
     __metadata("design:type", Object)
 ], SiteFileMiddleware.prototype, "siteFileConfig", void 0);
-SiteFileMiddleware = __decorate([
+exports.SiteFileMiddleware = SiteFileMiddleware = __decorate([
     (0, core_1.Middleware)()
 ], SiteFileMiddleware);
-exports.SiteFileMiddleware = SiteFileMiddleware;
 //# sourceMappingURL=fav.middleware.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/koa",
-  "version": "3.19.2",
+  "version": "4.0.0-alpha.1",
   "description": "Midway Web Framework for KOA",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -24,15 +24,15 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/mock": "^3.19.2",
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-alpha.1",
     "@types/koa-router": "7.4.8",
     "fs-extra": "11.2.0"
   },
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@midwayjs/cookies": "^1.0.2",
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/session": "^3.19.2",
+    "@midwayjs/session": "^4.0.0-alpha.1",
     "@types/koa": "2.15.0",
     "@types/qs": "6.9.17",
     "koa": "2.15.3",
@@ -47,5 +47,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }