@congruent-stack/congruent-api 0.12.2 → 0.14.0

package/dist/index.cjs

@@ -1,5 +1,8 @@
 'use strict';
 
+var zod = require('zod');
+var mini = require('zod/v4/mini');
+
 function endpoint(definition) {
   return new HttpMethodEndpoint(definition);
 }
@@ -321,9 +324,19 @@ function parseRequestDefinitionField(definition, key, requestObject) {
             }
             break;
         }
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
         return {
           code: HttpStatusCode.BadRequest_400,
-          body: `'${key}' is required for this endpoint` + (key === "body" ? ", { 'Content-Type': 'application/json' } header might be missing" : "")
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
         };
       }
       return result2.data;
@@ -332,7 +345,10 @@ function parseRequestDefinitionField(definition, key, requestObject) {
     if (!result.success) {
       return {
         code: HttpStatusCode.BadRequest_400,
-        body: result.error.issues
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: zod.treeifyError(result.error)
       };
     }
     return result.data;
@@ -563,9 +579,19 @@ function middlewareParseRequestDefinitionField(middlewareSchemas, key, requestOb
             }
             break;
         }
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
         return {
           code: HttpStatusCode.BadRequest_400,
-          body: `'${key}' is required for this endpoint` + (key === "body" ? ", { 'Content-Type': 'application/json' } header might be missing" : "")
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
         };
       }
       return result2.data;
@@ -574,7 +600,10 @@ function middlewareParseRequestDefinitionField(middlewareSchemas, key, requestOb
     if (!result.success) {
       return {
         code: HttpStatusCode.BadRequest_400,
-        body: result.error.issues
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: zod.treeifyError(result.error)
       };
     }
     return result.data;
@@ -740,6 +769,15 @@ function partialPathString(_apiReg, path) {
   return path;
 }
 
+var RequestFailureCode = /* @__PURE__ */ ((RequestFailureCode2) => {
+  RequestFailureCode2[RequestFailureCode2["ErrorThrown"] = -1] = "ErrorThrown";
+  RequestFailureCode2[RequestFailureCode2["SchemaValidationFailed"] = -2] = "SchemaValidationFailed";
+  return RequestFailureCode2;
+})(RequestFailureCode || {});
+function isRequestFailureSchemaValidationFailedOutput(output) {
+  return typeof output === "object" && output !== null && "code" in output && output.code === -2 /* SchemaValidationFailed */;
+}
+
 function createClient(contract, clientGenericHandler) {
   const apiClient = new ApiClient(contract, clientGenericHandler);
   return apiClient;
@@ -783,9 +821,22 @@ class InnerApiClient {
         currObj[key] = (requestObject) => {
           const pathParams = { ...client.__CONTEXT__.pathParameters };
           client.__CONTEXT__ = InnerApiClient._initNewContext();
+          let schemaValidationRequestFailureOutput = null;
           const headers = clientParseRequestDefinitionField(val.definition, "headers", requestObject);
+          if (isRequestFailureSchemaValidationFailedOutput(headers)) {
+            schemaValidationRequestFailureOutput = headers;
+            return schemaValidationRequestFailureOutput;
+          }
           const query = clientParseRequestDefinitionField(val.definition, "query", requestObject);
+          if (isRequestFailureSchemaValidationFailedOutput(query)) {
+            schemaValidationRequestFailureOutput = query;
+            return schemaValidationRequestFailureOutput;
+          }
           const body = clientParseRequestDefinitionField(val.definition, "body", requestObject);
+          if (isRequestFailureSchemaValidationFailedOutput(body)) {
+            schemaValidationRequestFailureOutput = body;
+            return schemaValidationRequestFailureOutput;
+          }
           const path = `/${val.pathSegments.map(
             (segment) => segment.startsWith(":") ? pathParams[segment.slice(1)] ?? "?" : segment
           ).join("/")}`;
@@ -824,13 +875,32 @@ function clientParseRequestDefinitionField(definition, key, requestObject) {
             }
             break;
         }
-        throw new Error(`'${key}' is required for this endpoint`);
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
+        return {
+          code: RequestFailureCode.SchemaValidationFailed,
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
+        };
       }
       return result2.data;
     }
     const result = definition[key].safeParse(requestObject[key]);
     if (!result.success) {
-      throw new Error(`Validation for '${key}' failed`, { cause: result.error });
+      return {
+        code: RequestFailureCode.SchemaValidationFailed,
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: mini.treeifyError(result.error)
+      };
     }
     return result.data;
   }
@@ -905,6 +975,15 @@ class DIContainer extends DIContainerBase {
     this._map.set(serviceNameCapitalizedLiteral, entry);
     return this;
   }
+  registerTransient(serviceNameCapitalizedLiteral, factory) {
+    return this.register(serviceNameCapitalizedLiteral, factory, "transient");
+  }
+  registerScoped(serviceNameCapitalizedLiteral, factory) {
+    return this.register(serviceNameCapitalizedLiteral, factory, "scoped");
+  }
+  registerSingleton(serviceNameCapitalizedLiteral, factory) {
+    return this.register(serviceNameCapitalizedLiteral, factory, "singleton");
+  }
   createTestClone() {
     return new DIContainerTestClone(this);
   }
@@ -950,7 +1029,11 @@ async function triggerEndpointDecoratorNoStaticTypeCheck(endpoint, decorator, re
   }
   const path = endpoint.createPath(requestObject.pathParams);
   return decorator.handle({
-    ...requestObject,
+    //...requestObject,
+    headers,
+    query,
+    body,
+    pathParams: requestObject.pathParams,
     method: endpoint.method,
     genericPath: endpoint.genericPath,
     path,
@@ -1001,9 +1084,19 @@ function decoratorParseRequestDefinitionField(decoratorSchemas, key, requestObje
             }
             break;
         }
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
         return {
           code: HttpStatusCode.BadRequest_400,
-          body: `'${key}' is required for this endpoint` + (key === "body" ? ", { 'Content-Type': 'application/json' } header might be missing" : "")
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
         };
       }
       return result2.data;
