valleyed 4.1.4 → 4.1.5

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.1.5](https://github.com/kevinand11/valleyed/compare/v4.1.4...v4.1.5) (2023-03-19)
+
 ### [4.1.4](https://github.com/kevinand11/valleyed/compare/v4.1.3...v4.1.4) (2023-03-18)
 
 

package/README.md

@@ -221,24 +221,24 @@ const res = isCustom((value) => typeof value === 'function')(() => {}) // res.va
 import { Validator, isEmail, isMinOf, isString, isNumber } from 'valleyed'
 
 // The Validator.and function is used to build up a schema or list of rules to validate a value against
-let res = Validator.and('johndoe@mail.com', [[isEmail(), isMinOf(1)]])
+let res = Validator.and([[isEmail(), isMinOf(1)]])('johndoe@mail.com')
 console.log(res) // { valid: true, errors: [], value: 'johndoe@mail.com' }
 
 // if the value fails validation, it returns a list of all errors in the errors array
-res = Validator.and('', [[isEmail(), isMinOf(1)]])
+res = Validator.and([[isEmail(), isMinOf(1)]])('')
 console.log(res) // { valid: false, value: '', errors: [ 'is not a valid email', 'must contain 1 or more characters' ] }
 
 // Similar to the And function, Validator has an or function that checks if the value passes validation for any of the list of rules passed in
-let res = Validator.or(2, [[isString(), isMinOf(1)], [isNumber()]])
+let res = Validator.or([[isString(), isMinOf(1)], [isNumber()]])(2)
 console.log(res) // { valid: true, value: 2, errors: [] }
 
 // if the value fails validation, it returns a list of all errors in the errors array
-res = Validator.or(false, [[isString(), isMinOf(1)], [isNumber()]])
+res = Validator.or([[isString(), isMinOf(1)], [isNumber()]])(false)
 console.log(res) // { valid: false, value: false, errors: [ 'doesn't match any of the schema' ] }
 
 // An optional third paramater can be passed into the And/Or functions to control if null and undefined are allowed to pass validation
-Validator.and('', [[isEmail()]], {
+Validator.and([[isEmail()]], {
 	nullable: true, // Boolean: if true, null passed as the first argument passes validation
 	required: () => false // Boolean or Function that returns a boolean: if false, undefined passed as the first argument passes validation
-})
+})('')
 ```

package/lib/validators/index.d.ts

@@ -1,7 +1,5 @@
 import { Options, Rule } from '../utils/rules';
-type Validity<T> = ReturnType<Rule<T>>;
 export declare class Validator {
-    static and<T>(value: T, rules: Rule<any>[][], options?: Partial<Options>): Validity<T>;
-    static or<T>(value: T, rules: Rule<any>[][], options?: Partial<Options>): Validity<T>;
+    static and<T>(rules: Rule<T>[][], options?: Partial<Options>): Rule<T>;
+    static or<T>(rules: Rule<T>[][], options?: Partial<Options>): Rule<T>;
 }
-export {};

package/lib/validators/index.js

@@ -3,25 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validator = void 0;
 const rules_1 = require("../utils/rules");
 class Validator {
-    static and(value, rules, options) {
-        for (const rule of rules) {
-            const valid = (0, rules_1.check)(value, rule, options);
-            if (valid.valid)
-                continue;
-            else
-                return valid;
-        }
-        return { valid: true, value: value, errors: [] };
+    static and(rules, options) {
+        return (0, rules_1.makeRule)((val) => {
+            const value = val;
+            for (const rule of rules) {
+                const valid = (0, rules_1.check)(value, rule, options);
+                if (valid.valid)
+                    continue;
+                else
+                    return valid;
+            }
+            return { valid: true, value: value, errors: [] };
+        });
     }
-    static or(value, rules, options) {
-        for (const rule of rules) {
-            const valid = (0, rules_1.check)(value, rule, options);
-            if (valid.valid)
-                return valid;
-            else
-                continue;
-        }
-        return { valid: false, value: value, errors: ['doesn\'t match any of the schema'] };
+    static or(rules, options) {
+        return (0, rules_1.makeRule)((val) => {
+            const value = val;
+            for (const rule of rules) {
+                const valid = (0, rules_1.check)(value, rule, options);
+                if (valid.valid)
+                    return valid;
+                else
+                    continue;
+            }
+            return { valid: false, value: value, errors: ['doesn\'t match any of the schema'] };
+        });
     }
 }
 exports.Validator = Validator;

package/lib/validators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AAIrD,MAAa,SAAS;IACd,MAAM,CAAC,GAAG,CAAI,KAAQ,EAAE,KAAoB,EAAE,OAA0B;QAC9E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACzB,MAAM,KAAK,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YACzC,IAAI,KAAK,CAAC,KAAK;gBAAE,SAAQ;;gBACpB,OAAO,KAAK,CAAA;SACjB;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;IACjD,CAAC;IAGM,MAAM,CAAC,EAAE,CAAI,KAAQ,EAAE,KAAoB,EAAE,OAA0B;QAC7E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACzB,MAAM,KAAK,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YACzC,IAAI,KAAK,CAAC,KAAK;gBAAE,OAAO,KAAK,CAAA;;gBACxB,SAAQ;SACb;QACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,kCAAkC,CAAC,EAAE,CAAA;IACpF,CAAC;CACD;AAnBD,8BAmBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":";;;AAAA,0CAA+D;AAE/D,MAAa,SAAS;IACd,MAAM,CAAC,GAAG,CAAK,KAAkB,EAAE,OAA0B;QACnE,OAAO,IAAA,gBAAQ,EAAI,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,GAAQ,CAAA;YACtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,MAAM,KAAK,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACzC,IAAI,KAAK,CAAC,KAAK;oBAAE,SAAQ;;oBACpB,OAAO,KAAK,CAAA;aACjB;YACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;QACjD,CAAC,CAAC,CAAA;IACH,CAAC;IAGM,MAAM,CAAC,EAAE,CAAK,KAAkB,EAAE,OAA0B;QAClE,OAAO,IAAA,gBAAQ,EAAI,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,GAAQ,CAAA;YACtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,MAAM,KAAK,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACzC,IAAI,KAAK,CAAC,KAAK;oBAAE,OAAO,KAAK,CAAA;;oBACxB,SAAQ;aACb;YACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,kCAAkC,CAAC,EAAE,CAAA;QACpF,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAzBD,8BAyBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "valleyed",
-	"version": "4.1.4",
+	"version": "4.1.5",
 	"description": "A lightweight package with definitions for various validation rules, and helper services to consume said rules.",
 	"main": "lib/index.js",
 	"sideEffects": false,