@innet/server 2.0.0-alpha.3 → 2.0.0-alpha.30

package/plugins/request/success/success.js

@@ -9,27 +9,38 @@ var useResponse = require('../../../hooks/useResponse/useResponse.js');
 var JSONString = require('../../../utils/JSONString/JSONString.js');
 
 const successStatuses = {
-    ok: 200,
-    created: 201,
     accepted: 202,
-    outside: 203,
+    alreadyReported: 208,
+    created: 201,
+    multiStatus: 207,
     noContent: 204,
-    resetContent: 205,
+    ok: 200,
+    outside: 203,
     partialContent: 206,
-    multiStatus: 207,
-    alreadyReported: 208,
+    resetContent: 205,
 };
 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 || (['bigint', 'boolean', 'number', 'string'].includes(typeof child)
+            ? 'text/plain'
+            : 'application/json');
+        const content = contentType === 'application/json' ? JSONString.JSONString(child) : String(child);
+        res.setHeader('Content-Type', contentType);
+        res.setHeader('Content-Length', content.length);
+        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/binary/binary.d.ts

@@ -1,9 +1,9 @@
 import { type HandlerPlugin } from 'innet';
 export interface BinaryProps {
-    ref?: string;
-    description?: string;
     accept?: string;
-    min?: number;
+    description?: string;
     max?: number;
+    min?: number;
+    ref?: string;
 }
 export declare const binary: HandlerPlugin;

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/date/date.d.ts

@@ -2,7 +2,7 @@ import { type HandlerPlugin } from 'innet';
 import { type ValuesSchemaProps } from '../../../types';
 import { type DateFormat } from '../../../utils';
 export interface DateProps extends ValuesSchemaProps<DateFormat> {
-    min?: DateFormat;
     max?: DateFormat;
+    min?: DateFormat;
 }
 export declare const date: HandlerPlugin;

package/plugins/schema/date/date.es6.js

@@ -16,7 +16,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const date = () => {
-    const _a = useProps() || {}, { min, max, default: defaultValue, example, examples, values: values$1 } = _a, props = __rest(_a, ["min", "max", "default", "example", "examples", "values"]);
+    const _a = useProps() || {}, { default: defaultValue, example, examples, max, min, values: values$1 } = _a, props = __rest(_a, ["default", "example", "examples", "max", "min", "values"]);
     const normMin = dateFormat(min);
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
@@ -25,9 +25,9 @@ const date = () => {
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat);
-    const schema = useSchemaType('string', Object.assign(Object.assign({}, props), { values: stringValues, example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
+    const schema = useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(), example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
         // @ts-expect-error: FIXME
-        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString() }));
+        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), values: stringValues }));
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));

package/plugins/schema/date/date.js

@@ -20,7 +20,7 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const date = () => {
-    const _a = jsx.useProps() || {}, { min, max, default: defaultValue, example, examples, values: values$1 } = _a, props = tslib.__rest(_a, ["min", "max", "default", "example", "examples", "values"]);
+    const _a = jsx.useProps() || {}, { default: defaultValue, example, examples, max, min, values: values$1 } = _a, props = tslib.__rest(_a, ["default", "example", "examples", "max", "min", "values"]);
     const normMin = dateFormat.dateFormat(min);
     const normMax = dateFormat.dateFormat(max);
     const normDefault = dateFormat.dateFormat(defaultValue);
@@ -29,9 +29,9 @@ const date = () => {
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat.dateFormat);
-    const schema = useSchemaType.useSchemaType('string', Object.assign(Object.assign({}, props), { values: stringValues, example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
+    const schema = useSchemaType.useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(), example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
         // @ts-expect-error: FIXME
-        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString() }));
+        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), values: stringValues }));
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo.defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));

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

@@ -1,5 +1,6 @@
 import { type HandlerPlugin } from 'innet';
 export interface FieldProps {
+    deprecated?: boolean;
     key: string;
     optional?: boolean;
 }

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