@@ -1012,7 +1105,10 @@ function decoratorParseRequestDefinitionField(decoratorSchemas, key, requestObje
     if (!result.success) {
       return {
         code: HttpStatusCode.BadRequest_400,
-        body: result.error.issues
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: zod.treeifyError(result.error)
       };
     }
     return result.data;
@@ -1114,6 +1210,7 @@ exports.MethodEndpointHandlerRegistryEntry = MethodEndpointHandlerRegistryEntry;
 exports.MiddlewareHandlersRegistry = MiddlewareHandlersRegistry;
 exports.MiddlewareHandlersRegistryEntry = MiddlewareHandlersRegistryEntry;
 exports.MiddlewareHandlersRegistryEntryInternal = MiddlewareHandlersRegistryEntryInternal;
+exports.RequestFailureCode = RequestFailureCode;
 exports.apiContract = apiContract;
 exports.createClient = createClient;
 exports.createInProcApiClient = createInProcApiClient;
@@ -1123,6 +1220,7 @@ exports.execHandlerChain = execHandlerChain;
 exports.flatListAllRegistryEntries = flatListAllRegistryEntries;
 exports.isHttpResponseObject = isHttpResponseObject;
 exports.isHttpStatusCode = isHttpStatusCode;
+exports.isRequestFailureSchemaValidationFailedOutput = isRequestFailureSchemaValidationFailedOutput;
 exports.middleware = middleware;
 exports.partial = partial;
 exports.partialPathString = partialPathString;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import z, { z as z$1 } from 'zod';
+import z, { z as z$1, treeifyError } from 'zod';
 
 type StringLiteral<T extends string> = string extends T ? never : T;
 type CapitalizedStringLiteral<T extends string> = string extends T ? never : T extends `${Uppercase<infer F>}${infer _}` ? F extends Lowercase<F> ? never : T : `❌ ERROR: Must start with uppercase letter`;
@@ -16,6 +16,9 @@ declare class DIContainerBase<R extends DIRegistry> {
 }
 declare class DIContainer<R extends DIRegistry = {}> extends DIContainerBase<R> {
     register<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T, lifetime: DILifetime): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
+    registerTransient<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
+    registerScoped<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
+    registerSingleton<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
     createTestClone(): DIContainerTestClone<R, this>;
 }
 declare class DIContainerTestClone<R extends DIRegistry, TDIContainer extends DIContainer<R>> extends DIContainerBase<R> {
@@ -145,9 +148,30 @@ interface ICanTriggerAsync {
     get genericPath(): string;
 }
 
+type _JoinSections<A extends string, B extends string> = [
+    A
+] extends [never] ? B : [B] extends [never] ? A : `${A},${B}`;
+type _DefinedSection<T, K extends string> = Exclude<T, undefined> extends never ? never : K;
+type _FailedValidationSectionsImpl<P extends string, H extends string, Q extends string, B extends string> = P | H | Q | B | _JoinSections<P, H> | _JoinSections<P, Q> | _JoinSections<P, B> | _JoinSections<H, Q> | _JoinSections<H, B> | _JoinSections<Q, B> | _JoinSections<_JoinSections<P, H>, Q> | _JoinSections<_JoinSections<P, H>, B> | _JoinSections<_JoinSections<P, Q>, B> | _JoinSections<_JoinSections<H, Q>, B> | _JoinSections<_JoinSections<_JoinSections<P, H>, Q>, B>;
+type FailedValidationSections<T extends {
+    headers?: any;
+    query?: any;
+    body?: any;
+}> = _FailedValidationSectionsImpl<'path-segments', _DefinedSection<T['headers'], 'headers'>, _DefinedSection<T['query'], 'query'>, _DefinedSection<T['body'], 'body'>>;
+
 type HttpMethodEndpointHandlerOutput<TEndpointDefinition extends IHttpMethodEndpointDefinition> = {
     [THttpStatusCode in keyof TEndpointDefinition['responses'] & HttpStatusCode]: TEndpointDefinition['responses'][THttpStatusCode] extends HttpMethodEndpointResponse<THttpStatusCode, infer TRespDef> ? CreateHandlerOutput<THttpStatusCode, TRespDef> : never;
-}[keyof TEndpointDefinition['responses'] & HttpStatusCode];
+}[keyof TEndpointDefinition['responses'] & HttpStatusCode] | {
+    code: HttpStatusCode.BadRequest_400;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TEndpointDefinition>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TEndpointDefinition['headers'] | TEndpointDefinition['query'] | TEndpointDefinition['body'], undefined>>>;
+} | {
+    code: HttpStatusCode.InternalServerError_500;
+    headers?: unknown;
+    body?: {};
+};
 type CreateHandlerOutput<THttpStatusCode extends HttpStatusCode, TRespDef> = TRespDef extends {
     headers: z$1.ZodType;
     body: z$1.ZodType;
@@ -182,10 +206,6 @@ type HttpResponseObject = {
     headers?: any;
     body?: any;
 };
-type BadRequestValidationErrorResponse = {
-    code: HttpStatusCode.BadRequest_400;
-    body: z$1.core.$ZodIssue[] | string;
-};
 declare function isHttpResponseObject(obj: any): obj is HttpResponseObject;
 
 declare const __overlap__error__: unique symbol;
@@ -211,8 +231,29 @@ type DecoratorHandlerContext = {
     originalRequest: any;
 };
 
+type InferInputProp<T extends IHttpMethodEndpointDefinition, P extends keyof T> = T[P] extends z$1.ZodType<any, any> ? Record<P, z$1.input<T[P]>> : {};
+type Merge3<A, B, C> = A & B & C;
+type HttpMethodCallInput<T extends IHttpMethodEndpointDefinition> = Merge3<InferInputProp<T, "headers">, InferInputProp<T, "query">, InferInputProp<T, "body">> extends infer M ? keyof M extends never ? never : M : never;
+declare enum RequestFailureCode {
+    ErrorThrown = -1,
+    SchemaValidationFailed = -2
+}
+type RequestFailureErrorThrownOutput = {
+    code: RequestFailureCode.ErrorThrown;
+    body: Error;
+};
+type RequestFailureSchemaValidationFailedOutput<TEndpointDefinition extends IHttpMethodEndpointDefinition> = {
+    code: RequestFailureCode.SchemaValidationFailed;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TEndpointDefinition>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TEndpointDefinition['headers'] | TEndpointDefinition['query'] | TEndpointDefinition['body'], undefined>>>;
+};
+declare function isRequestFailureSchemaValidationFailedOutput<TEndpointDefinition extends IHttpMethodEndpointDefinition>(output: any): output is RequestFailureSchemaValidationFailedOutput<TEndpointDefinition>;
+type HttpMethodCallFunc<TEndpointDefinition extends IHttpMethodEndpointDefinition> = HttpMethodCallInput<TEndpointDefinition> extends never ? () => Promise<HttpMethodEndpointHandlerOutput<TEndpointDefinition>> : (input: HttpMethodCallInput<TEndpointDefinition>) => Promise<HttpMethodEndpointHandlerOutput<TEndpointDefinition> | RequestFailureErrorThrownOutput | RequestFailureSchemaValidationFailedOutput<TEndpointDefinition>>;
+
 type HttpMethodEndpointHandler<TDef extends IHttpMethodEndpointDefinition, TPathParams extends string, TInjected> = (input: HttpMethodEndpointHandlerInput<TDef, TPathParams>, context: EndpointHandlerContext<TInjected>) => Promise<HttpMethodEndpointHandlerOutput<TDef>>;
-type ClientHttpMethodEndpointHandler = (input: ClientHttpMethodEndpointHandlerInput) => Promise<ClientHttpMethodEndpointHandlerOutput>;
+type ClientHttpMethodEndpointHandler = (input: ClientHttpMethodEndpointHandlerInput) => Promise<ClientHttpMethodEndpointHandlerOutput | RequestFailureErrorThrownOutput>;
 
 type MiddlewareHandlerSchemas = {
     headers?: z$1.ZodType;
@@ -232,7 +273,17 @@ type MiddlewareHandlerInput<TPathParams extends string, TMiddlewareSchemas exten
 };
 type MiddlewareHandlerOutput<TMiddlewareSchemas extends MiddlewareHandlerSchemas> = void | {
     [THttpStatusCode in keyof TMiddlewareSchemas['responses'] & HttpStatusCode]: TMiddlewareSchemas['responses'][THttpStatusCode] extends HttpMethodEndpointResponse<THttpStatusCode, infer TRespDef> ? CreateHandlerOutput<THttpStatusCode, TRespDef> : never;
-}[keyof TMiddlewareSchemas['responses'] & HttpStatusCode];
+}[keyof TMiddlewareSchemas['responses'] & HttpStatusCode] | {
+    code: HttpStatusCode.BadRequest_400;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TMiddlewareSchemas>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TMiddlewareSchemas['headers'] | TMiddlewareSchemas['query'] | TMiddlewareSchemas['body'], undefined>>>;
+} | {
+    code: HttpStatusCode.InternalServerError_500;
+    headers?: unknown;
+    body?: unknown;
+};
 type MiddlewareHandlerInputInternal = {
     method: HttpMethod;
     pathSegments: readonly string[];
@@ -342,7 +393,17 @@ type DecoratorHandlerInput<TDecoratorSchemas extends IDecoratorHandlerSchemas> =
 };
 type DecoratorHandlerOutput<TDecoratorSchemas extends IDecoratorHandlerSchemas> = void | {
     [THttpStatusCode in keyof TDecoratorSchemas['responses'] & HttpStatusCode]: TDecoratorSchemas['responses'][THttpStatusCode] extends HttpMethodEndpointResponse<THttpStatusCode, infer TRespDef> ? CreateHandlerOutput<THttpStatusCode, TRespDef> : never;
-}[keyof TDecoratorSchemas['responses'] & HttpStatusCode];
+}[keyof TDecoratorSchemas['responses'] & HttpStatusCode] | {
+    code: HttpStatusCode.BadRequest_400;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TDecoratorSchemas>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TDecoratorSchemas['headers'] | TDecoratorSchemas['query'] | TDecoratorSchemas['body'], undefined>>>;
+} | {
+    code: HttpStatusCode.InternalServerError_500;
+    headers?: unknown;
+    body?: unknown;
+};
 interface IEndpointHandlerDecorator<TDecoratorSchemas extends IDecoratorHandlerSchemas> {
     handle(input: DecoratorHandlerInput<TDecoratorSchemas>, context: DecoratorHandlerContext): Promise<DecoratorHandlerOutput<TDecoratorSchemas>>;
 }
