@innet/server 2.0.0-beta.1 → 2.0.0-beta.11

package/plugins/main/host/host.js

@@ -9,10 +9,6 @@ var useApi = require('../../../hooks/useApi/useApi.js');
 var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
 var useHost = require('../../../hooks/useHost/useHost.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
 const host = () => {
     const handler = innet.useNewHandler();
     const { docs } = useApi.useApi();
@@ -24,11 +20,13 @@ const host = () => {
         target.servers = [];
     }
     const { servers } = operation || docs;
-    const server = Object.assign({}, props);
+    const server = {
+        ...props,
+    };
     // @ts-expect-error: FIXME
     servers.push(server);
     handler[useHost.hostContext.key] = { server };
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 exports.host = host;

package/plugins/main/index.d.ts

@@ -1,13 +1,13 @@
-export * from './server';
 export * from './api';
+export * from './body';
 export * from './contact';
-export * from './license';
-export * from './host';
-export * from './variable';
-export * from './tag';
 export * from './endpoint';
-export * from './response';
-export * from './return';
+export * from './host';
+export * from './license';
 export * from './param';
-export * from './body';
 export * from './preset';
+export * from './response';
+export * from './return';
+export * from './server';
+export * from './tag';
+export * from './variable';

package/plugins/main/index.es6.js

@@ -1,13 +1,13 @@
-import './server/index.es6.js';
 import './api/index.es6.js';
+import './body/index.es6.js';
 import './contact/index.es6.js';
-import './license/index.es6.js';
-import './host/index.es6.js';
-import './variable/index.es6.js';
-import './tag/index.es6.js';
 import './endpoint/index.es6.js';
-import './response/index.es6.js';
-import './return/index.es6.js';
+import './host/index.es6.js';
+import './license/index.es6.js';
 import './param/index.es6.js';
-import './body/index.es6.js';
 import './preset/index.es6.js';
+import './response/index.es6.js';
+import './return/index.es6.js';
+import './server/index.es6.js';
+import './tag/index.es6.js';
+import './variable/index.es6.js';

package/plugins/main/index.js

@@ -1,16 +1,16 @@
 'use strict';
 
-require('./server/index.js');
 require('./api/index.js');
+require('./body/index.js');
 require('./contact/index.js');
-require('./license/index.js');
-require('./host/index.js');
-require('./variable/index.js');
-require('./tag/index.js');
 require('./endpoint/index.js');
-require('./response/index.js');
-require('./return/index.js');
+require('./host/index.js');
+require('./license/index.js');
 require('./param/index.js');
-require('./body/index.js');
 require('./preset/index.js');
+require('./response/index.js');
+require('./return/index.js');
+require('./server/index.js');
+require('./tag/index.js');
+require('./variable/index.js');
 

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

@@ -1,5 +1,4 @@
-import { __rest } from 'tslib';
-import innet, { useNewHandler } from 'innet';
+import { useNewHandler, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -25,8 +24,8 @@ const param = () => {
     if (!operation.parameters) {
         operation.parameters = [];
     }
-    const _b = useProps(), { children } = _b, props = __rest(_b, ["children"]);
-    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

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
@@ -17,10 +16,6 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var required = require('../../../utils/rules/required/required.js');
 var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
 const inMap = {
     cookie: 'cookie',
     header: 'header',
@@ -33,8 +28,8 @@ const param = () => {
     if (!operation.parameters) {
         operation.parameters = [];
     }
-    const _b = jsx.useProps(), { children } = _b, props = tslib.__rest(_b, ["children"]);
-    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;
     }
@@ -65,7 +60,7 @@ const param = () => {
             rulesMap[key] = override(rule);
         }
     });
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 exports.param = param;

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

@@ -1,4 +1,4 @@
-import innet, { useHandler } from 'innet';
+import { innet, useHandler } from 'innet';
 import { useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';

package/plugins/main/preset/preset.js

@@ -7,14 +7,10 @@ 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);
-
 function preset() {
     const children = jsx.useChildren();
     useServerPlugin.useServerPlugin(() => {
-        innet__default["default"](children, innet.useHandler());
+        innet.innet(children, innet.useHandler());
     });
 }
 

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

@@ -1,4 +1,4 @@
-import innet, { useNewHandler } from 'innet';
+import { useNewHandler, innet } from 'innet';
 import { useProps, useContext } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -12,7 +12,11 @@ import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.
 import { getOrAdd } from '../../../utils/getOrAdd/getOrAdd.es6.js';
 import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 
-const statuses = Object.assign(Object.assign(Object.assign({}, errorStatuses), redirectStatuses), successStatuses);
+const statuses = {
+    ...errorStatuses,
+    ...redirectStatuses,
+    ...successStatuses,
+};
 const response = () => {
     var _a;
     let { children, description = '', status = 'default', type = 'application/json', } = useProps() || {};
@@ -37,9 +41,12 @@ const response = () => {
         description,
     };
     if (schema) {
-        response.content = Object.assign(Object.assign({}, defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content), { [type]: {
+        response.content = {
+            ...defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content,
+            [type]: {
                 schema,
-            } });
+            },
+        };
     }
     operation.responses[status] = response;
     schemaContext.set(handler, schema);

package/plugins/main/response/response.js

@@ -16,11 +16,11 @@ var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext
 var getOrAdd = require('../../../utils/getOrAdd/getOrAdd.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
-const statuses = Object.assign(Object.assign(Object.assign({}, error.errorStatuses), redirect.redirectStatuses), success.successStatuses);
+const statuses = {
+    ...error.errorStatuses,
+    ...redirect.redirectStatuses,
+    ...success.successStatuses,
+};
 const response = () => {
     var _a;
     let { children, description = '', status = 'default', type = 'application/json', } = jsx.useProps() || {};
@@ -45,9 +45,12 @@ const response = () => {
         description,
     };
     if (schema) {
-        response.content = Object.assign(Object.assign({}, defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content), { [type]: {
+        response.content = {
+            ...defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content,
+            [type]: {
                 schema,
-            } });
+            },
+        };
     }
     operation.responses[status] = response;
     useSchemaContext.schemaContext.set(handler, schema);
@@ -55,7 +58,7 @@ const response = () => {
     useRule.ruleContext.set(handler, rule => {
         rules.response = rule;
     });
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 exports.response = response;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
 import { type IncomingMessage, type ServerResponse } from 'http';
 import { type ServerStartParams, type SSL } from '../../../types';

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

@@ -1,5 +1,4 @@
-import { __awaiter } from 'tslib';
-import innet, { useNewHandler } from 'innet';
+import { useNewHandler, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import http from 'node:http';
@@ -56,15 +55,13 @@ const server = () => {
         const requestHandler = Object.create(handler);
         actionContext.set(requestHandler, action);
         requestHandlerContext.set(requestHandler, requestHandler);
-        function server() {
-            return __awaiter(this, void 0, void 0, function* () {
-                for (const plugin of plugins) {
-                    const result = yield plugin();
-                    if (result !== undefined) {
-                        return result;
-                    }
+        async function server() {
+            for (const plugin of plugins) {
+                const result = await plugin();
+                if (result !== undefined) {
+                    return result;
                 }
-            });
+            }
         }
         innet({ props, type: server }, requestHandler);
     });

package/plugins/main/server/server.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var fs = require('node:fs');
@@ -21,7 +20,6 @@ var useRequestHandler = require('../../../hooks/useRequestHandler/useRequestHand
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
@@ -67,19 +65,17 @@ const server = () => {
         const requestHandler = Object.create(handler);
         useAction.actionContext.set(requestHandler, action);
         useRequestHandler.requestHandlerContext.set(requestHandler, requestHandler);
-        function server() {
-            return tslib.__awaiter(this, void 0, void 0, function* () {
-                for (const plugin of plugins) {
-                    const result = yield plugin();
-                    if (result !== undefined) {
-                        return result;
-                    }
+        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.innet({ props, type: server }, requestHandler);
     });
-    innet__default["default"](props.children, handler);
+    innet.innet(props.children, handler);
     server.listen(port, () => {
         onStart === null || onStart === void 0 ? void 0 : onStart({ https, port });
     });

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

@@ -1 +1 @@
-export { tag } from './tag.es6.js';
+export { TAG_GROUP_NAME, tag } from './tag.es6.js';

package/plugins/main/tag/index.js

@@ -6,4 +6,5 @@ var tag = require('./tag.js');
 
 
 
+exports.TAG_GROUP_NAME = tag.TAG_GROUP_NAME;
 exports.tag = tag.tag;

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

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

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

@@ -1,14 +1,15 @@
-import innet, { useNewHandler } from 'innet';
+import { useNewHandler, innet } from 'innet';
 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';
 
+const TAG_GROUP_NAME = 'x-tagGroups';
 const tag = () => {
     if (useContext(tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { children, description, name, } = useProps();
+    const { children, description, group, name, } = useProps();
     const { docs } = useApi();
     const tag = { name };
     if (description) {
@@ -23,9 +24,25 @@ const tag = () => {
     else {
         throw Error(`You cannot use two tags with the same name (${name})`);
     }
+    if (group) {
+        if (docs[TAG_GROUP_NAME]) {
+            const groups = docs[TAG_GROUP_NAME];
+            const tagGroup = groups.find(({ name }) => name === group);
+            if (tagGroup) {
+                tagGroup.tags.push(name);
+            }
+            else {
+                groups.push({ name: group, tags: [name] });
+            }
+        }
+        else {
+            // @ts-expect-error Custom field
+            docs[TAG_GROUP_NAME] = [{ name: group, tags: [name] }];
+        }
+    }
     const handler = useNewHandler();
     handler[tagContext.key] = tag;
     innet(children, handler);
 };
 
-export { tag };
+export { TAG_GROUP_NAME, tag };

package/plugins/main/tag/tag.js

@@ -8,15 +8,12 @@ require('../../../hooks/index.js');
 var useTag = require('../../../hooks/useTag/useTag.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
+const TAG_GROUP_NAME = 'x-tagGroups';
 const tag = () => {
     if (jsx.useContext(useTag.tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { children, description, name, } = jsx.useProps();
+    const { children, description, group, name, } = jsx.useProps();
     const { docs } = useApi.useApi();
     const tag = { name };
     if (description) {
@@ -31,9 +28,26 @@ const tag = () => {
     else {
         throw Error(`You cannot use two tags with the same name (${name})`);
     }
+    if (group) {
+        if (docs[TAG_GROUP_NAME]) {
+            const groups = docs[TAG_GROUP_NAME];
+            const tagGroup = groups.find(({ name }) => name === group);
+            if (tagGroup) {
+                tagGroup.tags.push(name);
+            }
+            else {
+                groups.push({ name: group, tags: [name] });
+            }
+        }
+        else {
+            // @ts-expect-error Custom field
+            docs[TAG_GROUP_NAME] = [{ name: group, tags: [name] }];
+        }
+    }
     const handler = innet.useNewHandler();
     handler[useTag.tagContext.key] = tag;
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
+exports.TAG_GROUP_NAME = TAG_GROUP_NAME;
 exports.tag = tag;

package/plugins/main/variable/variable.es6.js

@@ -1,18 +1,17 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { useHost } from '../../../hooks/useHost/useHost.es6.js';
 
 const variable = () => {
     const { server } = useHost();
-    const _a = useProps(), { key, values, 
+    const { key, values, 
     // predefine
-    value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = __rest(_a, ["key", "values", "value"]);
+    value = values === null || values === void 0 ? void 0 : values[0], ...rest } = useProps();
     if (!server.variables) {
         server.variables = {};
     }
     // @ts-expect-error: FIXME
-    server.variables[key] = Object.assign(Object.assign({}, rest), { default: value, enum: values });
+    server.variables[key] = { ...rest, default: value, enum: values };
 };
 
 export { variable };

package/plugins/main/variable/variable.js

@@ -2,21 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var useHost = require('../../../hooks/useHost/useHost.js');
 
 const variable = () => {
     const { server } = useHost.useHost();
-    const _a = jsx.useProps(), { key, values, 
+    const { key, values, 
     // predefine
-    value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = tslib.__rest(_a, ["key", "values", "value"]);
+    value = values === null || values === void 0 ? void 0 : values[0], ...rest } = jsx.useProps();
     if (!server.variables) {
         server.variables = {};
     }
     // @ts-expect-error: FIXME
-    server.variables[key] = Object.assign(Object.assign({}, rest), { default: value, enum: values });
+    server.variables[key] = { ...rest, default: value, enum: values };
 };
 
 exports.variable = variable;

package/plugins/request/cms/cms.es6.js

@@ -1,4 +1,4 @@
-import innet, { useHandler } from 'innet';
+import { useHandler, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import path from 'node:path';
 import '../file/index.es6.js';

package/plugins/request/cms/cms.js

@@ -12,7 +12,6 @@ var file = require('../file/file.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 function cms() {
@@ -23,10 +22,10 @@ function cms() {
         url = url.slice(prefix.length);
     }
     else {
-        return innet__default["default"](children, handler);
+        return innet.innet(children, handler);
     }
     const filePath = path__default["default"].join(dir, url);
-    innet__default["default"]({ children, props: { path: filePath }, type: file.file }, handler);
+    innet.innet({ children, props: { path: filePath }, type: file.file }, handler);
 }
 
 exports.cms = cms;

package/plugins/request/cookie/cookie.d.ts

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type CookieSerializeOptions } from 'cookie';
-export interface CookieProps extends CookieSerializeOptions {
+import { type Cookies } from 'cookie';
+export interface CookieProps extends Cookies {
     key: string;
     value?: string;
 }

package/plugins/request/cookie/cookie.es6.js

@@ -1,11 +1,10 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 const cookie = () => {
     const action = useAction();
-    const _a = useProps(), { key, value } = _a, opt = __rest(_a, ["key", "value"]);
+    const { key, value, ...opt } = useProps();
     action.setCookie(key, value, opt);
 };
 

package/plugins/request/cookie/cookie.js

@@ -2,14 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var useAction = require('../../../hooks/useAction/useAction.js');
 
 const cookie = () => {
     const action = useAction.useAction();
-    const _a = jsx.useProps(), { key, value } = _a, opt = tslib.__rest(_a, ["key", "value"]);
+    const { key, value, ...opt } = jsx.useProps();
     action.setCookie(key, value, opt);
 };
 

package/plugins/request/error/error.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -59,7 +58,7 @@ const errorStatuses = {
     webServerIsDown: 521,
 };
 const error = () => {
-    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
+    const { children, ...props } = useProps();
     const res = useResponse();
     if (!res) {
         throw Error('<error> MUST be in <request>');

package/plugins/request/error/error.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
@@ -63,7 +62,7 @@ const errorStatuses = {
     webServerIsDown: 521,
 };
 const error = () => {
-    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
+    const { children, ...props } = jsx.useProps();
     const res = useResponse.useResponse();
     if (!res) {
         throw Error('<error> MUST be in <request>');

package/plugins/request/file/file.es6.js

@@ -1,5 +1,4 @@
-import { __rest } from 'tslib';
-import innet, { useHandler } from 'innet';
+import { useHandler, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import mime from 'mime';
@@ -9,7 +8,7 @@ import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 function file() {
     const handler = useHandler();
-    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
+    const { children, ...props } = useProps();
     const res = useResponse();
     if (!res) {
         useThrow('<{type}> MUST be in <request> or <fallback>');