@innet/server 2.0.0-beta.3 → 2.0.0-beta.5

package/plugins/main/body/body.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
 var jsx = require('@innet/jsx');
-var utils = require('@innet/utils');
 var constants = require('../../../constants.js');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
@@ -13,10 +12,7 @@ var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext
 var getOrAdd = require('../../../utils/getOrAdd/getOrAdd.js');
 var useBodyFile = require('../../../hooks/useBodyFile/useBodyFile.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);
+var useEffect = require('../../../hooks/useEffect/useEffect.js');
 
 const body = () => {
     const endpoint = jsx.useContext(useEndpoint.endpointContext);
@@ -47,8 +43,8 @@ const body = () => {
     useRule.ruleContext.set(handler, rule => {
         rules.body = rule;
     });
-    innet__default["default"](children, handler);
-    innet__default["default"](() => {
+    innet.innet(children, handler);
+    useEffect.useEffect(() => {
         if (fileUsed) {
             requestBody.content['multipart/form-data'] = { schema };
         }
@@ -57,7 +53,7 @@ const body = () => {
                 requestBody.content[type] = { schema };
             }
         }
-    }, utils.callHandler);
+    });
 };
 
 exports.body = body;

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

@@ -1,4 +1,4 @@
-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';
@@ -24,12 +24,12 @@ const endpoint = () => {
         throw Error(`You cannot use the same endpoints ${method}:${path}`);
     }
     const operation = {};
-    if (summary) {
-        operation.summary = summary;
-    }
     if (operationId) {
         operation.operationId = operationId;
     }
+    if (summary) {
+        operation.summary = summary;
+    }
     if (description) {
         operation.description = description;
     }

package/plugins/main/endpoint/endpoint.js

@@ -12,10 +12,6 @@ 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 }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
 const endpoint = () => {
     const handler = innet.useNewHandler();
     const tag = useTag.useTag();
@@ -32,12 +28,12 @@ const endpoint = () => {
         throw Error(`You cannot use the same endpoints ${method}:${path}`);
     }
     const operation = {};
-    if (summary) {
-        operation.summary = summary;
-    }
     if (operationId) {
         operation.operationId = operationId;
     }
+    if (summary) {
+        operation.summary = summary;
+    }
     if (description) {
         operation.description = description;
     }
@@ -58,7 +54,7 @@ const 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);
+    innet.innet(children, handler);
 };
 
 exports.endpoint = endpoint;

package/plugins/main/host/host.es6.js

@@ -1,4 +1,4 @@
-import innet, { useNewHandler } from 'innet';
+import { useNewHandler, innet } from 'innet';
 import { useProps, useChildren, useContext } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';

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();
@@ -30,7 +26,7 @@ const host = () => {
     // @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,4 +1,4 @@
-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';

package/plugins/main/param/param.js

@@ -16,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',
@@ -64,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';

package/plugins/main/response/response.js

@@ -16,10 +16,6 @@ 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 = {
     ...error.errorStatuses,
     ...redirect.redirectStatuses,
@@ -62,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.es6.js

@@ -1,4 +1,4 @@
-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';

package/plugins/main/server/server.js

@@ -20,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);
@@ -74,9 +73,9 @@ const server = () => {
                 }
             }
         }
-        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/tag.es6.js

@@ -1,4 +1,4 @@
-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';

package/plugins/main/tag/tag.js

