@cleverbrush/schema 1.0.0-beta.4 → 1.0.0-beta.5

package/dist/builders/FunctionSchemaBuilder.d.ts

@@ -1,25 +1,27 @@
 import { Schema, Validator } from '../schema.js';
 import { ISchemaBuilder, SchemaBuilder } from './SchemaBuilder.js';
-export interface IFunctionSchemaBuilder<TRequired extends boolean = true, TNullable extends boolean = false> extends ISchemaBuilder<TRequired, TNullable> {
-    optional(): IFunctionSchemaBuilder<false, TNullable>;
-    required(): IFunctionSchemaBuilder<true, TNullable>;
-    nullable(): IFunctionSchemaBuilder<TRequired, true>;
-    notNullable(): IFunctionSchemaBuilder<TRequired, false>;
+export interface IFunctionSchemaBuilder<TRequired extends boolean = true, TNullable extends boolean = false, TMapToType = undefined> extends ISchemaBuilder<TRequired, TNullable> {
+    optional(): IFunctionSchemaBuilder<false, TNullable, TMapToType>;
+    required(): IFunctionSchemaBuilder<true, TNullable, TMapToType>;
+    nullable(): IFunctionSchemaBuilder<TRequired, true, TMapToType>;
+    notNullable(): IFunctionSchemaBuilder<TRequired, false, TMapToType>;
+    mapToType<T>(): IFunctionSchemaBuilder<TRequired, TNullable, T>;
 }
-export declare class FunctionSchemaBuilder<TRequired extends boolean = true, TNullable extends boolean = false> extends SchemaBuilder<TRequired, TNullable> implements IFunctionSchemaBuilder<TRequired, TNullable> {
+export declare class FunctionSchemaBuilder<TRequired extends boolean = true, TNullable extends boolean = false, TMapToType = undefined> extends SchemaBuilder<TRequired, TNullable> implements IFunctionSchemaBuilder<TRequired, TNullable> {
     protected readonly type = "function";
     get _schema(): Schema;
     clone(): this;
-    static create<TRequired extends boolean = true, TNullable extends boolean = false>(obj?: {
+    mapToType<T>(): IFunctionSchemaBuilder<TRequired, TNullable, T>;
+    static create<TRequired extends boolean = true, TNullable extends boolean = false, TMapToType = undefined>(obj?: {
         isRequired: TRequired;
         isNullable: TNullable;
         validators?: Validator[];
         preprocessor?: ((value: unknown) => unknown | Promise<unknown>) | string;
-    }): IFunctionSchemaBuilder<TRequired, TNullable>;
+    }): IFunctionSchemaBuilder<TRequired, TNullable, TMapToType>;
     private constructor();
-    optional(): IFunctionSchemaBuilder<false, TNullable>;
-    required(): IFunctionSchemaBuilder<true, TNullable>;
-    nullable(): IFunctionSchemaBuilder<TRequired, true>;
-    notNullable(): IFunctionSchemaBuilder<TRequired, false>;
+    optional(): IFunctionSchemaBuilder<false, TNullable, TMapToType>;
+    required(): IFunctionSchemaBuilder<true, TNullable, TMapToType>;
+    nullable(): IFunctionSchemaBuilder<TRequired, true, TMapToType>;
+    notNullable(): IFunctionSchemaBuilder<TRequired, false, TMapToType>;
 }
 export declare const func: () => IFunctionSchemaBuilder;

package/dist/builders/FunctionSchemaBuilder.js

@@ -13,6 +13,9 @@ class FunctionSchemaBuilder extends SchemaBuilder_js_1.SchemaBuilder {
     clone() {
         return FunctionSchemaBuilder.create(this._schema);
     }
+    mapToType() {
+        return this;
+    }
     static create(obj) {
         return new FunctionSchemaBuilder(obj);
     }

package/dist/index.d.ts

@@ -34,7 +34,7 @@ declare const _default: {
     object: <T>(properties?: T) => import("./builders/ObjectSchemaBuilder.js").IObjectSchemaBuilder<true, false, true, T extends undefined ? {} : T, undefined>;
     string: <T_1 extends string = undefined>(equals?: T_1) => import("./builders/StringSchemaBuilder.js").IStringSchemaBuilder<true, false, undefined, undefined, T_1 extends undefined ? undefined : T_1>;
     union: <T_2 extends import("./builders/SchemaBuilder.js").ISchemaBuilder<true, false>, K extends T_2[], TRequired extends boolean = true, TNullable extends boolean = false>(...schemas: K) => import("./builders/UnionSchemaBuilder.js").IUnionSchemaBuilder<TRequired, TNullable, K>;
-    func: () => import("./builders/FunctionSchemaBuilder.js").IFunctionSchemaBuilder<true, false>;
+    func: () => import("./builders/FunctionSchemaBuilder.js").IFunctionSchemaBuilder<true, false, undefined>;
 };
 export default _default;
 export { array, boolean, number, object, string, union, func, InferType };

package/dist/schema.d.ts

@@ -113,13 +113,13 @@ export declare type Schema<T = any> = T extends Record<string, any> ? any : T ex
 export declare type MakeOptional<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<false, TNullable, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<false, TNullable, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<false, TNullable, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<false, TNullable, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<false, TNullable, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<false, TNullable, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable> ? IFunctionSchemaBuilder<false, TNullable> : T & {
     isRequired: false;
 };
-export declare type MakeRequired<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<true, TNullable, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<true, TNullable, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<true, TNullable, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<true, TNullable, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<true, TNullable, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<true, TNullable, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable> ? IFunctionSchemaBuilder<true, TNullable> : T & {
+export declare type MakeRequired<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<true, TNullable, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<true, TNullable, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<true, TNullable, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<true, TNullable, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<true, TNullable, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<true, TNullable, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable, infer TMapToType> ? IFunctionSchemaBuilder<true, TNullable, TMapToType> : T & {
     isRequired: true;
 };
-export declare type MakeNullable<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<TRequired, true, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<TRequired, true, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<TRequired, true, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<TRequired, true, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<TRequired, true, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<TRequired, true, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable> ? IFunctionSchemaBuilder<TRequired, true> : T & {
+export declare type MakeNullable<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<TRequired, true, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<TRequired, true, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<TRequired, true, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<TRequired, true, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<TRequired, true, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<TRequired, true, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable, infer TMapToType> ? IFunctionSchemaBuilder<TRequired, true, TMapToType> : T & {
     isNullable: true;
 };
-export declare type MakeNotNullable<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<TRequired, false, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<TRequired, false, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<TRequired, false, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<TRequired, false, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<TRequired, false, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<TRequired, false, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable> ? IFunctionSchemaBuilder<TRequired, false> : T & {
+export declare type MakeNotNullable<T> = T extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? IUnionSchemaBuilder<TRequired, false, TVariants> : T extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? IStringSchemaBuilder<TRequired, false, TMinLength, TMaxLength, TEqualsTo> : T extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? IObjectSchemaBuilder<TRequired, false, TNoUnknownProperties, TProperties, TMapToType> : T extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? INumberSchemaBuilder<TRequired, false, TMin, TMax, TIsInteger, TEnsureNotNaN, TEnsureIsFinite, TEqualsTo> : T extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? IArraySchemaBuilder<TRequired, false, TOfType, TMaxLength, TMinLength> : T extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? IBooleanSchemaBuilder<TRequired, false, TEqualsTo> : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable, infer TMapToType> ? IFunctionSchemaBuilder<TRequired, false, TMapToType> : T & {
     isNullable: false;
 };
 export declare type ExpandUnionVariants<TVariants extends any[]> = TVariants extends [
@@ -167,8 +167,9 @@ export declare type ExpandSchemaBuilder<TSchema> = TSchema extends [
     infer TEqualsTo extends boolean | undefined
 ] ? IBooleanSchemaBuilder<TRequired, TNullable, TEqualsTo extends undefined ? undefined : boolean> : IBooleanSchemaBuilder : TType extends 'function' ? TParams extends [
     infer TRequired extends boolean,
-    infer TNullable extends boolean
-] ? IFunctionSchemaBuilder<TRequired, TNullable> : IFunctionSchemaBuilder : TSchema : TSchema;
+    infer TNullable extends boolean,
+    infer TMapToType
+] ? IFunctionSchemaBuilder<TRequired, TNullable, TMapToType> : IFunctionSchemaBuilder : TSchema : TSchema;
 export declare type ReduceSchemaBuilder<TBuilder> = TBuilder extends IObjectSchemaBuilder<infer TRequired, infer TNullable, infer TNoUnknownProperties, infer TProperties, infer TMapToType> ? [
     'object',
     TRequired,
@@ -195,7 +196,7 @@ export declare type ReduceSchemaBuilder<TBuilder> = TBuilder extends IObjectSche
     ReduceSchemaBuilder<TOfType>,
     TMaxLength,
     TMinLength
-] : TBuilder extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? ['union', TRequired, TNullable, ReduceSchemaBuilder<TVariants>] : TBuilder extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? ['boolean', TRequired, TNullable, TEqualsTo] : TBuilder extends IFunctionSchemaBuilder<infer TRequired, infer TNullable> ? ['function', TRequired, TNullable] : TBuilder extends [infer F] ? [ReduceSchemaBuilder<F>] : TBuilder extends [infer F, ...infer Rest] ? [ReduceSchemaBuilder<F>, ...ReduceSchemaBuilder<Rest>] : TBuilder;
+] : TBuilder extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? ['union', TRequired, TNullable, ReduceSchemaBuilder<TVariants>] : TBuilder extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? ['boolean', TRequired, TNullable, TEqualsTo] : TBuilder extends IFunctionSchemaBuilder<infer TRequired, infer TNullable, infer TMapToType> ? ['function', TRequired, TNullable, TMapToType] : TBuilder extends [infer F] ? [ReduceSchemaBuilder<F>] : TBuilder extends [infer F, ...infer Rest] ? [ReduceSchemaBuilder<F>, ...ReduceSchemaBuilder<Rest>] : TBuilder;
 export declare type InferType<S> = S extends DefaultSchemaType ? S extends 'string' ? string : S extends 'boolean' ? boolean : S extends 'number' ? number : S extends 'array' ? Array<any> : S extends 'object' ? Record<string, never> : S extends 'function' ? Function : never : S extends number ? S : S extends BooleanSchema ? S['equals'] extends undefined ? boolean : S['equals'] : S extends UnionSchema<infer K> ? InferType<K> : S extends {
     type: 'union';
     variants: infer K;
@@ -207,7 +208,7 @@ export declare type InferType<S> = S extends DefaultSchemaType ? S extends 'stri
     noUnknownProperties: false;
 }) & (TProperties extends Record<string, any> ? {
     properties: TProperties;
-} : {})> : TMapToType : S extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? TRequired extends true ? TEqualsTo extends undefined ? number : TEqualsTo : TEqualsTo extends undefined ? number | undefined : TEqualsTo | undefined : S extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? TRequired extends true ? TEqualsTo extends undefined ? boolean : TEqualsTo : TEqualsTo extends undefined ? boolean | undefined : TEqualsTo | undefined : S extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? TRequired extends true ? TEqualsTo extends undefined ? string : TEqualsTo : TEqualsTo extends undefined ? string | undefined : TEqualsTo | undefined : S extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? TRequired extends true ? InferType<TVariants> : InferType<TVariants> | undefined : S extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? TRequired extends true ? TOfType extends undefined ? any[] : InferType<TOfType>[] : TOfType extends undefined ? any[] | undefined : InferType<TOfType>[] | undefined : S extends IFunctionSchemaBuilder<infer TRequired, infer TNullable> ? TRequired extends true ? Function : Function | undefined : S extends StringSchema ? S['equals'] extends undefined ? string : S['equals'] : S extends NumberSchema ? S['equals'] extends undefined ? number : S['equals'] : S extends ObjectSchema<infer K> ? OptionalPropertiesOf<K> extends never ? {
+} : {})> : TMapToType : S extends INumberSchemaBuilder<infer TRequired, infer TNullable, infer TMin, infer TMax, infer TIsInteger, infer TEnsureNotNaN, infer TEnsureIsFinite, infer TEqualsTo> ? TRequired extends true ? TEqualsTo extends undefined ? number : TEqualsTo : TEqualsTo extends undefined ? number | undefined : TEqualsTo | undefined : S extends IBooleanSchemaBuilder<infer TRequired, infer TNullable, infer TEqualsTo> ? TRequired extends true ? TEqualsTo extends undefined ? boolean : TEqualsTo : TEqualsTo extends undefined ? boolean | undefined : TEqualsTo | undefined : S extends IStringSchemaBuilder<infer TRequired, infer TNullable, infer TMinLength, infer TMaxLength, infer TEqualsTo> ? TRequired extends true ? TEqualsTo extends undefined ? string : TEqualsTo : TEqualsTo extends undefined ? string | undefined : TEqualsTo | undefined : S extends IUnionSchemaBuilder<infer TRequired, infer TNullable, infer TVariants> ? TRequired extends true ? InferType<TVariants> : InferType<TVariants> | undefined : S extends IArraySchemaBuilder<infer TRequired, infer TNullable, infer TOfType, infer TMaxLength, infer TMinLength> ? TRequired extends true ? TOfType extends undefined ? any[] : InferType<TOfType>[] : TOfType extends undefined ? any[] | undefined : InferType<TOfType>[] | undefined : S extends IFunctionSchemaBuilder<infer TRequired, infer TNullable, infer TMapToType> ? TMapToType extends undefined ? TRequired extends true ? Function : Function | undefined : TRequired extends true ? TMapToType : TMapToType | undefined : S extends StringSchema ? S['equals'] extends undefined ? string : S['equals'] : S extends NumberSchema ? S['equals'] extends undefined ? number : S['equals'] : S extends ObjectSchema<infer K> ? OptionalPropertiesOf<K> extends never ? {
     [k in keyof K]: InferType<K[k]>;
 } : MakePropOptional<{
     [k in keyof K]: InferType<K[k]>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cleverbrush/schema",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "keywords": [
         "object schema validator",
         "schema",
@@ -23,7 +23,7 @@
         "build": "tsc"
     },
     "devDependencies": {
-        "@cleverbrush/deep": "1.0.0-beta.4"
+        "@cleverbrush/deep": "1.0.0-beta.5"
     },
     "types": "./dist/index.d.ts"
 }

package/src/builders/FunctionSchemaBuilder.test.ts

@@ -2,6 +2,7 @@ import { deepEqual } from '@cleverbrush/deep';
 
 import { Schema } from '../schema.js';
 import { func } from './FunctionSchemaBuilder.js';
+import { InferType } from '../schema.js';
 
 test('Clean', () => {
     const schema = func();
@@ -132,3 +133,13 @@ test('Clone', () => {
     const equal2 = deepEqual(schema1._schema, schema2._schema);
     expect(equal2).toEqual(true);
 });
+
+test('Map to type', () => {
+    const schema1 = func();
+    const schema2 = schema1.mapToType<(name: string) => number>();
+
+    // test of type inference
+    const callback: InferType<typeof schema2> = (name: string): number => 10;
+
+    expect(schema1 === schema2).toEqual(true);
+});

package/src/builders/FunctionSchemaBuilder.ts

@@ -4,17 +4,20 @@ import { defaultSchemas } from '../defaultSchemas.js';
 
 export interface IFunctionSchemaBuilder<
     TRequired extends boolean = true,
-    TNullable extends boolean = false
+    TNullable extends boolean = false,
+    TMapToType = undefined
 > extends ISchemaBuilder<TRequired, TNullable> {
-    optional(): IFunctionSchemaBuilder<false, TNullable>;
-    required(): IFunctionSchemaBuilder<true, TNullable>;
-    nullable(): IFunctionSchemaBuilder<TRequired, true>;
-    notNullable(): IFunctionSchemaBuilder<TRequired, false>;
+    optional(): IFunctionSchemaBuilder<false, TNullable, TMapToType>;
+    required(): IFunctionSchemaBuilder<true, TNullable, TMapToType>;
+    nullable(): IFunctionSchemaBuilder<TRequired, true, TMapToType>;
+    notNullable(): IFunctionSchemaBuilder<TRequired, false, TMapToType>;
+    mapToType<T>(): IFunctionSchemaBuilder<TRequired, TNullable, T>;
 }
 
 export class FunctionSchemaBuilder<
         TRequired extends boolean = true,
-        TNullable extends boolean = false
+        TNullable extends boolean = false,
+        TMapToType = undefined
     >
     extends SchemaBuilder<TRequired, TNullable>
     implements IFunctionSchemaBuilder<TRequired, TNullable>
@@ -34,9 +37,14 @@ export class FunctionSchemaBuilder<
         return FunctionSchemaBuilder.create(this._schema as any) as this;
     }
 
+    public mapToType<T>(): IFunctionSchemaBuilder<TRequired, TNullable, T> {
+        return this as any;
+    }
+
     public static create<
         TRequired extends boolean = true,
-        TNullable extends boolean = false
+        TNullable extends boolean = false,
+        TMapToType = undefined
     >(obj?: {
         isRequired: TRequired;
         isNullable: TNullable;
@@ -44,7 +52,7 @@ export class FunctionSchemaBuilder<
         preprocessor?:
             | ((value: unknown) => unknown | Promise<unknown>)
             | string;
-    }): IFunctionSchemaBuilder<TRequired, TNullable> {
+    }): IFunctionSchemaBuilder<TRequired, TNullable, TMapToType> {
         return new FunctionSchemaBuilder(obj as any);
     }
 
@@ -64,9 +72,9 @@ export class FunctionSchemaBuilder<
         }
     }
 
