@n1k1t/mock-server 0.1.1 → 0.1.2

package/lib/src/server/middlewares/handle-expectation-delay.middleware.d.ts

@@ -1,8 +1,18 @@
 import { Middleware } from '../models';
-declare const _default: Middleware & {
-    required: "expectation"[];
-} & {
-    handler: import("../models").TMiddlewareHandler<"expectation">;
+declare const _default: Middleware<"expectation", import("../models").HttpRequestContext<unknown> & {
+    shared: SetRequiredKeys<{
+        expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+        history?: import("../history").History;
+        forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+    }, "expectation">;
+}> & {
+    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: SetRequiredKeys<{
+            expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+            history?: import("../history").History;
+            forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+        }, "expectation">;
+    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
 };
 export default _default;
 //# sourceMappingURL=handle-expectation-delay.middleware.d.ts.map

package/lib/src/server/middlewares/handle-expectation-delay.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-expectation-delay.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-delay.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;AAGvC,wBASK"}
+{"version":3,"file":"handle-expectation-delay.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-delay.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;AAGvC,wBAQK"}

package/lib/src/server/middlewares/handle-expectation-delay.middleware.js

@@ -7,8 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const models_1 = require("../models");
 const utils_1 = require("../../utils");
 exports.default = models_1.Middleware
-    .build(__filename)
-    .requires(['expectation'])
+    .build(__filename, ['expectation'])
     .assignHandler(async (context, next) => {
     if (context.shared.expectation.delay) {
         await (0, utils_1.wait)(lodash_1.default.flatten([context.shared.expectation.delay])[0].ms);

package/lib/src/server/middlewares/handle-expectation-delay.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-expectation-delay.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-delay.middleware.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AAEvB,sCAAuC;AACvC,uCAAmC;AAEnC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC;KACzB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACrC,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACrC,MAAM,IAAA,YAAI,EAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,EAAE,CAAC;AACT,CAAC,CAAC,CAAC"}
+{"version":3,"file":"handle-expectation-delay.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-delay.middleware.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AAEvB,sCAAuC;AACvC,uCAAmC;AAEnC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;KAClC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACrC,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACrC,MAAM,IAAA,YAAI,EAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,EAAE,CAAC;AACT,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/handle-expectation-forward.middleware.d.ts

@@ -1,8 +1,18 @@
 import { Middleware } from '../models';
-declare const _default: Middleware & {
-    required: ("expectation" | "historyRecord")[];
-} & {
-    handler: import("../models").TMiddlewareHandler<"expectation" | "historyRecord">;
+declare const _default: Middleware<"expectation" | "history", import("../models").HttpRequestContext<unknown> & {
+    shared: SetRequiredKeys<{
+        expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+        history?: import("../history").History;
+        forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+    }, "expectation" | "history">;
+}> & {
+    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: SetRequiredKeys<{
+            expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+            history?: import("../history").History;
+            forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+        }, "expectation" | "history">;
+    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
 };
 export default _default;
 //# sourceMappingURL=handle-expectation-forward.middleware.d.ts.map

package/lib/src/server/middlewares/handle-expectation-forward.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-expectation-forward.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-forward.middleware.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;AAEvC,wBA+FK"}
+{"version":3,"file":"handle-expectation-forward.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-forward.middleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,UAAU,EAAkC,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;AAE3F,wBAmFK"}

package/lib/src/server/middlewares/handle-expectation-forward.middleware.js

@@ -6,40 +6,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils");
 const models_1 = require("../models");
 exports.default = models_1.Middleware
-    .build(__filename)
-    .requires(['expectation', 'historyRecord'])
+    .build(__filename, ['expectation', 'history'])
     .assignHandler(async (context, next) => {
     if (!context.shared.expectation.forward) {
         return next();
     }
-    const { protocol, host, port, timeout, proxy } = context.shared.expectation.forward;
-    const manipulatedContext = context.shared.expectation
-        .manipulateContext('request', context.toPlain(), { clone: true });
-    const body = manipulatedContext.body === undefined ? manipulatedContext.bodyRaw : manipulatedContext.body;
-    const bodyRaw = Buffer.from(typeof body === 'object' ? JSON.stringify(body) : String(body));
-    Object.assign(manipulatedContext, {
-        bodyRaw,
+    const { url, baseUrl, timeout, proxy } = context.shared.expectation.forward;
+    const forwarded = context.toPlain({ locations: ['incoming'], clone: true });
+    context.shared.expectation.request?.manipulate(forwarded);
+    const incomingType = (0, models_1.extractPayloadType)(forwarded.incoming.headers);
+    const body = forwarded.incoming.body === undefined ? forwarded.incoming.bodyRaw : forwarded.incoming.body;
+    const bodyRaw = Buffer.from(typeof body === 'object' ? (0, models_1.serializePayload)(incomingType, body) : String(body));
+    Object.assign(forwarded.incoming, {
+        type: incomingType,
+        bodyRaw: bodyRaw.toString(),
         headers: {
             'connection': 'close',
-            ...manipulatedContext.headers,
-            ...((!manipulatedContext.headers?.['transfer-encoding'] && bodyRaw?.length) && {
+            ...forwarded.incoming.headers,
+            ...((!forwarded.incoming.headers?.['transfer-encoding'] && bodyRaw?.length) && {
                 'content-length': String(bodyRaw.length),
             }),
         },
     });
-    const historyRecord = context.shared.historyRecord.assign({ forwaded: { request: manipulatedContext } });
-    context.exchange.ws.publish('history:updated', historyRecord);
+    const history = context.shared.history.extendForwarded(forwarded);
+    context.server.exchange.ws.publish('history:updated', history);
     const response = await (0, axios_1.default)({
         timeout: timeout ?? 1000 * 30,
-        method: manipulatedContext.method,
-        headers: manipulatedContext.headers,
-        url: manipulatedContext.path,
-        baseURL: `${protocol.toLocaleLowerCase()}://${host}:${port}`,
+        method: forwarded.incoming.method,
+        headers: forwarded.incoming.headers,
+        ...(url && { url }),
+        ...(baseUrl && { baseURL: baseUrl, url: forwarded.incoming.path }),
         data: bodyRaw,
-        params: context.query,
+        params: context.incoming.query,
         responseType: 'arraybuffer',
         ...(proxy && {
             proxy,
@@ -47,40 +47,26 @@ exports.default = models_1.Middleware
         }),
     }).catch((error) => {
         if (!error.response) {
-            historyRecord
+            history
                 .assign({ error: lodash_1.default.pick(error, ['message', 'code']) })
                 .changeState('finished');
-            context.exchange.ws.publish('history:updated', historyRecord);
+            context.server.exchange.ws.publish('history:updated', history);
             context.reply.internalError(error.message);
             throw error;
         }
         return error.response;
     });
-    const contentTypeKey = Object
-        .keys(response.headers)
-        .find((key) => key.toLowerCase() === 'content-type');
-    const isJsonData = lodash_1.default.flatten([lodash_1.default.get(response.headers, contentTypeKey ?? '', '')])
-        .join(',')
-        .toLowerCase()
-        .includes('application/json');
-    const parsingResponseDataResult = isJsonData ? (0, utils_1.parseJsonSafe)(response.data) : null;
-    const responseContext = {
-        payloadType: isJsonData ? 'json' : 'plain',
-        statusCode: response.status,
+    const outgoingType = (0, models_1.extractPayloadType)(response.headers);
+    const dataRaw = response.data?.toString() ?? '';
+    forwarded.outgoing = {
+        type: outgoingType,
+        status: response.status,
         headers: response.headers,
-        dataRaw: response.data?.toString() ?? '',
-        ...(parsingResponseDataResult?.status === 'OK' && { data: parsingResponseDataResult.result }),
+        dataRaw,
+        data: (0, models_1.parsePayload)(outgoingType, dataRaw),
     };
-    historyRecord.extendForwarded({
-        response: responseContext,
-        curl: lodash_1.default.get(response.config, 'curlCommand'),
-    });
-    context.exchange.ws.publish('history:updated', historyRecord);
-    return next({
-        forwarded: {
-            request: manipulatedContext,
-            response: responseContext,
-        },
-    });
+    history.extendForwarded(forwarded);
+    context.server.exchange.ws.publish('history:updated', history.toPlain());
+    return next({ forwarded });
 });
 //# sourceMappingURL=handle-expectation-forward.middleware.js.map

package/lib/src/server/middlewares/handle-expectation-forward.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-expectation-forward.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-forward.middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handle-expectation-forward.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/handle-expectation-forward.middleware.ts"],"names":[],"mappings":"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"}

package/lib/src/server/middlewares/index.d.ts

@@ -1,9 +1,9 @@
-export { default as handleInternalMiddleware } from './internal-route.middleware';
-export { default as resolvePublicMiddleware } from './resolve-public.middleware';
-export { default as validateExpectationRequestMiddleware } from './validate-expectation-request.middleware';
 export { default as handleExpectationForwardMiddleware } from './handle-expectation-forward.middleware';
 export { default as handleExpectationDelayMiddleware } from './handle-expectation-delay.middleware';
+export { default as buildDestroyRequestMiddleware } from './destroy-request.midleware';
+export { default as matchExpectationMiddleware } from './match-expectation.middleware';
+export { default as handleInternalMiddleware } from './internal-route.middleware';
+export { default as resolvePublicMiddleware } from './resolve-public.middleware';
 export { default as addHistoryMiddleware } from './add-history.middleware';
 export { default as replyMiddleware } from './reply.middleware';
-export { default as buildDestroyRequestMiddleware } from './destroy-request.midleware';
 //# sourceMappingURL=index.d.ts.map

package/lib/src/server/middlewares/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,OAAO,IAAI,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AAC5G,OAAO,EAAE,OAAO,IAAI,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AACxG,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACpG,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AACxG,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACpG,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC"}

package/lib/src/server/middlewares/index.js

@@ -3,21 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDestroyRequestMiddleware = exports.replyMiddleware = exports.addHistoryMiddleware = exports.handleExpectationDelayMiddleware = exports.handleExpectationForwardMiddleware = exports.validateExpectationRequestMiddleware = exports.resolvePublicMiddleware = exports.handleInternalMiddleware = void 0;
-var internal_route_middleware_1 = require("./internal-route.middleware");
-Object.defineProperty(exports, "handleInternalMiddleware", { enumerable: true, get: function () { return __importDefault(internal_route_middleware_1).default; } });
-var resolve_public_middleware_1 = require("./resolve-public.middleware");
-Object.defineProperty(exports, "resolvePublicMiddleware", { enumerable: true, get: function () { return __importDefault(resolve_public_middleware_1).default; } });
-var validate_expectation_request_middleware_1 = require("./validate-expectation-request.middleware");
-Object.defineProperty(exports, "validateExpectationRequestMiddleware", { enumerable: true, get: function () { return __importDefault(validate_expectation_request_middleware_1).default; } });
+exports.replyMiddleware = exports.addHistoryMiddleware = exports.resolvePublicMiddleware = exports.handleInternalMiddleware = exports.matchExpectationMiddleware = exports.buildDestroyRequestMiddleware = exports.handleExpectationDelayMiddleware = exports.handleExpectationForwardMiddleware = void 0;
 var handle_expectation_forward_middleware_1 = require("./handle-expectation-forward.middleware");
 Object.defineProperty(exports, "handleExpectationForwardMiddleware", { enumerable: true, get: function () { return __importDefault(handle_expectation_forward_middleware_1).default; } });
 var handle_expectation_delay_middleware_1 = require("./handle-expectation-delay.middleware");
 Object.defineProperty(exports, "handleExpectationDelayMiddleware", { enumerable: true, get: function () { return __importDefault(handle_expectation_delay_middleware_1).default; } });
+var destroy_request_midleware_1 = require("./destroy-request.midleware");
+Object.defineProperty(exports, "buildDestroyRequestMiddleware", { enumerable: true, get: function () { return __importDefault(destroy_request_midleware_1).default; } });
+var match_expectation_middleware_1 = require("./match-expectation.middleware");
+Object.defineProperty(exports, "matchExpectationMiddleware", { enumerable: true, get: function () { return __importDefault(match_expectation_middleware_1).default; } });
+var internal_route_middleware_1 = require("./internal-route.middleware");
+Object.defineProperty(exports, "handleInternalMiddleware", { enumerable: true, get: function () { return __importDefault(internal_route_middleware_1).default; } });
+var resolve_public_middleware_1 = require("./resolve-public.middleware");
+Object.defineProperty(exports, "resolvePublicMiddleware", { enumerable: true, get: function () { return __importDefault(resolve_public_middleware_1).default; } });
 var add_history_middleware_1 = require("./add-history.middleware");
 Object.defineProperty(exports, "addHistoryMiddleware", { enumerable: true, get: function () { return __importDefault(add_history_middleware_1).default; } });
 var reply_middleware_1 = require("./reply.middleware");
 Object.defineProperty(exports, "replyMiddleware", { enumerable: true, get: function () { return __importDefault(reply_middleware_1).default; } });
-var destroy_request_midleware_1 = require("./destroy-request.midleware");
-Object.defineProperty(exports, "buildDestroyRequestMiddleware", { enumerable: true, get: function () { return __importDefault(destroy_request_midleware_1).default; } });
 //# sourceMappingURL=index.js.map

package/lib/src/server/middlewares/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":";;;;;;AAAA,yEAAkF;AAAzE,sJAAA,OAAO,OAA4B;AAC5C,yEAAiF;AAAxE,qJAAA,OAAO,OAA2B;AAC3C,qGAA4G;AAAnG,gLAAA,OAAO,OAAwC;AACxD,iGAAwG;AAA/F,4KAAA,OAAO,OAAsC;AACtD,6FAAoG;AAA3F,wKAAA,OAAO,OAAoC;AACpD,mEAA2E;AAAlE,+IAAA,OAAO,OAAwB;AACxC,uDAAgE;AAAvD,oIAAA,OAAO,OAAmB;AACnC,yEAAuF;AAA9E,2JAAA,OAAO,OAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/middlewares/index.ts"],"names":[],"mappings":";;;;;;AAAA,iGAAwG;AAA/F,4KAAA,OAAO,OAAsC;AACtD,6FAAoG;AAA3F,wKAAA,OAAO,OAAoC;AACpD,yEAAuF;AAA9E,2JAAA,OAAO,OAAiC;AACjD,+EAAuF;AAA9E,2JAAA,OAAO,OAA8B;AAC9C,yEAAkF;AAAzE,sJAAA,OAAO,OAA4B;AAC5C,yEAAiF;AAAxE,qJAAA,OAAO,OAA2B;AAC3C,mEAA2E;AAAlE,+IAAA,OAAO,OAAwB;AACxC,uDAAgE;AAAvD,oIAAA,OAAO,OAAmB"}

package/lib/src/server/middlewares/internal-route.middleware.d.ts

@@ -1,6 +1,18 @@
 import { Middleware } from '../models';
-declare const _default: Middleware & {
-    handler: import("../models").TMiddlewareHandler<never>;
+declare const _default: Middleware<never, import("../models").HttpRequestContext<unknown> & {
+    shared: SetRequiredKeys<{
+        expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+        history?: import("../history").History;
+        forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+    }, never>;
+}> & {
+    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: SetRequiredKeys<{
+            expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+            history?: import("../history").History;
+            forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+        }, never>;
+    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
 };
 export default _default;
 //# sourceMappingURL=internal-route.middleware.d.ts.map

package/lib/src/server/middlewares/internal-route.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-route.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/internal-route.middleware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;AAEvC,wBAKK"}
+{"version":3,"file":"internal-route.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/internal-route.middleware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;AAEvC,wBAOK"}

package/lib/src/server/middlewares/internal-route.middleware.js

@@ -4,8 +4,9 @@ const router_1 = require("../router");
 const models_1 = require("../models");
 exports.default = models_1.Middleware
     .build(__filename)
-    .assignHandler((content, next) => {
-    const endpoint = (0, router_1.resolveInternalEndpoint)(content);
-    return endpoint ? endpoint.handle() : next();
+    .assignHandler((context, next) => {
+    const key = [context.incoming.method, context.incoming.path].join(':');
+    const endpoint = router_1.routes[context.type][key];
+    return endpoint?.handler ? endpoint.handler(context) : next();
 });
 //# sourceMappingURL=internal-route.middleware.js.map

package/lib/src/server/middlewares/internal-route.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal-route.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/internal-route.middleware.ts"],"names":[],"mappings":";;AAEA,sCAAoD;AACpD,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IAClD,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC/C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"internal-route.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/internal-route.middleware.ts"],"names":[],"mappings":";;AAEA,sCAAmC;AACnC,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC/B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE3C,OAAO,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/match-expectation.middleware.d.ts

@@ -0,0 +1,18 @@
+import { Middleware } from '../models';
+declare const _default: Middleware<never, import("../models").HttpRequestContext<unknown> & {
+    shared: SetRequiredKeys<{
+        expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+        history?: import("../history").History;
+        forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+    }, never>;
+}> & {
+    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: SetRequiredKeys<{
+            expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+            history?: import("../history").History;
+            forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+        }, never>;
+    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
+};
+export default _default;
+//# sourceMappingURL=match-expectation.middleware.d.ts.map

package/lib/src/server/middlewares/match-expectation.middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"match-expectation.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/match-expectation.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;AAEvC,wBAmBK"}

package/lib/src/server/middlewares/match-expectation.middleware.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const models_1 = require("../models");
+exports.default = models_1.Middleware
+    .build(__filename)
+    .assignHandler((context, next) => {
+    const plain = context.toPlain();
+    const expectation = context.server.storage.expectations.match('request', plain);
+    if (!expectation) {
+        const historyRecord = context.server.storage.history
+            .register(plain)
+            .changeState('finished');
+        context.server.exchange.ws.publish('history:added', historyRecord);
+        return context.reply.notFound();
+    }
+    expectation.increaseExecutionsCounter();
+    context.server.exchange.ws.publish('expectation:updated', expectation);
+    return next({ expectation });
+});
+//# sourceMappingURL=match-expectation.middleware.js.map

package/lib/src/server/middlewares/match-expectation.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"match-expectation.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/match-expectation.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAChC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAM,SAAS,EAAE,KAAK,CAAC,CAAC;IAErF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;aACjD,QAAQ,CAAC,KAAK,CAAC;aACf,WAAW,CAAC,UAAU,CAAC,CAAC;QAE3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAClC,CAAC;IAED,WAAW,CAAC,yBAAyB,EAAE,CAAC;IACxC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC;IAEvE,OAAO,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC"}

package/lib/src/server/middlewares/reply.middleware.d.ts

@@ -1,8 +1,18 @@
-import { Middleware } from '../models';
-declare const _default: Middleware & {
-    required: ("expectation" | "historyRecord")[];
-} & {
-    handler: import("../models").TMiddlewareHandler<"expectation" | "historyRecord">;
+import { HttpRequestContext, Middleware } from '../models';
+declare const _default: Middleware<"expectation" | "history", HttpRequestContext<unknown> & {
+    shared: SetRequiredKeys<{
+        expectation?: import("../../expectations").Expectation<Pick<HttpRequestContext, "incoming" | "outgoing">>;
+        history?: import("../history").History;
+        forwarded?: Pick<HttpRequestContext, "incoming" | "outgoing">;
+    }, "expectation" | "history">;
+}> & {
+    handler: TFunction<unknown, [HttpRequestContext<unknown> & {
+        shared: SetRequiredKeys<{
+            expectation?: import("../../expectations").Expectation<Pick<HttpRequestContext, "incoming" | "outgoing">>;
+            history?: import("../history").History;
+            forwarded?: Pick<HttpRequestContext, "incoming" | "outgoing">;
+        }, "expectation" | "history">;
+    }, (shared?: Partial<HttpRequestContext["shared"]>) => unknown]>;
 };
 export default _default;
 //# sourceMappingURL=reply.middleware.d.ts.map

package/lib/src/server/middlewares/reply.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reply.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/reply.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;AAEvC,wBA2CK"}
+{"version":3,"file":"reply.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/reply.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,kBAAkB,EAAoD,UAAU,EAAoB,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;AAkBnJ,wBAiCK"}

package/lib/src/server/middlewares/reply.middleware.js

@@ -1,35 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("../models");
+const buildEmptyOutgoing = (incoming) => ({
+    type: incoming.type,
+    status: 200,
+    data: incoming.type === 'plain' ? '' : {},
+    dataRaw: '',
+    headers: {
+        'content-type': incoming.type === 'json'
+            ? 'application/json'
+            : incoming.type === 'xml'
+                ? 'application/xml'
+                : incoming.headers['content-type'] ?? 'text/plain',
+    },
+});
 exports.default = models_1.Middleware
-    .build(__dirname)
-    .requires(['historyRecord', 'expectation'])
+    .build(__dirname, ['history', 'expectation'])
     .assignHandler((context) => {
-    const responseContext = context.shared.expectation.manipulateContext('response', Object.assign(context.toPlain(), context.shared.forwarded?.response ?? {
-        statusCode: 200,
-        headers: {},
-        data: {},
-        dataRaw: '',
-    }), { clone: true });
-    const dataRaw = Buffer.from(Object.keys(responseContext?.data ?? {}).length
-        ? JSON.stringify(responseContext.data)
-        : (responseContext.dataRaw ?? ''));
-    Object.assign(responseContext, {
-        dataRaw: dataRaw.toString(),
-        headers: {
-            ...(responseContext.payloadType === 'json' && { 'content-type': 'application/json' }),
-            ...responseContext.headers,
-            ...((!responseContext.headers?.['transfer-encoding'] && !context.http.request.headers['transfer-encoding']) && {
+    const { incoming, forwarded } = context.toPlain({ locations: ['incoming', 'forwarded.outgoing'], clone: true });
+    const manipulated = context.shared.expectation.response?.manipulate({
+        incoming,
+        outgoing: forwarded?.outgoing ?? buildEmptyOutgoing(context.incoming),
+    });
+    const outgoing = manipulated?.outgoing ?? forwarded?.outgoing ?? buildEmptyOutgoing(context.incoming);
+    const type = (0, models_1.extractPayloadType)(outgoing.headers);
+    const data = outgoing.data === undefined ? outgoing.dataRaw : outgoing.data;
+    const dataRaw = Buffer.from(typeof data === 'object' ? (0, models_1.serializePayload)(type, data) : String(data));
+    Object.assign(outgoing, {
+        type,
+        dataRaw,
+        headers: Object.assign(outgoing.headers, {
+            ...((!outgoing.headers?.['transfer-encoding'] && !context.request.headers['transfer-encoding']) && {
                 'content-length': String(dataRaw.length),
             }),
-        }
+        })
     });
-    context.http.response.writeHead(responseContext.statusCode ?? 200, responseContext.headers);
-    context.http.response.write(responseContext.dataRaw);
-    context.http.response.end();
-    context.shared.historyRecord
-        .assign({ response: responseContext })
-        .changeState('finished');
-    context.exchange.ws.publish('history:updated', context.shared.historyRecord);
+    context.response.writeHead(outgoing.status ?? 200, outgoing.headers);
+    context.response.write(outgoing.dataRaw);
+    context.response.end();
+    context.shared.history.assignOutgoing(outgoing).changeState('finished');
+    context.server.exchange.ws.publish('history:updated', context.shared.history.toPlain());
 });
 //# sourceMappingURL=reply.middleware.js.map

package/lib/src/server/middlewares/reply.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"reply.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/reply.middleware.ts"],"names":[],"mappings":";;AACA,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,SAAS,CAAC;KAChB,QAAQ,CAAC,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;KAC1C,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAClE,UAAU,EACV,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,IAAI;QACrE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE,EAAE;QAEX,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;KACZ,CAAC,EACF,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CACzB,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM;QAC7C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC;QACtC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC,CACpC,CAAC;IAEF,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE;QAC7B,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;QAC3B,OAAO,EAAE;YACP,GAAG,CAAC,eAAe,CAAC,WAAW,KAAK,MAAM,IAAI,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;YACrF,GAAG,eAAe,CAAC,OAAO;YAE1B,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,IAAI;gBAC7G,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACzC,CAAC;SACH;KACF,CAAC,CAAA;IAEF,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,IAAI,GAAG,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAE5B,OAAO,CAAC,MAAM,CAAC,aAAa;SACzB,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;SACrC,WAAW,CAAC,UAAU,CAAC,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"reply.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/reply.middleware.ts"],"names":[],"mappings":"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"}

package/lib/src/server/middlewares/resolve-public.middleware.d.ts

@@ -1,6 +1,18 @@
 import { Middleware } from '../models';
-declare const _default: Middleware & {
-    handler: import("../models").TMiddlewareHandler<never>;
+declare const _default: Middleware<never, import("../models").HttpRequestContext<unknown> & {
+    shared: SetRequiredKeys<{
+        expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+        history?: import("../history").History;
+        forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+    }, never>;
+}> & {
+    handler: TFunction<unknown, [import("../models").HttpRequestContext<unknown> & {
+        shared: SetRequiredKeys<{
+            expectation?: import("../../expectations").Expectation<Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">>;
+            history?: import("../history").History;
+            forwarded?: Pick<import("../models").HttpRequestContext, "incoming" | "outgoing">;
+        }, never>;
+    }, (shared?: Partial<import("../models").HttpRequestContext["shared"]>) => unknown]>;
 };
 export default _default;
 //# sourceMappingURL=resolve-public.middleware.d.ts.map

package/lib/src/server/middlewares/resolve-public.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-public.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/resolve-public.middleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;AAEvC,wBAgCK"}
+{"version":3,"file":"resolve-public.middleware.d.ts","sourceRoot":"","sources":["../../../../src/server/middlewares/resolve-public.middleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;;;;;;;;;;;;;;;;AAEvC,wBAgCK"}

package/lib/src/server/middlewares/resolve-public.middleware.js

@@ -10,28 +10,28 @@ const models_1 = require("../models");
 exports.default = models_1.Middleware
     .build(__filename)
     .assignHandler(async (context, next) => {
-    if (!context.path.includes(context.config.client.publicRoute)) {
+    if (!context.incoming.path.includes(context.server.config.client.publicRoute)) {
         return next();
     }
-    const requestPath = context.path.replace(context.config.client.publicRoute, '');
+    const requestPath = context.incoming.path.replace(context.server.config.client.publicRoute, '');
     const requestPathDetails = path_1.default.parse(requestPath);
     if (!requestPath) {
-        return context.http.response
-            .writeHead(301, 'Moved', { Location: path_1.default.join(context.config.client.publicRoute, '/') })
+        return context.response
+            .writeHead(301, 'Moved', { Location: path_1.default.join(context.server.config.client.publicRoute, '/') })
             .end();
     }
     if (requestPathDetails.dir === '/' && !requestPathDetails.ext) {
-        context.http.response.writeHead(200, 'Ok', { 'Content-type': 'text/html;charset=utf-8' });
-        return (0, fs_1.createReadStream)(path_1.default.join(context.config.client.publicDirPath, '/index.html'))
-            .pipe(context.http.response);
+        context.response.writeHead(200, 'Ok', { 'Content-type': 'text/html;charset=utf-8' });
+        return (0, fs_1.createReadStream)(path_1.default.join(context.server.config.client.publicDirPath, '/index.html'))
+            .pipe(context.response);
     }
-    const fileStat = await promises_1.default.stat(path_1.default.join(context.config.client.publicDirPath, requestPath)).catch(() => null);
+    const fileStat = await promises_1.default.stat(path_1.default.join(context.server.config.client.publicDirPath, requestPath)).catch(() => null);
     if (fileStat === null) {
-        return context.http.response
+        return context.response
             .writeHead(404, 'Not found')
             .end();
     }
-    return (0, fs_1.createReadStream)(path_1.default.join(context.config.client.publicDirPath, requestPath))
-        .pipe(context.http.response);
+    return (0, fs_1.createReadStream)(path_1.default.join(context.server.config.client.publicDirPath, requestPath))
+        .pipe(context.response);
 });
 //# sourceMappingURL=resolve-public.middleware.js.map

package/lib/src/server/middlewares/resolve-public.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-public.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/resolve-public.middleware.ts"],"names":[],"mappings":";;;;;AAAA,2BAAsC;AACtC,2DAA6B;AAC7B,gDAAwB;AAGxB,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9D,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAChF,MAAM,kBAAkB,GAAG,cAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ;aACzB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC;aACxF,GAAG,EAAE,CAAC;IACX,CAAC;IAED,IAAI,kBAAkB,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QAC9D,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAE1F,OAAO,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;aACnF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9G,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ;aACzB,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;aAC3B,GAAG,EAAE,CAAC;IACX,CAAC;IAED,OAAO,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SACjF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"resolve-public.middleware.js","sourceRoot":"","sources":["../../../../src/server/middlewares/resolve-public.middleware.ts"],"names":[],"mappings":";;;;;AAAA,2BAAsC;AACtC,2DAA6B;AAC7B,gDAAwB;AAGxB,sCAAuC;AAEvC,kBAAe,mBAAU;KACtB,KAAK,CAAC,UAAU,CAAC;KACjB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACrC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9E,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAChG,MAAM,kBAAkB,GAAG,cAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,OAAO,CAAC,QAAQ;aACpB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC;aAC/F,GAAG,EAAE,CAAC;IACX,CAAC;IAED,IAAI,kBAAkB,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAErF,OAAO,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;aAC1F,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrH,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC,QAAQ;aACpB,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;aAC3B,GAAG,EAAE,CAAC;IACX,CAAC;IAED,OAAO,IAAA,qBAAgB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SACxF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}