@midwayjs/koa 3.15.11 → 3.16.1

package/dist/framework.js

@@ -12,6 +12,8 @@ const cookies_1 = require("@midwayjs/cookies");
 const Router = require("@koa/router");
 const koa = require("koa");
 const onerror_1 = require("./onerror");
+const qs = require("qs");
+const querystring = require("querystring");
 const COOKIES = Symbol('context#cookies');
 class KoaControllerGenerator extends core_1.WebControllerGenerator {
     constructor(app, webRouterService) {
@@ -85,6 +87,45 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
                 };
             },
         });
+        const converter = this.configurationOptions.queryParseMode === 'strict'
+            ? function (value) {
+                return !Array.isArray(value) ? [value] : value;
+            }
+            : this.configurationOptions.queryParseMode === 'first'
+                ? function (value) {
+                    return Array.isArray(value) ? value[0] : value;
+                }
+                : undefined;
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const self = this;
+        // fix query with array params
+        Object.defineProperty(this.app.request, 'query', {
+            get() {
+                const str = this.querystring;
+                const c = (this._querycache = this._querycache || {});
+                // find cache
+                if (c[str])
+                    return c[str];
+                if (self.configurationOptions.queryParseMode) {
+                    // use qs module to parse query
+                    c[str] = qs.parse(str, self.configurationOptions.queryParseOptions || {});
+                }
+                else {
+                    // use querystring to parse query by default
+                    c[str] = querystring.parse(str);
+                }
+                if (converter) {
+                    for (const key in c[str]) {
+                        c[str][key] = converter(c[str][key]);
+                    }
+                }
+                return c[str];
+            },
+            set(value) {
+                this._querycache = this._querycache || {};
+                this._querycache[this.querystring] = value;
+            },
+        });
         const onerrorConfig = this.configService.getConfiguration('onerror');
         (0, onerror_1.setupOnError)(this.app, onerrorConfig, this.logger);
         // not found middleware

package/dist/interface.d.ts

@@ -3,6 +3,7 @@ import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midw
 import * as koa from 'koa';
 import { Context as KoaContext, DefaultState, Middleware, Next } from 'koa';
 import { RouterParamValue } from '@midwayjs/core';
+import * as qs from 'qs';
 export interface State extends DefaultState {
 }
 export type IMidwayKoaContext = IMidwayContext<KoaContext>;
@@ -77,8 +78,13 @@ export interface IMidwayKoaConfigurationOptions extends IConfigurationOptions {
      */
     serverTimeout?: number;
     /**
-     * https/https/http2 server options
+     * qs mode
      */
+    queryParseMode?: 'extended' | 'strict' | 'first';
+    /**
+     * qs options
+     */
+    queryParseOptions?: qs.IParseOptions;
     serverOptions?: Record<string, any>;
 }
 export type MiddlewareParamArray = Array<Middleware<DefaultState, IMidwayKoaContext>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/koa",
-  "version": "3.15.11",
+  "version": "3.16.1",
   "description": "Midway Web Framework for KOA",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,18 +24,20 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/mock": "^3.15.8",
+    "@midwayjs/mock": "^3.16.0",
     "@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.15.8",
-    "@midwayjs/session": "^3.15.8",
+    "@midwayjs/core": "^3.16.0",
+    "@midwayjs/session": "^3.16.0",
     "@types/koa": "2.15.0",
+    "@types/qs": "6.9.15",
     "koa": "2.15.3",
-    "koa-bodyparser": "4.4.1"
+    "koa-bodyparser": "4.4.1",
+    "qs": "6.12.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -45,5 +47,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "5bf318ca3f6d27e46db173fe4af3a859a40a6c88"
+  "gitHead": "14376294fb13a90c926f5fbd27b84150a47cf3f2"
 }