@@ -417,7 +478,7 @@ declare class MethodEndpointHandlerRegistryEntry<TDef extends IHttpMethodEndpoin
         pathParams: TypedPathParams<TPathParams>;
         query: TDef['query'] extends z.ZodType ? z.output<TDef['query']> : null;
         body: TDef['body'] extends z.ZodType ? z.output<TDef['body']> : null;
-    }): Promise<HttpMethodEndpointHandlerOutput<TDef> | BadRequestValidationErrorResponse>;
+    }): Promise<HttpMethodEndpointHandlerOutput<TDef>>;
     triggerNoStaticTypeCheck(diScope: DIScope<any>, requestObject: HttpRequestObject, context: EndpointHandlerContext<any>): Promise<any>;
 }
 
@@ -484,11 +545,6 @@ declare function register<const TDef extends IHttpMethodEndpointDefinition & Val
 
 declare function execHandlerChain(diScope: DIScope<any>, allHandlerEntries: ICanTriggerAsync[], input: ClientHttpMethodEndpointHandlerInput): Promise<any>;
 
-type InferInputProp<T extends IHttpMethodEndpointDefinition, P extends keyof T> = T[P] extends z$1.ZodType<any, any> ? Record<P, z$1.input<T[P]>> : {};
-type Merge3<A, B, C> = A & B & C;
-type HttpMethodCallInput<T extends IHttpMethodEndpointDefinition> = Merge3<InferInputProp<T, "headers">, InferInputProp<T, "query">, InferInputProp<T, "body">> extends infer M ? keyof M extends never ? never : M : never;
-type HttpMethodCallFunc<T extends IHttpMethodEndpointDefinition> = HttpMethodCallInput<T> extends never ? () => Promise<HttpMethodEndpointHandlerOutput<T>> : (input: HttpMethodCallInput<T>) => Promise<HttpMethodEndpointHandlerOutput<T>>;
-
 declare function createClient<TDef extends IApiContractDefinition & ValidateApiContractDefinition<TDef>>(contract: ApiContract<TDef>, clientGenericHandler: ClientHttpMethodEndpointHandler): ApiClient<TDef>;
 type PathParamFunc<TDef> = (value: string | number) => TDef;
 interface IClientContext {
@@ -512,4 +568,4 @@ interface InProcApiClientOptions<TDef extends IApiContractDefinition & ValidateA
 }
 declare function createInProcApiClient<TDef extends IApiContractDefinition & ValidateApiContractDefinition<TDef>, TDIContainer extends DIContainer, TDIContainerTestClone extends DIContainerTestClone<any, TDIContainer>>(contract: ApiContract<TDef>, testContainer: TDIContainerTestClone, registry: ApiHandlersRegistry<TDef, TDIContainer>, options?: InProcApiClientOptions<TDef, TDIContainer>): ApiClient<TDef>;
 
