@trpc/server 10.0.0-proxy-beta.13 → 10.0.0-proxy-beta.14

package/dist/{resolveHTTPResponse-f2b378b6.mjs → transformTRPCResponse-959de787.mjs}

@@ -1,13 +1,6 @@
-import { T as TRPCError, g as getTRPCErrorFromUnknown, a as getCauseFromUnknown } from './TRPCError-281ac25a.mjs';
+import { T as TRPCError } from './TRPCError-e99e7cbe.mjs';
 import { i as invert, T as TRPC_ERROR_CODES_BY_KEY } from './codes-7d21f749.mjs';
 import { c as createRecursiveProxy } from './index-5a6a2e91.mjs';
-import { t as transformTRPCResponse } from './transformTRPCResponse-c8138d5f.mjs';
-
-/* istanbul ignore file */ function assertNotBrowser() {
-    if (typeof window !== 'undefined' && !('Deno' in window) && process.env.NODE_ENV !== 'test' && process.env.JEST_WORKER_ID === undefined) {
-        throw new Error('Imported server-only code in the browser');
-    }
-}
 
 const defaultFormatter = ({ shape  })=>{
     return shape;
@@ -253,205 +246,32 @@ const emptyRouter = {
     return procedure(opts);
 }
 
-const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
-    GET: 'query',
-    POST: 'mutation'
-};
-function getRawProcedureInputOrThrow(req) {
-    try {
-        if (req.method === 'GET') {
-            if (!req.query.has('input')) {
-                return undefined;
-            }
-            const raw = req.query.get('input');
-            return JSON.parse(raw);
-        }
-        if (typeof req.body === 'string') {
-            // A mutation with no inputs will have req.body === ''
-            return req.body.length === 0 ? undefined : JSON.parse(req.body);
-        }
-        return req.body;
-    } catch (err) {
-        throw new TRPCError({
-            code: 'PARSE_ERROR',
-            cause: getCauseFromUnknown(err)
-        });
-    }
-}
-async function resolveHTTPResponse(opts) {
-    const { createContext , onError , router , req  } = opts;
-    const batchingEnabled = opts.batching?.enabled ?? true;
-    if (req.method === 'HEAD') {
-        // can be used for lambda warmup
+/**
+ * The default check to see if we're in a server
+ */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || process.env.NODE_ENV === 'test' || !!process.env.JEST_WORKER_ID;
+
+function transformTRPCResponseItem(router, item) {
+    if ('error' in item) {
         return {
-            status: 204
+            ...item,
+            error: router._def.transformer.output.serialize(item.error)
         };
     }
-    const type = HTTP_METHOD_PROCEDURE_TYPE_MAP[req.method] ?? 'unknown';
-    let ctx = undefined;
-    let paths = undefined;
-    const isBatchCall = !!req.query.get('batch');
-    function endResponse(untransformedJSON, errors) {
-        let status = getHTTPStatusCode(untransformedJSON);
-        const headers = {
-            'Content-Type': 'application/json'
-        };
-        const meta = opts.responseMeta?.({
-            ctx,
-            paths,
-            type,
-            data: Array.isArray(untransformedJSON) ? untransformedJSON : [
-                untransformedJSON
-            ],
-            errors
-        }) ?? {};
-        for (const [key, value] of Object.entries(meta.headers ?? {})){
-            headers[key] = value;
-        }
-        if (meta.status) {
-            status = meta.status;
-        }
-        const transformedJSON = transformTRPCResponse(router, untransformedJSON);
-        const body = JSON.stringify(transformedJSON);
+    if ('data' in item.result) {
         return {
-            body,
-            status,
-            headers
-        };
-    }
-    try {
-        if (opts.error) {
-            throw opts.error;
-        }
-        if (isBatchCall && !batchingEnabled) {
-            throw new Error(`Batching is not enabled on the server`);
-        }
-        if (type === 'subscription') {
-            throw new TRPCError({
-                message: 'Subscriptions should use wsLink',
-                code: 'METHOD_NOT_SUPPORTED'
-            });
-        }
-        if (type === 'unknown') {
-            throw new TRPCError({
-                message: `Unexpected request method ${req.method}`,
-                code: 'METHOD_NOT_SUPPORTED'
-            });
-        }
-        const rawInput = getRawProcedureInputOrThrow(req);
-        paths = isBatchCall ? opts.path.split(',') : [
-            opts.path
-        ];
-        ctx = await createContext();
-        const deserializeInputValue = (rawValue)=>{
-            return typeof rawValue !== 'undefined' ? router._def.transformer.input.deserialize(rawValue) : rawValue;
-        };
-        const getInputs = ()=>{
-            if (!isBatchCall) {
-                return {
-                    0: deserializeInputValue(rawInput)
-                };
-            }
-            if (rawInput == null || typeof rawInput !== 'object' || Array.isArray(rawInput)) {
-                throw new TRPCError({
-                    code: 'BAD_REQUEST',
-                    message: '"input" needs to be an object when doing a batch call'
-                });
-            }
-            const input = {};
-            for(const key in rawInput){
-                const k = key;
-                const rawValue = rawInput[k];
-                const value = deserializeInputValue(rawValue);
-                input[k] = value;
+            ...item,
+            result: {
+                ...item.result,
+                data: router._def.transformer.output.serialize(item.result.data)
             }
-            return input;
         };
-        const inputs = getInputs();
-        const rawResults = await Promise.all(paths.map(async (path, index)=>{
-            const input = inputs[index];
-            try {
-                const output = await callProcedure({
-                    procedures: router._def.procedures,
-                    path,
-                    rawInput: input,
-                    ctx,
-                    type
-                });
-                return {
-                    input,
-                    path,
-                    data: output
-                };
-            } catch (cause) {
-                const error = getTRPCErrorFromUnknown(cause);
-                onError?.({
-                    error,
-                    path,
-                    input,
-                    ctx,
-                    type: type,
-                    req
-                });
-                return {
-                    input,
-                    path,
-                    error
-                };
-            }
-        }));
-        const errors = rawResults.flatMap((obj)=>obj.error ? [
-                obj.error
-            ] : []);
-        const resultEnvelopes = rawResults.map((obj)=>{
-            const { path , input  } = obj;
-            if (obj.error) {
-                return {
-                    error: router.getErrorShape({
-                        error: obj.error,
-                        type,
-                        path,
-                        input,
-                        ctx
-                    })
-                };
-            } else {
-                return {
-                    result: {
-                        data: obj.data
-                    }
-                };
-            }
-        });
-        const result = isBatchCall ? resultEnvelopes : resultEnvelopes[0];
-        return endResponse(result, errors);
-    } catch (cause) {
-        // we get here if
-        // - batching is called when it's not enabled
-        // - `createContext()` throws
-        // - post body is too large
-        // - input deserialization fails
-        const error = getTRPCErrorFromUnknown(cause);
-        onError?.({
-            error,
-            path: undefined,
-            input: undefined,
-            ctx,
-            type: type,
-            req
-        });
-        return endResponse({
-            error: router.getErrorShape({
-                error,
-                type,
-                path: undefined,
-                input: undefined,
-                ctx
-            })
-        }, [
-            error
-        ]);
     }
+    return item;
+}
+/**
+ * Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
+ **/ function transformTRPCResponse(router, itemOrItems) {
+    return Array.isArray(itemOrItems) ? itemOrItems.map((item)=>transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
 }
 
-export { defaultTransformer as a, assertNotBrowser as b, createRouterFactory as c, defaultFormatter as d, callProcedure as e, getHTTPStatusCodeFromError as f, getDataTransformer as g, mergeWithoutOverrides as m, procedureTypes as p, resolveHTTPResponse as r };
+export { defaultTransformer as a, getHTTPStatusCodeFromError as b, createRouterFactory as c, defaultFormatter as d, callProcedure as e, getHTTPStatusCode as f, getDataTransformer as g, isServerDefault as i, mergeWithoutOverrides as m, procedureTypes as p, transformTRPCResponse as t };

package/dist/types.d.ts

@@ -2,12 +2,19 @@
  * @internal
  */
 export declare type identity<TType> = TType;
+declare type InferOptional<TType, TKeys extends keyof TType> = Partial<Pick<TType, TKeys>> & Omit<TType, TKeys>;
+declare type OmitNever<TType> = Pick<TType, {
+    [K in keyof TType]: TType[K] extends never ? never : K;
+}[keyof TType]>;
+declare type UndefinedKeys<TType> = keyof OmitNever<{
+    [K in keyof TType]: TType[K] extends undefined ? TType : never;
+}>;
 /**
  * @internal
  */
-export declare type FlatOverwrite<TType, TWith> = identity<{
+export declare type FlatOverwrite<TType, TWith> = Simplify<InferOptional<{
     [TKey in keyof TWith | keyof TType]: TKey extends keyof TWith ? TWith[TKey] : TKey extends keyof TType ? TType[TKey] : never;
-}>;
+}, UndefinedKeys<TType> | UndefinedKeys<TWith>>>;
 /**
  * @public
  */

package/dist/types.d.ts.map

@@ -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;;GAEG;AACH,oBAAY,aAAa,CAAC,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC;KAChD,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,CAAC,CAAC;AAEH;;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;;GAEG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI;KAAG,OAAO,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;CAAE,CAAC;AAE3E;;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"}
+{"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,QAAQ,CAChD,aAAa,CACX;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,CACF,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;;GAEG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI;KAAG,OAAO,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;CAAE,CAAC;AAE3E;;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

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-proxy-beta.13",
+  "version": "10.0.0-proxy-beta.14",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -122,10 +122,10 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
-    "@trpc/client": "10.0.0-proxy-beta.13",
-    "@trpc/next": "10.0.0-proxy-beta.13",
-    "@trpc/react": "10.0.0-proxy-beta.13",
-    "@trpc/server": "10.0.0-proxy-beta.13",
+    "@trpc/client": "10.0.0-proxy-beta.14",
+    "@trpc/next": "10.0.0-proxy-beta.14",
+    "@trpc/react": "10.0.0-proxy-beta.14",
+    "@trpc/server": "10.0.0-proxy-beta.14",
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
@@ -161,5 +161,5 @@
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "017ac71d5b0cc37d6c1fa22d03377a99a17b6dde"
+  "gitHead": "55d4775d90e8620889a6828a4a3d3373c1bdd5f5"
 }

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,5 +1,4 @@
 import { FastifyReply, FastifyRequest } from 'fastify';
-import { assertNotBrowser } from '../../assertNotBrowser';
 import { AnyRouter, inferRouterContext } from '../../core';
 import {
   HTTPBaseHandlerOptions,
@@ -8,8 +7,6 @@ import {
 import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 import { NodeHTTPCreateContextOption } from '../node-http';
 
-assertNotBrowser();
-
 export type FastifyHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends FastifyRequest,

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -1,11 +1,8 @@
-import { assertNotBrowser } from '../../assertNotBrowser';
 import { AnyRouter } from '../../core';
 import { HTTPRequest } from '../../http/internals/types';
 import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 import { FetchHandlerOptions } from './types';
 
-assertNotBrowser();
-
 export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = {
   req: Request;
   endpoint: string;

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { assertNotBrowser } from '../../assertNotBrowser';
 import { AnyRouter } from '../../core';
 import { inferRouterDef } from '../../core/types';
 import { HTTPRequest } from '../../http/internals/types';
@@ -11,8 +10,6 @@ import {
   NodeHTTPResponse,
 } from './types';
 
-assertNotBrowser();
-
 type NodeHTTPRequestHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends NodeHTTPRequest,

package/src/adapters/ws.ts

@@ -1,6 +1,11 @@
 import { IncomingMessage } from 'http';
 import ws from 'ws';
-import { AnyRouter, ProcedureType, inferRouterContext } from '../core';
+import {
+  AnyRouter,
+  ProcedureType,
+  callProcedure,
+  inferRouterContext,
+} from '../core';
 import { TRPCError } from '../error/TRPCError';
 import { getCauseFromUnknown, getTRPCErrorFromUnknown } from '../error/utils';
 import { transformTRPCResponse } from '../internals/transformTRPCResponse';
@@ -160,8 +165,13 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       try {
         await ctxPromise; // asserts context has been set
 
-        const caller = router.createCaller(ctx);
-        const result = await caller[type](path, input as any);
+        const result = await callProcedure({
+          procedures: router._def.procedures,
+          path,
+          rawInput: input,
+          ctx,
+          type,
+        });
 
         if (type === 'subscription') {
           if (!isObservable(result)) {

package/src/core/initTRPC.ts

@@ -18,6 +18,7 @@ import {
   CreateRootConfig,
   InitGenerics,
   InitOptions,
+  isServerDefault,
 } from './internals/config';
 import { createBuilder } from './internals/procedureBuilder';
 import { PickFirstDefined, ValidateShape } from './internals/utils';
@@ -95,6 +96,17 @@ function createTRPCInner<TParams extends Partial<InitGenerics>>() {
       transformer: $Transformer;
     }>;
 
+    {
+      // Server check
+      const isServer: boolean = options?.isServer ?? isServerDefault;
+
+      if (!isServer && options?.allowOutsideOfServer !== true) {
+        throw new Error(
+          `You're trying to use @trpc/server in a non-server environment. This is not supported by default.`,
+        );
+      }
+    }
+
     const errorFormatter = options?.errorFormatter ?? defaultFormatter;
     const transformer = getDataTransformer(
       options?.transformer ?? defaultTransformer,

package/src/core/internals/config.ts

@@ -12,6 +12,16 @@ export interface InitGenerics {
   ctx: Record<string, unknown>;
   meta: Record<string, unknown>;
 }
+
+/**
+ * The default check to see if we're in a server
+ */
+export const isServerDefault: boolean =
+  typeof window === 'undefined' ||
+  'Deno' in window ||
+  process.env.NODE_ENV === 'test' ||
+  !!process.env.JEST_WORKER_ID;
+
 /**
  * The initial params that are used and actually represents real values underneath
  * @internal
@@ -19,6 +29,15 @@ export interface InitGenerics {
 export interface InitOptions<TType extends InitGenerics> {
   transformer: DataTransformerOptions;
   errorFormatter: ErrorFormatter<TType['ctx'], any>;
+  /**
+   * Allow `@trpc/server` to run in non-server environments
+   * @default false
+   */
+  allowOutsideOfServer: boolean;
+  /**
+   * Is this a server environment?
+   */
+  isServer: boolean;
 }
 
 /**

package/src/core/middleware.ts

@@ -57,7 +57,7 @@ export type MiddlewareFunction<
     path: string;
     input: TParams['_input_out'];
     rawInput: unknown;
-    meta: TParams['_meta'];
+    meta: TParams['_meta'] | undefined;
     next: {
       (): Promise<MiddlewareResult<TParams>>;
       <TContext>(opts: { ctx: TContext }): Promise<

package/src/deprecated/internals/procedure.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { assertNotBrowser } from '../../assertNotBrowser';
 import { TRPCError } from '../../error/TRPCError';
 import {
   getCauseFromUnknown,
@@ -13,8 +12,6 @@ import {
   middlewareMarker,
 } from './middlewares';
 
-assertNotBrowser();
-
 export type ProcedureParserZodEsque<TInput, TOutput> = {
   _input: TInput;
   _output: TOutput;

package/src/deprecated/router.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { assertNotBrowser } from '../assertNotBrowser';
 import { TRPCError } from '../error/TRPCError';
 import { defaultFormatter } from '../error/formatter';
 import { getHTTPStatusCodeFromError } from '../http/internals/getHTTPStatusCode';
@@ -29,8 +28,6 @@ import {
 } from './internals/procedure';
 import { MigrateRouter, migrateRouter } from './interop';
 
-assertNotBrowser();
-
 export type { Procedure } from './internals/procedure';
 
 /**

package/src/http/index.ts

@@ -1,6 +1,2 @@
-import { assertNotBrowser } from '../assertNotBrowser';
-
 export * from './resolveHTTPResponse';
 export * from './types';
-
-assertNotBrowser();

package/src/index.ts

@@ -1,4 +1,3 @@
-export * from './assertNotBrowser';
 export * from './http';
 export * from './transformer';
 export * from './error/TRPCError';

package/src/types.ts

@@ -5,16 +5,37 @@
  */
 export type identity<TType> = TType;
 
+type InferOptional<TType, TKeys extends keyof TType> = Partial<
+  Pick<TType, TKeys>
+> &
+  Omit<TType, TKeys>;
+
+type OmitNever<TType> = Pick<
+  TType,
+  {
+    [K in keyof TType]: TType[K] extends never ? never : K;
+  }[keyof TType]
+>;
+
+type UndefinedKeys<TType> = keyof OmitNever<{
+  [K in keyof TType]: TType[K] extends undefined ? TType : never;
+}>;
+
 /**
  * @internal
  */
-export type FlatOverwrite<TType, TWith> = identity<{
-  [TKey in keyof TWith | keyof TType]: TKey extends keyof TWith
-    ? TWith[TKey]
-    : TKey extends keyof TType
-    ? TType[TKey]
-    : never;
-}>;
+export type FlatOverwrite<TType, TWith> = Simplify<
+  InferOptional<
+    {
+      [TKey in keyof TWith | keyof TType]: TKey extends keyof TWith
+        ? TWith[TKey]
+        : TKey extends keyof TType
+        ? TType[TKey]
+        : never;
+    },
+    UndefinedKeys<TType> | UndefinedKeys<TWith>
+  >
+>;
 
 /**
  * @public

package/dist/assertNotBrowser.d.ts

@@ -1,2 +0,0 @@
-export declare function assertNotBrowser(): void;
-//# sourceMappingURL=assertNotBrowser.d.ts.map

package/dist/assertNotBrowser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"assertNotBrowser.d.ts","sourceRoot":"","sources":["../src/assertNotBrowser.ts"],"names":[],"mappings":"AAEA,wBAAgB,gBAAgB,SAS/B"}