@local901/validator 0.4.2 → 0.5.0

package/index.d.ts

@@ -3,12 +3,13 @@ import { type NumberValidationOptions } from "./types/number/NumberValidator";
 import { type FieldValidators, type ObjectValidationOptions } from "./types/object/ObjectValidator";
 import { type StringValidationOptions } from "./types/string/StringValidator";
 import { Validator } from "./Validator";
-import { type OrValidators } from "./types/util/OrValidator";
+import { type OrValidatorTypes } from "./types/util/OrValidator";
 import { type ArrayValidatorOptions } from "./types/object/ArrayValidator";
 import { type EnumLike } from "./types/object/EnumValidator";
 import { type TupleValidators, type TupleValidatorTypes } from "./types/object/TupleValidator";
 import { type ConstructorType, type InstanceofValidationOptions } from "./types/util/InstanceofValidator";
 import { type RecordFieldValidator, type RecordKeyValidator } from "./types/object/RecordValidator";
+import { type AndValidatorTypes } from "./types/util/AndValidator.js";
 export { Validator } from "./Validator";
 export { ErrorType, type ErrorValue } from "./errors/ErrorType";
 export { ValidationError, type ErrorFields } from "./errors/ValidationError";
@@ -19,7 +20,7 @@ export declare class v {
     static array<T>(item: Validator<T>, options?: ArrayValidatorOptions): Validator<T[]>;
     static enum<T extends EnumLike>(enumInstance: T): Validator<T[keyof T]>;
     static object<T extends object>(fields: FieldValidators<T>, options?: ObjectValidationOptions): Validator<T>;
-    static record<T extends unknown, K = string | number | symbol>(field: Validator<T>, key?: Validator<K>): Validator<T>;
+    static record<T extends unknown, K extends string | number | symbol = string | number | symbol>(field: Validator<T>, key?: Validator<K>): Validator<Record<K, T>>;
     static record<T extends Record<string | number | symbol, unknown>>(field: RecordFieldValidator<T>, key?: RecordKeyValidator<T>): Validator<T>;
     static tuple<T extends ReadonlyArray<Validator>>(...validators: T): Validator<TupleValidatorTypes<T>>;
     static tuple<T extends ReadonlyArray<unknown>>(...validators: TupleValidators<T>): Validator<T>;
@@ -29,6 +30,8 @@ export declare class v {
     static optional<T>(val: Validator<Exclude<T, undefined | null>>, type?: undefined): Validator<T | undefined | null>;
     static optional<T>(val: Validator<Exclude<T, undefined | null>>, type: "undefined"): Validator<T | undefined>;
     static optional<T>(val: Validator<Exclude<T, undefined | null>>, type: "null"): Validator<T | null>;
-    static or<T>(validators: OrValidators<T>): Validator<T>;
+    static or<T extends ReadonlyArray<Validator>>(...validators: T): Validator<OrValidatorTypes<T>>;
+    static and<T extends ReadonlyArray<Validator>>(...validators: T): Validator<AndValidatorTypes<T>>;
+    static and<T extends unknown>(...validators: readonly Validator<Partial<T>>[]): Validator<T>;
     static validateOrThrow<T>(validator: Validator<T>, input: unknown): asserts input is T;
 }

package/index.js

@@ -14,6 +14,7 @@ const EnumValidator_1 = require("./types/object/EnumValidator");
 const TupleValidator_1 = require("./types/object/TupleValidator");
 const InstanceofValidator_1 = require("./types/util/InstanceofValidator");
 const RecordValidator_1 = require("./types/object/RecordValidator");
+const AndValidator_js_1 = require("./types/util/AndValidator.js");
 var Validator_1 = require("./Validator");
 Object.defineProperty(exports, "Validator", { enumerable: true, get: function () { return Validator_1.Validator; } });
 var ErrorType_1 = require("./errors/ErrorType");
@@ -62,9 +63,13 @@ class v {
     static optional(val, type) {
         return new OptionalValidator_1.OptionalValidator(val, { only: type });
     }
-    static or(validators) {
+    // public static or<T extends unknown>(...validators: readonly Validator<T>[]): Validator<T>;
+    static or(...validators) {
         return new OrValidator_1.OrValidator(validators);
     }
+    static and(...validators) {
+        return new AndValidator_js_1.AndValidator(validators);
+    }
     static validateOrThrow(validator, input) {
         const validationResult = validator.validateReturn(input);
         if (!validator.validateResult(input, validationResult)) {

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AACjE,8DAAsF;AACtF,oEAA+F;AAC/F,oEAAqH;AACrH,sEAAmE;AACnE,oEAA+F;AAE/F,4DAAyD;AACzD,0DAA0E;AAC1E,kEAA2F;AAC3F,gEAA4E;AAC5E,kEAA+G;AAC/G,0EAA+H;AAC/H,oEAAqH;AAErH,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,gDAAgE;AAAvD,sGAAA,SAAS,OAAA;AAClB,4DAA6E;AAApE,kHAAA,eAAe,OAAA;AAExB,MAAa,CAAC;IACV,UAAU;IACH,MAAM,CAAC,OAAO;QACjB,OAAO,IAAI,mCAAgB,EAAE,CAAC;IAClC,CAAC;IAED,UAAU;IACH,MAAM,CAAC,GAAG,CAAC,OAA8B;QAC5C,OAAO,IAAI,2BAAY,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IACM,MAAM,CAAC,MAAM,CAAC,OAAiC;QAClD,OAAO,IAAI,iCAAe,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,UAAU;IACH,MAAM,CAAC,KAAK,CAAI,IAAkB,EAAE,OAA+B;QACtE,OAAO,IAAI,+BAAc,CAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IACM,MAAM,CAAC,IAAI,CAAqB,YAAe;QAClD,OAAO,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IACM,MAAM,CAAC,MAAM,CAAmB,MAA0B,EAAE,OAAiC;QAChG,OAAO,IAAI,iCAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAGM,MAAM,CAAC,MAAM,CAAsD,KAA8B,EAAE,GAA2B;QACjI,OAAO,IAAI,iCAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC;IAGM,MAAM,CAAC,KAAK,CAAmC,GAAG,UAA8B;QACnF,OAAO,IAAI,+BAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,UAAU;IACH,MAAM,CAAC,MAAM,CAA4B,OAAiC;QAC7E,OAAO,IAAI,iCAAe,CAAI,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,UAAU;IACH,MAAM,CAAC,GAAG;QACb,OAAO,IAAI,2BAAY,EAAK,CAAC;IACjC,CAAC;IACM,MAAM,CAAC,UAAU,CAAI,QAA4B,EAAE,OAAwC;QAC9F,OAAO,IAAI,yCAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAIM,MAAM,CAAC,QAAQ,CAAI,GAA4C,EAAE,IAA2B;QAC/F,OAAO,IAAI,qCAAiB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IACM,MAAM,CAAC,EAAE,CAAI,UAA2B;QAC3C,OAAO,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,eAAe,CAAI,SAAuB,EAAE,KAAc;QACpE,MAAM,gBAAgB,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACrD,MAAM,gBAAgB,CAAC;QAC3B,CAAC;IACL,CAAC;CACJ;AA/DD,cA+DC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AACjE,8DAAsF;AACtF,oEAA+F;AAC/F,oEAAqH;AACrH,sEAAmE;AACnE,oEAA+F;AAE/F,4DAAyD;AACzD,0DAA8E;AAC9E,kEAA2F;AAC3F,gEAA4E;AAC5E,kEAA+G;AAC/G,0EAA+H;AAC/H,oEAAqH;AACrH,kEAAoF;AAEpF,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,gDAAgE;AAAvD,sGAAA,SAAS,OAAA;AAClB,4DAA6E;AAApE,kHAAA,eAAe,OAAA;AAExB,MAAa,CAAC;IACV,UAAU;IACH,MAAM,CAAC,OAAO;QACjB,OAAO,IAAI,mCAAgB,EAAE,CAAC;IAClC,CAAC;IAED,UAAU;IACH,MAAM,CAAC,GAAG,CAAC,OAA8B;QAC5C,OAAO,IAAI,2BAAY,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IACM,MAAM,CAAC,MAAM,CAAC,OAAiC;QAClD,OAAO,IAAI,iCAAe,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,UAAU;IACH,MAAM,CAAC,KAAK,CAAI,IAAkB,EAAE,OAA+B;QACtE,OAAO,IAAI,+BAAc,CAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IACM,MAAM,CAAC,IAAI,CAAqB,YAAe;QAClD,OAAO,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IACM,MAAM,CAAC,MAAM,CAAmB,MAA0B,EAAE,OAAiC;QAChG,OAAO,IAAI,iCAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAGM,MAAM,CAAC,MAAM,CAAsD,KAA8B,EAAE,GAA2B;QACjI,OAAO,IAAI,iCAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC;IAGM,MAAM,CAAC,KAAK,CAAmC,GAAG,UAA8B;QACnF,OAAO,IAAI,+BAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,UAAU;IACH,MAAM,CAAC,MAAM,CAA4B,OAAiC;QAC7E,OAAO,IAAI,iCAAe,CAAI,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,UAAU;IACH,MAAM,CAAC,GAAG;QACb,OAAO,IAAI,2BAAY,EAAK,CAAC;IACjC,CAAC;IACM,MAAM,CAAC,UAAU,CAAI,QAA4B,EAAE,OAAwC;QAC9F,OAAO,IAAI,yCAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAIM,MAAM,CAAC,QAAQ,CAAI,GAA4C,EAAE,IAA2B;QAC/F,OAAO,IAAI,qCAAiB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,6FAA6F;IACtF,MAAM,CAAC,EAAE,CAAoB,GAAG,UAAmC;QACtE,OAAO,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAIM,MAAM,CAAC,GAAG,CAAoB,GAAG,UAAmC;QACvE,OAAO,IAAI,8BAAY,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,eAAe,CAAI,SAAuB,EAAE,KAAc;QACpE,MAAM,gBAAgB,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACrD,MAAM,gBAAgB,CAAC;QAC3B,CAAC;IACL,CAAC;CACJ;AAvED,cAuEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@local901/validator",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Type validator for javascript and typescript",
   "main": "index.js",
   "scripts": {

package/types/util/AndValidator.d.ts

@@ -0,0 +1,13 @@
+import type { ValidationError } from "../../errors/ValidationError";
+import { Validator, type ValidatorConfig } from "../../Validator";
+type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+export type AndValidatorTypes<T extends readonly Validator[]> = UnionToIntersection<T[number] extends Validator<infer U> ? U : never>;
+export declare class AndValidator<T> extends Validator<T> {
+    readonly validators: readonly Validator<T>[];
+    type: string;
+    constructor(validators: readonly Validator<T>[]);
+    validateReturn(input: unknown): ValidationError<T> | null;
+    /** @inheritdoc */
+    protected config(): Omit<ValidatorConfig, "type">;
+}
+export {};

package/types/util/AndValidator.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AndValidator = void 0;
+const ErrorType_1 = require("../../errors/ErrorType");
+const Validator_1 = require("../../Validator");
+class AndValidator extends Validator_1.Validator {
+    validators;
+    type = "allof";
+    constructor(validators) {
+        super();
+        this.validators = validators;
+    }
+    validateReturn(input) {
+        const errors = {};
+        let i = 0;
+        for (const validator of this.validators) {
+            const result = validator.validateReturn(input);
+            if (result !== null) {
+                errors[i] = result;
+            }
+            i++;
+        }
+        return this.createError(ErrorType_1.ErrorType.INCORRECT_TYPE, "Has to match all of the types.", errors);
+    }
+    /** @inheritdoc */
+    config() {
+        return {
+            items: this.validators.map((validator) => validator.getConfig()),
+        };
+    }
+}
+exports.AndValidator = AndValidator;
+//# sourceMappingURL=AndValidator.js.map

package/types/util/AndValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AndValidator.js","sourceRoot":"","sources":["../../../src/types/util/AndValidator.ts"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,+CAAkE;AAQlE,MAAa,YAAgB,SAAQ,qBAAY;IAGV;IAFnB,IAAI,GAAG,OAAO,CAAC;IAE/B,YAAmC,UAAmC;QAClE,KAAK,EAAE,CAAC;QADuB,eAAU,GAAV,UAAU,CAAyB;IAEtE,CAAC;IAEe,cAAc,CAAC,KAAc;QACzC,MAAM,MAAM,GAAuC,EAAE,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;YACvB,CAAC;YACD,CAAC,EAAE,CAAA;QACP,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,qBAAS,CAAC,cAAc,EAAE,gCAAgC,EAAE,MAAM,CAAC,CAAC;IAChG,CAAC;IAED,kBAAkB;IACC,MAAM;QACrB,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;SACnE,CAAC;IACN,CAAC;CACJ;AA1BD,oCA0BC"}

package/types/util/OrValidator.d.ts

@@ -1,10 +1,10 @@
 import type { ValidationError } from "../../errors/ValidationError";
 import { Validator, type ValidatorConfig } from "../../Validator";
-export type OrValidators<T> = ReadonlyArray<Validator<T>>;
+export type OrValidatorTypes<T extends readonly Validator[]> = T[number] extends Validator<infer U> ? U : never;
 export declare class OrValidator<T> extends Validator<T> {
-    readonly validators: OrValidators<T>;
+    readonly validators: readonly Validator<T>[];
     type: string;
-    constructor(validators: OrValidators<T>);
+    constructor(validators: readonly Validator<T>[]);
     validateReturn(input: unknown): ValidationError<T> | null;
     /** @inheritdoc */
     protected config(): Omit<ValidatorConfig, "type">;

package/types/util/OrValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"OrValidator.js","sourceRoot":"","sources":["../../../src/types/util/OrValidator.ts"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,+CAAkE;AAIlE,MAAa,WAAe,SAAQ,qBAAY;IAGT;IAFnB,IAAI,GAAG,OAAO,CAAC;IAE/B,YAAmC,UAA2B;QAC1D,KAAK,EAAE,CAAC;QADuB,eAAU,GAAV,UAAU,CAAiB;IAE9D,CAAC;IAEe,cAAc,CAAC,KAAc;QACzC,MAAM,MAAM,GAAuC,EAAE,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,qBAAS,CAAC,cAAc,EAAE,yCAAyC,EAAE,MAAM,CAAC,CAAC;IACzG,CAAC;IAED,kBAAkB;IACC,MAAM;QACrB,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;SACnE,CAAC;IACN,CAAC;CACJ;AA1BD,kCA0BC"}
+{"version":3,"file":"OrValidator.js","sourceRoot":"","sources":["../../../src/types/util/OrValidator.ts"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,+CAAkE;AAIlE,MAAa,WAAe,SAAQ,qBAAY;IAGT;IAFnB,IAAI,GAAG,OAAO,CAAC;IAE/B,YAAmC,UAAmC;QAClE,KAAK,EAAE,CAAC;QADuB,eAAU,GAAV,UAAU,CAAyB;IAEtE,CAAC;IAEe,cAAc,CAAC,KAAc;QACzC,MAAM,MAAM,GAAuC,EAAE,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,qBAAS,CAAC,cAAc,EAAE,yCAAyC,EAAE,MAAM,CAAC,CAAC;IACzG,CAAC;IAED,kBAAkB;IACC,MAAM;QACrB,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;SACnE,CAAC;IACN,CAAC;CACJ;AA1BD,kCA0BC"}