@innet/server 2.0.0-beta.20 → 2.0.0-beta.22

package/hooks/useSchemaType/useSchemaType.d.ts

@@ -1,5 +1,5 @@
-import { type ObjectType, type SchemaObject, type ValuesSchemaProps } from '../../types';
+import { type ObjectType, type SchemaObject, type SchemaProps } from '../../types';
 export type SchemaType = 'any' | ObjectType;
 type TypeMap<T extends SchemaType> = T extends 'integer' | 'number' ? number : T extends 'string' ? string : T extends 'object' ? object : T extends 'array' ? any[] : T extends 'boolean' ? boolean : T extends 'null' ? null : T extends 'any' ? any : unknown;
-export declare function useSchemaType<T extends SchemaType>(type: T, { example, examples, nullable, ref, value, values, ...options }?: ValuesSchemaProps<TypeMap<T>> | undefined): SchemaObject | undefined;
+export declare function useSchemaType<T extends SchemaType>(type: T, { example, examples, nullable, ref, value, values, ...options }?: SchemaProps<TypeMap<T>> | undefined): SchemaObject | undefined;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.22",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

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,6 @@
 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;

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

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

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

@@ -15,7 +15,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const date = () => {
-    const { default: defaultValue, example, examples, max, min, values: values$1, ...props } = useProps() || {};
+    const { default: defaultValue, example, examples, max, min, value, values: values$1, ...props } = useProps() || {};
     const normMin = dateFormat(min);
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
@@ -28,6 +28,7 @@ const date = () => {
         ...props,
         default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(),
         example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(),
+        value: value instanceof Date ? value.toISOString() : typeof value === 'number' ? new Date(value).toISOString() : value,
         // @ts-expect-error: FIXME
         examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()),
         values: stringValues,

package/plugins/schema/date/date.js

@@ -19,7 +19,7 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const date = () => {
-    const { default: defaultValue, example, examples, max, min, values: values$1, ...props } = jsx.useProps() || {};
+    const { default: defaultValue, example, examples, max, min, value, values: values$1, ...props } = jsx.useProps() || {};
     const normMin = dateFormat.dateFormat(min);
     const normMax = dateFormat.dateFormat(max);
     const normDefault = dateFormat.dateFormat(defaultValue);
@@ -32,6 +32,7 @@ const date = () => {
         ...props,
         default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(),
         example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(),
+        value: value instanceof Date ? value.toISOString() : typeof value === 'number' ? new Date(value).toISOString() : value,
         // @ts-expect-error: FIXME
         examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()),
         values: stringValues,

package/plugins/schema/integer/integer.d.ts

@@ -1,6 +1,6 @@
 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:

package/plugins/schema/null/null.d.ts

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

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

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type ValuesSchemaProps } from '../../../types';
-export interface NumberProps extends ValuesSchemaProps<number> {
+import { type SchemaProps } from '../../../types';
+export interface NumberProps extends SchemaProps<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:

package/plugins/schema/object/object.d.ts

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

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

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type ValuesSchemaProps } from '../../../types';
-export interface StringProps extends ValuesSchemaProps<string> {
+import { type SchemaProps } from '../../../types';
+export interface StringProps extends SchemaProps<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

package/plugins/schema/tuple/tuple.d.ts

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type BaseSchemaProps } from '../../../types';
-export interface TupleProps extends BaseSchemaProps<any[]> {
+import { type SchemaProps } from '../../../types';
+export interface TupleProps extends SchemaProps<any[]> {
     children?: any;
 }
 export declare const tuple: HandlerPlugin;

package/plugins/schema/uuid/uuid.d.ts

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type ValuesSchemaProps } from '../../../types';
-export interface UuidProps extends ValuesSchemaProps<string> {
+import { type SchemaProps } from '../../../types';
+export interface UuidProps extends SchemaProps<string> {
     default?: 'new' | string;
 }
 export declare const uuid: HandlerPlugin;

package/types.d.ts

@@ -58,7 +58,8 @@ export interface ServerStartParams {
     https: boolean;
     port: number;
 }
-export interface BaseSchemaProps<T> {
+export type SchemaValues<T> = (T extends (number | string) ? Record<T, string> : never) | T[];
+export interface SchemaProps<T> {
     default?: T;
     deprecated?: boolean;
     description?: string;
@@ -68,12 +69,9 @@ export interface BaseSchemaProps<T> {
     readOnly?: boolean;
     ref?: string;
     title?: string;
-    writeOnly?: boolean;
-}
-export type SchemaValues<T> = (T extends (number | string) ? Record<T, string> : never) | T[];
-export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {
     value?: T;
     values?: SchemaValues<T>;
+    writeOnly?: boolean;
 }
 export type TResponse = Record<ResponseStatus, unknown>;
 export interface TEndpoint {