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

package/hooks/useSchemaType/useSchemaType.d.ts

@@ -1,5 +1,4 @@
 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 }?: SchemaProps<TypeMap<T>> | undefined): SchemaObject | undefined;
-export {};
+export type SchemaTypeMap<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 }?: SchemaProps<SchemaTypeMap<T>> | undefined): SchemaObject | undefined;

package/index.es6.js

@@ -1,7 +1,7 @@
 import './handler/index.es6.js';
 import './hooks/index.es6.js';
 import './plugins/index.es6.js';
-import './types.es6.js';
+import './types/index.es6.js';
 import './utils/index.es6.js';
 export { JSXPlugins, arrayPlugins, handler as default, fnPlugins, handler, objectPlugins, promisePlugins } from './handler/handler.es6.js';
 export { actionContext, useAction } from './hooks/useAction/useAction.es6.js';

package/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 require('./handler/index.js');
 require('./hooks/index.js');
 require('./plugins/index.js');
-require('./types.js');
+require('./types/index.js');
 require('./utils/index.js');
 var handler = require('./handler/handler.js');
 var useAction = require('./hooks/useAction/useAction.js');

package/package.json

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

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

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

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

@@ -1,9 +1,9 @@
 import { type HandlerPlugin } from 'innet';
 import { type SchemaProps } from '../../../types';
-export interface ArrayProps extends SchemaProps<any[]> {
-    children?: any;
+export type ArrayProps = SchemaProps<any[]> & {
+    children?: JSX.Element;
     maxItems?: number;
     minItems?: number;
     uniqueItems?: boolean;
-}
+};
 export declare const array: HandlerPlugin;

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

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

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

@@ -1,8 +1,8 @@
 import { type HandlerPlugin } from 'innet';
 import { type SchemaProps } from '../../../types';
-import { type DateFormat } from '../../../utils';
-export interface DateProps extends SchemaProps<DateFormat> {
+import { type DateFormat, type DefaultDateFormat } from '../../../utils';
+export type DateProps = SchemaProps<DateFormat, DefaultDateFormat> & {
     max?: DateFormat;
     min?: DateFormat;
-}
+};
 export declare const date: HandlerPlugin;

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

@@ -20,11 +20,11 @@ const date = () => {
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
     const normExample = dateFormat(example);
-    const normValues = values$1 && getArrayValues(values$1, dateFormat);
+    const normValues = values$1 && getArrayValues(values$1).map(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);
-    const schema = useSchemaType('string', {
+    const params = {
         ...props,
         default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(),
         example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(),
@@ -32,7 +32,8 @@ const date = () => {
         // @ts-expect-error: FIXME
         examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()),
         values: stringValues,
-    });
+    };
+    const schema = useSchemaType('string', params);
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));

package/plugins/schema/date/date.js

@@ -24,11 +24,11 @@ const date = () => {
     const normMax = dateFormat.dateFormat(max);
     const normDefault = dateFormat.dateFormat(defaultValue);
     const normExample = dateFormat.dateFormat(example);
-    const normValues = values$1 && values.getArrayValues(values$1, dateFormat.dateFormat);
+    const normValues = values$1 && values.getArrayValues(values$1).map(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);
-    const schema = useSchemaType.useSchemaType('string', {
+    const params = {
         ...props,
         default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(),
         example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(),
@@ -36,7 +36,8 @@ const date = () => {
         // @ts-expect-error: FIXME
         examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()),
         values: stringValues,
-    });
+    };
+    const schema = useSchemaType.useSchemaType('string', params);
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo.defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));

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

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
 import { type IntegerFormats, type SchemaProps } from '../../../types';