-export { ApiClient, type ApiClientDef, ApiContract, ApiHandlersRegistry, type ApiHandlersRegistryDef, type BadRequestValidationErrorResponse, type CapitalizedStringLiteral, type ClientHttpMethodEndpointHandler, type ClientHttpMethodEndpointHandlerInput, type ClientHttpMethodEndpointHandlerOutput, type CreateHandlerOutput, DIContainer, DIContainerBase, DIContainerTestClone, type DILifetime, type DIRegistry, type DIRegistryEntry, type DIScope, type DecoratorHandlerContext, type DecoratorHandlerInput, type DecoratorHandlerOutput, type EndpointHandlerContext, type EndpointHandlerContextOverlapGuard, type EndpointHandlerDecoratorFactory, type ExtractConcatenatedParamNamesFromMethodFirstPath, type ExtractConcatenatedParamNamesFromPath, type ExtractConcatenatedParamNamesFromPathSegments, type ExtractEndpointFromPath, type GenericOnHandlerRegisteredCallback, type HttpMethod, type HttpMethodCallFunc, type HttpMethodCallInput, HttpMethodEndpoint, type HttpMethodEndpointHandler, type HttpMethodEndpointHandlerInput, type HttpMethodEndpointHandlerOutput, HttpMethodEndpointResponse, type HttpMethodEndpointResponses, type HttpRequestObject, type HttpResponseObject, HttpStatusCode, type IApiContractDefinition, type IClientContext, type IDecoratorHandlerSchemas, type IEndpointHandlerDecorator, type IHttpMethodEndpointDefinition, type IHttpMethodEndpointResponseDefinition, type IRegistrySettings, type InProcApiClientOptions, type LowerCasedHttpMethod, MethodEndpointHandlerRegistryEntry, type MethodFirstPath, type MiddlewareHandler, type MiddlewareHandlerContext, type MiddlewareHandlerContextOverlapGuard, type MiddlewareHandlerInput, type MiddlewareHandlerInputInternal, type MiddlewareHandlerInternal, type MiddlewareHandlerOutput, type MiddlewareHandlerSchemas, MiddlewareHandlersRegistry, MiddlewareHandlersRegistryEntry, MiddlewareHandlersRegistryEntryInternal, type MiddlewarePath, type OnHandlerRegisteredCallback, type OnMiddlewareHandlerRegisteredCallback, type PartialPath, type PartialPathResult, type PathParamFunc, type PrepareRegistryEntryCallback, type StringLiteral, type TypedPathParams, type ValidateApiContractDefinition, type ValidateHttpMethodEndpointDefinition, apiContract, createClient, createInProcApiClient, createRegistry, endpoint, execHandlerChain, flatListAllRegistryEntries, isHttpResponseObject, isHttpStatusCode, middleware, partial, partialPathString, register, response, route, triggerEndpointDecoratorNoStaticTypeCheck, triggerMiddlewareDecoratorNoStaticTypeCheck };
+export { ApiClient, type ApiClientDef, ApiContract, ApiHandlersRegistry, type ApiHandlersRegistryDef, type CapitalizedStringLiteral, type ClientHttpMethodEndpointHandler, type ClientHttpMethodEndpointHandlerInput, type ClientHttpMethodEndpointHandlerOutput, type CreateHandlerOutput, DIContainer, DIContainerBase, DIContainerTestClone, type DILifetime, type DIRegistry, type DIRegistryEntry, type DIScope, type DecoratorHandlerContext, type DecoratorHandlerInput, type DecoratorHandlerOutput, type EndpointHandlerContext, type EndpointHandlerContextOverlapGuard, type EndpointHandlerDecoratorFactory, type ExtractConcatenatedParamNamesFromMethodFirstPath, type ExtractConcatenatedParamNamesFromPath, type ExtractConcatenatedParamNamesFromPathSegments, type ExtractEndpointFromPath, type GenericOnHandlerRegisteredCallback, type HttpMethod, type HttpMethodCallFunc, type HttpMethodCallInput, HttpMethodEndpoint, type HttpMethodEndpointHandler, type HttpMethodEndpointHandlerInput, type HttpMethodEndpointHandlerOutput, HttpMethodEndpointResponse, type HttpMethodEndpointResponses, type HttpRequestObject, type HttpResponseObject, HttpStatusCode, type IApiContractDefinition, type IClientContext, type IDecoratorHandlerSchemas, type IEndpointHandlerDecorator, type IHttpMethodEndpointDefinition, type IHttpMethodEndpointResponseDefinition, type IRegistrySettings, type InProcApiClientOptions, type LowerCasedHttpMethod, MethodEndpointHandlerRegistryEntry, type MethodFirstPath, type MiddlewareHandler, type MiddlewareHandlerContext, type MiddlewareHandlerContextOverlapGuard, type MiddlewareHandlerInput, type MiddlewareHandlerInputInternal, type MiddlewareHandlerInternal, type MiddlewareHandlerOutput, type MiddlewareHandlerSchemas, MiddlewareHandlersRegistry, MiddlewareHandlersRegistryEntry, MiddlewareHandlersRegistryEntryInternal, type MiddlewarePath, type OnHandlerRegisteredCallback, type OnMiddlewareHandlerRegisteredCallback, type PartialPath, type PartialPathResult, type PathParamFunc, type PrepareRegistryEntryCallback, RequestFailureCode, type RequestFailureErrorThrownOutput, type RequestFailureSchemaValidationFailedOutput, type StringLiteral, type TypedPathParams, type ValidateApiContractDefinition, type ValidateHttpMethodEndpointDefinition, apiContract, createClient, createInProcApiClient, createRegistry, endpoint, execHandlerChain, flatListAllRegistryEntries, isHttpResponseObject, isHttpStatusCode, isRequestFailureSchemaValidationFailedOutput, middleware, partial, partialPathString, register, response, route, triggerEndpointDecoratorNoStaticTypeCheck, triggerMiddlewareDecoratorNoStaticTypeCheck };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import z, { z as z$1 } from 'zod';
+import z, { z as z$1, treeifyError } from 'zod';
 
 type StringLiteral<T extends string> = string extends T ? never : T;
 type CapitalizedStringLiteral<T extends string> = string extends T ? never : T extends `${Uppercase<infer F>}${infer _}` ? F extends Lowercase<F> ? never : T : `❌ ERROR: Must start with uppercase letter`;
@@ -16,6 +16,9 @@ declare class DIContainerBase<R extends DIRegistry> {
 }
 declare class DIContainer<R extends DIRegistry = {}> extends DIContainerBase<R> {
     register<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T, lifetime: DILifetime): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
