@trpc/server 10.32.0 → 10.33.1
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/{TRPCError-2b10c8d2.mjs → TRPCError-6a1653a4.mjs} +28 -20
- package/dist/{TRPCError-7c3909ea.js → TRPCError-c3de85e9.js} +28 -21
- package/dist/{TRPCError-16b2e52d.js → TRPCError-d07099d1.js} +27 -20
- package/dist/adapters/aws-lambda/index.js +7 -7
- package/dist/adapters/aws-lambda/index.mjs +7 -7
- package/dist/adapters/express.js +5 -5
- package/dist/adapters/express.mjs +5 -5
- package/dist/adapters/fastify/fastifyRequestHandler.d.ts +2 -2
- package/dist/adapters/fastify/fastifyRequestHandler.d.ts.map +1 -1
- package/dist/adapters/fastify/index.js +4 -4
- package/dist/adapters/fastify/index.mjs +4 -4
- package/dist/adapters/fetch/fetchRequestHandler.d.ts +2 -2
- package/dist/adapters/fetch/fetchRequestHandler.d.ts.map +1 -1
- package/dist/adapters/fetch/index.js +4 -4
- package/dist/adapters/fetch/index.mjs +4 -4
- package/dist/adapters/fetch/types.d.ts +1 -1
- package/dist/adapters/fetch/types.d.ts.map +1 -1
- package/dist/adapters/next.js +5 -5
- package/dist/adapters/next.mjs +5 -5
- package/dist/adapters/node-http/content-type/form-data/fileUploadHandler.d.ts +3 -3
- package/dist/adapters/node-http/content-type/form-data/fileUploadHandler.d.ts.map +1 -1
- package/dist/adapters/node-http/content-type/form-data/index.js +18 -13
- package/dist/adapters/node-http/content-type/form-data/index.mjs +18 -13
- package/dist/adapters/node-http/content-type/form-data/memoryUploadHandler.d.ts +1 -1
- package/dist/adapters/node-http/content-type/form-data/memoryUploadHandler.d.ts.map +1 -1
- package/dist/adapters/node-http/content-type/form-data/streamSlice.d.ts.map +1 -1
- package/dist/adapters/node-http/content-type/form-data/uploadHandler.d.ts +2 -2
- package/dist/adapters/node-http/content-type/form-data/uploadHandler.d.ts.map +1 -1
- package/dist/adapters/node-http/content-type/json/index.js +2 -2
- package/dist/adapters/node-http/content-type/json/index.mjs +2 -2
- package/dist/adapters/node-http/index.js +5 -5
- package/dist/adapters/node-http/index.mjs +5 -5
- package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts.map +1 -1
- package/dist/adapters/node-http/types.d.ts +4 -6
- package/dist/adapters/node-http/types.d.ts.map +1 -1
- package/dist/adapters/standalone.js +5 -5
- package/dist/adapters/standalone.mjs +5 -5
- package/dist/adapters/ws.d.ts +2 -2
- package/dist/adapters/ws.d.ts.map +1 -1
- package/dist/adapters/ws.js +4 -3
- package/dist/adapters/ws.mjs +4 -3
- package/dist/{config-65c5b6d1.mjs → config-7eddc5bb.mjs} +1 -1
- package/dist/{config-f3ce0144.js → config-943bca43.js} +1 -1
- package/dist/{config-54786004.js → config-94ba862d.js} +1 -1
- package/dist/{contentType-acc3be52.mjs → contentType-53e30af8.mjs} +3 -3
- package/dist/{contentType-8356d528.js → contentType-5b601838.js} +3 -3
- package/dist/{contentType-7354963c.js → contentType-b87cced2.js} +3 -3
- package/dist/core/internals/getParseFn.d.ts +1 -1
- package/dist/core/internals/getParseFn.d.ts.map +1 -1
- package/dist/core/internals/mergeRouters.d.ts +5 -5
- package/dist/core/internals/mergeRouters.d.ts.map +1 -1
- package/dist/core/middleware.d.ts +1 -1
- package/dist/core/middleware.d.ts.map +1 -1
- package/dist/core/parser.d.ts +3 -3
- package/dist/core/parser.d.ts.map +1 -1
- package/dist/core/procedure.d.ts +1 -1
- package/dist/core/procedure.d.ts.map +1 -1
- package/dist/core/router.d.ts +4 -4
- package/dist/core/router.d.ts.map +1 -1
- package/dist/core/types.d.ts +1 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/deprecated/internals/middlewares.d.ts +1 -1
- package/dist/deprecated/internals/middlewares.d.ts.map +1 -1
- package/dist/deprecated/internals/procedure.d.ts +5 -5
- package/dist/deprecated/internals/procedure.d.ts.map +1 -1
- package/dist/deprecated/router.d.ts +17 -17
- package/dist/deprecated/router.d.ts.map +1 -1
- package/dist/error/TRPCError.d.ts.map +1 -1
- package/dist/error/formatter.d.ts +1 -1
- package/dist/error/formatter.d.ts.map +1 -1
- package/dist/error/utils.d.ts +4 -1
- package/dist/error/utils.d.ts.map +1 -1
- package/dist/http/contentType.d.ts.map +1 -1
- package/dist/http/index.js +4 -4
- package/dist/http/index.mjs +4 -4
- package/dist/http/internals/types.d.ts +1 -1
- package/dist/http/internals/types.d.ts.map +1 -1
- package/dist/http/resolveHTTPResponse.d.ts +1 -1
- package/dist/http/resolveHTTPResponse.d.ts.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.mjs +11 -11
- package/dist/internals/types.d.ts +1 -1
- package/dist/internals/types.d.ts.map +1 -1
- package/dist/{nodeHTTPRequestHandler-51d58a23.js → nodeHTTPRequestHandler-46ec104c.js} +2 -1
- package/dist/{nodeHTTPRequestHandler-071d36b5.js → nodeHTTPRequestHandler-61ea01f2.js} +2 -1
- package/dist/{nodeHTTPRequestHandler-bb12529f.mjs → nodeHTTPRequestHandler-dbfdf9a5.mjs} +2 -1
- package/dist/observable/internals/pipe.d.ts +1 -1
- package/dist/observable/internals/pipe.d.ts.map +1 -1
- package/dist/{resolveHTTPResponse-1f03fdfd.js → resolveHTTPResponse-199d522a.js} +4 -4
- package/dist/{resolveHTTPResponse-dd3677b3.mjs → resolveHTTPResponse-25592372.mjs} +4 -4
- package/dist/{resolveHTTPResponse-e0047ea2.js → resolveHTTPResponse-33a8a5fc.js} +4 -4
- package/dist/rpc/envelopes.d.ts +11 -11
- package/dist/rpc/envelopes.d.ts.map +1 -1
- package/dist/shared/createProxy/index.d.ts +1 -1
- package/dist/shared/getErrorShape.d.ts +1 -1
- package/dist/shared/getErrorShape.d.ts.map +1 -1
- package/dist/shared/internal/serialize.d.ts +4 -4
- package/dist/shared/internal/serialize.d.ts.map +1 -1
- package/dist/shared/transformTRPCResponse.d.ts +1 -1
- package/dist/subscription.d.ts +1 -1
- package/dist/subscription.d.ts.map +1 -1
- package/dist/subscription.js +4 -2
- package/dist/subscription.mjs +4 -2
- package/dist/transformer.d.ts +2 -2
- package/dist/transformer.d.ts.map +1 -1
- package/dist/types.d.ts +5 -5
- package/dist/types.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/adapters/aws-lambda/utils.ts +3 -3
- package/src/adapters/fastify/fastifyRequestHandler.ts +4 -4
- package/src/adapters/fetch/fetchRequestHandler.ts +7 -6
- package/src/adapters/fetch/types.ts +1 -1
- package/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts +13 -11
- package/src/adapters/node-http/content-type/form-data/index.ts +2 -2
- package/src/adapters/node-http/content-type/form-data/memoryUploadHandler.ts +1 -1
- package/src/adapters/node-http/content-type/form-data/streamSlice.ts +5 -3
- package/src/adapters/node-http/content-type/form-data/uploadHandler.ts +2 -2
- package/src/adapters/node-http/nodeHTTPRequestHandler.ts +1 -0
- package/src/adapters/node-http/types.ts +29 -29
- package/src/adapters/ws.ts +8 -7
- package/src/core/internals/getParseFn.ts +1 -1
- package/src/core/internals/mergeRouters.ts +6 -6
- package/src/core/middleware.ts +4 -5
- package/src/core/parser.ts +5 -5
- package/src/core/procedure.ts +1 -1
- package/src/core/router.ts +4 -4
- package/src/core/types.ts +1 -1
- package/src/deprecated/internals/middlewares.ts +2 -2
- package/src/deprecated/internals/procedure.ts +25 -28
- package/src/deprecated/router.ts +35 -35
- package/src/error/TRPCError.ts +35 -4
- package/src/error/formatter.ts +1 -1
- package/src/error/utils.ts +1 -9
- package/src/http/contentType.ts +2 -3
- package/src/http/internals/types.ts +1 -1
- package/src/http/resolveHTTPResponse.ts +6 -6
- package/src/internals/types.ts +1 -1
- package/src/observable/internals/pipe.ts +1 -1
- package/src/rpc/envelopes.ts +7 -7
- package/src/shared/createProxy/index.ts +1 -1
- package/src/shared/getErrorShape.ts +1 -1
- package/src/shared/internal/serialize.ts +4 -14
- package/src/subscription.ts +4 -2
- package/src/transformer.ts +3 -3
- package/src/types.ts +8 -7
|
@@ -4,23 +4,6 @@
|
|
|
4
4
|
// check that value is object
|
|
5
5
|
return !!value && !Array.isArray(value) && typeof value === 'object';
|
|
6
6
|
}
|
|
7
|
-
/**
|
|
8
|
-
* @internal
|
|
9
|
-
*/ function getMessageFromUnknownError(err, fallback) {
|
|
10
|
-
if (typeof err === 'string') {
|
|
11
|
-
return err;
|
|
12
|
-
}
|
|
13
|
-
if (isObject(err) && typeof err.message === 'string') {
|
|
14
|
-
return err.message;
|
|
15
|
-
}
|
|
16
|
-
return fallback;
|
|
17
|
-
}
|
|
18
|
-
function getCauseFromUnknown(cause) {
|
|
19
|
-
if (cause instanceof Error) {
|
|
20
|
-
return cause;
|
|
21
|
-
}
|
|
22
|
-
return undefined;
|
|
23
|
-
}
|
|
24
7
|
|
|
25
8
|
function getTRPCErrorFromUnknown(cause) {
|
|
26
9
|
if (cause instanceof TRPCError) {
|
|
@@ -36,17 +19,42 @@ function getTRPCErrorFromUnknown(cause) {
|
|
|
36
19
|
}
|
|
37
20
|
return trpcError;
|
|
38
21
|
}
|
|
22
|
+
class UnknownCauseError extends Error {
|
|
23
|
+
}
|
|
24
|
+
function getCauseFromUnknown(cause) {
|
|
25
|
+
if (cause instanceof Error) {
|
|
26
|
+
return cause;
|
|
27
|
+
}
|
|
28
|
+
const type = typeof cause;
|
|
29
|
+
if (type === 'undefined' || type === 'function' || cause === null) {
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
// Primitive types just get wrapped in an error
|
|
33
|
+
if (type !== 'object') {
|
|
34
|
+
return new Error(String(cause));
|
|
35
|
+
}
|
|
36
|
+
// If it's an object, we'll create a synthetic error
|
|
37
|
+
if (isObject(cause)) {
|
|
38
|
+
const err = new UnknownCauseError();
|
|
39
|
+
for(const key in cause){
|
|
40
|
+
err[key] = cause[key];
|
|
41
|
+
}
|
|
42
|
+
return err;
|
|
43
|
+
}
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
39
46
|
class TRPCError extends Error {
|
|
40
47
|
constructor(opts){
|
|
41
|
-
const
|
|
48
|
+
const cause = getCauseFromUnknown(opts.cause);
|
|
49
|
+
const message = opts.message ?? cause?.message ?? opts.code;
|
|
42
50
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
43
51
|
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
44
52
|
super(message, {
|
|
45
|
-
cause
|
|
53
|
+
cause
|
|
46
54
|
});
|
|
47
55
|
this.code = opts.code;
|
|
48
56
|
this.name = this.constructor.name;
|
|
49
57
|
}
|
|
50
58
|
}
|
|
51
59
|
|
|
52
|
-
export { TRPCError as T, getTRPCErrorFromUnknown as
|
|
60
|
+
export { TRPCError as T, getTRPCErrorFromUnknown as g };
|
|
@@ -5,24 +5,6 @@ function isObject(value) {
|
|
|
5
5
|
// check that value is object
|
|
6
6
|
return !!value && !Array.isArray(value) && typeof value === 'object';
|
|
7
7
|
}
|
|
8
|
-
/**
|
|
9
|
-
* @internal
|
|
10
|
-
*/
|
|
11
|
-
function getMessageFromUnknownError(err, fallback) {
|
|
12
|
-
if (typeof err === 'string') {
|
|
13
|
-
return err;
|
|
14
|
-
}
|
|
15
|
-
if (isObject(err) && typeof err.message === 'string') {
|
|
16
|
-
return err.message;
|
|
17
|
-
}
|
|
18
|
-
return fallback;
|
|
19
|
-
}
|
|
20
|
-
function getCauseFromUnknown(cause) {
|
|
21
|
-
if (cause instanceof Error) {
|
|
22
|
-
return cause;
|
|
23
|
-
}
|
|
24
|
-
return undefined;
|
|
25
|
-
}
|
|
26
8
|
|
|
27
9
|
function getTRPCErrorFromUnknown(cause) {
|
|
28
10
|
if (cause instanceof TRPCError) {
|
|
@@ -38,15 +20,40 @@ function getTRPCErrorFromUnknown(cause) {
|
|
|
38
20
|
}
|
|
39
21
|
return trpcError;
|
|
40
22
|
}
|
|
23
|
+
class UnknownCauseError extends Error {
|
|
24
|
+
}
|
|
25
|
+
function getCauseFromUnknown(cause) {
|
|
26
|
+
if (cause instanceof Error) {
|
|
27
|
+
return cause;
|
|
28
|
+
}
|
|
29
|
+
const type = typeof cause;
|
|
30
|
+
if (type === 'undefined' || type === 'function' || cause === null) {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
// Primitive types just get wrapped in an error
|
|
34
|
+
if (type !== 'object') {
|
|
35
|
+
return new Error(String(cause));
|
|
36
|
+
}
|
|
37
|
+
// If it's an object, we'll create a synthetic error
|
|
38
|
+
if (isObject(cause)) {
|
|
39
|
+
const err = new UnknownCauseError();
|
|
40
|
+
for (const key in cause) {
|
|
41
|
+
err[key] = cause[key];
|
|
42
|
+
}
|
|
43
|
+
return err;
|
|
44
|
+
}
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
41
47
|
class TRPCError extends Error {
|
|
42
48
|
constructor(opts) {
|
|
43
|
-
const
|
|
49
|
+
const cause = getCauseFromUnknown(opts.cause);
|
|
50
|
+
const message = opts.message ?? cause?.message ?? opts.code;
|
|
44
51
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
45
52
|
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
46
|
-
super(message, { cause
|
|
53
|
+
super(message, { cause });
|
|
47
54
|
this.code = opts.code;
|
|
48
55
|
this.name = this.constructor.name;
|
|
49
56
|
}
|
|
50
57
|
}
|
|
51
58
|
|
|
52
|
-
export { TRPCError as T, getTRPCErrorFromUnknown as
|
|
59
|
+
export { TRPCError as T, getTRPCErrorFromUnknown as g };
|
|
@@ -6,23 +6,6 @@
|
|
|
6
6
|
// check that value is object
|
|
7
7
|
return !!value && !Array.isArray(value) && typeof value === 'object';
|
|
8
8
|
}
|
|
9
|
-
/**
|
|
10
|
-
* @internal
|
|
11
|
-
*/ function getMessageFromUnknownError(err, fallback) {
|
|
12
|
-
if (typeof err === 'string') {
|
|
13
|
-
return err;
|
|
14
|
-
}
|
|
15
|
-
if (isObject(err) && typeof err.message === 'string') {
|
|
16
|
-
return err.message;
|
|
17
|
-
}
|
|
18
|
-
return fallback;
|
|
19
|
-
}
|
|
20
|
-
function getCauseFromUnknown(cause) {
|
|
21
|
-
if (cause instanceof Error) {
|
|
22
|
-
return cause;
|
|
23
|
-
}
|
|
24
|
-
return undefined;
|
|
25
|
-
}
|
|
26
9
|
|
|
27
10
|
function getTRPCErrorFromUnknown(cause) {
|
|
28
11
|
if (cause instanceof TRPCError) {
|
|
@@ -38,13 +21,38 @@ function getTRPCErrorFromUnknown(cause) {
|
|
|
38
21
|
}
|
|
39
22
|
return trpcError;
|
|
40
23
|
}
|
|
24
|
+
class UnknownCauseError extends Error {
|
|
25
|
+
}
|
|
26
|
+
function getCauseFromUnknown(cause) {
|
|
27
|
+
if (cause instanceof Error) {
|
|
28
|
+
return cause;
|
|
29
|
+
}
|
|
30
|
+
const type = typeof cause;
|
|
31
|
+
if (type === 'undefined' || type === 'function' || cause === null) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
// Primitive types just get wrapped in an error
|
|
35
|
+
if (type !== 'object') {
|
|
36
|
+
return new Error(String(cause));
|
|
37
|
+
}
|
|
38
|
+
// If it's an object, we'll create a synthetic error
|
|
39
|
+
if (isObject(cause)) {
|
|
40
|
+
const err = new UnknownCauseError();
|
|
41
|
+
for(const key in cause){
|
|
42
|
+
err[key] = cause[key];
|
|
43
|
+
}
|
|
44
|
+
return err;
|
|
45
|
+
}
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
41
48
|
class TRPCError extends Error {
|
|
42
49
|
constructor(opts){
|
|
43
|
-
const
|
|
50
|
+
const cause = getCauseFromUnknown(opts.cause);
|
|
51
|
+
const message = opts.message ?? cause?.message ?? opts.code;
|
|
44
52
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
45
53
|
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
46
54
|
super(message, {
|
|
47
|
-
cause
|
|
55
|
+
cause
|
|
48
56
|
});
|
|
49
57
|
this.code = opts.code;
|
|
50
58
|
this.name = this.constructor.name;
|
|
@@ -52,5 +60,4 @@ class TRPCError extends Error {
|
|
|
52
60
|
}
|
|
53
61
|
|
|
54
62
|
exports.TRPCError = TRPCError;
|
|
55
|
-
exports.getCauseFromUnknown = getCauseFromUnknown;
|
|
56
63
|
exports.getTRPCErrorFromUnknown = getTRPCErrorFromUnknown;
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var TRPCError = require('../../TRPCError-
|
|
5
|
+
var TRPCError = require('../../TRPCError-d07099d1.js');
|
|
6
6
|
require('../../index-4a823936.js');
|
|
7
7
|
require('../../codes-0eeb600d.js');
|
|
8
|
-
require('../../config-
|
|
9
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
8
|
+
require('../../config-943bca43.js');
|
|
9
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-199d522a.js');
|
|
10
10
|
require('../../transformTRPCResponse-48d70ef6.js');
|
|
11
|
-
require('../../contentType-
|
|
11
|
+
require('../../contentType-5b601838.js');
|
|
12
12
|
|
|
13
13
|
function isPayloadV1(event) {
|
|
14
14
|
return determinePayloadFormat(event) == '1.0';
|
|
@@ -50,14 +50,14 @@ function getPath(event) {
|
|
|
50
50
|
if (isPayloadV1(event)) {
|
|
51
51
|
if (!event.pathParameters) {
|
|
52
52
|
// Then this event was not triggered by a resource denoted with {proxy+}
|
|
53
|
-
return event.path.split('/').pop()
|
|
53
|
+
return event.path.split('/').pop() ?? '';
|
|
54
54
|
}
|
|
55
55
|
const matches = event.resource.matchAll(/\{(.*?)\}/g);
|
|
56
56
|
for (const match of matches){
|
|
57
57
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
58
58
|
const group = match[1];
|
|
59
59
|
if (group.includes('+') && event.pathParameters) {
|
|
60
|
-
return event.pathParameters[group.replace('+', '')]
|
|
60
|
+
return event.pathParameters[group.replace('+', '')] ?? '';
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
return event.path.slice(1);
|
|
@@ -68,7 +68,7 @@ function getPath(event) {
|
|
|
68
68
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
69
69
|
const group1 = match1[1];
|
|
70
70
|
if (group1.includes('+') && event.pathParameters) {
|
|
71
|
-
return event.pathParameters[group1.replace('+', '')]
|
|
71
|
+
return event.pathParameters[group1.replace('+', '')] ?? '';
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
return event.rawPath.slice(1);
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { T as TRPCError } from '../../TRPCError-
|
|
1
|
+
import { T as TRPCError } from '../../TRPCError-6a1653a4.mjs';
|
|
2
2
|
import '../../index-044a193b.mjs';
|
|
3
3
|
import '../../codes-24aa1ce1.mjs';
|
|
4
|
-
import '../../config-
|
|
5
|
-
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-
|
|
4
|
+
import '../../config-7eddc5bb.mjs';
|
|
5
|
+
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-25592372.mjs';
|
|
6
6
|
import '../../transformTRPCResponse-3dca0b20.mjs';
|
|
7
|
-
import '../../contentType-
|
|
7
|
+
import '../../contentType-53e30af8.mjs';
|
|
8
8
|
|
|
9
9
|
function isPayloadV1(event) {
|
|
10
10
|
return determinePayloadFormat(event) == '1.0';
|
|
@@ -46,14 +46,14 @@ function getPath(event) {
|
|
|
46
46
|
if (isPayloadV1(event)) {
|
|
47
47
|
if (!event.pathParameters) {
|
|
48
48
|
// Then this event was not triggered by a resource denoted with {proxy+}
|
|
49
|
-
return event.path.split('/').pop()
|
|
49
|
+
return event.path.split('/').pop() ?? '';
|
|
50
50
|
}
|
|
51
51
|
const matches = event.resource.matchAll(/\{(.*?)\}/g);
|
|
52
52
|
for (const match of matches){
|
|
53
53
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
54
54
|
const group = match[1];
|
|
55
55
|
if (group.includes('+') && event.pathParameters) {
|
|
56
|
-
return event.pathParameters[group.replace('+', '')]
|
|
56
|
+
return event.pathParameters[group.replace('+', '')] ?? '';
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
return event.path.slice(1);
|
|
@@ -64,7 +64,7 @@ function getPath(event) {
|
|
|
64
64
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
65
65
|
const group1 = match1[1];
|
|
66
66
|
if (group1.includes('+') && event.pathParameters) {
|
|
67
|
-
return event.pathParameters[group1.replace('+', '')]
|
|
67
|
+
return event.pathParameters[group1.replace('+', '')] ?? '';
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
return event.rawPath.slice(1);
|
package/dist/adapters/express.js
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-
|
|
5
|
+
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-61ea01f2.js');
|
|
6
6
|
require('../index-4a823936.js');
|
|
7
7
|
require('../codes-0eeb600d.js');
|
|
8
|
-
require('../resolveHTTPResponse-
|
|
9
|
-
require('../config-
|
|
10
|
-
require('../TRPCError-
|
|
8
|
+
require('../resolveHTTPResponse-199d522a.js');
|
|
9
|
+
require('../config-943bca43.js');
|
|
10
|
+
require('../TRPCError-d07099d1.js');
|
|
11
11
|
require('../transformTRPCResponse-48d70ef6.js');
|
|
12
|
-
require('../contentType-
|
|
12
|
+
require('../contentType-5b601838.js');
|
|
13
13
|
require('../batchStreamFormatter-93cdcdd4.js');
|
|
14
14
|
require('./node-http/content-type/json/index.js');
|
|
15
15
|
require('../contentType-8c16408e.js');
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-
|
|
1
|
+
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-dbfdf9a5.mjs';
|
|
2
2
|
import '../index-044a193b.mjs';
|
|
3
3
|
import '../codes-24aa1ce1.mjs';
|
|
4
|
-
import '../resolveHTTPResponse-
|
|
5
|
-
import '../config-
|
|
6
|
-
import '../TRPCError-
|
|
4
|
+
import '../resolveHTTPResponse-25592372.mjs';
|
|
5
|
+
import '../config-7eddc5bb.mjs';
|
|
6
|
+
import '../TRPCError-6a1653a4.mjs';
|
|
7
7
|
import '../transformTRPCResponse-3dca0b20.mjs';
|
|
8
|
-
import '../contentType-
|
|
8
|
+
import '../contentType-53e30af8.mjs';
|
|
9
9
|
import '../batchStreamFormatter-fc1ffb26.mjs';
|
|
10
10
|
import './node-http/content-type/json/index.mjs';
|
|
11
11
|
import '../contentType-3194ed5f.mjs';
|
|
@@ -3,11 +3,11 @@ import { AnyRouter } from '../../core';
|
|
|
3
3
|
import { HTTPBaseHandlerOptions } from '../../http';
|
|
4
4
|
import { NodeHTTPCreateContextOption } from '../node-http';
|
|
5
5
|
export type FastifyHandlerOptions<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply> = HTTPBaseHandlerOptions<TRouter, TRequest> & NodeHTTPCreateContextOption<TRouter, TRequest, TResponse>;
|
|
6
|
-
type FastifyRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply> = {
|
|
6
|
+
type FastifyRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply> = FastifyHandlerOptions<TRouter, TRequest, TResponse> & {
|
|
7
7
|
req: TRequest;
|
|
8
8
|
res: TResponse;
|
|
9
9
|
path: string;
|
|
10
|
-
}
|
|
10
|
+
};
|
|
11
11
|
export declare function fastifyRequestHandler<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply>(opts: FastifyRequestHandlerOptions<TRouter, TRequest, TResponse>): Promise<never>;
|
|
12
12
|
export {};
|
|
13
13
|
//# sourceMappingURL=fastifyRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,SAAS,EAAsB,MAAM,YAAY,CAAC;AAC3D,OAAO,EAEL,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B;
|
|
1
|
+
{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,SAAS,EAAsB,MAAM,YAAY,CAAC;AAC3D,OAAO,EAEL,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,kBAsFjE"}
|
|
@@ -4,14 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var node_stream = require('node:stream');
|
|
6
6
|
require('../../index-4a823936.js');
|
|
7
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
7
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-199d522a.js');
|
|
8
8
|
var batchStreamFormatter = require('../../batchStreamFormatter-93cdcdd4.js');
|
|
9
9
|
var adapters_ws = require('../ws.js');
|
|
10
10
|
require('../../codes-0eeb600d.js');
|
|
11
|
-
require('../../config-
|
|
12
|
-
require('../../TRPCError-
|
|
11
|
+
require('../../config-943bca43.js');
|
|
12
|
+
require('../../TRPCError-d07099d1.js');
|
|
13
13
|
require('../../transformTRPCResponse-48d70ef6.js');
|
|
14
|
-
require('../../contentType-
|
|
14
|
+
require('../../contentType-5b601838.js');
|
|
15
15
|
require('../../observable-464116ac.js');
|
|
16
16
|
|
|
17
17
|
async function fastifyRequestHandler(opts) {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Readable } from 'node:stream';
|
|
2
2
|
import '../../index-044a193b.mjs';
|
|
3
|
-
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-
|
|
3
|
+
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-25592372.mjs';
|
|
4
4
|
import { g as getBatchStreamFormatter } from '../../batchStreamFormatter-fc1ffb26.mjs';
|
|
5
5
|
import { applyWSSHandler } from '../ws.mjs';
|
|
6
6
|
import '../../codes-24aa1ce1.mjs';
|
|
7
|
-
import '../../config-
|
|
8
|
-
import '../../TRPCError-
|
|
7
|
+
import '../../config-7eddc5bb.mjs';
|
|
8
|
+
import '../../TRPCError-6a1653a4.mjs';
|
|
9
9
|
import '../../transformTRPCResponse-3dca0b20.mjs';
|
|
10
|
-
import '../../contentType-
|
|
10
|
+
import '../../contentType-53e30af8.mjs';
|
|
11
11
|
import '../../observable-ade1bad8.mjs';
|
|
12
12
|
|
|
13
13
|
async function fastifyRequestHandler(opts) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { AnyRouter } from '../../core';
|
|
2
2
|
import { FetchHandlerOptions } from './types';
|
|
3
|
-
export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = {
|
|
3
|
+
export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = FetchHandlerOptions<TRouter> & {
|
|
4
4
|
req: Request;
|
|
5
5
|
endpoint: string;
|
|
6
|
-
}
|
|
6
|
+
};
|
|
7
7
|
export declare function fetchRequestHandler<TRouter extends AnyRouter>(opts: FetchHandlerRequestOptions<TRouter>): Promise<Response>;
|
|
8
8
|
//# sourceMappingURL=fetchRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,
|
|
1
|
+
{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,mBAAmB,CAAC,OAAO,CAAC,GAAG;IAC7B,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEJ,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,GACxC,OAAO,CAAC,QAAQ,CAAC,CAoGnB"}
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
require('../../index-4a823936.js');
|
|
6
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
6
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-199d522a.js');
|
|
7
7
|
var batchStreamFormatter = require('../../batchStreamFormatter-93cdcdd4.js');
|
|
8
8
|
require('../../codes-0eeb600d.js');
|
|
9
|
-
require('../../config-
|
|
10
|
-
require('../../TRPCError-
|
|
9
|
+
require('../../config-943bca43.js');
|
|
10
|
+
require('../../TRPCError-d07099d1.js');
|
|
11
11
|
require('../../transformTRPCResponse-48d70ef6.js');
|
|
12
|
-
require('../../contentType-
|
|
12
|
+
require('../../contentType-5b601838.js');
|
|
13
13
|
|
|
14
14
|
async function fetchRequestHandler(opts) {
|
|
15
15
|
const resHeaders = new Headers();
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import '../../index-044a193b.mjs';
|
|
2
|
-
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-
|
|
2
|
+
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-25592372.mjs';
|
|
3
3
|
import { g as getBatchStreamFormatter } from '../../batchStreamFormatter-fc1ffb26.mjs';
|
|
4
4
|
import '../../codes-24aa1ce1.mjs';
|
|
5
|
-
import '../../config-
|
|
6
|
-
import '../../TRPCError-
|
|
5
|
+
import '../../config-7eddc5bb.mjs';
|
|
6
|
+
import '../../TRPCError-6a1653a4.mjs';
|
|
7
7
|
import '../../transformTRPCResponse-3dca0b20.mjs';
|
|
8
|
-
import '../../contentType-
|
|
8
|
+
import '../../contentType-53e30af8.mjs';
|
|
9
9
|
|
|
10
10
|
async function fetchRequestHandler(opts) {
|
|
11
11
|
const resHeaders = new Headers();
|
|
@@ -16,5 +16,5 @@ export type FetchCreateContextOption<TRouter extends AnyRouter> = unknown extend
|
|
|
16
16
|
**/
|
|
17
17
|
createContext: FetchCreateContextFn<TRouter>;
|
|
18
18
|
};
|
|
19
|
-
export type FetchHandlerOptions<TRouter extends AnyRouter> =
|
|
19
|
+
export type FetchHandlerOptions<TRouter extends AnyRouter> = FetchCreateContextOption<TRouter> & HTTPBaseHandlerOptions<TRouter, Request>;
|
|
20
20
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC5D,IAAI,EAAE,2BAA2B,KAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;CAC/C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAER,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,IACvD,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC5D,IAAI,EAAE,2BAA2B,KAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;CAC/C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAER,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,IACvD,wBAAwB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC"}
|
package/dist/adapters/next.js
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var TRPCError = require('../TRPCError-
|
|
5
|
+
var TRPCError = require('../TRPCError-d07099d1.js');
|
|
6
6
|
var transformTRPCResponse = require('../transformTRPCResponse-48d70ef6.js');
|
|
7
|
-
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-
|
|
7
|
+
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-61ea01f2.js');
|
|
8
8
|
require('../index-4a823936.js');
|
|
9
9
|
require('../codes-0eeb600d.js');
|
|
10
|
-
require('../resolveHTTPResponse-
|
|
11
|
-
require('../config-
|
|
12
|
-
require('../contentType-
|
|
10
|
+
require('../resolveHTTPResponse-199d522a.js');
|
|
11
|
+
require('../config-943bca43.js');
|
|
12
|
+
require('../contentType-5b601838.js');
|
|
13
13
|
require('../batchStreamFormatter-93cdcdd4.js');
|
|
14
14
|
require('./node-http/content-type/json/index.js');
|
|
15
15
|
require('../contentType-8c16408e.js');
|
package/dist/adapters/next.mjs
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { T as TRPCError } from '../TRPCError-
|
|
1
|
+
import { T as TRPCError } from '../TRPCError-6a1653a4.mjs';
|
|
2
2
|
import { g as getErrorShape } from '../transformTRPCResponse-3dca0b20.mjs';
|
|
3
|
-
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-
|
|
3
|
+
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-dbfdf9a5.mjs';
|
|
4
4
|
import '../index-044a193b.mjs';
|
|
5
5
|
import '../codes-24aa1ce1.mjs';
|
|
6
|
-
import '../resolveHTTPResponse-
|
|
7
|
-
import '../config-
|
|
8
|
-
import '../contentType-
|
|
6
|
+
import '../resolveHTTPResponse-25592372.mjs';
|
|
7
|
+
import '../config-7eddc5bb.mjs';
|
|
8
|
+
import '../contentType-53e30af8.mjs';
|
|
9
9
|
import '../batchStreamFormatter-fc1ffb26.mjs';
|
|
10
10
|
import './node-http/content-type/json/index.mjs';
|
|
11
11
|
import '../contentType-3194ed5f.mjs';
|
|
@@ -26,7 +26,7 @@ export type FileUploadHandlerOptions = {
|
|
|
26
26
|
/**
|
|
27
27
|
* The directory to write the upload.
|
|
28
28
|
*/
|
|
29
|
-
directory?:
|
|
29
|
+
directory?: FileUploadHandlerPathResolver | string;
|
|
30
30
|
/**
|
|
31
31
|
* The name of the file in the directory. Can be a relative path, the directory
|
|
32
32
|
* structure will be created if it does not exist.
|
|
@@ -43,7 +43,7 @@ export type FileUploadHandlerOptions = {
|
|
|
43
43
|
* @param contentType
|
|
44
44
|
* @param name
|
|
45
45
|
*/
|
|
46
|
-
filter?(args: FileUploadHandlerFilterArgs): boolean |
|
|
46
|
+
filter?(args: FileUploadHandlerFilterArgs): Promise<boolean> | boolean;
|
|
47
47
|
};
|
|
48
48
|
export declare function createFileUploadHandler({ directory, avoidFileConflicts, file, filter, maxPartSize, }?: FileUploadHandlerOptions): UploadHandler;
|
|
49
49
|
export declare class NodeOnDiskFile {
|
|
@@ -63,7 +63,7 @@ export declare class NodeOnDiskFile {
|
|
|
63
63
|
stream(): ReadableStream<any>;
|
|
64
64
|
stream(): NodeJS.ReadableStream;
|
|
65
65
|
text(): Promise<string>;
|
|
66
|
-
|
|
66
|
+
readonly [Symbol.toStringTag] = "File";
|
|
67
67
|
remove(): Promise<void>;
|
|
68
68
|
getFilePath(): string;
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileUploadHandler.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/fileUploadHandler.ts"],"names":[],"mappings":";;AAoBA,OAAO,EAA4B,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE1E,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,QAAQ,CAAC,EAAE,cAAc,mBAoB1B;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,6BAA6B,GAAG,CAC1C,IAAI,EAAE,iCAAiC,KACpC,MAAM,GAAG,SAAS,CAAC;AAExB,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"fileUploadHandler.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/fileUploadHandler.ts"],"names":[],"mappings":";;AAoBA,OAAO,EAA4B,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE1E,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,QAAQ,CAAC,EAAE,cAAc,mBAoB1B;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,6BAA6B,GAAG,CAC1C,IAAI,EAAE,iCAAiC,KACpC,MAAM,GAAG,SAAS,CAAC;AAExB,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE,6BAA6B,GAAG,MAAM,CAAC;IACnD;;;OAGG;IACH,IAAI,CAAC,EAAE,6BAA6B,CAAC;IACrC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,MAAM,CAAC,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CACxE,CAAC;AA4BF,wBAAgB,uBAAuB,CAAC,EACtC,SAAoB,EACpB,kBAAyB,EACzB,IAA8B,EAC9B,MAAM,EACN,WAAqB,GACtB,GAAE,wBAA6B,GAAG,aAAa,CAyD/C;AAED,qBAAa,cAAc;IAMvB,OAAO,CAAC,QAAQ;IACT,IAAI,EAAE,MAAM;IACnB,OAAO,CAAC,MAAM,CAAC;IAPjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,SAAK;IACjB,kBAAkB,SAAM;gBAGd,QAAQ,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACX,MAAM,CAAC;eAAW,MAAM;aAAO,MAAM;iBAAE;IAKjD,IAAI,IAAI,IAAI,MAAM,CASjB;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc;IAkB5D,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBzC,MAAM,IAAI,cAAc,CAAC,GAAG,CAAC;IAC7B,MAAM,IAAI,MAAM,CAAC,cAAc;IAUzB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,SAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU;IAE9C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,WAAW,IAAI,MAAM;CAGtB"}
|
|
@@ -458,7 +458,8 @@ class SliceStream extends node_stream.Transform {
|
|
|
458
458
|
} else {
|
|
459
459
|
this.push(chunk.slice(start, chunk.length));
|
|
460
460
|
}
|
|
461
|
-
|
|
461
|
+
done();
|
|
462
|
+
return;
|
|
462
463
|
}
|
|
463
464
|
if (this.emitUp && !this.emitDown) {
|
|
464
465
|
if (this.indexOffset >= this.endIndex) {
|
|
@@ -467,9 +468,10 @@ class SliceStream extends node_stream.Transform {
|
|
|
467
468
|
} else {
|
|
468
469
|
this.push(chunk);
|
|
469
470
|
}
|
|
470
|
-
|
|
471
|
+
done();
|
|
472
|
+
return;
|
|
471
473
|
}
|
|
472
|
-
|
|
474
|
+
done();
|
|
473
475
|
}
|
|
474
476
|
constructor(startIndex = 0, endIndex = Infinity){
|
|
475
477
|
super();
|
|
@@ -566,6 +568,7 @@ function createFileUploadHandler({ directory =node_os.tmpdir() , avoidFileConfli
|
|
|
566
568
|
return new NodeOnDiskFile(filepath, contentType);
|
|
567
569
|
};
|
|
568
570
|
}
|
|
571
|
+
let _toStringTag = Symbol.toStringTag;
|
|
569
572
|
class NodeOnDiskFile {
|
|
570
573
|
get size() {
|
|
571
574
|
const stats = node_fs.statSync(this.filepath);
|
|
@@ -578,9 +581,9 @@ class NodeOnDiskFile {
|
|
|
578
581
|
slice(start, end, type) {
|
|
579
582
|
if (typeof start === 'number' && start < 0) start = this.size + start;
|
|
580
583
|
if (typeof end === 'number' && end < 0) end = this.size + end;
|
|
581
|
-
const startOffset = this.slicer?.start
|
|
582
|
-
start = startOffset + (start
|
|
583
|
-
end = startOffset + (end
|
|
584
|
+
const startOffset = this.slicer?.start ?? 0;
|
|
585
|
+
start = startOffset + (start ?? 0);
|
|
586
|
+
end = startOffset + (end ?? this.size);
|
|
584
587
|
return new NodeOnDiskFile(this.filepath, typeof type === 'string' ? type : this.type, {
|
|
585
588
|
start,
|
|
586
589
|
end
|
|
@@ -594,8 +597,12 @@ class NodeOnDiskFile {
|
|
|
594
597
|
return new Promise((resolve, reject)=>{
|
|
595
598
|
const buf = [];
|
|
596
599
|
stream.on('data', (chunk)=>buf.push(chunk));
|
|
597
|
-
stream.on('end', ()=>
|
|
598
|
-
|
|
600
|
+
stream.on('end', ()=>{
|
|
601
|
+
resolve(Buffer.concat(buf));
|
|
602
|
+
});
|
|
603
|
+
stream.on('error', (err)=>{
|
|
604
|
+
reject(err);
|
|
605
|
+
});
|
|
599
606
|
});
|
|
600
607
|
}
|
|
601
608
|
stream() {
|
|
@@ -608,9 +615,6 @@ class NodeOnDiskFile {
|
|
|
608
615
|
async text() {
|
|
609
616
|
return readableStreamToString(this.stream());
|
|
610
617
|
}
|
|
611
|
-
get [Symbol.toStringTag]() {
|
|
612
|
-
return 'File';
|
|
613
|
-
}
|
|
614
618
|
remove() {
|
|
615
619
|
return promises.unlink(this.filepath);
|
|
616
620
|
}
|
|
@@ -623,6 +627,7 @@ class NodeOnDiskFile {
|
|
|
623
627
|
this.slicer = slicer;
|
|
624
628
|
this.lastModified = 0;
|
|
625
629
|
this.webkitRelativePath = '';
|
|
630
|
+
this[_toStringTag] = 'File';
|
|
626
631
|
this.name = node_path.basename(filepath);
|
|
627
632
|
}
|
|
628
633
|
}
|
|
@@ -633,7 +638,7 @@ class NodeOnDiskFile {
|
|
|
633
638
|
* TODO: Update this comment
|
|
634
639
|
* @see https://remix.run/utils/parse-multipart-form-data
|
|
635
640
|
*/ async function parseMultipartFormData(request, uploadHandler) {
|
|
636
|
-
const contentType = request.headers['content-type']
|
|
641
|
+
const contentType = request.headers['content-type'] ?? '';
|
|
637
642
|
const [type, boundary] = contentType.split(/\s*;\s*boundary=/);
|
|
638
643
|
if (!boundary || type !== 'multipart/form-data') {
|
|
639
644
|
throw new TypeError('Could not parse content as FormData.');
|
|
@@ -656,7 +661,7 @@ class NodeOnDiskFile {
|
|
|
656
661
|
}
|
|
657
662
|
function isMultipartFormDataRequest(req) {
|
|
658
663
|
const contentTypeHeader = req.headers['content-type'];
|
|
659
|
-
return contentTypeHeader?.startsWith('multipart/form-data')
|
|
664
|
+
return contentTypeHeader?.startsWith('multipart/form-data') ?? contentTypeHeader === 'application/x-www-form-urlencoded';
|
|
660
665
|
}
|
|
661
666
|
const nodeHTTPFormDataContentTypeHandler = contentType.createNodeHTTPContentTypeHandler({
|
|
662
667
|
isMatch (opts) {
|