-export interface IntegerProps extends SchemaProps<bigint | number> {
+export type IntegerProps = 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:
@@ -41,5 +41,5 @@ export interface IntegerProps extends SchemaProps<bigint | number> {
      * @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

@@ -19,7 +19,7 @@ const integer = () => {
         example: example !== undefined ? Number(example) : undefined,
         examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
         value: props.value !== undefined ? Number(props.value) : undefined,
-        values: values$1 && getArrayValues(values$1, Number),
+        values: values$1 && getArrayValues(values$1).map(Number),
     });
     if (schema) {
         if (format) {
@@ -47,7 +47,7 @@ const integer = () => {
     }
     rules.push(int(format));
     if (values$1) {
-        rules.push(values(getArrayValues(values$1, int(format))));
+        rules.push(values(getArrayValues(values$1).filter((v) => v !== null).map(v => int(format)(v))));
     }
     if (min$1 !== undefined) {
         rules.push(min(min$1));

package/plugins/schema/integer/integer.js

@@ -23,7 +23,7 @@ const integer = () => {
         example: example !== undefined ? Number(example) : undefined,
         examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
         value: props.value !== undefined ? Number(props.value) : undefined,
-        values: values$1 && values.getArrayValues(values$1, Number),
+        values: values$1 && values.getArrayValues(values$1).map(Number),
     });
     if (schema) {
         if (format) {
@@ -51,7 +51,7 @@ const integer = () => {
     }
     rules.push(int.int(format));
     if (values$1) {
-        rules.push(values.values(values.getArrayValues(values$1, int.int(format))));
+        rules.push(values.values(values.getArrayValues(values$1).filter((v) => v !== null).map(v => int.int(format)(v))));
     }
     if (min$1 !== undefined) {
         rules.push(min.min(min$1));

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

@@ -1,5 +1,4 @@
 import { type HandlerPlugin } from 'innet';
 import { type SchemaProps } from '../../../types';
-export interface NullProps extends SchemaProps<null> {
-}
+export type NullProps = 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 SchemaProps } from '../../../types';
-export interface NumberProps extends SchemaProps<number> {
+export type NumberProps = 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:
@@ -37,5 +37,5 @@ export interface NumberProps extends SchemaProps<number> {
      * @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

@@ -41,7 +41,7 @@ const number = () => {
     }
     rules.push(num);
     if (props.values) {
-        rules.push(values(getArrayValues(props.values, Number)));
+        rules.push(values(getArrayValues(props.values).map(Number)));
     }
     if (min$1 !== undefined) {
         rules.push(min(min$1));

package/plugins/schema/number/number.js

@@ -45,7 +45,7 @@ const number = () => {
     }
     rules.push(num.num);
     if (props.values) {
-        rules.push(values.values(values.getArrayValues(props.values, Number)));
+        rules.push(values.values(values.getArrayValues(props.values).map(Number)));
     }
     if (min$1 !== undefined) {
         rules.push(min.min(min$1));

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

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

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

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
 import { type SchemaProps } from '../../../types';
-export interface StringProps extends SchemaProps<string> {
+export type StringProps = 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
@@ -32,5 +32,5 @@ export interface StringProps extends SchemaProps<string> {
      * The `patternId` keyword is used to reference a pattern from the OpenAPI specification.
      * */
     patternId?: string;
-}
+};
 export declare const string: HandlerPlugin;

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

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

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

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

package/plugins/schema/uuid/uuid.es6.js

@@ -12,10 +12,13 @@ import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const uuid = () => {
     const { default: defaultValue, ...props } = useProps();
-    const schema = useSchemaType('string', {
+    const params = {
         ...props,
-        default: defaultValue === 'new' ? undefined : defaultValue,
-    });
+    };
+    if (defaultValue !== 'new') {
+        params.default = defaultValue;
+    }
+    const schema = useSchemaType('string', params);
     // @ts-expect-error: FIXME
     schema.format = 'uuid';
     if (defaultValue === 'new') {

package/plugins/schema/uuid/uuid.js

@@ -16,10 +16,13 @@ var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const uuid = () => {
     const { default: defaultValue, ...props } = jsx.useProps();
-    const schema = useSchemaType.useSchemaType('string', {
+    const params = {
         ...props,
-        default: defaultValue === 'new' ? undefined : defaultValue,
-    });
+    };
+    if (defaultValue !== 'new') {
+        params.default = defaultValue;
+    }
+    const schema = useSchemaType.useSchemaType('string', params);
     // @ts-expect-error: FIXME
     schema.format = 'uuid';
     if (defaultValue === 'new') {

package/{types.d.ts → types/appTypes.d.ts}

@@ -1,8 +1,8 @@
 import type { OpenAPIV3_1 as API } from 'openapi-types';
-import type { ApiErrorValue } from './constants';
-import { type ServerPlugin } from './hooks';
-import { type ResponseStatus } from './plugins';
-import { type Rule, type RulesErrors } from './utils/rules';
+import type { ApiErrorValue } from '../constants';
+import { type ServerPlugin } from '../hooks';
+import { type ResponseStatus } from '../plugins';
+import { type Rule, type RulesErrors } from '../utils/rules';
 export type TagObject = API.TagObject;
 export type Document = API.Document;
 export type ServerObject = API.ServerObject;
@@ -59,13 +59,13 @@ export interface ServerStartParams {
     port: number;
 }
 export type SchemaValues<T> = (T extends (number | string) ? Record<T, string> : never) | T[];
-export interface SchemaProps<T> {
-    default?: T;
+export interface BaseSchemaProps<T, D = T> {
+    default?: D;
     deprecated?: boolean;
     description?: string;
     example?: T;
     examples?: T[];
-    nullable?: boolean;
+    nullable?: false;
     readOnly?: boolean;
     ref?: string;
     title?: string;
@@ -73,6 +73,10 @@ export interface SchemaProps<T> {
     values?: SchemaValues<T>;
     writeOnly?: boolean;
 }
+export interface NullableSchemaProps<T, D = T> extends Omit<BaseSchemaProps<T | null, D | null>, 'nullable'> {
+    nullable: true;
+}
+export type SchemaProps<T, D = T> = BaseSchemaProps<T, D> | NullableSchemaProps<T, D>;
 export type TResponse = Record<ResponseStatus, unknown>;
 export interface TEndpoint {
     body?: unknown;

package/types/index.d.ts

@@ -0,0 +1,2 @@
+export * from './appTypes';
+export * from './isoDate';

package/types/index.es6.js

@@ -0,0 +1,2 @@
+import './appTypes.es6.js';
+import './isoDate.es6.js';

package/types/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+require('./appTypes.js');
+require('./isoDate.js');
+

package/types/isoDate.d.ts

@@ -0,0 +1 @@
+export type ISODate = `${number}-${number}-${number}` | `${number}-${number}-${number}T${number}:${number}:${number}${'+' | '-'}${number}:${number}` | `${number}-${number}-${number}T${number}:${number}:${number}` | `${number}-${number}-${number}T${number}:${number}:${number}Z`;

package/types/isoDate.es6.js

@@ -0,0 +1 @@
+

package/types/isoDate.js

@@ -0,0 +1,2 @@
+'use strict';
+

package/utils/dateFormat/dateFormat.d.ts

@@ -1,2 +1,2 @@
 export type DateFormat = 'now' | Date | number | string;
-export declare function dateFormat(date?: DateFormat): Date | undefined;
+export declare function dateFormat(date?: DateFormat | null): Date | undefined;

package/utils/dateFormat/dateFormat.es6.js

@@ -1,5 +1,5 @@
 function dateFormat(date) {
-    if (date === undefined)
+    if (date === undefined || date === null)
         return;
     if (date === 'now')
         return new Date();

package/utils/dateFormat/dateFormat.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function dateFormat(date) {
-    if (date === undefined)
+    if (date === undefined || date === null)
         return;
     if (date === 'now')
         return new Date();

package/utils/rules/dateTo/dateTo.d.ts

@@ -1,2 +1,4 @@
-export type DateFormat = 'now' | Date | number | string;
+import { type ISODate } from '../../../types';
+export type DateFormat = Date | ISODate | number;
+export type DefaultDateFormat = 'now' | DateFormat;
 export declare function dateTo(value: any, data?: object): Date;

package/utils/rules/values/values.d.ts

@@ -1,3 +1,3 @@
-import { type SchemaValues } from '../../../types';
-export declare function getArrayValues<T, F extends (value: T | string) => any = () => T>(values: SchemaValues<T>, format?: F): ReturnType<F>[];
+import type { SchemaValues } from '../../../types';
+export declare function getArrayValues<T extends Record<number | string, unknown> | unknown[]>(values: T): T extends SchemaValues<infer V> ? V[] : never;
 export declare function values<T>(values: T[]): (value: any, data?: object) => any;

package/utils/rules/values/values.es6.js

@@ -1,7 +1,8 @@
 import { RulesError } from '../helpers.es6.js';
 
-function getArrayValues(values, format = (value => value)) {
-    return Array.isArray(values) ? values.map(format) : Object.keys(values).map(format);
+function getArrayValues(values) {
+    // @ts-expect-error TODO: Fix types
+    return Array.isArray(values) ? values : Object.keys(values);
 }
 function values(values) {
     return (value, data) => {

package/utils/rules/values/values.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helpers = require('../helpers.js');
 
-function getArrayValues(values, format = (value => value)) {
-    return Array.isArray(values) ? values.map(format) : Object.keys(values).map(format);
+function getArrayValues(values) {
+    // @ts-expect-error TODO: Fix types
+    return Array.isArray(values) ? values : Object.keys(values);
 }
 function values(values) {
     return (value, data) => {