+    registerTransient<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
+    registerScoped<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
+    registerSingleton<K extends string, T>(serviceNameCapitalizedLiteral: CapitalizedStringLiteral<K>, factory: (scope: DIScope<R>) => T): DIContainer<R & Record<K, DIRegistryEntry<T>>>;
     createTestClone(): DIContainerTestClone<R, this>;
 }
 declare class DIContainerTestClone<R extends DIRegistry, TDIContainer extends DIContainer<R>> extends DIContainerBase<R> {
@@ -145,9 +148,30 @@ interface ICanTriggerAsync {
     get genericPath(): string;
 }
 
+type _JoinSections<A extends string, B extends string> = [
+    A
+] extends [never] ? B : [B] extends [never] ? A : `${A},${B}`;
+type _DefinedSection<T, K extends string> = Exclude<T, undefined> extends never ? never : K;
+type _FailedValidationSectionsImpl<P extends string, H extends string, Q extends string, B extends string> = P | H | Q | B | _JoinSections<P, H> | _JoinSections<P, Q> | _JoinSections<P, B> | _JoinSections<H, Q> | _JoinSections<H, B> | _JoinSections<Q, B> | _JoinSections<_JoinSections<P, H>, Q> | _JoinSections<_JoinSections<P, H>, B> | _JoinSections<_JoinSections<P, Q>, B> | _JoinSections<_JoinSections<H, Q>, B> | _JoinSections<_JoinSections<_JoinSections<P, H>, Q>, B>;
+type FailedValidationSections<T extends {
+    headers?: any;
+    query?: any;
+    body?: any;
+}> = _FailedValidationSectionsImpl<'path-segments', _DefinedSection<T['headers'], 'headers'>, _DefinedSection<T['query'], 'query'>, _DefinedSection<T['body'], 'body'>>;
+
 type HttpMethodEndpointHandlerOutput<TEndpointDefinition extends IHttpMethodEndpointDefinition> = {
     [THttpStatusCode in keyof TEndpointDefinition['responses'] & HttpStatusCode]: TEndpointDefinition['responses'][THttpStatusCode] extends HttpMethodEndpointResponse<THttpStatusCode, infer TRespDef> ? CreateHandlerOutput<THttpStatusCode, TRespDef> : never;
-}[keyof TEndpointDefinition['responses'] & HttpStatusCode];
+}[keyof TEndpointDefinition['responses'] & HttpStatusCode] | {
+    code: HttpStatusCode.BadRequest_400;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TEndpointDefinition>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TEndpointDefinition['headers'] | TEndpointDefinition['query'] | TEndpointDefinition['body'], undefined>>>;
+} | {
+    code: HttpStatusCode.InternalServerError_500;
+    headers?: unknown;
+    body?: {};
+};
 type CreateHandlerOutput<THttpStatusCode extends HttpStatusCode, TRespDef> = TRespDef extends {
     headers: z$1.ZodType;
     body: z$1.ZodType;
@@ -182,10 +206,6 @@ type HttpResponseObject = {
     headers?: any;
     body?: any;
 };
-type BadRequestValidationErrorResponse = {
-    code: HttpStatusCode.BadRequest_400;
-    body: z$1.core.$ZodIssue[] | string;
-};
 declare function isHttpResponseObject(obj: any): obj is HttpResponseObject;
 
 declare const __overlap__error__: unique symbol;
@@ -211,8 +231,29 @@ type DecoratorHandlerContext = {
     originalRequest: any;
 };
 
+type InferInputProp<T extends IHttpMethodEndpointDefinition, P extends keyof T> = T[P] extends z$1.ZodType<any, any> ? Record<P, z$1.input<T[P]>> : {};
+type Merge3<A, B, C> = A & B & C;
+type HttpMethodCallInput<T extends IHttpMethodEndpointDefinition> = Merge3<InferInputProp<T, "headers">, InferInputProp<T, "query">, InferInputProp<T, "body">> extends infer M ? keyof M extends never ? never : M : never;
+declare enum RequestFailureCode {
+    ErrorThrown = -1,
+    SchemaValidationFailed = -2
+}
+type RequestFailureErrorThrownOutput = {
+    code: RequestFailureCode.ErrorThrown;
+    body: Error;
+};
+type RequestFailureSchemaValidationFailedOutput<TEndpointDefinition extends IHttpMethodEndpointDefinition> = {
+    code: RequestFailureCode.SchemaValidationFailed;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TEndpointDefinition>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TEndpointDefinition['headers'] | TEndpointDefinition['query'] | TEndpointDefinition['body'], undefined>>>;
+};
+declare function isRequestFailureSchemaValidationFailedOutput<TEndpointDefinition extends IHttpMethodEndpointDefinition>(output: any): output is RequestFailureSchemaValidationFailedOutput<TEndpointDefinition>;
+type HttpMethodCallFunc<TEndpointDefinition extends IHttpMethodEndpointDefinition> = HttpMethodCallInput<TEndpointDefinition> extends never ? () => Promise<HttpMethodEndpointHandlerOutput<TEndpointDefinition>> : (input: HttpMethodCallInput<TEndpointDefinition>) => Promise<HttpMethodEndpointHandlerOutput<TEndpointDefinition> | RequestFailureErrorThrownOutput | RequestFailureSchemaValidationFailedOutput<TEndpointDefinition>>;
+
 type HttpMethodEndpointHandler<TDef extends IHttpMethodEndpointDefinition, TPathParams extends string, TInjected> = (input: HttpMethodEndpointHandlerInput<TDef, TPathParams>, context: EndpointHandlerContext<TInjected>) => Promise<HttpMethodEndpointHandlerOutput<TDef>>;
-type ClientHttpMethodEndpointHandler = (input: ClientHttpMethodEndpointHandlerInput) => Promise<ClientHttpMethodEndpointHandlerOutput>;
+type ClientHttpMethodEndpointHandler = (input: ClientHttpMethodEndpointHandlerInput) => Promise<ClientHttpMethodEndpointHandlerOutput | RequestFailureErrorThrownOutput>;
 
 type MiddlewareHandlerSchemas = {
     headers?: z$1.ZodType;
@@ -232,7 +273,17 @@ type MiddlewareHandlerInput<TPathParams extends string, TMiddlewareSchemas exten
 };
 type MiddlewareHandlerOutput<TMiddlewareSchemas extends MiddlewareHandlerSchemas> = void | {
     [THttpStatusCode in keyof TMiddlewareSchemas['responses'] & HttpStatusCode]: TMiddlewareSchemas['responses'][THttpStatusCode] extends HttpMethodEndpointResponse<THttpStatusCode, infer TRespDef> ? CreateHandlerOutput<THttpStatusCode, TRespDef> : never;
-}[keyof TMiddlewareSchemas['responses'] & HttpStatusCode];
+}[keyof TMiddlewareSchemas['responses'] & HttpStatusCode] | {
+    code: HttpStatusCode.BadRequest_400;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TMiddlewareSchemas>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TMiddlewareSchemas['headers'] | TMiddlewareSchemas['query'] | TMiddlewareSchemas['body'], undefined>>>;
+} | {
+    code: HttpStatusCode.InternalServerError_500;
+    headers?: unknown;
+    body?: unknown;
+};
 type MiddlewareHandlerInputInternal = {
     method: HttpMethod;
     pathSegments: readonly string[];
@@ -342,7 +393,17 @@ type DecoratorHandlerInput<TDecoratorSchemas extends IDecoratorHandlerSchemas> =
 };
 type DecoratorHandlerOutput<TDecoratorSchemas extends IDecoratorHandlerSchemas> = void | {
     [THttpStatusCode in keyof TDecoratorSchemas['responses'] & HttpStatusCode]: TDecoratorSchemas['responses'][THttpStatusCode] extends HttpMethodEndpointResponse<THttpStatusCode, infer TRespDef> ? CreateHandlerOutput<THttpStatusCode, TRespDef> : never;
-}[keyof TDecoratorSchemas['responses'] & HttpStatusCode];
+}[keyof TDecoratorSchemas['responses'] & HttpStatusCode] | {
+    code: HttpStatusCode.BadRequest_400;
+    headers: {
+        "x-failed-validation-sections": FailedValidationSections<TDecoratorSchemas>;
+    };
+    body: ReturnType<typeof treeifyError<Exclude<TDecoratorSchemas['headers'] | TDecoratorSchemas['query'] | TDecoratorSchemas['body'], undefined>>>;
+} | {
+    code: HttpStatusCode.InternalServerError_500;
+    headers?: unknown;
+    body?: unknown;
+};
 interface IEndpointHandlerDecorator<TDecoratorSchemas extends IDecoratorHandlerSchemas> {
     handle(input: DecoratorHandlerInput<TDecoratorSchemas>, context: DecoratorHandlerContext): Promise<DecoratorHandlerOutput<TDecoratorSchemas>>;
 }
