@cleverbrush/schema 1.0.0-beta.0 → 1.0.0-beta.2

package/package.json

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

package/src/builders/UnionSchemaBuilder.ts

@@ -33,12 +33,7 @@ class UnionSchemaBuilder<
             },
             this.getCommonSchema(),
             {
-                variants: this._variants.map((variant) => {
-                    if (variant instanceof SchemaBuilder) {
-                        return variant._schema;
-                    }
-                    return JSON.parse(JSON.stringify(variant));
-                })
+                variants: this._variants
             }
         );
     }

package/src/index.ts

@@ -5,7 +5,6 @@ import {
 } from './schema.js';
 import SchemaRegistry from './schemaRegistry.js';
 
-import { alias } from './builders/AliasSchemaBuilder.js';
 import { array } from './builders/ArraySchemaBuilder.js';
 import { boolean } from './builders/BooleanSchemaBuilder.js';
 import { number } from './builders/NumberSchemaBuilder.js';
@@ -55,7 +54,6 @@ export interface ISchemaRegistry<T extends Record<string, any>> {
 export { SchemaRegistry };
 export default {
     SchemaRegistry,
-    alias,
     array,
     boolean,
     number,
@@ -65,14 +63,4 @@ export default {
     func
 };
 
-export {
-    alias,
-    array,
-    boolean,
-    number,
-    object,
-    string,
-    union,
-    func,
-    InferType
-};
+export { array, boolean, number, object, string, union, func, InferType };

package/src/schema.ts

@@ -1,5 +1,4 @@
 import { ISchemaBuilder } from './builders/SchemaBuilder.js';
-import { IAliasSchemaBuilder } from './builders/AliasSchemaBuilder.js';
 import { IUnionSchemaBuilder } from './builders/UnionSchemaBuilder.js';
 import { IStringSchemaBuilder } from './builders/StringSchemaBuilder.js';
 import { IObjectSchemaBuilder } from './builders/ObjectSchemaBuilder.js';
@@ -179,25 +178,11 @@ export type Schema<T = any> = T extends Record<string, any>
     ? BooleanSchema | boolean
     : number | DefaultSchemaType | SchemaSpecification | Schema[];
 
-export type MakeOptional<T> = T extends IAliasSchemaBuilder<
-    infer TSchemaName,
+export type MakeOptional<T> = T extends IUnionSchemaBuilder<
     infer TRequired,
     infer TNullable,
-    infer TAliases,
-    infer TAliasesCompiledType
+    infer TVariants
 >
-    ? IAliasSchemaBuilder<
-          TSchemaName,
-          false,
-          TNullable,
-          TAliases,
-          TAliasesCompiledType
-      >
-    : T extends IUnionSchemaBuilder<
-          infer TRequired,
-          infer TNullable,
-          infer TVariants
-      >
     ? IUnionSchemaBuilder<false, TNullable, TVariants>
     : T extends IStringSchemaBuilder<
           infer TRequired,
@@ -259,25 +244,11 @@ export type MakeOptional<T> = T extends IAliasSchemaBuilder<
     ? IFunctionSchemaBuilder<false, TNullable>
     : T & { isRequired: false };
 
-export type MakeRequired<T> = T extends IAliasSchemaBuilder<
-    infer TSchemaName,
+export type MakeRequired<T> = T extends IUnionSchemaBuilder<
     infer TRequired,
     infer TNullable,
-    infer TAliases,
-    infer TAliasesCompiledType
+    infer TVariants
 >
-    ? IAliasSchemaBuilder<
-          TSchemaName,
-          true,
-          TNullable,
-          TAliases,
-          TAliasesCompiledType
-      >
-    : T extends IUnionSchemaBuilder<
-          infer TRequired,
-          infer TNullable,
-          infer TVariants
-      >
     ? IUnionSchemaBuilder<true, TNullable, TVariants>
     : T extends IStringSchemaBuilder<
           infer TRequired,
@@ -339,25 +310,11 @@ export type MakeRequired<T> = T extends IAliasSchemaBuilder<
     ? IFunctionSchemaBuilder<true, TNullable>
     : T & { isRequired: true };
 
-export type MakeNullable<T> = T extends IAliasSchemaBuilder<
-    infer TSchemaName,
+export type MakeNullable<T> = T extends IUnionSchemaBuilder<
     infer TRequired,
     infer TNullable,
-    infer TAliases,
-    infer TAliasesCompiledType
+    infer TVariants
 >
-    ? IAliasSchemaBuilder<
-          TSchemaName,
-          TRequired,
-          true,
-          TAliases,
-          TAliasesCompiledType
-      >
-    : T extends IUnionSchemaBuilder<
-          infer TRequired,
-          infer TNullable,
-          infer TVariants
-      >
     ? IUnionSchemaBuilder<TRequired, true, TVariants>
     : T extends IStringSchemaBuilder<
           infer TRequired,
@@ -419,25 +376,11 @@ export type MakeNullable<T> = T extends IAliasSchemaBuilder<
     ? IFunctionSchemaBuilder<TRequired, true>
     : T & { isNullable: true };
 
-export type MakeNotNullable<T> = T extends IAliasSchemaBuilder<
-    infer TSchemaName,
+export type MakeNotNullable<T> = T extends IUnionSchemaBuilder<
     infer TRequired,
     infer TNullable,
-    infer TAliases,
-    infer TAliasesCompiledType
+    infer TVariants
 >
-    ? IAliasSchemaBuilder<
-          TSchemaName,
-          TRequired,
-          false,
-          TAliases,
-          TAliasesCompiledType
-      >
-    : T extends IUnionSchemaBuilder<
-          infer TRequired,
-          infer TNullable,
-          infer TVariants
-      >
     ? IUnionSchemaBuilder<TRequired, false, TVariants>
     : T extends IStringSchemaBuilder<
           infer TRequired,
@@ -504,7 +447,7 @@ export type ExpandUnionVariants<TVariants extends any[]> = TVariants extends [
 ]
     ? [ExpandSchemaBuilder<T>]
     : TVariants extends [infer T, ...infer Rest]
-    ? [ExpandSchemaBuilder<T>, ExpandUnionVariants<[...Rest]>]
+    ? [ExpandSchemaBuilder<T>, ...ExpandUnionVariants<[...Rest]>]
     : never;
 
 export type ExpandSchemaBuilder<TSchema> = TSchema extends [
@@ -588,21 +531,6 @@ export type ExpandSchemaBuilder<TSchema> = TSchema extends [
                       undefined
                   >
             : INumberSchemaBuilder
-        : TType extends 'alias'
-        ? TParams extends [
-              infer TSchemaName extends string,
-              infer TRequired extends boolean,
-              infer TNullable extends boolean,
-              infer TAliasesCompiledType
-          ]
-            ? IAliasSchemaBuilder<
-                  TSchemaName,
-                  TRequired,
-                  TNullable,
-                  any,
-                  TAliasesCompiledType
-              >
-            : IAliasSchemaBuilder<any>
         : TType extends 'array'
         ? TParams extends [
               infer TRequired extends boolean,
@@ -700,19 +628,6 @@ export type ReduceSchemaBuilder<TBuilder> =
               TEnsureIsFinite,
               TEqualsTo
           ]
-        : TBuilder extends IAliasSchemaBuilder<
-              infer TSchemaName,
-              infer TRequired,
-              infer TNullable,
-              infer TAliases
-          >
-        ? [
-              'alias',
-              TSchemaName,
-              TRequired,
-              TNullable,
-              InferType<ExpandSchemaBuilder<TAliases[TSchemaName]>>
-          ]
         : TBuilder extends IArraySchemaBuilder<
               infer TRequired,
               infer TNullable,
@@ -849,16 +764,6 @@ export type InferType<S> = S extends DefaultSchemaType
     ? TRequired extends true
         ? InferType<TVariants>
         : InferType<TVariants> | undefined
-    : S extends IAliasSchemaBuilder<
-          infer TSchemaName,
-          infer TRequired,
-          infer TNullable,
-          infer TAliases,
-          infer TAliasesCompiledType
-      >
-    ? TRequired extends true
-        ? TAliasesCompiledType
-        : TAliasesCompiledType | undefined
     : S extends IArraySchemaBuilder<
           infer TRequired,
           infer TNullable,

package/src/schemaRegistry.builders.test.ts

@@ -5,7 +5,6 @@ import { string } from './builders/StringSchemaBuilder.js';
 import { array } from './builders/ArraySchemaBuilder.js';
 import { union } from './builders/UnionSchemaBuilder.js';
 import { boolean } from './builders/BooleanSchemaBuilder.js';
-import { alias } from './builders/AliasSchemaBuilder.js';
 
 import SchemaRegistry from './schemaRegistry.js';
 
@@ -702,7 +701,7 @@ test('Validate schema - 2', async () => {
 
     const result = await validator.validate(
         object({
-            date: alias('Date').optional()
+            date: validator.schemas.Date.schema.optional()
         }),
         {}
     );
@@ -710,52 +709,6 @@ test('Validate schema - 2', async () => {
     expect(result).toHaveProperty('valid', true);
 });
 
-test('Not required alternative schema alias', async () => {
-    const validator = new SchemaRegistry()
-        .addSchema('Alternate1', ({ object, string }) =>
-            object({
-                a1: string()
-            })
-        )
-        .addSchema('Alternate2', ({ object, string }) =>
-            object({
-                a2: string()
-            })
-        )
-        .addSchema('Alternate', ({ union, alias }) =>
-            union(alias('Alternate1')).or(alias('Alternate2'))
-        );
-
-    const s = alias('Alternate').optional();
-    let result = await validator.validate(s, undefined);
-
-    expect(result).toHaveProperty('valid', true);
-
-    result = await validator.validate(
-        {
-            type: 'alias',
-            isRequired: false,
-            schemaName: 'Alternate'
-        },
-        {
-            a2: 'something'
-        }
-    );
-
-    expect(result).toHaveProperty('valid', true);
-
-    result = await validator.validate(
-        {
-            type: 'alias',
-            isRequired: false,
-            schemaName: 'Alternate'
-        },
-        'invalid'
-    );
-
-    expect(result).toHaveProperty('valid', false);
-});
-
 test('Preprocessors - 1', async () => {
     const validator = new SchemaRegistry().addSchema(
         'Date',
@@ -772,7 +725,7 @@ test('Preprocessors - 1', async () => {
     );
 
     const schema = object({
-        bornAt: alias('Date')
+        bornAt: validator.schemas.Date.schema
     }).setPropPreprocessor('bornAt', (value: any): Date | undefined => {
         const time = Date.parse((value as Record<string, unknown>).toString());
         if (Number.isNaN(time)) return undefined;
@@ -800,7 +753,7 @@ test('Preprocessors - 2', async () => {
     );
 
     let schema = object({
-        bornAt: alias('Date')
+        bornAt: validator.schemas.Date.schema
     }).setPropPreprocessor('bornAt', 'StringToDate');
 
     validator.addPreprocessor(
@@ -833,8 +786,8 @@ test('Preprocessors - 2', async () => {
     expect(result).toHaveProperty('valid', true);
 
     schema = object({
-        bornAt: alias('Date'),
-        diedAt: alias('Date')
+        bornAt: validator.schemas.Date.schema,
+        diedAt: validator.schemas.Date.schema
     })
         .setPropPreprocessor('bornAt', 'StringToDate')
         .setPropPreprocessor('diedAt', 'Unregistered') as any;
@@ -873,7 +826,9 @@ test('Preprocessors - 3', async () => {
     let obj = [new Date().toJSON()];
 
     let result = await validator.validate(
-        array().ofType(alias('Date')).addPreprocessor('StringToDate'),
+        array()
+            .ofType(validator.schemas.Date.schema)
+            .addPreprocessor('StringToDate'),
         obj
     );
     expect(result).toHaveProperty('valid', true);
@@ -881,7 +836,7 @@ test('Preprocessors - 3', async () => {
     obj = [new Date().toJSON()];
     result = await validator.validate(
         array()
-            .ofType(alias('Date'))
+            .ofType(validator.schemas.Date.schema)
             .addPreprocessor((value: unknown): Date | undefined => {
                 const time = Date.parse(
                     (value as Record<string, unknown>).toString()
@@ -896,7 +851,7 @@ test('Preprocessors - 3', async () => {
     obj = ['sdfsdf12', new Date().toJSON()];
     result = await validator.validate(
         array()
-            .ofType(alias('Date'))
+            .ofType(validator.schemas.Date.schema)
             .addPreprocessor((value: unknown): Date | undefined => {
                 const time = Date.parse(
                     (value as Record<string, unknown>).toString()
@@ -961,7 +916,9 @@ test('Preprocessors - 4', async () => {
     let obj = [new Date().toJSON()];
 
     let result = await validator.validate(
-        array().ofType(alias('Date')).addPreprocessor('StringToDate'),
+        array()
+            .ofType(validator.schemas.Date.schema)
+            .addPreprocessor('StringToDate'),
         obj
     );
     expect(result).toHaveProperty('valid', true);
@@ -969,7 +926,7 @@ test('Preprocessors - 4', async () => {
     obj = [new Date().toJSON()];
     result = await validator.validate(
         array()
-            .ofType(alias('Date'))
+            .ofType(validator.schemas.Date.schema)
             .addPreprocessor((value: unknown): Date | undefined => {
                 const time = Date.parse(
                     (value as Record<string, unknown>).toString()
@@ -984,7 +941,7 @@ test('Preprocessors - 4', async () => {
     obj = ['sdfsdf12', new Date().toJSON()];
     result = await validator.validate(
         array()
-            .ofType(alias('Date'))
+            .ofType(validator.schemas.Date.schema)
             .addPreprocessor((value: unknown): Date | undefined => {
                 const time = Date.parse(
                     (value as Record<string, unknown>).toString()
@@ -1039,23 +996,21 @@ test('Submodules - 3', async () => {
 });
 
 test('Submodules - 4', async () => {
-    const validator = new SchemaRegistry()
-        .addSchema('Module1.Schema1', ({ object, number }) =>
-            object({
-                b: number()
-            })
-        )
-        .addSchema('Module1.Schema2', ({ object, alias }) =>
-            object({
-                a: alias('Module1.Schema3' as any)
-            })
-        );
-
-    await validator.schemas.Module1.Schema2.validate({
-        a: {
-            b: 20
-        }
-    }).catch((e) => expect(e).toBeInstanceOf(Error));
+    try {
+        new SchemaRegistry()
+            .addSchema('Module1.Schema1', ({ object, number }) =>
+                object({
+                    b: number()
+                })
+            )
+            .addSchema('Module1.Schema2', ({ object, alias }) =>
+                object({
+                    a: alias('Module1.Schema3' as any)
+                })
+            );
+    } catch (e) {
+        expect(e).toBeInstanceOf(Error);
+    }
 });
 
 test('No unknown fields - 1', async () => {
@@ -1098,8 +1053,8 @@ test('addSchemaFrom - 1', async () => {
                 last: string()
             })
         )
-        .addSchemaFrom('Person', 'PersonWithEmail', ({ schema, string }) =>
-            schema.addProps({
+        .addSchemaFrom('Person', 'PersonWithEmail', ({ base, string }) =>
+            base.addProps({
                 email: string()
             })
         );
@@ -1168,8 +1123,8 @@ test('no unknown props allowed by default', async () => {
 
     expect(valid).toEqual(false);
 
-    const registry2 = registry.addSchemaFrom('User', 'UserOpen', ({ schema }) =>
-        schema.canHaveUnknownProps()
+    const registry2 = registry.addSchemaFrom('User', 'UserOpen', ({ base }) =>
+        base.canHaveUnknownProps()
     );
 
     const { valid: valid2 } = await registry2.schemas.UserOpen.validate({
@@ -1347,7 +1302,7 @@ test('External Schema - 2', async () => {
             object({
                 name: string().addValidator(() => ({ valid: true })),
                 director: external(validator1, 'person')
-            }).addValidator((v) => ({ valid: true }))
+            }).addValidator(() => ({ valid: true }))
     );
 
     const result = await validator2.schemas.company.validate({