@innet/server 2.0.0-alpha.9 → 2.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.1",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -36,7 +36,7 @@
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
     "@cantinc/utils": "^1.4.2",
-    "@innet/jsx": "^2.0.0-alpha.10",
+    "@innet/jsx": "^2.0.0-beta.2",
     "@innet/utils": "^2.0.0-alpha.1",
     "@types/cookie": "^0.5.1",
     "@types/multiparty": "^0.0.33",
@@ -44,7 +44,6 @@
     "cookie": "^0.5.0",
     "http-proxy": "^1.18.1",
     "innet": "^2.0.0-alpha.3",
-    "is-invalid-path": "^1.0.2",
     "mime": "^3.0.0",
     "multiparty": "^4.2.3",
     "openapi-types": "^12.1.3",

package/plugins/main/api/api.d.ts

@@ -1,5 +1,16 @@
 import { type HandlerPlugin } from 'innet';
 export interface ApiProps {
+    children?: any;
+    /** A description of the API. [CommonMark syntax](https://spec.commonmark.or.org) MAY be used for rich text representation. */
+    description?: string;
+    exclude?: RegExp;
+    include?: RegExp;
+    /** URL path prefix scopes the API. */
+    prefix?: string;
+    /** A short summary of the API. */
+    summary?: string;
+    /** A URL to the Terms of Service for the API. This MUST be in the form of a URL. */
+    termsOfService?: string;
     /** The title of the API. */
     title?: string;
     /**
@@ -10,13 +21,5 @@ export interface ApiProps {
      * @default: 0.0.0
      * */
     version?: string;
-    /** A short summary of the API. */
-    summary?: string;
-    /** A description of the API. [CommonMark syntax](https://spec.commonmark.or.org) MAY be used for rich text representation. */
-    description?: string;
-    /** A URL to the Terms of Service for the API. This MUST be in the form of a URL. */
-    termsOfService?: string;
-    /** URL path prefix scopes the API. */
-    prefix?: string;
 }
 export declare const api: HandlerPlugin;

package/plugins/main/api/api.es6.js

@@ -1,56 +1,59 @@
 import { __rest, __awaiter } from 'tslib';
-import innet, { useNewHandler, useApp } from 'innet';
-import { onDestroy } from 'watch-state';
+import innet, { useNewHandler } from 'innet';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import '../../../utils/rules/index.es6.js';
-import { useServer } from '../../../hooks/useServer/useServer.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
 import { apiContext } from '../../../hooks/useApi/useApi.es6.js';
-import { Action } from '../../../utils/action/Action.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction, actionContext } from '../../../hooks/useAction/useAction.es6.js';
 import { JSONString } from '../../../utils/JSONString/JSONString.es6.js';
 import { RulesError } from '../../../utils/rules/helpers.es6.js';
-import { responseContext } from '../../../hooks/useResponse/useResponse.es6.js';
-import { requestContext } from '../../../hooks/useRequest/useRequest.es6.js';
 import { paramsContext } from '../../../hooks/useParams/useParams.es6.js';
