@trpc/server 10.0.0-proxy-beta.23 → 10.0.0-proxy-beta.25
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/adapters/aws-lambda/index.d.ts.map +1 -1
- package/dist/adapters/aws-lambda/index.js +10 -3
- package/dist/adapters/aws-lambda/index.mjs +10 -3
- package/dist/adapters/express.js +4 -3
- package/dist/adapters/express.mjs +4 -3
- package/dist/adapters/fastify/index.js +3 -2
- package/dist/adapters/fastify/index.mjs +3 -2
- package/dist/adapters/fetch/index.js +3 -2
- package/dist/adapters/fetch/index.mjs +3 -2
- package/dist/adapters/next.js +4 -3
- package/dist/adapters/next.mjs +4 -3
- package/dist/adapters/node-http/index.js +4 -3
- package/dist/adapters/node-http/index.mjs +4 -3
- package/dist/adapters/standalone.js +4 -3
- package/dist/adapters/standalone.mjs +4 -3
- package/dist/adapters/ws.js +3 -2
- package/dist/adapters/ws.mjs +2 -1
- package/dist/{transformTRPCResponse-23e99f82.mjs → config-287b8ea5.mjs} +28 -52
- package/dist/{transformTRPCResponse-92c79c47.js → config-7bd017ac.js} +28 -52
- package/dist/http/{internals/getHTTPStatusCode.d.ts → getHTTPStatusCode.d.ts} +2 -2
- package/dist/http/getHTTPStatusCode.d.ts.map +1 -0
- package/dist/http/index.d.ts +1 -0
- package/dist/http/index.d.ts.map +1 -1
- package/dist/http/index.js +17 -0
- package/dist/http/index.mjs +6 -0
- package/dist/index.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +398 -400
- package/dist/index.mjs +389 -390
- package/dist/{nodeHTTPRequestHandler-bb607c2b.mjs → nodeHTTPRequestHandler-a3060966.mjs} +1 -1
- package/dist/{nodeHTTPRequestHandler-0e40a231.js → nodeHTTPRequestHandler-b1dc9f7c.js} +1 -1
- package/dist/{resolveHTTPResponse-9dff3dcc.mjs → resolveHTTPResponse-01a6f231.mjs} +2 -1
- package/dist/{resolveHTTPResponse-92daf326.js → resolveHTTPResponse-61271ba9.js} +4 -3
- package/dist/transformTRPCResponse-547a4702.mjs +25 -0
- package/dist/transformTRPCResponse-cc650f44.js +27 -0
- package/http/index.d.ts +1 -0
- package/http/index.js +1 -0
- package/package.json +12 -6
- package/src/adapters/aws-lambda/index.ts +10 -2
- package/src/core/router.ts +1 -1
- package/src/deprecated/router.ts +1 -1
- package/src/http/{internals/getHTTPStatusCode.ts → getHTTPStatusCode.ts} +3 -3
- package/src/http/index.ts +1 -0
- package/src/http/resolveHTTPResponse.ts +1 -1
- package/src/index.ts +0 -1
- package/dist/http/internals/getHTTPStatusCode.d.ts.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { r as resolveHTTPResponse } from './resolveHTTPResponse-
|
|
1
|
+
import { r as resolveHTTPResponse } from './resolveHTTPResponse-01a6f231.mjs';
|
|
2
2
|
import { T as TRPCError } from './TRPCError-e99e7cbe.mjs';
|
|
3
3
|
|
|
4
4
|
async function getPostBody({ req , maxBodySize }) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
3
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-61271ba9.js');
|
|
4
4
|
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
5
5
|
|
|
6
6
|
async function getPostBody({ req , maxBodySize }) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { e as callProcedure, f as getHTTPStatusCode
|
|
1
|
+
import { e as callProcedure, f as getHTTPStatusCode } from './config-287b8ea5.mjs';
|
|
2
2
|
import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-e99e7cbe.mjs';
|
|
3
|
+
import { t as transformTRPCResponse } from './transformTRPCResponse-547a4702.mjs';
|
|
3
4
|
|
|
4
5
|
const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
|
|
5
6
|
GET: 'query',
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var config = require('./config-7bd017ac.js');
|
|
4
4
|
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
5
|
+
var transformTRPCResponse = require('./transformTRPCResponse-cc650f44.js');
|
|
5
6
|
|
|
6
7
|
const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
|
|
7
8
|
GET: 'query',
|
|
@@ -42,7 +43,7 @@ async function resolveHTTPResponse(opts) {
|
|
|
42
43
|
let paths = undefined;
|
|
43
44
|
const isBatchCall = !!req.query.get('batch');
|
|
44
45
|
function endResponse(untransformedJSON, errors) {
|
|
45
|
-
let status =
|
|
46
|
+
let status = config.getHTTPStatusCode(untransformedJSON);
|
|
46
47
|
const headers = {
|
|
47
48
|
'Content-Type': 'application/json'
|
|
48
49
|
};
|
|
@@ -121,7 +122,7 @@ async function resolveHTTPResponse(opts) {
|
|
|
121
122
|
const rawResults = await Promise.all(paths.map(async (path, index)=>{
|
|
122
123
|
const input = inputs[index];
|
|
123
124
|
try {
|
|
124
|
-
const output = await
|
|
125
|
+
const output = await config.callProcedure({
|
|
125
126
|
procedures: router._def.procedures,
|
|
126
127
|
path,
|
|
127
128
|
rawInput: input,
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
function transformTRPCResponseItem(router, item) {
|
|
2
|
+
if ('error' in item) {
|
|
3
|
+
return {
|
|
4
|
+
...item,
|
|
5
|
+
error: router._def._config.transformer.output.serialize(item.error)
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
if ('data' in item.result) {
|
|
9
|
+
return {
|
|
10
|
+
...item,
|
|
11
|
+
result: {
|
|
12
|
+
...item.result,
|
|
13
|
+
data: router._def._config.transformer.output.serialize(item.result.data)
|
|
14
|
+
}
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
return item;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
|
|
21
|
+
**/ function transformTRPCResponse(router, itemOrItems) {
|
|
22
|
+
return Array.isArray(itemOrItems) ? itemOrItems.map((item)=>transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export { transformTRPCResponse as t };
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
function transformTRPCResponseItem(router, item) {
|
|
4
|
+
if ('error' in item) {
|
|
5
|
+
return {
|
|
6
|
+
...item,
|
|
7
|
+
error: router._def._config.transformer.output.serialize(item.error)
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
if ('data' in item.result) {
|
|
11
|
+
return {
|
|
12
|
+
...item,
|
|
13
|
+
result: {
|
|
14
|
+
...item.result,
|
|
15
|
+
data: router._def._config.transformer.output.serialize(item.result.data)
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
return item;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
|
|
23
|
+
**/ function transformTRPCResponse(router, itemOrItems) {
|
|
24
|
+
return Array.isArray(itemOrItems) ? itemOrItems.map((item)=>transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
exports.transformTRPCResponse = transformTRPCResponse;
|
package/http/index.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from '../dist/http';
|
package/http/index.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
module.exports = require('../dist/http');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/server",
|
|
3
|
-
"version": "10.0.0-proxy-beta.
|
|
3
|
+
"version": "10.0.0-proxy-beta.25",
|
|
4
4
|
"description": "tRPC Server",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -79,6 +79,11 @@
|
|
|
79
79
|
"require": "./dist/adapters/fetch/index.js",
|
|
80
80
|
"default": "./dist/adapters/fetch/index.js"
|
|
81
81
|
},
|
|
82
|
+
"./http": {
|
|
83
|
+
"import": "./dist/http/index.mjs",
|
|
84
|
+
"require": "./dist/http/index.js",
|
|
85
|
+
"default": "./dist/http/index.js"
|
|
86
|
+
},
|
|
82
87
|
"./rpc": {
|
|
83
88
|
"import": "./dist/rpc/index.mjs",
|
|
84
89
|
"require": "./dist/rpc/index.js",
|
|
@@ -105,6 +110,7 @@
|
|
|
105
110
|
"src",
|
|
106
111
|
"README.md",
|
|
107
112
|
"adapters",
|
|
113
|
+
"http",
|
|
108
114
|
"rpc",
|
|
109
115
|
"observable",
|
|
110
116
|
"subscription",
|
|
@@ -122,10 +128,10 @@
|
|
|
122
128
|
"@testing-library/jest-dom": "^5.16.5",
|
|
123
129
|
"@testing-library/react": "^13.4.0",
|
|
124
130
|
"@testing-library/user-event": "^14.4.3",
|
|
125
|
-
"@trpc/client": "10.0.0-proxy-beta.
|
|
126
|
-
"@trpc/next": "10.0.0-proxy-beta.
|
|
127
|
-
"@trpc/react-query": "^10.0.0-proxy-beta.
|
|
128
|
-
"@trpc/server": "10.0.0-proxy-beta.
|
|
131
|
+
"@trpc/client": "10.0.0-proxy-beta.25",
|
|
132
|
+
"@trpc/next": "10.0.0-proxy-beta.25",
|
|
133
|
+
"@trpc/react-query": "^10.0.0-proxy-beta.25",
|
|
134
|
+
"@trpc/server": "10.0.0-proxy-beta.25",
|
|
129
135
|
"@types/aws-lambda": "^8.10.97",
|
|
130
136
|
"@types/express": "^4.17.12",
|
|
131
137
|
"@types/hash-sum": "^1.0.0",
|
|
@@ -161,5 +167,5 @@
|
|
|
161
167
|
"yup": "^0.32.8",
|
|
162
168
|
"zod": "^3.0.0"
|
|
163
169
|
},
|
|
164
|
-
"gitHead": "
|
|
170
|
+
"gitHead": "cfcb81b4875f1de6e8b1d9bd4855ede419a87d34"
|
|
165
171
|
}
|
|
@@ -5,8 +5,9 @@ import type {
|
|
|
5
5
|
APIGatewayProxyResult,
|
|
6
6
|
APIGatewayProxyStructuredResultV2,
|
|
7
7
|
} from 'aws-lambda';
|
|
8
|
-
import { TRPCError
|
|
8
|
+
import { TRPCError } from '../..';
|
|
9
9
|
import { AnyRouter, inferRouterContext } from '../../core';
|
|
10
|
+
import { resolveHTTPResponse } from '../../http';
|
|
10
11
|
import { HTTPRequest } from '../../http/internals/types';
|
|
11
12
|
import type { HTTPResponse } from '../../http/internals/types';
|
|
12
13
|
import {
|
|
@@ -33,11 +34,18 @@ function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
|
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
|
|
37
|
+
let body: string | null | undefined;
|
|
38
|
+
if (event.body && event.isBase64Encoded) {
|
|
39
|
+
body = Buffer.from(event.body, 'base64').toString('utf8');
|
|
40
|
+
} else {
|
|
41
|
+
body = event.body;
|
|
42
|
+
}
|
|
43
|
+
|
|
36
44
|
return {
|
|
37
45
|
method: getHTTPMethod(event),
|
|
38
46
|
query: query,
|
|
39
47
|
headers: event.headers,
|
|
40
|
-
body:
|
|
48
|
+
body: body,
|
|
41
49
|
};
|
|
42
50
|
}
|
|
43
51
|
|
package/src/core/router.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TRPCError } from '../error/TRPCError';
|
|
2
2
|
import { DefaultErrorShape, defaultFormatter } from '../error/formatter';
|
|
3
|
-
import { getHTTPStatusCodeFromError } from '../http/
|
|
3
|
+
import { getHTTPStatusCodeFromError } from '../http/getHTTPStatusCode';
|
|
4
4
|
import { TRPC_ERROR_CODES_BY_KEY } from '../rpc';
|
|
5
5
|
import { createRecursiveProxy } from '../shared';
|
|
6
6
|
import { defaultTransformer } from '../transformer';
|
package/src/deprecated/router.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { TRPCError } from '../error/TRPCError';
|
|
3
3
|
import { defaultFormatter } from '../error/formatter';
|
|
4
|
-
import { getHTTPStatusCodeFromError } from '../http/
|
|
4
|
+
import { getHTTPStatusCodeFromError } from '../http/getHTTPStatusCode';
|
|
5
5
|
import { Observable, inferObservableValue } from '../observable';
|
|
6
6
|
import {
|
|
7
7
|
TRPCErrorShape,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { TRPCError } from '
|
|
2
|
-
import { invert } from '
|
|
3
|
-
import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '
|
|
1
|
+
import { TRPCError } from '../error/TRPCError';
|
|
2
|
+
import { invert } from '../internals/invert';
|
|
3
|
+
import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '../rpc';
|
|
4
4
|
|
|
5
5
|
export const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
|
|
6
6
|
type ValueOf<TType> = TType[keyof TType];
|
package/src/http/index.ts
CHANGED
|
@@ -11,7 +11,7 @@ import { getCauseFromUnknown, getTRPCErrorFromUnknown } from '../error/utils';
|
|
|
11
11
|
import { transformTRPCResponse } from '../internals/transformTRPCResponse';
|
|
12
12
|
import { TRPCResponse } from '../rpc';
|
|
13
13
|
import { Maybe } from '../types';
|
|
14
|
-
import { getHTTPStatusCode } from './
|
|
14
|
+
import { getHTTPStatusCode } from './getHTTPStatusCode';
|
|
15
15
|
import {
|
|
16
16
|
HTTPBaseHandlerOptions,
|
|
17
17
|
HTTPHeaders,
|
package/src/index.ts
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getHTTPStatusCode.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/http/internals/getHTTPStatusCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAElE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;CAAkC,CAAC;AAC1E,aAAK,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;AAEzC,oBAAY,sBAAsB,GAAG,OAAO,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAwB7E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,EAAE,OAuBpE;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,UAI1D"}
|