@local901/validator 0.2.3 → 0.2.5

package/index.d.ts

@@ -1,32 +1,31 @@
-import { BooleanValidator } from "./types/bool/BooleanValidator";
-import { IntValidator, type IntValidationOptions } from "./types/number/IntValidator";
-import { NumberValidator, type NumberValidationOptions } from "./types/number/NumberValidator";
-import { ObjectValidator, type FieldValidators } from "./types/object/ObjectValidator";
-import { OptionalValidator } from "./types/util/OptionalValidator";
-import { stringValidator, type StringValidationOptions } from "./types/string/StringValidator";
+import { type IntValidationOptions } from "./types/number/IntValidator";
+import { type NumberValidationOptions } from "./types/number/NumberValidator";
+import { type FieldValidators } from "./types/object/ObjectValidator";
+import { type StringValidationOptions } from "./types/string/StringValidator";
 import { Validator } from "./Validator";
-import { AnyValidator } from "./types/util/AnyValidator";
-import { OrValidator, type OrValidators } from "./types/util/OrValidator";
-import { ArrayValidator, type ArrayValidatorOptions } from "./types/object/ArrayValidator";
-import { EnumValidator, type EnumLike } from "./types/object/EnumValidator";
-import { TupleValidator, type TupleValidators } from "./types/object/TupleValidator";
-import { InstanceofValidator, type ConstructorType, type InstanceofValidationOptions } from "./types/util/InstanceofValidator";
-import { RecordValidator, type RecordType, type RecordTypeValidator } from "./types/object/RecordValidator";
+import { type OrValidators } from "./types/util/OrValidator";
+import { type ArrayValidatorOptions } from "./types/object/ArrayValidator";
+import { type EnumLike } from "./types/object/EnumValidator";
+import { type TupleValidators } from "./types/object/TupleValidator";
+import { type ConstructorType, type InstanceofValidationOptions } from "./types/util/InstanceofValidator";
+import { type RecordType, type RecordTypeValidator } from "./types/object/RecordValidator";
 export { Validator } from "./Validator";
 export { ErrorType, type ErrorValue } from "./errors/ErrorType";
 export { ValidationError, type ErrorFields } from "./errors/ValidationError";
 export declare class v {
-    static boolean: () => BooleanValidator;
-    static int: (options?: IntValidationOptions) => IntValidator;
-    static number: (options?: NumberValidationOptions) => NumberValidator;
-    static array: <T>(item: Validator<T>, options?: ArrayValidatorOptions) => ArrayValidator<T>;
-    static enum: <T extends EnumLike>(enumInstance: T) => EnumValidator<T>;
-    static object: <T extends object>(fields: FieldValidators<T>) => ObjectValidator<T>;
-    static record: <T extends RecordType>(field: RecordTypeValidator<T>) => RecordValidator<T>;
-    static tuple: <T extends [...unknown[]]>(validators: TupleValidators<T>) => TupleValidator<T>;
-    static string: <T extends string = string>(options?: StringValidationOptions) => stringValidator<T>;
-    static any: <T>() => AnyValidator<T>;
-    static instanceof: <T>(instance: ConstructorType<T>, options: InstanceofValidationOptions<T>) => InstanceofValidator<T>;
-    static optional: <T>(val: Validator<Exclude<T, undefined | null>>) => OptionalValidator<T>;
-    static or: <T>(validators: OrValidators<T>) => OrValidator<T>;
+    static boolean(): Validator<boolean>;
+    static int(options?: IntValidationOptions): Validator<number>;
+    static number(options?: NumberValidationOptions): Validator<number>;
+    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>): Validator<T>;
+    static record<T extends RecordType>(field: RecordTypeValidator<T>): Validator<T>;
+    static tuple<T extends [...unknown[]]>(validators: TupleValidators<T>): Validator<T>;
+    static string<T extends string = string>(options?: StringValidationOptions): Validator<T>;
+    static any<T>(): Validator<T>;
+    static instanceof<T>(instance: ConstructorType<T>, options: InstanceofValidationOptions<T>): Validator<T>;
+    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>;
 }

package/index.js

