dx-server 0.0.8 → 0.1.0

package/README.md

@@ -18,7 +18,7 @@ import chain from 'jchain'
 import {
 	makeContext, requestContext, responseContext,
 
-	expressContext,
+	dxContext,
 	setHtml,
 	setJson,
 	setText,
@@ -34,9 +34,9 @@ import {
 	textBodyContext,
 	urlencodedBodyContext,
 
-	router,
-	expressApp, expressRouter, chainExpressMiddlewares,
+	router
 } from 'dx-server'
+import {expressApp, expressRouter, chainExpressMiddlewares} from 'dx-server/express'
 import express from 'express'
 import morgan from 'morgan'
 
@@ -66,7 +66,7 @@ const requireAuth = () => {
 }
 
 const serverChain = chain(
-	expressContext.chain({jsonBeautify: true}), // allows to use setHtml, setJson, setRaw, setBuffer, setFile, setRedirect, etc.
+	dxContext.chain({jsonBeautify: true}), // allows to use setHtml, setJson, setRaw, setBuffer, setFile, setRedirect, etc.
 	bufferBodyContext.chain(), // use raw buffer body as Buffer use bufferBodyContext.value. This is required for jsonBodyContext, urlencodedBodyContext, textBodyContext, rawBodyContext
 	jsonBodyContext.chain(), // to get body parsed as json use jsonBodyContext.value. Only available if content-type is application/json
 	urlencodedBodyContext.chain(), // to get body parsed as urlencoded use urlencodedBodyContext.value. Only available if content-type is application/x-www-form-urlencoded

package/cjs/dx.d.ts

@@ -0,0 +1,81 @@
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import { Readable } from 'node:stream';
+export declare const dxContext: {
+    readonly value: {
+        charset?: BufferEncoding | undefined;
+        jsonBeautify?: boolean | undefined;
+        disableEtag?: boolean | undefined;
+    } & ({
+        type: 'text';
+        data: string;
+    } | {
+        type: 'html';
+        data: string;
+    } | {
+        type: 'buffer';
+        data: Buffer;
+    } | {
+        type: 'json';
+        data: any;
+    } | {
+        type: 'redirect';
+        data: string;
+    } | {
+        type: 'nodeStream';
+        data: Readable;
+    } | {
+        type: 'webStream';
+        data: ReadableStream;
+    });
+    chain(params_0?: {
+        jsonBeautify?: boolean | undefined;
+        disableEtag?: boolean | undefined;
+    } | undefined): <V>(next: () => V) => Promise<any>;
+    with(value: {
+        charset?: BufferEncoding | undefined;
+        jsonBeautify?: boolean | undefined;
+        disableEtag?: boolean | undefined;
+    } & ({
+        type: 'text';
+        data: string;
+    } | {
+        type: 'html';
+        data: string;
+    } | {
+        type: 'buffer';
+        data: Buffer;
+    } | {
+        type: 'json';
+        data: any;
+    } | {
+        type: 'redirect';
+        data: string;
+    } | {
+        type: 'nodeStream';
+        data: Readable;
+    } | {
+        type: 'webStream';
+        data: ReadableStream;
+    })): <V_1>(next: () => V_1) => Promise<any>;
+};
+export declare function setText(text: string, { status }?: {
+    status?: number;
+}): void;
+export declare function setHtml(html: string, opts?: {
+    status?: number;
+}): void;
+export declare function setBuffer(buffer: Buffer, { status }?: {
+    status?: number;
+}): void;
+export declare function setNodeStream(stream: Readable, { status }?: {
+    status?: number;
+}): void;
+export declare function setWebStream(stream: ReadableStream, { status }?: {
+    status?: number;
+}): void;
+export declare function setJson(json: any, { status, beautify }?: {
+    status?: number;
+    beautify?: boolean;
+}): void;
+export declare function setRedirect(url: string, status: 301 | 302): void;

package/cjs/dx.js

@@ -0,0 +1,183 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setRedirect = exports.setJson = exports.setWebStream = exports.setNodeStream = exports.setBuffer = exports.setHtml = exports.setText = exports.dxContext = void 0;
+const jdefer_1 = __importDefault(require("jdefer"));
+const node_util_1 = require("node:util");
+const etag_js_1 = require("./etag.js");
+const context_js_1 = require("./context.js");
+const node_stream_1 = require("node:stream");
+exports.dxContext = (0, context_js_1.makeContext)(async ({ jsonBeautify, disableEtag } = {}) => {
+    return {
+        jsonBeautify,
+        disableEtag,
+    };
+}, async (ret, { type, data, charset, jsonBeautify, disableEtag }) => {
+    const res = context_js_1.responseContext.value;
+    const setContentType = (contentType) => {
+        if (res.headersSent || res.getHeader('content-type'))
+            return;
+        res.setHeader('content-type', `${contentType}${charset ? `; charset=${charset}` : ''}`);
+    };
+    let bufferOrStream;
+    switch (type) {
+        case 'text':
+            setContentType('text/plain');
+        case 'html':
+            setContentType('text/html');
+            // shared with text
+            bufferOrStream = Buffer.from(data, charset);
+            break;
+        case 'buffer':
+            setContentType('application/octet-stream');
+            bufferOrStream = data;
+            break;
+        case 'nodeStream':
+            setContentType('application/octet-stream');
+            bufferOrStream = data;
+            break;
+        case 'webStream':
+            setContentType('application/octet-stream');
+            bufferOrStream = node_stream_1.Readable.fromWeb(data);
+            break;
+        case 'json':
+            setContentType('application/json');
+            bufferOrStream = Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset);
+            break;
+        case 'redirect':
+            res.setHeader('location', data);
+            bufferOrStream = Buffer.from('', charset);
+            break;
+        case undefined:
+            // skip response. Some middleware may handle it outside the chain. For example, express middleware
+            return ret;
+        default:
+            if (!res.getHeader('content-type'))
+                res.setHeader('content-type', 'text/plain');
+            throw new Error(`unsupported response type ${type}`);
+    }
+    const req = context_js_1.requestContext.value;
+    if (res.headersSent) {
+        if (res.writableFinished) {
+            // skipped: response is already finished
+        }
+        else if (res.writableEnded) {
+            const defer = (0, jdefer_1.default)();
+            res.addListener('finish', defer.resolve);
+            await defer.promise;
+            // skipped: response is already ended
+            // chunk is not fully flushed yet
+        }
+        else
+            await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // to be consistent, we end the response immediately
+    }
+    else {
+        // https://github.com/expressjs/express/blob/980d881e3b023db079de60477a2588a91f046ca5/lib/response.js#L210
+        if (res.statusCode === 204) { // No Content
+            res.removeHeader('content-type');
+            res.removeHeader('content-length');
+            res.removeHeader('transfer-encoding');
+            // write nothing
+        }
+        if (res.statusCode === 205) { // reset content. Tell client to clear the form, etc.
+            res.setHeader('content-length', 0);
+            res.removeHeader('transfer-encoding');
+        }
+        else if (req.method === 'HEAD') {
+            // write nothing
+        }
+        else {
+            if (Buffer.isBuffer(bufferOrStream)) {
+                // support: 304 (etag), zipping, file etag and last modified
+                res.setHeader('content-length', bufferOrStream.length);
+                if (!disableEtag) {
+                    const etag = (0, etag_js_1.entityTag)(bufferOrStream);
+                    const lastModified = res.getHeader('last-modified');
+                    res.setHeader('ETag', etag);
+                    if ((0, etag_js_1.isFreshETag)(req, etag)) {
+                        res.removeHeader('content-type');
+                        res.removeHeader('content-length');
+                        res.removeHeader('transfer-encoding');
+                        res.statusCode = 304;
+                        // write nothing
+                    }
+                    else
+                        res.write(bufferOrStream);
+                }
+                else
+                    res.write(bufferOrStream);
+            }
+            else {
+                bufferOrStream.pipe(res);
+            }
+            // fixme: not support content-encoding (gzip, deflate, br) for now
+        }
+        await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // some express middleware, such as express-session, requires explicitly passing chunk
+    }
+    return ret;
+});
+// todo: support setFile (with stream or with buffer)
+function setText(text, { status } = {}) {
+    const response = context_js_1.responseContext.value;
+    const express = exports.dxContext.value;
+    if (status)
+        response.statusCode = status;
+    express.data = text;
+    express.type = 'text';
+}
+exports.setText = setText;
+function setHtml(html, opts = {}) {
+    setText(html, opts);
+    const express = exports.dxContext.value;
+    express.type = 'html';
+}
+exports.setHtml = setHtml;
+function setBuffer(buffer, { status } = {}) {
+    const response = context_js_1.responseContext.value;
+    const express = exports.dxContext.value;
+    if (status)
+        response.statusCode = status;
+    express.data = buffer;
+    express.type = 'buffer';
+}
+exports.setBuffer = setBuffer;
+function setNodeStream(stream, { status } = {}) {
+    const response = context_js_1.responseContext.value;
+    const express = exports.dxContext.value;
+    if (status)
+        response.statusCode = status;
+    express.data = stream;
+    express.type = 'nodeStream';
+}
+exports.setNodeStream = setNodeStream;
+function setWebStream(stream, { status } = {}) {
+    const response = context_js_1.responseContext.value;
+    const express = exports.dxContext.value;
+    if (status)
+        response.statusCode = status;
+    express.data = stream;
+    express.type = 'webStream';
+}
+exports.setWebStream = setWebStream;
+function setJson(json, { status, beautify } = {}) {
+    const response = context_js_1.responseContext.value;
+    if (status)
+        response.statusCode = status;
+    const express = exports.dxContext.value;
+    express.data = json;
+    express.type = 'json';
+    if (beautify !== undefined)
+        express.jsonBeautify = beautify;
+}
+exports.setJson = setJson;
+function setRedirect(url, status) {
+    const response = context_js_1.responseContext.value;
+    const express = exports.dxContext.value;
+    response.statusCode = status;
+    express.data = url;
+    express.type = 'redirect';
+}
+exports.setRedirect = setRedirect;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0RBQThCO0FBQzlCLHlDQUFtQztBQUNuQyx1Q0FBZ0Q7QUFDaEQsNkNBQXlFO0FBQ3pFLDZDQUFvQztBQUV2QixRQUFBLFNBQVMsR0FBRyxJQUFBLHdCQUFXLEVBQUMsS0FBSyxFQUN6QyxFQUFDLFlBQVksRUFBRSxXQUFXLEtBR3RCLEVBQUUsRUFDTCxFQUFFO0lBQ0gsT0FBTztRQUNOLFlBQVk7UUFDWixXQUFXO0tBbUNWLENBQUE7QUFDSCxDQUFDLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxFQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUMsRUFBRSxFQUFFO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLDRCQUFlLENBQUMsS0FBSyxDQUFBO0lBQ2pDLE1BQU0sY0FBYyxHQUFHLENBQUMsV0FBbUIsRUFBRSxFQUFFO1FBQzlDLElBQUksR0FBRyxDQUFDLFdBQVcsSUFBSSxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztZQUFFLE9BQU07UUFDNUQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxjQUFjLEVBQUUsR0FBRyxXQUFXLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxhQUFhLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQ3hGLENBQUMsQ0FBQTtJQUNELElBQUksY0FBYyxDQUFBO0lBRWxCLFFBQVEsSUFBSSxFQUFFLENBQUM7UUFDZCxLQUFLLE1BQU07WUFDVixjQUFjLENBQUMsWUFBWSxDQUFDLENBQUE7UUFDN0IsS0FBSyxNQUFNO1lBQ1YsY0FBYyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1lBQzNCLG1CQUFtQjtZQUNuQixjQUFjLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUE7WUFD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

package/cjs/express.d.ts

@@ -1,81 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Readable } from 'node:stream';
-export declare const expressContext: {
-    readonly value: {
-        charset?: BufferEncoding | undefined;
-        jsonBeautify?: boolean | undefined;
-        disableEtag?: boolean | undefined;
-    } & ({
-        type: 'text';
-        data: string;
-    } | {
-        type: 'html';
-        data: string;
-    } | {
-        type: 'buffer';
-        data: Buffer;
-    } | {
-        type: 'json';
-        data: any;
-    } | {
-        type: 'redirect';
-        data: string;
-    } | {
-        type: 'nodeStream';
-        data: Readable;
-    } | {
-        type: 'webStream';
-        data: ReadableStream;
-    });
-    chain(params_0?: {
-        jsonBeautify?: boolean | undefined;
-        disableEtag?: boolean | undefined;
-    } | undefined): <V>(next: () => V) => Promise<any>;
-    with(value: {
-        charset?: BufferEncoding | undefined;
-        jsonBeautify?: boolean | undefined;
-        disableEtag?: boolean | undefined;
-    } & ({
-        type: 'text';
-        data: string;
-    } | {
-        type: 'html';
-        data: string;
-    } | {
-        type: 'buffer';
-        data: Buffer;
-    } | {
-        type: 'json';
-        data: any;
-    } | {
-        type: 'redirect';
-        data: string;
-    } | {
-        type: 'nodeStream';
-        data: Readable;
-    } | {
-        type: 'webStream';
-        data: ReadableStream;
-    })): <V_1>(next: () => V_1) => Promise<any>;
-};
-export declare function setText(text: string, { status }?: {
-    status?: number;
-}): void;
-export declare function setHtml(html: string, opts?: {
-    status?: number;
-}): void;
-export declare function setBuffer(buffer: Buffer, { status }?: {
-    status?: number;
-}): void;
-export declare function setNodeStream(stream: Readable, { status }?: {
-    status?: number;
-}): void;
-export declare function setWebStream(stream: ReadableStream, { status }?: {
-    status?: number;
-}): void;
-export declare function setJson(json: any, { status, beautify }?: {
-    status?: number;
-    beautify?: boolean;
-}): void;
-export declare function setRedirect(url: string, status: 301 | 302): void;
+import { type Express, type Request, type Response, type Router } from 'express';
+export declare const expressApp: (setup: (app: Express) => any) => Promise<(next: any) => Promise<void>>;
+export declare const expressRouter: (setup: (router: Router) => any) => Promise<(next: any) => Promise<void>>;
+export declare const chainExpressMiddlewares: (...middlewares: ((req: Request, res: Response, next: () => any) => any)[]) => Promise<(next: any) => Promise<void>>;

