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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cleverbrush/schema",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.5",
     "keywords": [
         "object schema validator",
         "schema",
@@ -8,6 +8,10 @@
     ],
     "author": "Andrew Zolotukhin <andrew_zol@cleverbrush.com>",
     "license": "BSD",
+    "files": [
+        "*",
+        "dist/*"
+    ],
     "main": "./dist/index.js",
     "readme": "https://github.com/cleverbrush/libs/tree/master/libs/schema#readme",
     "repository": {
@@ -19,7 +23,7 @@
         "build": "tsc"
     },
     "devDependencies": {
-        "@cleverbrush/deep": "1.0.0-beta.3"
+        "@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