@eggjs/supertest 9.0.0-beta.19 → 9.0.0-beta.21
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/dist/agent.d.ts +21 -26
- package/dist/agent.js +85 -72
- package/dist/error/AssertError.d.ts +4 -7
- package/dist/error/AssertError.js +12 -15
- package/dist/index.d.ts +8 -11
- package/dist/index.js +25 -19
- package/dist/request.d.ts +19 -23
- package/dist/request.js +55 -50
- package/dist/test.d.ts +93 -97
- package/dist/test.js +311 -233
- package/dist/types.d.ts +9 -13
- package/dist/types.js +2 -0
- package/package.json +2 -2
package/dist/test.js
CHANGED
|
@@ -1,237 +1,315 @@
|
|
|
1
|
+
import { inspect } from 'node:util';
|
|
2
|
+
import { STATUS_CODES } from 'node:http';
|
|
3
|
+
import { Server as HttpsServer } from 'node:tls';
|
|
4
|
+
import { deepStrictEqual } from 'node:assert';
|
|
5
|
+
import { Request } from 'superagent';
|
|
1
6
|
import { AssertError } from "./error/AssertError.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
}
|
|
7
|
+
export class Test extends Request {
|
|
8
|
+
app;
|
|
9
|
+
_server;
|
|
10
|
+
_asserts = [];
|
|
11
|
+
/**
|
|
12
|
+
* Initialize a new `Test` with the given `app`,
|
|
13
|
+
* request `method` and `path`.
|
|
14
|
+
*/
|
|
15
|
+
constructor(app, method, path) {
|
|
16
|
+
super(method.toUpperCase(), path);
|
|
17
|
+
this.redirects(0);
|
|
18
|
+
this.buffer();
|
|
19
|
+
this.app = app;
|
|
20
|
+
this.url = typeof app === 'string' ? app + path : this.serverAddress(app, path);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Returns a URL, extracted from a server.
|
|
24
|
+
*
|
|
25
|
+
* @return {String} URL address
|
|
26
|
+
* @private
|
|
27
|
+
*/
|
|
28
|
+
serverAddress(app, path) {
|
|
29
|
+
const addr = app.address();
|
|
30
|
+
if (!addr) {
|
|
31
|
+
this._server = app.listen(0);
|
|
32
|
+
}
|
|
33
|
+
const port = app.address().port;
|
|
34
|
+
const protocol = app instanceof HttpsServer || this._server instanceof HttpsServer ? 'https' : 'http';
|
|
35
|
+
return `${protocol}://127.0.0.1:${port}${path}`;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Expectations:
|
|
39
|
+
*
|
|
40
|
+
* ```js
|
|
41
|
+
* .expect(200)
|
|
42
|
+
* .expect(200, fn)
|
|
43
|
+
* .expect(200, body)
|
|
44
|
+
* .expect('Some body')
|
|
45
|
+
* .expect('Some body', fn)
|
|
46
|
+
* .expect(['json array body', { key: 'val' }])
|
|
47
|
+
* .expect('Content-Type', 'application/json')
|
|
48
|
+
* .expect('Content-Type', 'application/json', fn)
|
|
49
|
+
* .expect(fn)
|
|
50
|
+
* .expect([200, 404])
|
|
51
|
+
* ```
|
|
52
|
+
*
|
|
53
|
+
* @return {Test} The current Test instance for chaining.
|
|
54
|
+
*/
|
|
55
|
+
expect(a, b, c) {
|
|
56
|
+
// callback
|
|
57
|
+
if (typeof a === 'function') {
|
|
58
|
+
// .expect(fn)
|
|
59
|
+
this._asserts.push(wrapAssertFn(a));
|
|
60
|
+
return this;
|
|
61
|
+
}
|
|
62
|
+
if (typeof b === 'function') {
|
|
63
|
+
// .expect('Some body', fn)
|
|
64
|
+
this.end(b);
|
|
65
|
+
}
|
|
66
|
+
if (typeof c === 'function') {
|
|
67
|
+
// .expect('Content-Type', 'application/json', fn)
|
|
68
|
+
this.end(c);
|
|
69
|
+
}
|
|
70
|
+
// status
|
|
71
|
+
if (typeof a === 'number') {
|
|
72
|
+
this._asserts.push(wrapAssertFn(this._assertStatus.bind(this, a)));
|
|
73
|
+
// body
|
|
74
|
+
if (typeof b !== 'function' && arguments.length > 1) {
|
|
75
|
+
// .expect(200, 'body')
|
|
76
|
+
// .expect(200, null)
|
|
77
|
+
// .expect(200, 9999999)
|
|
78
|
+
this._asserts.push(wrapAssertFn(this._assertBody.bind(this, b)));
|
|
79
|
+
}
|
|
80
|
+
return this;
|
|
81
|
+
}
|
|
82
|
+
// multiple statuses
|
|
83
|
+
if (Array.isArray(a) && a.length > 0 && a.every(val => typeof val === 'number')) {
|
|
84
|
+
// .expect([200, 300])
|
|
85
|
+
this._asserts.push(wrapAssertFn(this._assertStatusArray.bind(this, a)));
|
|
86
|
+
return this;
|
|
87
|
+
}
|
|
88
|
+
// header field
|
|
89
|
+
if (typeof b === 'string' || typeof b === 'number' || b instanceof RegExp) {
|
|
90
|
+
// .expect('Content-Type', 'application/json')
|
|
91
|
+
// .expect('Content-Type', /json/)
|
|
92
|
+
this._asserts.push(wrapAssertFn(this._assertHeader.bind(this, { name: String(a), value: b })));
|
|
93
|
+
return this;
|
|
94
|
+
}
|
|
95
|
+
// body
|
|
96
|
+
// .expect('body')
|
|
97
|
+
// .expect(['json array body', { key: 'val' }])
|
|
98
|
+
// .expect(/foo/)
|
|
99
|
+
this._asserts.push(wrapAssertFn(this._assertBody.bind(this, a)));
|
|
100
|
+
return this;
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* UnExpectations:
|
|
104
|
+
*
|
|
105
|
+
* .unexpectHeader('Content-Type')
|
|
106
|
+
* .unexpectHeader('Content-Type', fn)
|
|
107
|
+
*/
|
|
108
|
+
unexpectHeader(name, fn) {
|
|
109
|
+
if (typeof fn === 'function') {
|
|
110
|
+
this.end(fn);
|
|
111
|
+
}
|
|
112
|
+
// header
|
|
113
|
+
if (typeof name === 'string') {
|
|
114
|
+
this._asserts.push(this._unexpectHeader.bind(this, name));
|
|
115
|
+
}
|
|
116
|
+
return this;
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Expectations:
|
|
120
|
+
*
|
|
121
|
+
* .expectHeader('Content-Type')
|
|
122
|
+
* .expectHeader('Content-Type', fn)
|
|
123
|
+
*/
|
|
124
|
+
expectHeader(name, fn) {
|
|
125
|
+
if (typeof fn === 'function') {
|
|
126
|
+
this.end(fn);
|
|
127
|
+
}
|
|
128
|
+
// header
|
|
129
|
+
if (typeof name === 'string') {
|
|
130
|
+
this._asserts.push(this._expectHeader.bind(this, name));
|
|
131
|
+
}
|
|
132
|
+
return this;
|
|
133
|
+
}
|
|
134
|
+
_unexpectHeader(name, res) {
|
|
135
|
+
const actual = res.headers[name.toLowerCase()];
|
|
136
|
+
if (actual) {
|
|
137
|
+
return new AssertError('unexpected "' + name + '" header field, got "' + actual + '"', name, actual);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
_expectHeader(name, res) {
|
|
141
|
+
const actual = res.headers[name.toLowerCase()];
|
|
142
|
+
if (!actual) {
|
|
143
|
+
return new AssertError('expected "' + name + '" header field', name, actual);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* Defer invoking superagent's `.end()` until
|
|
148
|
+
* the server is listening.
|
|
149
|
+
*/
|
|
150
|
+
end(fn) {
|
|
151
|
+
const server = this._server;
|
|
152
|
+
super.end((err, res) => {
|
|
153
|
+
const localAssert = () => {
|
|
154
|
+
this.assert(err, res, fn);
|
|
155
|
+
};
|
|
156
|
+
if (server && '_handle' in server && server._handle) {
|
|
157
|
+
return server.close(localAssert);
|
|
158
|
+
}
|
|
159
|
+
localAssert();
|
|
160
|
+
});
|
|
161
|
+
return this;
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Perform assertions and invoke `fn(err, res)`.
|
|
165
|
+
*/
|
|
166
|
+
assert(resError, res, fn) {
|
|
167
|
+
let errorObj;
|
|
168
|
+
// check for unexpected network errors or server not running/reachable errors
|
|
169
|
+
// when there is no response and superagent sends back a System Error
|
|
170
|
+
// do not check further for other asserts, if any, in such case
|
|
171
|
+
// https://nodejs.org/api/errors.html#errors_common_system_errors
|
|
172
|
+
const sysErrors = {
|
|
173
|
+
ECONNREFUSED: 'Connection refused',
|
|
174
|
+
ECONNRESET: 'Connection reset by peer',
|
|
175
|
+
EPIPE: 'Broken pipe',
|
|
176
|
+
ETIMEDOUT: 'Operation timed out',
|
|
177
|
+
};
|
|
178
|
+
if (!res && resError) {
|
|
179
|
+
if (resError instanceof Error && resError.syscall === 'connect' && resError.code && sysErrors[resError.code]) {
|
|
180
|
+
errorObj = new Error(resError.code + ': ' + sysErrors[resError.code]);
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
errorObj = resError;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
// asserts
|
|
187
|
+
for (let i = 0; i < this._asserts.length && !errorObj; i += 1) {
|
|
188
|
+
errorObj = this._assertFunction(this._asserts[i], res);
|
|
189
|
+
}
|
|
190
|
+
// set unexpected superagent error if no other error has occurred.
|
|
191
|
+
if (!errorObj && resError instanceof Error && (!res || resError.status !== res.status)) {
|
|
192
|
+
errorObj = resError;
|
|
193
|
+
}
|
|
194
|
+
if (!fn) {
|
|
195
|
+
console.warn('[@eggjs/supertest] no callback function provided, fn: %s', typeof fn);
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
fn.call(this, errorObj || null, res);
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Perform assertions on a response body and return an Error upon failure.
|
|
202
|
+
*/
|
|
203
|
+
_assertBody(body, res) {
|
|
204
|
+
const isRegexp = body instanceof RegExp;
|
|
205
|
+
// parsed
|
|
206
|
+
if (typeof body === 'object' && !isRegexp) {
|
|
207
|
+
try {
|
|
208
|
+
deepStrictEqual(body, res.body);
|
|
209
|
+
}
|
|
210
|
+
catch (err) {
|
|
211
|
+
const a = inspect(body);
|
|
212
|
+
const b = inspect(res.body);
|
|
213
|
+
return new AssertError('expected ' + a + ' response body, got ' + b, body, res.body, { cause: err });
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
else if (body !== res.text) {
|
|
217
|
+
// string
|
|
218
|
+
const a = inspect(body);
|
|
219
|
+
const b = inspect(res.text);
|
|
220
|
+
// regexp
|
|
221
|
+
if (isRegexp) {
|
|
222
|
+
if (!body.test(res.text)) {
|
|
223
|
+
return new AssertError('expected body ' + b + ' to match ' + body, body, res.body);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
return new AssertError('expected ' + a + ' response body, got ' + b, body, res.body);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* Perform assertions on a response header and return an Error upon failure.
|
|
233
|
+
*/
|
|
234
|
+
_assertHeader(header, res) {
|
|
235
|
+
const field = header.name;
|
|
236
|
+
const actual = res.header[field.toLowerCase()];
|
|
237
|
+
const fieldExpected = header.value;
|
|
238
|
+
if (typeof actual === 'undefined') {
|
|
239
|
+
return new AssertError('expected "' + field + '" header field', header, actual);
|
|
240
|
+
}
|
|
241
|
+
// This check handles header values that may be a String or single element Array
|
|
242
|
+
if ((Array.isArray(actual) && actual.toString() === fieldExpected) || fieldExpected === actual) {
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
if (fieldExpected instanceof RegExp) {
|
|
246
|
+
if (!fieldExpected.test(actual)) {
|
|
247
|
+
return new AssertError('expected "' + field + '" matching ' + fieldExpected + ', got "' + actual + '"', header, actual);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
return new AssertError('expected "' + field + '" of "' + fieldExpected + '", got "' + actual + '"', header, actual);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* Perform assertions on the response status and return an Error upon failure.
|
|
256
|
+
*/
|
|
257
|
+
_assertStatus(status, res) {
|
|
258
|
+
if (res.status !== status) {
|
|
259
|
+
const a = STATUS_CODES[status];
|
|
260
|
+
const b = STATUS_CODES[res.status];
|
|
261
|
+
return new AssertError('expected ' + status + ' "' + a + '", got ' + res.status + ' "' + b + '"', status, res.status);
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* Perform assertions on the response status and return an Error upon failure.
|
|
266
|
+
*/
|
|
267
|
+
_assertStatusArray(statusArray, res) {
|
|
268
|
+
if (!statusArray.includes(res.status)) {
|
|
269
|
+
const b = STATUS_CODES[res.status];
|
|
270
|
+
const expectedList = statusArray.join(', ');
|
|
271
|
+
return new AssertError('expected one of "' + expectedList + '", got ' + res.status + ' "' + b + '"', statusArray, res.status);
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
/**
|
|
275
|
+
* Performs an assertion by calling a function and return an Error upon failure.
|
|
276
|
+
*/
|
|
277
|
+
_assertFunction(fn, res) {
|
|
278
|
+
let err;
|
|
279
|
+
try {
|
|
280
|
+
err = fn(res);
|
|
281
|
+
}
|
|
282
|
+
catch (e) {
|
|
283
|
+
err = e;
|
|
284
|
+
}
|
|
285
|
+
if (err instanceof Error) {
|
|
286
|
+
return err;
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
}
|
|
211
290
|
/**
|
|
212
|
-
* Wraps an assert function into another.
|
|
213
|
-
* The wrapper function edit the stack trace of any assertion error, prepending a more useful stack to it.
|
|
214
|
-
*
|
|
215
|
-
* @param {Function} assertFn
|
|
216
|
-
* @return {Function} wrapped assert function
|
|
217
|
-
*/
|
|
291
|
+
* Wraps an assert function into another.
|
|
292
|
+
* The wrapper function edit the stack trace of any assertion error, prepending a more useful stack to it.
|
|
293
|
+
*
|
|
294
|
+
* @param {Function} assertFn
|
|
295
|
+
* @return {Function} wrapped assert function
|
|
296
|
+
*/
|
|
218
297
|
function wrapAssertFn(assertFn) {
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
298
|
+
const savedStack = new Error().stack.split('\n').slice(3);
|
|
299
|
+
return (res) => {
|
|
300
|
+
let badStack;
|
|
301
|
+
let err;
|
|
302
|
+
try {
|
|
303
|
+
err = assertFn(res);
|
|
304
|
+
}
|
|
305
|
+
catch (e) {
|
|
306
|
+
err = e;
|
|
307
|
+
}
|
|
308
|
+
if (err instanceof Error && err.stack) {
|
|
309
|
+
badStack = err.stack.replace(err.message, '').split('\n').slice(1);
|
|
310
|
+
err.stack = [err.toString()].concat(savedStack).concat('----').concat(badStack).join('\n');
|
|
311
|
+
}
|
|
312
|
+
return err;
|
|
313
|
+
};
|
|
234
314
|
}
|
|
235
|
-
|
|
236
|
-
//#endregion
|
|
237
|
-
export { Test };
|
|
315
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import { RequestListener } from
|
|
2
|
-
import { Http2ServerRequest, Http2ServerResponse } from
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
type
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
interface AgentOptions$1 extends AgentOptions {
|
|
11
|
-
http2?: boolean;
|
|
1
|
+
import type { RequestListener } from 'node:http';
|
|
2
|
+
import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
|
|
3
|
+
import type { Server } from 'node:net';
|
|
4
|
+
import type { AgentOptions as SAgentOptions } from 'superagent';
|
|
5
|
+
export type H2RequestListener = (request: Http2ServerRequest, response: Http2ServerResponse) => void;
|
|
6
|
+
export type H1RequestListener = RequestListener;
|
|
7
|
+
export type App = Server | H1RequestListener | H2RequestListener | string;
|
|
8
|
+
export interface AgentOptions extends SAgentOptions {
|
|
9
|
+
http2?: boolean;
|
|
12
10
|
}
|
|
13
|
-
//#endregion
|
|
14
|
-
export { AgentOptions$1 as AgentOptions, App };
|
package/dist/types.js
ADDED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/supertest",
|
|
3
3
|
"description": "SuperAgent driven library for testing HTTP servers",
|
|
4
|
-
"version": "9.0.0-beta.
|
|
4
|
+
"version": "9.0.0-beta.21",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"typescript": "^5.9.3"
|
|
52
52
|
},
|
|
53
53
|
"scripts": {
|
|
54
|
-
"build": "tsdown",
|
|
54
|
+
"build": "tsdown && rimraf dist && tsc -b --clean && tsc",
|
|
55
55
|
"test": "vitest run",
|
|
56
56
|
"typecheck": "tsc --noEmit",
|
|
57
57
|
"lint": "oxlint --type-aware"
|