Merge pull request #13 from easeq/master

0.6.0

Author: easeq

README.md

@@ -104,12 +104,15 @@ when(rule, data) // => returns true or false
 
 ### Rules using callback
 
-You can also pass a callback function to check the data.
+You can also pass a callback function to check the data. Which will be resolved to a promise.
+It can either be a plain function or a promise
 
 ```js
 when(function(data) {
     return data.a !== data.b
-}, data)
+}, data).then((result) => {
+    //...handle your result
+})
 ```
 
 ## Logical rules

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/when-condition",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "description": "Check conditional statements and return true/false",
     "main": "lib/index.js",
     "module": "es/index.js",

package.json

@@ -80,11 +80,7 @@ const processCondition = (condition, data) => (
     logicalRules[condition.toLowerCase()](data)
 );
 
-const when = (conditions, data) => {
-    if (typeof conditions === 'function') {
-        return conditions(data);
-    }
-
+const validate = (conditions, data) => {
     if (!isValidCondition(conditions)) {
         return processRule(conditions, data);
     }
@@ -102,4 +98,12 @@ const when = (conditions, data) => {
     return processCondition(logicalRule, result)
 }
 
+const when = (conditions, data) => {
+    if (typeof conditions === 'function') {
+        return Promise.resolve(conditions(data));
+    }
+
+    return validate(conditions, data);
+}
+
 export default when;

src/index.js

@@ -7,14 +7,16 @@ describe('when', () => {
         country: 'Germany'
     }
 
-    it('callback', () => {
-        expect(when(function(data) {
+    it('callback', async () => {
+        const valid = await when(function(data) {
             return data.name == 'John Doe' && data.age >= 18
-        }, data)).to.equal(true)
+        }, data);
+        expect(valid).to.equal(true);
 
-        expect(when(function(data) {
+        const inValid = await when(function(data) {
             return data.name == 'John' && data.age >= 18
-        }, data)).to.equal(false)
+        }, data);
+        expect(inValid).to.equal(false);
     })
 
     it('mixed deep conditions', () => {