@trpc/server 10.43.1 → 10.43.3

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.
@@ -2,10 +2,14 @@ import { Simplify } from '../../types';
2
2
  import { ProcedureParams } from '../procedure';
3
3
  /**
4
4
  * @internal
5
+ * Overwrite properties in `TType` with properties in `TWith`
6
+ * Only overwrites properties when both types are objects
7
+ * Otherwise it will overwrite the entire TType with TWith,
8
+ * unless TWith is never.
5
9
  */
6
- export type Overwrite<TType, TWith> = TType extends any ? TWith extends any ? {
10
+ export type Overwrite<TType, TWith> = TType extends object ? TWith extends object ? {
7
11
  [K in keyof TType | keyof TWith]: K extends keyof TWith ? TWith[K] : K extends keyof TType ? TType[K] : never;
8
- } : never : never;
12
+ } : TWith extends any ? TWith : never : TType extends any ? TWith extends any ? TWith : TType : never;
9
13
  /**
10
14
  * @internal
11
15
  */
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/core/internals/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,IAAI,KAAK,SAAS,GAAG,GACnD,KAAK,SAAS,GAAG,GACf;KACG,CAAC,IAAI,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,KAAK,GACnD,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,MAAM,KAAK,GACrB,KAAK,CAAC,CAAC,CAAC,GACR,KAAK;CACV,GACD,KAAK,GACP,KAAK,CAAC;AACV;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,KAAK,EAAE,KAAK,IAAI;KACxC,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;CAChE,CAAC;AACF;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,MAAM,EAAE,SAAS,IAAI,WAAW,SAAS,MAAM,GACpE,SAAS,GACT,MAAM,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,gBAAgB;aAClB,kBAAkB;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,WAAW,eAAwB,CAAC;AACjD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,eAAe;IAC7D,GAAG,EAAE,QAAQ,CACX,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CACpE,CAAC;IACF,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,WAAW,GAC5C,SAAS,GACT,OAAO,CAAC,YAAY,CAAC,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,YAAY,EAAE,cAAc,IACpD,YAAY,SAAS,cAAc,GAC/B,OAAO,CAAC,MAAM,YAAY,EAAE,MAAM,cAAc,CAAC,SAAS,KAAK,GAC7D,YAAY,GACZ,cAAc,GAChB,KAAK,CAAC;AAEZ;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,KAAK,EAAE,KAAK,IAAI,SAAS,SAAS,KAAK,GAChE,SAAS,SAAS,KAAK,GACrB,KAAK,GACL,KAAK,GACP,KAAK,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/core/internals/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,IAAI,KAAK,SAAS,MAAM,GACtD,KAAK,SAAS,MAAM,GAElB;KACG,CAAC,IAAI,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,KAAK,GACnD,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,MAAM,KAAK,GACrB,KAAK,CAAC,CAAC,CAAC,GACR,KAAK;CACV,GACD,KAAK,SAAS,GAAG,GAEjB,KAAK,GACL,KAAK,GACP,KAAK,SAAS,GAAG,GACjB,KAAK,SAAS,GAAG,GAEf,KAAK,GACL,KAAK,GACP,KAAK,CAAC;AAEV;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,KAAK,EAAE,KAAK,IAAI;KACxC,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;CAChE,CAAC;AACF;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,MAAM,EAAE,SAAS,IAAI,WAAW,SAAS,MAAM,GACpE,SAAS,GACT,MAAM,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,gBAAgB;aAClB,kBAAkB;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,WAAW,eAAwB,CAAC;AACjD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,eAAe;IAC7D,GAAG,EAAE,QAAQ,CACX,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CACpE,CAAC;IACF,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,WAAW,GAC5C,SAAS,GACT,OAAO,CAAC,YAAY,CAAC,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,YAAY,EAAE,cAAc,IACpD,YAAY,SAAS,cAAc,GAC/B,OAAO,CAAC,MAAM,YAAY,EAAE,MAAM,cAAc,CAAC,SAAS,KAAK,GAC7D,YAAY,GACZ,cAAc,GAChB,KAAK,CAAC;AAEZ;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,KAAK,EAAE,KAAK,IAAI,SAAS,SAAS,KAAK,GAChE,SAAS,SAAS,KAAK,GACrB,KAAK,GACL,KAAK,GACP,KAAK,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "10.43.1",
3
+ "version": "10.43.3",
4
4
  "description": "The tRPC server library",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -146,8 +146,8 @@
146
146
  "@types/express": "^4.17.17",
147
147
  "@types/hash-sum": "^1.0.0",
148
148
  "@types/node": "^18.16.16",
149
- "@types/react": "^18.2.8",
150
- "@types/react-dom": "^18.2.4",
149
+ "@types/react": "^18.2.33",
150
+ "@types/react-dom": "^18.2.14",
151
151
  "@types/ws": "^8.2.0",
152
152
  "@web3-storage/multipart-parser": "^1.0.0",
153
153
  "aws-lambda": "^1.0.7",
@@ -158,14 +158,14 @@
158
158
  "fastify-plugin": "^4.5.0",
159
159
  "hash-sum": "^2.0.0",
160
160
  "myzod": "^1.3.1",
161
- "next": "^13.4.8",
161
+ "next": "^14.0.1",
162
162
  "react": "^18.2.0",
163
163
  "react-dom": "^18.2.0",
164
164
  "rollup": "^2.79.1",
165
165
  "superjson": "^1.12.4",
166
166
  "superstruct": "^1.0.0",
167
167
  "tslib": "^2.5.0",
168
- "tsx": "^3.12.7",
168
+ "tsx": "^4.0.0",
169
169
  "typescript": "^5.1.3",
170
170
  "valibot": "^0.20.0",
171
171
  "vitest": "^0.32.0",
@@ -176,5 +176,5 @@
176
176
  "funding": [
177
177
  "https://trpc.io/sponsor"
178
178
  ],
179
- "gitHead": "c20cff51a2f6391d1b4b584eb4e547d2d5c65f13"
179
+ "gitHead": "5366fbaf7b483f22814977ff397f708425791d2b"
180
180
  }
@@ -3,18 +3,32 @@ import { ProcedureParams } from '../procedure';
3
3
 
4
4
  /**
5
5
  * @internal
6
+ * Overwrite properties in `TType` with properties in `TWith`
7
+ * Only overwrites properties when both types are objects
8
+ * Otherwise it will overwrite the entire TType with TWith,
9
+ * unless TWith is never.
6
10
  */
7
- export type Overwrite<TType, TWith> = TType extends any
8
- ? TWith extends any
9
- ? {
11
+ export type Overwrite<TType, TWith> = TType extends object
12
+ ? TWith extends object
13
+ ? // Both TType and TWith are objects: overwrite key-by-key
14
+ {
10
15
  [K in keyof TType | keyof TWith]: K extends keyof TWith
11
16
  ? TWith[K]
12
17
  : K extends keyof TType
13
18
  ? TType[K]
14
19
  : never;
15
20
  }
21
+ : TWith extends any
22
+ ? // TWith is not an object but some non-never type, so fully overwrite TType
23
+ TWith
16
24
  : never
25
+ : TType extends any
26
+ ? TWith extends any
27
+ ? // Same as above: just overwrite TType with TWith
28
+ TWith
29
+ : TType
17
30
  : never;
31
+
18
32
  /**
19
33
  * @internal
20
34
  */