zibri 2.3.0 → 2.4.0

package/dist/cjs/routing/resolve-route-params.function.js

@@ -1,56 +1,96 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRouteParams = resolveRouteParams;
+const request_context_token_model_1 = require("../context/request/request-context-token.model");
+const zibri_di_tokens_default_1 = require("../di/default/zibri-di-tokens.default");
+const inject_function_1 = require("../di/inject.function");
 const metadata_utilities_1 = require("../utilities/metadata.utilities");
 const object_utilities_1 = require("../utilities/object.utilities");
 // eslint-disable-next-line jsdoc/require-jsdoc
-async function resolveRouteParams(controllerClass, controllerMethod, totalParamCount, req, parser, validationService, authService, currentWebsocketConnection) {
-    // TODO: validate that no additional parameters have been provided that are unused in the controller.
+async function resolveRouteParams(controllerClass, controllerMethod, totalParamCount, context) {
+    const params = await parseRouteParams(controllerClass, controllerMethod, totalParamCount, context);
+    const validationService = (0, inject_function_1.inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.VALIDATION_SERVICE);
+    // validate
+    const pathParams = metadata_utilities_1.MetadataUtilities.getRoutePathParams(controllerClass, controllerMethod);
+    const queryParams = metadata_utilities_1.MetadataUtilities.getRouteQueryParams(controllerClass, controllerMethod);
+    const headerParams = metadata_utilities_1.MetadataUtilities.getRouteHeaderParams(controllerClass, controllerMethod);
+    const requestBody = metadata_utilities_1.MetadataUtilities.getRouteBody(controllerClass, controllerMethod);
+    await Promise.all([
+        ...object_utilities_1.ObjectUtilities.entries(pathParams).map(async ([indexStr, metadata]) => {
+            const idx = Number(indexStr);
+            await validationService.validatePathParam(params[idx], metadata);
+        }),
+        ...object_utilities_1.ObjectUtilities.entries(queryParams).map(async ([indexStr, metadata]) => {
+            const idx = Number(indexStr);
+            await validationService.validateQueryParam(params[idx], metadata);
+        }),
+        ...object_utilities_1.ObjectUtilities.entries(headerParams).map(async ([indexStr, metadata]) => {
+            const idx = Number(indexStr);
+            await validationService.validateHeaderParam(params[idx], metadata);
+        }),
+        ...requestBody ? [validationService.validateBody(params[requestBody.index], requestBody)] : []
+    ]);
+    return params;
+}
+// eslint-disable-next-line jsdoc/require-jsdoc
+async function parseRouteParams(controllerClass, controllerMethod, totalParamCount, context) {
+    const parser = (0, inject_function_1.inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.PARSER);
     let resolvedParamCount = 0;
     const params = new Array(totalParamCount).fill(undefined);
     // 1) Path decorators
     const pathParams = metadata_utilities_1.MetadataUtilities.getRoutePathParams(controllerClass, controllerMethod);
     for (const [indexStr, metadata] of object_utilities_1.ObjectUtilities.entries(pathParams)) {
         const idx = Number(indexStr);
-        params[idx] = parser.parsePathParam(req, metadata);
-        validationService.validatePathParam(params[idx], metadata);
+        context.request.params ??= {};
+        context.request.params[metadata.name] = parser.parsePathParam(context.request, metadata);
+        params[idx] = context.request.params[metadata.name];
     }
     resolvedParamCount += object_utilities_1.ObjectUtilities.keys(pathParams).length;
-    // 2) Body decorator
-    const requestBody = metadata_utilities_1.MetadataUtilities.getRouteBody(controllerClass, controllerMethod);
-    if (requestBody) {
-        resolvedParamCount++;
-        params[requestBody.index] = await parser.parseBody(req, requestBody);
-        validationService.validateBody(params[requestBody.index], requestBody);
-    }
-    // 3) Query decorators
+    // 2) Query decorators
     const queryParams = metadata_utilities_1.MetadataUtilities.getRouteQueryParams(controllerClass, controllerMethod);
     for (const [indexStr, metadata] of object_utilities_1.ObjectUtilities.entries(queryParams)) {
         const idx = Number(indexStr);
-        params[idx] = parser.parseQueryParam(req, metadata);
-        validationService.validateQueryParam(params[idx], metadata);
+        context.request.query ??= {};
+        context.request.query[metadata.name] = parser.parseQueryParam(context.request, metadata);
+        params[idx] = context.request.query[metadata.name];
     }
     resolvedParamCount += object_utilities_1.ObjectUtilities.keys(queryParams).length;
     // 3) Header decorators
     const headerParams = metadata_utilities_1.MetadataUtilities.getRouteHeaderParams(controllerClass, controllerMethod);
     for (const [indexStr, metadata] of object_utilities_1.ObjectUtilities.entries(headerParams)) {
         const idx = Number(indexStr);
-        params[idx] = parser.parseHeaderParam(req, metadata);
-        validationService.validateHeaderParam(params[idx], metadata);
+        context.request.headers[metadata.name] = parser.parseHeaderParam(context.request, metadata);
+        params[idx] = parser.parseHeaderParam(context.request, metadata);
     }
     resolvedParamCount += object_utilities_1.ObjectUtilities.keys(headerParams).length;
-    // 4) CurrentUser decorator
-    const currentUser = metadata_utilities_1.MetadataUtilities.getRouteCurrentUser(controllerClass, controllerMethod);
-    if (currentUser) {
+    // 4) Body decorator
+    const requestBody = metadata_utilities_1.MetadataUtilities.getRouteBody(controllerClass, controllerMethod);
+    if (requestBody) {
+        context.request.body = await parser.parseBody(context.request, requestBody);
+        params[requestBody.index] = context.request.body;
+        resolvedParamCount++;
+    }
+    // 5) CurrentUser decorator
+    const currentUserMetadata = metadata_utilities_1.MetadataUtilities.getRouteCurrentUser(controllerClass, controllerMethod);
+    if (currentUserMetadata) {
+        const currentUser = await context.get(request_context_token_model_1.ZIBRI_REQUEST_CONTEXT_TOKENS.CURRENT_USER);
+        params[currentUserMetadata.index] = currentUser;
         resolvedParamCount++;
-        params[currentUser.index] = await authService.getCurrentUser(req, currentUser.allowedStrategies ?? authService.strategies, currentUser.required);
     }
-    // 4) CurrentWebsocketConnection decorator
+    // 6) CurrentWebsocketConnection decorator
     // eslint-disable-next-line stylistic/max-len
     const currentWebsocketConnectionMetadata = metadata_utilities_1.MetadataUtilities.getRouteCurrentWebsocketConnection(controllerClass, controllerMethod);
     if (currentWebsocketConnectionMetadata) {
+        switch (context.type) {
+            case 'http-request': {
+                throw new Error('Tried to inject a websocket connection on a http request.');
+            }
+            case 'websocket-request': {
+                params[currentWebsocketConnectionMetadata.index] = context.connection;
+                break;
+            }
+        }
         resolvedParamCount++;
-        params[currentWebsocketConnectionMetadata.index] = currentWebsocketConnection;
     }
     if (resolvedParamCount < totalParamCount) {
         throw new Error(

package/dist/cjs/routing/resolve-route-params.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-route-params.function.js","sourceRoot":"","sources":["../../../src/routing/resolve-route-params.function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-route-params.function.js","sourceRoot":"","sources":["../../../src/routing/resolve-route-params.function.ts"],"names":[],"mappings":"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"}

package/dist/cjs/routing/route-configuration.model.d.ts

@@ -38,7 +38,7 @@ type QueryMetaInputObjectToMetaObject<QueryMetaInputObject extends Record<string
 export type HeaderMetaInputObjectToMetaObject<HeaderMetaInputObject extends Record<string, HeaderParamMetadataInput>> = {
     [K in keyof HeaderMetaInputObject]: MergeRequired<HeaderMetaInputObject[K], ParamMetadataInputToMeta<HeaderMetaInputObject[K]>>;
 };
-type ParamMetadataInputToMeta<M extends (PathParamMetadataInput | QueryParamMetadataInput | HeaderParamMetadataInput | ArrayPropertyItemMetadataInput)> = M extends StringParamMetadataInput ? StringParamMetadata : M extends NumberParamMetadataInput ? NumberParamMetadata : M extends BooleanParamMetadataInput ? BooleanParamMetadata : M extends DateParamMetadataInput ? DateParamMetadata : M extends ObjectParamMetadataInput ? ObjectParamMetadata : M extends ArrayParamMetadataInput ? ArrayParamMetadata : never;
+type ParamMetadataInputToMeta<M extends (PathParamMetadataInput | QueryParamMetadataInput | HeaderParamMetadataInput | ArrayPropertyItemMetadataInput)> = M extends StringParamMetadataInput<any, any, any, any, any> ? StringParamMetadata<any, any, any, any, any> : M extends NumberParamMetadataInput ? NumberParamMetadata : M extends BooleanParamMetadataInput ? BooleanParamMetadata : M extends DateParamMetadataInput ? DateParamMetadata : M extends ObjectParamMetadataInput ? ObjectParamMetadata : M extends ArrayParamMetadataInput ? ArrayParamMetadata : never;
 type MergeRequired<I, M> = I extends {
     required: false;
 } ? M & {
@@ -46,7 +46,7 @@ type MergeRequired<I, M> = I extends {
 } : M & {
     required: true;
 };
-type RawParamMetadataToType<M extends (PathParamMetadata | QueryParamMetadata | HeaderParamMetadata | ArrayPropertyItemMetadata | OmitStrict<PathParamMetadata, 'name'> | OmitStrict<QueryParamMetadata, 'name'> | OmitStrict<HeaderParamMetadata, 'name'>)> = M extends StringParamMetadata ? string : M extends NumberParamMetadata ? number : M extends BooleanParamMetadata ? boolean : M extends DateParamMetadata ? Date : M extends ObjectParamMetadata ? InstanceType<ReturnType<M['cls']>> : M extends ArrayParamMetadata ? ParamMetadataToType<M['items']>[] : never;
+type RawParamMetadataToType<M extends (PathParamMetadata | QueryParamMetadata | HeaderParamMetadata | ArrayPropertyItemMetadata | OmitStrict<PathParamMetadata, 'name'> | OmitStrict<QueryParamMetadata, 'name'> | OmitStrict<HeaderParamMetadata, 'name'>)> = M extends StringParamMetadata<any, any, any, any, any> ? string : M extends NumberParamMetadata ? number : M extends BooleanParamMetadata ? boolean : M extends DateParamMetadata ? Date : M extends ObjectParamMetadata ? InstanceType<ReturnType<M['cls']>> : M extends ArrayParamMetadata ? ParamMetadataToType<M['items']>[] : never;
 type ParamMetadataToType<M extends (PathParamMetadata | QueryParamMetadata | HeaderParamMetadata | ArrayPropertyItemMetadata | OmitStrict<PathParamMetadata, 'name'> | OmitStrict<QueryParamMetadata, 'name'> | OmitStrict<HeaderParamMetadata, 'name'>)> = M extends {
     required: false;
 } ? RawParamMetadataToType<M> | undefined : RawParamMetadataToType<M>;

package/dist/cjs/routing/route-configuration.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-configuration.model.d.ts","sourceRoot":"","sources":["../../../src/routing/route-configuration.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAC3H,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACrL,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AACxG,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAGrG,KAAK,4BAA4B,CAAC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,IAAI;KACzF,CAAC,IAAI,MAAM,cAAc,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;CACtE,CAAC;AAGF,KAAK,6BAA6B,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,IAAI;KAC5F,CAAC,IAAI,MAAM,eAAe,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CACxE,CAAC;AAGF,MAAM,MAAM,8BAA8B,CAAC,gBAAgB,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI;KACtG,CAAC,IAAI,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC1E,CAAC;AAGF,KAAK,+BAA+B,CAAC,mBAAmB,SAAS,iBAAiB,GAAG;IAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,IAE/G,aAAa,CAAC,mBAAmB,EAAE,YAAY,GAAG;IAAE,UAAU,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAA;CAAE,CAAC,CAAC;AAG3G,KAAK,+BAA+B,CAAC,mBAAmB,SAAS,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACtG,CAAC,IAAI,MAAM,mBAAmB,GAAG,aAAa,CAC3C,mBAAmB,CAAC,CAAC,CAAC,EACtB,wBAAwB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CACnD;CACJ,CAAC;AAGF,KAAK,gCAAgC,CAAC,oBAAoB,SAAS,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,IAAI;KACzG,CAAC,IAAI,MAAM,oBAAoB,GAAG,aAAa,CAC5C,oBAAoB,CAAC,CAAC,CAAC,EACvB,wBAAwB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CACpD;CACJ,CAAC;AAGF,MAAM,MAAM,iCAAiC,CAAC,qBAAqB,SAAS,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,IAAI;KACnH,CAAC,IAAI,MAAM,qBAAqB,GAAG,aAAa,CAC7C,qBAAqB,CAAC,CAAC,CAAC,EACxB,wBAAwB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CACrD;CACJ,CAAC;AAGF,KAAK,wBAAwB,CAAC,CAAC,SAAS,CAAC,sBAAsB,GAAG,uBAAuB,GAAG,wBAAwB,GAAG,8BAA8B,CAAC,IAChJ,CAAC,SAAS,wBAAwB,GAC9B,mBAAmB,GACnB,CAAC,SAAS,wBAAwB,GAC9B,mBAAmB,GACnB,CAAC,SAAS,yBAAyB,GAC/B,oBAAoB,GACpB,CAAC,SAAS,sBAAsB,GAC5B,iBAAiB,GACjB,CAAC,SAAS,wBAAwB,GAC9B,mBAAmB,GACnB,CAAC,SAAS,uBAAuB,GAC7B,kBAAkB,GAClB,KAAK,CAAC;AAGpC,KAAK,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG,CAAC,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG,CAAC,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,CAAC;AAG5G,KAAK,sBAAsB,CAAC,CAAC,SAAS,CAClC,iBAAiB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,yBAAyB,GACtF,UAAU,CAAC,iBAAiB,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAC7H,IACK,CAAC,SAAS,mBAAmB,GACzB,MAAM,GACN,CAAC,SAAS,mBAAmB,GACzB,MAAM,GACN,CAAC,SAAS,oBAAoB,GAC1B,OAAO,GACP,CAAC,SAAS,iBAAiB,GACvB,IAAI,GACJ,CAAC,SAAS,mBAAmB,GACzB,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAClC,CAAC,SAAS,kBAAkB,GACxB,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,GACjC,KAAK,CAAC;AAGpC,KAAK,mBAAmB,CAAC,CAAC,SAAS,CAC/B,iBAAiB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,yBAAyB,GACtF,UAAU,CAAC,iBAAiB,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAC7H,IAEK,CAAC,SAAS;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,GACzB,sBAAsB,CAAC,CAAC,CAAC,GAAG,SAAS,GACrC,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAGpC,KAAK,UAAU,CAAC,CAAC,IAEX,CAAC,SAAS;IAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,GACtC,CAAC,GACD,KAAK,CAAC;AAEhB;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACpC;;OAEG;IACH,YAAY,EAAE,KAAK,CAAA;CACtB,GAAG;IACA;;OAEG;IACH,YAAY,EAAE,IAAI,CAAC;IACnB;;OAEG;IACH,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAA;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,CACpB,cAAc,SAAS,YAAY,EACnC,gBAAgB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChD,iBAAiB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjD,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAClD,CACA,GAAG,EAAE,WAAW,CAEZ,cAAc,SAAS;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,EAChH,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,CACrB,EACD,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,YAAY,KACjB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAC1B,cAAc,SAAS,YAAY,EACnC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACxD,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC1D,gBAAgB,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAC5D;IACA;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,YAAY,CACjB,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC,EAC7C,4BAA4B,CAAC,cAAc,CAAC,EAC5C,6BAA6B,CAAC,eAAe,CAAC,EAC9C,8BAA8B,CAAC,gBAAgB,CAAC,CACnD,CAAC;IACF;;OAEG;IACH,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC;;OAEG;IACH,UAAU,EAAE,cAAc,CAAC;IAC3B;;OAEG;IACH,WAAW,EAAE,eAAe,CAAC;IAC7B;;OAEG;IACH,YAAY,EAAE,gBAAgB,CAAC;IAC/B;;OAEG;IACH,OAAO,EAAE,yBAAyB,CAAA;CACrC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,CAE/B,mBAAmB,SAAS,iBAAiB,GAAG;IAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,EAChF,mBAAmB,SAAS,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAClE,oBAAoB,SAAS,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACpE,qBAAqB,SAAS,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,IACtE,UAAU,CACV,kBAAkB,CACd,+BAA+B,CAAC,mBAAmB,CAAC,EACpD,+BAA+B,CAAC,mBAAmB,CAAC,EACpD,gCAAgC,CAAC,oBAAoB,CAAC,EACtD,iCAAiC,CAAC,qBAAqB,CAAC,CAC3D,EACD,cAAc,GAAG,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,SAAS,CAC7E,GAAG;IACA;;OAEG;IACH,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC;;OAEG;IACH,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC;;OAEG;IACH,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC;;OAEG;IACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAA;CACjG,CAAC"}
+{"version":3,"file":"route-configuration.model.d.ts","sourceRoot":"","sources":["../../../src/routing/route-configuration.model.ts"],"names":[],"mappings":"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"}

package/dist/cjs/routing/router.d.ts

@@ -34,6 +34,8 @@ export declare class Router implements RouterInterface, OnAppInit, OnAppStart {
     private routeToRequestHandler;
     private controllerRouteToRequestHandler;
     private returnResult;
-    private resolveRouteParams;
+    private returnFileResult;
+    private returnHtmlResult;
+    private validateResultType;
 }
 //# sourceMappingURL=router.d.ts.map

package/dist/cjs/routing/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../src/routing/router.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGrL,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGlD,OAAO,EAA6B,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACrH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAM3E,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAM9D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAInE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAG7F;;GAEG;AACH,qBACa,MAAO,YAAW,eAAe,EAAE,SAAS,EAAE,UAAU;IAc7D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAnBhC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,QAAQ,CAAC,wBAAwB,EAAE,kBAAkB,CACjD,YAAY,EACZ,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAClC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CACtC,EAAE,CAAM;gBAIY,MAAM,EAAE,eAAe,EAEvB,MAAM,EAAE,eAAe,EAEvB,iBAAiB,EAAE,0BAA0B,EAE7C,WAAW,EAAE,oBAAoB;IAIhD,SAAS,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrD,UAAU,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAKvC,OAAO,CAAC,2BAA2B;IAe7B,aAAa,CAEf,mBAAmB,SAAS,iBAAiB,GAAG;QAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,EAChF,mBAAmB,SAAS,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAClE,oBAAoB,SAAS,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACpE,qBAAqB,SAAS,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAEtE,KAAK,EAAE,uBAAuB,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB,CAAC,GACtH,OAAO,CAAC,IAAI,CAAC;IAqDhB,OAAO,CAAC,+BAA+B;IAqCjC,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B1E,OAAO,CAAC,qBAAqB;YA6Cf,+BAA+B;IA+B7C,OAAO,CAAC,YAAY;YA4EN,kBAAkB;CAiBnC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../src/routing/router.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGrL,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAA6B,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACrH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAM3E,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAM9D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAKnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAO7F;;GAEG;AACH,qBACa,MAAO,YAAW,eAAe,EAAE,SAAS,EAAE,UAAU;IAc7D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAnBhC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,QAAQ,CAAC,wBAAwB,EAAE,kBAAkB,CACjD,YAAY,EACZ,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAClC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CACtC,EAAE,CAAM;gBAIY,MAAM,EAAE,eAAe,EAEvB,MAAM,EAAE,eAAe,EAEvB,iBAAiB,EAAE,0BAA0B,EAE7C,WAAW,EAAE,oBAAoB;IAIhD,SAAS,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrD,UAAU,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAIvC,OAAO,CAAC,2BAA2B;IAe7B,aAAa,CAEf,mBAAmB,SAAS,iBAAiB,GAAG;QAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,EAChF,mBAAmB,SAAS,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAClE,oBAAoB,SAAS,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACpE,qBAAqB,SAAS,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAEtE,KAAK,EAAE,uBAAuB,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB,CAAC,GACtH,OAAO,CAAC,IAAI,CAAC;IAqDhB,OAAO,CAAC,+BAA+B;IAqCjC,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B1E,OAAO,CAAC,qBAAqB;YA2Df,+BAA+B;YAuC/B,YAAY;YAwBZ,gBAAgB;IAyC9B,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,kBAAkB;CAmB7B"}

package/dist/cjs/routing/router.js

@@ -17,7 +17,6 @@ const express_1 = require("express");
 const body_decorator_1 = require("./decorators/body.decorator");
 const missing_base_route_error_1 = require("./missing-base-route.error");
 const param_metdata_helpers_1 = require("./param-metdata.helpers");
-const request_context_1 = require("./request.context");
 const resolve_route_params_function_1 = require("./resolve-route-params.function");
 const inject_decorator_1 = require("../di/decorators/inject.decorator");
 const injectable_decorator_1 = require("../di/decorators/injectable.decorator");
@@ -28,9 +27,14 @@ const http_method_enum_1 = require("../http/http-method.enum");
 const known_header_enum_1 = require("../http/known-header.enum");
 const mime_type_enum_1 = require("../http/mime-type.enum");
 const file_response_model_1 = require("../parsing/form-data/file-response.model");
+const csp_options_model_1 = require("../parsing/html/csp-options.model");
 const html_response_model_1 = require("../parsing/html/html-response.model");
 const metadata_utilities_1 = require("../utilities/metadata.utilities");
 const ms_1 = require("../utilities/ms");
+const als_utilities_1 = require("../context/als.utilities");
+const http_request_context_1 = require("../context/request/http-request.context");
+const json_utilities_1 = require("../utilities/json.utilities");
+const object_utilities_1 = require("../utilities/object.utilities");
 /**
  * Default router implementation of Zibri.
  */
@@ -63,7 +67,6 @@ let Router = class Router {
     // eslint-disable-next-line jsdoc/require-jsdoc
     onAppStart(app) {
         app.use(this.expressRouter);
-        app.use((req, _res, next) => (0, request_context_1.runWithRequest)(req, () => next()));
     }
     checkForOrphanedControllers(controllers) {
         const orphanedControllers = global_registry_1.GlobalRegistry.controllerClasses.filter(c => {
@@ -175,31 +178,44 @@ let Router = class Router {
         }
     }
     routeToRequestHandler(route) {
-        const handler = (async (req, res, next) => {
-            try {
-                if (route.bodyMetadata) {
-                    req.body = await this.parser.parseBody(req, route.bodyMetadata);
-                    this.validationService.validateBody(req.body, route.bodyMetadata);
-                }
-                for (const key in route.pathParams) {
-                    req.params[key] = this.parser.parsePathParam(req, route.pathParams[key]);
-                    this.validationService.validatePathParam(req.params[key], route.pathParams[key]);
+        const handler = (async (request, res, next) => {
+            const context = new http_request_context_1.HttpRequestContext(request, res, undefined, undefined);
+            await als_utilities_1.AlsUtilities.runWithHttpRequestContext(context, async () => {
+                try {
+                    // parse
+                    for (const key of object_utilities_1.ObjectUtilities.keys(route.pathParams)) {
+                        context.request.params[key] = this.parser.parsePathParam(context.request, route.pathParams[key]);
+                    }
+                    for (const key of object_utilities_1.ObjectUtilities.keys(route.queryParams)) {
+                        context.request.query[key] = this.parser.parseQueryParam(context.request, route.queryParams[key]);
+                    }
+                    for (const key of object_utilities_1.ObjectUtilities.keys(route.headerParams)) {
+                        context.request.headers[key] = this.parser.parseHeaderParam(context.request, route.headerParams[key]);
+                    }
+                    if (route.bodyMetadata) {
+                        context.request.body = await this.parser.parseBody(context.request, route.bodyMetadata);
+                    }
+                    // validate
+                    await Promise.all([
+                        ...object_utilities_1.ObjectUtilities.keys(route.pathParams).map(async (key) => {
+                            await this.validationService.validatePathParam(context.request.params[key], route.pathParams[key]);
+                        }),
+                        ...object_utilities_1.ObjectUtilities.keys(route.queryParams).map(async (key) => {
+                            await this.validationService.validateQueryParam(context.request.query[key], route.queryParams[key]);
+                        }),
+                        ...object_utilities_1.ObjectUtilities.keys(route.headerParams).map(async (key) => {
+                            await this.validationService.validateHeaderParam(context.request.headers[key], route.headerParams[key]);
+                        }),
+                        ...route.bodyMetadata ? [this.validationService.validateBody(context.request.body, route.bodyMetadata)] : []
+                    ]);
+                    // eslint-disable-next-line typescript/no-explicit-any
+                    const result = await route.handler(context.request, context.response, next);
+                    await this.returnResult(context.response, result, next, []);
                 }
-                for (const key in route.queryParams) {
-                    req.query[key] = this.parser.parseQueryParam(req, route.queryParams[key]);
-                    this.validationService.validateQueryParam(req.query[key], route.queryParams[key]);
+                catch (error) {
+                    next(error);
                 }
-                for (const key in route.headerParams) {
-                    req.headers[key] = this.parser.parseHeaderParam(req, route.headerParams[key]);
-                    this.validationService.validateHeaderParam(req.headers[key], route.headerParams[key]);
-                }
-                // eslint-disable-next-line typescript/no-explicit-any
-                const result = await route.handler(req, res, next);
-                this.returnResult(res, result, next);
-            }
-            catch (error) {
-                next(error);
-            }
+            });
         });
         return handler;
     }
@@ -209,23 +225,26 @@ let Router = class Router {
             await this.logger.warn(`No responses defined on route ${controllerClass.name}.${route.controllerMethod}`);
         }
         const handler = (async (req, res, next) => {
-            try {
-                await this.authService.checkAccess(controllerClass, route.controllerMethod, req);
-                const controller = (0, inject_function_1.inject)(controllerClass);
-                const params = await this.resolveRouteParams(controllerClass, route.controllerMethod, 
-                // eslint-disable-next-line typescript/no-unsafe-member-access, typescript/no-explicit-any
-                controller[route.controllerMethod].length, req);
-                // eslint-disable-next-line typescript/no-unsafe-call, typescript/no-explicit-any, typescript/no-unsafe-member-access
-                const result = await controller[route.controllerMethod](...params);
-                this.returnResult(res, result, next);
-            }
-            catch (error) {
-                next(error);
-            }
+            const context = new http_request_context_1.HttpRequestContext(req, res, controllerClass, route.controllerMethod);
+            await als_utilities_1.AlsUtilities.runWithHttpRequestContext(context, async () => {
+                try {
+                    await this.authService.checkAccess(controllerClass, route.controllerMethod, context);
+                    const controller = (0, inject_function_1.inject)(controllerClass);
+                    const params = await (0, resolve_route_params_function_1.resolveRouteParams)(controllerClass, route.controllerMethod, 
+                    // eslint-disable-next-line typescript/no-unsafe-member-access, typescript/no-explicit-any
+                    controller[route.controllerMethod].length, context);
+                    // eslint-disable-next-line typescript/no-unsafe-call, typescript/no-explicit-any, typescript/no-unsafe-member-access
+                    const result = await controller[route.controllerMethod](...params);
+                    await this.returnResult(context.response, result, next, responses);
+                }
+                catch (error) {
+                    next(error);
+                }
+            });
         });
         return handler;
     }
-    returnResult(res, result, next) {
+    async returnResult(res, result, next, responses) {
         if (res.headersSent) {
             return;
         }
@@ -233,67 +252,100 @@ let Router = class Router {
             res.end();
             return;
         }
-        // if (
-        //     responses.length // all non error responses are json responses
-        //     && responses.filter(r => r.type !== 'error').length === responses.filter(r => r.type === 'json').length
-        //     && ((result instanceof FileResponse) || (result instanceof HtmlResponse))
-        // ) {
-        //     throw new Error('Invalid return value, json cannot be FileResponse or HtmlResponse');
-        // }
-        // if (
-        //     responses.length // all non error responses are file responses
-        //     && responses.filter(r => r.type !== 'error').length === responses.filter(r => r.type === 'file').length
-        //     && !(result instanceof FileResponse)
-        // ) {
-        //     throw new Error('Invalid return value, needs to be a FileResponse');
-        // }
-        // if (
-        //     responses.length // all non error responses are html responses
-        //     && responses.filter(r => r.type !== 'error').length === responses.filter(r => r.type === 'html').length
-        //     && !(result instanceof FileResponse)
-        // ) {
-        //     throw new Error('Invalid return value, needs to be a HtmlResponse');
-        // }
+        this.validateResultType(responses, result);
         if (result instanceof file_response_model_1.FileResponse) {
-            res.setHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE, result.mimeType);
-            res.setHeader(known_header_enum_1.KnownHeader.CONTENT_DISPOSITION, `attachment; filename="${encodeURIComponent(result.filename)}"`);
-            if (result.size != undefined) {
-                res.setHeader(known_header_enum_1.KnownHeader.CONTENT_LENGTH, result.size);
+            await this.returnFileResult(res, result, next);
+            return;
+        }
+        if (result instanceof html_response_model_1.HtmlResponse) {
+            this.returnHtmlResult(res, result, next);
+            return;
+        }
+        res.json(json_utilities_1.JsonUtilities.parse(json_utilities_1.JsonUtilities.stringify(result)));
+    }
+    async returnFileResult(res, result, next) {
+        res.setHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE, result.mimeType);
+        res.setHeader(known_header_enum_1.KnownHeader.CONTENT_DISPOSITION, `attachment; filename="${encodeURIComponent(result.filename)}"`);
+        if (result.size != undefined) {
+            res.setHeader(known_header_enum_1.KnownHeader.CONTENT_LENGTH, result.size);
+        }
+        if (result.csp !== false) {
+            if (result.mimeType === mime_type_enum_1.MimeType.SVG) {
+                await this.logger.warn('Useless CSP headers found on a file that is not of type svg');
             }
-            // send file from disk
-            if (typeof result.data === 'string') {
-                res.sendFile(result.data);
-                return;
+            const csp = result.csp === true ? (0, inject_function_1.inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.DEFAULT_CSP_OPTIONS) : result.csp;
+            res.setHeader(known_header_enum_1.KnownHeader.CONTENT_SECURITY_POLICY, (0, csp_options_model_1.buildCspHeaders)(csp));
+            if (csp.frameAncestors.length === 1) {
+                const ancestor = csp.frameAncestors[0];
+                if (ancestor === '\'none\'') {
+                    res.setHeader(known_header_enum_1.KnownHeader.X_FRAME_OPTIONS, 'DENY');
+                }
+                else if (ancestor === '\'self\'') {
+                    // eslint-disable-next-line cspell/spellchecker
+                    res.setHeader(known_header_enum_1.KnownHeader.X_FRAME_OPTIONS, 'SAMEORIGIN');
+                }
             }
-            // send file as stream
-            res.on('close', () => result.data.destroy());
-            result.data.on('error', err => {
-                res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE);
-                res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_LENGTH);
-                res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_DISPOSITION);
-                next(err);
-            }).pipe(res);
+        }
+        // send file from disk
+        if (typeof result.data === 'string') {
+            res.sendFile(result.data);
             return;
         }
-        if (result instanceof html_response_model_1.HtmlResponse) {
-            res.setHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE, mime_type_enum_1.MimeType.HTML);
-            // send html as string
-            if (typeof result.data === 'string') {
-                res.type('.html').send(result.data);
-                return;
+        // send file as stream
+        res.on('close', () => result.data.destroy());
+        result.data.on('error', err => {
+            res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE);
+            res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_LENGTH);
+            res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_DISPOSITION);
+            res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_SECURITY_POLICY);
+            next(err);
+        }).pipe(res);
+    }
+    returnHtmlResult(res, result, next) {
+        res.setHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE, mime_type_enum_1.MimeType.HTML);
+        if (result.csp !== false) {
+            const csp = result.csp === true ? (0, inject_function_1.inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.DEFAULT_CSP_OPTIONS) : result.csp;
+            res.setHeader(known_header_enum_1.KnownHeader.CONTENT_SECURITY_POLICY, (0, csp_options_model_1.buildCspHeaders)(csp));
+            if (csp.frameAncestors.length === 1) {
+                const ancestor = csp.frameAncestors[0];
+                if (ancestor === '\'none\'') {
+                    res.setHeader(known_header_enum_1.KnownHeader.X_FRAME_OPTIONS, 'DENY');
+                }
+                else if (ancestor === '\'self\'') {
+                    // eslint-disable-next-line cspell/spellchecker
+                    res.setHeader(known_header_enum_1.KnownHeader.X_FRAME_OPTIONS, 'SAMEORIGIN');
+                }
             }
-            // send html as stream
-            res.on('close', () => result.data.destroy());
-            result.data.on('error', err => {
-                res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE);
-                next(err);
-            }).pipe(res);
+        }
+        // send html as string
+        if (typeof result.data === 'string') {
+            res.type('.html').send(result.data);
             return;
         }
-        res.json(result);
+        // send html as stream
+        res.on('close', () => result.data.destroy());
+        result.data.on('error', err => {
+            res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_TYPE);
+            res.removeHeader(known_header_enum_1.KnownHeader.CONTENT_SECURITY_POLICY);
+            next(err);
+        }).pipe(res);
     }
-    async resolveRouteParams(controllerClass, controllerMethod, totalParamCount, req) {
-        return await (0, resolve_route_params_function_1.resolveRouteParams)(controllerClass, controllerMethod, totalParamCount, req, this.parser, this.validationService, this.authService, undefined);
+    validateResultType(responses, result) {
+        if (responses.some(r => r.type === 'json') // all non error responses are json responses
+            && responses.filter(r => r.type !== 'error').length === responses.filter(r => r.type === 'json').length
+            && ((result instanceof file_response_model_1.FileResponse) || (result instanceof html_response_model_1.HtmlResponse))) {
+            throw new Error('Invalid return value, json cannot be FileResponse or HtmlResponse');
+        }
+        if (responses.some(r => r.type === 'file') // all non error responses are file responses
+            && responses.filter(r => r.type !== 'error').length === responses.filter(r => r.type === 'file').length
+            && !(result instanceof file_response_model_1.FileResponse)) {
+            throw new Error('Invalid return value, needs to be a FileResponse');
+        }
+        if (responses.some(r => r.type === 'html') // all non error responses are html responses
+            && responses.filter(r => r.type !== 'error').length === responses.filter(r => r.type === 'html').length
+            && !(result instanceof html_response_model_1.HtmlResponse)) {
+            throw new Error('Invalid return value, needs to be a HtmlResponse');
+        }
     }
 };
 exports.Router = Router;

package/dist/cjs/routing/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/routing/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/routing/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,qCAAgF;AAGhF,gEAAkG;AAElG,yEAAmE;AACnE,mEAAuH;AAGvH,mFAAqE;AAGrE,wEAA2D;AAC3D,gFAAmE;AACnE,mFAAwE;AACxE,2DAA+C;AAC/C,+DAA2D;AAG3D,+DAAsD;AAGtD,iEAAwD;AACxD,2DAAkD;AAGlD,kFAAwE;AACxE,yEAA2F;AAC3F,6EAAmE;AAGnE,wEAAoE;AACpE,wCAAqC;AAGrC,4DAAwD;AACxD,kFAA6E;AAC7E,gEAA4D;AAC5D,oEAAgE;AAEhE;;GAEG;AAEI,IAAM,MAAM,GAAZ,MAAM,MAAM;IAcM;IAEA;IAEA;IAEA;IAnBJ,aAAa,GAAkB,IAAA,gBAAa,GAAE,CAAC;IAC/C,aAAa,GAAa,EAAE,CAAC;IAC7B,cAAc,GAAa,EAAE,CAAC;IAC/C,+CAA+C;IACtC,wBAAwB,GAK3B,EAAE,CAAC;IAET,YAEqB,MAAuB,EAEvB,MAAuB,EAEvB,iBAA6C,EAE7C,WAAiC;QANjC,WAAM,GAAN,MAAM,CAAiB;QAEvB,WAAM,GAAN,MAAM,CAAiB;QAEvB,sBAAiB,GAAjB,iBAAiB,CAA4B;QAE7C,gBAAW,GAAX,WAAW,CAAsB;IACnD,CAAC;IAEJ,+CAA+C;IAC/C,KAAK,CAAC,SAAS,CAAC,GAAqB;QACjC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,eAAe,CAAC,CAAC;QACnF,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAmC,sCAAiB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YACjG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;YAC3E,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,+CAA+C;IAC/C,UAAU,CAAC,GAAqB;QAC5B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;IAEO,2BAA2B,CAAC,WAA+B;QAC/D,MAAM,mBAAmB,GAAuB,gCAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YACxF,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,sCAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,WAAW,IAAI,KAAK,CAAC,CAAC;QACvG,CAAC,CAAC,CAAC;QACH,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAa,CAAC,4BAA4B,EAAE,6BAA6B,CAAC,CAAC;YACxF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YACtE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,aAAa,CAOf,KAAqH;QAErH,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;YACnF,MAAM,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,KAAK,oCAAoC,CAAC,CAAC;QACrH,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAE7E,MAAM,UAAU,GAAsC,EAAE,CAAC;QACzD,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACjC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAA,+CAAuB,EAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,WAAW,GAAuC,EAAE,CAAC;QAC3D,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YAClC,WAAW,CAAC,GAAG,CAAC,GAAG,IAAA,gDAAwB,EAAC,GAAG,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7E,CAAC;QACD,MAAM,YAAY,GAAwC,EAAE,CAAC;QAC7D,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACnC,YAAY,CAAC,GAAG,CAAC,GAAG,IAAA,iDAAyB,EAAC,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,sDAAsD;QACtD,MAAM,KAAK,GAA2C;YAClD,GAAG,KAAK;YACR,OAAO,EAAE,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC;YAC9E,YAAY,EAAE,KAAK,CAAC,YAAY;gBAC5B,CAAC,CAAC;oBACE,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,IAAI;oBACd,WAAW,EAAE,SAAS;oBACtB,IAAI,EAAE,yBAAQ,CAAC,IAAI;oBACnB,cAAc,EAAE,OAAE,CAAC,GAAG;oBACtB,OAAO,EAAE,KAAK;oBACd,yBAAyB,EAAE,KAAK;oBAChC,OAAO,EAAE,IAAA,mCAAkB,EAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC;oBAC1F,GAAG,KAAK,CAAC,YAAY;iBACxB;gBACD,CAAC,CAAC,SAAS;YACf,UAAU;YACV,WAAW;YACX,YAAY;SACf,CAAC;QACF,MAAM,OAAO,GAAmB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACvF,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAC9B,KAKC,CACJ,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEO,+BAA+B,CACnC,KAAuG,EACvG,UAAsB;QAEtB,IAAI,KAAK,EAAE,YAAY,KAAK,IAAI,EAAE,CAAC;YAC/B,OAAO;gBACH,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE,EAAE;gBACR,GAAG,KAAK;aACX,CAAC;QACN,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACR,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,QAAQ,UAAU,EAAE,CAAC;YACjB,KAAK,6BAAU,CAAC,IAAI,CAAC;YACrB,KAAK,6BAAU,CAAC,OAAO,CAAC;YACxB,KAAK,6BAAU,CAAC,KAAK,CAAC;YACtB,KAAK,6BAAU,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClB,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;YACnC,CAAC;YACD,KAAK,6BAAU,CAAC,IAAI,CAAC;YACrB,KAAK,6BAAU,CAAC,GAAG,CAAC;YACpB,KAAK,6BAAU,CAAC,KAAK,CAAC;YACtB,KAAK,6BAAU,CAAC,MAAM,CAAC,CAAC,CAAC;gBACrB,OAAO;oBACH,SAAS,EAAE,EAAE;oBACb,IAAI,EAAE,EAAE;oBACR,YAAY,EAAE,IAAI;iBACrB,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,kBAAkB,CAAC,eAAiC;QACtD,MAAM,cAAc,GAA+B,sCAAiB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACxG,IAAI,cAAc,IAAI,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,gDAAqB,CAAC,eAAe,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,mBAAmB,cAAc,CAAC,SAAS,iDAAiD,CAAC,CAAC;QAClH,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,MAAM,GAAmC,sCAAiB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAEtG,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,OAAO,GAAmB,MAAM,IAAI,CAAC,+BAA+B,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YACnG,MAAM,UAAU,GAAW,cAAc,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YACxH,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,EAAE,CAAC,EAAE,CAAC;gBAClF,MAAM,IAAI,KAAK,CACX,cAAc,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,oCAAoC,EAC9F,EAAE,KAAK,EAAE,eAAe,EAAE,CAC7B,CAAC;YACN,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;IACL,CAAC;IAEO,qBAAqB,CAK3B,KAA4F;QAC1F,MAAM,OAAO,GAAmB,CAAC,KAAK,EAClC,OAAoB,EACpB,GAAiB,EACjB,IAAkB,EACpB,EAAE;YACA,MAAM,OAAO,GAAuB,IAAI,yCAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC/F,MAAM,4BAAY,CAAC,yBAAyB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAC7D,IAAI,CAAC;oBACD,QAAQ;oBACR,KAAK,MAAM,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;wBACtD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAa,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;oBAClH,CAAC;oBACD,KAAK,MAAM,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;wBACvD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAa,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CACjE,OAAO,CAAC,OAAO,EACf,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CACzB,CAAC;oBACN,CAAC;oBACD,KAAK,MAAM,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;wBACxD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAa,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CACpE,OAAO,CAAC,OAAO,EACf,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAC1B,CAAC;oBACN,CAAC;oBACD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;wBACrB,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC5F,CAAC;oBACD,WAAW;oBACX,MAAM,OAAO,CAAC,GAAG,CAAC;wBACd,GAAG,kCAAe,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;4BACtD,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;wBACvG,CAAC,CAAC;wBACF,GAAG,kCAAe,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;4BACvD,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;wBACxG,CAAC,CAAC;wBACF,GAAG,kCAAe,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;4BACxD,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC5G,CAAC,CAAC;wBACF,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;qBAC/G,CAAC,CAAC;oBAEH,sDAAsD;oBACtD,MAAM,MAAM,GAAY,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAA0C,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;oBACxH,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;gBAChE,CAAC;gBACD,OAAO,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAmB,CAAC;QACrB,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,+BAA+B,CACzC,eAAiC,EACjC,KAAmC;QAEnC,MAAM,SAAS,GAAsB,sCAAiB,CAAC,iBAAiB,CAAC,eAAe,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAClH,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,eAAe,CAAC,IAAI,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC9G,CAAC;QACD,MAAM,OAAO,GAAmB,CAAC,KAAK,EAAE,GAAgB,EAAE,GAAiB,EAAE,IAAkB,EAAE,EAAE;YAC/F,MAAM,OAAO,GAAuB,IAAI,yCAAkB,CACtD,GAAG,EACH,GAAG,EACH,eAAe,EACf,KAAK,CAAC,gBAAgB,CACzB,CAAC;YACF,MAAM,4BAAY,CAAC,yBAAyB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAC7D,IAAI,CAAC;oBACD,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;oBACrF,MAAM,UAAU,GAAY,IAAA,wBAAM,EAAC,eAAe,CAAC,CAAC;oBACpD,MAAM,MAAM,GAAc,MAAM,IAAA,kDAAkB,EAC9C,eAAe,EACf,KAAK,CAAC,gBAAgB;oBACtB,0FAA0F;oBACxF,UAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAc,CAAC,MAAM,EAChE,OAAO,CACV,CAAC;oBAEF,qHAAqH;oBACrH,MAAM,MAAM,GAAY,MAAQ,UAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAc,CAAC,GAAG,MAAM,CAAC,CAAC;oBACnG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBACvE,CAAC;gBACD,OAAO,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAmB,CAAC;QACrB,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,GAAiB,EAAE,MAAe,EAAE,IAAkB,EAAE,SAA4B;QAC3G,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QACD,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACtB,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACX,CAAC;QAED,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAE3C,IAAI,MAAM,YAAY,kCAAY,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/C,OAAO;QACX,CAAC;QAED,IAAI,MAAM,YAAY,kCAAY,EAAE,CAAC;YACjC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACzC,OAAO;QACX,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,8BAAa,CAAC,KAAK,CAAC,8BAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,GAAiB,EAAE,MAAoB,EAAE,IAAkB;QACtF,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,YAAY,EAAE,MAAM,CAAC,QAAoB,CAAC,CAAC;QACrE,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,mBAAmB,EAAE,yBAAyB,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChH,IAAI,MAAM,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YAC3B,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,MAAM,CAAC,GAAG,KAAK,KAAK,EAAE,CAAC;YACvB,IAAI,MAAM,CAAC,QAAQ,KAAK,yBAAQ,CAAC,GAAG,EAAE,CAAC;gBACnC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAC1F,CAAC;YACD,MAAM,GAAG,GAAe,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAA,wBAAM,EAAC,yCAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACvG,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,uBAAuB,EAAE,IAAA,mCAAe,EAAC,GAAG,CAAC,CAAC,CAAC;YACzE,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,QAAQ,GAAc,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;gBAClD,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;oBAC1B,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;gBACvD,CAAC;qBACI,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;oBAC/B,+CAA+C;oBAC/C,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;gBAC7D,CAAC;YACL,CAAC;QACL,CAAC;QAED,sBAAsB;QACtB,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,OAAO;QACX,CAAC;QAED,sBAAsB;QACtB,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAE,MAAM,CAAC,IAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;YAC1B,GAAG,CAAC,YAAY,CAAC,+BAAW,CAAC,YAAY,CAAC,CAAC;YAC3C,GAAG,CAAC,YAAY,CAAC,+BAAW,CAAC,cAAc,CAAC,CAAC;YAC7C,GAAG,CAAC,YAAY,CAAC,+BAAW,CAAC,mBAAmB,CAAC,CAAC;YAClD,GAAG,CAAC,YAAY,CAAC,+BAAW,CAAC,uBAAuB,CAAC,CAAC;YACtD,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAEO,gBAAgB,CAAC,GAAiB,EAAE,MAAoB,EAAE,IAAkB;QAChF,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,YAAY,EAAE,yBAAQ,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,GAAG,KAAK,KAAK,EAAE,CAAC;YACvB,MAAM,GAAG,GAAe,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAA,wBAAM,EAAC,yCAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACvG,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,uBAAuB,EAAE,IAAA,mCAAe,EAAC,GAAG,CAAC,CAAC,CAAC;YACzE,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,QAAQ,GAAc,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;gBAClD,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;oBAC1B,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;gBACvD,CAAC;qBACI,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;oBAC/B,+CAA+C;oBAC/C,GAAG,CAAC,SAAS,CAAC,+BAAW,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;gBAC7D,CAAC;YACL,CAAC;QACL,CAAC;QACD,sBAAsB;QACtB,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpC,OAAO;QACX,CAAC;QACD,sBAAsB;QACtB,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAE,MAAM,CAAC,IAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;YAC1B,GAAG,CAAC,YAAY,CAAC,+BAAW,CAAC,YAAY,CAAC,CAAC;YAC3C,GAAG,CAAC,YAAY,CAAC,+BAAW,CAAC,uBAAuB,CAAC,CAAC;YACtD,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAEO,kBAAkB,CAAC,SAA4B,EAAE,MAAU;QAC/D,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,6CAA6C;eACjF,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM;eACpG,CAAC,CAAC,MAAM,YAAY,kCAAY,CAAC,IAAI,CAAC,MAAM,YAAY,kCAAY,CAAC,CAAC,EAAE,CAAC;YAC5E,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;QACzF,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,6CAA6C;eACjF,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM;eACpG,CAAC,CAAC,MAAM,YAAY,kCAAY,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,6CAA6C;eACjF,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM;eACpG,CAAC,CAAC,MAAM,YAAY,kCAAY,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;CACJ,CAAA;AAtYY,wBAAM;iBAAN,MAAM;IADlB,IAAA,iCAAU,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAczB,WAAA,IAAA,yBAAM,EAAC,yCAAe,CAAC,MAAM,CAAC,CAAA;IAE9B,WAAA,IAAA,yBAAM,EAAC,yCAAe,CAAC,MAAM,CAAC,CAAA;IAE9B,WAAA,IAAA,yBAAM,EAAC,yCAAe,CAAC,kBAAkB,CAAC,CAAA;IAE1C,WAAA,IAAA,yBAAM,EAAC,yCAAe,CAAC,YAAY,CAAC,CAAA;;GAnBhC,MAAM,CAsYlB"}

package/dist/cjs/types/any-enum.type.d.ts

@@ -1,4 +1,4 @@
-export type AnyEnum<T extends string | number = string | number> = {
+export type AnyEnum<T extends string | number | bigint = string | number | bigint> = {
     [key: string]: T;
 };
 //# sourceMappingURL=any-enum.type.d.ts.map

package/dist/cjs/types/any-enum.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"any-enum.type.d.ts","sourceRoot":"","sources":["../../../src/types/any-enum.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAA;CAAE,CAAC"}
+{"version":3,"file":"any-enum.type.d.ts","sourceRoot":"","sources":["../../../src/types/any-enum.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAA;CAAE,CAAC"}

package/dist/cjs/types/deep-partial.type.d.ts

@@ -1,4 +1,4 @@
-export type DeepPartial<T> = T | (T extends (infer U)[] ? DeepPartial<U>[] : T extends Map<infer K, infer V> ? Map<DeepPartial<K>, DeepPartial<V>> : T extends Set<infer M> ? Set<DeepPartial<M>> : T extends object ? {
+export type DeepPartial<T> = T | (T extends Date ? Date : T extends (infer U)[] ? DeepPartial<U>[] : T extends Map<infer K, infer V> ? Map<DeepPartial<K>, DeepPartial<V>> : T extends Set<infer M> ? Set<DeepPartial<M>> : T extends object ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : T);
 //# sourceMappingURL=deep-partial.type.d.ts.map

package/dist/cjs/types/deep-partial.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deep-partial.type.d.ts","sourceRoot":"","sources":["../../../src/types/deep-partial.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GACjD,WAAW,CAAC,CAAC,CAAC,EAAE,GAChB,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC3B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GACnC,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAClB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACnB,CAAC,SAAS,MAAM,GACZ;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrC,GAAG,CAAC,CAAC,CAAC"}
+{"version":3,"file":"deep-partial.type.d.ts","sourceRoot":"","sources":["../../../src/types/deep-partial.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAC7B,CAAC,SAAS,IAAI,GACR,IAAI,GACJ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GACjB,WAAW,CAAC,CAAC,CAAC,EAAE,GAChB,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAC3B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GACnC,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAClB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACnB,CAAC,SAAS,MAAM,GACZ;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACtC,CAAC,CAC1B,CAAC"}

package/dist/cjs/types/percentage.type.d.ts

@@ -1,5 +1,5 @@
 type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
-type IntRange<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
+export type IntRange<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
 /**
  * A number from 0 to 100.
  */