-    optional(): IFunctionSchemaBuilder<false, TNullable> {
+    optional(): IFunctionSchemaBuilder<false, TNullable, TMapToType> {
         if (this.isRequired === false) {
-            return this as IFunctionSchemaBuilder<false, TNullable>;
+            return this as any;
         }
         return FunctionSchemaBuilder.create({
             ...(this._schema as any),
@@ -74,9 +82,9 @@ export class FunctionSchemaBuilder<
         });
     }
 
-    required(): IFunctionSchemaBuilder<true, TNullable> {
+    required(): IFunctionSchemaBuilder<true, TNullable, TMapToType> {
         if (this.isRequired === true) {
-            return this as IFunctionSchemaBuilder<true, TNullable>;
+            return this as any;
         }
         return FunctionSchemaBuilder.create({
             ...(this._schema as any),
@@ -84,9 +92,9 @@ export class FunctionSchemaBuilder<
         });
     }
 
-    nullable(): IFunctionSchemaBuilder<TRequired, true> {
+    nullable(): IFunctionSchemaBuilder<TRequired, true, TMapToType> {
         if (this.isNullable === true) {
-            return this as IFunctionSchemaBuilder<TRequired, true>;
+            return this as any;
         }
         return FunctionSchemaBuilder.create({
             ...(this._schema as any),
@@ -94,9 +102,9 @@ export class FunctionSchemaBuilder<
         });
     }
 
-    notNullable(): IFunctionSchemaBuilder<TRequired, false> {
+    notNullable(): IFunctionSchemaBuilder<TRequired, false, TMapToType> {
         if (this.isNullable === false) {
-            return this as IFunctionSchemaBuilder<TRequired, false>;
+            return this as any;
         }
         return FunctionSchemaBuilder.create({
             ...(this._schema as any),

package/src/schema.ts

@@ -306,8 +306,12 @@ export type MakeRequired<T> = T extends IUnionSchemaBuilder<
           infer TEqualsTo
       >
     ? IBooleanSchemaBuilder<true, TNullable, TEqualsTo>
-    : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable>
-    ? IFunctionSchemaBuilder<true, TNullable>
+    : T extends IFunctionSchemaBuilder<
+          infer TRequired,
+          infer TNullable,
+          infer TMapToType
+      >
+    ? IFunctionSchemaBuilder<true, TNullable, TMapToType>
     : T & { isRequired: true };
 
 export type MakeNullable<T> = T extends IUnionSchemaBuilder<
@@ -372,8 +376,12 @@ export type MakeNullable<T> = T extends IUnionSchemaBuilder<
           infer TEqualsTo
       >
     ? IBooleanSchemaBuilder<TRequired, true, TEqualsTo>
-    : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable>
-    ? IFunctionSchemaBuilder<TRequired, true>
+    : T extends IFunctionSchemaBuilder<
+          infer TRequired,
+          infer TNullable,
+          infer TMapToType
+      >
+    ? IFunctionSchemaBuilder<TRequired, true, TMapToType>
     : T & { isNullable: true };
 
 export type MakeNotNullable<T> = T extends IUnionSchemaBuilder<
@@ -438,8 +446,12 @@ export type MakeNotNullable<T> = T extends IUnionSchemaBuilder<
           infer TEqualsTo
       >
     ? IBooleanSchemaBuilder<TRequired, false, TEqualsTo>
-    : T extends IFunctionSchemaBuilder<infer TRequired, infer TNullable>
-    ? IFunctionSchemaBuilder<TRequired, false>
+    : T extends IFunctionSchemaBuilder<
+          infer TRequired,
+          infer TNullable,
+          infer TMapToType
+      >
+    ? IFunctionSchemaBuilder<TRequired, false, TMapToType>
     : T & { isNullable: false };
 
 export type ExpandUnionVariants<TVariants extends any[]> = TVariants extends [
@@ -574,9 +586,10 @@ export type ExpandSchemaBuilder<TSchema> = TSchema extends [
         : TType extends 'function'
         ? TParams extends [
               infer TRequired extends boolean,
-              infer TNullable extends boolean
+              infer TNullable extends boolean,
+              infer TMapToType
           ]
-            ? IFunctionSchemaBuilder<TRequired, TNullable>
+            ? IFunctionSchemaBuilder<TRequired, TNullable, TMapToType>
             : IFunctionSchemaBuilder
         : TSchema
     : TSchema;
@@ -657,9 +670,10 @@ export type ReduceSchemaBuilder<TBuilder> =
         ? ['boolean', TRequired, TNullable, TEqualsTo]
         : TBuilder extends IFunctionSchemaBuilder<
               infer TRequired,
-              infer TNullable
+              infer TNullable,
+              infer TMapToType
           >
-        ? ['function', TRequired, TNullable]
+        ? ['function', TRequired, TNullable, TMapToType]
         : TBuilder extends [infer F]
         ? [ReduceSchemaBuilder<F>]
         : TBuilder extends [infer F, ...infer Rest]
@@ -778,10 +792,18 @@ export type InferType<S> = S extends DefaultSchemaType
         : TOfType extends undefined
         ? any[] | undefined
         : InferType<TOfType>[] | undefined
-    : S extends IFunctionSchemaBuilder<infer TRequired, infer TNullable>
-    ? TRequired extends true
-        ? Function
-        : Function | undefined
+    : S extends IFunctionSchemaBuilder<
+          infer TRequired,
+          infer TNullable,
+          infer TMapToType
+      >
+    ? TMapToType extends undefined
+        ? TRequired extends true
+            ? Function
+            : Function | undefined
+        : TRequired extends true
+        ? TMapToType
+        : TMapToType | undefined
     : S extends StringSchema
     ? S['equals'] extends undefined
         ? string