better-call 0.2.13-beta.6 → 0.2.13-beta.8

package/dist/adapter/node.d.cts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'node:http';
 import * as undici_types from 'undici-types';
-import { R as Router } from '../shared/better-call.bb4fb8f1.cjs';
+import { R as Router } from '../shared/better-call.25f0dd59.cjs';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
 import '@asteasolutions/zod-to-openapi';

package/dist/adapter/node.d.mts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'node:http';
 import * as undici_types from 'undici-types';
-import { R as Router } from '../shared/better-call.bb4fb8f1.mjs';
+import { R as Router } from '../shared/better-call.25f0dd59.mjs';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
 import '@asteasolutions/zod-to-openapi';

package/dist/adapter/node.d.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'node:http';
 import * as undici_types from 'undici-types';
-import { R as Router } from '../shared/better-call.bb4fb8f1.js';
+import { R as Router } from '../shared/better-call.25f0dd59.js';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
 import '@asteasolutions/zod-to-openapi';

package/dist/client.d.cts

@@ -1,5 +1,5 @@
 import { BetterFetchOption, BetterFetchResponse } from '@better-fetch/fetch';
-import { R as Router, U as UnionToIntersection, b as Endpoint, H as HasRequiredKeys } from './shared/better-call.bb4fb8f1.cjs';
+import { R as Router, U as UnionToIntersection, b as Endpoint, H as HasRequiredKeys } from './shared/better-call.25f0dd59.cjs';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
 import '@asteasolutions/zod-to-openapi';

package/dist/client.d.mts

@@ -1,5 +1,5 @@
 import { BetterFetchOption, BetterFetchResponse } from '@better-fetch/fetch';