-import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
 
 const api = () => {
-    var _a;
     const handler = useNewHandler();
-    const { props = {}, children } = useApp();
-    const { server } = useServer();
-    const { prefix = '', title = '' } = props, rest = __rest(props, ["prefix", "title"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const props = useProps();
+    const { children, exclude, include, prefix = process.env.INNET_API_PREFIX || '', title = '', version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = __rest(props, ["children", "exclude", "include", "prefix", "title", "version"]);
+    const info = Object.assign(Object.assign({}, rest), { title, version });
     const endpoints = {};
     const docs = {
-        openapi: '3.1.0',
         info,
+        openapi: '3.1.0',
         paths: {},
     };
-    const requestPlugins = new Set();
-    const context = { docs, endpoints, prefix, requestPlugins, refRules: {} };
+    const plugins = new Set();
+    const context = { docs, endpoints, prefix, refRules: {} };
+    const condition = (action) => {
+        const path = action.parsedUrl.path;
+        const url = path.endsWith('/') ? path.slice(0, -1) : path;
+        if (!url.startsWith(prefix) || (exclude === null || exclude === void 0 ? void 0 : exclude.test(url))) {
+            return false;
+        }
+        if (include && !include.test(url)) {
+            return false;
+        }
+        return true;
+    };
+    serverPlugins.set(handler, plugins);
     apiContext.set(handler, context);
-    const listener = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
-        if (res.writableEnded)
+    useServerPlugin(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
+        const action = useAction();
+        if (!condition(action))
             return;
-        const action = new Action(req, res);
+        const actionHandler = useNewHandler();
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;
+        const { req, res, } = action;
         if (url === (prefix || '')) {
             res.setHeader('Content-Type', 'application/json');
             res.write(JSONString(docs));
             res.end();
-            return;
-        }
-        if (!url.startsWith(prefix)) {
-            return;
+            return null;
         }
-        for (const requestPlugin of requestPlugins) {
-            if (requestPlugin(action))
-                return;
-        }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -85,8 +88,8 @@ const api = () => {
                                     if (e instanceof RulesError) {
                                         res.statusCode = 400;
                                         res.write(JSONString({
-                                            error: 'requestValidation',
                                             data: Object.assign(Object.assign({}, e.data), { in: key }),
+                                            error: 'requestValidation',
                                         }));
                                         res.end();
                                     }
@@ -94,8 +97,8 @@ const api = () => {
                                         console.error(e);
                                         res.statusCode = 500;
                                         res.write(JSONString({
-                                            error: 'unknown',
                                             data: { in: key },
+                                            error: 'unknown',
                                         }));
                                         res.end();
                                     }
@@ -124,32 +127,34 @@ const api = () => {
                             if (checkActionRules(bodyRules, 'body'))
                                 return true;
                         }
-                        const newHandler = Object.create(runEndpoint.handler);
-                        responseContext.set(newHandler, res);
-                        requestContext.set(newHandler, req);
-                        paramsContext.set(newHandler, params);
-                        actionContext.set(newHandler, action);
-                        innet(runEndpoint.content, newHandler);
+                        paramsContext.set(actionHandler, params);
+                        for (const plugin of runEndpoint.plugins) {
+                            const result = yield plugin();
+                            if (result === undefined)
+                                continue;
+                            innet(result, actionHandler);
+                            return true;
+                        }
                         return true;
                     });
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.content) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
                         continue;
-                    return;
+                    return null;
                 }
                 if (currentEndpoint.dynamic) {
                     for (const dynamicEndpoint of currentEndpoint.dynamic) {
-                        if (dynamicEndpoint.content) {
+                        if (dynamicEndpoint.plugins) {
                             if (!(yield run(dynamicEndpoint, Object.assign(Object.assign({}, params), { [dynamicEndpoint.key.slice(1, -1)]: key }))))
                                 continue;
-                            return;
+                            return null;
                         }
                     }
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {
@@ -158,22 +163,16 @@ const api = () => {
                 }
             }
         }
-        if (context.fallback) {
-            const newHandler = Object.create(context.fallback.handler);
-            responseContext.set(newHandler, res);
-            requestContext.set(newHandler, req);
+        for (const plugin of plugins) {
+            const result = yield plugin();
+            if (result === undefined)
+                continue;
+            const newHandler = Object.create(handler);
             actionContext.set(newHandler, action);
-            innet(context.fallback.children, newHandler);
-        }
-        else {
-            res.statusCode = 404;
-            res.end();
+            innet(result, newHandler);
+            return null;
         }
-    });
-    server.on('request', listener);
-    onDestroy(() => {
-        server.off('request', listener);
-    });
+    }));
     innet(children, handler);
 };
 

package/plugins/main/api/api.js

@@ -4,61 +4,64 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var innet = require('innet');
-var watchState = require('watch-state');
+var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
 require('../../../utils/rules/index.js');