@@ -2,19 +2,17 @@ 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';
 
 const field = () => {
     const handler = useNewHandler();
-    const { key, optional } = useProps();
-    const schema = useSchemaContext();
+    const { deprecated, key, optional, } = useProps();
+    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 = {};
     }
@@ -23,6 +21,9 @@ const field = () => {
     }
     const fieldSchema = {};
     schemaContext.set(handler, fieldSchema);
+    if (deprecated) {
+        fieldSchema.deprecated = true;
+    }
     schema.properties[key] = fieldSchema;
     if (!optional) {
         if (!schema.required) {

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');
@@ -17,12 +18,9 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const field = () => {
     const handler = innet.useNewHandler();
-    const { key, optional } = jsx.useProps();
-    const schema = useSchemaContext.useSchemaContext();
+    const { deprecated, key, optional, } = jsx.useProps();
+    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 = {};
     }
@@ -31,6 +29,9 @@ const field = () => {
     }
     const fieldSchema = {};
     useSchemaContext.schemaContext.set(handler, fieldSchema);
+    if (deprecated) {
+        fieldSchema.deprecated = true;
+    }
     schema.properties[key] = fieldSchema;
     if (!optional) {
         if (!schema.required) {

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/integer/integer.d.ts

@@ -1,8 +1,8 @@
 import { type HandlerPlugin } from 'innet';
 import { type IntegerFormats, type ValuesSchemaProps } from '../../../types';
-export interface IntegerProps extends ValuesSchemaProps<number | bigint> {
+export interface IntegerProps extends ValuesSchemaProps<bigint | number> {
     format?: IntegerFormats;
-    min?: number | bigint;
-    max?: number | bigint;
+    max?: bigint | number;
+    min?: bigint | number;
 }
 export declare const integer: HandlerPlugin;

package/plugins/schema/integer/integer.es6.js

@@ -13,7 +13,7 @@ import { optional } from '../../../utils/rules/optional/optional.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const integer = () => {
-    const _a = useProps() || {}, { format = 'int32', min: min$1, max: max$1, values: values$1, example, examples, default: defaultValue } = _a, props = __rest(_a, ["format", "min", "max", "values", "example", "examples", "default"]);
+    const _a = useProps() || {}, { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1 } = _a, props = __rest(_a, ["default", "example", "examples", "format", "max", "min", "values"]);
     const schema = useSchemaType('integer', Object.assign(Object.assign({}, props), { default: defaultValue !== undefined ? Number(defaultValue) : undefined, example: example !== undefined ? Number(example) : undefined, examples: examples === null || examples === void 0 ? void 0 : examples.map(Number), values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number) }));
     // @ts-expect-error: FIXME
     schema.format = format;

package/plugins/schema/integer/integer.js

@@ -17,7 +17,7 @@ var optional = require('../../../utils/rules/optional/optional.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const integer = () => {
-    const _a = jsx.useProps() || {}, { format = 'int32', min: min$1, max: max$1, values: values$1, example, examples, default: defaultValue } = _a, props = tslib.__rest(_a, ["format", "min", "max", "values", "example", "examples", "default"]);
+    const _a = jsx.useProps() || {}, { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1 } = _a, props = tslib.__rest(_a, ["default", "example", "examples", "format", "max", "min", "values"]);
     const schema = useSchemaType.useSchemaType('integer', Object.assign(Object.assign({}, props), { default: defaultValue !== undefined ? Number(defaultValue) : undefined, example: example !== undefined ? Number(example) : undefined, examples: examples === null || examples === void 0 ? void 0 : examples.map(Number), values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number) }));
     // @ts-expect-error: FIXME
     schema.format = format;

package/plugins/schema/number/number.d.ts

@@ -1,9 +1,9 @@
 import { type HandlerPlugin } from 'innet';
 import { type ValuesSchemaProps } from '../../../types';
 export interface NumberProps extends ValuesSchemaProps<number> {
-    /** Validate the number value by minimum. */
-    min?: number;
     /** Validate the number value by maximum. */
     max?: number;
+    /** Validate the number value by minimum. */
+    min?: number;
 }
 export declare const number: HandlerPlugin;

package/plugins/schema/number/number.es6.js

@@ -14,7 +14,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const number = () => {
-    const _a = useProps() || {}, { min: min$1, max: max$1 } = _a, props = __rest(_a, ["min", "max"]);
+    const _a = useProps() || {}, { max: max$1, min: min$1 } = _a, props = __rest(_a, ["max", "min"]);
     const schema = useSchemaType('number', props);
     // @ts-expect-error: FIXME
     schema.minimum = min$1;

package/plugins/schema/number/number.js

@@ -18,7 +18,7 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const number = () => {
-    const _a = jsx.useProps() || {}, { min: min$1, max: max$1 } = _a, props = tslib.__rest(_a, ["min", "max"]);
+    const _a = jsx.useProps() || {}, { max: max$1, min: min$1 } = _a, props = tslib.__rest(_a, ["max", "min"]);
     const schema = useSchemaType.useSchemaType('number', props);
     // @ts-expect-error: FIXME
     schema.minimum = min$1;

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/schema/string/string.d.ts

@@ -1,9 +1,9 @@
 import { type HandlerPlugin } from 'innet';
 import { type ValuesSchemaProps } from '../../../types';
 export interface StringProps extends ValuesSchemaProps<string> {
-    min?: number;
     max?: number;
-    pattern?: string | RegExp;
+    min?: number;
+    pattern?: RegExp | string;
     patternId?: string;
 }
 export declare const string: HandlerPlugin;

package/plugins/schema/string/string.es6.js

@@ -3,48 +3,62 @@ import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
+import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { values } from '../../../utils/rules/values/values.es6.js';
 import { minLength } from '../../../utils/rules/minLength/minLength.es6.js';
 import { maxLength } from '../../../utils/rules/maxLength/maxLength.es6.js';
 import { pattern } from '../../../utils/rules/pattern/pattern.es6.js';
-import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
+import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 
 const string = () => {
-    const _a = useProps() || {}, { min, max, pattern: pattern$1, patternId } = _a, props = __rest(_a, ["min", "max", "pattern", "patternId"]);
+    const _a = useProps() || {}, { max, min, pattern: pattern$1, patternId } = _a, props = __rest(_a, ["max", "min", "pattern", "patternId"]);
+    const { refRules } = useApi();
     const schema = useSchemaType('string', props);
-    const rules = [];
-    if (props.default !== undefined) {
-        rules.push(defaultTo(props.default));
-    }
-    rules.push(String);
-    if (props.values) {
-        rules.push(values(props.values));
-    }
-    if (min !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.minimum = min;
-        rules.push(minLength(min));
-    }
-    if (max !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.maximum = max;
-        rules.push(maxLength(max));
-    }
-    if (pattern$1 !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.pattern = String(pattern$1);
-        rules.push(pattern(pattern$1, patternId));
-    }
-    if (props.default) {
-        useRule(pipe(...rules));
+    if (schema) {
+        const rules = [];
+        if (props.default !== undefined) {
+            rules.push(defaultTo(props.default));
+        }
+        rules.push(String);
+        if (props.values) {
+            rules.push(values(props.values));
+        }
+        if (min !== undefined) {
+            schema.minimum = min;
+            rules.push(minLength(min));
+        }
+        if (max !== undefined) {
+            schema.maximum = max;
+            rules.push(maxLength(max));
+        }
+        if (pattern$1 !== undefined) {
+            schema.pattern = String(pattern$1);
+            rules.push(pattern(pattern$1, patternId));
+        }
+        const rule = pipe(...rules);
+        if (props.ref) {
+            refRules[props.ref] = rule;
+        }
+        if (props.default) {
+            useRule(rule);
+        }
+        else {
+            const parentRule = useParentRule();
+            useRule(parentRule(rule));
+        }
     }
-    else {
-        const parentRule = useParentRule();
-        useRule(parentRule(pipe(...rules)));
+    else if (props.ref) {
+        if (props.default) {
+            useRule(refRules[props.ref]);
+        }
+        else {
+            const parentRule = useParentRule();
+            useRule(parentRule(refRules[props.ref]));
+        }
     }
 };