@tstdl/base 0.78.0-beta9 → 0.78.0

package/schema/schemas/number.js.map

@@ -1 +1 @@
-{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../source/schema/schemas/number.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,yDAAgD;AAChD,oDAA2D;AAC3D,oDAA2D;AAC3D,oDAA2D;AAC3D,8CAAwE;AACxE,oCAAkG;AAQlG,SAAgB,MAAM,CAAC,UAAyB,EAAE;IAChD,MAAM,WAAW,GAA4B,EAAE,CAAC;IAEhD,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,2BAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;KAC1D;IAED,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,2BAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;KAC1D;IAED,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE;QAC3B,WAAW,CAAC,IAAI,CAAC,2BAAiB,CAAC,CAAC;KACrC;IAED,OAAO,IAAA,mBAAW,EAAC,IAAA,kBAAU,EAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAChD,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,gBAAgB,EAAE,WAAW;KAC9B,CAAC,CAAC;AACL,CAAC;AAtBD,wBAsBC;AAED,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,IAAA,oDAAuC,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../source/schema/schemas/number.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,yDAAgD;AAChD,oDAA2D;AAC3D,oDAA2D;AAC3D,oDAA2D;AAC3D,8CAAwE;AAExE,oCAAmD;AAQnD,SAAgB,MAAM,CAAC,UAAyB,EAAE;IAChD,MAAM,WAAW,GAA4B,EAAE,CAAC;IAEhD,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,2BAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;KAC1D;IAED,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,2BAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;KAC1D;IAED,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE;QAC3B,WAAW,CAAC,IAAI,CAAC,2BAAiB,CAAC,CAAC;KACrC;IAED,OAAO,IAAA,mBAAW,EAAC,IAAA,kBAAU,EAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAChD,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,gBAAgB,EAAE,WAAW;KAC9B,CAAC,CAAC;AACL,CAAC;AAnBD,wBAmBC;AAED,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,IAAA,oDAAuC,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,wBAEC"}

package/schema/schemas/omit.d.ts

@@ -0,0 +1,4 @@
+import type { OneOrMany, Record } from "../../types";
+import type { Simplify } from 'type-fest';
+import type { ObjectSchema, ObjectSchemaOrType } from '../types';
+export declare function omit<T extends Record, K extends keyof T>(schemaOrType: ObjectSchemaOrType<T>, keys: OneOrMany<K>): ObjectSchema<Simplify<Omit<T, K>>>;

package/schema/schemas/{exclude.js → omit.js}

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exclude = void 0;
+exports.omit = void 0;
 const array_1 = require("../../utils/array/array");
 const types_1 = require("../types");
-function exclude(schema, key) {
-    const keys = (0, array_1.toArray)(key);
+const schema_1 = require("../utils/schema");
+function omit(schemaOrType, keys) {
+    const schema = (0, schema_1.getObjectSchema)(schemaOrType);
+    const keyArray = (0, array_1.toArray)(keys);
     const entries = Object.entries(schema.properties);
-    const pickedEntries = entries.filter(([propertyKey]) => !keys.includes(propertyKey));
+    const pickedEntries = entries.filter(([propertyKey]) => !keyArray.includes(propertyKey));
     const pickedSchema = (0, types_1.objectSchema)({
         ...schema,
         properties: Object.fromEntries(pickedEntries)
     });
     return pickedSchema;
 }
-exports.exclude = exclude;
-//# sourceMappingURL=exclude.js.map
+exports.omit = omit;
+//# sourceMappingURL=omit.js.map

package/schema/schemas/omit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"omit.js","sourceRoot":"","sources":["../../../source/schema/schemas/omit.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAG9C,oCAAwC;AACxC,4CAAkD;AAElD,SAAgB,IAAI,CAAsC,YAAmC,EAAE,IAAkB;IAC/G,MAAM,MAAM,GAAG,IAAA,wBAAe,EAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAgB,CAAC,CAAC,CAAC;IAE9F,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC;QAChC,GAAG,MAAM;QACT,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,aAAa,CAA8B;KAC3E,CAAC,CAAC;IAEH,OAAO,YAAmD,CAAC;AAC7D,CAAC;AAbD,oBAaC"}

package/schema/schemas/one-or-many.d.ts

@@ -0,0 +1,10 @@
+import type { OneOrMany } from "../../types";
+import type { SchemaTestable } from '../schema';
+import type { ValueSchema } from '../types';
+export declare type OneOrManyOptions = {
+    /** minimum array length */
+    minimumLength?: number;
+    /** maximum array length */
+    maximumLength?: number;
+};
+export declare function oneOrMany<T, O = T>(innerValues: OneOrMany<SchemaTestable<T, O>>, options?: OneOrManyOptions): ValueSchema<T, O | O[]>;

package/schema/schemas/one-or-many.js

@@ -0,0 +1,12 @@
+"use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.oneOrMany = void 0;
+const array_1 = require("../../utils/array");
+const array_2 = require("./array");
+const union_1 = require("./union");
+function oneOrMany(innerValues, options = {}) {
+    return (0, union_1.union)((0, array_2.array)(innerValues, options), ...(0, array_1.toArray)(innerValues));
+}
+exports.oneOrMany = oneOrMany;
+//# sourceMappingURL=one-or-many.js.map

package/schema/schemas/one-or-many.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"one-or-many.js","sourceRoot":"","sources":["../../../source/schema/schemas/one-or-many.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,6CAAwC;AAGxC,mCAAgC;AAChC,mCAAgC;AAUhC,SAAgB,SAAS,CAAW,WAA4C,EAAE,UAA4B,EAAE;IAC9G,OAAO,IAAA,aAAK,EAAC,IAAA,aAAK,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,GAAG,IAAA,eAAO,EAAC,WAAW,CAAC,CAA4B,CAAC;AAChG,CAAC;AAFD,8BAEC"}

package/schema/schemas/optional.d.ts

@@ -1,3 +1,4 @@
-import type { Schema } from '../schema';
+import type { OneOrMany } from "../../types";
+import type { SchemaTestable } from '../schema';
 import type { ValueSchema } from '../types';
-export declare function optional<T, O>(schema: Schema<T, O>): ValueSchema<T | undefined, O | undefined>;
+export declare function optional<T, O>(schema: OneOrMany<SchemaTestable<T, O>>): ValueSchema<T | undefined, O | undefined>;

package/schema/schemas/optional.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/schemas/optional.ts"],"names":[],"mappings":";;;AAEA,oCAAuC;AAEvC,SAAgB,QAAQ,CAAO,MAAoB;IACjD,OAAO,IAAA,mBAAW,EAAC,MAA8C,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACzF,CAAC;AAFD,4BAEC"}
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/schemas/optional.ts"],"names":[],"mappings":";;;AAGA,oCAAuC;AAEvC,SAAgB,QAAQ,CAAO,MAAuC;IACpE,OAAO,IAAA,mBAAW,EAAC,MAAsD,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACjG,CAAC;AAFD,4BAEC"}

package/schema/schemas/partial.d.ts

@@ -0,0 +1,4 @@
+import type { OneOrMany, PartialProperty, Record } from "../../types";
+import type { ObjectSchema, ObjectSchemaOrType } from '../types';
+export declare function partial<T extends Record>(schema: ObjectSchemaOrType<T>): ObjectSchema<Partial<T>>;
+export declare function partial<T extends Record, K extends keyof T>(schema: ObjectSchemaOrType<T>, keys: OneOrMany<K>): ObjectSchema<PartialProperty<T, K>>;

package/schema/schemas/partial.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.partial = void 0;
+const array_1 = require("../../utils/array/array");
+const object_1 = require("../../utils/object");
+const type_guards_1 = require("../../utils/type-guards");
+const types_1 = require("../types");
+const utils_1 = require("../utils");
+const optional_1 = require("./optional");
+function partial(schemaOrType, keys) {
+    const schema = (0, utils_1.getObjectSchema)(schemaOrType);
+    const keyArray = (0, type_guards_1.isDefined)(keys) ? (0, array_1.toArray)(keys) : undefined;
+    const makeAllOptional = (0, type_guards_1.isUndefined)(keyArray);
+    const partialEntries = (0, object_1.mapObjectValues)(schema.properties, (propertySchema, key) => ((makeAllOptional || keyArray.includes(key)) ? (0, optional_1.optional)(propertySchema) : propertySchema));
+    const pickedSchema = (0, types_1.objectSchema)({
+        ...schema,
+        properties: partialEntries
+    });
+    return pickedSchema;
+}
+exports.partial = partial;
+//# sourceMappingURL=partial.js.map

package/schema/schemas/partial.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"partial.js","sourceRoot":"","sources":["../../../source/schema/schemas/partial.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,+CAAiD;AACjD,yDAA6D;AAE7D,oCAAwC;AACxC,oCAA2C;AAC3C,yCAAsC;AAItC,SAAgB,OAAO,CAAsC,YAAmC,EAAE,IAAmB;IACnH,MAAM,MAAM,GAAG,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;IAE7C,MAAM,QAAQ,GAAG,IAAA,uBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAA,yBAAW,EAAC,QAAQ,CAAC,CAAC;IAE9C,MAAM,cAAc,GAAG,IAAA,wBAAe,EAAC,MAAM,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAA8B,CAAC;IAEhN,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC;QAChC,GAAG,MAAM;QACT,UAAU,EAAE,cAAc;KAC3B,CAAC,CAAC;IAEH,OAAO,YAAmD,CAAC;AAC7D,CAAC;AAdD,0BAcC"}

package/schema/schemas/pick.d.ts

@@ -1,4 +1,4 @@
 import type { OneOrMany, Record } from "../../types";
 import type { Simplify } from 'type-fest';
-import type { ObjectSchema } from '../types';
-export declare function pick<T extends Record, K extends keyof T>(schema: ObjectSchema<T>, key: OneOrMany<K>): ObjectSchema<Simplify<Pick<T, K>>>;
+import type { ObjectSchema, ObjectSchemaOrType } from '../types';
+export declare function pick<T extends Record, K extends keyof T>(schemaOrType: ObjectSchemaOrType<T>, key: OneOrMany<K>): ObjectSchema<Simplify<Pick<T, K>>>;

package/schema/schemas/pick.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pick = void 0;
 const array_1 = require("../../utils/array/array");
 const types_1 = require("../types");
-function pick(schema, key) {
+const schema_1 = require("../utils/schema");
+function pick(schemaOrType, key) {
+    const schema = (0, schema_1.getObjectSchema)(schemaOrType);
     const keys = (0, array_1.toArray)(key);
     const entries = Object.entries(schema.properties);
     const pickedEntries = entries.filter(([propertyKey]) => keys.includes(propertyKey));

package/schema/schemas/pick.js.map

@@ -1 +1 @@
-{"version":3,"file":"pick.js","sourceRoot":"","sources":["../../../source/schema/schemas/pick.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAG9C,oCAAwC;AAExC,SAAgB,IAAI,CAAsC,MAAuB,EAAE,GAAiB;IAClG,MAAM,IAAI,GAAG,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC;IAE1B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAgB,CAAC,CAAC,CAAC;IAEzF,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC;QAChC,GAAG,MAAM;QACT,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,aAAa,CAA8B;KAC3E,CAAC,CAAC;IAEH,OAAO,YAAmD,CAAC;AAC7D,CAAC;AAZD,oBAYC"}
+{"version":3,"file":"pick.js","sourceRoot":"","sources":["../../../source/schema/schemas/pick.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAG9C,oCAAwC;AACxC,4CAAkD;AAElD,SAAgB,IAAI,CAAsC,YAAmC,EAAE,GAAiB;IAC9G,MAAM,MAAM,GAAG,IAAA,wBAAe,EAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC;IAE1B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAgB,CAAC,CAAC,CAAC;IAEzF,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC;QAChC,GAAG,MAAM;QACT,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,aAAa,CAA8B;KAC3E,CAAC,CAAC;IAEH,OAAO,YAAmD,CAAC;AAC7D,CAAC;AAbD,oBAaC"}

package/schema/schemas/record.d.ts

@@ -1,5 +1,5 @@
 import type { OneOrMany, Record, TypedOmit } from "../../types";
-import type { Schema } from '../schema';
+import type { SchemaTestable } from '../schema';
 import type { ObjectSchema } from '../types';
 export declare type RecordOptions<T extends Record = Record> = TypedOmit<ObjectSchema<T>, 'properties' | 'allowUnknownProperties' | 'mask'>;
-export declare function record<T, O>(valueType: OneOrMany<Schema<T, O>>, options?: RecordOptions): ObjectSchema<Record<any, O>>;
+export declare function record<T, O>(valueType: OneOrMany<SchemaTestable<T, O>>, options?: RecordOptions): ObjectSchema<Record<any, O>>;

package/schema/schemas/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../source/schema/schemas/record.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAKzD,oCAAwC;AAIxC,SAAgB,MAAM,CAAO,SAAkC,EAAE,OAAuB;IACtF,OAAO,IAAA,oBAAY,EAAC;QAClB,UAAU,EAAE,EAAE;QACd,sBAAsB,EAAE,SAAS;QACjC,GAAG,OAAO;KACX,CAAiB,CAAC;AACrB,CAAC;AAND,wBAMC"}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../source/schema/schemas/record.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAKzD,oCAAwC;AAIxC,SAAgB,MAAM,CAAO,SAA0C,EAAE,OAAuB;IAC9F,OAAO,IAAA,oBAAY,EAAC;QAClB,UAAU,EAAE,EAAE;QACd,sBAAsB,EAAE,SAAS;QACjC,GAAG,OAAO;KACX,CAAiB,CAAC;AACrB,CAAC;AAND,wBAMC"}

package/schema/schemas/union.d.ts

@@ -1,10 +1,5 @@
 import type { Decorator } from "../../reflection";
-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'>;
+import type { SchemaTestable } from '../schema';
+import type { SchemaInput, SchemaOutput, ValueSchema } from '../types';
+export declare function union<T extends SchemaTestable[]>(...schemas: [...T]): ValueSchema<SchemaInput<T[number]>, SchemaOutput<T[number]>>;
+export declare function Union(...schemas: SchemaTestable[]): Decorator<'property' | 'accessor'>;

package/schema/schemas/union.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,yDAA6C;AAC7C,8CAAwE;AAGxE,oCAAuC;AAEvC,SAAgB,KAAK,CAA6B,GAAG,OAAe;IAClE,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,OAAyB;IAChD,OAAO,IAAA,oDAAuC,EAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,sBAEC"}

package/schema/types.d.ts

@@ -1,30 +1,35 @@
 import type { JsonPath } from "../json-path/json-path";
 import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "../types";
-import type { NormalizedSchema, Schema } from './schema';
+import type { NormalizedSchema, Schema, SchemaTestable } from './schema';
 import type { SchemaError } from './schema.error';
 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> = {
+export declare type SchemaFactoryFunction<T, O = T> = (data: T) => NormalizeValueType<O>;
+export declare type SchemaFactory<T, O = T> = {
     type: Type<T>;
     builder?: undefined;
 } | {
     type?: undefined;
     builder: SchemaFactoryFunction<T, O>;
 };
-export declare type ObjectSchemaProperties<T extends Record> = {
-    [K in keyof T]-?: OneOrMany<Schema<any, T[K]>>;
+export declare type ObjectSchemaProperties<T> = {
+    [K in keyof T]-?: OneOrMany<SchemaTestable<any, T[K]>>;
 };
 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> = {
+export declare type SchemaInput<T extends SchemaTestable> = T extends ObjectSchema<infer U, any> ? U : T extends ValueSchema<infer U, any> ? U : T extends TypeSchema<infer U> ? U : T extends ValueType<infer U> ? NormalizeValueType<U> : never;
+export declare type SchemaOutput<T extends SchemaTestable> = T extends ObjectSchema<any, infer O> ? O : T extends ValueSchema<any, infer O> ? O : T extends TypeSchema<infer O> ? O : T extends ValueType<infer O> ? NormalizeValueType<O> : never;
+export declare type TupleSchemaOutput<T extends readonly SchemaTestable[]> = {
+    [P in keyof T]: SchemaOutput<T[P]>;
+};
+export declare type ObjectSchemaOrType<T = any, O = T> = ObjectSchema<T, O> | AbstractConstructor<O>;
+export declare type ObjectSchema<T = any, O = T> = {
     [schemaOutputTypeSymbol]?: O;
     sourceType?: ValueType;
     factory?: SchemaFactory<T, O>;
     properties: ObjectSchemaProperties<T>;
     mask?: boolean;
-    allowUnknownProperties?: OneOrMany<Schema>;
+    allowUnknownProperties?: OneOrMany<SchemaTestable>;
 };
 export declare type TypeSchema<T = any> = {
     type: ValueType<T>;
@@ -34,7 +39,7 @@ export declare type NormalizedTypeSchema<T = any> = {
 };
 export declare type ValueSchema<T = unknown, O = T> = {
     [schemaOutputTypeSymbol]?: O;
-    schema: OneOrMany<Schema<T, O>>;
+    schema: OneOrMany<SchemaTestable<T, O>>;
     array?: boolean;
     optional?: boolean;
     nullable?: boolean;
@@ -46,7 +51,7 @@ export declare type ValueSchema<T = unknown, O = T> = {
     arrayConstraints?: OneOrMany<SchemaArrayConstraint>;
     valueConstraints?: OneOrMany<SchemaValueConstraint>;
 };
-export declare type NormalizedObjectSchema<T extends Record = any, O extends Record = T> = {
+export declare type NormalizedObjectSchema<T = any, O = T> = {
     [schemaOutputTypeSymbol]?: O;
     factory?: SchemaFactory<T, O>;
     properties: NormalizedObjectSchemaProperties<T>;
@@ -75,11 +80,10 @@ export declare type CoercerContext = SchemaContext;
 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> = {
+export declare type DeferredValueType<T = any> = {
     deferred: () => ValueType<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 ResolvedValueType<T = any> = Exclude<ValueType<T>, DeferredValueType>;
 export declare type Coercible = {
     coerce?: boolean;
 };
@@ -106,15 +110,19 @@ export declare abstract class SchemaValueCoercer {
 }
 export declare type SchemaTestOptions = {
     /**
-     * try to convert wrong input into desired output.
+     * Try to convert wrong input into desired output.
      * Can be specified on definition and validation. If specified on both, definition has higher priority
      */
     coerce?: boolean;
     /**
-     * remove unspecified fields on input data instead of raising an error.
+     * Remove unspecified fields on input data instead of raising an error.
      * Can be specified on definition and validation. If specified on both, definition has higher priority
      */
     mask?: boolean;
+    /**
+     * Use fast errors which can improve performance a lot but misses detailed stack traces.
+     */
+    fastErrors?: boolean;
 };
 export declare type SchemaTestResult<T> = {
     valid: true;
@@ -150,10 +158,11 @@ export declare type TransformResult<T> = {
     value?: undefined;
     error: SchemaError;
 };
-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 objectSchemaProperties<T extends Record>(properties: ObjectSchemaProperties<T>): ObjectSchemaProperties<T>;
+export declare function objectSchema<T extends Record, O extends Record = T>(schema: ObjectSchema<T, O>): ObjectSchema<T, O>;
+export declare function valueSchema<T, O = T>(schema: OneOrMany<SchemaTestable<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 isSchema<T, O>(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>;
@@ -161,8 +170,9 @@ export declare function isValueSchema<T, O>(schema: any): schema is ValueSchema<
 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 isDeferredValueType(value: any): value is DeferredValueType;
 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 declare function valueTypesOrSchemasToSchemas<T, O>(valueTypesOrSchemas: OneOrMany<SchemaTestable<T, O>>): OneOrMany<Schema<T, O>>;
+export declare function schemaTestableToSchema<T, O>(valueTypeOrSchema: SchemaTestable<T, O>): Schema<T, O>;
 export {};

package/schema/types.js

@@ -1,7 +1,8 @@
 "use strict";
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.schemaTestableToSchema = exports.valueTypesOrSchemasToSchemas = exports.resolveValueType = exports.resolveValueTypes = exports.isDeferredValueType = exports.isTypeSchema = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.typeSchema = exports.valueSchema = exports.objectSchema = exports.objectSchemaProperties = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
+const object_1 = require("../utils/object/object");
 const type_guards_1 = require("../utils/type-guards");
 exports.primitiveConstructors = [String, Number, Boolean, Symbol, BigInt, Function, 'undefined', 'null'];
 exports.primitiveConstructorSet = new Set(exports.primitiveConstructors);
@@ -17,12 +18,16 @@ exports.SchemaValueTransformer = SchemaValueTransformer;
 class SchemaValueCoercer {
 }
 exports.SchemaValueCoercer = SchemaValueCoercer;
+function objectSchemaProperties(properties) {
+    return (0, object_1.filterObject)(properties, type_guards_1.isDefined);
+}
+exports.objectSchemaProperties = objectSchemaProperties;
 function objectSchema(schema) {
-    return schema;
+    return (0, object_1.filterObject)(schema, type_guards_1.isDefined);
 }
 exports.objectSchema = objectSchema;
 function valueSchema(schema, options) {
-    return { schema, ...options };
+    return (0, object_1.filterObject)({ schema, ...options }, type_guards_1.isDefined);
 }
 exports.valueSchema = valueSchema;
 function typeSchema(type) {
@@ -42,7 +47,16 @@ function isValueSchema(schema) {
 }
 exports.isValueSchema = isValueSchema;
 function isTypeSchema(schema) {
-    return (0, type_guards_1.isObject)(schema) && (0, type_guards_1.isFunction)(schema?.type);
+    if (!(0, type_guards_1.isObject)(schema)) {
+        return false;
+    }
+    const type = schema.type;
+    return (0, type_guards_1.isObject)(schema)
+        && ((0, type_guards_1.isFunction)(type)
+            || ((0, type_guards_1.isObject)(type) && (0, type_guards_1.isFunction)(type.deferred))
+            || (type == 'undefined')
+            || (type == 'null')
+            || (type == 'any'));
 }
 exports.isTypeSchema = isTypeSchema;
 function isDeferredValueType(value) {
@@ -64,16 +78,16 @@ function resolveValueType(valueType) {
 exports.resolveValueType = resolveValueType;
 function valueTypesOrSchemasToSchemas(valueTypesOrSchemas) {
     if ((0, type_guards_1.isArray)(valueTypesOrSchemas)) {
-        return valueTypesOrSchemas.map(valueTypeOrSchemaToSchema);
+        return valueTypesOrSchemas.map(schemaTestableToSchema);
     }
-    return valueTypeOrSchemaToSchema(valueTypesOrSchemas);
+    return schemaTestableToSchema(valueTypesOrSchemas);
 }
 exports.valueTypesOrSchemasToSchemas = valueTypesOrSchemasToSchemas;
-function valueTypeOrSchemaToSchema(valueTypeOrSchema) {
+function schemaTestableToSchema(valueTypeOrSchema) {
     if (isSchema(valueTypeOrSchema)) {
         return valueTypeOrSchema;
     }
     return typeSchema(valueTypeOrSchema);
 }
-exports.valueTypeOrSchemaToSchema = valueTypeOrSchemaToSchema;
+exports.schemaTestableToSchema = schemaTestableToSchema;
 //# sourceMappingURL=types.js.map

package/schema/types.js.map

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

package/schema/utils/schema.d.ts

@@ -1,13 +1,18 @@
+import type { AbstractConstructor } from "../../types";
 import type { NormalizedSchema, Schema } from '../schema';
-import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, TypeSchema, ValueSchema } from '../types';
+import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, ObjectSchemaOrType, 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 const tryGetObjectSchemaFromReflection: typeof _tryGetObjectSchemaFromReflection;
+export declare function getObjectSchema<T, O = T>(schemaOrType: ObjectSchemaOrType<T, O>): ObjectSchema<T, O>;
 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 declare function getObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T>;
+declare function _tryGetObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T> | null;
 export {};

package/schema/utils/schema.js

@@ -1,16 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArrayItemSchema = exports.normalizeTypeSchema = exports.normalizeValueSchema = exports.normalizeObjectSchema = exports.normalizeSchema = void 0;
+exports.getObjectSchemaFromReflection = exports.getObjectSchema = exports.tryGetObjectSchemaFromReflection = exports.getArrayItemSchema = exports.normalizeTypeSchema = exports.normalizeValueSchema = exports.normalizeObjectSchema = exports.normalizeSchema = void 0;
+const registry_1 = require("../../reflection/registry");
 const array_1 = require("../../utils/array/array");
 const memoize_1 = require("../../utils/function/memoize");
 const object_1 = require("../../utils/object/object");
 const type_guards_1 = require("../../utils/type-guards");
+const assign_1 = require("../schemas/assign");
 const types_1 = require("../types");
 exports.normalizeSchema = (0, memoize_1.memoizeSingle)(_normalizeSchema, { weak: true });
 exports.normalizeObjectSchema = (0, memoize_1.memoizeSingle)(_normalizeObjectSchema, { weak: true });
 exports.normalizeValueSchema = (0, memoize_1.memoizeSingle)(_normalizeValueSchema, { weak: true });
 exports.normalizeTypeSchema = (0, memoize_1.memoizeSingle)(_normalizeTypeSchema, { weak: true });
 exports.getArrayItemSchema = (0, memoize_1.memoizeSingle)(_getArrayItemSchema, { weak: true });
+exports.tryGetObjectSchemaFromReflection = (0, memoize_1.memoizeSingle)(_tryGetObjectSchemaFromReflection, { weak: true });
+function getObjectSchema(schemaOrType) {
+    return ((0, type_guards_1.isFunction)(schemaOrType)
+        ? getObjectSchemaFromReflection(schemaOrType)
+        : schemaOrType);
+}
+exports.getObjectSchema = getObjectSchema;
 function _normalizeSchema(schema) {
     if ((0, types_1.isObjectSchema)(schema)) {
         return (0, exports.normalizeObjectSchema)(schema);
@@ -26,15 +35,15 @@ function _normalizeSchema(schema) {
 function _normalizeObjectSchema(schema) {
     const normalizedSchema = {
         factory: schema.factory,
-        properties: (0, object_1.mapObjectValues)(schema.properties, (propertyValueType) => ((0, type_guards_1.isArray)(propertyValueType) ? (0, types_1.valueSchema)(propertyValueType) : propertyValueType)),
+        properties: (0, object_1.mapObjectValues)(schema.properties, (propertyValueType) => (0, types_1.valueTypesOrSchemasToSchemas)(propertyValueType)),
         mask: schema.mask,
-        allowUnknownProperties: new Set((0, array_1.toArray)(schema.allowUnknownProperties ?? []).map(types_1.valueTypeOrSchemaToSchema))
+        allowUnknownProperties: new Set((0, array_1.toArray)(schema.allowUnknownProperties ?? []).map(types_1.schemaTestableToSchema))
     };
     return normalizedSchema;
 }
 function _normalizeValueSchema(schema) {
     const normalizedValueSchema = {
-        schema: new Set((0, array_1.toArray)(schema.schema)),
+        schema: new Set((0, array_1.toArray)(schema.schema).map(types_1.schemaTestableToSchema)),
         array: schema.array ?? false,
         optional: schema.optional ?? false,
         nullable: schema.nullable ?? false,
@@ -63,12 +72,56 @@ function _normalizeTypeSchema(schema) {
 function _getArrayItemSchema(schema) {
     const itemSchema = {
         schema: schema.schema,
-        array: false,
-        optional: false,
-        nullable: false,
         transformers: schema.transformers,
         valueConstraints: schema.valueConstraints
     };
     return itemSchema;
 }
+function getObjectSchemaFromReflection(type) {
+    const schema = (0, exports.tryGetObjectSchemaFromReflection)(type);
+    if ((0, type_guards_1.isNull)(schema)) {
+        throw new Error(`Could not get schema for ${type.name} from reflection data.`);
+    }
+    return schema;
+}
+exports.getObjectSchemaFromReflection = getObjectSchemaFromReflection;
+function _tryGetObjectSchemaFromReflection(type) {
+    const metadata = registry_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 = reflectionData?.schema;
+        const array = (reflectionData?.array == true) ? true : undefined;
+        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)}"`);
+        }
+        properties[key] = (0, types_1.valueSchema)((0, types_1.valueTypesOrSchemasToSchemas)(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
+        });
+    }
+    const schema = (0, types_1.objectSchema)({
+        sourceType: type,
+        factory: (0, type_guards_1.isDefined)(typeData?.factory) ? { builder: typeData.factory } : { type: type },
+        properties,
+        mask: typeData?.mask,
+        allowUnknownProperties: ((0, type_guards_1.isUndefined)(typeData?.allowUnknownProperties) || ((0, type_guards_1.isArray)(typeData?.allowUnknownProperties) && (typeData?.allowUnknownProperties.length == 0))) ? undefined : typeData?.allowUnknownProperties
+    });
+    const prototype = Reflect.getPrototypeOf(type);
+    if ((0, type_guards_1.isNotNull)(prototype) && registry_1.reflectionRegistry.hasType(prototype)) {
+        const parentSchema = getObjectSchemaFromReflection(prototype);
+        return (0, assign_1.assign)(parentSchema, schema);
+    }
+    return schema;
+}
 //# sourceMappingURL=schema.js.map

package/schema/utils/schema.js.map

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

package/schema/utils/value-type.d.ts

@@ -1,5 +1,7 @@
-import type { Schema } from '../schema';
+import type { OneOrMany } from "../../types";
+import type { SchemaTestable } from '../schema';
 import type { ResolvedValueType, ValueType } from '../types';
-export declare function getValueType(value: unknown): ResolvedValueType<any>;
+export declare function getValueType(value: unknown): ResolvedValueType;
 export declare function getValueTypeName(valueType: ValueType): string;
-export declare function getSchemaTypeNames(schema: Schema): string[];
+export declare function getSchemaTypeNames(schema: SchemaTestable): string[];
+export declare function getSchemaValueTypes(schema: OneOrMany<SchemaTestable>): ResolvedValueType[];

package/schema/utils/value-type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSchemaTypeNames = exports.getValueTypeName = exports.getValueType = void 0;
+exports.getSchemaValueTypes = exports.getSchemaTypeNames = exports.getValueTypeName = exports.getValueType = void 0;
 const array_1 = require("../../utils/array/array");
 const type_guards_1 = require("../../utils/type-guards");
 const types_1 = require("../types");
@@ -22,18 +22,33 @@ function getValueTypeName(valueType) {
 }
 exports.getValueTypeName = getValueTypeName;
 function getSchemaTypeNames(schema) {
+    return getSchemaValueTypes(schema)
+        .map((valueType) => ((0, type_guards_1.isString)(valueType) ? valueType : valueType.name));
+}
+exports.getSchemaTypeNames = getSchemaTypeNames;
+function getSchemaValueTypes(schema) {
     if ((0, types_1.isTypeSchema)(schema)) {
-        const name = getValueTypeName(schema.type);
-        return [name];
+        return [(0, types_1.resolveValueType)(schema.type)];
+    }
+    if ((0, type_guards_1.isFunction)(schema)) {
+        return [schema];
+    }
+    if ((0, type_guards_1.isString)(schema)) {
+        return [schema];
     }
     if ((0, types_1.isObjectSchema)(schema)) {
-        const name = getValueTypeName(schema.sourceType ?? Object);
-        return [name];
+        return [(0, types_1.resolveValueType)(schema.sourceType ?? Object)];
     }
     if ((0, types_1.isValueSchema)(schema)) {
-        return [...new Set((0, array_1.toArray)(schema.schema).flatMap(getSchemaTypeNames))];
+        return [...new Set((0, array_1.toArray)(schema.schema).flatMap(getSchemaValueTypes))];
+    }
+    if ((0, types_1.isDeferredValueType)(schema)) {
+        return getSchemaValueTypes((0, types_1.resolveValueType)(schema));
+    }
+    if ((0, type_guards_1.isArray)(schema)) {
+        return schema.flatMap(getSchemaValueTypes);
     }
     throw new Error('Unsupported schema');
 }
-exports.getSchemaTypeNames = getSchemaTypeNames;
+exports.getSchemaValueTypes = getSchemaValueTypes;
 //# sourceMappingURL=value-type.js.map