-var useServer = require('../../../hooks/useServer/useServer.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
-var Action = require('../../../utils/action/Action.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 var JSONString = require('../../../utils/JSONString/JSONString.js');
 var helpers = require('../../../utils/rules/helpers.js');
-var useResponse = require('../../../hooks/useResponse/useResponse.js');
-var useRequest = require('../../../hooks/useRequest/useRequest.js');
 var useParams = require('../../../hooks/useParams/useParams.js');
-var useAction = require('../../../hooks/useAction/useAction.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const api = () => {
-    var _a;
     const handler = innet.useNewHandler();
-    const { props = {}, children } = innet.useApp();
-    const { server } = useServer.useServer();
-    const { prefix = '', title = '' } = props, rest = tslib.__rest(props, ["prefix", "title"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const props = jsx.useProps();
+    const { children, exclude, include, prefix = process.env.INNET_API_PREFIX || '', title = '', version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = tslib.__rest(props, ["children", "exclude", "include", "prefix", "title", "version"]);
+    const info = Object.assign(Object.assign({}, rest), { title, version });
     const endpoints = {};
     const docs = {
-        openapi: '3.1.0',
         info,
+        openapi: '3.1.0',
         paths: {},
     };
-    const requestPlugins = new Set();
-    const context = { docs, endpoints, prefix, requestPlugins, refRules: {} };
+    const plugins = new Set();
+    const context = { docs, endpoints, prefix, refRules: {} };
+    const condition = (action) => {
+        const path = action.parsedUrl.path;
+        const url = path.endsWith('/') ? path.slice(0, -1) : path;
+        if (!url.startsWith(prefix) || (exclude === null || exclude === void 0 ? void 0 : exclude.test(url))) {
+            return false;
+        }
+        if (include && !include.test(url)) {
+            return false;
+        }
+        return true;
+    };
+    useServerPlugins.serverPlugins.set(handler, plugins);
     useApi.apiContext.set(handler, context);
-    const listener = (req, res) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
-        if (res.writableEnded)
+    useServerPlugin.useServerPlugin(() => tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
+        const action = useAction.useAction();
+        if (!condition(action))
             return;
-        const action = new Action.Action(req, res);
+        const actionHandler = innet.useNewHandler();
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;
+        const { req, res, } = action;
         if (url === (prefix || '')) {
             res.setHeader('Content-Type', 'application/json');
             res.write(JSONString.JSONString(docs));
             res.end();
-            return;
-        }
-        if (!url.startsWith(prefix)) {
-            return;
-        }
-        for (const requestPlugin of requestPlugins) {
-            if (requestPlugin(action))
-                return;
+            return null;
         }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -93,8 +96,8 @@ const api = () => {
                                     if (e instanceof helpers.RulesError) {
                                         res.statusCode = 400;
                                         res.write(JSONString.JSONString({
-                                            error: 'requestValidation',
                                             data: Object.assign(Object.assign({}, e.data), { in: key }),
+                                            error: 'requestValidation',
                                         }));
                                         res.end();
                                     }
@@ -102,8 +105,8 @@ const api = () => {
                                         console.error(e);
                                         res.statusCode = 500;
                                         res.write(JSONString.JSONString({
-                                            error: 'unknown',
                                             data: { in: key },
+                                            error: 'unknown',
                                         }));
                                         res.end();
                                     }
@@ -132,32 +135,34 @@ const api = () => {
                             if (checkActionRules(bodyRules, 'body'))
                                 return true;
                         }
-                        const newHandler = Object.create(runEndpoint.handler);
-                        useResponse.responseContext.set(newHandler, res);
-                        useRequest.requestContext.set(newHandler, req);
-                        useParams.paramsContext.set(newHandler, params);
-                        useAction.actionContext.set(newHandler, action);
-                        innet__default["default"](runEndpoint.content, newHandler);
+                        useParams.paramsContext.set(actionHandler, params);
+                        for (const plugin of runEndpoint.plugins) {
+                            const result = yield plugin();
+                            if (result === undefined)
+                                continue;
+                            innet__default["default"](result, actionHandler);
+                            return true;
+                        }
                         return true;
                     });
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.content) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
                         continue;
-                    return;
+                    return null;
                 }
                 if (currentEndpoint.dynamic) {
                     for (const dynamicEndpoint of currentEndpoint.dynamic) {
-                        if (dynamicEndpoint.content) {
+                        if (dynamicEndpoint.plugins) {
                             if (!(yield run(dynamicEndpoint, Object.assign(Object.assign({}, params), { [dynamicEndpoint.key.slice(1, -1)]: key }))))
                                 continue;
-                            return;
+                            return null;
                         }
                     }
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {
@@ -166,22 +171,16 @@ const api = () => {
                 }
             }
         }
-        if (context.fallback) {
-            const newHandler = Object.create(context.fallback.handler);
-            useResponse.responseContext.set(newHandler, res);
-            useRequest.requestContext.set(newHandler, req);
+        for (const plugin of plugins) {
+            const result = yield plugin();
+            if (result === undefined)
+                continue;
+            const newHandler = Object.create(handler);
             useAction.actionContext.set(newHandler, action);
-            innet__default["default"](context.fallback.children, newHandler);
-        }
-        else {
-            res.statusCode = 404;
-            res.end();
+            innet__default["default"](result, newHandler);
+            return null;
         }
-    });
-    server.on('request', listener);
-    watchState.onDestroy(() => {
-        server.off('request', listener);
-    });
+    }));
     innet__default["default"](children, handler);
 };
 