@@ -21,19 +21,50 @@ Object.defineProperty(exports, "ErrorType", { enumerable: true, get: function ()
 var ValidationError_1 = require("./errors/ValidationError");
 Object.defineProperty(exports, "ValidationError", { enumerable: true, get: function () { return ValidationError_1.ValidationError; } });
 class v {
-    static boolean = () => new BooleanValidator_1.BooleanValidator();
-    static int = (options) => new IntValidator_1.IntValidator(options);
-    static number = (options) => new NumberValidator_1.NumberValidator(options);
-    static array = (item, options) => new ArrayValidator_1.ArrayValidator(item, options);
-    static enum = (enumInstance) => new EnumValidator_1.EnumValidator(enumInstance);
-    static object = (fields) => new ObjectValidator_1.ObjectValidator(fields);
-    static record = (field) => new RecordValidator_1.RecordValidator(field);
-    static tuple = (validators) => new TupleValidator_1.TupleValidator(validators);
-    static string = (options) => new StringValidator_1.stringValidator(options);
-    static any = () => new AnyValidator_1.AnyValidator();
-    static instanceof = (instance, options) => new InstanceofValidator_1.InstanceofValidator(instance, options);
-    static optional = (val) => new OptionalValidator_1.OptionalValidator(val);
-    static or = (validators) => new OrValidator_1.OrValidator(validators);
+    // Boolean
+    static boolean() {
+        return new BooleanValidator_1.BooleanValidator();
+    }
+    // Numbers
+    static int(options) {
+        return new IntValidator_1.IntValidator(options);
+    }
+    static number(options) {
+        return new NumberValidator_1.NumberValidator(options);
+    }
+    // Objects
+    static array(item, options) {
+        return new ArrayValidator_1.ArrayValidator(item, options);
+    }
+    static enum(enumInstance) {
+        return new EnumValidator_1.EnumValidator(enumInstance);
+    }
+    static object(fields) {
+        return new ObjectValidator_1.ObjectValidator(fields);
+    }
+    static record(field) {
+        return new RecordValidator_1.RecordValidator(field);
+    }
+    static tuple(validators) {
+        return new TupleValidator_1.TupleValidator(validators);
+    }
+    // Strings
+    static string(options) {
+        return new StringValidator_1.stringValidator(options);
+    }
+    // Utility
+    static any() {
+        return new AnyValidator_1.AnyValidator();
+    }
+    static instanceof(instance, options) {
+        return new InstanceofValidator_1.InstanceofValidator(instance, options);
+    }
+    static optional(val, type) {
+        return new OptionalValidator_1.OptionalValidator(val, { only: type });
+    }
+    static or(validators) {
+        return new OrValidator_1.OrValidator(validators);
+    }
 }
 exports.v = v;
 //# sourceMappingURL=index.js.map

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,oEAAuF;AACvF,sEAAmE;AACnE,oEAA+F;AAE/F,4DAAyD;AACzD,0DAA0E;AAC1E,kEAA2F;AAC3F,gEAA4E;AAC5E,kEAAqF;AACrF,0EAA+H;AAC/H,oEAA4G;AAE5G,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,gDAAgE;AAAvD,sGAAA,SAAS,OAAA;AAClB,4DAA6E;AAApE,kHAAA,eAAe,OAAA;AAExB,MAAa,CAAC;IACH,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,mCAAgB,EAAE,CAAC;IAE9C,MAAM,CAAC,GAAG,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAI,2BAAY,CAAC,OAAO,CAAC,CAAC;IAC3E,MAAM,CAAC,MAAM,GAAG,CAAC,OAAiC,EAAE,EAAE,CAAC,IAAI,iCAAe,CAAC,OAAO,CAAC,CAAC;IAEpF,MAAM,CAAC,KAAK,GAAG,CAAI,IAAkB,EAAE,OAA+B,EAAE,EAAE,CAAC,IAAI,+BAAc,CAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IAChH,MAAM,CAAC,IAAI,GAAG,CAAqB,YAAe,EAAE,EAAE,CAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;IACvF,MAAM,CAAC,MAAM,GAAG,CAAmB,MAA0B,EAAE,EAAE,CAAC,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC;IAC9F,MAAM,CAAC,MAAM,GAAG,CAAuB,KAA6B,EAAE,EAAE,CAAC,IAAI,iCAAe,CAAC,KAAK,CAAC,CAAC;IACpG,MAAM,CAAC,KAAK,GAAG,CAA2B,UAA8B,EAAE,EAAE,CAAC,IAAI,+BAAc,CAAC,UAAU,CAAC,CAAC;IAE5G,MAAM,CAAC,MAAM,GAAG,CAA4B,OAAiC,EAAE,EAAE,CAAC,IAAI,iCAAe,CAAI,OAAO,CAAC,CAAC;IAElH,MAAM,CAAC,GAAG,GAAG,GAAM,EAAE,CAAC,IAAI,2BAAY,EAAK,CAAC;IAC5C,MAAM,CAAC,UAAU,GAAG,CAAI,QAA4B,EAAE,OAAuC,EAAE,EAAE,CAAC,IAAI,yCAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7I,MAAM,CAAC,QAAQ,GAAG,CAAI,GAA4C,EAAE,EAAE,CAAC,IAAI,qCAAiB,CAAC,GAAG,CAAC,CAAC;IAClG,MAAM,CAAC,EAAE,GAAG,CAAI,UAA2B,EAAE,EAAE,CAAC,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC;;AAjBvF,cAkBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AACjE,8DAAsF;AACtF,oEAA+F;AAC/F,oEAAuF;AACvF,sEAAmE;AACnE,oEAA+F;AAE/F,4DAAyD;AACzD,0DAA0E;AAC1E,kEAA2F;AAC3F,gEAA4E;AAC5E,kEAAqF;AACrF,0EAA+H;AAC/H,oEAA4G;AAE5G,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;QAC7D,OAAO,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IACM,MAAM,CAAC,MAAM,CAAuB,KAA6B;QACpE,OAAO,IAAI,iCAAe,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACM,MAAM,CAAC,KAAK,CAA2B,UAA8B;QACxE,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,OAAuC;QAC7F,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;CACJ;AApDD,cAoDC"}

package/package.json

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