@@ -417,7 +478,7 @@ declare class MethodEndpointHandlerRegistryEntry<TDef extends IHttpMethodEndpoin
         pathParams: TypedPathParams<TPathParams>;
         query: TDef['query'] extends z.ZodType ? z.output<TDef['query']> : null;
         body: TDef['body'] extends z.ZodType ? z.output<TDef['body']> : null;
-    }): Promise<HttpMethodEndpointHandlerOutput<TDef> | BadRequestValidationErrorResponse>;
+    }): Promise<HttpMethodEndpointHandlerOutput<TDef>>;
     triggerNoStaticTypeCheck(diScope: DIScope<any>, requestObject: HttpRequestObject, context: EndpointHandlerContext<any>): Promise<any>;
 }
 
@@ -484,11 +545,6 @@ declare function register<const TDef extends IHttpMethodEndpointDefinition & Val
 
 declare function execHandlerChain(diScope: DIScope<any>, allHandlerEntries: ICanTriggerAsync[], input: ClientHttpMethodEndpointHandlerInput): Promise<any>;
 
-type InferInputProp<T extends IHttpMethodEndpointDefinition, P extends keyof T> = T[P] extends z$1.ZodType<any, any> ? Record<P, z$1.input<T[P]>> : {};
-type Merge3<A, B, C> = A & B & C;
-type HttpMethodCallInput<T extends IHttpMethodEndpointDefinition> = Merge3<InferInputProp<T, "headers">, InferInputProp<T, "query">, InferInputProp<T, "body">> extends infer M ? keyof M extends never ? never : M : never;
-type HttpMethodCallFunc<T extends IHttpMethodEndpointDefinition> = HttpMethodCallInput<T> extends never ? () => Promise<HttpMethodEndpointHandlerOutput<T>> : (input: HttpMethodCallInput<T>) => Promise<HttpMethodEndpointHandlerOutput<T>>;
-
 declare function createClient<TDef extends IApiContractDefinition & ValidateApiContractDefinition<TDef>>(contract: ApiContract<TDef>, clientGenericHandler: ClientHttpMethodEndpointHandler): ApiClient<TDef>;
 type PathParamFunc<TDef> = (value: string | number) => TDef;
 interface IClientContext {
@@ -512,4 +568,4 @@ interface InProcApiClientOptions<TDef extends IApiContractDefinition & ValidateA
 }
 declare function createInProcApiClient<TDef extends IApiContractDefinition & ValidateApiContractDefinition<TDef>, TDIContainer extends DIContainer, TDIContainerTestClone extends DIContainerTestClone<any, TDIContainer>>(contract: ApiContract<TDef>, testContainer: TDIContainerTestClone, registry: ApiHandlersRegistry<TDef, TDIContainer>, options?: InProcApiClientOptions<TDef, TDIContainer>): ApiClient<TDef>;
 
