@apisr/response 0.0.2 → 0.0.3

package/dist/error/default.mjs

@@ -3,6 +3,10 @@ import { zod } from "../zod/dist/index.mjs";
 //#region src/error/default.ts
 function generateDefaultErrors(_mapDefaultError) {
 	const mapDefaultError = _mapDefaultError ?? ((err) => err);
+	const resolveCause = (input) => {
+		if (typeof input !== "object" || input === null || !("cause" in input)) return;
+		return input.cause;
+	};
 	const inputSchema = zod.object({ cause: zod.any().optional() }).optional();
 	return {
 		unauthorized: {
@@ -10,7 +14,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Unauthorized",
 				code: "UNAUTHORIZED",
 				name: "UnauthorizedError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,
@@ -23,7 +27,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Forbidden",
 				code: "FORBIDDEN",
 				name: "ForbiddenError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,
@@ -36,7 +40,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Not Found",
 				code: "NOT_FOUND",
 				name: "NotFoundError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,
@@ -49,7 +53,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Bad Request",
 				code: "BAD_REQUEST",
 				name: "BadRequestError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,
@@ -62,7 +66,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Conflict",
 				code: "CONFLICT",
 				name: "ConflictError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,
@@ -75,7 +79,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Too Many Requests",
 				code: "TOO_MANY_REQUESTS",
 				name: "TooManyRequestsError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,
@@ -88,7 +92,7 @@ function generateDefaultErrors(_mapDefaultError) {
 				message: "Internal Server Error",
 				code: "INTERNAL_SERVER_ERROR",
 				name: "InternalServerError",
-				cause: input.cause
+				cause: resolveCause(input)
 			}),
 			options: {
 				input: inputSchema,

package/dist/error/index.d.mts

@@ -11,9 +11,14 @@ type DefaultError = {
   cause?: unknown;
   stack?: string[];
 };
+type InferErrorHandlerInput<THandlerOptions extends ErrorHandlerOptions | undefined> = THandlerOptions extends {
+  input: infer TSchema;
+} ? TSchema extends Schema ? Infer<TSchema> : never : THandlerOptions extends {
+  input?: infer TSchema;
+} ? TSchema extends Schema ? Infer<TSchema> | undefined : undefined : never;
 type ErrorHandler<TOptions extends Options, THandlerOptions extends ErrorHandlerOptions | undefined> = (data: {
   meta: TOptions["meta"] extends undefined ? never : Infer<ExtractSchema<TOptions["meta"]>>;
-  input: THandlerOptions extends undefined ? never : Infer<Exclude<THandlerOptions, undefined>["input"]>;
+  input: InferErrorHandlerInput<THandlerOptions>;
 }) => ErrorOptions.InferedSchema<TOptions>;
 interface ErrorHandlerOptions<TSchema extends Schema = Schema> {
   input?: TSchema;

package/dist/handler.d.mts

@@ -1,11 +1,11 @@
 import { PromiseOr } from "./types.mjs";
-import { MetaOptions } from "./options/meta.mjs";
-import { ErrorOptions } from "./options/error.mjs";
 import { BaseResponse } from "./response/base.mjs";
-import { JsonResponse } from "./response/json/index.mjs";
-import { JsonOptions } from "./options/json.mjs";
 import { Binary, BinaryResponse } from "./response/binary/index.mjs";
 import { BinaryOptions } from "./options/binary.mjs";
+import { ErrorOptions } from "./options/error.mjs";
+import { JsonResponse } from "./response/json/index.mjs";
+import { JsonOptions } from "./options/json.mjs";
+import { MetaOptions } from "./options/meta.mjs";
 import { ErrorResponse } from "./response/error/index.mjs";
 import { DefaultResponse } from "./response/default.mjs";
 import { Options } from "./options/base.mjs";

package/dist/handler.mjs

@@ -1,5 +1,5 @@
-import { checkSchema } from "./schema/dist/index.mjs";
 import { generateDefaultErrors } from "./error/default.mjs";
+import { checkSchema } from "./schema/dist/index.mjs";
 import { resolveHeaders } from "./headers.mjs";
 import { options } from "./options/index.mjs";
 import { BaseResponse } from "./response/base.mjs";

package/dist/index.d.mts

@@ -1,13 +1,13 @@
-import { DefaultMeta } from "./response/meta/index.mjs";
 import { AnyObject, FunctionObject, PromiseOr } from "./types.mjs";
-import { MetaOptions, meta } from "./options/meta.mjs";
 import { Headers, RawHeaders, resolveHeaders } from "./headers.mjs";
-import { ErrorOptions, error } from "./options/error.mjs";
 import { BaseResponse, ResponseTypes } from "./response/base.mjs";
-import { JsonResponse } from "./response/json/index.mjs";
-import { JsonOptions, json } from "./options/json.mjs";
 import { Binary, BinaryResponse } from "./response/binary/index.mjs";
 import { BinaryOptions, binary } from "./options/binary.mjs";
+import { ErrorOptions, error } from "./options/error.mjs";
+import { JsonResponse } from "./response/json/index.mjs";
+import { JsonOptions, json } from "./options/json.mjs";
+import { DefaultMeta } from "./response/meta/index.mjs";
+import { MetaOptions, meta } from "./options/meta.mjs";
 import { ErrorResponse } from "./response/error/index.mjs";
 import { DefaultResponse } from "./response/default.mjs";
 import { Options } from "./options/base.mjs";

package/dist/index.mjs

@@ -1,9 +1,10 @@
 import { generateDefaultErrors } from "./error/default.mjs";
+import "./error/index.mjs";
 import { resolveHeaders } from "./headers.mjs";
+import { binary } from "./options/binary.mjs";
+import { error } from "./options/error.mjs";
 import { json } from "./options/json.mjs";
 import { meta } from "./options/meta.mjs";
-import { error } from "./options/error.mjs";
-import { binary } from "./options/binary.mjs";
 import { options } from "./options/index.mjs";
 import { BaseResponse } from "./response/base.mjs";
 import { BinaryResponse } from "./response/binary/index.mjs";
@@ -11,8 +12,7 @@ import { ErrorResponse } from "./response/error/index.mjs";
 import { JsonResponse } from "./response/json/index.mjs";
 import { TextResponse } from "./response/text/index.mjs";
 import { ResponseHandler, createResponseHandler } from "./handler.mjs";
-import { responseSymbol } from "./symbol.mjs";
 import "./response/index.mjs";
-import "./error/index.mjs";
+import { responseSymbol } from "./symbol.mjs";
 
 export { BaseResponse, BinaryResponse, ErrorResponse, JsonResponse, ResponseHandler, TextResponse, binary, createResponseHandler, error, generateDefaultErrors, json, meta, options, resolveHeaders, responseSymbol };

package/dist/options/base.d.mts

@@ -1,28 +1,28 @@
 import { PromiseOr } from "../types.mjs";
-import { MetaOptions } from "./meta.mjs";
 import { Headers } from "../headers.mjs";
-import { ErrorOptions } from "./error.mjs";
 import { BaseResponse, ResponseTypes } from "../response/base.mjs";
-import { JsonOptions } from "./json.mjs";
 import { Binary } from "../response/binary/index.mjs";
 import { BinaryOptions } from "./binary.mjs";
+import { ErrorOptions } from "./error.mjs";
+import { JsonOptions } from "./json.mjs";
+import { MetaOptions } from "./meta.mjs";
 import { DefaultResponse } from "../response/default.mjs";
 
 //#region src/options/base.d.ts
 interface Options<TMeta extends MetaOptions.Base = MetaOptions.Base, TError extends ErrorOptions.Base = ErrorOptions.Base, TJson extends JsonOptions.Base = JsonOptions.Base, TBinary extends BinaryOptions.Base = BinaryOptions.Base> {
+  binary?: TBinary;
+  error?: TError;
   headers?: Headers<{
     type: ResponseTypes;
     data: any;
   }>;
-  meta?: TMeta;
-  error?: TError;
   json?: TJson;
-  binary?: TBinary;
   mapResponse?(data: {
     data: JsonOptions.InferedSchemaFromBase<TJson> | Binary | string;
     error: ErrorOptions.InferedSchemaFromBase<TError>;
     response: BaseResponse.Base<DefaultResponse>;
   }): PromiseOr<Response>;
+  meta?: TMeta;
 }
 //#endregion
 export { Options };

package/dist/options/index.d.mts

@@ -1,7 +1,7 @@
-import { MetaOptions, meta } from "./meta.mjs";
+import { BinaryOptions, binary } from "./binary.mjs";
 import { ErrorOptions, error } from "./error.mjs";
 import { JsonOptions, json } from "./json.mjs";
-import { BinaryOptions, binary } from "./binary.mjs";
+import { MetaOptions, meta } from "./meta.mjs";
 import { Options } from "./base.mjs";
 
 //#region src/options/index.d.ts

package/dist/options/index.mjs

@@ -1,7 +1,7 @@
+import { binary } from "./binary.mjs";
+import { error } from "./error.mjs";
 import { json } from "./json.mjs";
 import { meta } from "./meta.mjs";
-import { error } from "./error.mjs";
-import { binary } from "./binary.mjs";
 
 //#region src/options/index.ts
 const options = {

package/dist/options/meta.d.mts

@@ -1,5 +1,5 @@
-import { DefaultMeta } from "../response/meta/index.mjs";
 import { FunctionObject } from "../types.mjs";
+import { DefaultMeta } from "../response/meta/index.mjs";
 import { Options } from "./base.mjs";
 
 //#region src/options/meta.d.ts

package/dist/response/base.d.mts

@@ -4,9 +4,9 @@ import { RawHeaders } from "../headers.mjs";
 type ResponseTypes = "json" | "binary" | "text" | "error";
 declare namespace BaseResponse {
   interface Options {
+    headers?: RawHeaders;
     status?: number;
     statusText?: string;
-    headers?: RawHeaders;
   }
   class Base<TPayload> extends Response {
     payload: TPayload | undefined;

package/dist/response/default.d.mts

@@ -2,10 +2,10 @@ import { ErrorResponse } from "./error/index.mjs";
 
 //#region src/response/default.d.ts
 interface DefaultResponse<TData = unknown> {
-  success: boolean;
-  error: ErrorResponse.Base<any, any, any> | null;
   data: TData | null;
+  error: ErrorResponse.Base<any, any, any> | null;
   metadata: Record<string, unknown>;
+  success: boolean;
 }
 //#endregion
 export { DefaultResponse };

package/dist/schema/dist/index.mjs

@@ -1,111 +1,6 @@
-import z from "zod";
+import { resolveZodSchemaFromSources, z } from "./zod/dist/index.mjs";
 
 //#region ../schema/dist/index.mjs
-/**
-* Extracts `from` metadata from each field of a zod object schema.
-*
-* @example
-* ```ts
-* const schema = z.object({
-*   name: z.string().from("body"),
-*   id: z.string().from("params"),
-*   token: z.string().from("headers", { key: "authorization" }),
-* });
-*
-* resolveZodSchemaMeta(schema);
-* // => {
-* //   name:  { from: "body" },
-* //   id:    { from: "params" },
-* //   token: { from: "headers", key: "authorization" },
-* // }
-* ```
-*/
-function resolveZodSchemaMeta(schema) {
-	const shape = schema._zod.def.shape;
-	const result = {};
-	for (const fieldName in shape) {
-		const fieldSchema = shape[fieldName];
-		const meta = resolveFieldMeta(fieldSchema);
-		if (meta) result[fieldName] = meta;
-	}
-	return result;
-}
-function resolveFieldMeta(schema) {
-	const meta = z.globalRegistry.get(schema);
-	if (meta && typeof meta.from === "string") {
-		const key = meta.key ?? meta.fromKey;
-		return {
-			from: meta.from,
-			...key !== void 0 ? { key } : {}
-		};
-	}
-	const def = schema._zod?.def;
-	if (def?.innerType) return resolveFieldMeta(def.innerType);
-}
-/**
-* Resolves field values from dynamic sources based on the schema's `from` metadata.
-*
-* Sources is a map where keys match possible `from` values
-* (e.g. `"query"`, `"params"`, `"body"`, `"headers"`, `"handler.payload"`)
-* and values are the corresponding data objects.
-*
-* @example
-* ```ts
-* const schema = z.object({
-*   name: z.string().from("body"),
-*   id: z.string().from("params"),
-*   search: z.string().from("query"),
-*   auth: z.string().from("headers", { key: "authorization" }),
-*   prev: z.string().from("handler.payload", { key: "name" }),
-* });
-*
-* const resolved = resolveZodSchemaFromSources(schema, {
-*   body:   { name: "John" },
-*   params: { id: "42" },
-*   query:  { search: "test" },
-*   headers: { authorization: "Bearer ..." },
-*   "handler.payload": { name: "prev-value" },
-* });
-* // => { name: "John", id: "42", search: "test", auth: "Bearer ...", prev: "prev-value" }
-* ```
-*/
-function resolveZodSchemaFromSources(schema, sources) {
-	const fieldsMeta = resolveZodSchemaMeta(schema);
-	const result = {};
-	for (const [fieldName, meta] of Object.entries(fieldsMeta)) {
-		const source = sources[meta.from];
-		if (!source) continue;
-		const keys = meta.key ? Array.isArray(meta.key) ? meta.key : [meta.key] : [fieldName];
-		for (const k of keys) {
-			const value = getNestedValue(source, k);
-			if (value !== void 0) {
-				result[fieldName] = value;
-				break;
-			}
-		}
-	}
-	return result;
-}
-function getNestedValue(obj, path) {
-	const parts = path.split(".");
-	let current = obj;
-	for (const part of parts) {
-		if (current === null || current === void 0 || typeof current !== "object") return;
-		current = current[part];
-	}
-	return current;
-}
-function extendZod(zod) {
-	if (typeof zod.ZodType.prototype.from !== "undefined") return zod;
-	zod.ZodType.prototype.from = function(from, options) {
-		return this.meta({
-			from,
-			...options ?? {}
-		});
-	};
-	return zod;
-}
-extendZod(z);
 function checkSchema(schema, input, options) {
 	const validationType = options?.validationType ?? "parse";
 	let resolved = input;
@@ -114,7 +9,7 @@ function checkSchema(schema, input, options) {
 		...resolveZodSchemaFromSources(schema, options.sources)
 	};
 	if (validationType === "parse") return schema.parse(resolved) ?? null;
-	else if (validationType === "safeParse") {
+	if (validationType === "safeParse") {
 		const { data } = schema.safeParse(resolved);
 		return data ?? null;
 	}

package/dist/schema/dist/zod/dist/index.mjs

@@ -0,0 +1,111 @@
+import z, { default as z$1 } from "zod";
+
+//#region ../schema/dist/zod/dist/index.mjs
+/**
+* Extracts `from` metadata from each field of a zod object schema.
+*
+* @example
+* ```ts
+* const schema = z.object({
+*   name: z.string().from("body"),
+*   id: z.string().from("params"),
+*   token: z.string().from("headers", { key: "authorization" }),
+* });
+*
+* resolveZodSchemaMeta(schema);
+* // => {
+* //   name:  { from: "body" },
+* //   id:    { from: "params" },
+* //   token: { from: "headers", key: "authorization" },
+* // }
+* ```
+*/
+function resolveZodSchemaMeta(schema) {
+	const shape = schema._zod.def.shape;
+	const result = {};
+	for (const fieldName in shape) {
+		const fieldSchema = shape[fieldName];
+		const meta = resolveFieldMeta(fieldSchema);
+		if (meta) result[fieldName] = meta;
+	}
+	return result;
+}
+function resolveFieldMeta(schema) {
+	const meta = z$1.globalRegistry.get(schema);
+	if (meta && typeof meta.from === "string") {
+		const key = meta.key ?? meta.fromKey;
+		return {
+			from: meta.from,
+			...key !== void 0 ? { key } : {}
+		};
+	}
+	const def = schema._zod?.def;
+	if (def?.innerType) return resolveFieldMeta(def.innerType);
+}
+/**
+* Resolves field values from dynamic sources based on the schema's `from` metadata.
+*
+* Sources is a map where keys match possible `from` values
+* (e.g. `"query"`, `"params"`, `"body"`, `"headers"`, `"handler.payload"`)
+* and values are the corresponding data objects.
+*
+* @example
+* ```ts
+* const schema = z.object({
+*   name: z.string().from("body"),
+*   id: z.string().from("params"),
+*   search: z.string().from("query"),
+*   auth: z.string().from("headers", { key: "authorization" }),
+*   prev: z.string().from("handler.payload", { key: "name" }),
+* });
+*
+* const resolved = resolveZodSchemaFromSources(schema, {
+*   body:   { name: "John" },
+*   params: { id: "42" },
+*   query:  { search: "test" },
+*   headers: { authorization: "Bearer ..." },
+*   "handler.payload": { name: "prev-value" },
+* });
+* // => { name: "John", id: "42", search: "test", auth: "Bearer ...", prev: "prev-value" }
+* ```
+*/
+function resolveZodSchemaFromSources(schema, sources) {
+	const fieldsMeta = resolveZodSchemaMeta(schema);
+	const result = {};
+	for (const [fieldName, meta] of Object.entries(fieldsMeta)) {
+		const source = sources[meta.from];
+		if (!source) continue;
+		const keys = meta.key ? Array.isArray(meta.key) ? meta.key : [meta.key] : [fieldName];
+		for (const k of keys) {
+			const value = getNestedValue(source, k);
+			if (value !== void 0) {
+				result[fieldName] = value;
+				break;
+			}
+		}
+	}
+	return result;
+}
+function getNestedValue(obj, path) {
+	const parts = path.split(".");
+	let current = obj;
+	for (const part of parts) {
+		if (current === null || current === void 0 || typeof current !== "object") return;
+		current = current[part];
+	}
+	return current;
+}
+function extendZod(zod) {
+	if (typeof zod.ZodType.prototype.from !== "undefined") return zod;
+	zod.ZodType.prototype.from = function(from, options) {
+		return this.meta({
+			from,
+			...options ?? {}
+		});
+	};
+	return zod;
+}
+extendZod(z);
+
+//#endregion
+export { resolveZodSchemaFromSources, z };

package/dist/types.d.mts

@@ -1,6 +1,6 @@
 //#region src/types.d.ts
 type AnyObject = Record<string, any>;
-type FunctionObject<TResult extends any, TFnArg = never> = TResult | ((TFnArg extends never ? (() => TResult) : ((arg: TFnArg) => TResult)));
+type FunctionObject<TResult, TFnArg = never> = TResult | (TFnArg extends never ? () => TResult : (arg: TFnArg) => TResult);
 type PromiseOr<T> = PromiseLike<T> | T;
 //#endregion
 export { AnyObject, FunctionObject, PromiseOr };

package/dist/zod/dist/index.mjs

@@ -11,7 +11,7 @@ function extendZod(zod) {
 	};
 	return zod;
 }
-const zod = extendZod(z$1);
+const zod = extendZod(z);
 
 //#endregion
 export { zod };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apisr/response",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "module": "src/index.ts",
   "devDependencies": {
     "@repo/eslint-config": "*",

package/src/error/default.ts

@@ -6,6 +6,13 @@ export function generateDefaultErrors<TOptions extends Options>(
 	_mapDefaultError: ErrorOptions.Base["mapDefaultError"]
 ): ErrorRegistry<TOptions> {
 	const mapDefaultError = _mapDefaultError ?? ((err) => err);
+	const resolveCause = (input: unknown): unknown => {
+		if (typeof input !== "object" || input === null || !("cause" in input)) {
+			return undefined;
+		}
+
+		return (input as { cause?: unknown }).cause;
+	};
 
 	const inputSchema = z
 		.object({
@@ -20,7 +27,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Unauthorized",
 					code: "UNAUTHORIZED",
 					name: "UnauthorizedError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,
@@ -35,7 +42,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Forbidden",
 					code: "FORBIDDEN",
 					name: "ForbiddenError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,
@@ -50,7 +57,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Not Found",
 					code: "NOT_FOUND",
 					name: "NotFoundError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,
@@ -65,7 +72,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Bad Request",
 					code: "BAD_REQUEST",
 					name: "BadRequestError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,
@@ -80,7 +87,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Conflict",
 					code: "CONFLICT",
 					name: "ConflictError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,
@@ -95,7 +102,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Too Many Requests",
 					code: "TOO_MANY_REQUESTS",
 					name: "TooManyRequestsError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,
@@ -110,7 +117,7 @@ export function generateDefaultErrors<TOptions extends Options>(
 					message: "Internal Server Error",
 					code: "INTERNAL_SERVER_ERROR",
 					name: "InternalServerError",
-					cause: input.cause,
+					cause: resolveCause(input),
 				}),
 			options: {
 				input: inputSchema,

package/src/error/index.ts

@@ -28,6 +28,22 @@ export type DefaultError = {
 	stack?: string[];
 };
 
+type InferErrorHandlerInput<
+	THandlerOptions extends ErrorHandlerOptions | undefined,
+> = THandlerOptions extends {
+	input: infer TSchema;
+}
+	? TSchema extends Schema
+		? Infer<TSchema>
+		: never
+	: THandlerOptions extends {
+				input?: infer TSchema;
+			}
+		? TSchema extends Schema
+			? Infer<TSchema> | undefined
+			: undefined
+		: never;
+
 export type ErrorHandler<
 	TOptions extends Options,
 	THandlerOptions extends ErrorHandlerOptions | undefined,
@@ -35,9 +51,7 @@ export type ErrorHandler<
 	meta: TOptions["meta"] extends undefined
 		? never
 		: Infer<ExtractSchema<TOptions["meta"]>>;
-	input: THandlerOptions extends undefined
-		? never
-		: Infer<Exclude<THandlerOptions, undefined>["input"]>;
+	input: InferErrorHandlerInput<THandlerOptions>;
 }) => ErrorOptions.InferedSchema<TOptions>;
 
 export interface ErrorHandlerOptions<TSchema extends Schema = Schema> {