@trpc/server 10.0.0-proxy-beta.25 → 10.0.0-rc.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.
Files changed (38) hide show
  1. package/dist/adapters/aws-lambda/index.js +2 -2
  2. package/dist/adapters/aws-lambda/index.mjs +2 -2
  3. package/dist/adapters/express.js +3 -3
  4. package/dist/adapters/express.mjs +3 -3
  5. package/dist/adapters/fastify/index.js +2 -2
  6. package/dist/adapters/fastify/index.mjs +2 -2
  7. package/dist/adapters/fetch/index.js +2 -2
  8. package/dist/adapters/fetch/index.mjs +2 -2
  9. package/dist/adapters/next.js +3 -3
  10. package/dist/adapters/next.mjs +3 -3
  11. package/dist/adapters/node-http/index.js +3 -3
  12. package/dist/adapters/node-http/index.mjs +3 -3
  13. package/dist/adapters/standalone.js +3 -3
  14. package/dist/adapters/standalone.mjs +3 -3
  15. package/dist/adapters/ws.js +1 -1
  16. package/dist/adapters/ws.mjs +1 -1
  17. package/dist/{config-287b8ea5.mjs → config-28be9d3d.mjs} +1 -1
  18. package/dist/{config-7bd017ac.js → config-8ef987c1.js} +1 -1
  19. package/dist/core/initTRPC.d.ts.map +1 -1
  20. package/dist/core/internals/config.d.ts.map +1 -1
  21. package/dist/core/internals/procedureBuilder.d.ts +5 -2
  22. package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
  23. package/dist/http/index.js +2 -2
  24. package/dist/http/index.mjs +2 -2
  25. package/dist/index.js +3 -3
  26. package/dist/index.mjs +4 -4
  27. package/dist/{nodeHTTPRequestHandler-b1dc9f7c.js → nodeHTTPRequestHandler-7ab93f6c.js} +1 -1
  28. package/dist/{nodeHTTPRequestHandler-a3060966.mjs → nodeHTTPRequestHandler-89b8c411.mjs} +1 -1
  29. package/dist/{resolveHTTPResponse-61271ba9.js → resolveHTTPResponse-743deb7c.js} +1 -1
  30. package/dist/{resolveHTTPResponse-01a6f231.mjs → resolveHTTPResponse-d5ccf107.mjs} +1 -1
  31. package/dist/types.d.ts +4 -7
  32. package/dist/types.d.ts.map +1 -1
  33. package/package.json +7 -7
  34. package/src/core/initTRPC.ts +2 -1
  35. package/src/core/internals/config.ts +2 -2
  36. package/src/core/internals/procedureBuilder.ts +17 -2
  37. package/src/deprecated/router.ts +1 -1
  38. package/src/types.ts +4 -11
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var TRPCError = require('../../TRPCError-fe9113e5.js');
6
- require('../../config-7bd017ac.js');
6
+ require('../../config-8ef987c1.js');
7
7
  require('../../codes-76c38a34.js');
8
- var resolveHTTPResponse = require('../../resolveHTTPResponse-61271ba9.js');
8
+ var resolveHTTPResponse = require('../../resolveHTTPResponse-743deb7c.js');
9
9
  require('../../index-62d46c97.js');
10
10
  require('../../transformTRPCResponse-cc650f44.js');
11
11
 
@@ -1,7 +1,7 @@
1
1
  import { T as TRPCError } from '../../TRPCError-e99e7cbe.mjs';
2
- import '../../config-287b8ea5.mjs';
2
+ import '../../config-28be9d3d.mjs';
3
3
  import '../../codes-7d21f749.mjs';
4
- import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-01a6f231.mjs';
4
+ import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-d5ccf107.mjs';
5
5
  import '../../index-0332d528.mjs';
6
6
  import '../../transformTRPCResponse-547a4702.mjs';
7
7
 
@@ -2,9 +2,9 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-b1dc9f7c.js');
6
- require('../resolveHTTPResponse-61271ba9.js');
7
- require('../config-7bd017ac.js');
5
+ var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ab93f6c.js');
6
+ require('../resolveHTTPResponse-743deb7c.js');
7
+ require('../config-8ef987c1.js');
8
8
  require('../TRPCError-fe9113e5.js');
