@eggjs/koa 2.20.7 → 2.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Readme.md +8 -8
- package/dist/commonjs/application.d.ts +12 -12
- package/dist/commonjs/application.js +60 -22
- package/dist/commonjs/context.d.ts +9 -11
- package/dist/commonjs/context.js +31 -15
- package/dist/commonjs/index.d.ts +1 -1
- package/dist/commonjs/index.js +1 -2
- package/dist/commonjs/request.d.ts +3 -2
- package/dist/commonjs/request.js +35 -64
- package/dist/commonjs/response.d.ts +3 -2
- package/dist/commonjs/response.js +26 -19
- package/dist/commonjs/types.d.ts +3 -2
- package/dist/esm/application.d.ts +12 -12
- package/dist/esm/application.js +25 -20
- package/dist/esm/context.d.ts +9 -11
- package/dist/esm/context.js +31 -15
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.js +1 -2
- package/dist/esm/request.d.ts +3 -2
- package/dist/esm/request.js +35 -64
- package/dist/esm/response.d.ts +3 -2
- package/dist/esm/response.js +26 -19
- package/dist/esm/types.d.ts +3 -2
- package/dist/package.json +1 -1
- package/package.json +18 -10
- package/src/application.ts +48 -30
- package/src/context.ts +85 -34
- package/src/index.ts +1 -1
- package/src/request.ts +73 -54
- package/src/response.ts +53 -27
- package/src/types.ts +4 -2
package/Readme.md
CHANGED
|
@@ -19,7 +19,7 @@ Koa is not bundled with any middleware.
|
|
|
19
19
|
|
|
20
20
|
## Installation
|
|
21
21
|
|
|
22
|
-
@eggjs/koa requires
|
|
22
|
+
@eggjs/koa requires **node v18.19.0** or higher for Node.js LTS support.
|
|
23
23
|
|
|
24
24
|
```bash
|
|
25
25
|
npm install @eggjs/koa
|
|
@@ -33,7 +33,7 @@ import { Application } from '@eggjs/koa';
|
|
|
33
33
|
const app = new Application();
|
|
34
34
|
|
|
35
35
|
// response
|
|
36
|
-
app.use(
|
|
36
|
+
app.use(ctx => {
|
|
37
37
|
ctx.body = 'Hello Koa';
|
|
38
38
|
});
|
|
39
39
|
|
|
@@ -55,7 +55,7 @@ Koa is a middleware framework that can take two different kinds of functions as
|
|
|
55
55
|
|
|
56
56
|
Here is an example of logger middleware with each of the different functions:
|
|
57
57
|
|
|
58
|
-
###
|
|
58
|
+
### **_async_** functions
|
|
59
59
|
|
|
60
60
|
```ts
|
|
61
61
|
app.use(async (ctx, next) => {
|
|
@@ -84,7 +84,7 @@ app.use((ctx, next) => {
|
|
|
84
84
|
## Context, Request and Response
|
|
85
85
|
|
|
86
86
|
Each middleware receives a Koa `Context` object that encapsulates an incoming
|
|
87
|
-
http message and the corresponding response to that message.
|
|
87
|
+
http message and the corresponding response to that message. `ctx` is often used
|
|
88
88
|
as the parameter name for the context object.
|
|
89
89
|
|
|
90
90
|
```ts
|
|
@@ -112,11 +112,11 @@ app.use(async (ctx, next) => {
|
|
|
112
112
|
Koa provides a `Response` object as the `response` property of the `Context`.
|
|
113
113
|
Koa's `Response` object provides helpful methods for working with
|
|
114
114
|
http responses which delegate to a [ServerResponse](https://nodejs.org/api/http.html#http_class_http_serverresponse)
|
|
115
|
-
.
|
|
115
|
+
.
|
|
116
116
|
|
|
117
117
|
Koa's pattern of delegating to Node's request and response objects rather than extending them
|
|
118
118
|
provides a cleaner interface and reduces conflicts between different middleware and with Node
|
|
119
|
-
itself as well as providing better support for stream handling.
|
|
119
|
+
itself as well as providing better support for stream handling. The `IncomingMessage` can still be
|
|
120
120
|
directly accessed as the `req` property on the `Context` and `ServerResponse` can be directly
|
|
121
121
|
accessed as the `res` property on the `Context`.
|
|
122
122
|
|
|
@@ -130,8 +130,8 @@ app.use(async (ctx, next) => {
|
|
|
130
130
|
});
|
|
131
131
|
```
|
|
132
132
|
|
|
133
|
-
The `Context` object also provides shortcuts for methods on its `request` and `response`.
|
|
134
|
-
examples,
|
|
133
|
+
The `Context` object also provides shortcuts for methods on its `request` and `response`. In the prior
|
|
134
|
+
examples, `ctx.type` can be used instead of `ctx.response.type` and `ctx.accepts` can be used
|
|
135
135
|
instead of `ctx.request.accepts`.
|
|
136
136
|
|
|
137
137
|
For more information on `Request`, `Response` and `Context`, see the [Request API Reference](docs/api/request.md),
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import Emitter from 'node:events';
|
|
2
1
|
import util from 'node:util';
|
|
2
|
+
import Emitter from 'node:events';
|
|
3
3
|
import http from 'node:http';
|
|
4
4
|
import type { AsyncLocalStorage } from 'node:async_hooks';
|
|
5
5
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
@@ -10,7 +10,7 @@ import type { CustomError, AnyProto } from './types.js';
|
|
|
10
10
|
export type ProtoImplClass<T = object> = new (...args: any[]) => T;
|
|
11
11
|
export type Next = () => Promise<void>;
|
|
12
12
|
type _MiddlewareFunc<T> = (ctx: T, next: Next) => Promise<void> | void;
|
|
13
|
-
export type MiddlewareFunc<T = Context> = _MiddlewareFunc<T> & {
|
|
13
|
+
export type MiddlewareFunc<T extends Context = Context> = _MiddlewareFunc<T> & {
|
|
14
14
|
_name?: string;
|
|
15
15
|
};
|
|
16
16
|
/**
|
|
@@ -41,15 +41,15 @@ export declare class Application extends Emitter {
|
|
|
41
41
|
response: AnyProto;
|
|
42
42
|
/**
|
|
43
43
|
* Initialize a new `Application`.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
44
|
+
*
|
|
45
|
+
* @param {object} [options] Application options
|
|
46
|
+
* @param {string} [options.env] Environment, default is `development`
|
|
47
|
+
* @param {string[]} [options.keys] Signed cookie keys
|
|
48
|
+
* @param {boolean} [options.proxy] Trust proxy headers
|
|
49
|
+
* @param {number} [options.subdomainOffset] Subdomain offset
|
|
50
|
+
* @param {string} [options.proxyIpHeader] Proxy IP header, defaults to X-Forwarded-For
|
|
51
|
+
* @param {number} [options.maxIpsCount] Max IPs read from proxy IP header, default to 0 (means infinity)
|
|
52
|
+
*/
|
|
53
53
|
constructor(options?: {
|
|
54
54
|
proxy?: boolean;
|
|
55
55
|
subdomainOffset?: number;
|
|
@@ -95,7 +95,7 @@ export declare class Application extends Emitter {
|
|
|
95
95
|
/**
|
|
96
96
|
* Use the given middleware `fn`.
|
|
97
97
|
*/
|
|
98
|
-
use(fn: MiddlewareFunc): this;
|
|
98
|
+
use<T extends Context = Context>(fn: MiddlewareFunc<T>): this;
|
|
99
99
|
/**
|
|
100
100
|
* Return a request handler callback
|
|
101
101
|
* for node's native http server.
|
|
@@ -1,12 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
5
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
39
|
exports.Application = void 0;
|
|
7
|
-
const node_util_1 = require("node:util");
|
|
40
|
+
const node_util_1 = __importStar(require("node:util"));
|
|
8
41
|
const node_events_1 = __importDefault(require("node:events"));
|
|
9
|
-
const node_util_2 = __importDefault(require("node:util"));
|
|
10
42
|
const node_stream_1 = __importDefault(require("node:stream"));
|
|
11
43
|
const node_http_1 = __importDefault(require("node:http"));
|
|
12
44
|
const gals_1 = require("gals");
|
|
@@ -46,15 +78,15 @@ class Application extends node_events_1.default {
|
|
|
46
78
|
response;
|
|
47
79
|
/**
|
|
48
80
|
* Initialize a new `Application`.
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
81
|
+
*
|
|
82
|
+
* @param {object} [options] Application options
|
|
83
|
+
* @param {string} [options.env] Environment, default is `development`
|
|
84
|
+
* @param {string[]} [options.keys] Signed cookie keys
|
|
85
|
+
* @param {boolean} [options.proxy] Trust proxy headers
|
|
86
|
+
* @param {number} [options.subdomainOffset] Subdomain offset
|
|
87
|
+
* @param {string} [options.proxyIpHeader] Proxy IP header, defaults to X-Forwarded-For
|
|
88
|
+
* @param {number} [options.maxIpsCount] Max IPs read from proxy IP header, default to 0 (means infinity)
|
|
89
|
+
*/
|
|
58
90
|
constructor(options) {
|
|
59
91
|
super();
|
|
60
92
|
options = options || {};
|
|
@@ -69,14 +101,17 @@ class Application extends node_events_1.default {
|
|
|
69
101
|
this.middleware = [];
|
|
70
102
|
this.ctxStorage = (0, gals_1.getAsyncLocalStorage)();
|
|
71
103
|
this.silent = false;
|
|
72
|
-
this.ContextClass =
|
|
73
|
-
|
|
104
|
+
this.ContextClass =
|
|
105
|
+
class ApplicationContext extends context_js_1.Context {
|
|
106
|
+
};
|
|
74
107
|
this.context = this.ContextClass.prototype;
|
|
75
|
-
this.RequestClass =
|
|
76
|
-
|
|
108
|
+
this.RequestClass =
|
|
109
|
+
class ApplicationRequest extends request_js_1.Request {
|
|
110
|
+
};
|
|
77
111
|
this.request = this.RequestClass.prototype;
|
|
78
|
-
this.ResponseClass =
|
|
79
|
-
|
|
112
|
+
this.ResponseClass =
|
|
113
|
+
class ApplicationResponse extends response_js_1.Response {
|
|
114
|
+
};
|
|
80
115
|
this.response = this.ResponseClass.prototype;
|
|
81
116
|
}
|
|
82
117
|
get keys() {
|
|
@@ -102,6 +137,7 @@ class Application extends node_events_1.default {
|
|
|
102
137
|
*
|
|
103
138
|
* http.createServer(app.callback()).listen(...)
|
|
104
139
|
*/
|
|
140
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
105
141
|
listen(...args) {
|
|
106
142
|
debug('listen with args: %o', args);
|
|
107
143
|
const server = node_http_1.default.createServer(this.callback());
|
|
@@ -124,7 +160,7 @@ class Application extends node_events_1.default {
|
|
|
124
160
|
inspect() {
|
|
125
161
|
return this.toJSON();
|
|
126
162
|
}
|
|
127
|
-
[
|
|
163
|
+
[node_util_1.default.inspect.custom]() {
|
|
128
164
|
return this.inspect();
|
|
129
165
|
}
|
|
130
166
|
/**
|
|
@@ -175,6 +211,7 @@ class Application extends node_events_1.default {
|
|
|
175
211
|
const res = ctx.res;
|
|
176
212
|
res.statusCode = 404;
|
|
177
213
|
const onerror = (err) => ctx.onerror(err);
|
|
214
|
+
// oxlint-disable-next-line promise/prefer-await-to-callbacks
|
|
178
215
|
(0, on_finished_1.default)(res, (err) => {
|
|
179
216
|
if (err) {
|
|
180
217
|
onerror(err);
|
|
@@ -208,13 +245,14 @@ class Application extends node_events_1.default {
|
|
|
208
245
|
const isNativeError = err instanceof Error ||
|
|
209
246
|
Object.prototype.toString.call(err) === '[object Error]';
|
|
210
247
|
if (!isNativeError)
|
|
211
|
-
throw new TypeError(
|
|
248
|
+
throw new TypeError(node_util_1.default.format('non-error thrown: %j', err));
|
|
212
249
|
if (err.status === 404 || err.expose)
|
|
213
250
|
return;
|
|
214
251
|
if (this.silent)
|
|
215
252
|
return;
|
|
216
253
|
const msg = err.stack || err.toString();
|
|
217
|
-
console
|
|
254
|
+
// oxlint-disable-next-line no-console
|
|
255
|
+
console.error(`\n${msg.replaceAll(/^/gm, ' ')}\n`);
|
|
218
256
|
}
|
|
219
257
|
/**
|
|
220
258
|
* Response helper.
|
|
@@ -243,7 +281,7 @@ class Application extends node_events_1.default {
|
|
|
243
281
|
return res.end();
|
|
244
282
|
}
|
|
245
283
|
// status body
|
|
246
|
-
if (body
|
|
284
|
+
if (body === null || body === undefined) {
|
|
247
285
|
if (ctx.response._explicitNullBody) {
|
|
248
286
|
ctx.response.remove('Content-Type');
|
|
249
287
|
ctx.response.remove('Transfer-Encoding');
|
|
@@ -277,4 +315,4 @@ class Application extends node_events_1.default {
|
|
|
277
315
|
}
|
|
278
316
|
}
|
|
279
317
|
exports.Application = Application;
|
|
280
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
318
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import util from 'node:util';
|
|
2
2
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
3
|
-
import { ParsedUrlQuery } from 'node:querystring';
|
|
3
|
+
import type { ParsedUrlQuery } from 'node:querystring';
|
|
4
4
|
import Cookies from 'cookies';
|
|
5
|
-
import {
|
|
5
|
+
import type { Accepts } from 'accepts';
|
|
6
6
|
import type { Application } from './application.js';
|
|
7
7
|
import type { Request } from './request.js';
|
|
8
8
|
import type { Response } from './response.js';
|
|
@@ -99,15 +99,12 @@ export declare class Context {
|
|
|
99
99
|
/**
|
|
100
100
|
* Similar to .throw(), adds assertion.
|
|
101
101
|
*
|
|
102
|
-
*
|
|
103
|
-
*
|
|
104
|
-
*
|
|
105
|
-
* @param {Mixed} value
|
|
106
|
-
* @param {Number} status
|
|
107
|
-
* @param {String} opts
|
|
102
|
+
* ```ts
|
|
103
|
+
* this.assert(this.user, 401, 'Please login!');
|
|
104
|
+
* ```
|
|
108
105
|
*/
|
|
109
|
-
assert(value:
|
|
110
|
-
assert(value:
|
|
106
|
+
assert(value: unknown, status?: number, errorProps?: Record<string, unknown>): void;
|
|
107
|
+
assert(value: unknown, status?: number, errorMessage?: string, errorProps?: Record<string, unknown>): void;
|
|
111
108
|
/**
|
|
112
109
|
* Throw an error with `status` (default 500) and
|
|
113
110
|
* `msg`. Note that these are user-level
|
|
@@ -164,7 +161,8 @@ export declare class Context {
|
|
|
164
161
|
acceptsCharsets(): string[];
|
|
165
162
|
acceptsCharsets(charsets: string[]): string | false;
|
|
166
163
|
acceptsCharsets(...charsets: string[]): string | false;
|
|
167
|
-
accepts(
|
|
164
|
+
accepts(args: string[]): string | string[] | false;
|
|
165
|
+
accepts(...args: string[]): string | string[] | false;
|
|
168
166
|
get<T = string | string[]>(field: string): T;
|
|
169
167
|
is(type?: string | string[], ...types: string[]): string | false | null;
|
|
170
168
|
get querystring(): string;
|
package/dist/commonjs/context.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.Context = void 0;
|
|
7
7
|
const node_util_1 = __importDefault(require("node:util"));
|
|
8
8
|
const http_errors_1 = __importDefault(require("http-errors"));
|
|
9
|
-
const http_assert_1 = __importDefault(require("http-assert"));
|
|
10
9
|
const statuses_1 = __importDefault(require("statuses"));
|
|
11
10
|
const cookies_1 = __importDefault(require("cookies"));
|
|
12
11
|
class Context {
|
|
@@ -17,6 +16,7 @@ class Context {
|
|
|
17
16
|
response;
|
|
18
17
|
originalUrl;
|
|
19
18
|
respond;
|
|
19
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
20
20
|
#state = {};
|
|
21
21
|
constructor(app, req, res) {
|
|
22
22
|
this.app = app;
|
|
@@ -26,7 +26,7 @@ class Context {
|
|
|
26
26
|
this.response = new app.ResponseClass(app, this, req, res);
|
|
27
27
|
this.request.response = this.response;
|
|
28
28
|
this.response.request = this.request;
|
|
29
|
-
this.originalUrl = req.url;
|
|
29
|
+
this.originalUrl = req.url ?? '/';
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
32
|
* util.inspect() implementation, which
|
|
@@ -60,13 +60,20 @@ class Context {
|
|
|
60
60
|
socket: '<original node socket>',
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
|
-
assert(value, status,
|
|
64
|
-
if (
|
|
65
|
-
return
|
|
63
|
+
assert(value, status, errorMessageOrProps, errorProps) {
|
|
64
|
+
if (value) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
status = status ?? 500;
|
|
68
|
+
if (typeof errorMessageOrProps === 'string') {
|
|
69
|
+
// assert(value, status, errorMessage, errorProps?)
|
|
70
|
+
throw (0, http_errors_1.default)(status, errorMessageOrProps, errorProps ?? {});
|
|
66
71
|
}
|
|
67
|
-
|
|
72
|
+
// assert(value, status, errorProps?)
|
|
73
|
+
throw (0, http_errors_1.default)(status, errorMessageOrProps ?? {});
|
|
68
74
|
}
|
|
69
75
|
throw(arg1, arg2, errorProps) {
|
|
76
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
70
77
|
const args = [];
|
|
71
78
|
if (typeof arg2 === 'number') {
|
|
72
79
|
// throw(error, status)
|
|
@@ -105,7 +112,8 @@ class Context {
|
|
|
105
112
|
}
|
|
106
113
|
let headerSent = false;
|
|
107
114
|
if (this.response.headerSent || !this.response.writable) {
|
|
108
|
-
headerSent =
|
|
115
|
+
headerSent = true;
|
|
116
|
+
err.headerSent = true;
|
|
109
117
|
}
|
|
110
118
|
// delegate
|
|
111
119
|
this.app.emit('error', err, this);
|
|
@@ -117,23 +125,29 @@ class Context {
|
|
|
117
125
|
}
|
|
118
126
|
const { res } = this;
|
|
119
127
|
// first unset all headers
|
|
120
|
-
|
|
128
|
+
for (const name of res.getHeaderNames()) {
|
|
129
|
+
res.removeHeader(name);
|
|
130
|
+
}
|
|
121
131
|
// then set those specified
|
|
122
|
-
if (err.headers)
|
|
132
|
+
if (err.headers) {
|
|
123
133
|
this.response.set(err.headers);
|
|
134
|
+
}
|
|
124
135
|
// force text/plain
|
|
125
136
|
this.response.type = 'text';
|
|
126
137
|
let statusCode = err.status || err.statusCode;
|
|
127
138
|
// ENOENT support
|
|
128
|
-
if (err.code === 'ENOENT')
|
|
139
|
+
if (err.code === 'ENOENT') {
|
|
129
140
|
statusCode = 404;
|
|
141
|
+
}
|
|
130
142
|
// default to 500
|
|
131
|
-
if (typeof statusCode !== 'number' || !statuses_1.default.message[statusCode])
|
|
143
|
+
if (typeof statusCode !== 'number' || !statuses_1.default.message[statusCode]) {
|
|
132
144
|
statusCode = 500;
|
|
145
|
+
}
|
|
133
146
|
// respond
|
|
134
147
|
const statusMessage = statuses_1.default.message[statusCode];
|
|
135
148
|
const msg = err.expose ? err.message : statusMessage;
|
|
136
|
-
|
|
149
|
+
err.status = statusCode;
|
|
150
|
+
this.response.status = statusCode;
|
|
137
151
|
this.response.length = Buffer.byteLength(msg);
|
|
138
152
|
res.end(msg);
|
|
139
153
|
}
|
|
@@ -162,8 +176,8 @@ class Context {
|
|
|
162
176
|
acceptsCharsets(charsets, ...others) {
|
|
163
177
|
return this.request.acceptsCharsets(charsets, ...others);
|
|
164
178
|
}
|
|
165
|
-
accepts(...
|
|
166
|
-
return this.request.accepts(...
|
|
179
|
+
accepts(args, ...others) {
|
|
180
|
+
return this.request.accepts(args, ...others);
|
|
167
181
|
}
|
|
168
182
|
get(field) {
|
|
169
183
|
return this.request.get(field);
|
|
@@ -300,9 +314,11 @@ class Context {
|
|
|
300
314
|
set message(msg) {
|
|
301
315
|
this.response.message = msg;
|
|
302
316
|
}
|
|
317
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
303
318
|
get body() {
|
|
304
319
|
return this.response.body;
|
|
305
320
|
}
|
|
321
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
306
322
|
set body(val) {
|
|
307
323
|
this.response.body = val;
|
|
308
324
|
}
|
|
@@ -338,4 +354,4 @@ class Context {
|
|
|
338
354
|
}
|
|
339
355
|
}
|
|
340
356
|
exports.Context = Context;
|
|
341
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}
|
|
357
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}
|
package/dist/commonjs/index.d.ts
CHANGED
package/dist/commonjs/index.js
CHANGED
|
@@ -20,5 +20,4 @@ __exportStar(require("./application.js"), exports);
|
|
|
20
20
|
__exportStar(require("./context.js"), exports);
|
|
21
21
|
__exportStar(require("./request.js"), exports);
|
|
22
22
|
__exportStar(require("./response.js"), exports);
|
|
23
|
-
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFEQUErQztBQUUvQyxrQkFBZSw0QkFBVyxDQUFDO0FBRTNCLG1EQUFpQztBQUNqQywrQ0FBNkI7QUFDN0IsK0NBQTZCO0FBQzdCLGdEQUE4QjtBQUM5Qiw2Q0FBMkIifQ==
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFEQUErQztBQUUvQyxrQkFBZSw0QkFBVyxDQUFDO0FBRTNCLG1EQUFpQztBQUNqQywrQ0FBNkI7QUFDN0IsK0NBQTZCO0FBQzdCLGdEQUE4QiJ9
|
|
@@ -65,7 +65,7 @@ export declare class Request {
|
|
|
65
65
|
/**
|
|
66
66
|
* Set pathname, retaining the query string when present.
|
|
67
67
|
*/
|
|
68
|
-
set path(
|
|
68
|
+
set path(pathname: string);
|
|
69
69
|
protected _parsedUrlQueryCache: Record<string, ParsedUrlQuery> | undefined;
|
|
70
70
|
/**
|
|
71
71
|
* Get parsed query string.
|
|
@@ -231,7 +231,8 @@ export declare class Request {
|
|
|
231
231
|
* this.accepts('html', 'json');
|
|
232
232
|
* // => "json"
|
|
233
233
|
*/
|
|
234
|
-
accepts(
|
|
234
|
+
accepts(args: string[]): string | string[] | false;
|
|
235
|
+
accepts(...args: string[]): string | string[] | false;
|
|
235
236
|
/**
|
|
236
237
|
* Return accepted encodings or best fit based on `encodings`.
|
|
237
238
|
*
|