@innet/server 2.0.0-alpha.2 → 2.0.0-alpha.20

package/plugins/main/server/server.js

@@ -2,13 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 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 Action = require('../../../utils/action/Action.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -24,7 +29,7 @@ const server = () => {
     const handler = innet.useNewHandler();
     const { props = {}, children } = innet.useApp();
     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: { key = (_a = env.INNET_SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.INNET_SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
     try {
         if (!isInvalidPath(key)) {
             key = fs__default["default"].readFileSync(key).toString();
@@ -38,20 +43,37 @@ 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 { port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, onClose, } = props;
+    const plugins = new Set();
     const server = https ? http2__default["default"].createServer({ key, cert }) : http__default["default"].createServer();
-    handler[useServer.serverContext.key] = { server, port };
+    useServer.serverContext.set(handler, { server, port });
+    useServerPlugins.serverPlugins.set(handler, plugins);
     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);
     }
+    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);
+        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;
+                    }
+                }
+            });
+        }
+        innet__default["default"]({ type: server, props }, requestHandler);
+    });
     innet__default["default"](children, handler);
     server.listen(port, () => {
         onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });

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

@@ -11,7 +11,10 @@ const tag = () => {
     const { name, description } = useProps();
     const children = useChildren();
     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

@@ -19,7 +19,10 @@ const tag = () => {
     const { name, description } = jsx.useProps();
     const children = jsx.useChildren();
     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/request/cms/cms.es6.js

@@ -7,7 +7,7 @@ import { usePath } from '../../../hooks/usePath/usePath.es6.js';
 import { file } from '../file/file.es6.js';
 
 function cms() {
-    const { prefix = '/', dir = '.' } = useProps() || {};
+    const { prefix = process.env.INNET_CMS_PREFIX || '/', dir = process.env.INNET_CMS_DIR || '.', } = useProps() || {};
     const children = useChildren();
     const handler = useHandler();
     let url = usePath();

package/plugins/request/cms/cms.js

@@ -16,7 +16,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 function cms() {
-    const { prefix = '/', dir = '.' } = jsx.useProps() || {};
+    const { prefix = process.env.INNET_CMS_PREFIX || '/', dir = process.env.INNET_CMS_DIR || '.', } = jsx.useProps() || {};
     const children = jsx.useChildren();
     const handler = innet.useHandler();
     let url = usePath.usePath();

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

@@ -1,28 +1,12 @@
 import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
-import cookie$1 from 'cookie';
 import '../../../hooks/index.es6.js';
-import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
-import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 const cookie = () => {
-    const res = useResponse();
-    if (!res) {
-        useThrow('<{type}> MUST be in <request> or <fallback>');
-    }
+    const action = useAction();
     const _a = useProps(), { key, value } = _a, opt = __rest(_a, ["key", "value"]);
-    let cookies = res.getHeader('Set-Cookie');
-    if (typeof cookies === 'string') {
-        cookies = [cookies];
-    }
-    const normValue = typeof value === 'string' ? cookie$1.serialize(key, value, opt) : `${key}=; max-age=0`;
-    if (cookies) {
-        cookies.push(normValue);
-    }
-    else {
-        cookies = normValue;
-    }
-    res.setHeader('Set-Cookie', cookies);
+    action.setCookie(key, value, opt);
 };
 
 export { cookie };

package/plugins/request/cookie/cookie.js

@@ -4,33 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var jsx = require('@innet/jsx');
-var cookie$1 = require('cookie');
 require('../../../hooks/index.js');
-var useResponse = require('../../../hooks/useResponse/useResponse.js');
-var useThrow = require('../../../hooks/useThrow/useThrow.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var cookie__default = /*#__PURE__*/_interopDefaultLegacy(cookie$1);
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 const cookie = () => {
-    const res = useResponse.useResponse();
-    if (!res) {
-        useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
-    }
+    const action = useAction.useAction();
     const _a = jsx.useProps(), { key, value } = _a, opt = tslib.__rest(_a, ["key", "value"]);
-    let cookies = res.getHeader('Set-Cookie');
-    if (typeof cookies === 'string') {
-        cookies = [cookies];
-    }
-    const normValue = typeof value === 'string' ? cookie__default["default"].serialize(key, value, opt) : `${key}=; max-age=0`;
-    if (cookies) {
-        cookies.push(normValue);
-    }
-    else {
-        cookies = normValue;
-    }
-    res.setHeader('Set-Cookie', cookies);
+    action.setCookie(key, value, opt);
 };
 
 exports.cookie = cookie;

package/plugins/request/proxy/proxy.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
+import { type IncomingMessage } from 'http';
 export interface ProxyProps {
     to: string;
     secure?: boolean;
+    onProxyRes?: (res: IncomingMessage) => void;
 }
 export declare const proxy: HandlerPlugin;

package/plugins/request/proxy/proxy.es6.js

@@ -6,7 +6,7 @@ import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 const proxy = () => {
-    const { to, secure } = useProps();
+    const { to, secure = false, onProxyRes } = useProps();
     const req = useRequest();
     const res = useResponse();
     if (!req || !res) {
@@ -14,6 +14,9 @@ const proxy = () => {
     }
     const proxyServer = httpProxy.createProxyServer({});
     delete req.headers.host;
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
     proxyServer.web(req, res, { target: to, secure });
 };
 

package/plugins/request/proxy/proxy.js

@@ -14,7 +14,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 
 const proxy = () => {
-    const { to, secure } = jsx.useProps();
+    const { to, secure = false, onProxyRes } = jsx.useProps();
     const req = useRequest.useRequest();
     const res = useResponse.useResponse();
     if (!req || !res) {
@@ -22,6 +22,9 @@ const proxy = () => {
     }
     const proxyServer = httpProxy__default["default"].createProxyServer({});
     delete req.headers.host;
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
     proxyServer.web(req, res, { target: to, secure });
 };
 

package/plugins/request/redirect/redirect.d.ts

@@ -9,9 +9,10 @@ export declare const redirectStatuses: {
     temporaryRedirect: number;
     permanentRedirect: number;
 };
+export type RedirectStatuses = keyof typeof redirectStatuses;
 export interface RedirectProps {
     to: string;
     encode?: boolean;
-    status?: number | keyof typeof redirectStatuses;
+    status?: number | RedirectStatuses;
 }
 export declare const redirect: HandlerPlugin;

package/plugins/request/success/success.d.ts

@@ -13,5 +13,6 @@ export declare const successStatuses: {
 export type SuccessStatuses = keyof typeof successStatuses;
 export interface SuccessProps {
     status?: SuccessStatuses | number;
+    type?: string;
 }
 export declare const success: HandlerPlugin;

package/plugins/request/success/success.es6.js

@@ -17,15 +17,24 @@ const successStatuses = {
 };
 const success = () => {
     const children = useChildren();
-    const props = useProps();
+    const { status, type } = useProps() || {};
     const res = useResponse();
-    const status = props === null || props === void 0 ? void 0 : props.status;
     if (!res) {
         throw Error('<success> MUST be in <request>');
     }
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
-    if (children) {
-        res.write(JSONString(children[0]));
+    if (children === null || children === void 0 ? void 0 : children[0]) {
+        const child = children[0];
+        const contentType = type || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
+            ? 'text/plain'
+            : 'application/json');
+        res.setHeader('Content-Type', contentType);
+        if (contentType === 'application/json') {
+            res.write(JSONString(child));
+        }
+        else {
+            res.write(String(child));
+        }
     }
     res.end();
 };

package/plugins/request/success/success.js

@@ -21,15 +21,24 @@ const successStatuses = {
 };
 const success = () => {
     const children = jsx.useChildren();
-    const props = jsx.useProps();
+    const { status, type } = jsx.useProps() || {};
     const res = useResponse.useResponse();
-    const status = props === null || props === void 0 ? void 0 : props.status;
     if (!res) {
         throw Error('<success> MUST be in <request>');
     }
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
-    if (children) {
-        res.write(JSONString.JSONString(children[0]));
+    if (children === null || children === void 0 ? void 0 : children[0]) {
+        const child = children[0];
+        const contentType = type || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
+            ? 'text/plain'
+            : 'application/json');
+        res.setHeader('Content-Type', contentType);
+        if (contentType === 'application/json') {
+            res.write(JSONString.JSONString(child));
+        }
+        else {
+            res.write(String(child));
+        }
     }
     res.end();
 };

package/plugins/schema/any/any.d.ts

@@ -0,0 +1,5 @@
+import { type HandlerPlugin } from 'innet';
+import { type BaseSchemaProps } from '../../../types';
+export interface AnyProps extends BaseSchemaProps<any> {
+}
+export declare const any: HandlerPlugin;

package/plugins/schema/any/any.es6.js

@@ -0,0 +1,27 @@
+import { useProps } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import '../../../hooks/useParentRule/index.es6.js';
+import '../../../utils/index.es6.js';
+import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
+import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
+import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
+import { useRule } from '../../../hooks/useRule/useRule.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
+
+const any = () => {
+    const props = useProps();
+    useSchemaType('any', props);
+    const rules = [];
+    if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
+        rules.push(defaultTo(props.default));
+    }
+    if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
+        const parentRule = useParentRule();
+        useRule(parentRule(pipe(...rules)));
+    }
+    else {
+        useRule(pipe(...rules));
+    }
+};
+
+export { any };

package/plugins/schema/any/any.js

@@ -0,0 +1,31 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+require('../../../hooks/useParentRule/index.js');
+require('../../../utils/index.js');
+var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
+var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
+var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
+var useRule = require('../../../hooks/useRule/useRule.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
+
+const any = () => {
+    const props = jsx.useProps();
+    useSchemaType.useSchemaType('any', props);
+    const rules = [];
+    if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
+        rules.push(defaultTo.defaultTo(props.default));
+    }
+    if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
+        const parentRule = useParentRule.useParentRule();
+        useRule.useRule(parentRule(pipe.pipe(...rules)));
+    }
+    else {
+        useRule.useRule(pipe.pipe(...rules));
+    }
+};
+
+exports.any = any;

package/plugins/schema/boolean/boolean.es6.js

@@ -1,10 +1,9 @@
-import { useProps, useContext } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
-import { paramContext } from '../../../hooks/useParam/useParam.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 import { useRule } from '../../../hooks/useRule/useRule.es6.js';
@@ -14,12 +13,11 @@ const boolean = () => {
     useBlock('path');
     const props = useProps();
     useSchemaType('boolean', props);
-    const param = useContext(paramContext);
     const rules = [];
     if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
         rules.push(defaultTo(props.default));
     }
-    rules.push(param ? val => val === 'true' || (val === 'false' ? false : Boolean(val)) : Boolean);
+    rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
     if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
         const parentRule = useParentRule();
         useRule(parentRule(pipe(...rules)));

package/plugins/schema/boolean/boolean.js

@@ -8,7 +8,6 @@ require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
 var useBlock = require('../../../hooks/useBlock/useBlock.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
-var useParam = require('../../../hooks/useParam/useParam.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
@@ -18,12 +17,11 @@ const boolean = () => {
     useBlock.useBlock('path');
     const props = jsx.useProps();
     useSchemaType.useSchemaType('boolean', props);
-    const param = jsx.useContext(useParam.paramContext);
     const rules = [];
     if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
         rules.push(defaultTo.defaultTo(props.default));
     }
-    rules.push(param ? val => val === 'true' || (val === 'false' ? false : Boolean(val)) : Boolean);
+    rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
     if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
         const parentRule = useParentRule.useParentRule();
         useRule.useRule(parentRule(pipe.pipe(...rules)));

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

@@ -2,7 +2,8 @@ import innet, { useNewHandler } from 'innet';
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
-import { useSchemaContext, schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
+import { useObjectSchemaContext } from '../../../hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';
+import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { useObjectRule, objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es6.js';
 import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 import { required } from '../../../utils/rules/required/required.es6.js';
@@ -10,11 +11,8 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 const field = () => {
     const handler = useNewHandler();
     const { key, optional } = useProps();
-    const schema = useSchemaContext();
+    const schema = useObjectSchemaContext();
     const children = useChildren();
-    if (Array.isArray(schema) || (schema === null || schema === void 0 ? void 0 : schema.type) !== 'object') {
-        throw Error('Use <field> inside <object>');
-    }
     if (!schema.properties) {
         schema.properties = {};
     }

package/plugins/schema/field/field.js

@@ -6,6 +6,7 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+var useObjectSchemaContext = require('../../../hooks/useObjectSchemaContext/useObjectSchemaContext.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
 var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
@@ -18,11 +19,8 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 const field = () => {
     const handler = innet.useNewHandler();
     const { key, optional } = jsx.useProps();
-    const schema = useSchemaContext.useSchemaContext();
+    const schema = useObjectSchemaContext.useObjectSchemaContext();
     const children = jsx.useChildren();
-    if (Array.isArray(schema) || (schema === null || schema === void 0 ? void 0 : schema.type) !== 'object') {
-        throw Error('Use <field> inside <object>');
-    }
     if (!schema.properties) {
         schema.properties = {};
     }

package/plugins/schema/index.d.ts

@@ -10,3 +10,4 @@ export * from './date';
 export * from './tuple';
 export * from './uuid';
 export * from './binary';
+export * from './any';

package/plugins/schema/index.es6.js

@@ -10,3 +10,4 @@ import './date/index.es6.js';
 import './tuple/index.es6.js';
 import './uuid/index.es6.js';
 import './binary/index.es6.js';
+import './any/index.es6.js';

package/plugins/schema/index.js

@@ -12,4 +12,5 @@ require('./date/index.js');
 require('./tuple/index.js');
 require('./uuid/index.js');
 require('./binary/index.js');
+require('./any/index.js');
 

package/plugins/schema/object/object.es6.js

@@ -1,11 +1,13 @@
 import innet, { useNewHandler } from 'innet';
 import { useChildren, 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';
 import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
+import { objectSchemaContext } from '../../../hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';
 import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { parentRuleContext, useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
@@ -22,19 +24,23 @@ const object = () => {
     const schema = useSchemaType('object', props);
     const handler = useNewHandler();
     if (schema) {
-        schemaContext.set(handler, schema);
+        schema.additionalProperties = {};
+        objectSchemaContext.set(handler, schema);
+        schemaContext.set(handler, schema.additionalProperties);
         parentRuleContext.reset(handler);
         const rules = [];
         const rulesMap = {};
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
             rules.push(defaultTo(props.default));
         }
+        let childRule = v => v;
+        const restRule = (value, data) => childRule(value, data);
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
-            rules.push(objectOf(rulesMap));
+            rules.push(objectOf(rulesMap, restRule));
         }
         else {
             const parentRule = useParentRule();
-            rules.push(parentRule(objectOf(rulesMap)));
+            rules.push(parentRule(objectOf(rulesMap, restRule)));
         }
         const rule = pipe(...rules);
         if (props.ref) {
@@ -42,9 +48,16 @@ const object = () => {
         }
         useRule(rule);
         objectRuleContext.set(handler, rulesMap);
-        ruleContext.set(handler, null);
+        ruleContext.set(handler, rule => {
+            childRule = rule;
+        });
         parentRuleContext.reset(handler);
         innet(children, handler);
+        innet(() => {
+            if (!Object.keys(schema.additionalProperties).length) {
+                delete schema.additionalProperties;
+            }
+        }, callHandler);
     }
     else if (props.ref) {
         useRule(refRules[props.ref]);

package/plugins/schema/object/object.js

@@ -4,12 +4,14 @@ 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');
 var useBlock = require('../../../hooks/useBlock/useBlock.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
+var useObjectSchemaContext = require('../../../hooks/useObjectSchemaContext/useObjectSchemaContext.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
@@ -30,19 +32,23 @@ const object = () => {
     const schema = useSchemaType.useSchemaType('object', props);
     const handler = innet.useNewHandler();
     if (schema) {
-        useSchemaContext.schemaContext.set(handler, schema);
+        schema.additionalProperties = {};
+        useObjectSchemaContext.objectSchemaContext.set(handler, schema);
+        useSchemaContext.schemaContext.set(handler, schema.additionalProperties);
         useParentRule.parentRuleContext.reset(handler);
         const rules = [];
         const rulesMap = {};
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
             rules.push(defaultTo.defaultTo(props.default));
         }
+        let childRule = v => v;
+        const restRule = (value, data) => childRule(value, data);
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
-            rules.push(objectOf.objectOf(rulesMap));
+            rules.push(objectOf.objectOf(rulesMap, restRule));
         }
         else {
             const parentRule = useParentRule.useParentRule();
-            rules.push(parentRule(objectOf.objectOf(rulesMap)));
+            rules.push(parentRule(objectOf.objectOf(rulesMap, restRule)));
         }
         const rule = pipe.pipe(...rules);
         if (props.ref) {
@@ -50,9 +56,16 @@ const object = () => {
         }
         useRule.useRule(rule);
         useObjectRule.objectRuleContext.set(handler, rulesMap);
-        useRule.ruleContext.set(handler, null);
+        useRule.ruleContext.set(handler, rule => {
+            childRule = rule;
+        });
         useParentRule.parentRuleContext.reset(handler);
         innet__default["default"](children, handler);
+        innet__default["default"](() => {
+            if (!Object.keys(schema.additionalProperties).length) {
+                delete schema.additionalProperties;
+            }
+        }, utils.callHandler);
     }
     else if (props.ref) {
         useRule.useRule(refRules[props.ref]);

package/plugins/utils/blacklist/blacklist.d.ts

@@ -0,0 +1,4 @@
+export interface BlacklistProps {
+    ip?: string | string[];
+}
+export declare function blacklist(): void;

package/plugins/utils/blacklist/blacklist.es6.js

@@ -0,0 +1,18 @@
+import { useProps, useChildren } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
+
+function blacklist() {
+    const { ip = process.env.INNET_BLACKLIST_IP, } = useProps() || {};
+    const children = useChildren();
+    const ips = typeof ip === 'string' ? ip.split(',') : ip;
+    useServerPlugin(() => {
+        const action = useAction();
+        if (!action.clientIp || (ips === null || ips === void 0 ? void 0 : ips.includes(action.clientIp))) {
+            return children;
+        }
+    });
+}
+
+export { blacklist };