package/cjs/express.js

@@ -3,181 +3,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setRedirect = exports.setJson = exports.setWebStream = exports.setNodeStream = exports.setBuffer = exports.setHtml = exports.setText = exports.expressContext = void 0;
-const jdefer_1 = __importDefault(require("jdefer"));
-const node_util_1 = require("node:util");
-const etag_js_1 = require("./etag.js");
+exports.chainExpressMiddlewares = exports.expressRouter = exports.expressApp = void 0;
+const express_1 = __importDefault(require("express"));
 const context_js_1 = require("./context.js");
-const node_stream_1 = require("node:stream");
-exports.expressContext = (0, context_js_1.makeContext)(async ({ jsonBeautify, disableEtag } = {}) => {
-    return {
-        jsonBeautify,
-        disableEtag,
+const jdefer_1 = __importDefault(require("jdefer"));
+const expressApp = async (setup) => {
+    const symbol = Symbol('expressApp');
+    const app = (0, express_1.default)();
+    await setup(app);
+    app.use((req, _res, _next) => req[symbol].resolve());
+    app.use((err, req, _res, _next) => req[symbol].reject(err));
+    return async (next) => {
+        const req = context_js_1.requestContext.value;
+        const defer = (0, jdefer_1.default)();
+        req[symbol] = defer;
+        app(req, context_js_1.responseContext.value);
+        await defer.promise;
+        await next();
     };
-}, async (ret, { type, data, charset, jsonBeautify, disableEtag }) => {
-    const res = context_js_1.responseContext.value;
-    const setContentType = (contentType) => {
-        if (res.headersSent || res.getHeader('content-type'))
-            return;
-        res.setHeader('content-type', `${contentType}${charset ? `; charset=${charset}` : ''}`);
+};
+exports.expressApp = expressApp;
+const expressRouter = async (setup) => {
+    const symbol = Symbol('expressRouter');
+    const router = express_1.default.Router();
+    await setup(router);
+    router.use((req, _res, _next) => req[symbol].resolve());
+    router.use((err, req, _res, _next) => req[symbol].reject(err));
+    return async (next) => {
+        const req = context_js_1.requestContext.value;
+        const defer = (0, jdefer_1.default)();
+        req[symbol] = defer;
+        router(req, context_js_1.responseContext.value);
+        await defer.promise;
+        await next();
     };
-    let bufferOrStream;
-    switch (type) {
-        case 'text':
-            setContentType('text/plain');
-        case 'html':
-            setContentType('text/html');
-            // shared with text
-            bufferOrStream = Buffer.from(data, charset);
-            break;
-        case 'buffer':
-            setContentType('application/octet-stream');
-            bufferOrStream = data;
-            break;
-        case 'nodeStream':
-            setContentType('application/octet-stream');
-            bufferOrStream = data;
-            break;
-        case 'webStream':
-            setContentType('application/octet-stream');
-            bufferOrStream = node_stream_1.Readable.fromWeb(data);
-            break;
-        case 'json':
-            setContentType('application/json');
-            bufferOrStream = Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset);
-            break;
-        case 'redirect':
-            res.setHeader('location', data);
-            bufferOrStream = Buffer.from('', charset);
-            break;
-        case undefined:
-            // skip response. Some middleware may handle it outside the chain. For example, express middleware
-            return ret;
-        default:
-            if (!res.getHeader('content-type'))
-                res.setHeader('content-type', 'text/plain');
-            throw new Error(`unsupported response type ${type}`);
-    }
-    const req = context_js_1.requestContext.value;
-    if (res.headersSent) {
-        if (res.writableFinished) {
-            // skipped: response is already finished
-        }
-        else if (res.writableEnded) {
-            const defer = (0, jdefer_1.default)();
-            res.addListener('finish', defer.resolve);
-            await defer.promise;
-            // skipped: response is already ended
-            // chunk is not fully flushed yet
-        }
-        else
-            await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // to be consistent, we end the response immediately
-    }
-    else {
-        // https://github.com/expressjs/express/blob/980d881e3b023db079de60477a2588a91f046ca5/lib/response.js#L210
-        if (res.statusCode === 204) { // No Content
-            res.removeHeader('content-type');
-            res.removeHeader('content-length');
-            res.removeHeader('transfer-encoding');
-            // write nothing
-        }
-        if (res.statusCode === 205) { // reset content. Tell client to clear the form, etc.
-            res.setHeader('content-length', 0);
-            res.removeHeader('transfer-encoding');
-        }
-        else if (req.method === 'HEAD') {
-            // write nothing
-        }
-        else {
-            if (Buffer.isBuffer(bufferOrStream)) {
-                // support: 304 (etag), zipping, file etag and last modified
-                res.setHeader('content-length', bufferOrStream.length);
-                if (!disableEtag) {
-                    const etag = (0, etag_js_1.entityTag)(bufferOrStream);
-                    const lastModified = res.getHeader('last-modified');
-                    res.setHeader('ETag', etag);
-                    if ((0, etag_js_1.isFreshETag)(req, etag)) {
-                        res.removeHeader('content-type');
-                        res.removeHeader('content-length');
-                        res.removeHeader('transfer-encoding');
-                        res.statusCode = 304;
-                        // write nothing
-                    }
-                    else
-                        res.write(bufferOrStream);
-                }
-                else
-                    res.write(bufferOrStream);
-            }
-            else {
-                bufferOrStream.pipe(res);
-            }
-            // fixme: not support content-encoding (gzip, deflate, br) for now
-        }
-        await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // some express middleware, such as express-session, requires explicitly passing chunk
-    }
-    return ret;
-});
-// todo: support setFile (with stream or with buffer)
-function setText(text, { status } = {}) {
-    const response = context_js_1.responseContext.value;
-    const express = exports.expressContext.value;
-    if (status)
-        response.statusCode = status;
-    express.data = text;
-    express.type = 'text';
-}
-exports.setText = setText;
-function setHtml(html, opts = {}) {
-    setText(html, opts);
-    const express = exports.expressContext.value;
-    express.type = 'html';
-}
-exports.setHtml = setHtml;
-function setBuffer(buffer, { status } = {}) {
-    const response = context_js_1.responseContext.value;
-    const express = exports.expressContext.value;
-    if (status)
-        response.statusCode = status;
-    express.data = buffer;
-    express.type = 'buffer';
-}
-exports.setBuffer = setBuffer;
-function setNodeStream(stream, { status } = {}) {
-    const response = context_js_1.responseContext.value;
-    const express = exports.expressContext.value;
-    if (status)
-        response.statusCode = status;
-    express.data = stream;
-    express.type = 'nodeStream';
-}
-exports.setNodeStream = setNodeStream;
-function setWebStream(stream, { status } = {}) {
-    const response = context_js_1.responseContext.value;
-    const express = exports.expressContext.value;
-    if (status)
-        response.statusCode = status;
-    express.data = stream;
-    express.type = 'webStream';
-}
-exports.setWebStream = setWebStream;
-function setJson(json, { status, beautify } = {}) {
-    const response = context_js_1.responseContext.value;
-    if (status)
-        response.statusCode = status;
-    const express = exports.expressContext.value;
-    express.data = json;
-    express.type = 'json';
-    if (beautify !== undefined)
-        express.jsonBeautify = beautify;
-}
-exports.setJson = setJson;
-function setRedirect(url, status) {
-    const response = context_js_1.responseContext.value;
-    const express = exports.expressContext.value;
-    response.statusCode = status;
-    express.data = url;
-    express.type = 'redirect';
-}
-exports.setRedirect = setRedirect;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9leHByZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG9EQUE4QjtBQUM5Qix5Q0FBbUM7QUFDbkMsdUNBQWdEO0FBQ2hELDZDQUF5RTtBQUN6RSw2Q0FBb0M7QUFFdkIsUUFBQSxjQUFjLEdBQUcsSUFBQSx3QkFBVyxFQUFDLEtBQUssRUFDOUMsRUFBQyxZQUFZLEVBQUUsV0FBVyxLQUd0QixFQUFFLEVBQ0wsRUFBRTtJQUNILE9BQU87UUFDTixZQUFZO1FBQ1osV0FBVztLQW1DVixDQUFBO0FBQ0gsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsRUFBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFDLEVBQUUsRUFBRTtJQUNsRSxNQUFNLEdBQUcsR0FBRyw0QkFBZSxDQUFDLEtBQUssQ0FBQTtJQUNqQyxNQUFNLGNBQWMsR0FBRyxDQUFDLFdBQW1CLEVBQUUsRUFBRTtRQUM5QyxJQUFJLEdBQUcsQ0FBQyxXQUFXLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUM7WUFBRSxPQUFNO1FBQzVELEdBQUcsQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLEdBQUcsV0FBVyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsYUFBYSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUN4RixDQUFDLENBQUE7SUFDRCxJQUFJLGNBQWMsQ0FBQTtJQUVsQixRQUFRLElBQUksRUFBRSxDQUFDO1FBQ2QsS0FBSyxNQUFNO1lBQ1YsY0FBYyxDQUFDLFlBQVksQ0FBQyxDQUFBO1FBQzdCLEtBQUssTUFBTTtZQUNWLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQTtZQUMzQixtQkFBbUI7WUFDbkIsY0FBYyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FB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
+};
+exports.expressRouter = expressRouter;
+const chainExpressMiddlewares = (...middlewares) => (0, exports.expressRouter)(router => router.use(...middlewares));
+exports.chainExpressMiddlewares = chainExpressMiddlewares;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9leHByZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHNEQUF1RjtBQUN2Riw2Q0FBNEQ7QUFDNUQsb0RBQThCO0FBRXZCLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxLQUE0QixFQUFFLEVBQUU7SUFDaEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBRW5DLE1BQU0sR0FBRyxHQUFHLElBQUEsaUJBQU8sR0FBRSxDQUFBO0lBQ3JCLE1BQU0sS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2hCLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFDcEQsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQzNELE9BQU8sS0FBSyxFQUFDLElBQUksRUFBQyxFQUFFO1FBQ25CLE1BQU0sR0FBRyxHQUFHLDJCQUFjLENBQUMsS0FBSyxDQUFBO1FBQ2hDLE1BQU0sS0FBSyxHQUFHLElBQUEsZ0JBQVMsR0FBRSxDQUFBO1FBQ3pCLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUE7UUFDbkIsR0FBRyxDQUFDLEdBQUcsRUFBRSw0QkFBZSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQy9CLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQTtRQUNuQixNQUFNLElBQUksRUFBRSxDQUFBO0lBQ2IsQ0FBQyxDQUFBO0FBQ0YsQ0FBQyxDQUFBO0FBZlksUUFBQSxVQUFVLGNBZXRCO0FBRU0sTUFBTSxhQUFhLEdBQUcsS0FBSyxFQUFFLEtBQThCLEVBQUUsRUFBRTtJQUNyRSxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsZUFBZSxDQUFDLENBQUE7SUFFdEMsTUFBTSxNQUFNLEdBQUcsaUJBQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQTtJQUMvQixNQUFNLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNuQixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZELE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUM5RCxPQUFPLEtBQUssRUFBQyxJQUFJLEVBQUMsRUFBRTtRQUNuQixNQUFNLEdBQUcsR0FBRywyQkFBYyxDQUFDLEtBQUssQ0FBQTtRQUNoQyxNQUFNLEtBQUssR0FBRyxJQUFBLGdCQUFTLEdBQUUsQ0FBQTtRQUN6QixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFBO1FBQ25CLE1BQU0sQ0FBQyxHQUFHLEVBQUUsNEJBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNsQyxNQUFNLEtBQUssQ0FBQyxPQUFPLENBQUE7UUFDbkIsTUFBTSxJQUFJLEVBQUUsQ0FBQTtJQUNiLENBQUMsQ0FBQTtBQUNGLENBQUMsQ0FBQTtBQWZZLFFBQUEsYUFBYSxpQkFlekI7QUFFTSxNQUFNLHVCQUF1QixHQUFHLENBQ3RDLEdBQUcsV0FBeUUsRUFDM0UsRUFBRSxDQUFDLElBQUEscUJBQWEsRUFBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFBO0FBRjNDLFFBQUEsdUJBQXVCLDJCQUVvQiJ9

package/cjs/index.d.ts

@@ -1,5 +1,4 @@
 export { makeContext, requestContext, responseContext } from './context.js';
-export { expressContext, setHtml, setJson, setBuffer, setRedirect, setText } from './express.js';
+export { dxContext, setHtml, setJson, setBuffer, setRedirect, setText } from './dx.js';
 export { bufferBodyContext, jsonBodyContext, queryContext, rawBodyContext, textBodyContext, urlencodedBodyContext } from './body.js';
 export { router } from './route.js';
-export { expressApp, expressRouter, chainExpressMiddlewares } from './expressApp.js';