-import { R as Router, U as UnionToIntersection, b as Endpoint, H as HasRequiredKeys } from './shared/better-call.bb4fb8f1.mjs';
+import { R as Router, U as UnionToIntersection, b as Endpoint, H as HasRequiredKeys } from './shared/better-call.25f0dd59.mjs';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
 import '@asteasolutions/zod-to-openapi';

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 import { BetterFetchOption, BetterFetchResponse } from '@better-fetch/fetch';
-import { R as Router, U as UnionToIntersection, b as Endpoint, H as HasRequiredKeys } from './shared/better-call.bb4fb8f1.js';
+import { R as Router, U as UnionToIntersection, b as Endpoint, H as HasRequiredKeys } from './shared/better-call.25f0dd59.js';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
 import '@asteasolutions/zod-to-openapi';

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.bb4fb8f1.cjs';
-export { A as APIError, j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, _ as _statusCode, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.bb4fb8f1.cjs';
+import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.25f0dd59.cjs';
+export { A as APIError, j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, M as MergeObject, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, _ as _statusCode, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.25f0dd59.cjs';
 import { BufferSource } from 'stream/web';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.bb4fb8f1.mjs';
-export { A as APIError, j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, _ as _statusCode, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.bb4fb8f1.mjs';
+import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.25f0dd59.mjs';
+export { A as APIError, j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, M as MergeObject, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, _ as _statusCode, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.25f0dd59.mjs';
 import { BufferSource } from 'stream/web';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.bb4fb8f1.js';
-export { A as APIError, j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, _ as _statusCode, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.bb4fb8f1.js';
+import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.25f0dd59.js';
+export { A as APIError, j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, M as MergeObject, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, _ as _statusCode, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.25f0dd59.js';
 import { BufferSource } from 'stream/web';
 import 'zod';
 import '@asteasolutions/zod-to-openapi/dist/zod-extensions';

package/dist/shared/{better-call.bb4fb8f1.d.cts → better-call.25f0dd59.d.cts}

@@ -21,6 +21,7 @@ type Prettify<T> = {
 } & {};
 type IsEmptyObject<T> = keyof T extends never ? true : false;
 type UnionToIntersection<Union> = (Union extends unknown ? (distributedUnion: Union) => void : never) extends (mergedIntersection: infer Intersection) => void ? Intersection & Union : never;
+type MergeObject<T extends Record<string, any> | never, S extends Record<string, any> | never> = T extends never ? S : S extends never ? T : T & S;
 
 declare module "zod" {
     interface ZodTypeDef {
@@ -85,7 +86,7 @@ type InferParamWildCard<Path> = Path extends `${infer _Start}/*:${infer Param}/$
 type InferParam<Path extends string> = IsEmptyObject<InferParamPath<Path> & InferParamWildCard<Path>> extends true ? never : Prettify<InferParamPath<Path> & InferParamWildCard<Path>>;
 type InferRequest<Option extends EndpointOptions> = Option["requireRequest"] extends true ? Request : Request | undefined;
 type InferHeaders<Option extends EndpointOptions> = Option["requireHeaders"] extends true ? Headers : Headers | undefined;
-type InferUse<Opts extends EndpointOptions["use"]> = Opts extends Endpoint[] ? UnionToIntersection<Awaited<ReturnType<Opts[number]>>> : never;
+type InferUse<Opts extends EndpointOptions["use"]> = Opts extends Endpoint[] ? UnionToIntersection<Awaited<ReturnType<Opts[number]>>> : {};
 type InferMethod<Options extends EndpointOptions> = Options["method"] extends Array<Method> ? Options["method"][number] : Options["method"];
 
 type Cookie = Record<string, string>;
@@ -202,7 +203,7 @@ interface EndpointContext<Path extends string, Options extends EndpointOptions>
      * @param routerResponse - The response object to return if `asResponse` is
      * true in the context this will take precedence
      */
-    json: <R extends Record<string, any>>(json: R, routerResponse?: {
+    json: <R extends Record<string, any> | null>(json: R, routerResponse?: {
         status?: number;
         headers?: Record<string, string>;
         response?: Response;
@@ -331,7 +332,7 @@ interface JSONResponse<R = any> {
      */
     _flag: "json";
 }
-type EndpointResponse = JSONResponse | Response | void | Record<string, any>;
+type EndpointResponse = JSONResponse | Response | void | Record<string, any> | null;
 type InferResponse<Ctx, R> = Ctx extends {
     asResponse: true;
 } ? Response : R extends JSONResponse<infer T> ? T : R;
@@ -366,7 +367,7 @@ declare const createEndpoint: {
 declare function createEndpointCreator<E extends {
     use: Endpoint[];
 }>(opts: E): <Path extends string, Opts extends EndpointOptions, R extends EndpointResponse>(path: Path, options: Opts, handler: <InferE extends EndpointContext<Path, Opts>>(ctx: Omit<InferE, "context"> & {
-    context: InferUse<E["use"]> & (InferE["context"] extends never ? {} : InferE["context"]);
+    context: InferUse<E["use"]> & InferE["context"];
 }) => Promise<R>) => {
     <Ctx extends ({
         body: InferBody<Opts & {
@@ -673,4 +674,4 @@ declare const createRouter: <E extends Record<string, Endpoint>, Config extends
 };
 type Router = ReturnType<typeof createRouter>;
 
-export { APIError as A, type CookiePrefixOptions as C, type EndpointOptions as E, type HasRequiredKeys as H, type InferUse as I, type JSONResponse as J, type Prettify as P, type Router as R, type SignedCookie as S, type UnionToIntersection as U, _statusCode as _, type EndpointResponse as a, type Endpoint as b, type EndpointContext as c, type CookieOptions as d, createEndpoint as e, createRouter as f, type Input as g, type RequiredKeysOf as h, type IsEmptyObject as i, type Context as j, createSetHeader as k, createGetHeader as l, type InferResponse as m, fromError as n, type Cookie as o, type CookieConstraint as p, parse as q, runValidation as r, parseSigned as s, serialize as t, serializeSigned as u };
+export { APIError as A, type CookiePrefixOptions as C, type EndpointOptions as E, type HasRequiredKeys as H, type InferUse as I, type JSONResponse as J, type MergeObject as M, type Prettify as P, type Router as R, type SignedCookie as S, type UnionToIntersection as U, _statusCode as _, type EndpointResponse as a, type Endpoint as b, type EndpointContext as c, type CookieOptions as d, createEndpoint as e, createRouter as f, type Input as g, type RequiredKeysOf as h, type IsEmptyObject as i, type Context as j, createSetHeader as k, createGetHeader as l, type InferResponse as m, fromError as n, type Cookie as o, type CookieConstraint as p, parse as q, runValidation as r, parseSigned as s, serialize as t, serializeSigned as u };

package/dist/shared/{better-call.bb4fb8f1.d.mts → better-call.25f0dd59.d.mts}

@@ -21,6 +21,7 @@ type Prettify<T> = {
 } & {};
 type IsEmptyObject<T> = keyof T extends never ? true : false;
 type UnionToIntersection<Union> = (Union extends unknown ? (distributedUnion: Union) => void : never) extends (mergedIntersection: infer Intersection) => void ? Intersection & Union : never;
+type MergeObject<T extends Record<string, any> | never, S extends Record<string, any> | never> = T extends never ? S : S extends never ? T : T & S;
 
 declare module "zod" {
     interface ZodTypeDef {
@@ -85,7 +86,7 @@ type InferParamWildCard<Path> = Path extends `${infer _Start}/*:${infer Param}/$
 type InferParam<Path extends string> = IsEmptyObject<InferParamPath<Path> & InferParamWildCard<Path>> extends true ? never : Prettify<InferParamPath<Path> & InferParamWildCard<Path>>;
 type InferRequest<Option extends EndpointOptions> = Option["requireRequest"] extends true ? Request : Request | undefined;
 type InferHeaders<Option extends EndpointOptions> = Option["requireHeaders"] extends true ? Headers : Headers | undefined;
-type InferUse<Opts extends EndpointOptions["use"]> = Opts extends Endpoint[] ? UnionToIntersection<Awaited<ReturnType<Opts[number]>>> : never;
+type InferUse<Opts extends EndpointOptions["use"]> = Opts extends Endpoint[] ? UnionToIntersection<Awaited<ReturnType<Opts[number]>>> : {};
 type InferMethod<Options extends EndpointOptions> = Options["method"] extends Array<Method> ? Options["method"][number] : Options["method"];
 
 type Cookie = Record<string, string>;
@@ -202,7 +203,7 @@ interface EndpointContext<Path extends string, Options extends EndpointOptions>
      * @param routerResponse - The response object to return if `asResponse` is
      * true in the context this will take precedence
      */
-    json: <R extends Record<string, any>>(json: R, routerResponse?: {
+    json: <R extends Record<string, any> | null>(json: R, routerResponse?: {
         status?: number;
         headers?: Record<string, string>;
         response?: Response;
@@ -331,7 +332,7 @@ interface JSONResponse<R = any> {
      */
     _flag: "json";
 }
-type EndpointResponse = JSONResponse | Response | void | Record<string, any>;
+type EndpointResponse = JSONResponse | Response | void | Record<string, any> | null;
 type InferResponse<Ctx, R> = Ctx extends {
     asResponse: true;
 } ? Response : R extends JSONResponse<infer T> ? T : R;
@@ -366,7 +367,7 @@ declare const createEndpoint: {
 declare function createEndpointCreator<E extends {
     use: Endpoint[];
 }>(opts: E): <Path extends string, Opts extends EndpointOptions, R extends EndpointResponse>(path: Path, options: Opts, handler: <InferE extends EndpointContext<Path, Opts>>(ctx: Omit<InferE, "context"> & {
-    context: InferUse<E["use"]> & (InferE["context"] extends never ? {} : InferE["context"]);
+    context: InferUse<E["use"]> & InferE["context"];
 }) => Promise<R>) => {
     <Ctx extends ({
         body: InferBody<Opts & {
@@ -673,4 +674,4 @@ declare const createRouter: <E extends Record<string, Endpoint>, Config extends
 };
 type Router = ReturnType<typeof createRouter>;
 
-export { APIError as A, type CookiePrefixOptions as C, type EndpointOptions as E, type HasRequiredKeys as H, type InferUse as I, type JSONResponse as J, type Prettify as P, type Router as R, type SignedCookie as S, type UnionToIntersection as U, _statusCode as _, type EndpointResponse as a, type Endpoint as b, type EndpointContext as c, type CookieOptions as d, createEndpoint as e, createRouter as f, type Input as g, type RequiredKeysOf as h, type IsEmptyObject as i, type Context as j, createSetHeader as k, createGetHeader as l, type InferResponse as m, fromError as n, type Cookie as o, type CookieConstraint as p, parse as q, runValidation as r, parseSigned as s, serialize as t, serializeSigned as u };
+export { APIError as A, type CookiePrefixOptions as C, type EndpointOptions as E, type HasRequiredKeys as H, type InferUse as I, type JSONResponse as J, type MergeObject as M, type Prettify as P, type Router as R, type SignedCookie as S, type UnionToIntersection as U, _statusCode as _, type EndpointResponse as a, type Endpoint as b, type EndpointContext as c, type CookieOptions as d, createEndpoint as e, createRouter as f, type Input as g, type RequiredKeysOf as h, type IsEmptyObject as i, type Context as j, createSetHeader as k, createGetHeader as l, type InferResponse as m, fromError as n, type Cookie as o, type CookieConstraint as p, parse as q, runValidation as r, parseSigned as s, serialize as t, serializeSigned as u };

package/dist/shared/{better-call.bb4fb8f1.d.ts → better-call.25f0dd59.d.ts}

@@ -21,6 +21,7 @@ type Prettify<T> = {
 } & {};
 type IsEmptyObject<T> = keyof T extends never ? true : false;
 type UnionToIntersection<Union> = (Union extends unknown ? (distributedUnion: Union) => void : never) extends (mergedIntersection: infer Intersection) => void ? Intersection & Union : never;
+type MergeObject<T extends Record<string, any> | never, S extends Record<string, any> | never> = T extends never ? S : S extends never ? T : T & S;
 
 declare module "zod" {
     interface ZodTypeDef {
@@ -85,7 +86,7 @@ type InferParamWildCard<Path> = Path extends `${infer _Start}/*:${infer Param}/$
 type InferParam<Path extends string> = IsEmptyObject<InferParamPath<Path> & InferParamWildCard<Path>> extends true ? never : Prettify<InferParamPath<Path> & InferParamWildCard<Path>>;
 type InferRequest<Option extends EndpointOptions> = Option["requireRequest"] extends true ? Request : Request | undefined;
 type InferHeaders<Option extends EndpointOptions> = Option["requireHeaders"] extends true ? Headers : Headers | undefined;
-type InferUse<Opts extends EndpointOptions["use"]> = Opts extends Endpoint[] ? UnionToIntersection<Awaited<ReturnType<Opts[number]>>> : never;
+type InferUse<Opts extends EndpointOptions["use"]> = Opts extends Endpoint[] ? UnionToIntersection<Awaited<ReturnType<Opts[number]>>> : {};
 type InferMethod<Options extends EndpointOptions> = Options["method"] extends Array<Method> ? Options["method"][number] : Options["method"];
 
 type Cookie = Record<string, string>;
@@ -202,7 +203,7 @@ interface EndpointContext<Path extends string, Options extends EndpointOptions>
      * @param routerResponse - The response object to return if `asResponse` is
      * true in the context this will take precedence
      */
-    json: <R extends Record<string, any>>(json: R, routerResponse?: {
+    json: <R extends Record<string, any> | null>(json: R, routerResponse?: {
         status?: number;
         headers?: Record<string, string>;
         response?: Response;
@@ -331,7 +332,7 @@ interface JSONResponse<R = any> {
      */
     _flag: "json";
 }
-type EndpointResponse = JSONResponse | Response | void | Record<string, any>;
+type EndpointResponse = JSONResponse | Response | void | Record<string, any> | null;
 type InferResponse<Ctx, R> = Ctx extends {
     asResponse: true;
 } ? Response : R extends JSONResponse<infer T> ? T : R;
@@ -366,7 +367,7 @@ declare const createEndpoint: {
 declare function createEndpointCreator<E extends {
     use: Endpoint[];
 }>(opts: E): <Path extends string, Opts extends EndpointOptions, R extends EndpointResponse>(path: Path, options: Opts, handler: <InferE extends EndpointContext<Path, Opts>>(ctx: Omit<InferE, "context"> & {
-    context: InferUse<E["use"]> & (InferE["context"] extends never ? {} : InferE["context"]);
+    context: InferUse<E["use"]> & InferE["context"];
 }) => Promise<R>) => {
     <Ctx extends ({
         body: InferBody<Opts & {
@@ -673,4 +674,4 @@ declare const createRouter: <E extends Record<string, Endpoint>, Config extends
 };
 type Router = ReturnType<typeof createRouter>;
 
-export { APIError as A, type CookiePrefixOptions as C, type EndpointOptions as E, type HasRequiredKeys as H, type InferUse as I, type JSONResponse as J, type Prettify as P, type Router as R, type SignedCookie as S, type UnionToIntersection as U, _statusCode as _, type EndpointResponse as a, type Endpoint as b, type EndpointContext as c, type CookieOptions as d, createEndpoint as e, createRouter as f, type Input as g, type RequiredKeysOf as h, type IsEmptyObject as i, type Context as j, createSetHeader as k, createGetHeader as l, type InferResponse as m, fromError as n, type Cookie as o, type CookieConstraint as p, parse as q, runValidation as r, parseSigned as s, serialize as t, serializeSigned as u };
+export { APIError as A, type CookiePrefixOptions as C, type EndpointOptions as E, type HasRequiredKeys as H, type InferUse as I, type JSONResponse as J, type MergeObject as M, type Prettify as P, type Router as R, type SignedCookie as S, type UnionToIntersection as U, _statusCode as _, type EndpointResponse as a, type Endpoint as b, type EndpointContext as c, type CookieOptions as d, createEndpoint as e, createRouter as f, type Input as g, type RequiredKeysOf as h, type IsEmptyObject as i, type Context as j, createSetHeader as k, createGetHeader as l, type InferResponse as m, fromError as n, type Cookie as o, type CookieConstraint as p, parse as q, runValidation as r, parseSigned as s, serialize as t, serializeSigned as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-call",
-  "version": "0.2.13-beta.6",
+  "version": "0.2.13-beta.8",
   "description": "",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",