@tstdl/base 0.78.0-beta1 → 0.78.0-beta10

package/schema/schemas/uint8-array.js

@@ -1,11 +1,12 @@
 "use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uint8Array = exports.uint8Array = void 0;
 const type_guards_1 = require("../../utils/type-guards");
 const uint8_array_coercer_1 = require("../coercers/uint8-array.coercer");
 const maximum_length_1 = require("../constraints/maximum-length");
 const minimum_length_1 = require("../constraints/minimum-length");
-const decorators_1 = require("../decorators");
+const utils_1 = require("../decorators/utils");
 const types_1 = require("../types");
 function uint8Array(options = {}) {
     const constraints = [];
@@ -15,15 +16,14 @@ function uint8Array(options = {}) {
     if ((0, type_guards_1.isDefined)(options.maximumLength)) {
         constraints.push(new maximum_length_1.MaximumLengthConstraint(options.maximumLength));
     }
-    return (0, types_1.valueSchema)({
-        type: globalThis.Uint8Array,
+    return (0, types_1.valueSchema)((0, types_1.typeSchema)(globalThis.Uint8Array), {
         coercers: (options.coerce == true) ? uint8_array_coercer_1.uint8ArrayCoercer : undefined,
         valueConstraints: constraints
     });
 }
 exports.uint8Array = uint8Array;
 function Uint8Array(options) {
-    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(uint8Array(options));
+    return (0, utils_1.createSchemaPropertyDecoratorFromSchema)(uint8Array(options));
 }
 exports.Uint8Array = Uint8Array;
 //# sourceMappingURL=uint8-array.js.map

package/schema/schemas/uint8-array.js.map

@@ -1 +1 @@
-{"version":3,"file":"uint8-array.js","sourceRoot":"","sources":["../../../source/schema/schemas/uint8-array.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,yEAAoE;AACpE,kEAAwE;AACxE,kEAAwE;AACxE,8CAA2E;AAG3E,oCAAuC;AAOvC,SAAgB,UAAU,CAAC,UAAmC,EAAE;IAC9D,MAAM,WAAW,GAA4B,EAAE,CAAC;IAEhD,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,IAAI,wCAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;KACtE;IAED,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,IAAI,wCAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;KACtE;IAED,OAAO,IAAA,mBAAW,EAAC;QACjB,IAAI,EAAE,UAAU,CAAC,UAAU;QAC3B,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,uCAAiB,CAAC,CAAC,CAAC,SAAS;QAClE,gBAAgB,EAAE,WAAW;KAC9B,CAAC,CAAC;AACL,CAAC;AAhBD,gCAgBC;AAED,SAAgB,UAAU,CAAC,OAAiC;IAC1D,OAAO,IAAA,uDAA0C,EAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AACzE,CAAC;AAFD,gCAEC"}
+{"version":3,"file":"uint8-array.js","sourceRoot":"","sources":["../../../source/schema/schemas/uint8-array.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,yDAAgD;AAChD,yEAAoE;AACpE,kEAAwE;AACxE,kEAAwE;AACxE,+CAA8E;AAE9E,oCAAmD;AAOnD,SAAgB,UAAU,CAAC,UAAmC,EAAE;IAC9D,MAAM,WAAW,GAA4B,EAAE,CAAC;IAEhD,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,IAAI,wCAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;KACtE;IAED,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,IAAI,wCAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;KACtE;IAED,OAAO,IAAA,mBAAW,EAAC,IAAA,kBAAU,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACpD,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,uCAAiB,CAAC,CAAC,CAAC,SAAS;QAClE,gBAAgB,EAAE,WAAW;KAC9B,CAAC,CAAC;AACL,CAAC;AAfD,gCAeC;AAED,SAAgB,UAAU,CAAC,OAAiC;IAC1D,OAAO,IAAA,+CAAuC,EAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC;AAFD,gCAEC"}

package/schema/schemas/union.d.ts

@@ -1,5 +1,10 @@
 import type { Decorator } from "../../reflection";
-import type { MaybeDeferredValueTypes, ValueSchema } from '../types';
-export declare type UnionTypeHelper<T extends MaybeDeferredValueTypes> = T extends MaybeDeferredValueTypes<infer U> ? U : never;
-export declare function union<T extends [MaybeDeferredValueTypes, ...MaybeDeferredValueTypes[]]>(...schemas: T): ValueSchema<UnionTypeHelper<T[number]>>;
-export declare function Union(...schemas: [MaybeDeferredValueTypes, ...MaybeDeferredValueTypes[]]): Decorator<'property' | 'accessor'>;
+import type { Schema } from '../schema';
+import type { ValueSchema } from '../types';
+export declare function union<T1, O1, T2, O2>(schema1: Schema<T1, O1>, schema2: Schema<T2, O2>): ValueSchema<T1 | T2, O1 | O2>;
+export declare function union<T1, O1, T2, O2, T3, O3>(schema1: Schema<T1, O1>, schema2: Schema<T2, O2>, schema3: Schema<T3, O3>): ValueSchema<T1 | T2 | T3, O1 | O2 | O3>;
+export declare function union<T1, O1, T2, O2, T3, O3, T4, O4>(schema1: Schema<T1, O1>, schema2: Schema<T2, O2>, schema3: Schema<T3, O3>, schema4: Schema<T4, O4>): ValueSchema<T1 | T2 | T3 | T4, O1 | O2 | O3 | O4>;
+export declare function union<T1, O1, T2, O2, T3, O3, T4, O4, T5, O5>(schema1: Schema<T1, O1>, schema2: Schema<T2, O2>, schema3: Schema<T3, O3>, schema4: Schema<T4, O4>, schema5: Schema<T5, O5>): ValueSchema<T1 | T2 | T3 | T4 | T5, O1 | O2 | O3 | O4 | O5>;
+export declare function union<T1, O1, T2, O2, T3, O3, T4, O4, T5, O5, T6, O6>(schema1: Schema<T1, O1>, schema2: Schema<T2, O2>, schema3: Schema<T3, O3>, schema4: Schema<T4, O4>, schema5: Schema<T5, O5>, schema6: Schema<T6>): ValueSchema<T1 | T2 | T3 | T4 | T5 | T6, O1 | O2 | O3 | O4 | O5 | O6>;
+export declare function union(...schemas: Schema[]): ValueSchema;
+export declare function Union(...schemas: Schema[]): Decorator<'property' | 'accessor'>;

package/schema/schemas/union.js

@@ -1,16 +1,17 @@
 "use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Union = exports.union = void 0;
+const type_guards_1 = require("../../utils/type-guards");
 const decorators_1 = require("../decorators");
 const types_1 = require("../types");
 function union(...schemas) {
-    return (0, types_1.valueSchema)({
-        type: schemas
-    });
+    (0, type_guards_1.assert)(schemas.length >= 2, 'Assign requires at least 2 schemas.');
+    return (0, types_1.valueSchema)(schemas);
 }
 exports.union = union;
 function Union(...schemas) {
-    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(union(...schemas));
+    return (0, decorators_1.createSchemaPropertyDecoratorFromSchema)(union(...schemas));
 }
 exports.Union = Union;
 //# sourceMappingURL=union.js.map

package/schema/schemas/union.js.map

@@ -1 +1 @@
-{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";;;AACA,8CAA2E;AAE3E,oCAAuC;AAIvC,SAAgB,KAAK,CAAoE,GAAG,OAAU;IACpG,OAAO,IAAA,mBAAW,EAAC;QACjB,IAAI,EAAE,OAAO;KACd,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC;AAED,SAAgB,KAAK,CAAC,GAAG,OAAgE;IACvF,OAAO,IAAA,uDAA0C,EAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;AACvE,CAAC;AAFD,sBAEC"}
+{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,yDAA6C;AAC7C,8CAAwE;AAGxE,oCAAuC;AAQvC,SAAgB,KAAK,CAAC,GAAG,OAAiB;IACxC,IAAA,oBAAM,EAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAC;IACnE,OAAO,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAHD,sBAGC;AAED,SAAgB,KAAK,CAAC,GAAG,OAAiB;IACxC,OAAO,IAAA,oDAAuC,EAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,sBAEC"}

package/schema/schemas/unknown.d.ts

@@ -1,4 +1,4 @@
 import type { Decorator } from "../../reflection";
-import type { ValueSchema } from '../types';
-export declare function unknown(): ValueSchema<unknown>;
+import type { TypeSchema } from '../types';
+export declare function unknown(): TypeSchema<unknown>;
 export declare function Unknwon(): Decorator<'property' | 'accessor'>;

package/schema/schemas/unknown.js

@@ -5,11 +5,11 @@ exports.Unknwon = exports.unknown = void 0;
 const decorators_1 = require("../decorators");
 const types_1 = require("../types");
 function unknown() {
-    return (0, types_1.valueSchema)({ type: 'any' });
+    return (0, types_1.typeSchema)('any');
 }
 exports.unknown = unknown;
 function Unknwon() {
-    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(unknown());
+    return (0, decorators_1.createSchemaPropertyDecoratorFromSchema)(unknown());
 }
 exports.Unknwon = Unknwon;
 //# sourceMappingURL=unknown.js.map

package/schema/schemas/unknown.js.map

@@ -1 +1 @@
-{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../source/schema/schemas/unknown.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAA2E;AAE3E,oCAAuC;AAEvC,SAAgB,OAAO;IACrB,OAAO,IAAA,mBAAW,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AACtC,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO;IACrB,OAAO,IAAA,uDAA0C,EAAC,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC;AAFD,0BAEC"}
+{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../source/schema/schemas/unknown.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAwE;AAExE,oCAAsC;AAEtC,SAAgB,OAAO;IACrB,OAAO,IAAA,kBAAU,EAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO;IACrB,OAAO,IAAA,oDAAuC,EAAC,OAAO,EAAE,CAAC,CAAC;AAC5D,CAAC;AAFD,0BAEC"}

package/schema/transformers/generic.d.ts

@@ -1,13 +1,13 @@
 import type { Decorator } from "../../reflection";
-import type { OneOrMany, TypedOmit } from "../../types";
+import type { AbstractConstructor, OneOrMany, TypedOmit } from "../../types";
 import type { TransformResult, ValueType } from '../types';
 import { SchemaValueTransformer } from '../types';
-export declare type GenericTransformFunction<T> = (value: T) => TypedOmit<TransformResult, 'success'>;
-export declare class GenericTransformer<T> extends SchemaValueTransformer {
-    readonly sourceType: OneOrMany<ValueType>;
-    readonly targetType: ValueType;
-    readonly transformFunction: GenericTransformFunction<T>;
-    constructor(sourceType: OneOrMany<ValueType>, targetType: ValueType, transformFunction: GenericTransformFunction<T>);
-    transform(value: T): TransformResult;
+export declare type GenericTransformFunction<T, O> = (value: T) => TypedOmit<TransformResult<O>, 'success'>;
+export declare class GenericTransformer<T, O, TransformOutput> extends SchemaValueTransformer<T, O, TransformOutput> {
+    readonly sourceType: OneOrMany<ValueType<T>>;
+    readonly targetType: ValueType<TransformOutput>;
+    readonly transformFunction: GenericTransformFunction<O, TransformOutput>;
+    constructor(sourceType: OneOrMany<ValueType<T>>, targetType: AbstractConstructor<TransformOutput>, transformFunction: GenericTransformFunction<O, TransformOutput>);
+    transform(value: O): TransformResult<TransformOutput>;
 }
-export declare function Transform<T>(sourceType: OneOrMany<ValueType>, targetType: ValueType, transformFunction: GenericTransformFunction<T>): Decorator<'property' | 'accessor'>;
+export declare function Transform<T, O, TransformOutput>(sourceType: OneOrMany<AbstractConstructor<T>>, targetType: AbstractConstructor, transformFunction: GenericTransformFunction<O, TransformOutput>): Decorator<'property' | 'accessor'>;

package/schema/transformers/generic.js.map

@@ -1 +1 @@
-{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../../source/schema/transformers/generic.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,yDAAgD;AAChD,8CAAsE;AAEtE,oCAAkD;AAIlD,MAAa,kBAAsB,SAAQ,8BAAsB;IAK/D,YAAY,UAAgC,EAAE,UAAqB,EAAE,iBAA8C;QACjH,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED,SAAS,CAAC,KAAQ;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,IAAA,uBAAS,EAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAC3B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;SAChD;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAChD,CAAC;CACF;AAtBD,gDAsBC;AAED,SAAgB,SAAS,CAAI,UAAgC,EAAE,UAAqB,EAAE,iBAA8C;IAClI,OAAO,IAAA,kDAAqC,EAAC,IAAI,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAClH,CAAC;AAFD,8BAEC"}
+{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../../source/schema/transformers/generic.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,yDAAgD;AAChD,8CAAsE;AAEtE,oCAAkD;AAIlD,MAAa,kBAA0C,SAAQ,8BAA6C;IAK1G,YAAY,UAAmC,EAAE,UAAgD,EAAE,iBAA+D;QAChK,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED,SAAS,CAAC,KAAQ;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,IAAA,uBAAS,EAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAC3B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;SAChD;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAM,EAAE,CAAC;IACjD,CAAC;CACF;AAtBD,gDAsBC;AAED,SAAgB,SAAS,CAAwB,UAA6C,EAAE,UAA+B,EAAE,iBAA+D;IAC9L,OAAO,IAAA,kDAAqC,EAAC,IAAI,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAClH,CAAC;AAFD,8BAEC"}

package/schema/transformers/lowercase.d.ts

@@ -1,9 +1,9 @@
 import type { Decorator } from "../../reflection";
 import type { TransformResult } from '../types';
 import { SchemaValueTransformer } from '../types';
-export declare class LowercaseTransformer extends SchemaValueTransformer {
+export declare class LowercaseTransformer extends SchemaValueTransformer<string, string, string> {
     readonly sourceType: StringConstructor;
     readonly targetType: StringConstructor;
-    transform(value: string): TransformResult;
+    transform(value: string): TransformResult<string>;
 }
 export declare function Lowercase(): Decorator<'property' | 'accessor'>;

package/schema/transformers/lowercase.js

@@ -16,7 +16,7 @@ class LowercaseTransformer extends types_1.SchemaValueTransformer {
 }
 exports.LowercaseTransformer = LowercaseTransformer;
 function Lowercase() {
-    return (0, decorators_1.createSchemaValueTransformerDecorator)(new LowercaseTransformer(), { type: String });
+    return (0, decorators_1.createSchemaValueTransformerDecorator)(new LowercaseTransformer(), { schema: (0, types_1.typeSchema)(String) });
 }
 exports.Lowercase = Lowercase;
 //# sourceMappingURL=lowercase.js.map

package/schema/transformers/lowercase.js.map

@@ -1 +1 @@
-{"version":3,"file":"lowercase.js","sourceRoot":"","sources":["../../../source/schema/transformers/lowercase.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAsE;AAEtE,oCAAkD;AAElD,MAAa,oBAAqB,SAAQ,8BAAsB;IAAhE;;QACW,eAAU,GAAG,MAAM,CAAC;QACpB,eAAU,GAAG,MAAM,CAAC;IAK/B,CAAC;IAHC,SAAS,CAAC,KAAa;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IACvD,CAAC;CACF;AAPD,oDAOC;AAED,SAAgB,SAAS;IACvB,OAAO,IAAA,kDAAqC,EAAC,IAAI,oBAAoB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7F,CAAC;AAFD,8BAEC"}
+{"version":3,"file":"lowercase.js","sourceRoot":"","sources":["../../../source/schema/transformers/lowercase.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAsE;AAEtE,oCAA8D;AAE9D,MAAa,oBAAqB,SAAQ,8BAA8C;IAAxF;;QACW,eAAU,GAAG,MAAM,CAAC;QACpB,eAAU,GAAG,MAAM,CAAC;IAK/B,CAAC;IAHC,SAAS,CAAC,KAAa;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IACvD,CAAC;CACF;AAPD,oDAOC;AAED,SAAgB,SAAS;IACvB,OAAO,IAAA,kDAAqC,EAAC,IAAI,oBAAoB,EAAE,EAAE,EAAE,MAAM,EAAE,IAAA,kBAAU,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3G,CAAC;AAFD,8BAEC"}

package/schema/transformers/trim.d.ts

@@ -1,9 +1,9 @@
 import type { Decorator } from "../../reflection";
 import type { TransformResult } from '../types';
 import { SchemaValueTransformer } from '../types';
-export declare class TrimTransformer extends SchemaValueTransformer {
+export declare class TrimTransformer extends SchemaValueTransformer<string, string, string> {
     readonly sourceType: StringConstructor;
     readonly targetType: StringConstructor;
-    transform(value: string): TransformResult;
+    transform(value: string): TransformResult<string>;
 }
 export declare function Trim(): Decorator<'property' | 'accessor'>;

package/schema/transformers/trim.js

@@ -16,7 +16,7 @@ class TrimTransformer extends types_1.SchemaValueTransformer {
 }
 exports.TrimTransformer = TrimTransformer;
 function Trim() {
-    return (0, decorators_1.createSchemaValueTransformerDecorator)(new TrimTransformer(), { type: String });
+    return (0, decorators_1.createSchemaValueTransformerDecorator)(new TrimTransformer(), { schema: (0, types_1.typeSchema)(String) });
 }
 exports.Trim = Trim;
 //# sourceMappingURL=trim.js.map

package/schema/transformers/trim.js.map

@@ -1 +1 @@
-{"version":3,"file":"trim.js","sourceRoot":"","sources":["../../../source/schema/transformers/trim.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAsE;AAEtE,oCAAkD;AAElD,MAAa,eAAgB,SAAQ,8BAAsB;IAA3D;;QACW,eAAU,GAAG,MAAM,CAAC;QACpB,eAAU,GAAG,MAAM,CAAC;IAK/B,CAAC;IAHC,SAAS,CAAC,KAAa;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAChD,CAAC;CACF;AAPD,0CAOC;AAED,SAAgB,IAAI;IAClB,OAAO,IAAA,kDAAqC,EAAC,IAAI,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AACxF,CAAC;AAFD,oBAEC"}
+{"version":3,"file":"trim.js","sourceRoot":"","sources":["../../../source/schema/transformers/trim.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAsE;AAEtE,oCAA8D;AAE9D,MAAa,eAAgB,SAAQ,8BAA8C;IAAnF;;QACW,eAAU,GAAG,MAAM,CAAC;QACpB,eAAU,GAAG,MAAM,CAAC;IAK/B,CAAC;IAHC,SAAS,CAAC,KAAa;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAChD,CAAC;CACF;AAPD,0CAOC;AAED,SAAgB,IAAI;IAClB,OAAO,IAAA,kDAAqC,EAAC,IAAI,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,IAAA,kBAAU,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACtG,CAAC;AAFD,oBAEC"}

package/schema/transformers/uppercase.d.ts

@@ -1,9 +1,9 @@
 import type { Decorator } from "../../reflection";
 import type { TransformResult } from '../types';
 import { SchemaValueTransformer } from '../types';
-export declare class UppercaseTransformer extends SchemaValueTransformer {
+export declare class UppercaseTransformer extends SchemaValueTransformer<string, string, string> {
     readonly sourceType: StringConstructor;
     readonly targetType: StringConstructor;
-    transform(value: string): TransformResult;
+    transform(value: string): TransformResult<string>;
 }
 export declare function Uppercase(): Decorator<'property' | 'accessor'>;

package/schema/transformers/uppercase.js

@@ -16,7 +16,7 @@ class UppercaseTransformer extends types_1.SchemaValueTransformer {
 }
 exports.UppercaseTransformer = UppercaseTransformer;
 function Uppercase() {
-    return (0, decorators_1.createSchemaValueTransformerDecorator)(new UppercaseTransformer(), { type: String });
+    return (0, decorators_1.createSchemaValueTransformerDecorator)(new UppercaseTransformer(), { schema: (0, types_1.typeSchema)(String) });
 }
 exports.Uppercase = Uppercase;
 //# sourceMappingURL=uppercase.js.map

package/schema/transformers/uppercase.js.map

@@ -1 +1 @@
-{"version":3,"file":"uppercase.js","sourceRoot":"","sources":["../../../source/schema/transformers/uppercase.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAsE;AAEtE,oCAAkD;AAElD,MAAa,oBAAqB,SAAQ,8BAAsB;IAAhE;;QACW,eAAU,GAAG,MAAM,CAAC;QACpB,eAAU,GAAG,MAAM,CAAC;IAK/B,CAAC;IAHC,SAAS,CAAC,KAAa;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IACvD,CAAC;CACF;AAPD,oDAOC;AAED,SAAgB,SAAS;IACvB,OAAO,IAAA,kDAAqC,EAAC,IAAI,oBAAoB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7F,CAAC;AAFD,8BAEC"}
+{"version":3,"file":"uppercase.js","sourceRoot":"","sources":["../../../source/schema/transformers/uppercase.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,8CAAsE;AAEtE,oCAA8D;AAE9D,MAAa,oBAAqB,SAAQ,8BAA8C;IAAxF;;QACW,eAAU,GAAG,MAAM,CAAC;QACpB,eAAU,GAAG,MAAM,CAAC;IAK/B,CAAC;IAHC,SAAS,CAAC,KAAa;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IACvD,CAAC;CACF;AAPD,oDAOC;AAED,SAAgB,SAAS;IACvB,OAAO,IAAA,kDAAqC,EAAC,IAAI,oBAAoB,EAAE,EAAE,EAAE,MAAM,EAAE,IAAA,kBAAU,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3G,CAAC;AAFD,8BAEC"}

package/schema/types.d.ts

@@ -1,29 +1,40 @@
 import type { JsonPath } from "../json-path/json-path";
-import type { OneOrMany, Record, Type } from "../types";
-import type { Schema } from './schema';
+import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "../types";
+import type { NormalizedSchema, Schema } from './schema';
 import type { SchemaError } from './schema.error';
-declare const schemaTypeSymbol: unique symbol;
-export declare type SchemaFactoryFunction<T extends Record> = (data: T) => T;
-export declare type SchemaFactory<T extends Record> = {
-    type: Type<T, []>;
+declare const schemaOutputTypeSymbol: unique symbol;
+export declare type SchemaFactoryFunction<T extends Record, O = T> = (data: T) => NormalizeValueType<O>;
+export declare type SchemaFactory<T extends Record, O = T> = {
+    type: Type<T>;
     builder?: undefined;
 } | {
     type?: undefined;
-    builder: SchemaFactoryFunction<T>;
+    builder: SchemaFactoryFunction<T, O>;
 };
 export declare type ObjectSchemaProperties<T extends Record> = {
-    [K in keyof T]-?: MaybeDeferredValueTypes<T[K]>;
+    [K in keyof T]-?: OneOrMany<Schema<any, T[K]>>;
 };
-export declare type SchemaOutput<T extends Schema | Type> = T extends ObjectSchema<infer U> ? U : T extends ValueSchema<infer U> ? U : T extends Type<infer U> ? U : never;
-export declare type ObjectSchema<T extends Record = any> = {
-    factory?: SchemaFactory<T>;
+export declare type NormalizedObjectSchemaProperties<T> = {
+    [K in keyof T]-?: Schema<any, T[K]>;
+};
+export declare type SchemaOutput<T extends Schema> = T extends ObjectSchema<any, infer O> ? O : T extends ValueSchema<any, infer O> ? O : T extends TypeSchema<infer O> ? O : never;
+export declare type ObjectSchema<T extends Record = any, O extends Record = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    sourceType?: ValueType;
+    factory?: SchemaFactory<T, O>;
     properties: ObjectSchemaProperties<T>;
     mask?: boolean;
-    allowUnknownProperties?: MaybeDeferredValueTypes;
+    allowUnknownProperties?: OneOrMany<Schema>;
+};
+export declare type TypeSchema<T = any> = {
+    type: ValueType<T>;
+};
+export declare type NormalizedTypeSchema<T = any> = {
+    foo: ResolvedValueType<T>;
 };
-export declare type ValueSchema<T = any> = {
-    [schemaTypeSymbol]?: T;
-    type: MaybeDeferredValueTypes;
+export declare type ValueSchema<T = unknown, O = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    schema: OneOrMany<Schema<T, O>>;
     array?: boolean;
     optional?: boolean;
     nullable?: boolean;
@@ -35,63 +46,61 @@ export declare type ValueSchema<T = any> = {
     arrayConstraints?: OneOrMany<SchemaArrayConstraint>;
     valueConstraints?: OneOrMany<SchemaValueConstraint>;
 };
-export declare type NormalizedObjectSchema<T extends Record = any> = {
-    factory?: SchemaFactory<T>;
-    properties: {
-        [K in keyof T]: Schema<T[K]>;
-    };
+export declare type NormalizedObjectSchema<T extends Record = any, O extends Record = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    factory?: SchemaFactory<T, O>;
+    properties: NormalizedObjectSchemaProperties<T>;
     mask?: boolean;
     allowUnknownProperties: Set<Schema>;
 };
-export declare type NormalizedValueSchema<T = any> = {
-    type: Set<ValueType<T>>;
+export declare type NormalizedValueSchema<T = any, O = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    schema: Set<Schema<T, O>>;
     array: boolean;
     optional: boolean;
     nullable: boolean;
     coerce: boolean;
     coercers: Map<ValueType, SchemaValueCoercer[]>;
-    transformers: readonly SchemaValueTransformer[];
+    transformers: readonly SchemaValueTransformer<any, any, any>[];
     arrayConstraints: readonly SchemaArrayConstraint[];
     valueConstraints: readonly SchemaValueConstraint[];
 };
 export declare type SchemaContext = {
-    schema: NormalizedValueSchema;
+    schema: NormalizedSchema;
     options: SchemaTestOptions;
 };
 export declare type ConstraintContext = SchemaContext;
 export declare type TransformerContext = SchemaContext;
 export declare type CoercerContext = SchemaContext;
-export declare type ValueType<T = any> = Schema<T> | Type<T> | typeof BigInt | typeof Symbol | typeof Function | 'undefined' | 'null' | 'any';
-export declare type DeferredValueType<T> = {
+export declare type NormalizeValueType<T> = T extends String ? string : T extends Number ? number : T extends Boolean ? boolean : T extends BigInt ? bigint : T extends Symbol ? symbol : T extends 'undefined' ? undefined : T extends 'null' ? null : T extends 'any' ? any : T;
+export declare type NormalizeToValueType<T> = T extends string | String ? typeof String : T extends number ? typeof Number : T extends boolean ? typeof Boolean : T extends bigint ? typeof BigInt : T extends symbol ? typeof Symbol : T extends undefined ? 'undefined' : T extends null ? 'null' : T extends any ? 'any' : never;
+export declare type ValueType<T = any> = AbstractConstructor<T> | NormalizeToValueType<T> | DeferredValueType<T>;
+export declare type DeferredValueType<T = unknown> = {
     deferred: () => ValueType<T>;
 };
-export declare type MaybeDeferredValueType<T = any> = ValueType<T> | DeferredValueType<T>;
-export declare type ValueTypes<T = any> = OneOrMany<ValueType<T>>;
-export declare type DeferredValueTypes<T = any> = {
-    deferred: () => ValueTypes<T>;
-};
-export declare type MaybeDeferredValueTypes<T = any> = OneOrMany<ValueTypes<T> | DeferredValueTypes<T>> | MaybeDeferredValueTypes<T>[];
+export declare type ResolvedValueType<T = unknown> = Exclude<ValueType<T>, DeferredValueType>;
+export declare type ValueTypeOutput<T extends ValueType> = T extends ValueType<infer U> ? NormalizeValueType<U> : never;
 export declare type Coercible = {
     coerce?: boolean;
 };
-export declare const primitiveValueTypes: ValueType[];
-export declare const primitiveValueTypesSet: Set<ValueType<any>>;
+export declare const primitiveConstructors: ValueType[];
+export declare const primitiveConstructorSet: Set<ValueType<any>>;
 export declare abstract class SchemaArrayConstraint {
     abstract validate(value: readonly unknown[], path: JsonPath, context: ConstraintContext): ConstraintResult;
 }
 export declare type OptionKeys<T extends Record> = readonly (keyof T)[];
 export declare abstract class SchemaValueConstraint {
-    abstract readonly suitableTypes: ValueTypes;
+    abstract readonly suitableTypes: OneOrMany<ValueType>;
     abstract readonly expects: OneOrMany<string>;
     abstract validate(value: unknown, path: JsonPath, context: ConstraintContext): ConstraintResult;
 }
-export declare abstract class SchemaValueTransformer {
-    abstract readonly sourceType: ValueTypes;
-    abstract readonly targetType: ValueType;
-    abstract transform(value: unknown, path: JsonPath, context: TransformerContext): TransformResult;
+export declare abstract class SchemaValueTransformer<T = any, O = T, TransformOutput = O> {
+    abstract readonly sourceType: OneOrMany<ValueType<T>>;
+    abstract readonly targetType: ValueType<TransformOutput>;
+    abstract transform(value: O, path: JsonPath, context: TransformerContext): TransformResult<TransformOutput>;
 }
 export declare abstract class SchemaValueCoercer {
-    abstract readonly sourceType: ValueTypes;
+    abstract readonly sourceType: OneOrMany<ValueType>;
     abstract readonly targetType: ValueType;
     abstract coerce(value: unknown, path: JsonPath, context: CoercerContext): CoerceResult;
 }
@@ -108,19 +117,19 @@ export declare type SchemaTestOptions = {
     mask?: boolean;
 };
 export declare type SchemaTestResult<T> = {
-    success: true;
+    valid: true;
     value: T;
     error?: undefined;
 } | {
-    success: false;
+    valid: false;
     value?: undefined;
     error: SchemaError;
 };
 export declare type ConstraintResult = {
-    success: true;
+    valid: true;
     error?: undefined;
 } | {
-    success: false;
+    valid: false;
     error: SchemaError;
 };
 export declare type CoerceResult = {
@@ -132,19 +141,28 @@ export declare type CoerceResult = {
     value?: undefined;
     error: SchemaError;
 };
-export declare type TransformResult = {
+export declare type TransformResult<T> = {
     success: true;
-    value: any;
+    value: T;
     error?: undefined;
 } | {
     success: false;
     value?: undefined;
     error: SchemaError;
 };
-export declare function objectSchema<T extends ObjectSchema>(schema: T): T;
-export declare function valueSchema<T extends ValueSchema>(schema: T): T;
-export declare function isSchema<T>(value: ValueType<T>): value is Schema<T>;
-export declare function isObjectSchema<T>(value: ValueType<T>): value is ObjectSchema<T>;
-export declare function isValueSchema<T>(value: ValueType<T>): value is ValueSchema<T>;
-export declare function isDeferredValueType<T>(value: MaybeDeferredValueTypes<T>): value is (DeferredValueType<T> | DeferredValueTypes<T>);
+export declare function objectSchema<T, O = T>(schema: ObjectSchema<T, O>): ObjectSchema<T, O>;
+export declare function valueSchema<T, O = T>(schema: OneOrMany<Schema<T, O>>, options?: TypedOmit<ValueSchema<T, O>, 'schema'>): ValueSchema<T, O>;
+export declare function typeSchema<T>(type: ValueType<T>): TypeSchema<NormalizeValueType<T>>;
+export declare function isSchema<T extends Record, O extends Record>(value: any): value is Schema<T, O>;
+export declare function isObjectSchema<T extends Record, O extends Record>(schema: Schema<T, O>): schema is ObjectSchema<T, O>;
+export declare function isObjectSchema<T extends Record, O extends Record>(schema: any): schema is ObjectSchema<T, O>;
+export declare function isValueSchema<T, O>(schema: Schema<T, O>): schema is ValueSchema<T, O>;
+export declare function isValueSchema<T, O>(schema: any): schema is ValueSchema<T, O>;
+export declare function isTypeSchema<T, O>(schema: Schema<T, O>): schema is TypeSchema<O>;
+export declare function isTypeSchema<T, O>(schema: any): schema is TypeSchema<O>;
+export declare function isDeferredValueType<T>(value: ValueType<T>): value is DeferredValueType<T>;
+export declare function resolveValueTypes<T>(valueTypes: OneOrMany<ValueType<T>>): OneOrMany<ResolvedValueType<T>>;
+export declare function resolveValueType<T>(valueType: ValueType<T>): ResolvedValueType<T>;
+export declare function valueTypesOrSchemasToSchemas<T, O>(valueTypesOrSchemas: OneOrMany<ValueType<O> | Schema<T, O>>): OneOrMany<Schema<T, O>>;
+export declare function valueTypeOrSchemaToSchema<T, O>(valueTypeOrSchema: ValueType<O> | Schema<T, O>): Schema<T, O>;
 export {};

package/schema/types.js

@@ -1,10 +1,10 @@
 "use strict";
+/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDeferredValueType = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.valueSchema = exports.objectSchema = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveValueTypesSet = exports.primitiveValueTypes = void 0;
-const object_1 = require("../utils/object/object");
+exports.valueTypeOrSchemaToSchema = exports.valueTypesOrSchemasToSchemas = exports.resolveValueType = exports.resolveValueTypes = exports.isDeferredValueType = exports.isTypeSchema = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.typeSchema = exports.valueSchema = exports.objectSchema = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
 const type_guards_1 = require("../utils/type-guards");
-exports.primitiveValueTypes = [String, Number, Boolean, BigInt, Symbol, Function, 'undefined', 'null', 'any'];
-exports.primitiveValueTypesSet = new Set(exports.primitiveValueTypes);
+exports.primitiveConstructors = [String, Number, Boolean, Symbol, BigInt, Function, 'undefined', 'null'];
+exports.primitiveConstructorSet = new Set(exports.primitiveConstructors);
 class SchemaArrayConstraint {
 }
 exports.SchemaArrayConstraint = SchemaArrayConstraint;
@@ -21,24 +21,59 @@ function objectSchema(schema) {
     return schema;
 }
 exports.objectSchema = objectSchema;
-function valueSchema(schema) {
-    return schema;
+function valueSchema(schema, options) {
+    return { schema, ...options };
 }
 exports.valueSchema = valueSchema;
+function typeSchema(type) {
+    return { type };
+}
+exports.typeSchema = typeSchema;
 function isSchema(value) {
-    return isObjectSchema(value) || isValueSchema(value);
+    return isObjectSchema(value) || isValueSchema(value) || isTypeSchema(value);
 }
 exports.isSchema = isSchema;
-function isObjectSchema(value) {
-    return (0, type_guards_1.isObject)(value?.properties);
+function isObjectSchema(schema) {
+    return (0, type_guards_1.isObject)(schema?.properties);
 }
 exports.isObjectSchema = isObjectSchema;
-function isValueSchema(value) {
-    return (0, type_guards_1.isObject)(value) && (0, type_guards_1.isDefined)(value?.type);
+function isValueSchema(schema) {
+    return (0, type_guards_1.isObject)(schema) && (0, type_guards_1.isDefined)(schema?.schema);
 }
 exports.isValueSchema = isValueSchema;
+function isTypeSchema(schema) {
+    return (0, type_guards_1.isObject)(schema) && (0, type_guards_1.isFunction)(schema?.type);
+}
+exports.isTypeSchema = isTypeSchema;
 function isDeferredValueType(value) {
-    return (0, type_guards_1.isObject)(value) && (0, object_1.hasOwnProperty)(value, 'deferred');
+    return (0, type_guards_1.isObject)(value) && (0, type_guards_1.isFunction)(value.deferred);
 }
 exports.isDeferredValueType = isDeferredValueType;
+function resolveValueTypes(valueTypes) {
+    if ((0, type_guards_1.isArray)(valueTypes)) {
+        return valueTypes.flatMap((valueType) => resolveValueTypes(valueType));
+    }
+    return resolveValueType(valueTypes);
+}
+exports.resolveValueTypes = resolveValueTypes;
+function resolveValueType(valueType) {
+    return isDeferredValueType(valueType)
+        ? resolveValueType(valueType.deferred())
+        : valueType;
+}
+exports.resolveValueType = resolveValueType;
+function valueTypesOrSchemasToSchemas(valueTypesOrSchemas) {
+    if ((0, type_guards_1.isArray)(valueTypesOrSchemas)) {
+        return valueTypesOrSchemas.map(valueTypeOrSchemaToSchema);
+    }
+    return valueTypeOrSchemaToSchema(valueTypesOrSchemas);
+}
+exports.valueTypesOrSchemasToSchemas = valueTypesOrSchemasToSchemas;
+function valueTypeOrSchemaToSchema(valueTypeOrSchema) {
+    if (isSchema(valueTypeOrSchema)) {
+        return valueTypeOrSchema;
+    }
+    return typeSchema(valueTypeOrSchema);
+}
+exports.valueTypeOrSchemaToSchema = valueTypeOrSchemaToSchema;
 //# sourceMappingURL=types.js.map

package/schema/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":";;;AAEA,mDAAuD;AACvD,sDAA0D;AAuF7C,QAAA,mBAAmB,GAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACnH,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC,2BAAmB,CAAC,CAAC;AAEnE,MAAsB,qBAAqB;CAE1C;AAFD,sDAEC;AAID,MAAsB,qBAAqB;CAK1C;AALD,sDAKC;AAED,MAAsB,sBAAsB;CAK3C;AALD,wDAKC;AAED,MAAsB,kBAAkB;CAKvC;AALD,gDAKC;AAgCD,SAAgB,YAAY,CAAyB,MAAS;IAC5D,OAAO,MAAM,CAAC;AAChB,CAAC;AAFD,oCAEC;AAED,SAAgB,WAAW,CAAwB,MAAS;IAC1D,OAAO,MAAM,CAAC;AAChB,CAAC;AAFD,kCAEC;AAED,SAAgB,QAAQ,CAAI,KAAmB;IAC7C,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,SAAgB,cAAc,CAAI,KAAmB;IACnD,OAAO,IAAA,sBAAQ,EAAE,KAA2C,EAAE,UAAU,CAAC,CAAC;AAC5E,CAAC;AAFD,wCAEC;AAED,SAAgB,aAAa,CAAI,KAAmB;IAClD,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,uBAAS,EAAE,KAA0C,EAAE,IAAI,CAAC,CAAC;AACzF,CAAC;AAFD,sCAEC;AAED,SAAgB,mBAAmB,CAAI,KAAiC;IACtE,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,uBAAc,EAAE,KAA4B,EAAE,UAAU,CAAC,CAAC;AACtF,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAIjD,sDAA+E;AAgHlE,QAAA,qBAAqB,GAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAwC,EAAE,MAAwC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AAClL,QAAA,uBAAuB,GAAG,IAAI,GAAG,CAAC,6BAAqB,CAAC,CAAC;AAEtE,MAAsB,qBAAqB;CAE1C;AAFD,sDAEC;AAID,MAAsB,qBAAqB;CAK1C;AALD,sDAKC;AAED,MAAsB,sBAAsB;CAK3C;AALD,wDAKC;AAED,MAAsB,kBAAkB;CAKvC;AALD,gDAKC;AAgCD,SAAgB,YAAY,CAAW,MAA0B;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAFD,oCAEC;AAED,SAAgB,WAAW,CAAW,MAA+B,EAAE,OAAgD;IACrH,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;AAChC,CAAC;AAFD,kCAEC;AAED,SAAgB,UAAU,CAAI,IAAkB;IAC9C,OAAO,EAAE,IAAI,EAAuC,CAAC;AACvD,CAAC;AAFD,gCAEC;AAED,SAAgB,QAAQ,CAAqC,KAAU;IACrE,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAFD,4BAEC;AAID,SAAgB,cAAc,CAAC,MAAW;IACxC,OAAO,IAAA,sBAAQ,EAAE,MAA4C,EAAE,UAAU,CAAC,CAAC;AAC7E,CAAC;AAFD,wCAEC;AAID,SAAgB,aAAa,CAAC,MAAW;IACvC,OAAO,IAAA,sBAAQ,EAAC,MAAM,CAAC,IAAI,IAAA,uBAAS,EAAE,MAAkC,EAAE,MAAM,CAAC,CAAC;AACpF,CAAC;AAFD,sCAEC;AAID,SAAgB,YAAY,CAAC,MAAW;IACtC,OAAO,IAAA,sBAAQ,EAAC,MAAM,CAAC,IAAI,IAAA,wBAAU,EAAE,MAAiC,EAAE,IAAI,CAAC,CAAC;AAClF,CAAC;AAFD,oCAEC;AAED,SAAgB,mBAAmB,CAAI,KAAmB;IACxD,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,wBAAU,EAAE,KAA2B,CAAC,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAFD,kDAEC;AAED,SAAgB,iBAAiB,CAAI,UAAmC;IACtE,IAAI,IAAA,qBAAO,EAAC,UAAU,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;KACxE;IAED,OAAO,gBAAgB,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAND,8CAMC;AAED,SAAgB,gBAAgB,CAAI,SAAuB;IACzD,OAAO,mBAAmB,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACxC,CAAC,CAAC,SAAiC,CAAC;AACxC,CAAC;AAJD,4CAIC;AAED,SAAgB,4BAA4B,CAAO,mBAA2D;IAC5G,IAAI,IAAA,qBAAO,EAAC,mBAAmB,CAAC,EAAE;QAChC,OAAO,mBAAmB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;KAC3D;IAED,OAAO,yBAAyB,CAAC,mBAAmB,CAAC,CAAC;AACxD,CAAC;AAND,oEAMC;AAED,SAAgB,yBAAyB,CAAO,iBAA8C;IAC5F,IAAI,QAAQ,CAAO,iBAAiB,CAAC,EAAE;QACrC,OAAO,iBAAiB,CAAC;KAC1B;IAED,OAAO,UAAU,CAAC,iBAAiB,CAAkB,CAAC;AACxD,CAAC;AAND,8DAMC"}

package/schema/utils/schema.d.ts

@@ -1,12 +1,13 @@
-import type { Schema } from '../schema';
-import type { MaybeDeferredValueTypes, NormalizedObjectSchema, NormalizedValueSchema, ObjectSchema, ValueSchema, ValueTypes } from '../types';
-export declare const normalizeSchema: typeof _normalizeObjectSchema;
+import type { NormalizedSchema, Schema } from '../schema';
+import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, TypeSchema, ValueSchema } from '../types';
+export declare const normalizeSchema: typeof _normalizeSchema;
+export declare const normalizeObjectSchema: typeof _normalizeObjectSchema;
 export declare const normalizeValueSchema: typeof _normalizeValueSchema;
+export declare const normalizeTypeSchema: typeof _normalizeTypeSchema;
 export declare const getArrayItemSchema: typeof _getArrayItemSchema;
-export declare function _normalizeObjectSchema<T>(objectSchema: ObjectSchema<T>): NormalizedObjectSchema<T>;
-export declare function _normalizeValueSchema<T>(valueSchema: ValueSchema<T>): NormalizedValueSchema<T>;
-declare function _getArrayItemSchema<T>(valueSchema: ValueSchema<T>): ValueSchema<T>;
-export declare function maybeDeferredValueTypesToValueTypes<T>(valueTypes: MaybeDeferredValueTypes<T>): ValueTypes<T>;
-export declare function valueTypesToSchema<T>(valueType: ValueTypes<T>): Schema<T>;
-export declare function maybeDeferredValueTypesToSchema<T>(valueType: MaybeDeferredValueTypes<T>): Schema<T>;
+declare function _normalizeSchema<T, O>(schema: Schema<T, O>): NormalizedSchema<T, O>;
+declare function _normalizeObjectSchema<T, O>(schema: ObjectSchema<T, O>): NormalizedObjectSchema<T, O>;
+declare function _normalizeValueSchema<T, O>(schema: ValueSchema<T, O>): NormalizedValueSchema<T, O>;
+declare function _normalizeTypeSchema<T>(schema: TypeSchema<T>): NormalizedTypeSchema<T>;
+declare function _getArrayItemSchema<T, O>(schema: ValueSchema<T, O>): ValueSchema<T, O>;
 export {};