@tstdl/base 0.72.0-beta1 → 0.78.0-beta1

package/schema/schemas/nullable.js

@@ -1,27 +1,9 @@
-import { isNull, isUndefined } from "../../utils/type-guards.js";
-import { SchemaValidator, test } from '../schema.validator.js';
-import { schemaHelper } from '../types.js';
-export class NullableSchemaValidator extends SchemaValidator {
-    constructor(innerValidator, schema) {
-        super(schema);
-        this.innerValidator = innerValidator;
-    }
-    [test](value, options, path) {
-        if (isNull(value)) {
-            return { valid: true, value };
-        }
-        if ((this.schema.coerce ?? options.coerce) && isUndefined(value)) {
-            return { valid: true, value: null };
-        }
-        return this.innerValidator[test](value, options, path);
-    }
-}
-export function nullable(innerValidator, options) {
-    const schema = schemaHelper({
-        type: 'nullable',
-        schema: innerValidator.schema,
-        ...options
-    });
-    return new NullableSchemaValidator(innerValidator, schema);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nullable = void 0;
+const types_1 = require("../types");
+function nullable(schema) {
+    return (0, types_1.valueSchema)({ type: schema, nullable: true });
 }
+exports.nullable = nullable;
 //# sourceMappingURL=nullable.js.map

package/schema/schemas/nullable.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../source/schema/schemas/nullable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,mCAA+B;AAE7D,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,MAAM,OAAO,uBAAoD,SAAQ,eAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,IAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE;YAChE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACrC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF;AAED,MAAM,UAAU,QAAQ,CAA6B,cAAkC,EAAE,OAA8D;IACrJ,MAAM,MAAM,GAAG,YAAY,CAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAI,cAAc,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../source/schema/schemas/nullable.ts"],"names":[],"mappings":";;;AAEA,oCAAuC;AAEvC,SAAgB,QAAQ,CAAI,MAAiB;IAC3C,OAAO,IAAA,mBAAW,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC;AAFD,4BAEC"}

package/schema/schemas/number.d.ts

@@ -1,16 +1,9 @@
-import type { JsonPath } from "../../json-path/index.js";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import type { Coercible, SchemaDefinition, SchemaOptions } from '../types.js';
-export declare type NumberSchemaDefinition = SchemaDefinition<'number', unknown, number> & Coercible & {
-    /** integer */
+import type { Decorator } from "../../reflection";
+import type { Coercible, ValueSchema } from '../types';
+export declare type NumberOptions = Coercible & {
+    minimum?: number;
+    maximum?: number;
     integer?: boolean;
-    /** min */
-    min?: number;
-    /** max */
-    max?: number;
 };
-export declare class NumberSchemaValidator extends SchemaValidator<NumberSchemaDefinition> {
-    [test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<number>;
-}
-export declare function number(options?: SchemaOptions<NumberSchemaDefinition>): NumberSchemaValidator;
+export declare function number(options?: NumberOptions): ValueSchema<number>;
+export declare function Number(options?: NumberOptions): Decorator<'property' | 'accessor'>;

package/schema/schemas/number.js

@@ -1,49 +1,33 @@
-import { numberPattern } from "../../utils/patterns.js";
-import { isDefined } from "../../utils/type-guards.js";
-import { SchemaError, schemaError } from '../schema.error.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import { schemaHelper } from '../types.js';
-const coercerMap = {
-    string: (string, path) => {
-        const isNumberString = numberPattern.test(string);
-        const numberValue = Number(string);
-        if (!isNumberString || Number.isNaN(numberValue)) {
-            return { valid: false, error: SchemaError.couldNotCoerce('number', 'string', 'invalid format', path) };
-        }
-        return { valid: true, value: numberValue };
-    },
-    boolean: (boolean) => ({ valid: true, value: Number(boolean) }),
-    bigint: (bigint, path) => {
-        const numberValue = Number(bigint);
-        if (!Number.isFinite(numberValue)) {
-            return { valid: false, error: SchemaError.couldNotCoerce('number', 'bigint', 'value out of bounds', path) };
-        }
-        return { valid: true, value: numberValue };
+"use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Number = exports.number = void 0;
+const type_guards_1 = require("../../utils/type-guards");
+const integer_1 = require("../constraints/integer");
+const maximum_1 = require("../constraints/maximum");
+const minimum_1 = require("../constraints/minimum");
+const decorators_1 = require("../decorators");
+const types_1 = require("../types");
+function number(options = {}) {
+    const constraints = [];
+    if ((0, type_guards_1.isDefined)(options.minimum)) {
+        constraints.push(new minimum_1.MinimumConstraint(options.minimum));
     }
-};
-export class NumberSchemaValidator extends SchemaValidator {
-    [test](value, options, path) {
-        const result = super.ensureType('number', value, path, { coerce: this.schema.coerce ?? options.coerce }, coercerMap);
-        if (!result.valid) {
-            return result;
-        }
-        if ((this.schema.integer == true) && !Number.isInteger(result.value)) {
-            return { valid: false, error: schemaError('expected integer', path) };
-        }
-        if (isDefined(this.schema.min) && (result.value < this.schema.min)) {
-            return { valid: false, error: schemaError(`minimum valid value is ${this.schema.min}`, path) };
-        }
-        if (isDefined(this.schema.max) && (result.value > this.schema.max)) {
-            return { valid: false, error: schemaError(`maximum valid value is ${this.schema.max}`, path) };
-        }
-        return { valid: true, value: result.value };
+    if ((0, type_guards_1.isDefined)(options.maximum)) {
+        constraints.push(new maximum_1.MaximumConstraint(options.maximum));
     }
-}
-export function number(options) {
-    const schema = schemaHelper({
-        type: 'number',
-        ...options
+    if (options.integer == true) {
+        constraints.push(integer_1.integerConstraint);
+    }
+    return (0, types_1.valueSchema)({
+        type: globalThis.Number,
+        coerce: options.coerce,
+        valueConstraints: constraints
     });
-    return new NumberSchemaValidator(schema);
 }
+exports.number = number;
+function Number(options) {
+    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(number(options));
+}
+exports.Number = Number;
 //# sourceMappingURL=number.js.map

package/schema/schemas/number.js.map

@@ -1 +1 @@
-{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../source/schema/schemas/number.ts"],"names":[],"mappings":"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"}
+{"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,8CAA2E;AAE3E,oCAAuC;AAQvC,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;QACjB,IAAI,EAAE,UAAU,CAAC,MAAM;QACvB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,gBAAgB,EAAE,WAAW;KAC9B,CAAC,CAAC;AACL,CAAC;AApBD,wBAoBC;AAED,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,IAAA,uDAA0C,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACrE,CAAC;AAFD,wBAEC"}

package/schema/schemas/object.d.ts

@@ -1,27 +1,6 @@
-import type { JsonPath } from "../../json-path/index.js";
-import type { Optionalize, Simplify, SimplifyObject, StringMap } from "../../types.js";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator.js';
-import { SchemaValidator, test, testAsync } from '../schema.validator.js';
-import type { Maskable, SchemaDefinition, SchemaOptions, SchemaOutput } from '../types.js';
-export declare type ObjectOutputType<T extends StringMap<SchemaDefinition>> = Simplify<Optionalize<{
-    [P in keyof T]: SchemaOutput<T[P]>;
-}>>;
-export declare type ObjectSchemaValidatorEntries<T extends StringMap<SchemaDefinition>> = {
-    [P in keyof T]: SchemaValidator<T[P]>;
-};
-export declare type ObjectSchemaDefinition<T extends StringMap<SchemaDefinition> = StringMap<SchemaDefinition>> = SchemaDefinition<'object', unknown, ObjectOutputType<T>> & Maskable & {
-    entries: T;
-    /** Keep unknown properties instead of raising an error. This overwrites mask. */
-    keepUnknown?: boolean;
-};
-export declare type ObjectAssign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>> = SimplifyObject<B & Omit<A, keyof B>>;
-export declare class ObjectSchemaValidator<T extends StringMap<SchemaDefinition>> extends SchemaValidator<ObjectSchemaDefinition<T>> {
-    private readonly validatorEntries;
-    constructor(validators: ObjectSchemaValidatorEntries<T>, schema: ObjectSchemaDefinition<T>);
-    static assign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>>(a: ObjectSchemaValidator<A>, b: ObjectSchemaValidator<B>): ObjectSchemaValidator<ObjectAssign<A, B>>;
-    [test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<ObjectOutputType<T>>;
-    [testAsync](value: unknown, options: DefinedValidationOptions, path: JsonPath): Promise<ValidationTestResult<ObjectOutputType<T>>>;
-    private _testBase;
-}
-export declare function object<T extends StringMap<SchemaDefinition>>(entries: ObjectSchemaValidatorEntries<T>, options?: SchemaOptions<ObjectSchemaDefinition<T>, 'entries'>): ObjectSchemaValidator<T>;
-export declare function assign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>>(a: ObjectSchemaValidator<A>, b: ObjectSchemaValidator<B>): ObjectSchemaValidator<ObjectAssign<A, B>>;
+import type { Record, TypedOmit } from "../../types";
+import type { PartialOnUndefinedDeep } from 'type-fest';
+import type { ObjectSchema, ObjectSchemaProperties } from '../types';
+export declare type ObjectOptions<T extends Record = Record> = TypedOmit<ObjectSchema<T>, 'properties'>;
+export declare function explicitObject<T extends Record>(properties: ObjectSchemaProperties<T>, options?: ObjectOptions<T>): ObjectSchema<T>;
+export declare function object<T extends Record>(properties: ObjectSchemaProperties<T>, options?: ObjectOptions<T>): ObjectSchema<PartialOnUndefinedDeep<T>>;

package/schema/schemas/object.js

@@ -1,87 +1,17 @@
-import { differenceMaps } from "../../utils/map.js";
-import { isBoolean } from "../../utils/type-guards.js";
-import { schemaError, SchemaError } from '../schema.error.js';
-import { SchemaValidator, test, testAsync } from '../schema.validator.js';
-import { schemaHelper } from '../types.js';
-export class ObjectSchemaValidator extends SchemaValidator {
-    constructor(validators, schema) {
-        super(schema);
-        this.validatorEntries = new Map(Object.entries(validators));
-    }
-    static assign(a, b) {
-        const validatorEntries = Object.fromEntries([...a.validatorEntries.entries(), ...b.validatorEntries.entries()]);
-        const schema = {
-            type: 'object',
-            entries: { ...a.schema.entries, ...b.schema.entries }
-        };
-        return new ObjectSchemaValidator(validatorEntries, schema);
-    }
-    [test](value, options, path) {
-        const testBaseResult = this._testBase(value, options, path);
-        if (!testBaseResult.valid) {
-            return testBaseResult;
-        }
-        let resultObject = {};
-        for (const [key, validator] of this.validatorEntries) {
-            const innerValue = testBaseResult.value.get(key);
-            const innerValueValidationTestResult = validator[test](innerValue, options, path.add(key));
-            if (!innerValueValidationTestResult.valid) {
-                return innerValueValidationTestResult;
-            }
-            resultObject[key] = innerValueValidationTestResult.value;
-        }
-        if (this.schema.keepUnknown == true) {
-            resultObject = { ...value, ...resultObject };
-        }
-        return { valid: true, value: resultObject };
-    }
-    async [testAsync](value, options, path) {
-        const testBaseResult = this._testBase(value, options, path);
-        if (!testBaseResult.valid) {
-            return testBaseResult;
-        }
-        let resultObject = {};
-        for (const [key, validator] of this.validatorEntries) {
-            const innerValue = testBaseResult.value.get(key);
-            const innerValueValidationTestResult = await validator[testAsync](innerValue, options, path.add(key));
-            if (!innerValueValidationTestResult.valid) {
-                return innerValueValidationTestResult;
-            }
-            resultObject[key] = innerValueValidationTestResult.value;
-        }
-        if (this.schema.keepUnknown == true) {
-            resultObject = { ...value, ...resultObject };
-        }
-        return { valid: true, value: resultObject };
-    }
-    _testBase(value, options, path) {
-        const typeResult = this.ensureType('object', value, path);
-        if (!typeResult.valid) {
-            return typeResult;
-        }
-        else if (value === null) {
-            return { valid: false, error: SchemaError.expectedButGot('object', 'null', path) };
-        }
-        const valueEntries = new Map(Object.entries(value));
-        const unknownKeys = differenceMaps(valueEntries, this.validatorEntries);
-        if ((unknownKeys.length > 0) && (this.schema.mask != true) && (isBoolean(this.schema.mask) || !options.mask) && (this.schema.keepUnknown != true)) {
-            const keys = unknownKeys.map((entry) => entry[0]).join(', ');
-            return { valid: false, error: schemaError(`unexpecet keys in object: ${keys}`, path) };
-        }
-        return { valid: true, value: valueEntries };
-    }
+"use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.object = exports.explicitObject = void 0;
+const types_1 = require("../types");
+function explicitObject(properties, options) {
+    return object(properties, options);
 }
-export function object(entries, options) {
-    const validatorEntries = Object.entries(entries);
-    const mappedValidatorEntries = validatorEntries.map(([key, value]) => [key, value.schema]);
-    const schema = schemaHelper({
-        type: 'object',
-        entries: Object.fromEntries(mappedValidatorEntries),
+exports.explicitObject = explicitObject;
+function object(properties, options) {
+    return (0, types_1.objectSchema)({
+        properties,
         ...options
     });
-    return new ObjectSchemaValidator(entries, schema);
-}
-export function assign(a, b) {
-    return ObjectSchemaValidator.assign(a, b);
 }
+exports.object = object;
 //# sourceMappingURL=object.js.map

package/schema/schemas/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAKzD,oCAAwC;AAIxC,SAAgB,cAAc,CAAmB,UAAqC,EAAE,OAA0B;IAChH,OAAO,MAAM,CAAC,UAAU,EAAE,OAAO,CAA2B,CAAC;AAC/D,CAAC;AAFD,wCAEC;AAED,SAAgB,MAAM,CAAmB,UAAqC,EAAE,OAA0B;IACxG,OAAO,IAAA,oBAAY,EAAC;QAClB,UAAU;QACV,GAAG,OAAO;KACX,CAA4C,CAAC;AAChD,CAAC;AALD,wBAKC"}

package/schema/schemas/optional.d.ts

@@ -1,13 +1,3 @@
-import type { JsonPath } from "../../json-path/index.js";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import type { Coercible, SchemaDefinition, SchemaInput, SchemaOptions, SchemaOutput } from '../types.js';
-export declare type OptionalSchemaDefinition<T extends SchemaDefinition = SchemaDefinition> = SchemaDefinition<'optional', SchemaInput<T> | undefined, SchemaOutput<T> | undefined> & Coercible & {
-    schema: T;
-};
-export declare class OptionalSchemaValidator<T extends SchemaDefinition> extends SchemaValidator<OptionalSchemaDefinition<T>> {
-    private readonly innerValidator;
-    constructor(innerValidator: SchemaValidator<T>, schema: OptionalSchemaDefinition<T>);
-    [test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<SchemaOutput<OptionalSchemaDefinition<T>>>;
-}
-export declare function optional<T extends SchemaDefinition>(innerValidator: SchemaValidator<T>, options?: SchemaOptions<OptionalSchemaDefinition<T>, 'schema'>): OptionalSchemaValidator<T>;
+import type { Schema } from '../schema';
+import type { ValueSchema } from '../types';
+export declare function optional<T>(schema: Schema<T>): ValueSchema<T | undefined>;

package/schema/schemas/optional.js

@@ -1,27 +1,9 @@
-import { isNull, isUndefined } from "../../utils/type-guards.js";
-import { SchemaValidator, test } from '../schema.validator.js';
-import { schemaHelper } from '../types.js';
-export class OptionalSchemaValidator extends SchemaValidator {
-    constructor(innerValidator, schema) {
-        super(schema);
-        this.innerValidator = innerValidator;
-    }
-    [test](value, options, path) {
-        if (isUndefined(value)) {
-            return { valid: true, value };
-        }
-        if ((this.schema.coerce ?? options.coerce) && isNull(value)) {
-            return { valid: true, value: undefined };
-        }
-        return this.innerValidator[test](value, options, path);
-    }
-}
-export function optional(innerValidator, options) {
-    const schema = schemaHelper({
-        type: 'optional',
-        schema: innerValidator.schema,
-        ...options
-    });
-    return new OptionalSchemaValidator(innerValidator, schema);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.optional = void 0;
+const types_1 = require("../types");
+function optional(schema) {
+    return (0, types_1.valueSchema)({ type: schema, optional: true });
 }
+exports.optional = optional;
 //# sourceMappingURL=optional.js.map

package/schema/schemas/optional.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/schemas/optional.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,mCAA+B;AAE7D,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,MAAM,OAAO,uBAAoD,SAAQ,eAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,IAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;YAC3D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF;AAED,MAAM,UAAU,QAAQ,CAA6B,cAAkC,EAAE,OAA8D;IACrJ,MAAM,MAAM,GAAG,YAAY,CAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../../source/schema/schemas/optional.ts"],"names":[],"mappings":";;;AAEA,oCAAuC;AAEvC,SAAgB,QAAQ,CAAI,MAAiB;IAC3C,OAAO,IAAA,mBAAW,EAAC,EAAE,IAAI,EAAE,MAA+B,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAChF,CAAC;AAFD,4BAEC"}

package/schema/schemas/pick.d.ts

@@ -0,0 +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>>>;

package/schema/schemas/pick.js

@@ -0,0 +1,17 @@
+"use strict";
+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 keys = (0, array_1.toArray)(key);
+    const entries = Object.entries(schema.properties);
+    const pickedEntries = entries.filter(([propertyKey]) => keys.includes(propertyKey));
+    const pickedSchema = (0, types_1.objectSchema)({
+        ...schema,
+        properties: Object.fromEntries(pickedEntries)
+    });
+    return pickedSchema;
+}
+exports.pick = pick;
+//# sourceMappingURL=pick.js.map

package/schema/schemas/pick.js.map

@@ -0,0 +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,CAAe;KAC5D,CAAC,CAAC;IAEH,OAAO,YAAwC,CAAC;AAClD,CAAC;AAZD,oBAYC"}

package/schema/schemas/readable-stream.d.ts

@@ -1,9 +1,4 @@
-import type { JsonPath } from "../../json-path/index.js";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import type { SchemaDefinition, SchemaOptions, SchemaOutput } from '../types.js';
-export declare type ReadableStreamSchemaDefinition = SchemaDefinition<'readableStream', unknown, ReadableStream>;
-export declare class ReadableStreamSchemaValidator extends SchemaValidator<ReadableStreamSchemaDefinition> {
-    [test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<SchemaOutput<ReadableStreamSchemaDefinition>>;
-}
-export declare function readableStream(options?: SchemaOptions<ReadableStreamSchemaDefinition>): ReadableStreamSchemaValidator;
+import type { Decorator } from "../../reflection";
+import type { ValueSchema } from '../types';
+export declare function readableStream(): ValueSchema<globalThis.ReadableStream>;
+export declare function ReadableStream(): Decorator<'property' | 'accessor'>;

package/schema/schemas/readable-stream.js

@@ -1,17 +1,16 @@
-import { SchemaValidator, test } from '../schema.validator.js';
-import { schemaHelper } from '../types.js';
-import { instance } from './instance.js';
-const readableStreamInstanceSchema = (typeof ReadableStream != 'function' ? undefined : instance(ReadableStream));
-export class ReadableStreamSchemaValidator extends SchemaValidator {
-    [test](value, options, path) {
-        return readableStreamInstanceSchema[test](value, options, path);
-    }
-}
-export function readableStream(options) {
-    const schema = schemaHelper({
-        type: 'readableStream',
-        ...options
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReadableStream = exports.readableStream = void 0;
+const decorators_1 = require("../decorators");
+const types_1 = require("../types");
+function readableStream() {
+    return (0, types_1.valueSchema)({
+        type: globalThis.ReadableStream
     });
-    return new ReadableStreamSchemaValidator(schema);
 }
+exports.readableStream = readableStream;
+function ReadableStream() {
+    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(readableStream());
+}
+exports.ReadableStream = ReadableStream;
 //# sourceMappingURL=readable-stream.js.map

package/schema/schemas/readable-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"readable-stream.js","sourceRoot":"","sources":["../../../source/schema/schemas/readable-stream.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,MAAM,4BAA4B,GAAG,CAAC,OAAO,cAAc,IAAI,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAE,CAAC;AAEnH,MAAM,OAAO,6BAA8B,SAAQ,eAA+C;IAChG,CAAC,IAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,OAAO,4BAA4B,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,OAAuD;IACpF,MAAM,MAAM,GAAG,YAAY,CAAiC;QAC1D,IAAI,EAAE,gBAAgB;QACtB,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,6BAA6B,CAAC,MAAM,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"readable-stream.js","sourceRoot":"","sources":["../../../source/schema/schemas/readable-stream.ts"],"names":[],"mappings":";;;AACA,8CAA2E;AAE3E,oCAAuC;AAEvC,SAAgB,cAAc;IAC5B,OAAO,IAAA,mBAAW,EAAC;QACjB,IAAI,EAAE,UAAU,CAAC,cAAc;KAChC,CAAC,CAAC;AACL,CAAC;AAJD,wCAIC;AAED,SAAgB,cAAc;IAC5B,OAAO,IAAA,uDAA0C,EAAC,cAAc,EAAE,CAAC,CAAC;AACtE,CAAC;AAFD,wCAEC"}

package/schema/schemas/record.d.ts

@@ -0,0 +1,4 @@
+import type { Record, TypedOmit } from "../../types";
+import type { MaybeDeferredValueTypes, ObjectSchema } from '../types';
+export declare type RecordOptions<T extends Record = Record> = TypedOmit<ObjectSchema<T>, 'properties' | 'allowUnknownProperties'>;
+export declare function record<T extends MaybeDeferredValueTypes>(schemas: T, options?: RecordOptions): ObjectSchema<Record<any, T extends MaybeDeferredValueTypes<infer U> ? U : never>>;

package/schema/schemas/record.js

@@ -0,0 +1,14 @@
+"use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.record = void 0;
+const types_1 = require("../types");
+function record(schemas, options) {
+    return (0, types_1.objectSchema)({
+        properties: {},
+        allowUnknownProperties: schemas,
+        ...options
+    });
+}
+exports.record = record;
+//# sourceMappingURL=record.js.map

package/schema/schemas/record.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../source/schema/schemas/record.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,oCAAwC;AAIxC,SAAgB,MAAM,CAAoC,OAAU,EAAE,OAAuB;IAC3F,OAAO,IAAA,oBAAY,EAAC;QAClB,UAAU,EAAE,EAAE;QACd,sBAAsB,EAAE,OAAO;QAC/B,GAAG,OAAO;KACX,CAAiB,CAAC;AACrB,CAAC;AAND,wBAMC"}

package/schema/schemas/regexp.d.ts

@@ -1,9 +1,6 @@
-import type { JsonPath } from "../../json-path/index.js";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import type { Coercible, SchemaDefinition, SchemaOptions } from '../types.js';
-export declare type RegExpSchemaDefinition = SchemaDefinition<'regexp', unknown, RegExp> & Coercible;
-export declare class RegExpSchemaValidator extends SchemaValidator<RegExpSchemaDefinition> {
-    [test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<RegExp>;
-}
-export declare function regexp(options?: SchemaOptions<RegExpSchemaDefinition>): RegExpSchemaValidator;
+import type { Decorator } from "../../reflection";
+import type { Schema } from '../schema';
+import type { Coercible } from '../types';
+export declare type RegExpSchemaOptions = Coercible;
+export declare function regexp(options?: RegExpSchemaOptions): Schema<globalThis.RegExp>;
+export declare function RegExp(options?: RegExpSchemaOptions): Decorator<'property' | 'accessor'>;

package/schema/schemas/regexp.js

@@ -1,29 +1,17 @@
-import { isRegExp, isString } from "../../utils/type-guards.js";
-import { typeOf } from "../../utils/type-of.js";
-import { schemaError, SchemaError } from '../schema.error.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import { schemaHelper } from '../types.js';
-export class RegExpSchemaValidator extends SchemaValidator {
-    [test](value, options, path) {
-        if (!isRegExp(value)) {
-            if ((this.schema.coerce ?? options.coerce) && isString(value)) {
-                try {
-                    return { valid: true, value: RegExp(value, 'u') };
-                }
-                catch (error) {
-                    return { valid: false, error: schemaError(`could not coerce provided string to regular expression: ${error.message}`, path) };
-                }
-            }
-            return { valid: false, error: SchemaError.expectedButGot('RegExp', typeOf(value), path) };
-        }
-        return { valid: true, value };
-    }
-}
-export function regexp(options) {
-    const schema = schemaHelper({
-        type: 'regexp',
-        ...options
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RegExp = exports.regexp = void 0;
+const decorators_1 = require("../decorators");
+const types_1 = require("../types");
+function regexp(options = {}) {
+    return (0, types_1.valueSchema)({
+        type: globalThis.RegExp,
+        coerce: options.coerce
     });
-    return new RegExpSchemaValidator(schema);
 }
+exports.regexp = regexp;
+function RegExp(options) {
+    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(regexp(options));
+}
+exports.RegExp = RegExp;
 //# sourceMappingURL=regexp.js.map

package/schema/schemas/regexp.js.map

@@ -1 +1 @@
-{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../../source/schema/schemas/regexp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,mCAA+B;AAC5D,OAAO,EAAE,MAAM,EAAE,+BAA2B;AAC5C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,MAAM,OAAO,qBAAsB,SAAQ,eAAuC;IAChF,CAAC,IAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC7D,IAAI;oBACF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;iBACnD;gBACD,OAAO,KAAK,EAAE;oBACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,2DAA4D,KAAe,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;iBAC1I;aACF;YAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;SAC3F;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;CACF;AAED,MAAM,UAAU,MAAM,CAAC,OAA+C;IACpE,MAAM,MAAM,GAAG,YAAY,CAAyB;QAClD,IAAI,EAAE,QAAQ;QACd,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../../source/schema/schemas/regexp.ts"],"names":[],"mappings":";;;AACA,8CAA2E;AAG3E,oCAAuC;AAIvC,SAAgB,MAAM,CAAC,UAA+B,EAAE;IACtD,OAAO,IAAA,mBAAW,EAAC;QACjB,IAAI,EAAE,UAAU,CAAC,MAAM;QACvB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;AACL,CAAC;AALD,wBAKC;AAED,SAAgB,MAAM,CAAC,OAA6B;IAClD,OAAO,IAAA,uDAA0C,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACrE,CAAC;AAFD,wBAEC"}

package/schema/schemas/string.d.ts

@@ -1,8 +1,6 @@
-import type { JsonPath } from "../../json-path/index.js";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator.js';
-import { SchemaValidator, test } from '../schema.validator.js';
-import type { Coercible, SchemaDefinition, SchemaOptions } from '../types.js';
-export declare type StringSchemaDefinition = SchemaDefinition<'string', unknown, string> & Coercible & {
+import type { Decorator } from "../../reflection";
+import type { Coercible, ValueSchema } from '../types';
+export declare type StringOptions = Coercible & {
     /** trim */
     trim?: boolean;
     /** lowercase */
@@ -10,17 +8,15 @@ export declare type StringSchemaDefinition = SchemaDefinition<'string', unknown,
     /** uppercase */
     uppercase?: boolean;
     /** minimum length */
-    min?: number;
+    minimumLength?: number;
     /** maximum length */
-    max?: number;
+    maximumLength?: number;
     /** regular expression */
     pattern?: string | RegExp;
     /** regular expression flags */
     patternFlags?: string;
+    /** name for errors */
+    patternName?: string;
 };
-export declare class StringSchemaValidator extends SchemaValidator<StringSchemaDefinition> {
-    private readonly regexp;
-    constructor(schema: StringSchemaDefinition);
-    [test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<string>;
-}
-export declare function string(options?: SchemaOptions<StringSchemaDefinition>): StringSchemaValidator;
+export declare function string(options?: StringOptions): ValueSchema<string>;
+export declare function String(options?: StringOptions): Decorator<'property' | 'accessor'>;