-export { ApiClient, type ApiClientDef, ApiContract, ApiHandlersRegistry, type ApiHandlersRegistryDef, type BadRequestValidationErrorResponse, type CapitalizedStringLiteral, type ClientHttpMethodEndpointHandler, type ClientHttpMethodEndpointHandlerInput, type ClientHttpMethodEndpointHandlerOutput, type CreateHandlerOutput, DIContainer, DIContainerBase, DIContainerTestClone, type DILifetime, type DIRegistry, type DIRegistryEntry, type DIScope, type DecoratorHandlerContext, type DecoratorHandlerInput, type DecoratorHandlerOutput, type EndpointHandlerContext, type EndpointHandlerContextOverlapGuard, type EndpointHandlerDecoratorFactory, type ExtractConcatenatedParamNamesFromMethodFirstPath, type ExtractConcatenatedParamNamesFromPath, type ExtractConcatenatedParamNamesFromPathSegments, type ExtractEndpointFromPath, type GenericOnHandlerRegisteredCallback, type HttpMethod, type HttpMethodCallFunc, type HttpMethodCallInput, HttpMethodEndpoint, type HttpMethodEndpointHandler, type HttpMethodEndpointHandlerInput, type HttpMethodEndpointHandlerOutput, HttpMethodEndpointResponse, type HttpMethodEndpointResponses, type HttpRequestObject, type HttpResponseObject, HttpStatusCode, type IApiContractDefinition, type IClientContext, type IDecoratorHandlerSchemas, type IEndpointHandlerDecorator, type IHttpMethodEndpointDefinition, type IHttpMethodEndpointResponseDefinition, type IRegistrySettings, type InProcApiClientOptions, type LowerCasedHttpMethod, MethodEndpointHandlerRegistryEntry, type MethodFirstPath, type MiddlewareHandler, type MiddlewareHandlerContext, type MiddlewareHandlerContextOverlapGuard, type MiddlewareHandlerInput, type MiddlewareHandlerInputInternal, type MiddlewareHandlerInternal, type MiddlewareHandlerOutput, type MiddlewareHandlerSchemas, MiddlewareHandlersRegistry, MiddlewareHandlersRegistryEntry, MiddlewareHandlersRegistryEntryInternal, type MiddlewarePath, type OnHandlerRegisteredCallback, type OnMiddlewareHandlerRegisteredCallback, type PartialPath, type PartialPathResult, type PathParamFunc, type PrepareRegistryEntryCallback, type StringLiteral, type TypedPathParams, type ValidateApiContractDefinition, type ValidateHttpMethodEndpointDefinition, apiContract, createClient, createInProcApiClient, createRegistry, endpoint, execHandlerChain, flatListAllRegistryEntries, isHttpResponseObject, isHttpStatusCode, middleware, partial, partialPathString, register, response, route, triggerEndpointDecoratorNoStaticTypeCheck, triggerMiddlewareDecoratorNoStaticTypeCheck };
+export { ApiClient, type ApiClientDef, ApiContract, ApiHandlersRegistry, type ApiHandlersRegistryDef, type CapitalizedStringLiteral, type ClientHttpMethodEndpointHandler, type ClientHttpMethodEndpointHandlerInput, type ClientHttpMethodEndpointHandlerOutput, type CreateHandlerOutput, DIContainer, DIContainerBase, DIContainerTestClone, type DILifetime, type DIRegistry, type DIRegistryEntry, type DIScope, type DecoratorHandlerContext, type DecoratorHandlerInput, type DecoratorHandlerOutput, type EndpointHandlerContext, type EndpointHandlerContextOverlapGuard, type EndpointHandlerDecoratorFactory, type ExtractConcatenatedParamNamesFromMethodFirstPath, type ExtractConcatenatedParamNamesFromPath, type ExtractConcatenatedParamNamesFromPathSegments, type ExtractEndpointFromPath, type GenericOnHandlerRegisteredCallback, type HttpMethod, type HttpMethodCallFunc, type HttpMethodCallInput, HttpMethodEndpoint, type HttpMethodEndpointHandler, type HttpMethodEndpointHandlerInput, type HttpMethodEndpointHandlerOutput, HttpMethodEndpointResponse, type HttpMethodEndpointResponses, type HttpRequestObject, type HttpResponseObject, HttpStatusCode, type IApiContractDefinition, type IClientContext, type IDecoratorHandlerSchemas, type IEndpointHandlerDecorator, type IHttpMethodEndpointDefinition, type IHttpMethodEndpointResponseDefinition, type IRegistrySettings, type InProcApiClientOptions, type LowerCasedHttpMethod, MethodEndpointHandlerRegistryEntry, type MethodFirstPath, type MiddlewareHandler, type MiddlewareHandlerContext, type MiddlewareHandlerContextOverlapGuard, type MiddlewareHandlerInput, type MiddlewareHandlerInputInternal, type MiddlewareHandlerInternal, type MiddlewareHandlerOutput, type MiddlewareHandlerSchemas, MiddlewareHandlersRegistry, MiddlewareHandlersRegistryEntry, MiddlewareHandlersRegistryEntryInternal, type MiddlewarePath, type OnHandlerRegisteredCallback, type OnMiddlewareHandlerRegisteredCallback, type PartialPath, type PartialPathResult, type PathParamFunc, type PrepareRegistryEntryCallback, RequestFailureCode, type RequestFailureErrorThrownOutput, type RequestFailureSchemaValidationFailedOutput, type StringLiteral, type TypedPathParams, type ValidateApiContractDefinition, type ValidateHttpMethodEndpointDefinition, apiContract, createClient, createInProcApiClient, createRegistry, endpoint, execHandlerChain, flatListAllRegistryEntries, isHttpResponseObject, isHttpStatusCode, isRequestFailureSchemaValidationFailedOutput, middleware, partial, partialPathString, register, response, route, triggerEndpointDecoratorNoStaticTypeCheck, triggerMiddlewareDecoratorNoStaticTypeCheck };

package/dist/index.mjs

@@ -1,3 +1,6 @@
+import { treeifyError } from 'zod';
+import { treeifyError as treeifyError$1 } from 'zod/v4/mini';
+
 function endpoint(definition) {
   return new HttpMethodEndpoint(definition);
 }
@@ -319,9 +322,19 @@ function parseRequestDefinitionField(definition, key, requestObject) {
             }
             break;
         }
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
         return {
           code: HttpStatusCode.BadRequest_400,
-          body: `'${key}' is required for this endpoint` + (key === "body" ? ", { 'Content-Type': 'application/json' } header might be missing" : "")
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
         };
       }
       return result2.data;
@@ -330,7 +343,10 @@ function parseRequestDefinitionField(definition, key, requestObject) {
     if (!result.success) {
       return {
         code: HttpStatusCode.BadRequest_400,
-        body: result.error.issues
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: treeifyError(result.error)
       };
     }
     return result.data;
@@ -561,9 +577,19 @@ function middlewareParseRequestDefinitionField(middlewareSchemas, key, requestOb
             }
             break;
         }
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
         return {
           code: HttpStatusCode.BadRequest_400,
-          body: `'${key}' is required for this endpoint` + (key === "body" ? ", { 'Content-Type': 'application/json' } header might be missing" : "")
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
         };
       }
       return result2.data;
