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

package/plugins/main/param/param.es6.js

@@ -1,5 +1,5 @@
 import innet, { useNewHandler } from 'innet';
-import { useChildren, useProps } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import '../../../utils/rules/index.es6.js';
@@ -13,20 +13,19 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
 
 const inMap = {
-    query: 'search',
-    path: 'path',
     cookie: 'cookie',
     header: 'header',
+    path: 'path',
+    query: 'search',
 };
 const param = () => {
     var _a;
-    const { operation, endpoint } = useEndpoint();
+    const { endpoint, operation, } = useEndpoint();
     if (!operation.parameters) {
         operation.parameters = [];
     }
-    const children = useChildren();
-    const props = useProps();
-    const params = Object.assign({}, props);
+    const { children, ...props } = useProps();
+    const params = { ...props };
     if (props.in === 'path') {
         params.required = (_a = params.required) !== null && _a !== void 0 ? _a : true;
     }

package/plugins/main/param/param.js

@@ -21,20 +21,19 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const inMap = {
-    query: 'search',
-    path: 'path',
     cookie: 'cookie',
     header: 'header',
+    path: 'path',
+    query: 'search',
 };
 const param = () => {
     var _a;
-    const { operation, endpoint } = useEndpoint.useEndpoint();
+    const { endpoint, operation, } = useEndpoint.useEndpoint();
     if (!operation.parameters) {
         operation.parameters = [];
     }
-    const children = jsx.useChildren();
-    const props = jsx.useProps();
-    const params = Object.assign({}, props);
+    const { children, ...props } = jsx.useProps();
+    const params = { ...props };
     if (props.in === 'path') {
         params.required = (_a = params.required) !== null && _a !== void 0 ? _a : true;
     }

package/plugins/main/preset/index.d.ts

@@ -0,0 +1 @@
+export * from './preset';

package/plugins/main/preset/index.es6.js

@@ -0,0 +1 @@
+export { preset } from './preset.es6.js';

package/plugins/{utils/prod → main/preset}/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var prod = require('./prod.js');
+var preset = require('./preset.js');
 
 
 
-exports.prod = prod.prod;
+exports.preset = preset.preset;

package/plugins/main/preset/preset.d.ts

@@ -0,0 +1,3 @@
+export interface PresetProps {
+}
+export declare function preset(): void;

package/plugins/main/preset/preset.es6.js

@@ -0,0 +1,13 @@
+import innet, { useHandler } from 'innet';
+import { useChildren } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+
+function preset() {
+    const children = useChildren();
+    useServerPlugin(() => {
+        innet(children, useHandler());
+    });
+}
+
+export { preset };

package/plugins/{utils/dev/dev.js → main/preset/preset.js}

@@ -4,15 +4,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
 var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
-const dev = () => {
-    if (process.env.NODE_ENV === 'development') {
-        innet__default["default"](jsx.useChildren(), innet.useHandler());
-    }
-};
+function preset() {
+    const children = jsx.useChildren();
+    useServerPlugin.useServerPlugin(() => {
+        innet__default["default"](children, innet.useHandler());
+    });
+}
 
-exports.dev = dev;
+exports.preset = preset;

package/plugins/main/response/index.es6.js

@@ -1 +1 @@
-export { response } from './response.es6.js';
+export { response, statuses } from './response.es6.js';

package/plugins/main/response/index.js

@@ -7,3 +7,4 @@ var response = require('./response.js');
 
 
 exports.response = response.response;
+exports.statuses = response.statuses;

package/plugins/main/response/response.d.ts

@@ -1,5 +1,8 @@
 import { type HandlerPlugin } from 'innet';
+import { type ErrorStatuses, type RedirectStatuses, type SuccessStatuses } from '../../request';
+export type StatusKey = ErrorStatuses | RedirectStatuses | SuccessStatuses;
 export interface ResponseProps {
+    children?: any;
     /**
      * A description of the response.
      * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
@@ -11,6 +14,8 @@ export interface ResponseProps {
      * For example, 2XX represents all response codes between [200-299].
      * Only the following range definitions are allowed: 1XX, 2XX, 3XX, 4XX, and 5XX.
      * */
-    status?: number | 'default';
+    status?: 'default' | `${1 | 2 | 3 | 4 | 5}XX` | StatusKey | number;
+    type?: string;
 }
+export declare const statuses: Record<StatusKey, number>;
 export declare const response: HandlerPlugin;

package/plugins/main/response/response.es6.js

@@ -1,37 +1,53 @@
 import innet, { useNewHandler } from 'innet';
-import { useProps, useChildren, useContext } from '@innet/jsx';
+import { useProps, useContext } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
+import '../../request/index.es6.js';
+import { errorStatuses } from '../../request/error/error.es6.js';
+import { redirectStatuses } from '../../request/redirect/redirect.es6.js';
+import { successStatuses } from '../../request/success/success.es6.js';
 import { useEndpoint, endpointContext } from '../../../hooks/useEndpoint/useEndpoint.es6.js';
 import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { getOrAdd } from '../../../utils/getOrAdd/getOrAdd.es6.js';
 import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 
+const statuses = {
+    ...errorStatuses,
+    ...redirectStatuses,
+    ...successStatuses,
+};
 const response = () => {
-    const { description = '', status = 'default' } = useProps() || {};
-    const { operation, props: { path } } = useEndpoint();
-    const children = useChildren();
+    var _a;
+    let { children, description = '', status = 'default', type = 'application/json', } = useProps() || {};
+    const { operation, props: { path }, } = useEndpoint();
     const handler = useNewHandler();
     const endpoint = useContext(endpointContext);
+    if (status in statuses) {
+        status = statuses[status];
+    }
     if (!endpoint) {
         useThrow('<{type}> MUST be placed in <endpoint> element');
     }
     if (!operation.responses) {
         operation.responses = {};
     }
-    if (operation.responses[status]) {
-        throw Error(`status ${status} for '${path}' already used`);
+    const defaultResponse = operation.responses[status];
+    if ((_a = defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content) === null || _a === void 0 ? void 0 : _a[type]) {
+        throw Error(`status ${status} and type ${type} for '${path}' already used`);
     }
-    const schema = {};
+    const schema = status === 204 || !children ? undefined : {};
     const response = {
         description,
-        content: {
-            'application/json': {
+    };
+    if (schema) {
+        response.content = {
+            ...defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content,
+            [type]: {
                 schema,
             },
-        },
-    };
+        };
+    }
     operation.responses[status] = response;
     schemaContext.set(handler, schema);
     const rules = getOrAdd(endpoint, 'endpoint.rules', [{}, {}]);
@@ -41,4 +57,4 @@ const response = () => {
     innet(children, handler);
 };
 
-export { response };
+export { response, statuses };

package/plugins/main/response/response.js

@@ -6,6 +6,10 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+require('../../request/index.js');
+var error = require('../../request/error/error.js');
+var redirect = require('../../request/redirect/redirect.js');
+var success = require('../../request/success/success.js');
 var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
 var useThrow = require('../../../hooks/useThrow/useThrow.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
@@ -16,30 +20,42 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
+const statuses = {
+    ...error.errorStatuses,
+    ...redirect.redirectStatuses,
+    ...success.successStatuses,
+};
 const response = () => {
-    const { description = '', status = 'default' } = jsx.useProps() || {};
-    const { operation, props: { path } } = useEndpoint.useEndpoint();
-    const children = jsx.useChildren();
+    var _a;
+    let { children, description = '', status = 'default', type = 'application/json', } = jsx.useProps() || {};
+    const { operation, props: { path }, } = useEndpoint.useEndpoint();
     const handler = innet.useNewHandler();
     const endpoint = jsx.useContext(useEndpoint.endpointContext);
+    if (status in statuses) {
+        status = statuses[status];
+    }
     if (!endpoint) {
         useThrow.useThrow('<{type}> MUST be placed in <endpoint> element');
     }
     if (!operation.responses) {
         operation.responses = {};
     }
-    if (operation.responses[status]) {
-        throw Error(`status ${status} for '${path}' already used`);
+    const defaultResponse = operation.responses[status];
+    if ((_a = defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content) === null || _a === void 0 ? void 0 : _a[type]) {
+        throw Error(`status ${status} and type ${type} for '${path}' already used`);
     }
-    const schema = {};
+    const schema = status === 204 || !children ? undefined : {};
     const response = {
         description,
-        content: {
-            'application/json': {
+    };
+    if (schema) {
+        response.content = {
+            ...defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content,
+            [type]: {
                 schema,
             },
-        },
-    };
+        };
+    }
     operation.responses[status] = response;
     useSchemaContext.schemaContext.set(handler, schema);
     const rules = getOrAdd.getOrAdd(endpoint, 'endpoint.rules', [{}, {}]);
@@ -50,3 +66,4 @@ const response = () => {
 };
 
 exports.response = response;
+exports.statuses = statuses;

package/plugins/main/return/index.d.ts

@@ -0,0 +1 @@
+export * from './return';

package/plugins/main/return/index.es6.js

@@ -0,0 +1 @@
+export { returnPlugin } from './return.es6.js';

package/plugins/main/return/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _return = require('./return.js');
+
+
+
+exports.returnPlugin = _return.returnPlugin;

package/plugins/main/return/return.d.ts

@@ -0,0 +1,4 @@
+import { type HandlerPlugin } from 'innet';
+export interface ReturnProps {
+}
+export declare const returnPlugin: HandlerPlugin;

package/plugins/main/return/return.es6.js

@@ -0,0 +1,10 @@
+import { useChildren } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+
+const returnPlugin = () => {
+    const children = useChildren();
+    useServerPlugin(() => children);
+};
+
+export { returnPlugin };

package/plugins/main/return/return.js

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+
+const returnPlugin = () => {
+    const children = jsx.useChildren();
+    useServerPlugin.useServerPlugin(() => children);
+};
+
+exports.returnPlugin = returnPlugin;

package/plugins/main/server/server.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
-import { type ServerResponse } from 'http';
+import { type IncomingMessage, type ServerResponse } from 'http';
 import { type ServerStartParams, type SSL } from '../../../types';
 export interface ServerProps {
+    children?: any;
+    onClose?: () => any;
+    onError?: (e: Error) => any;
+    onRequest?: (req: IncomingMessage, res: ServerResponse) => any;
+    onStart?: (params: ServerStartParams) => any;
     port?: number;
     ssl?: SSL;
-    onStart?: (params: ServerStartParams) => any;
-    onRequest?: (req: Request, res: ServerResponse) => any;
-    onError?: (e: Error) => any;
-    onDestroy?: () => any;
 }
 export declare const server: HandlerPlugin;

package/plugins/main/server/server.es6.js

@@ -1,24 +1,30 @@
-import innet, { useNewHandler, useApp } from 'innet';
+import innet, { useNewHandler } from 'innet';
+import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import http from 'node:http';
 import http2 from 'node:https';
 import { onDestroy } from 'watch-state';
 import '../../../hooks/index.es6.js';
+import '../../../utils/index.es6.js';
 import { serverContext } from '../../../hooks/useServer/useServer.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
+import { serverPortContext } from '../../../hooks/useServerPort/useServerPort.es6.js';
+import { serverHttpsContext } from '../../../hooks/useIsServerHttps/useIsServerHttps.es6.js';
+import { Action } from '../../../utils/action/Action.es6.js';
+import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
+import { requestHandlerContext } from '../../../hooks/useRequestHandler/useRequestHandler.es6.js';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const isInvalidPath = require('is-invalid-path');
 const server = () => {
     var _a, _b, _c;
     const handler = useNewHandler();
-    const { props = {}, children } = useApp();
+    const props = useProps();
     const { env } = process;
-    let { ssl: { key = (_a = env.SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
+    let { ssl: { cert = (_a = env.INNET_SSL_CRT) !== null && _a !== void 0 ? _a : 'localhost.crt', key = (_b = env.INNET_SSL_KEY) !== null && _b !== void 0 ? _b : 'localhost.key', } = {}, } = props;
     try {
-        if (!isInvalidPath(key)) {
+        if (!key.startsWith('-----BEGIN PRIVATE KEY-----')) {
             key = fs.readFileSync(key).toString();
         }
-        if (!isInvalidPath(cert)) {
+        if (!cert.startsWith('-----BEGIN CERTIFICATE-----')) {
             cert = fs.readFileSync(cert).toString();
         }
     }
@@ -27,23 +33,41 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
-    const server = https ? http2.createServer({ key, cert }) : http.createServer();
-    handler[serverContext.key] = { server, port };
+    const { onClose, onError, onRequest, onStart, port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 443 : 80)), } = props;
+    const plugins = new Set();
+    const server = https ? http2.createServer({ cert, key }) : http.createServer();
+    serverContext.set(handler, { port, server });
+    serverPlugins.set(handler, plugins);
+    serverPortContext.set(handler, port);
+    serverHttpsContext.set(handler, https);
     onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
         server.close();
     });
     if (onError) {
         server.on('error', onError);
     }
-    if (onRequest) {
-        server.on('request', onRequest);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
-    innet(children, handler);
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action(req, res);
+        const requestHandler = Object.create(handler);
+        actionContext.set(requestHandler, action);
+        requestHandlerContext.set(requestHandler, requestHandler);
+        async function server() {
+            for (const plugin of plugins) {
+                const result = await plugin();
+                if (result !== undefined) {
+                    return result;
+                }
+            }
+        }
+        innet({ props, type: server }, requestHandler);
+    });
+    innet(props.children, handler);
     server.listen(port, () => {
-        onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });
+        onStart === null || onStart === void 0 ? void 0 : onStart({ https, port });
     });
 };
 

package/plugins/main/server/server.js

@@ -3,12 +3,20 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
+var jsx = require('@innet/jsx');
 var fs = require('node:fs');
 var http = require('node:http');
 var http2 = require('node:https');
 var watchState = require('watch-state');
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useServer = require('../../../hooks/useServer/useServer.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
+var useServerPort = require('../../../hooks/useServerPort/useServerPort.js');
+var useIsServerHttps = require('../../../hooks/useIsServerHttps/useIsServerHttps.js');
+var Action = require('../../../utils/action/Action.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
+var useRequestHandler = require('../../../hooks/useRequestHandler/useRequestHandler.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -17,19 +25,17 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const isInvalidPath = require('is-invalid-path');
 const server = () => {
     var _a, _b, _c;
     const handler = innet.useNewHandler();
-    const { props = {}, children } = innet.useApp();
+    const props = jsx.useProps();
     const { env } = process;
-    let { ssl: { key = (_a = env.SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
+    let { ssl: { cert = (_a = env.INNET_SSL_CRT) !== null && _a !== void 0 ? _a : 'localhost.crt', key = (_b = env.INNET_SSL_KEY) !== null && _b !== void 0 ? _b : 'localhost.key', } = {}, } = props;
     try {
-        if (!isInvalidPath(key)) {
+        if (!key.startsWith('-----BEGIN PRIVATE KEY-----')) {
             key = fs__default["default"].readFileSync(key).toString();
         }
-        if (!isInvalidPath(cert)) {
+        if (!cert.startsWith('-----BEGIN CERTIFICATE-----')) {
             cert = fs__default["default"].readFileSync(cert).toString();
         }
     }
@@ -38,23 +44,41 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
-    const server = https ? http2__default["default"].createServer({ key, cert }) : http__default["default"].createServer();
-    handler[useServer.serverContext.key] = { server, port };
+    const { onClose, onError, onRequest, onStart, port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 443 : 80)), } = props;
+    const plugins = new Set();
+    const server = https ? http2__default["default"].createServer({ cert, key }) : http__default["default"].createServer();
+    useServer.serverContext.set(handler, { port, server });
+    useServerPlugins.serverPlugins.set(handler, plugins);
+    useServerPort.serverPortContext.set(handler, port);
+    useIsServerHttps.serverHttpsContext.set(handler, https);
     watchState.onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
         server.close();
     });
     if (onError) {
         server.on('error', onError);
     }
-    if (onRequest) {
-        server.on('request', onRequest);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
-    innet__default["default"](children, handler);
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action.Action(req, res);
+        const requestHandler = Object.create(handler);
+        useAction.actionContext.set(requestHandler, action);
+        useRequestHandler.requestHandlerContext.set(requestHandler, requestHandler);
+        async function server() {
+            for (const plugin of plugins) {
+                const result = await plugin();
+                if (result !== undefined) {
+                    return result;
+                }
+            }
+        }
+        innet__default["default"]({ props, type: server }, requestHandler);
+    });
+    innet__default["default"](props.children, handler);
     server.listen(port, () => {
-        onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });
+        onStart === null || onStart === void 0 ? void 0 : onStart({ https, port });
     });
 };
 

package/plugins/main/tag/tag.d.ts

@@ -1,11 +1,12 @@
 import { type HandlerPlugin } from 'innet';
 export interface TagProps {
-    /** The name of the tag. */
-    name: string;
+    children?: any;
     /**
      * A description for the tag.
      * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
      * */
     description?: string;
+    /** The name of the tag. */
+    name: string;
 }
 export declare const tag: HandlerPlugin;

package/plugins/main/tag/tag.es6.js

@@ -1,5 +1,5 @@
 import innet, { useNewHandler } from 'innet';
-import { useContext, useProps, useChildren } from '@innet/jsx';
+import { useContext, useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { tagContext } from '../../../hooks/useTag/useTag.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
@@ -8,10 +8,12 @@ const tag = () => {
     if (useContext(tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { name, description } = useProps();
-    const children = useChildren();
+    const { children, description, name, } = useProps();
     const { docs } = useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }

package/plugins/main/tag/tag.js

@@ -16,10 +16,12 @@ const tag = () => {
     if (jsx.useContext(useTag.tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { name, description } = jsx.useProps();
-    const children = jsx.useChildren();
+    const { children, description, name, } = jsx.useProps();
     const { docs } = useApi.useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }

package/plugins/main/variable/variable.d.ts

@@ -1,5 +1,10 @@
 import { type HandlerPlugin } from 'innet';
 export interface VariableProps {
+    /**
+     * An optional description for the server variable.
+     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * A server url parameter
      * */
@@ -15,10 +20,5 @@ export interface VariableProps {
      * The array MUST NOT be empty.
      * */
     values?: [string, string, ...string[]];
-    /**
-     * An optional description for the server variable.
-     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
-     * */
-    description?: string;
 }
 export declare const variable: HandlerPlugin;