9
9
  require('../codes-76c38a34.js');
10
10
  require('../index-62d46c97.js');
@@ -1,6 +1,6 @@
1
- import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-a3060966.mjs';
2
- import '../resolveHTTPResponse-01a6f231.mjs';
3
- import '../config-287b8ea5.mjs';
1
+ import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-89b8c411.mjs';
2
+ import '../resolveHTTPResponse-d5ccf107.mjs';
3
+ import '../config-28be9d3d.mjs';
4
4
  import '../TRPCError-e99e7cbe.mjs';
5
5
  import '../codes-7d21f749.mjs';
6
6
  import '../index-0332d528.mjs';
@@ -2,9 +2,9 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var resolveHTTPResponse = require('../../resolveHTTPResponse-61271ba9.js');
5
+ var resolveHTTPResponse = require('../../resolveHTTPResponse-743deb7c.js');
6
6
  var adapters_ws = require('../ws.js');
7
- require('../../config-7bd017ac.js');
7
+ require('../../config-8ef987c1.js');
8
8
  require('../../TRPCError-fe9113e5.js');
9
9
  require('../../codes-76c38a34.js');
10
10
  require('../../index-62d46c97.js');
@@ -1,6 +1,6 @@
1
- import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-01a6f231.mjs';
1
+ import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-d5ccf107.mjs';
2
2
  import { applyWSSHandler } from '../ws.mjs';
3
- import '../../config-287b8ea5.mjs';
3
+ import '../../config-28be9d3d.mjs';
4
4
  import '../../TRPCError-e99e7cbe.mjs';
5
5
  import '../../codes-7d21f749.mjs';
6
6
  import '../../index-0332d528.mjs';
@@ -2,8 +2,8 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var resolveHTTPResponse = require('../../resolveHTTPResponse-61271ba9.js');
6
- require('../../config-7bd017ac.js');
5
+ var resolveHTTPResponse = require('../../resolveHTTPResponse-743deb7c.js');
6
+ require('../../config-8ef987c1.js');
7
7
  require('../../TRPCError-fe9113e5.js');
8
8
  require('../../codes-76c38a34.js');
9
9
  require('../../index-62d46c97.js');
@@ -1,5 +1,5 @@
1
- import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-01a6f231.mjs';
2
- import '../../config-287b8ea5.mjs';
1
+ import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-d5ccf107.mjs';
2
+ import '../../config-28be9d3d.mjs';
3
3
  import '../../TRPCError-e99e7cbe.mjs';
4
4
  import '../../codes-7d21f749.mjs';
5
5
  import '../../index-0332d528.mjs';
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var TRPCError = require('../TRPCError-fe9113e5.js');
6
- var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-b1dc9f7c.js');
7
- require('../resolveHTTPResponse-61271ba9.js');
8
- require('../config-7bd017ac.js');
6
+ var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ab93f6c.js');
7
+ require('../resolveHTTPResponse-743deb7c.js');
8
+ require('../config-8ef987c1.js');
9
9
  require('../codes-76c38a34.js');
10
10
  require('../index-62d46c97.js');
11
11
  require('../transformTRPCResponse-cc650f44.js');
@@ -1,7 +1,7 @@
1
1
  import { T as TRPCError } from '../TRPCError-e99e7cbe.mjs';
2
- import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-a3060966.mjs';
3
- import '../resolveHTTPResponse-01a6f231.mjs';
4
- import '../config-287b8ea5.mjs';
2
+ import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-89b8c411.mjs';
3
+ import '../resolveHTTPResponse-d5ccf107.mjs';
4
+ import '../config-28be9d3d.mjs';
5
5
  import '../codes-7d21f749.mjs';
6
6
  import '../index-0332d528.mjs';
7
7
  import '../transformTRPCResponse-547a4702.mjs';
@@ -2,9 +2,9 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-b1dc9f7c.js');
6
- require('../../resolveHTTPResponse-61271ba9.js');
7
- require('../../config-7bd017ac.js');
5
+ var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-7ab93f6c.js');
6
+ require('../../resolveHTTPResponse-743deb7c.js');
7
+ require('../../config-8ef987c1.js');
8
8
  require('../../TRPCError-fe9113e5.js');