package/plugins/main/body/body.d.ts

@@ -1,4 +1,5 @@
 import { type HandlerPlugin } from 'innet';
 export interface BodyProps {
+    children?: any;
 }
 export declare const body: HandlerPlugin;

package/plugins/main/contact/contact.d.ts

@@ -1,10 +1,10 @@
 import { type HandlerPlugin } from 'innet';
 export interface ContactProps {
+    /** The email address of the contact person/organization. This MUST be in the form of an email address. */
+    email?: string;
     /** The identifying name of the contact person/organization. */
     name?: string;
     /** The URL pointing to the contact information. This MUST be in the form of a URL. */
     url?: string;
-    /** The email address of the contact person/organization. This MUST be in the form of an email address. */
-    email?: string;
 }
 export declare const contact: HandlerPlugin;

package/plugins/main/endpoint/endpoint.d.ts

@@ -1,6 +1,18 @@
 import { type HandlerPlugin } from 'innet';
 import { type EndpointsMethods } from '../../../types';
 export interface EndpointProps {
+    children?: any;
+    /**
+     * Declares this operation to be deprecated.
+     * Consumers SHOULD refrain from usage of the declared operation.
+     * Default value is false.
+     * */
+    deprecated?: boolean;
+    /**
+     * An optional, string description, intended to apply to all operations in this path.
+     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * A method of the endpoint.
      * */
@@ -13,25 +25,14 @@ export interface EndpointProps {
      * Templated paths with the same hierarchy but different templated names MUST NOT exist as they are identical.
      * */
     path: string;
-    /**
-     * An optional, string summary, intended to apply to all operations in this path.
-     * */
-    summary?: string;
-    /**
-     * An optional, string description, intended to apply to all operations in this path.
-     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
-     * */
-    description?: string;
-    /**
-     * Declares this operation to be deprecated.
-     * Consumers SHOULD refrain from usage of the declared operation.
-     * Default value is false.
-     * */
-    deprecated?: boolean;
     /**
      * Declares this operation to make an endpoint private.
      * That means the endpoint should not be described and will not be shown in the Open API documentation.
      * */
     private?: boolean;
+    /**
+     * An optional, string summary, intended to apply to all operations in this path.
+     * */
+    summary?: string;
 }
 export declare const endpoint: HandlerPlugin;

package/plugins/main/endpoint/endpoint.es6.js

@@ -1,19 +1,19 @@
 import innet, { useNewHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useTag } from '../../../hooks/useTag/useTag.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { getEndpoint } from '../../../utils/getEndpoint/getEndpoint.es6.js';
 import { endpointContext } from '../../../hooks/useEndpoint/useEndpoint.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
 
 const endpoint = () => {
     const handler = useNewHandler();
     const tag = useTag();
-    const { docs, endpoints } = useApi();
     const props = useProps();
-    const { path, summary, description, deprecated, method, private: privateMode } = props;
-    const children = useChildren();
+    const { docs, endpoints, } = useApi();
+    const { children, deprecated, description, method, path, private: privateMode, summary, } = props;
     const { paths } = docs;
     if (!paths)
         throw Error('cannot find paths in docs');
@@ -42,12 +42,14 @@ const endpoint = () => {
         paths[path][method] = operation;
     }
     if (!endpoints[method]) {
-        endpoints[method] = { key: '' };
+        endpoints[method] = { key: '', plugins: new Set() };
     }
     // @ts-expect-error: it's always an object
     const endpoint = getEndpoint(path, endpoints[method]);
     // @ts-expect-error: it's always an object
-    endpointContext.set(handler, { operation, props, endpoint });
+    endpointContext.set(handler, { endpoint, operation, props });
+    // @ts-expect-error: it's always an object
+    serverPlugins.set(handler, endpoint.plugins);
     innet(children, handler);
 };
 

package/plugins/main/endpoint/endpoint.js

@@ -10,6 +10,7 @@ var useTag = require('../../../hooks/useTag/useTag.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 var getEndpoint = require('../../../utils/getEndpoint/getEndpoint.js');
 var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -18,10 +19,9 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 const endpoint = () => {
     const handler = innet.useNewHandler();
     const tag = useTag.useTag();
-    const { docs, endpoints } = useApi.useApi();
     const props = jsx.useProps();
-    const { path, summary, description, deprecated, method, private: privateMode } = props;
-    const children = jsx.useChildren();
+    const { docs, endpoints, } = useApi.useApi();
+    const { children, deprecated, description, method, path, private: privateMode, summary, } = props;
     const { paths } = docs;
     if (!paths)
         throw Error('cannot find paths in docs');
@@ -50,12 +50,14 @@ const endpoint = () => {
         paths[path][method] = operation;
     }
     if (!endpoints[method]) {
-        endpoints[method] = { key: '' };
+        endpoints[method] = { key: '', plugins: new Set() };
     }
     // @ts-expect-error: it's always an object
     const endpoint = getEndpoint.getEndpoint(path, endpoints[method]);
     // @ts-expect-error: it's always an object
-    useEndpoint.endpointContext.set(handler, { operation, props, endpoint });
+    useEndpoint.endpointContext.set(handler, { endpoint, operation, props });
+    // @ts-expect-error: it's always an object
+    useServerPlugins.serverPlugins.set(handler, endpoint.plugins);
     innet__default["default"](children, handler);
 };
 

package/plugins/main/host/host.d.ts

@@ -1,5 +1,10 @@
 import { type HandlerPlugin } from 'innet';
 export interface HostProps {
+    /**
+     * An optional string describing the host designated by the URL.
+     * [CommonMark syntax](https://spec.commonmark.org/) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * A URL to the target host.
      * This URL supports Server Variables and MAY be relative,
@@ -7,10 +12,5 @@ export interface HostProps {
      * Variable substitutions will be made when a variable is named in {brackets}.
      * */
     url: string;
-    /**
-     * An optional string describing the host designated by the URL.
-     * [CommonMark syntax](https://spec.commonmark.org/) MAY be used for rich text representation.
-     * */
-    description?: string;
 }
 export declare const host: HandlerPlugin;

package/plugins/main/index.d.ts

@@ -7,7 +7,7 @@ export * from './variable';
 export * from './tag';
 export * from './endpoint';
 export * from './response';
-export * from './request';
+export * from './return';
 export * from './param';
 export * from './body';
-export * from './fallback';
+export * from './preset';

package/plugins/main/index.es6.js

@@ -7,7 +7,7 @@ import './variable/index.es6.js';
 import './tag/index.es6.js';
 import './endpoint/index.es6.js';
 import './response/index.es6.js';
-import './request/index.es6.js';
+import './return/index.es6.js';
 import './param/index.es6.js';
 import './body/index.es6.js';
-import './fallback/index.es6.js';
+import './preset/index.es6.js';

package/plugins/main/index.js

@@ -9,8 +9,8 @@ require('./variable/index.js');
 require('./tag/index.js');
 require('./endpoint/index.js');
 require('./response/index.js');
-require('./request/index.js');
+require('./return/index.js');
 require('./param/index.js');
 require('./body/index.js');
-require('./fallback/index.js');
+require('./preset/index.js');