@tstdl/base 0.78.0-beta4 → 0.78.0-beta40

package/schema/decorators/optional.d.ts

@@ -1,2 +1,4 @@
 import type { Decorator } from "../../reflection";
-export declare function Optional(): Decorator<'property' | 'accessor'>;
+import type { OneOrMany } from "../../types";
+import type { SchemaTestable } from '../schema';
+export declare function Optional(schema?: OneOrMany<SchemaTestable>): Decorator<'property' | 'accessor'>;

package/schema/decorators/optional.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Optional = void 0;
 const utils_1 = require("./utils");
-function Optional() {
-    return (0, utils_1.createSchemaPropertyDecorator)({ optional: true });
+function Optional(schema) {
+    return (0, utils_1.createSchemaPropertyDecorator)({ schema, optional: true });
 }
 exports.Optional = Optional;
 //# sourceMappingURL=optional.js.map

package/schema/decorators/optional.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/decorators/optional.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,mCAAwD;AAExD,SAAgB,QAAQ;IACtB,OAAO,IAAA,qCAA6B,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAC3D,CAAC;AAFD,4BAEC"}
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/decorators/optional.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAKzD,mCAAwD;AAExD,SAAgB,QAAQ,CAAC,MAAkC;IACzD,OAAO,IAAA,qCAA6B,EAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAFD,4BAEC"}

package/schema/decorators/property.d.ts

@@ -3,4 +3,4 @@ import type { OneOrMany, TypedOmit } from "../../types";
 import type { ValueType } from '../types';
 import type { PropertyOptions } from './types';
 export declare function Property(options?: PropertyOptions): Decorator<'property' | 'accessor'>;
-export declare function Property(types?: () => OneOrMany<ValueType>, options?: TypedOmit<PropertyOptions, 'type'>): Decorator<'property' | 'accessor'>;
+export declare function Property(schema?: OneOrMany<ValueType>, options?: TypedOmit<PropertyOptions, 'schema'>): Decorator<'property' | 'accessor'>;

package/schema/decorators/property.js

@@ -7,8 +7,10 @@ const type_guards_1 = require("../../utils/type-guards");
 const types_1 = require("../types");
 const utils_1 = require("./utils");
 function Property(optionsOrTypes = {}, optionsOrNothing) {
-    const options = (0, type_guards_1.isFunction)(optionsOrTypes) ? { type: { deferred: () => (0, types_1.valueTypesToSchema)(optionsOrTypes()) }, ...optionsOrNothing } : optionsOrTypes;
+    const schema = ((0, type_guards_1.isFunction)(optionsOrTypes) || (0, type_guards_1.isString)(optionsOrTypes)) ? (0, types_1.typeSchema)(optionsOrTypes) : undefined;
+    const options = (0, type_guards_1.isUndefined)(schema) ? optionsOrTypes : optionsOrNothing ?? {};
     return (0, utils_1.createSchemaPropertyDecorator)({
+        schema,
         ...options,
         coercers: (0, type_guards_1.isDefined)(options.coercers) ? (0, array_1.toArray)(options.coercers) : undefined,
         transformers: (0, type_guards_1.isDefined)(options.transformers) ? (0, array_1.toArray)(options.transformers) : undefined,

package/schema/decorators/property.js.map

@@ -1 +1 @@
-{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../source/schema/decorators/property.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,mDAA8C;AAC9C,yDAA4D;AAE5D,oCAA8C;AAE9C,mCAAwD;AAIxD,SAAgB,QAAQ,CAAC,iBAAiE,EAAE,EAAE,gBAAkC;IAC9H,MAAM,OAAO,GAAoB,IAAA,wBAAU,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAkB,EAAC,cAAc,EAAE,CAAC,EAAE,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;IAEvK,OAAO,IAAA,qCAA6B,EAAC;QACnC,GAAG,OAAO;QACV,QAAQ,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAC7E,YAAY,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;QACzF,gBAAgB,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;QACrG,gBAAgB,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;KACtG,CAAC,CAAC;AACL,CAAC;AAVD,4BAUC"}
+{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../source/schema/decorators/property.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,mDAA8C;AAC9C,yDAAmF;AAEnF,oCAAsC;AAEtC,mCAAwD;AAIxD,SAAgB,QAAQ,CAAC,iBAAyD,EAAE,EAAE,gBAAkC;IACtH,MAAM,MAAM,GAAG,CAAC,IAAA,wBAAU,EAAC,cAAc,CAAC,IAAI,IAAA,sBAAQ,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjH,MAAM,OAAO,GAAG,IAAA,yBAAW,EAAC,MAAM,CAAC,CAAC,CAAC,CAAE,cAAkC,CAAC,CAAC,CAAC,gBAAgB,IAAK,EAAsB,CAAC;IAExH,OAAO,IAAA,qCAA6B,EAAC;QACnC,MAAM;QACN,GAAG,OAAO;QACV,QAAQ,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAC7E,YAAY,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;QACzF,gBAAgB,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;QACrG,gBAAgB,EAAE,IAAA,uBAAS,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;KACtG,CAAC,CAAC;AACL,CAAC;AAZD,4BAYC"}

package/schema/decorators/types.d.ts

@@ -1,11 +1,11 @@
 import type { OneOrMany } from "../../types";
-import type { ObjectSchema, SchemaArrayConstraint, SchemaFactoryFunction, SchemaValueCoercer, SchemaValueConstraint, SchemaValueTransformer, ValueSchema, ValueType } from '../types';
+import type { SchemaTestable } from '../schema';
+import type { ObjectSchema, SchemaArrayConstraint, SchemaFactoryFunction, SchemaValueCoercer, SchemaValueConstraint, SchemaValueTransformer, ValueSchema } from '../types';
 export declare type SchemaTypeReflectionData = Partial<Pick<ObjectSchema, 'mask' | 'allowUnknownProperties'>> & {
     factory?: SchemaFactoryFunction<any>;
 };
-export declare type TypesProvider = () => OneOrMany<ValueType>;
 export declare type SchemaPropertyReflectionData = {
-    type?: OneOrMany<ValueType>;
+    schema?: OneOrMany<SchemaTestable>;
     array?: boolean;
     optional?: boolean;
     nullable?: boolean;
@@ -15,4 +15,4 @@ export declare type SchemaPropertyReflectionData = {
     arrayConstraints?: readonly SchemaArrayConstraint[];
     valueConstraints?: readonly SchemaValueConstraint[];
 };
-export declare type PropertyOptions = Partial<ValueSchema>;
+export declare type PropertyOptions = Partial<ValueSchema<any>>;

package/schema/decorators/utils.d.ts

@@ -1,9 +1,10 @@
 import type { Decorator } from "../../reflection";
 import type { OneOrMany } from "../../types";
-import type { SchemaArrayConstraint, SchemaValueCoercer, SchemaValueConstraint, SchemaValueTransformer, ValueType } from '../types';
+import type { Schema } from '../schema';
+import type { SchemaArrayConstraint, SchemaValueCoercer, SchemaValueConstraint, SchemaValueTransformer } from '../types';
 import type { PropertyOptions } from './types';
 export declare function createSchemaPropertyDecorator(options: PropertyOptions): Decorator<'property' | 'accessor'>;
-export declare function createSchemaPropertyDecoratorFromValueType(valueType: ValueType): Decorator<'property' | 'accessor'>;
+export declare function createSchemaPropertyDecoratorFromSchema(schema: Schema): Decorator<'property' | 'accessor'>;
 export declare function createSchemaValueCoercerDecorator(coercer: SchemaValueCoercer, options?: PropertyOptions): Decorator<'property' | 'accessor'>;
 export declare function createSchemaValueTransformerDecorator(transformer: SchemaValueTransformer, options?: PropertyOptions): Decorator<'property' | 'accessor'>;
 export declare function createSchemaArrayConstraintDecorator(constraint: SchemaArrayConstraint, options?: PropertyOptions): Decorator<'property' | 'accessor'>;

package/schema/decorators/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable @typescript-eslint/naming-convention */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchemaValueConstraintDecorator = exports.createSchemaArrayConstraintDecorator = exports.createSchemaValueTransformerDecorator = exports.createSchemaValueCoercerDecorator = exports.createSchemaPropertyDecoratorFromValueType = exports.createSchemaPropertyDecorator = void 0;
+exports.createSchemaValueConstraintDecorator = exports.createSchemaArrayConstraintDecorator = exports.createSchemaValueTransformerDecorator = exports.createSchemaValueCoercerDecorator = exports.createSchemaPropertyDecoratorFromSchema = exports.createSchemaPropertyDecorator = void 0;
 const reflection_1 = require("../../reflection");
 const array_1 = require("../../utils/array/array");
 const merge_1 = require("../../utils/merge");
@@ -24,14 +24,10 @@ function createSchemaPropertyDecorator(options) {
     });
 }
 exports.createSchemaPropertyDecorator = createSchemaPropertyDecorator;
-function createSchemaPropertyDecoratorFromValueType(valueType) {
-    const schema = (0, types_1.isValueSchema)(valueType) ? valueType : (0, types_1.valueSchema)(valueType);
-    return createSchemaPropertyDecorator({
-        ...schema,
-        type: schema.type
-    });
+function createSchemaPropertyDecoratorFromSchema(schema) {
+    return createSchemaPropertyDecorator((0, types_1.isValueSchema)(schema) ? schema : (0, types_1.valueSchema)(schema));
 }
-exports.createSchemaPropertyDecoratorFromValueType = createSchemaPropertyDecoratorFromValueType;
+exports.createSchemaPropertyDecoratorFromSchema = createSchemaPropertyDecoratorFromSchema;
 function createSchemaValueCoercerDecorator(coercer, options) {
     return createSchemaPropertyDecorator({ ...options, coercers: coercer });
 }

package/schema/decorators/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/schema/decorators/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/schema/decorators/utils.ts"],"names":[],"mappings":"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"}

package/schema/schema.d.ts

@@ -1,18 +1,16 @@
 import { JsonPath } from "../json-path";
-import type { ObjectSchema, SchemaTestOptions, SchemaTestResult, SchemaValueCoercer, TypeSchema, ValueSchema } from './types';
-export declare type Schema<T = any, O = T> = ObjectSchema<T, O> | ValueSchema<T, O>;
-export declare const getSchemaFromReflection: typeof _getObjectSchemaFromReflection;
-export declare type SchemaTestable<T = any, O = T> = Schema<T, O> | TypeSchema<T, O>;
+import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, SchemaTestOptions, SchemaTestResult, SchemaValueCoercer, TypeSchema, ValueSchema, ValueType } from './types';
+export declare type Schema<T = any, O = T> = ObjectSchema<T, O> | ValueSchema<T, O> | TypeSchema<O>;
+export declare type SchemaTestable<T = any, O = T> = Schema<T, O> | ValueType<O>;
+export declare type NormalizedSchema<T = any, O = T> = NormalizedObjectSchema<T, O> | NormalizedValueSchema<T, O> | NormalizedTypeSchema<O>;
 export declare const Schema: {
     registerDefaultCoercer(coercer: SchemaValueCoercer): void;
-    test<T, O>(schema: SchemaTestable<T, O>, value: unknown, options?: SchemaTestOptions, path?: JsonPath): SchemaTestResult<O>;
-    validate<T_1, O_1 = T_1>(schema: SchemaTestable<T_1, O_1>, value: unknown, options?: SchemaTestOptions): boolean;
-    parse<T_2, O_2 = T_2>(schema: SchemaTestable<T_2, O_2>, value: unknown, options?: SchemaTestOptions): O_2;
+    test<T, O>(schemaOrValueType: SchemaTestable<T, O>, value: unknown, options?: SchemaTestOptions, path?: JsonPath): SchemaTestResult<O>;
+    validate<T_1, O_1 = T_1>(schemaOrValueType: SchemaTestable<T_1, O_1>, value: unknown, options?: SchemaTestOptions): boolean;
+    parse<T_2, O_2 = T_2>(schemaOrValueType: SchemaTestable<T_2, O_2>, value: unknown, options?: SchemaTestOptions): O_2;
     /**
      * disables stack traces for errors
      * @deprecated for internal use only
      */
-    testWithFastError<T_3, O_3 = T_3>(schema: SchemaTestable<T_3, O_3>, value: unknown, options?: SchemaTestOptions, path?: JsonPath): SchemaTestResult<O_3>;
+    testWithFastError<T_3, O_3 = T_3>(schema: Schema<T_3, O_3>, value: unknown, options?: SchemaTestOptions, path?: JsonPath): SchemaTestResult<O_3>;
 };
-declare function _getObjectSchemaFromReflection<T, O>(type: TypeSchema<T, O>): ObjectSchema<T> | null;
-export {};

package/schema/schema.error.d.ts

@@ -8,6 +8,7 @@ export declare type SchemaErrorOptions = Pick<CustomErrorOptions, 'fast'> & {
     path: string | JsonPath;
     inner?: OneOrMany<SchemaError>;
     details?: UndefinableJson;
+    cause?: any;
 };
 export declare class SchemaError extends CustomError implements ErrorExtraInfo {
     static readonly errorName = "SchemaError";

package/schema/schema.error.js

@@ -7,7 +7,7 @@ const type_guards_1 = require("../utils/type-guards");
 const utils_1 = require("./utils");
 class SchemaError extends error_1.CustomError {
     constructor(message, options, cause) {
-        super({ message, cause, fast: options.fast ?? true });
+        super({ message, cause: cause ?? options.cause, fast: options.fast ?? true });
         this.path = (0, type_guards_1.isString)(options.path) ? options.path : options.path.path;
         if ((0, type_guards_1.isDefined)(options.inner)) {
             const errors = (0, array_1.toArray)(options.inner);

package/schema/schema.error.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.error.js","sourceRoot":"","sources":["../../source/schema/schema.error.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.error.js","sourceRoot":"","sources":["../../source/schema/schema.error.ts"],"names":[],"mappings":"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"}

package/schema/schema.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Schema = exports.getSchemaFromReflection = void 0;
+exports.Schema = void 0;
 const json_path_1 = require("../json-path");
-const reflection_1 = require("../reflection");
 const array_1 = require("../utils/array/array");
-const function_1 = require("../utils/function");
 const noop_1 = require("../utils/noop");
 const object_1 = require("../utils/object/object");
 const set_1 = require("../utils/set");
@@ -18,7 +16,6 @@ const uint8_array_coercer_1 = require("./coercers/uint8-array.coercer");
 const schema_error_1 = require("./schema.error");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
-exports.getSchemaFromReflection = (0, function_1.memoizeSingle)(_getObjectSchemaFromReflection);
 const defaultCoercers = new Map();
 let initialize = () => {
     exports.Schema.registerDefaultCoercer(number_coercer_1.numberCoercer);
@@ -39,20 +36,23 @@ exports.Schema = {
             defaultCoercers.get(sourceType).push(coercer);
         }
     },
-    test(schema, value, options, path = json_path_1.JsonPath.ROOT) {
+    test(schemaOrValueType, value, options, path = json_path_1.JsonPath.ROOT) {
+        const schema = (0, types_1.valueTypeOrSchemaToSchema)(schemaOrValueType);
         const result = this.testWithFastError(schema, value, options, path);
-        if (result.success) {
+        if (result.valid) {
             return result;
         }
-        return { success: false, error: new schema_error_1.SchemaError(result.error.message, { ...result.error, fast: false }, result.error.cause) };
+        return { valid: false, error: new schema_error_1.SchemaError(result.error.message, { ...result.error, fast: false }) };
     },
-    validate(schema, value, options) {
+    validate(schemaOrValueType, value, options) {
+        const schema = (0, types_1.valueTypeOrSchemaToSchema)(schemaOrValueType);
         const result = this.test(schema, value, options);
-        return result.success;
+        return result.valid;
     },
-    parse(schema, value, options) {
+    parse(schemaOrValueType, value, options) {
+        const schema = (0, types_1.valueTypeOrSchemaToSchema)(schemaOrValueType);
         const result = this.test(schema, value, options);
-        if (result.success) {
+        if (result.valid) {
             return result.value;
         }
         throw result.error;
@@ -66,222 +66,189 @@ exports.Schema = {
         if ((0, types_1.isValueSchema)(schema)) {
             return testValue(schema, value, options, path);
         }
-        return testObject(schema, value, options, path);
+        if ((0, types_1.isTypeSchema)(schema)) {
+            return testType(schema, value, options, path);
+        }
+        if ((0, types_1.isObjectSchema)(schema)) {
+            return testObject(schema, value, options, path);
+        }
+        throw new Error('Unsupported schema');
     }
 };
-// eslint-disable-next-line complexity
-function testObject(schemaOrType, value, options = {}, path = json_path_1.JsonPath.ROOT) {
-    if ((0, type_guards_1.isFunction)(schemaOrType) && (value instanceof schemaOrType)) {
-        return { success: true, value: value };
+function testType(schema, value, options = {}, path = json_path_1.JsonPath.ROOT) {
+    const resolvedValueType = (0, types_1.resolveValueType)(schema.type);
+    if (resolvedValueType == 'any') {
+        return { valid: true, value: value };
+    }
+    else if ((0, type_guards_1.isFunction)(resolvedValueType)) {
+        if ((value instanceof resolvedValueType) || ((0, utils_1.getValueType)(value) == resolvedValueType)) {
+            return { valid: true, value: value };
+        }
+        const objectSchema = (0, utils_1.getSchemaFromReflection)(resolvedValueType);
+        if ((0, type_guards_1.isNotNull)(objectSchema)) {
+            return testObject(objectSchema, value, options, path);
+        }
     }
-    if (!(value instanceof Object) && !(0, type_guards_1.isObject)(value)) {
-        const expected = (0, type_guards_1.isFunction)(schemaOrType) ? schemaOrType : Object;
-        return { success: false, error: schema_error_1.SchemaError.expectedButGot(expected, (0, utils_1.getValueType)(value), path) };
+    else if ((resolvedValueType == 'null' && (0, type_guards_1.isNull)(value)) || (resolvedValueType == 'undefined' && (0, type_guards_1.isUndefined)(value)) || (resolvedValueType == 'any')) {
+        return { valid: true, value: value };
     }
-    const unnormalizedSchema = (0, type_guards_1.isFunction)(schemaOrType) ? (0, exports.getSchemaFromReflection)(schemaOrType) : schemaOrType;
-    if ((0, type_guards_1.isNull)(unnormalizedSchema)) {
-        return { success: false, error: schema_error_1.SchemaError.expectedButGot(schemaOrType, (0, utils_1.getValueType)(value), path) };
+    return { valid: false, error: schema_error_1.SchemaError.expectedButGot(resolvedValueType, (0, utils_1.getValueType)(value), path) };
+}
+// eslint-disable-next-line complexity
+function testObject(objectSchema, value, options = {}, path = json_path_1.JsonPath.ROOT) {
+    if (!(value instanceof Object)) {
+        return { valid: false, error: schema_error_1.SchemaError.expectedButGot(objectSchema.sourceType ?? 'object', (0, utils_1.getValueType)(value), path) };
     }
-    const schema = (0, utils_1.normalizeSchema)(unnormalizedSchema);
+    const schema = (0, utils_1.normalizeObjectSchema)(objectSchema);
     const mask = schema.mask ?? options.mask ?? false;
     const resultValue = (0, type_guards_1.isDefined)(schema.factory?.type) ? new schema.factory.type() : {};
     const schemaPropertyKeys = (0, object_1.objectKeys)(schema.properties);
     const valuePropertyKeys = (0, object_1.objectKeys)(value);
     const unknownValuePropertyKeys = (0, set_1.differenceSets)(new Set(valuePropertyKeys), new Set(schemaPropertyKeys));
     if ((unknownValuePropertyKeys.length > 0) && !(mask || (schema.allowUnknownProperties.size > 0))) {
-        return { success: false, error: new schema_error_1.SchemaError('Unknown property', { path: path.add(unknownValuePropertyKeys[0]) }) };
+        return { valid: false, error: new schema_error_1.SchemaError('Unknown property', { path: path.add(unknownValuePropertyKeys[0]) }) };
     }
     for (const key of schemaPropertyKeys) {
         const propertyResult = exports.Schema.testWithFastError(schema.properties[key], value[key], options, path.add(key));
-        if (!propertyResult.success) {
+        if (!propertyResult.valid) {
             return propertyResult;
         }
         resultValue[key] = propertyResult.value;
     }
     if (schema.allowUnknownProperties.size > 0) {
         for (const key of unknownValuePropertyKeys) {
-            const errors = [];
-            for (const allowedSchema of schema.allowUnknownProperties) {
-                const propertyResult = exports.Schema.testWithFastError(allowedSchema, value[key], options, path.add(key));
-                if (!propertyResult.success && !mask) {
-                    errors.push(propertyResult.error);
-                    continue;
-                }
-                resultValue[key] = propertyResult.value;
-                break;
-            }
-            if (errors.length > 0) {
-                return { success: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value did not match any allowed schemas.', { inner: errors, path }) };
+            const propertyResult = exports.Schema.testWithFastError((0, types_1.valueSchema)([...schema.allowUnknownProperties]), value[key], options, path.add(key));
+            if (!propertyResult.valid && !mask) {
+                return propertyResult;
             }
+            resultValue[key] = propertyResult.value;
         }
     }
     const testResultValue = (0, type_guards_1.isUndefined)(schema.factory) ? resultValue : (0, type_guards_1.isDefined)(schema.factory.type) ? resultValue : schema.factory.builder(resultValue);
-    return { success: true, value: testResultValue };
+    return { valid: true, value: testResultValue };
 }
 // eslint-disable-next-line max-lines-per-function, max-statements, complexity
 function testValue(schema, value, options = {}, path = json_path_1.JsonPath.ROOT) {
-    const valueSchema = (0, utils_1.normalizeValueSchema)(schema);
-    if (valueSchema.optional && (0, type_guards_1.isUndefined)(value)) {
-        return { success: true, value: value };
+    const normalizedValueSchema = (0, utils_1.normalizeValueSchema)(schema);
+    if (normalizedValueSchema.optional && (0, type_guards_1.isUndefined)(value)) {
+        return { valid: true, value: value };
     }
-    if (valueSchema.nullable && (0, type_guards_1.isNull)(value)) {
-        return { success: true, value: value };
+    if (normalizedValueSchema.nullable && (0, type_guards_1.isNull)(value)) {
+        return { valid: true, value: value };
     }
     const context = {
-        schema: valueSchema,
+        schema: normalizedValueSchema,
         options
     };
     /** handle arrays */
-    if (valueSchema.array) {
+    if (normalizedValueSchema.array) {
         if (!(0, type_guards_1.isArray)(value)) {
             throw schema_error_1.SchemaError.expectedButGot(Array, (0, utils_1.getValueType)(value), path);
         }
-        for (const arrayConstraint of valueSchema.arrayConstraints) {
+        for (const arrayConstraint of normalizedValueSchema.arrayConstraints) {
             const result = arrayConstraint.validate(value, path, context);
-            if (!result.success) {
-                return { success: false, error: result.error };
+            if (!result.valid) {
+                return { valid: false, error: result.error };
             }
         }
         const itemSchema = (0, utils_1.getArrayItemSchema)(schema);
         const validatedItems = [];
         for (let i = 0; i < value.length; i++) {
             const result = testValue(itemSchema, value[i], options, path.add(i));
-            if (!result.success) {
+            if (!result.valid) {
                 return result;
             }
             validatedItems.push(result.value);
         }
-        return { success: true, value: validatedItems };
-    }
-    let valueType = (0, utils_1.getValueType)(value);
-    let validType = isValidType(valueSchema, valueType);
-    let resultValue = value;
-    /** try to coerce with custom coercers */
-    if (!validType) {
-        const coercers = valueSchema.coercers.get(valueType);
-        if ((0, type_guards_1.isDefined)(coercers)) {
-            const errors = [];
-            for (const coercer of coercers) {
-                const coerceResult = coercer.coerce(resultValue, path, context);
-                if (!coerceResult.success) {
-                    errors.push(coerceResult.error);
-                    continue;
-                }
-                resultValue = coerceResult.value;
-                valueType = (0, utils_1.getValueType)(resultValue);
-                validType = isValidType(valueSchema, valueType);
-                break;
-            }
-            if ((errors.length > 0)) {
-                return { success: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value could not be coerced.', { inner: errors, path }) };
-            }
-        }
-    }
-    /** try to coerce with default coercers if enabled */
-    if (!validType && (valueSchema.coerce || options.coerce == true)) {
-        const coercers = defaultCoercers.get(valueType);
-        if ((0, type_guards_1.isDefined)(coercers)) {
-            const errors = [];
-            for (const coercer of coercers) {
-                const coerceResult = coercer.coerce(resultValue, path, context);
-                if (!coerceResult.success) {
-                    errors.push(coerceResult.error);
-                    continue;
-                }
-                resultValue = coerceResult.value;
-                valueType = (0, utils_1.getValueType)(resultValue);
-                validType = isValidType(valueSchema, valueType);
-                break;
-            }
-            if ((errors.length > 0)) {
-                return { success: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value could not be coerced.', { inner: errors, path }) };
-            }
-        }
-    }
-    /** check for sub-schemas */
-    if (!validType) {
+        return { valid: true, value: validatedItems };
+    }
+    let valueType;
+    let valueTestResult;
+    let resultValue;
+    function updateCurrentState(newValue) {
+        resultValue = newValue;
+        valueType = (0, utils_1.getValueType)(newValue);
+        valueTestResult = isValidValue(normalizedValueSchema.schema, newValue, options, path);
+    }
+    updateCurrentState(value);
+    /** try to coerce */
+    if (!valueTestResult.valid) {
+        const coercers = [
+            ...(normalizedValueSchema.coercers.get(valueType) ?? []),
+            ...((normalizedValueSchema.coerce || options.coerce == true) ? (defaultCoercers.get(valueType) ?? []) : [])
+        ];
         const errors = [];
-        for (const type of valueSchema.type) {
-            if (types_1.primitiveValueTypesSet.has(type)) {
-                continue;
-            }
-            const typeSchema = (0, types_1.valueTypesToSchema)(type);
-            const result = exports.Schema.testWithFastError(typeSchema, resultValue, options, path);
-            if (!result.success) {
-                errors.push(result.error);
+        let success = false;
+        for (const coercer of coercers) {
+            const coerceResult = coercer.coerce(resultValue, path, context);
+            if (!coerceResult.success) {
+                errors.push(coerceResult.error);
                 continue;
             }
-            resultValue = result.value;
-            validType = true;
+            success = true;
+            updateCurrentState(coerceResult.value);
             break;
         }
-        if (!validType && (errors.length > 0)) {
-            return { success: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value did not match any allowed schemas.', { inner: errors, path }) };
+        if (!success && (errors.length > 0)) {
+            return { valid: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value could not be coerced.', { inner: errors, path }) };
         }
     }
-    if (!validType) {
-        const expectedNames = [...valueSchema.type].map((exp) => ((0, type_guards_1.isString)(exp) ? exp : (0, utils_1.getValueTypeName)(exp)));
-        const expectedTypeString = expectedNames.length == 1
-            ? expectedNames[0]
-            : `[${expectedNames.join(', ')}]`;
-        const expects = valueSchema.valueConstraints.map((constraint) => constraint.expects);
-        const expectsString = expects.length > 0 ? ` (${expects.join(', ')})` : '';
-        return { success: false, error: schema_error_1.SchemaError.expectedButGot(`${expectedTypeString}${expectsString}`, (0, utils_1.getValueType)(resultValue), path) };
+    if (!valueTestResult.valid) {
+        const expectsString = getExpectString(schema);
+        return { valid: false, error: schema_error_1.SchemaError.expectedButGot(expectsString, valueType, path) };
     }
-    if (valueSchema.transformers.length > 0) {
-        for (const transformer of valueSchema.transformers) {
-            resultValue = transformer.transform(resultValue, path, context);
+    if (normalizedValueSchema.transformers.length > 0) {
+        let transformedValue = resultValue;
+        for (const transformer of normalizedValueSchema.transformers) {
+            const transformResult = transformer.transform(transformedValue, path, context);
+            if (!transformResult.success) {
+                return { valid: false, error: transformResult.error };
+            }
+            transformedValue = transformResult.value;
         }
-        valueType = (0, utils_1.getValueType)(resultValue);
-        validType = isValidType(valueSchema, valueType);
-        if (!validType) {
-            const typeString = (0, type_guards_1.isFunction)(valueType) ? valueType.name : valueType;
+        updateCurrentState(transformedValue);
+        if (!valueTestResult.valid) { // eslint-disable-line @typescript-eslint/no-unnecessary-condition
+            const typeString = (0, utils_1.getValueTypeName)(valueType);
             throw new Error(`Transformers resulted in invalid type (${typeString}).`);
         }
     }
-    for (const constraint of valueSchema.valueConstraints) {
-        const result = constraint.validate(resultValue, path, context);
-        if (!result.success) {
-            return { success: false, error: result.error };
+    {
+        const errors = [];
+        for (const constraint of normalizedValueSchema.valueConstraints) {
+            const result = constraint.validate(resultValue, path, context);
+            if (!result.valid) {
+                errors.push(result.error);
+            }
+        }
+        if (errors.length > 0) {
+            return { valid: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value did not match schema.', { path, fast: true, inner: errors }) };
         }
     }
-    return { success: true, value: resultValue };
+    return { valid: true, value: resultValue };
 }
-function isValidType(valueSchema, valueType) {
-    return valueSchema.type.has(valueType) || valueSchema.type.has('any');
-}
-function _getObjectSchemaFromReflection(type) {
-    const metadata = reflection_1.reflectionRegistry.getMetadata(type);
-    if (!metadata.registered) {
-        return null;
-    }
-    const typeData = metadata.data.tryGet('schema');
-    const properties = {};
-    for (const [key, propertyMetadata] of metadata.properties) {
-        const reflectionData = propertyMetadata.data.tryGet('schema');
-        const itemType = (0, type_guards_1.isDefined)(reflectionData?.type) ? (0, types_1.deferrableValueTypesToValueTypes)(reflectionData.type) : undefined;
-        const array = ((propertyMetadata.type == Array) && (itemType != Array)) || (reflectionData?.array == true);
-        if (array && ((0, type_guards_1.isUndefined)(itemType) || ((0, type_guards_1.isArray)(itemType) && (itemType.length == 0)))) {
-            throw new Error(`Item type missing on type ${type.name} at property "${String(key)}"`);
+function isValidValue(validSchemas, value, options, path) {
+    const errors = [];
+    for (const schema of validSchemas) {
+        const result = exports.Schema.testWithFastError(schema, value, options, path);
+        if (result.valid) {
+            return result;
         }
-        properties[key] = {
-            type: (itemType ?? propertyMetadata.type),
-            array,
-            optional: reflectionData?.optional,
-            nullable: reflectionData?.nullable,
-            coerce: reflectionData?.coerce,
-            coercers: reflectionData?.coercers,
-            transformers: reflectionData?.transformers,
-            arrayConstraints: reflectionData?.arrayConstraints,
-            valueConstraints: reflectionData?.valueConstraints
-        };
+        errors.push(result.error);
     }
-    const objectSchema = {
-        factory: (0, type_guards_1.isDefined)(typeData?.factory) ? { builder: typeData.factory } : { type: type },
-        properties,
-        mask: typeData?.mask,
-        allowUnknownProperties: typeData?.allowUnknownProperties
-    };
-    return objectSchema;
+    const expectStrings = [];
+    for (const schema of validSchemas) {
+        getExpectString(schema);
+    }
+    const expectString = expectStrings.join('\n');
+    return { valid: false, error: schema_error_1.SchemaError.expectedButGot(expectString, (0, utils_1.getValueType)(value), path) };
+}
+function getExpectString(schema) {
+    const expectedNames = (0, utils_1.getSchemaTypeNames)(schema);
+    const expectedTypeString = (expectedNames.length == 1)
+        ? expectedNames[0]
+        : `[${expectedNames.join(', ')}]`;
+    const expects = (0, types_1.isValueSchema)(schema) ? (0, array_1.toArray)(schema.valueConstraints ?? []).map((constraint) => constraint.expects) : [];
+    const expectsString = (expects.length > 0) ? ` (${expects.join(', ')})` : '';
+    return `${expectedTypeString}${expectsString}`;
 }
 //# sourceMappingURL=schema.js.map