@@ -572,7 +598,10 @@ function middlewareParseRequestDefinitionField(middlewareSchemas, key, requestOb
     if (!result.success) {
       return {
         code: HttpStatusCode.BadRequest_400,
-        body: result.error.issues
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: treeifyError(result.error)
       };
     }
     return result.data;
@@ -738,6 +767,15 @@ function partialPathString(_apiReg, path) {
   return path;
 }
 
+var RequestFailureCode = /* @__PURE__ */ ((RequestFailureCode2) => {
+  RequestFailureCode2[RequestFailureCode2["ErrorThrown"] = -1] = "ErrorThrown";
+  RequestFailureCode2[RequestFailureCode2["SchemaValidationFailed"] = -2] = "SchemaValidationFailed";
+  return RequestFailureCode2;
+})(RequestFailureCode || {});
+function isRequestFailureSchemaValidationFailedOutput(output) {
+  return typeof output === "object" && output !== null && "code" in output && output.code === -2 /* SchemaValidationFailed */;
+}
+
 function createClient(contract, clientGenericHandler) {
   const apiClient = new ApiClient(contract, clientGenericHandler);
   return apiClient;
@@ -781,9 +819,22 @@ class InnerApiClient {
         currObj[key] = (requestObject) => {
           const pathParams = { ...client.__CONTEXT__.pathParameters };
           client.__CONTEXT__ = InnerApiClient._initNewContext();
+          let schemaValidationRequestFailureOutput = null;
           const headers = clientParseRequestDefinitionField(val.definition, "headers", requestObject);
+          if (isRequestFailureSchemaValidationFailedOutput(headers)) {
+            schemaValidationRequestFailureOutput = headers;
+            return schemaValidationRequestFailureOutput;
+          }
           const query = clientParseRequestDefinitionField(val.definition, "query", requestObject);
+          if (isRequestFailureSchemaValidationFailedOutput(query)) {
+            schemaValidationRequestFailureOutput = query;
+            return schemaValidationRequestFailureOutput;
+          }
           const body = clientParseRequestDefinitionField(val.definition, "body", requestObject);
+          if (isRequestFailureSchemaValidationFailedOutput(body)) {
+            schemaValidationRequestFailureOutput = body;
+            return schemaValidationRequestFailureOutput;
+          }
           const path = `/${val.pathSegments.map(
             (segment) => segment.startsWith(":") ? pathParams[segment.slice(1)] ?? "?" : segment
           ).join("/")}`;
@@ -822,13 +873,32 @@ function clientParseRequestDefinitionField(definition, key, requestObject) {
             }
             break;
         }
-        throw new Error(`'${key}' is required for this endpoint`);
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
+        return {
+          code: RequestFailureCode.SchemaValidationFailed,
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
+        };
       }
       return result2.data;
     }
     const result = definition[key].safeParse(requestObject[key]);
     if (!result.success) {
-      throw new Error(`Validation for '${key}' failed`, { cause: result.error });
+      return {
+        code: RequestFailureCode.SchemaValidationFailed,
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: treeifyError$1(result.error)
+      };
     }
     return result.data;
   }
@@ -903,6 +973,15 @@ class DIContainer extends DIContainerBase {
     this._map.set(serviceNameCapitalizedLiteral, entry);
     return this;
   }
+  registerTransient(serviceNameCapitalizedLiteral, factory) {
+    return this.register(serviceNameCapitalizedLiteral, factory, "transient");
+  }
+  registerScoped(serviceNameCapitalizedLiteral, factory) {
+    return this.register(serviceNameCapitalizedLiteral, factory, "scoped");
+  }
+  registerSingleton(serviceNameCapitalizedLiteral, factory) {
+    return this.register(serviceNameCapitalizedLiteral, factory, "singleton");
+  }
   createTestClone() {
     return new DIContainerTestClone(this);
   }
@@ -948,7 +1027,11 @@ async function triggerEndpointDecoratorNoStaticTypeCheck(endpoint, decorator, re
   }
   const path = endpoint.createPath(requestObject.pathParams);
   return decorator.handle({
-    ...requestObject,
+    //...requestObject,
+    headers,
+    query,
+    body,
+    pathParams: requestObject.pathParams,
     method: endpoint.method,
     genericPath: endpoint.genericPath,
     path,
@@ -999,9 +1082,19 @@ function decoratorParseRequestDefinitionField(decoratorSchemas, key, requestObje
             }
             break;
         }
+        const errors = [`'${key}' is required for this endpoint`];
+        if (key === "body") {
+          errors.push("{ 'Content-Type': 'application/json' } header might be missing");
+        }
         return {
           code: HttpStatusCode.BadRequest_400,
-          body: `'${key}' is required for this endpoint` + (key === "body" ? ", { 'Content-Type': 'application/json' } header might be missing" : "")
+          headers: {
+            "x-failed-validation-sections": key
+          },
+          body: {
+            errors
+            // treeifyError return type like structure, but here we just return simple error messages
+          }
         };
       }
       return result2.data;
@@ -1010,7 +1103,10 @@ function decoratorParseRequestDefinitionField(decoratorSchemas, key, requestObje
     if (!result.success) {
       return {
         code: HttpStatusCode.BadRequest_400,
-        body: result.error.issues
+        headers: {
+          "x-failed-validation-sections": key
+        },
+        body: treeifyError(result.error)
       };
     }
     return result.data;
@@ -1099,4 +1195,4 @@ function addMiddlewareDecorators(mwHandlers, mwEntry) {
   });
 }
 
-export { ApiClient, ApiContract, ApiHandlersRegistry, DIContainer, DIContainerBase, DIContainerTestClone, HttpMethodEndpoint, HttpMethodEndpointResponse, HttpStatusCode, MethodEndpointHandlerRegistryEntry, MiddlewareHandlersRegistry, MiddlewareHandlersRegistryEntry, MiddlewareHandlersRegistryEntryInternal, apiContract, createClient, createInProcApiClient, createRegistry, endpoint, execHandlerChain, flatListAllRegistryEntries, isHttpResponseObject, isHttpStatusCode, middleware, partial, partialPathString, register, response, route, triggerEndpointDecoratorNoStaticTypeCheck, triggerMiddlewareDecoratorNoStaticTypeCheck };
+export { ApiClient, ApiContract, ApiHandlersRegistry, DIContainer, DIContainerBase, DIContainerTestClone, HttpMethodEndpoint, HttpMethodEndpointResponse, HttpStatusCode, MethodEndpointHandlerRegistryEntry, MiddlewareHandlersRegistry, MiddlewareHandlersRegistryEntry, MiddlewareHandlersRegistryEntryInternal, RequestFailureCode, apiContract, createClient, createInProcApiClient, createRegistry, endpoint, execHandlerChain, flatListAllRegistryEntries, isHttpResponseObject, isHttpStatusCode, isRequestFailureSchemaValidationFailedOutput, middleware, partial, partialPathString, register, response, route, triggerEndpointDecoratorNoStaticTypeCheck, triggerMiddlewareDecoratorNoStaticTypeCheck };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@congruent-stack/congruent-api",
   "type": "module",
-  "version": "0.12.2",
+  "version": "0.14.0",
   "description": "Typescript schema-first tooling for agnostic REST APIs.",
   "keywords": [],
   "author": "congruent-stack",