@innet/server 2.0.0-beta.2 → 2.0.0-beta.21

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);
 
@@ -21,7 +20,7 @@ function file() {
     const { children, ...props } = jsx.useProps();
     const res = useResponse.useResponse();
     if (!res) {
-        useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { path } = props;
     if (fs__default["default"].existsSync(path)) {
@@ -40,7 +39,7 @@ function file() {
             return;
         }
     }
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 }
 
 exports.file = file;

package/plugins/request/header/header.es6.js

@@ -6,7 +6,7 @@ import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 const header = () => {
     const res = useResponse();
     if (!res) {
-        useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { key, value, } = useProps();
     res.setHeader(key, value);

package/plugins/request/header/header.js

@@ -10,7 +10,7 @@ var useThrow = require('../../../hooks/useThrow/useThrow.js');
 const header = () => {
     const res = useResponse.useResponse();
     if (!res) {
-        useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { key, value, } = jsx.useProps();
     res.setHeader(key, value);

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

@@ -28,13 +28,15 @@ const success = () => {
             ? 'text/plain'
             : 'application/json');
         const content = contentType === 'application/json' ? JSONString(child) : String(child);
-        res.setHeader('Content-Type', contentType);
-        res.setHeader('Content-Length', content.length);
+        res.setHeader('Content-Type', contentType === 'application/json'
+            ? 'application/json; charset=utf-8'
+            : contentType);
+        res.setHeader('Content-Length', Buffer.byteLength(content));
         if (contentType === 'application/json') {
-            res.write(JSONString(child));
+            res.write(content, 'utf-8');
         }
         else {
-            res.write(String(child));
+            res.write(content);
         }
     }
     res.end();

package/plugins/request/success/success.js

@@ -32,13 +32,15 @@ const success = () => {
             ? '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);
+        res.setHeader('Content-Type', contentType === 'application/json'
+            ? 'application/json; charset=utf-8'
+            : contentType);
+        res.setHeader('Content-Length', Buffer.byteLength(content));
         if (contentType === 'application/json') {
-            res.write(JSONString.JSONString(child));
+            res.write(content, 'utf-8');
         }
         else {
-            res.write(String(child));
+            res.write(content);
         }
     }
     res.end();

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

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

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

@@ -1,6 +1,9 @@
 import { type HandlerPlugin } from 'innet';
-import { type BaseSchemaProps } from '../../../types';
-export interface ArrayProps extends BaseSchemaProps<any[]> {
+import { type SchemaProps } from '../../../types';
+export interface ArrayProps extends SchemaProps<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/binary/binary.d.ts

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

package/plugins/schema/boolean/boolean.d.ts

@@ -1,5 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type BaseSchemaProps } from '../../../types';
-export interface BooleanProps extends BaseSchemaProps<boolean> {
+import { type SchemaProps } from '../../../types';
+export interface BooleanProps extends SchemaProps<boolean> {
+    const?: boolean;
 }
 export declare const boolean: HandlerPlugin;

package/plugins/schema/date/date.d.ts

@@ -1,7 +1,8 @@
 import { type HandlerPlugin } from 'innet';
-import { type ValuesSchemaProps } from '../../../types';
+import { type SchemaProps } from '../../../types';
 import { type DateFormat } from '../../../utils';
-export interface DateProps extends ValuesSchemaProps<DateFormat> {
+export interface DateProps extends Omit<SchemaProps<DateFormat>, 'value'> {
+    const?: string;
     max?: DateFormat;
     min?: DateFormat;
 }

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

@@ -4,10 +4,10 @@ import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
 import '../../../utils/dateFormat/index.es6.js';
 import { dateFormat } from '../../../utils/dateFormat/dateFormat.es6.js';
+import { getArrayValues, values } from '../../../utils/rules/values/values.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { dateTo } from '../../../utils/rules/dateTo/dateTo.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
 import { minDate } from '../../../utils/rules/minDate/minDate.es6.js';
 import { maxDate } from '../../../utils/rules/maxDate/maxDate.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
@@ -20,7 +20,7 @@ const date = () => {
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
     const normExample = dateFormat(example);
-    const normValues = values$1 === null || values$1 === void 0 ? void 0 : values$1.map(dateFormat);
+    const normValues = values$1 && getArrayValues(values$1, dateFormat);
     // @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);

package/plugins/schema/date/date.js

@@ -8,10 +8,10 @@ require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
 require('../../../utils/dateFormat/index.js');
 var dateFormat = require('../../../utils/dateFormat/dateFormat.js');
+var values = require('../../../utils/rules/values/values.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var dateTo = require('../../../utils/rules/dateTo/dateTo.js');
-var values = require('../../../utils/rules/values/values.js');
 var minDate = require('../../../utils/rules/minDate/minDate.js');
 var maxDate = require('../../../utils/rules/maxDate/maxDate.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
@@ -24,7 +24,7 @@ const date = () => {
     const normMax = dateFormat.dateFormat(max);
     const normDefault = dateFormat.dateFormat(defaultValue);
     const normExample = dateFormat.dateFormat(example);
-    const normValues = values$1 === null || values$1 === void 0 ? void 0 : values$1.map(dateFormat.dateFormat);
+    const normValues = values$1 && values.getArrayValues(values$1, dateFormat.dateFormat);
     // @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);

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

@@ -2,7 +2,11 @@ import { type HandlerPlugin } from 'innet';
 export interface FieldProps {
     children?: any;
     deprecated?: boolean;
+    description?: string;
     key: string;
     optional?: boolean;
+    readOnly?: boolean;
+    title?: string;
+    writeOnly?: boolean;
 }
 export declare const field: HandlerPlugin;

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

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

@@ -6,20 +6,17 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+var getSafeSchema = require('../../../utils/getSafeSchema/getSafeSchema.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');
 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 schema = useObjectSchemaContext.useObjectSchemaContext();
+    const { children, deprecated, description, key, optional, readOnly, title, writeOnly, } = jsx.useProps();
+    const schema = getSafeSchema.getSafeSchema(useObjectSchemaContext.useObjectSchemaContext());
     if (!schema.properties) {
         schema.properties = {};
     }
@@ -31,6 +28,18 @@ const field = () => {
     if (deprecated) {
         fieldSchema.deprecated = true;
     }
+    if (title) {
+        fieldSchema.title = title;
+    }
+    if (description) {
+        fieldSchema.description = description;
+    }
+    if (readOnly) {
+        fieldSchema.readOnly = true;
+    }
+    if (writeOnly) {
+        fieldSchema.writeOnly = true;
+    }
     schema.properties[key] = fieldSchema;
     if (!optional) {
         if (!schema.required) {
@@ -48,7 +57,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';

package/plugins/schema/index.es6.js

@@ -1,13 +1,13 @@
-import './object/index.es6.js';
-import './field/index.es6.js';
-import './number/index.es6.js';
-import './integer/index.es6.js';
-import './string/index.es6.js';
+import './any/index.es6.js';
 import './array/index.es6.js';
+import './binary/index.es6.js';
 import './boolean/index.es6.js';
-import './null/index.es6.js';
 import './date/index.es6.js';
+import './field/index.es6.js';
+import './integer/index.es6.js';
+import './null/index.es6.js';
+import './number/index.es6.js';
+import './object/index.es6.js';
+import './string/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

@@ -1,16 +1,16 @@
 'use strict';
 
-require('./object/index.js');
-require('./field/index.js');
-require('./number/index.js');
-require('./integer/index.js');
-require('./string/index.js');
+require('./any/index.js');
 require('./array/index.js');
+require('./binary/index.js');
 require('./boolean/index.js');
-require('./null/index.js');
 require('./date/index.js');
+require('./field/index.js');
+require('./integer/index.js');
+require('./null/index.js');
+require('./number/index.js');
+require('./object/index.js');
+require('./string/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,45 @@
 import { type HandlerPlugin } from 'innet';
-import { type IntegerFormats, type ValuesSchemaProps } from '../../../types';
-export interface IntegerProps extends ValuesSchemaProps<bigint | number> {
+import { type IntegerFormats, type SchemaProps } from '../../../types';
+export interface IntegerProps extends SchemaProps<bigint | number> {
+    /**
+     * The `exclusiveMaximum` keyword is used to restrict the value to be less than the specified number.
+     * @example For example, the following value is valid:
+     * ```tsx
+     * <integer exclusiveMaximum={10} />
+     * ```
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#numbers
+     * */
+    exclusiveMaximum?: bigint | boolean | number;
+    /**
+     * The `exclusiveMinimum` keyword is used to restrict the value to be greater than the specified number.
+     * @example For example, the following value is valid:
+     * ```tsx
+     * <integer exclusiveMinimum={10} />
+     * ```
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#numbers
+     * */
+    exclusiveMinimum?: bigint | boolean | number;
+    /**
+     * An optional format modifier serves as a hint at the contents and format of the string.
+     * @example For example, the following value is valid:
+     * ```tsx
+     * <integer format='int64' />
+     * ```
+     * @see https://swagger.io/docs/specification/data-models/data-types/#numbers
+     * */
     format?: IntegerFormats;
+    /** Validate the integer number value by maximum. */
     max?: bigint | number;
+    /** Validate the integer number value by minimum. */
     min?: bigint | number;
+    /**
+     * The `multipleOf` keyword is used to restrict the value to be a multiple of the specified number.
+     * @example For example, the following value is valid:
+     * ```tsx
+     * <number multipleOf={2} />
+     * ```
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#numbers
+     * */
+    multipleOf?: bigint | number;
 }
 export declare const integer: HandlerPlugin;

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

@@ -2,9 +2,9 @@ import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
+import { getArrayValues, values } from '../../../utils/rules/values/values.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { int } from '../../../utils/rules/int/int.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
 import { min } from '../../../utils/rules/min/min.es6.js';
 import { max } from '../../../utils/rules/max/max.es6.js';
 import { useRule } from '../../../hooks/useRule/useRule.es6.js';
@@ -12,27 +12,42 @@ import { optional } from '../../../utils/rules/optional/optional.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const integer = () => {
-    const { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1, ...props } = useProps() || {};
+    const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = useProps() || {};
     const schema = useSchemaType('integer', {
         ...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),
+        value: props.value !== undefined ? Number(props.value) : undefined,
+        values: values$1 && getArrayValues(values$1, Number),
     });
-    // @ts-expect-error: FIXME
-    schema.format = format;
-    // @ts-expect-error: FIXME
-    schema.minimum = min$1 !== undefined ? Number(min$1) : undefined;
-    // @ts-expect-error: FIXME
-    schema.maximum = max$1 !== undefined ? Number(max$1) : undefined;
+    if (schema) {
+        if (format) {
+            schema.format = format;
+        }
+        if (min$1 !== undefined) {
+            schema.minimum = Number(min$1);
+        }
+        if (max$1 !== undefined) {
+            schema.maximum = Number(max$1);
+        }
+        if (exclusiveMinimum) {
+            schema.exclusiveMinimum = typeof exclusiveMinimum === 'boolean' ? exclusiveMinimum : Number(exclusiveMinimum);
+        }
+        if (exclusiveMaximum) {
+            schema.exclusiveMaximum = typeof exclusiveMaximum === 'boolean' ? exclusiveMaximum : Number(exclusiveMaximum);
+        }
+        if (multipleOf !== undefined) {
+            schema.multipleOf = Number(multipleOf);
+        }
+    }
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo(defaultValue));
     }
     rules.push(int(format));
     if (values$1) {
-        rules.push(values(values$1.map(value => int(format)(value))));
+        rules.push(values(getArrayValues(values$1, int(format))));
     }
     if (min$1 !== undefined) {
         rules.push(min(min$1));