@@ -8,10 +8,6 @@ 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 = () => {
     if (jsx.useContext(useTag.tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
@@ -33,7 +29,7 @@ const tag = () => {
     }
     const handler = innet.useNewHandler();
     handler[useTag.tagContext.key] = tag;
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 exports.tag = tag;

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/file/file.es6.js

@@ -1,4 +1,4 @@
-import innet, { useHandler } from 'innet';
+import { useHandler, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import mime from 'mime';

package/plugins/request/file/file.js

@@ -12,7 +12,6 @@ var useThrow = require('../../../hooks/useThrow/useThrow.js');
 
 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 mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
 
@@ -40,7 +39,7 @@ function file() {
             return;
         }
     }
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 }
 
 exports.file = file;

package/plugins/request/index.d.ts

@@ -1,8 +1,8 @@
-export * from './success';
+export * from './cms';
+export * from './cookie';
 export * from './error';
+export * from './file';
+export * from './header';
 export * from './proxy';
 export * from './redirect';
-export * from './header';
-export * from './cookie';
-export * from './file';
-export * from './cms';
+export * from './success';

package/plugins/request/index.es6.js

@@ -1,8 +1,8 @@
-import './success/index.es6.js';
+import './cms/index.es6.js';
+import './cookie/index.es6.js';
 import './error/index.es6.js';
+import './file/index.es6.js';
+import './header/index.es6.js';
 import './proxy/index.es6.js';
 import './redirect/index.es6.js';
-import './header/index.es6.js';
-import './cookie/index.es6.js';
-import './file/index.es6.js';
-import './cms/index.es6.js';
+import './success/index.es6.js';

package/plugins/request/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
-require('./success/index.js');
+require('./cms/index.js');
+require('./cookie/index.js');
 require('./error/index.js');
+require('./file/index.js');
+require('./header/index.js');
 require('./proxy/index.js');
 require('./redirect/index.js');
-require('./header/index.js');
-require('./cookie/index.js');
-require('./file/index.js');
-require('./cms/index.js');
+require('./success/index.js');
 

package/plugins/schema/array/array.d.ts

@@ -2,5 +2,8 @@ import { type HandlerPlugin } from 'innet';
 import { type BaseSchemaProps } from '../../../types';
 export interface ArrayProps extends BaseSchemaProps<any[]> {
     children?: any;
+    maxItems?: number;
+    minItems?: number;
+    uniqueItems?: boolean;
 }
 export declare const array: HandlerPlugin;

package/plugins/schema/array/array.es6.js

@@ -1,6 +1,5 @@
-import innet, { useNewHandler } from 'innet';
+import { useNewHandler, innet } from 'innet';
 import { useContext, useProps } from '@innet/jsx';
-import { callHandler } from '@innet/utils';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -13,16 +12,26 @@ import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 import { arrayOf } from '../../../utils/rules/arrayOf/arrayOf.es6.js';
 import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
 
 const array = () => {
     useBlock('path');
     const setRule = useContext(ruleContext);
     const handler = useNewHandler();
-    const { children, ...props } = useProps();
+    const { children, maxItems, minItems, uniqueItems, ...props } = useProps();
     const schema = useSchemaType('array', props);
     const fieldSchema = {};
     handler[schemaContext.key] = fieldSchema;
     schema.items = fieldSchema;
+    if (maxItems) {
+        schema.maxItems = maxItems;
+    }
+    if (minItems) {
+        schema.minItems = minItems;
+    }
+    if (uniqueItems) {
+        schema.uniqueItems = uniqueItems;
+    }
     if (setRule) {
         let oneOfRulesMap;
         const rules = [];
@@ -44,11 +53,11 @@ const array = () => {
             }
         });
         innet(children, handler);
-        innet(() => {
+        useEffect(() => {
             if (!oneOfRulesMap && setRule) {
                 setRule(rootRule(e => e));
             }
-        }, callHandler);
+        });
         return;
     }
     innet(children, handler);

package/plugins/schema/array/array.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
 var jsx = require('@innet/jsx');
-var utils = require('@innet/utils');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
@@ -17,20 +16,26 @@ var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 var arrayOf = require('../../../utils/rules/arrayOf/arrayOf.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);
+var useEffect = require('../../../hooks/useEffect/useEffect.js');
 
 const array = () => {
     useBlock.useBlock('path');
     const setRule = jsx.useContext(useRule.ruleContext);
     const handler = innet.useNewHandler();
-    const { children, ...props } = jsx.useProps();
+    const { children, maxItems, minItems, uniqueItems, ...props } = jsx.useProps();
     const schema = useSchemaType.useSchemaType('array', props);
     const fieldSchema = {};
     handler[useSchemaContext.schemaContext.key] = fieldSchema;
     schema.items = fieldSchema;
+    if (maxItems) {
+        schema.maxItems = maxItems;
+    }
+    if (minItems) {
+        schema.minItems = minItems;
+    }
+    if (uniqueItems) {
+        schema.uniqueItems = uniqueItems;
+    }
     if (setRule) {
         let oneOfRulesMap;
         const rules = [];
@@ -51,15 +56,15 @@ const array = () => {
                 setRule(rootRule(oneOf.oneOf(oneOfRulesMap)));
             }
         });
-        innet__default["default"](children, handler);
-        innet__default["default"](() => {
+        innet.innet(children, handler);
+        useEffect.useEffect(() => {
             if (!oneOfRulesMap && setRule) {
                 setRule(rootRule(e => e));
             }
-        }, utils.callHandler);
+        });
         return;
     }
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 exports.array = array;

package/plugins/schema/field/field.d.ts

@@ -4,5 +4,7 @@ export interface FieldProps {
     deprecated?: boolean;
     key: string;
     optional?: boolean;
+    readOnly?: boolean;
+    writeOnly?: boolean;
 }
 export declare const field: HandlerPlugin;

package/plugins/schema/field/field.es6.js

@@ -1,4 +1,4 @@
-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';
@@ -10,7 +10,7 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 
 const field = () => {
     const handler = useNewHandler();
-    const { children, deprecated, key, optional, } = useProps();
+    const { children, deprecated, key, optional, readOnly, writeOnly, } = useProps();
     const schema = useObjectSchemaContext();
     if (!schema.properties) {
         schema.properties = {};
@@ -23,6 +23,12 @@ const field = () => {
     if (deprecated) {
         fieldSchema.deprecated = true;
     }
+    if (readOnly) {
+        fieldSchema.readOnly = true;
+    }
+    if (writeOnly) {
+        fieldSchema.writeOnly = true;
+    }
     schema.properties[key] = fieldSchema;
     if (!optional) {
         if (!schema.required) {

package/plugins/schema/field/field.js

@@ -12,13 +12,9 @@ var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 var required = require('../../../utils/rules/required/required.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
 const field = () => {
     const handler = innet.useNewHandler();
-    const { children, deprecated, key, optional, } = jsx.useProps();
+    const { children, deprecated, key, optional, readOnly, writeOnly, } = jsx.useProps();
     const schema = useObjectSchemaContext.useObjectSchemaContext();
     if (!schema.properties) {
         schema.properties = {};
@@ -31,6 +27,12 @@ const field = () => {
     if (deprecated) {
         fieldSchema.deprecated = true;
     }
+    if (readOnly) {
+        fieldSchema.readOnly = true;
+    }
+    if (writeOnly) {
+        fieldSchema.writeOnly = true;
+    }
     schema.properties[key] = fieldSchema;
     if (!optional) {
         if (!schema.required) {
@@ -48,7 +50,7 @@ const field = () => {
         }
     });
     useObjectRule.objectRuleContext.set(handler, null);
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 exports.field = field;

package/plugins/schema/index.d.ts

@@ -1,13 +1,13 @@
-export * from './object';
-export * from './field';
-export * from './number';
-export * from './integer';
-export * from './string';
+export * from './any';
 export * from './array';
+export * from './binary';
 export * from './boolean';
-export * from './null';
 export * from './date';
+export * from './field';
+export * from './integer';
+export * from './null';
+export * from './number';
+export * from './object';
+export * from './string';
 export * from './tuple';
 export * from './uuid';
-export * from './binary';
-export * from './any';