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

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

@@ -18,11 +18,20 @@ 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 = [];

package/plugins/schema/array/array.js

@@ -22,11 +22,20 @@ 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 = [];

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

@@ -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

@@ -14,7 +14,7 @@ var required = require('../../../utils/rules/required/required.js');
 
 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 = {};
@@ -27,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) {

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> {
+    /**
+     * 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

@@ -12,7 +12,7 @@ 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,
@@ -20,12 +20,26 @@ const integer = () => {
         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;
-    // @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));

package/plugins/schema/integer/integer.js

@@ -16,7 +16,7 @@ var optional = require('../../../utils/rules/optional/optional.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const integer = () => {
-    const { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1, ...props } = jsx.useProps() || {};
+    const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = jsx.useProps() || {};
     const schema = useSchemaType.useSchemaType('integer', {
         ...props,
         default: defaultValue !== undefined ? Number(defaultValue) : undefined,
@@ -24,12 +24,26 @@ const integer = () => {
         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;
-    // @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.defaultTo(defaultValue));

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

@@ -1,9 +1,41 @@
 import { type HandlerPlugin } from 'innet';
 import { type ValuesSchemaProps } from '../../../types';
 export interface NumberProps extends ValuesSchemaProps<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
+     * <number exclusiveMaximum={10} />
+     * ```
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#numbers
+     * */
+    exclusiveMaximum?: boolean;
+    /**
+     * 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
+     * <number exclusiveMinimum={10} />
+     * ```
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#numbers
+     * */
+    exclusiveMinimum?: boolean;
+    /**
+     * An optional format modifier serves as a hint at the contents and format of the string.
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#numbers
+     * */
+    format?: 'double' | 'float' | (string & {});
     /** Validate the number value by maximum. */
     max?: number;
     /** Validate the number value by minimum. */
     min?: 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?: number;
 }
 export declare const number: HandlerPlugin;

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

@@ -13,12 +13,28 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const number = () => {
-    const { max: max$1, min: min$1, ...props } = useProps() || {};
+    const { exclusiveMaximum, exclusiveMinimum, format, max: max$1, min: min$1, multipleOf, ...props } = useProps() || {};
     const schema = useSchemaType('number', props);
-    // @ts-expect-error: FIXME
-    schema.minimum = min$1;
-    // @ts-expect-error: FIXME
-    schema.maximum = max$1;
+    if (schema) {
+        if (format !== undefined) {
+            schema.format = format;
+        }
+        if (min$1 !== undefined) {
+            schema.minimum = min$1;
+        }
+        if (max$1 !== undefined) {
+            schema.maximum = 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 (props.default !== undefined) {
         rules.push(defaultTo(props.default));

package/plugins/schema/number/number.js

@@ -17,12 +17,28 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const number = () => {
-    const { max: max$1, min: min$1, ...props } = jsx.useProps() || {};
+    const { exclusiveMaximum, exclusiveMinimum, format, max: max$1, min: min$1, multipleOf, ...props } = jsx.useProps() || {};
     const schema = useSchemaType.useSchemaType('number', props);
-    // @ts-expect-error: FIXME
-    schema.minimum = min$1;
-    // @ts-expect-error: FIXME
-    schema.maximum = max$1;
+    if (schema) {
+        if (format !== undefined) {
+            schema.format = format;
+        }
+        if (min$1 !== undefined) {
+            schema.minimum = min$1;
+        }
+        if (max$1 !== undefined) {
+            schema.maximum = 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 (props.default !== undefined) {
         rules.push(defaultTo.defaultTo(props.default));

package/plugins/schema/string/string.d.ts

@@ -1,9 +1,36 @@
 import { type HandlerPlugin } from 'innet';
 import { type ValuesSchemaProps } from '../../../types';
 export interface StringProps extends ValuesSchemaProps<string> {
+    /**
+     * An optional format modifier serves as a hint at the contents and format of the string.
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#strings
+     * */
+    format?: 'binary' | 'byte' | 'date' | 'date-time' | 'email' | 'hostname' | 'ipv4' | 'ipv6' | 'password' | 'uri' | 'uuid' | (string & {});
+    /**
+     * String length can be restricted using `min` and `max`.
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#strings
+     * */
     max?: number;
+    /**
+     * String length can be restricted using `min` and `max`.
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#strings
+     * */
     min?: number;
+    /**
+     * The pattern keyword lets you define a regular expression template for the string value.
+     * Only the values that match this template will be accepted.
+     * The regular expression syntax used is from JavaScript (more specifically, ECMA 262).
+     * Regular expressions are case-sensitive, that is, [a-z] and [A-Z] are different expressions.
+     * @example For example, the following pattern matches a Social Security Number (SSN) in the 123-45-6789 format:
+     * ```tsx
+     * <string pattern='^\d{3}-\d{2}-\d{4}$' />
+     * ```
+     * @see https://swagger.io/docs/specification/v3_0/data-models/data-types/#strings
+     * */
     pattern?: RegExp | string;
+    /**
+     * The `patternId` keyword is used to reference a pattern from the OpenAPI specification.
+     * */
     patternId?: string;
 }
 export declare const string: HandlerPlugin;

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

@@ -14,11 +14,14 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 
 const string = () => {
-    const { max, min, pattern: pattern$1, patternId, ...props } = useProps() || {};
+    const { format, max, min, pattern: pattern$1, patternId, ...props } = useProps() || {};
     const { refRules } = useApi();
     const schema = useSchemaType('string', props);
     if (schema) {
         const rules = [];
+        if (format !== undefined) {
+            schema.format = format;
+        }
         if (props.default !== undefined) {
             rules.push(defaultTo(props.default));
         }
@@ -26,12 +29,15 @@ const string = () => {
         if (props.values) {
             rules.push(values(props.values));
         }
+        if (format !== undefined) {
+            schema.format = format;
+        }
         if (min !== undefined) {
-            schema.minimum = min;
+            schema.minLength = min;
             rules.push(minLength(min));
         }
         if (max !== undefined) {
-            schema.maximum = max;
+            schema.maxLength = max;
             rules.push(maxLength(max));
         }
         if (pattern$1 !== undefined) {

package/plugins/schema/string/string.js

@@ -18,11 +18,14 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 
 const string = () => {
-    const { max, min, pattern: pattern$1, patternId, ...props } = jsx.useProps() || {};
+    const { format, max, min, pattern: pattern$1, patternId, ...props } = jsx.useProps() || {};
     const { refRules } = useApi.useApi();
     const schema = useSchemaType.useSchemaType('string', props);
     if (schema) {
         const rules = [];
+        if (format !== undefined) {
+            schema.format = format;
+        }
         if (props.default !== undefined) {
             rules.push(defaultTo.defaultTo(props.default));
         }
@@ -30,12 +33,15 @@ const string = () => {
         if (props.values) {
             rules.push(values.values(props.values));
         }
+        if (format !== undefined) {
+            schema.format = format;
+        }
         if (min !== undefined) {
-            schema.minimum = min;
+            schema.minLength = min;
             rules.push(minLength.minLength(min));
         }
         if (max !== undefined) {
-            schema.maximum = max;
+            schema.maxLength = max;
             rules.push(maxLength.maxLength(max));
         }
         if (pattern$1 !== undefined) {

package/plugins/utils/index.d.ts

@@ -1,6 +1,6 @@
-export * from './swagger';
+export * from './blacklist';
 export * from './dts';
 export * from './env';
 export * from './protection';
-export * from './blacklist';
+export * from './swagger';
 export * from './whitelist';

package/plugins/utils/index.es6.js

@@ -1,6 +1,6 @@
-import './swagger/index.es6.js';
+import './blacklist/index.es6.js';
 import './dts/index.es6.js';
 import './env/index.es6.js';
 import './protection/index.es6.js';
-import './blacklist/index.es6.js';
+import './swagger/index.es6.js';
 import './whitelist/index.es6.js';

package/plugins/utils/index.js

@@ -1,9 +1,9 @@
 'use strict';
 
-require('./swagger/index.js');
+require('./blacklist/index.js');
 require('./dts/index.js');
 require('./env/index.js');
 require('./protection/index.js');
-require('./blacklist/index.js');
+require('./swagger/index.js');
 require('./whitelist/index.js');
 

package/utils/index.d.ts

@@ -1,13 +1,13 @@
-export * from './parseSearch';
-export * from './stringifySearch';
-export * from './httpOnStart';
+export * from './FileData';
+export * from './JSONString';
+export * from './action';
+export * from './decorators';
+export * from './generateTypes';
 export * from './getEndpoint';
 export * from './getOrAdd';
-export * from './decorators';
-export * from './action';
+export * from './httpOnStart';
 export * from './parseBody';
 export * from './parseFormBody';
+export * from './parseSearch';
 export * from './rules';
-export * from './JSONString';
-export * from './FileData';
-export * from './generateTypes';
+export * from './stringifySearch';

package/utils/index.es6.js

@@ -1,13 +1,13 @@
-import './parseSearch/index.es6.js';
-import './stringifySearch/index.es6.js';
-import './httpOnStart/index.es6.js';
+import './FileData/index.es6.js';
+import './JSONString/index.es6.js';
+import './action/index.es6.js';
+import './decorators/index.es6.js';
+import './generateTypes/index.es6.js';
 import './getEndpoint/index.es6.js';
 import './getOrAdd/index.es6.js';
-import './decorators/index.es6.js';
-import './action/index.es6.js';
+import './httpOnStart/index.es6.js';
 import './parseBody/index.es6.js';
 import './parseFormBody/index.es6.js';
+import './parseSearch/index.es6.js';
 import './rules/index.es6.js';
-import './JSONString/index.es6.js';
-import './FileData/index.es6.js';
-import './generateTypes/index.es6.js';
+import './stringifySearch/index.es6.js';

package/utils/index.js

@@ -1,16 +1,16 @@
 'use strict';
 
-require('./parseSearch/index.js');
-require('./stringifySearch/index.js');
-require('./httpOnStart/index.js');
+require('./FileData/index.js');
+require('./JSONString/index.js');
+require('./action/index.js');
+require('./decorators/index.js');
+require('./generateTypes/index.js');
 require('./getEndpoint/index.js');
 require('./getOrAdd/index.js');
-require('./decorators/index.js');
-require('./action/index.js');
+require('./httpOnStart/index.js');
 require('./parseBody/index.js');
 require('./parseFormBody/index.js');
+require('./parseSearch/index.js');
 require('./rules/index.js');
-require('./JSONString/index.js');
-require('./FileData/index.js');
-require('./generateTypes/index.js');
+require('./stringifySearch/index.js');