n4s 5.0.1 → 6.0.0-next-7a898c

package/CHANGELOG.md

@@ -4,10 +4,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 5.0.1 - 2021-12-24
-### Fixed and improved
-- 7e8d48d  Update changelog (ealush)
-
 ## 4.0.0 2021-12-24
 
 - 7daf6d2 rule(n4s): add isNullish rule, improve isBlank (ealush)

package/README.md

@@ -1,5 +1,7 @@
 # Enforce - n4s
 
+[![Join Discord](https://badgen.net/discord/online-members/WmADZpJnSe?icon=discord&label=Discord)](https://discord.gg/WmADZpJnSe) [![Version](https://badgen.net/npm/v/vest?&icon=npm)](https://www.npmjs.com/package/n4s) [![Downloads](https://badgen.net/npm/dt/n4s?label=Downloads)](https://www.npmjs.com/package/n4s) [![bundlephobia](https://badgen.net/bundlephobia/minzip/n4s)](https://bundlephobia.com/package/n4s) [![Status](https://badgen.net/github/status/ealush/vest)](https://github.com/ealush/vest/actions)
+
 Enforce is a validations assertions library. It provides rules that you can test your data against.
 
 By default, enforce throws an error when your validations fail. These errors should be caught by a validation testing framework such as [Vest](https://github.com/ealush/vest).

package/compose/package.json

@@ -1,6 +1,8 @@
 {
   "main": "../dist/cjs/compose.js",
   "module": "../dist/es/compose.production.js",
+  "unpkg": "../dist/umd/compose.production.js",
+  "jsdelivr": "../dist/umd/compose.production.js",
   "name": "compose",
   "types": "../types/compose.d.ts",
   "private": true

package/compounds/package.json

@@ -1,6 +1,8 @@
 {
   "main": "../dist/cjs/compounds.js",
   "module": "../dist/es/compounds.production.js",
+  "unpkg": "../dist/umd/compounds.production.js",
+  "jsdelivr": "../dist/umd/compounds.production.js",
   "name": "compounds",
   "types": "../types/compounds.d.ts",
   "private": true

package/dist/cjs/compose.development.js

@@ -1,79 +1,10 @@
 'use strict';
 
 var n4s = require('n4s');
-
-function mapFirst(array, callback) {
-    var broke = false;
-    var breakoutValue = null;
-    for (var i = 0; i < array.length; i++) {
-        callback(array[i], breakout, i);
-        if (broke) {
-            return breakoutValue;
-        }
-    }
-    function breakout(value) {
-        broke = true;
-        breakoutValue = value;
-    }
-}
-
-function isFunction(value) {
-    return typeof value === 'function';
-}
-
-function optionalFunctionValue(value) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    return isFunction(value) ? value.apply(void 0, args) : value;
-}
-
-function defaultTo(callback, defaultValue) {
-    var _a;
-    return (_a = optionalFunctionValue(callback)) !== null && _a !== void 0 ? _a : defaultValue;
-}
-
-/**
- * Throws a timed out error.
- */
-function throwError(devMessage, productionMessage) {
-    throw new Error(devMessage );
-}
-
-/**
- * A safe hasOwnProperty access
- */
-function hasOwnProperty(obj, key) {
-    return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isNumber(value) {
-    return Boolean(typeof value === 'number');
-}
-
-function lengthEquals(value, arg1) {
-    return value.length === Number(arg1);
-}
-
-function isEmpty(value) {
-    if (!value) {
-        return true;
-    }
-    else if (isNumber(value)) {
-        return value === 0;
-    }
-    else if (hasOwnProperty(value, 'length')) {
-        return lengthEquals(value, 0);
-    }
-    else if (typeof value === 'object') {
-        return lengthEquals(Object.keys(value), 0);
-    }
-    return true;
-}
+var vestUtils = require('vest-utils');
 
 function ruleReturn(pass, message) {
-    var output = { pass: pass };
+    const output = { pass };
     if (message) {
         output.message = message;
     }
@@ -86,7 +17,7 @@ function passing() {
     return ruleReturn(true);
 }
 function defaultToPassing(callback) {
-    return defaultTo(callback, passing());
+    return vestUtils.defaultTo(callback, passing());
 }
 
 function runLazyRule(lazyRule, currentValue) {
@@ -99,38 +30,24 @@ function runLazyRule(lazyRule, currentValue) {
 }
 
 /* eslint-disable max-lines-per-function */
-function compose() {
-    var composites = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        composites[_i] = arguments[_i];
-    }
-    return Object.assign(function (value) {
-        var res = run(value);
-        if (!res.pass) {
-            if (isEmpty(res.message)) {
-                throwError();
-            }
-            else {
-                // Explicitly throw a string so that vest.test can pick it up as the validation error message
-                throw res.message;
-            }
-        }
+function compose(...composites) {
+    return vestUtils.assign((value) => {
+        const res = run(value);
+        vestUtils.invariant(res.pass, vestUtils.StringObject(res.message));
     }, {
-        run: run,
-        test: function (value) { return run(value).pass; }
+        run,
+        test: (value) => run(value).pass,
     });
     function run(value) {
-        return n4s.ctx.run({ value: value }, function () {
-            return defaultToPassing(mapFirst(composites, function (composite, breakout) {
+        return n4s.ctx.run({ value }, () => {
+            return defaultToPassing(vestUtils.mapFirst(composites, (composite, breakout) => {
                 /* HACK: Just a small white lie. ~~HELP WANTED~~.
-                   The ideal is that instead of `TLazyRuleRunners` We would simply use `TLazy` to begin with.
+                   The ideal is that instead of `LazyRuleRunners` We would simply use `Lazy` to begin with.
                    The problem is that lazy rules can't really be passed to this function due to some generic hell
                    so we're limiting it to a small set of functions.
                 */
-                var res = runLazyRule(composite, value);
-                if (!res.pass) {
-                    breakout(res);
-                }
+                const res = runLazyRule(composite, value);
+                breakout(!res.pass, res);
             }));
         });
     }

package/dist/cjs/compose.production.js

@@ -1 +1 @@
-"use strict";var n=require("n4s");function r(n,r){function t(n){u=!0,e=n}for(var u=!1,e=null,o=0;o<n.length;o++)if(r(n[o],t,o),u)return e}function t(n){return"function"==typeof n}function u(n,r){var u;return null!==(u=function(n){for(var r=[],u=1;u<arguments.length;u++)r[u-1]=arguments[u];return t(n)?n.apply(void 0,r):n}(n))&&void 0!==u?u:r}function e(n,r){throw Error(u(r,n))}function o(n,r){return n.length===Number(r)}function f(n){if(n){if(function(n){return"number"==typeof n}(n))return 0===n;if(function(n,r){return Object.prototype.hasOwnProperty.call(n,r)}(n,"length"))return o(n,0);if("object"==typeof n)return o(Object.keys(n),0)}return!0}function i(n,r){return n={pass:n},r&&(n.message=r),n}function c(n){return u(n,i(!0))}function s(n,r){try{return n.run(r)}catch(n){return i(!1)}}module.exports=function(){function t(t){return n.ctx.run({value:t},(function(){return c(r(u,(function(n,r){(n=s(n,t)).pass||r(n)})))}))}for(var u=[],o=0;o<arguments.length;o++)u[o]=arguments[o];return Object.assign((function(n){if(!(n=t(n)).pass){if(!f(n.message))throw n.message;e()}}),{run:t,test:function(n){return t(n).pass}})};
+"use strict";var t=require("n4s"),n=require("vest-utils");function r(t,n){const r={pass:t};return n&&(r.message=n),r}function s(t){return n.defaultTo(t,r(!0))}function e(t,n){try{return t.run(n)}catch(t){return r(!1)}}module.exports=function(...r){return n.assign((t=>{const r=u(t);n.invariant(r.pass,n.StringObject(r.message))}),{run:u,test:t=>u(t).pass});function u(u){return t.ctx.run({value:u},(()=>s(n.mapFirst(r,((t,n)=>{const r=e(t,u);n(!r.pass,r)})))))}};

package/dist/cjs/compounds.development.js

@@ -1,41 +1,10 @@
 'use strict';
 
 var n4s = require('n4s');
-
-function mapFirst(array, callback) {
-    var broke = false;
-    var breakoutValue = null;
-    for (var i = 0; i < array.length; i++) {
-        callback(array[i], breakout, i);
-        if (broke) {
-            return breakoutValue;
-        }
-    }
-    function breakout(value) {
-        broke = true;
-        breakoutValue = value;
-    }
-}
-
-function isFunction(value) {
-    return typeof value === 'function';
-}
-
-function optionalFunctionValue(value) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    return isFunction(value) ? value.apply(void 0, args) : value;
-}
-
-function defaultTo(callback, defaultValue) {
-    var _a;
-    return (_a = optionalFunctionValue(callback)) !== null && _a !== void 0 ? _a : defaultValue;
-}
+var vestUtils = require('vest-utils');
 
 function ruleReturn(pass, message) {
-    var output = { pass: pass };
+    const output = { pass };
     if (message) {
         output.message = message;
     }
@@ -48,10 +17,10 @@ function passing() {
     return ruleReturn(true);
 }
 function defaultToFailing(callback) {
-    return defaultTo(callback, failing());
+    return vestUtils.defaultTo(callback, failing());
 }
 function defaultToPassing(callback) {
-    return defaultTo(callback, passing());
+    return vestUtils.defaultTo(callback, passing());
 }
 
 function runLazyRule(lazyRule, currentValue) {
@@ -63,70 +32,45 @@ function runLazyRule(lazyRule, currentValue) {
     }
 }
 
-function allOf(value) {
-    var rules = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rules[_i - 1] = arguments[_i];
-    }
-    return defaultToPassing(mapFirst(rules, function (rule, breakout) {
-        var res = runLazyRule(rule, value);
-        if (!res.pass) {
-            breakout(res);
-        }
+function allOf(value, ...rules) {
+    return defaultToPassing(vestUtils.mapFirst(rules, (rule, breakout) => {
+        const res = runLazyRule(rule, value);
+        breakout(!res.pass, res);
     }));
 }
 
-function anyOf(value) {
-    var rules = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rules[_i - 1] = arguments[_i];
-    }
-    return defaultToFailing(mapFirst(rules, function (rule, breakout) {
-        var res = runLazyRule(rule, value);
-        if (res.pass) {
-            breakout(res);
-        }
+function anyOf(value, ...rules) {
+    return defaultToFailing(vestUtils.mapFirst(rules, (rule, breakout) => {
+        const res = runLazyRule(rule, value);
+        breakout(res.pass, res);
     }));
 }
 
-function noneOf(value) {
-    var rules = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rules[_i - 1] = arguments[_i];
-    }
-    return defaultToPassing(mapFirst(rules, function (rule, breakout) {
-        var res = runLazyRule(rule, value);
-        if (res.pass) {
-            breakout(failing());
-        }
+function noneOf(value, ...rules) {
+    return defaultToPassing(vestUtils.mapFirst(rules, (rule, breakout) => {
+        const res = runLazyRule(rule, value);
+        breakout(res.pass, failing());
     }));
 }
 
-function lengthEquals(value, arg1) {
-    return value.length === Number(arg1);
+function equals(value, arg1) {
+    return value === arg1;
 }
+vestUtils.bindNot(equals);
 
-function longerThan(value, arg1) {
-    return value.length > Number(arg1);
-}
-
-var REQUIRED_COUNT = 1;
-function oneOf(value) {
-    var rules = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rules[_i - 1] = arguments[_i];
-    }
-    var passing = [];
-    rules.some(function (rule) {
-        if (longerThan(passing, REQUIRED_COUNT)) {
-            return false;
-        }
-        var res = runLazyRule(rule, value);
+const REQUIRED_COUNT = 1;
+function oneOf(value, ...rules) {
+    let passingCount = 0;
+    rules.some(rule => {
+        const res = runLazyRule(rule, value);
         if (res.pass) {
-            passing.push(res);
+            passingCount++;
+        }
+        if (vestUtils.greaterThan(passingCount, REQUIRED_COUNT)) {
+            return false;
         }
     });
-    return ruleReturn(lengthEquals(passing, REQUIRED_COUNT));
+    return ruleReturn(equals(passingCount, REQUIRED_COUNT));
 }
 
-n4s.enforce.extend({ allOf: allOf, anyOf: anyOf, noneOf: noneOf, oneOf: oneOf });
+n4s.enforce.extend({ allOf, anyOf, noneOf, oneOf });

package/dist/cjs/compounds.production.js

@@ -1 +1 @@
-"use strict";var n=require("n4s");function r(n,r){function t(n){u=!0,e=n}for(var u=!1,e=null,f=0;f<n.length;f++)if(r(n[f],t,f),u)return e}function t(n){return"function"==typeof n}function u(n,r){var u;return null!==(u=function(n){for(var r=[],u=1;u<arguments.length;u++)r[u-1]=arguments[u];return t(n)?n.apply(void 0,r):n}(n))&&void 0!==u?u:r}function e(n,r){return n={pass:n},r&&(n.message=r),n}function f(){return e(!1)}function o(n){return u(n,f())}function i(n){return u(n,e(!0))}function c(n,r){try{return n.run(r)}catch(n){return f()}}function a(n,r){return n.length===Number(r)}function s(n,r){return n.length>Number(r)}n.enforce.extend({allOf:function(n){for(var t=[],u=1;u<arguments.length;u++)t[u-1]=arguments[u];return i(r(t,(function(r,t){(r=c(r,n)).pass||t(r)})))},anyOf:function(n){for(var t=[],u=1;u<arguments.length;u++)t[u-1]=arguments[u];return o(r(t,(function(r,t){(r=c(r,n)).pass&&t(r)})))},noneOf:function(n){for(var t=[],u=1;u<arguments.length;u++)t[u-1]=arguments[u];return i(r(t,(function(r,t){c(r,n).pass&&t(f())})))},oneOf:function(n){for(var r=[],t=1;t<arguments.length;t++)r[t-1]=arguments[t];var u=[];return r.some((function(r){if(s(u,1))return!1;(r=c(r,n)).pass&&u.push(r)})),e(a(u,1))}});
+"use strict";var n=require("n4s"),t=require("vest-utils");function r(n,t){const r={pass:n};return t&&(r.message=t),r}function e(){return r(!1)}function u(n){return t.defaultTo(n,r(!0))}function s(n,t){try{return n.run(t)}catch(n){return e()}}function o(n,t){return n===t}t.bindNot(o);n.enforce.extend({allOf:function(n,...r){return u(t.mapFirst(r,((t,r)=>{const e=s(t,n);r(!e.pass,e)})))},anyOf:function(n,...r){return u=t.mapFirst(r,((t,r)=>{const e=s(t,n);r(e.pass,e)})),t.defaultTo(u,e());var u},noneOf:function(n,...r){return u(t.mapFirst(r,((t,r)=>{r(s(t,n).pass,e())})))},oneOf:function(n,...e){let u=0;return e.some((r=>{if(s(r,n).pass&&u++,t.greaterThan(u,1))return!1})),r(o(u,1))}});