9
9
  require('../../codes-76c38a34.js');
10
10
  require('../../index-62d46c97.js');
@@ -1,6 +1,6 @@
1
- export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-a3060966.mjs';
2
- import '../../resolveHTTPResponse-01a6f231.mjs';
3
- import '../../config-287b8ea5.mjs';
1
+ export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-89b8c411.mjs';
2
+ import '../../resolveHTTPResponse-d5ccf107.mjs';
3
+ import '../../config-28be9d3d.mjs';
4
4
  import '../../TRPCError-e99e7cbe.mjs';
5
5
  import '../../codes-7d21f749.mjs';
6
6
  import '../../index-0332d528.mjs';
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var http = require('node:http');
6
- var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-b1dc9f7c.js');
7
- require('../resolveHTTPResponse-61271ba9.js');
8
- require('../config-7bd017ac.js');
6
+ var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ab93f6c.js');
7
+ require('../resolveHTTPResponse-743deb7c.js');
8
+ require('../config-8ef987c1.js');
9
9
  require('../TRPCError-fe9113e5.js');
10
10
  require('../codes-76c38a34.js');
11
11
  require('../index-62d46c97.js');
@@ -1,7 +1,7 @@
1
1
  import http from 'node:http';
2
- import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-a3060966.mjs';
3
- import '../resolveHTTPResponse-01a6f231.mjs';
4
- import '../config-287b8ea5.mjs';
2
+ import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-89b8c411.mjs';
3
+ import '../resolveHTTPResponse-d5ccf107.mjs';
4
+ import '../config-28be9d3d.mjs';
5
5
  import '../TRPCError-e99e7cbe.mjs';
6
6
  import '../codes-7d21f749.mjs';
7
7
  import '../index-0332d528.mjs';
@@ -2,7 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var config = require('../config-7bd017ac.js');
5
+ var config = require('../config-8ef987c1.js');
6
6
  var TRPCError = require('../TRPCError-fe9113e5.js');
7
7
  var transformTRPCResponse = require('../transformTRPCResponse-cc650f44.js');
8
8
  var observable = require('../observable-b651bf11.js');
@@ -1,4 +1,4 @@
1
- import { e as callProcedure } from '../config-287b8ea5.mjs';
1
+ import { e as callProcedure } from '../config-28be9d3d.mjs';
2
2
  import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from '../TRPCError-e99e7cbe.mjs';
3
3
  import { t as transformTRPCResponse } from '../transformTRPCResponse-547a4702.mjs';
4
4
  import { i as isObservable } from '../observable-e129ac9d.mjs';
