@tstdl/base 0.71.88 → 0.78.0-beta2

package/schema/schemas/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/schema/schemas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,0CAAwB;AACxB,mDAAiC;AACjC,4CAA0B;AAC1B,yCAAuB;AACvB,8CAA4B;AAC5B,gDAA8B;AAC9B,6CAA2B;AAC3B,6CAA2B;AAC3B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,2CAAyB;AACzB,2CAAyB;AACzB,6CAA2B;AAC3B,+CAA6B;AAC7B,oDAAkC;AAClC,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,0CAAwB;AACxB,4CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/schema/schemas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,yCAAuB;AACvB,gDAA8B;AAC9B,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,6CAA2B;AAC3B,2CAAyB;AACzB,2CAAyB;AACzB,6CAA2B;AAC3B,yCAAuB;AACvB,oDAAkC;AAClC,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,0CAAwB;AACxB,4CAA0B"}

package/schema/schemas/instance.d.ts

@@ -1,12 +1,2 @@
-import type { JsonPath } from "../../json-path";
-import type { Type } from "../../types";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
-import { SchemaValidator, test } from '../schema.validator';
-import type { SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
-export declare type InstanceSchemaDefinition<T = unknown> = SchemaDefinition<'instance', T, T> & {
-    constructor: Type<T>;
-};
-export declare class InstanceSchemaValidator<T> extends SchemaValidator<InstanceSchemaDefinition<T>> {
-    [test](value: unknown, _options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<SchemaOutput<InstanceSchemaDefinition<T>>>;
-}
-export declare function instance<T>(constructor: Type<T>, options?: SchemaOptions<InstanceSchemaDefinition<T>, 'constructor'>): InstanceSchemaValidator<T>;
+import type { ValueSchema, ValueType } from '../types';
+export declare function instance<T>(type: Extract<ValueType<T>, Function>): ValueSchema<T>;

package/schema/schemas/instance.js

@@ -1,26 +1,10 @@
 "use strict";
+/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.instance = exports.InstanceSchemaValidator = void 0;
-const type_of_1 = require("../../utils/type-of");
-const schema_error_1 = require("../schema.error");
-const schema_validator_1 = require("../schema.validator");
+exports.instance = void 0;
 const types_1 = require("../types");
-class InstanceSchemaValidator extends schema_validator_1.SchemaValidator {
-    [schema_validator_1.test](value, _options, path) {
-        if (value instanceof this.schema.constructor) {
-            return { valid: true, value: value };
-        }
-        return { valid: false, error: schema_error_1.SchemaError.expectedButGot(`instance of ${this.schema.constructor.name}`, (0, type_of_1.typeOf)(value), path) };
-    }
-}
-exports.InstanceSchemaValidator = InstanceSchemaValidator;
-function instance(constructor, options) {
-    const schema = (0, types_1.schemaHelper)({
-        type: 'instance',
-        constructor,
-        ...options
-    });
-    return new InstanceSchemaValidator(schema);
+function instance(type) {
+    return (0, types_1.valueSchema)({ type });
 }
 exports.instance = instance;
 //# sourceMappingURL=instance.js.map

package/schema/schemas/instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../../source/schema/schemas/instance.ts"],"names":[],"mappings":";;;AAEA,iDAAyC;AACzC,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAA2B,SAAQ,kCAA4C;IAC1F,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,IAAI,KAAK,YAAY,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC5C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC;SAC3C;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IACjI,CAAC;CACF;AARD,0DAQC;AAED,SAAgB,QAAQ,CAAI,WAAoB,EAAE,OAAmE;IACnH,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;QACvD,IAAI,EAAE,UAAU;QAChB,WAAW;QACX,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AARD,4BAQC"}
+{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../../source/schema/schemas/instance.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAGjD,oCAAuC;AAEvC,SAAgB,QAAQ,CAAI,IAAqC;IAC/D,OAAO,IAAA,mBAAW,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/B,CAAC;AAFD,4BAEC"}

package/schema/schemas/literal.d.ts

@@ -1,11 +1,4 @@
-import type { JsonPath } from "../../json-path";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
-import { SchemaValidator, test } from '../schema.validator';
-import type { SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
-export declare type LiteralSchemaDefinition<T> = SchemaDefinition<'literal', T, T> & {
-    value: T;
-};
-export declare class LiteralSchemaValidator<T> extends SchemaValidator<LiteralSchemaDefinition<T>> {
-    [test](value: unknown, _options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<SchemaOutput<LiteralSchemaDefinition<T>>>;
-}
-export declare function literal<T>(value: T, options?: SchemaOptions<LiteralSchemaDefinition<T>, 'value'>): LiteralSchemaValidator<T>;
+import type { Decorator } from "../../reflection";
+import type { ValueSchema } from '../types';
+export declare function literal<T>(value: T): ValueSchema<T>;
+export declare function Literal(value: any): Decorator<'property' | 'accessor'>;

package/schema/schemas/literal.js

@@ -1,25 +1,20 @@
 "use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.literal = exports.LiteralSchemaValidator = void 0;
-const schema_error_1 = require("../schema.error");
-const schema_validator_1 = require("../schema.validator");
+exports.Literal = exports.literal = void 0;
+const constraints_1 = require("../constraints");
+const decorators_1 = require("../decorators");
 const types_1 = require("../types");
-class LiteralSchemaValidator extends schema_validator_1.SchemaValidator {
-    [schema_validator_1.test](value, _options, path) {
-        if (value === this.schema.value) {
-            return { valid: true, value: value };
-        }
-        return { valid: false, error: schema_error_1.SchemaError.expectedButGot(String(this.schema.value), String(value), path) };
-    }
-}
-exports.LiteralSchemaValidator = LiteralSchemaValidator;
-function literal(value, options) {
-    const schema = (0, types_1.schemaHelper)({
-        type: 'literal',
-        value,
-        ...options
+const utils_1 = require("../utils");
+function literal(value) {
+    return (0, types_1.valueSchema)({
+        type: (0, utils_1.getValueType)(value),
+        valueConstraints: new constraints_1.LiteralConstraint(value)
     });
-    return new LiteralSchemaValidator(schema);
 }
 exports.literal = literal;
+function Literal(value) {
+    return (0, decorators_1.createSchemaPropertyDecoratorFromValueType)(literal(value));
+}
+exports.Literal = Literal;
 //# sourceMappingURL=literal.js.map

package/schema/schemas/literal.js.map

@@ -1 +1 @@
-{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../../source/schema/schemas/literal.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,sBAA0B,SAAQ,kCAA2C;IACxF,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,QAAkC,EAAE,IAAc;QACvE,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAC/B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,CAAC;SAC3C;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,0BAAW,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAC7G,CAAC;CACF;AARD,wDAQC;AAED,SAAgB,OAAO,CAAI,KAAQ,EAAE,OAA4D;IAC/F,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA6B;QACtD,IAAI,EAAE,SAAS;QACf,KAAK;QACL,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AARD,0BAQC"}
+{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../../source/schema/schemas/literal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,gDAAmD;AACnD,8CAA2E;AAE3E,oCAAuC;AACvC,oCAAwC;AAExC,SAAgB,OAAO,CAAI,KAAQ;IACjC,OAAO,IAAA,mBAAW,EAAC;QACjB,IAAI,EAAE,IAAA,oBAAY,EAAC,KAAK,CAAC;QACzB,gBAAgB,EAAE,IAAI,+BAAiB,CAAC,KAAK,CAAC;KAC/C,CAAC,CAAC;AACL,CAAC;AALD,0BAKC;AAED,SAAgB,OAAO,CAAC,KAAU;IAChC,OAAO,IAAA,uDAA0C,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,0BAEC"}

package/schema/schemas/nullable.d.ts

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

package/schema/schemas/nullable.js

@@ -1,32 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullable = exports.NullableSchemaValidator = void 0;
-const type_guards_1 = require("../../utils/type-guards");
-const schema_validator_1 = require("../schema.validator");
+exports.nullable = void 0;
 const types_1 = require("../types");
-class NullableSchemaValidator extends schema_validator_1.SchemaValidator {
-    constructor(innerValidator, schema) {
-        super(schema);
-        this.innerValidator = innerValidator;
-    }
-    [schema_validator_1.test](value, options, path) {
-        if ((0, type_guards_1.isNull)(value)) {
-            return { valid: true, value };
-        }
-        if ((this.schema.coerce ?? options.coerce) && (0, type_guards_1.isUndefined)(value)) {
-            return { valid: true, value: null };
-        }
-        return this.innerValidator[schema_validator_1.test](value, options, path);
-    }
-}
-exports.NullableSchemaValidator = NullableSchemaValidator;
-function nullable(innerValidator, options) {
-    const schema = (0, types_1.schemaHelper)({
-        type: 'nullable',
-        schema: innerValidator.schema,
-        ...options
-    });
-    return new NullableSchemaValidator(innerValidator, schema);
+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,yDAA0D;AAE1D,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,IAAA,oBAAM,EAAC,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,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YAChE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACrC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF;AApBD,0DAoBC;AAED,SAAgB,QAAQ,CAA6B,cAAkC,EAAE,OAA8D;IACrJ,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;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;AARD,4BAQC"}
+{"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";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
-import { SchemaValidator, test } from '../schema.validator';
-import type { Coercible, SchemaDefinition, SchemaOptions } from '../types';
-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,54 +1,33 @@
 "use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.number = exports.NumberSchemaValidator = void 0;
-const patterns_1 = require("../../utils/patterns");
+exports.Number = exports.number = void 0;
 const type_guards_1 = require("../../utils/type-guards");
-const schema_error_1 = require("../schema.error");
-const schema_validator_1 = require("../schema.validator");
+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");
-const coercerMap = {
-    string: (string, path) => {
-        const isNumberString = patterns_1.numberPattern.test(string);
-        const numberValue = Number(string);
-        if (!isNumberString || Number.isNaN(numberValue)) {
-            return { valid: false, error: schema_error_1.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: schema_error_1.SchemaError.couldNotCoerce('number', 'bigint', 'value out of bounds', path) };
-        }
-        return { valid: true, value: numberValue };
+function number(options = {}) {
+    const constraints = [];
+    if ((0, type_guards_1.isDefined)(options.minimum)) {
+        constraints.push(new minimum_1.MinimumConstraint(options.minimum));
     }
-};
-class NumberSchemaValidator extends schema_validator_1.SchemaValidator {
-    [schema_validator_1.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: (0, schema_error_1.schemaError)('expected integer', path) };
-        }
-        if ((0, type_guards_1.isDefined)(this.schema.min) && (result.value < this.schema.min)) {
-            return { valid: false, error: (0, schema_error_1.schemaError)(`minimum valid value is ${this.schema.min}`, path) };
-        }
-        if ((0, type_guards_1.isDefined)(this.schema.max) && (result.value > this.schema.max)) {
-            return { valid: false, error: (0, schema_error_1.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));
     }
-}
-exports.NumberSchemaValidator = NumberSchemaValidator;
-function number(options) {
-    const schema = (0, types_1.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,34 +1,6 @@
-import type { JsonPath } from "../../json-path";
-import type { OneOrMany, Optionalize, SimplifyObject, StringMap } from "../../types";
-import type { Simplify } from 'type-fest';
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
-import { SchemaValidator, test, testAsync } from '../schema.validator';
-import type { Maskable, SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
-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 type ObjectPick<T extends StringMap<SchemaDefinition>, K extends keyof T> = SimplifyObject<Pick<T, K>>;
-export declare type ObjectExclude<T extends StringMap<SchemaDefinition>, K extends keyof T> = SimplifyObject<Omit<T, K>>;
-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>>;
-    static pick<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectPick<T, K>>;
-    static exclude<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectExclude<T, K>>;
-    [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>>;
-export declare function pick<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectPick<T, K>>;
-export declare function exclude<T extends StringMap<SchemaDefinition>, K extends keyof T>(objectSchema: ObjectSchemaValidator<T>, keys: OneOrMany<K>): ObjectSchemaValidator<ObjectExclude<T, K>>;
+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,121 +1,17 @@
 "use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exclude = exports.pick = exports.assign = exports.object = exports.ObjectSchemaValidator = void 0;
-const array_1 = require("../../utils/array/array");
-const map_1 = require("../../utils/map");
-const object_1 = require("../../utils/object/object");
-const type_guards_1 = require("../../utils/type-guards");
-const schema_error_1 = require("../schema.error");
-const schema_validator_1 = require("../schema.validator");
+exports.object = exports.explicitObject = void 0;
 const types_1 = require("../types");
-class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
-    constructor(validators, schema) {
-        super(schema);
-        this.validatorEntries = new Map((0, object_1.objectEntries)(validators));
-    }
-    static assign(a, b) {
-        const validatorEntries = Object.fromEntries([...a.validatorEntries, ...b.validatorEntries]);
-        const schema = {
-            type: 'object',
-            entries: { ...a.schema.entries, ...b.schema.entries }
-        };
-        return new ObjectSchemaValidator(validatorEntries, schema);
-    }
-    static pick(objectSchema, keys) {
-        const keysArray = (0, array_1.toArray)(keys);
-        const validatorEntries = Object.fromEntries([...objectSchema.validatorEntries].filter(([key]) => keysArray.includes(key)));
-        const schema = {
-            type: 'object',
-            entries: Object.fromEntries([...Object.entries(objectSchema.schema.entries)].filter(([key]) => keysArray.includes(key)))
-        };
-        return new ObjectSchemaValidator(validatorEntries, schema);
-    }
-    static exclude(objectSchema, keys) {
-        const keysArray = (0, array_1.toArray)(keys);
-        const validatorEntries = Object.fromEntries([...objectSchema.validatorEntries].filter(([key]) => !keysArray.includes(key)));
-        const schema = {
-            type: 'object',
-            entries: Object.fromEntries([...Object.entries(objectSchema.schema.entries)].filter(([key]) => !keysArray.includes(key)))
-        };
-        return new ObjectSchemaValidator(validatorEntries, schema);
-    }
-    [schema_validator_1.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[schema_validator_1.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 [schema_validator_1.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[schema_validator_1.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: schema_error_1.SchemaError.expectedButGot('object', 'null', path) };
-        }
-        const valueEntries = new Map((0, object_1.objectEntries)(value));
-        const unknownKeys = (0, map_1.differenceMaps)(valueEntries, this.validatorEntries);
-        if ((unknownKeys.length > 0) && (this.schema.mask != true) && ((0, type_guards_1.isBoolean)(this.schema.mask) || !options.mask) && (this.schema.keepUnknown != true)) {
-            const keys = unknownKeys.map((entry) => entry[0]).join(', ');
-            return { valid: false, error: (0, schema_error_1.schemaError)(`unexpected keys in object: ${keys}`, path) };
-        }
-        return { valid: true, value: valueEntries };
-    }
+function explicitObject(properties, options) {
+    return object(properties, options);
 }
-exports.ObjectSchemaValidator = ObjectSchemaValidator;
-function object(entries, options) {
-    const validatorEntries = (0, object_1.objectEntries)(entries);
-    const mappedValidatorEntries = validatorEntries.map(([key, value]) => [key, value.schema]);
-    const schema = (0, types_1.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);
 }
 exports.object = object;
-function assign(a, b) {
-    return ObjectSchemaValidator.assign(a, b);
-}
-exports.assign = assign;
-function pick(objectSchema, keys) {
-    return ObjectSchemaValidator.pick(objectSchema, keys);
-}
-exports.pick = pick;
-function exclude(objectSchema, keys) {
-    return ObjectSchemaValidator.exclude(objectSchema, keys);
-}
-exports.exclude = exclude;
 //# 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";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
-import { SchemaValidator, test } from '../schema.validator';
-import type { Coercible, SchemaDefinition, SchemaInput, SchemaOptions, SchemaOutput } from '../types';
-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,32 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optional = exports.OptionalSchemaValidator = void 0;
-const type_guards_1 = require("../../utils/type-guards");
-const schema_validator_1 = require("../schema.validator");
+exports.optional = void 0;
 const types_1 = require("../types");
-class OptionalSchemaValidator extends schema_validator_1.SchemaValidator {
-    constructor(innerValidator, schema) {
-        super(schema);
-        this.innerValidator = innerValidator;
-    }
-    [schema_validator_1.test](value, options, path) {
-        if ((0, type_guards_1.isUndefined)(value)) {
-            return { valid: true, value };
-        }
-        if ((this.schema.coerce ?? options.coerce) && (0, type_guards_1.isNull)(value)) {
-            return { valid: true, value: undefined };
-        }
-        return this.innerValidator[schema_validator_1.test](value, options, path);
-    }
-}
-exports.OptionalSchemaValidator = OptionalSchemaValidator;
-function optional(innerValidator, options) {
-    const schema = (0, types_1.schemaHelper)({
-        type: 'optional',
-        schema: innerValidator.schema,
-        ...options
-    });
-    return new OptionalSchemaValidator(innerValidator, schema);
+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,yDAA0D;AAE1D,0DAA4D;AAE5D,oCAAwC;AAMxC,MAAa,uBAAoD,SAAQ,kCAA4C;IAGnH,YAAY,cAAkC,EAAE,MAAmC;QACjF,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,IAAI,IAAA,yBAAW,EAAC,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,IAAA,oBAAM,EAAC,KAAK,CAAC,EAAE;YAC3D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,uBAAI,CAAC,CAAC,KAAuB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF;AApBD,0DAoBC;AAED,SAAgB,QAAQ,CAA6B,cAAkC,EAAE,OAA8D;IACrJ,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA8B;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;AARD,4BAQC"}
+{"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";
-import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
-import { SchemaValidator, test } from '../schema.validator';
-import type { SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
-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'>;