@@ -228,6 +228,6 @@ const emptyRouter = {
228
228
 
229
229
  /**
230
230
  * The default check to see if we're in a server
231
- */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || process.env.NODE_ENV === 'test' || !!process.env.JEST_WORKER_ID;
231
+ */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || globalThis.process?.env?.NODE_ENV === 'test' || !!globalThis.process?.env?.JEST_WORKER_ID;
232
232
 
233
233
  export { TRPC_ERROR_CODES_BY_NUMBER as T, defaultTransformer as a, getDataTransformer as b, createRouterFactory as c, defaultFormatter as d, callProcedure as e, getHTTPStatusCode as f, getHTTPStatusCodeFromError as g, isServerDefault as i, procedureTypes as p };
@@ -230,7 +230,7 @@ const emptyRouter = {
230
230
 
231
231
  /**
232
232
  * The default check to see if we're in a server
233
- */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || process.env.NODE_ENV === 'test' || !!process.env.JEST_WORKER_ID;
233
+ */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || globalThis.process?.env?.NODE_ENV === 'test' || !!globalThis.process?.env?.JEST_WORKER_ID;
234
234
 
235
235
  exports.TRPC_ERROR_CODES_BY_NUMBER = TRPC_ERROR_CODES_BY_NUMBER;
236
236
  exports.callProcedure = callProcedure;
@@ -1 +1 @@
1
- {"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,eAAe,EACf,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,aAAK,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvD,aAAK,gCAAgC,CAAC,MAAM,SAAS,sBAAsB,IACzE,qBAAqB,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IACvE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IAC3E,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAC;AAEL;;;;;GAKG;AAEH,cAAM,WAAW,CAAC,OAAO,SAAS,sBAAsB,GAAG,EAAE;IAC3D,OAAO,CAAC,WAAW,SAAS,eAAe,CAAC,KAAK,CAAC;aACK,WAAW;;IAElE,IAAI,CAAC,QAAQ,SAAS,eAAe,CAAC,MAAM,CAAC;cACW,QAAQ;;IAEhE,MAAM,CACJ,QAAQ,SAAS,OAAO,CACtB,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CACzD,EAED,OAAO,CAAC,EACJ,aAAa,CACX,QAAQ,EACR,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,GACD,SAAS;QAuEX;;;WAGG;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;QAEH;;WAEG;;;CAtFR;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,iBAAoB,CAAC"}
1
+ {"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,eAAe,EACf,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,aAAK,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvD,aAAK,gCAAgC,CAAC,MAAM,SAAS,sBAAsB,IACzE,qBAAqB,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IACvE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IAC3E,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAC;AAEL;;;;;GAKG;AAEH,cAAM,WAAW,CAAC,OAAO,SAAS,sBAAsB,GAAG,EAAE;IAC3D,OAAO,CAAC,WAAW,SAAS,eAAe,CAAC,KAAK,CAAC;aACK,WAAW;;IAElE,IAAI,CAAC,QAAQ,SAAS,eAAe,CAAC,MAAM,CAAC;cACW,QAAQ;;IAEhE,MAAM,CACJ,QAAQ,SAAS,OAAO,CACtB,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CACzD,EAED,OAAO,CAAC,EACJ,aAAa,CACX,QAAQ,EACR,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,GACD,SAAS;QAwEX;;;WAGG;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;QAEH;;WAEG;;;CAvFR;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,iBAAoB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,OAIA,CAAC;AAE/B;;;GAGG;AACH,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,eAAe;IAC3D;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACnC;;;OAGG;IACH,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IACnD;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,oBAAY,qBAAqB,CAAC,SAAS,SAAS,eAAe,IACjE,SAAS,CAAC;AAEZ;;;;GAIG;AACH,MAAM,WAAW,UAAU,CAAC,SAAS,SAAS,eAAe,CAC3D,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,CAAC;CACnB;AAED;;GAEG;AACH,oBAAY,aAAa,GAAG,UAAU,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC,CAAC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,OAIa,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,eAAe;IAC3D;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACnC;;;OAGG;IACH,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IACnD;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,oBAAY,qBAAqB,CAAC,SAAS,SAAS,eAAe,IACjE,SAAS,CAAC;AAEZ;;;;GAIG;AACH,MAAM,WAAW,UAAU,CAAC,SAAS,SAAS,eAAe,CAC3D,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,CAAC;CACnB;AAED;;GAEG;AACH,oBAAY,aAAa,GAAG,UAAU,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { FlatOverwrite, MaybePromise, Simplify } from '../../types';
1
+ import { InferOptional, MaybePromise, Simplify, UndefinedKeys } from '../../types';
2
2
  import { MiddlewareFunction } from '../middleware';
3
3
  import { Parser, inferParser } from '../parser';
4
4
  import { Procedure, ProcedureParams } from '../procedure';
@@ -22,7 +22,10 @@ export interface BuildProcedure<TType extends ProcedureType, TParams extends Pro
22
22
  _output_out: TOutput;
23
23
  }> : TParams> {
24
24
  }
25
- declare type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType ? TWith : Simplify<FlatOverwrite<TType, TWith>>;
25
+ declare type Merge<TType, TWith> = {
26
+ [TKey in keyof TType | keyof TWith]: TKey extends keyof TType ? TKey extends keyof TWith ? TType[TKey] & TWith[TKey] : TType[TKey] : TWith[TKey & keyof TWith];
27
+ };
28
+ declare type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType ? TWith : Simplify<InferOptional<Merge<TType, TWith>, UndefinedKeys<Merge<TType, TWith>>>>;
26
29
  declare type ErrorMessage<TMessage extends string> = TMessage;
27
30
  export declare type ProcedureBuilderDef<TParams extends ProcedureParams> = {
28
31
  inputs: Parser[];
@@ -1 +1 @@
1
- {"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var config = require('../config-7bd017ac.js');
6
- var resolveHTTPResponse = require('../resolveHTTPResponse-61271ba9.js');
5
+ var config = require('../config-8ef987c1.js');
6
+ var resolveHTTPResponse = require('../resolveHTTPResponse-743deb7c.js');
7
7
  require('../TRPCError-fe9113e5.js');
8
8
  require('../codes-76c38a34.js');
9
9
  require('../index-62d46c97.js');
@@ -1,5 +1,5 @@
1
- export { T as TRPC_ERROR_CODES_BY_NUMBER, f as getHTTPStatusCode, g as getHTTPStatusCodeFromError } from '../config-287b8ea5.mjs';
2
- export { r as resolveHTTPResponse } from '../resolveHTTPResponse-01a6f231.mjs';
1
+ export { T as TRPC_ERROR_CODES_BY_NUMBER, f as getHTTPStatusCode, g as getHTTPStatusCodeFromError } from '../config-28be9d3d.mjs';
2
+ export { r as resolveHTTPResponse } from '../resolveHTTPResponse-d5ccf107.mjs';
3
3
  import '../TRPCError-e99e7cbe.mjs';
4
4
  import '../codes-7d21f749.mjs';
5
5
  import '../index-0332d528.mjs';
package/dist/index.js CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var config = require('./config-7bd017ac.js');
5
+ var config = require('./config-8ef987c1.js');
6
6
  var TRPCError = require('./TRPCError-fe9113e5.js');
7
7
  var codes = require('./codes-76c38a34.js');
8
8
  var index = require('./index-62d46c97.js');
@@ -678,7 +678,7 @@ function safeObject(...args) {
678
678
  httpStatus: config.getHTTPStatusCodeFromError(error)
679
679
  }
680
680
  };
681
- if (process.env.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
681
+ if (globalThis.process?.env?.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
682
682
  shape.data.stack = opts.error.stack;
683
683
  }
684
684
  if (typeof path === 'string') {
@@ -792,7 +792,7 @@ function createTRPCInner() {
792
792
  const transformer = config.getDataTransformer(runtime?.transformer ?? config.defaultTransformer);
793
793
  const config$1 = {
794
794
  transformer,
795
- isDev: runtime?.isDev ?? process.env.NODE_ENV !== 'production',
795
+ isDev: runtime?.isDev ?? globalThis.process?.env?.NODE_ENV !== 'production',
796
796
  allowOutsideOfServer: runtime?.allowOutsideOfServer ?? false,
797
797
  errorFormatter,
798
798
  isServer: runtime?.isServer ?? config.isServerDefault,
package/dist/index.mjs CHANGED
@@ -1,5 +1,5 @@
1
- import { c as createRouterFactory, d as defaultFormatter, g as getHTTPStatusCodeFromError, a as defaultTransformer, b as getDataTransformer$1, i as isServerDefault } from './config-287b8ea5.mjs';
2
- export { e as callProcedure, a as defaultTransformer, b as getDataTransformer, p as procedureTypes } from './config-287b8ea5.mjs';
1
+ import { c as createRouterFactory, d as defaultFormatter, g as getHTTPStatusCodeFromError, a as defaultTransformer, b as getDataTransformer$1, i as isServerDefault } from './config-28be9d3d.mjs';
2
+ export { e as callProcedure, a as defaultTransformer, b as getDataTransformer, p as procedureTypes } from './config-28be9d3d.mjs';
3
3
  import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from './TRPCError-e99e7cbe.mjs';
4
4
  export { T as TRPCError } from './TRPCError-e99e7cbe.mjs';
5
5
  import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-7d21f749.mjs';
@@ -676,7 +676,7 @@ function safeObject(...args) {
676
676
  httpStatus: getHTTPStatusCodeFromError(error)
677
677
  }
678
678
  };
679
- if (process.env.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
679
+ if (globalThis.process?.env?.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
680
680
  shape.data.stack = opts.error.stack;
681
681
  }
682
682
  if (typeof path === 'string') {
@@ -790,7 +790,7 @@ function createTRPCInner() {
790
790
  const transformer = getDataTransformer$1(runtime?.transformer ?? defaultTransformer);
791
791
  const config = {
792
792
  transformer,
793
- isDev: runtime?.isDev ?? process.env.NODE_ENV !== 'production',
793
+ isDev: runtime?.isDev ?? globalThis.process?.env?.NODE_ENV !== 'production',
794
794
  allowOutsideOfServer: runtime?.allowOutsideOfServer ?? false,
795
795
  errorFormatter,
796
796
  isServer: runtime?.isServer ?? isServerDefault,
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var resolveHTTPResponse = require('./resolveHTTPResponse-61271ba9.js');
3
+ var resolveHTTPResponse = require('./resolveHTTPResponse-743deb7c.js');
4
4
  var TRPCError = require('./TRPCError-fe9113e5.js');
5
5
 
6
6
  async function getPostBody({ req , maxBodySize }) {
@@ -1,4 +1,4 @@
1
- import { r as resolveHTTPResponse } from './resolveHTTPResponse-01a6f231.mjs';
1
+ import { r as resolveHTTPResponse } from './resolveHTTPResponse-d5ccf107.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 config = require('./config-7bd017ac.js');
3
+ var config = require('./config-8ef987c1.js');
4
4
  var TRPCError = require('./TRPCError-fe9113e5.js');
5
5
  var transformTRPCResponse = require('./transformTRPCResponse-cc650f44.js');
6
6
 
@@ -1,4 +1,4 @@
1
- import { e as callProcedure, f as getHTTPStatusCode } from './config-287b8ea5.mjs';
1
+ import { e as callProcedure, f as getHTTPStatusCode } from './config-28be9d3d.mjs';
2
2
  import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-e99e7cbe.mjs';
3
3
  import { t as transformTRPCResponse } from './transformTRPCResponse-547a4702.mjs';
4
4
 
package/dist/types.d.ts CHANGED
@@ -2,13 +2,10 @@
2
2
  * @internal
3
3
  */
4
4
  export declare type identity<TType> = TType;
5
- declare type InferOptional<TType, TKeys extends keyof TType> = Partial<Pick<TType, TKeys>> & Omit<TType, TKeys>;
6
- declare type OmitNever<TType> = Pick<TType, {
7
- [K in keyof TType]: TType[K] extends never ? never : K;
8
- }[keyof TType]>;
9
- declare type UndefinedKeys<TType> = keyof OmitNever<{
10
- [K in keyof TType]: TType[K] extends undefined ? TType : never;
11
- }>;
5
+ export declare type InferOptional<TType, TKeys extends keyof TType> = Partial<Pick<TType, TKeys>> & Omit<TType, TKeys>;
6
+ export declare type UndefinedKeys<TType> = {
7
+ [K in keyof TType]: undefined extends TType[K] ? K : never;
8
+ }[keyof TType];
12
9
  /**
13
10
  * @internal
14
11
  */
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC;AAEpC,aAAK,aAAa,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,OAAO,CAC5D,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CACnB,GACC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAErB,aAAK,SAAS,CAAC,KAAK,IAAI,IAAI,CAC1B,KAAK,EACL;KACG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC;CACvD,CAAC,MAAM,KAAK,CAAC,CACf,CAAC;AAEF,aAAK,aAAa,CAAC,KAAK,IAAI,MAAM,SAAS,CAAC;KACzC,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;CAC/D,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,aAAa,CAAC,KAAK,EAAE,KAAK,IAAI,aAAa,CACrD;KACG,IAAI,IAAI,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,IAAI,SAAS,MAAM,KAAK,GACzD,KAAK,CAAC,IAAI,CAAC,GACX,IAAI,SAAS,MAAM,KAAK,GACxB,KAAK,CAAC,IAAI,CAAC,GACX,KAAK;CACV,EACD,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAC5C,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,KAAK,IAAI,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC;AAEpD;;GAEG;AACH,oBAAY,OAAO,CAAC,KAAK,IAAI,KAAK,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC3D,OAAO,CAAC,CAAC,CAAC,GACV,KAAK,CAAC;AAEV;;;GAGG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,SAAS,GAAG,EAAE,GAAG,IAAI,GACpD,KAAK,GACL;KAAG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAC1C;;GAEG;AACH,oBAAY,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;AAE5D;;GAEG;AACH,oBAAY,YAAY,CAAC,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEzD;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,KAAK,IAAI,KAAK,GAAG;KACpC,OAAO,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI;KAC7C,IAAI,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,IAAI,GAAG,KAAK;CAChE,CAAC,MAAM,IAAI,CAAC,CAAC;AAEd;;GAEG;AACH,oBAAY,MAAM,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI,IAAI,CACrD,IAAI,EACJ,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAC1B,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC;AAEpC,oBAAY,aAAa,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,OAAO,CACnE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CACnB,GACC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAErB,oBAAY,aAAa,CAAC,KAAK,IAAI;KAChC,CAAC,IAAI,MAAM,KAAK,GAAG,SAAS,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAC3D,CAAC,MAAM,KAAK,CAAC,CAAC;AAEf;;GAEG;AACH,oBAAY,aAAa,CAAC,KAAK,EAAE,KAAK,IAAI,aAAa,CACrD;KACG,IAAI,IAAI,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,IAAI,SAAS,MAAM,KAAK,GACzD,KAAK,CAAC,IAAI,CAAC,GACX,IAAI,SAAS,MAAM,KAAK,GACxB,KAAK,CAAC,IAAI,CAAC,GACX,KAAK;CACV,EACD,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAC5C,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,KAAK,IAAI,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC;AAEpD;;GAEG;AACH,oBAAY,OAAO,CAAC,KAAK,IAAI,KAAK,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC3D,OAAO,CAAC,CAAC,CAAC,GACV,KAAK,CAAC;AAEV;;;GAGG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,SAAS,GAAG,EAAE,GAAG,IAAI,GACpD,KAAK,GACL;KAAG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAC1C;;GAEG;AACH,oBAAY,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;AAE5D;;GAEG;AACH,oBAAY,YAAY,CAAC,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEzD;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,KAAK,IAAI,KAAK,GAAG;KACpC,OAAO,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI;KAC7C,IAAI,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,IAAI,GAAG,KAAK;CAChE,CAAC,MAAM,IAAI,CAAC,CAAC;AAEd;;GAEG;AACH,oBAAY,MAAM,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI,IAAI,CACrD,IAAI,EACJ,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAC1B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "10.0.0-proxy-beta.25",
3
+ "version": "10.0.0-rc.0",
4
4
  "description": "tRPC Server",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -128,10 +128,10 @@
128
128
  "@testing-library/jest-dom": "^5.16.5",
129
129
  "@testing-library/react": "^13.4.0",
130
130
  "@testing-library/user-event": "^14.4.3",
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",
131
+ "@trpc/client": "10.0.0-rc.0",
132
+ "@trpc/next": "10.0.0-rc.0",
133
+ "@trpc/react-query": "^10.0.0-rc.0",
134
+ "@trpc/server": "10.0.0-rc.0",
135
135
  "@types/aws-lambda": "^8.10.97",
136
136
  "@types/express": "^4.17.12",
137
137
  "@types/hash-sum": "^1.0.0",
@@ -144,7 +144,7 @@
144
144
  "abort-controller": "^3.0.0",
145
145
  "aws-lambda": "^1.0.7",
146
146
  "devalue": "^2.0.1",
147
- "expect-type": "^0.13.0",
147
+ "expect-type": "^0.15.0",
148
148
  "express": "^4.17.1",
149
149
  "fastify": "^3.27.1",
150
150
  "fastify-plugin": "^3.0.1",
@@ -167,5 +167,5 @@
167
167
  "yup": "^0.32.8",
168
168
  "zod": "^3.0.0"
169
169
  },
170
- "gitHead": "cfcb81b4875f1de6e8b1d9bd4855ede419a87d34"
170
+ "gitHead": "efb953bda0bc67081378a5824635d6a5326d4d07"
171
171
  }
@@ -106,7 +106,8 @@ function createTRPCInner<TParams extends PartialRootConfigTypes>() {
106
106
 
107
107
  const config: $Config = {
108
108
  transformer,
109
- isDev: runtime?.isDev ?? process.env.NODE_ENV !== 'production',
109
+ isDev:
110
+ runtime?.isDev ?? globalThis.process?.env?.NODE_ENV !== 'production',
110
111
  allowOutsideOfServer: runtime?.allowOutsideOfServer ?? false,
111
112
  errorFormatter,
112
113
  isServer: runtime?.isServer ?? isServerDefault,
@@ -17,8 +17,8 @@ export interface RootConfigTypes {
17
17
  export const isServerDefault: boolean =
18
18
  typeof window === 'undefined' ||
19
19
  'Deno' in window ||
20
- process.env.NODE_ENV === 'test' ||
21
- !!process.env.JEST_WORKER_ID;
20
+ globalThis.process?.env?.NODE_ENV === 'test' ||
21
+ !!globalThis.process?.env?.JEST_WORKER_ID;
22
22
 
23
23
  /**
24
24
  * The runtime config that are used and actually represents real values underneath
@@ -1,6 +1,11 @@
1
1
  import { TRPCError } from '../../error/TRPCError';
2
2
  import { getTRPCErrorFromUnknown } from '../../error/utils';
3
- import { FlatOverwrite, MaybePromise, Simplify } from '../../types';
3
+ import {
4
+ InferOptional,
5
+ MaybePromise,
6
+ Simplify,
7
+ UndefinedKeys,
8
+ } from '../../types';
4
9
  import {
5
10
  MiddlewareFunction,
6
11
  MiddlewareResult,
@@ -62,9 +67,19 @@ export interface BuildProcedure<
62
67
  : TParams
63
68
  > {}
64
69
 
70
+ type Merge<TType, TWith> = {
71
+ [TKey in keyof TType | keyof TWith]: TKey extends keyof TType
72
+ ? TKey extends keyof TWith
73
+ ? TType[TKey] & TWith[TKey]
74
+ : TType[TKey]
75
+ : TWith[TKey & keyof TWith];
76
+ };
77
+
65
78
  type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType
66
79
  ? TWith
67
- : Simplify<FlatOverwrite<TType, TWith>>;
80
+ : Simplify<
81
+ InferOptional<Merge<TType, TWith>, UndefinedKeys<Merge<TType, TWith>>>
82
+ >;
68
83
 
69
84
  type ErrorMessage<TMessage extends string> = TMessage;
70
85
 
@@ -816,7 +816,7 @@ export class Router<
816
816
  },
817
817
  };
818
818
  if (
819
- process.env.NODE_ENV !== 'production' &&
819
+ globalThis.process?.env?.NODE_ENV !== 'production' &&
820
820
  typeof opts.error.stack === 'string'
821
821
  ) {
822
822
  shape.data.stack = opts.error.stack;
package/src/types.ts CHANGED
@@ -5,21 +5,14 @@
5
5
  */
6
6
  export type identity<TType> = TType;
7
7
 
8
- type InferOptional<TType, TKeys extends keyof TType> = Partial<
8
+ export type InferOptional<TType, TKeys extends keyof TType> = Partial<
9
9
  Pick<TType, TKeys>
10
10
  > &
11
11
  Omit<TType, TKeys>;
12
12
 
13
- type OmitNever<TType> = Pick<
14
- TType,
15
- {
16
- [K in keyof TType]: TType[K] extends never ? never : K;
17
- }[keyof TType]
18
- >;
19
-
20
- type UndefinedKeys<TType> = keyof OmitNever<{
21
- [K in keyof TType]: TType[K] extends undefined ? TType : never;
22
- }>;
13
+ export type UndefinedKeys<TType> = {
14
+ [K in keyof TType]: undefined extends TType[K] ? K : never;
15
+ }[keyof TType];
23
16
 
24
17
  /**
25
18
  * @internal