reverse arguments

 - reverse the arguments passed to util.value, util.fn, and util.inverse
 - fixes #279

Author: doowb

lib/array.js

@@ -222,7 +222,7 @@ helpers.forEach = function(array, options) {
  */
 
 helpers.inArray = function(array, value, options) {
-  return util.value(util.indexOf(array, value) > -1, options, this);
+  return util.value(util.indexOf(array, value) > -1, this, options);
 };
 
 /**
@@ -321,7 +321,7 @@ helpers.equalsLength = function(value, length, options) {
     len = value.length;
   }
 
-  return util.value(len === length, options, this);
+  return util.value(len === length, this, options);
 };
 
 /**

lib/collection.js

@@ -22,16 +22,16 @@ var helpers = module.exports;
 helpers.isEmpty = function(collection, options) {
   if (!util.isOptions(options)) {
     options = collection;
-    return util.fn(true, options, this);
+    return util.fn(true, this, options);
   }
 
   if (Array.isArray(collection) && !collection.length) {
-    return util.fn(true, options, this);
+    return util.fn(true, this, options);
   }
 
   var keys = Object.keys(collection);
   var isEmpty = typeof collection === 'object' && !keys.length;
-  return util.value(isEmpty, options, this);
+  return util.value(isEmpty, this, options);
 };
 
 /**

lib/comparison.js

@@ -30,7 +30,7 @@ helpers.and = function() {
     }
   }
 
-  return util.value(val, options, this);
+  return util.value(val, this, options);
 };
 
 /**
@@ -89,7 +89,7 @@ helpers.compare = function(a, operator, b, options) {
     }
   }
 
-  return util.value(result, options, this);
+  return util.value(result, this, options);
 };
 
 /**
@@ -121,7 +121,7 @@ helpers.contains = function(collection, value, startIndex, options) {
     startIndex = undefined;
   }
   var val = utils.contains(collection, value, startIndex);
-  return util.value(val, options, this);
+  return util.value(val, this, options);
 };
 
 /**
@@ -161,7 +161,7 @@ helpers.eq = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a === b, options, this);
+  return util.value(a === b, this, options);
 };
 
 /**
@@ -184,7 +184,7 @@ helpers.gt = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a > b, options, this);
+  return util.value(a > b, this, options);
 };
 
 /**
@@ -208,7 +208,7 @@ helpers.gte = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a >= b, options, this);
+  return util.value(a >= b, this, options);
 };
 
 /**
@@ -236,23 +236,22 @@ helpers.has = function(value, pattern, options) {
   }
 
   if (value === null) {
-    return util.value(false, options, this);
+    return util.value(false, this, options);
   }
 
   if (arguments.length === 2) {
-    return util.value(has(this, value), options, this);
-    // return util.inverse(false, pattern, this);
+    return util.value(has(this, value), this, options);
   }
 
   if ((Array.isArray(value) || util.isString(value)) && util.isString(pattern)) {
     if (value.indexOf(pattern) > -1) {
-      return util.fn(true, options, this);
+      return util.fn(true, this, options);
     }
   }
   if (util.isObject(value) && util.isString(pattern) && pattern in value) {
-    return util.fn(true, options, this);
+    return util.fn(true, this, options);
   }
-  return util.inverse(false, options, this);
+  return util.inverse(false, this, options);
 };
 
 /**
@@ -267,7 +266,7 @@ helpers.has = function(value, pattern, options) {
  */
 
 helpers.isFalsey = function(val, options) {
-  return util.value(utils.falsey(val), options, this);
+  return util.value(utils.falsey(val), this, options);
 };
 
 /**
@@ -282,7 +281,7 @@ helpers.isFalsey = function(val, options) {
  */
 
 helpers.isTruthy = function(val, options) {
-  return util.value(!utils.falsey(val), options, this);
+  return util.value(!utils.falsey(val), this, options);
 };
 
 /**
@@ -303,7 +302,7 @@ helpers.isTruthy = function(val, options) {
  */
 
 helpers.ifEven = function(num, options) {
-  return util.value(utils.isEven(num), options, this);
+  return util.value(utils.isEven(num), this, options);
 };
 
 /**
@@ -321,7 +320,7 @@ helpers.ifEven = function(num, options) {
 
 helpers.ifNth = function(a, b, options) {
   var isNth = utils.isNumber(a) && utils.isNumber(b) && b % a === 0;
-  return util.value(isNth, options, this);
+  return util.value(isNth, this, options);
 };
 
 /**
@@ -343,7 +342,7 @@ helpers.ifNth = function(a, b, options) {
  */
 
 helpers.ifOdd = function(val, options) {
-  return util.value(!utils.isEven(val), options, this);
+  return util.value(!utils.isEven(val), this, options);
 };
 
 /**
@@ -364,7 +363,7 @@ helpers.is = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a == b, options, this);
+  return util.value(a == b, this, options);
 };
 
 /**
@@ -386,7 +385,7 @@ helpers.isnt = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a != b, options, this);
+  return util.value(a != b, this, options);
 };
 
 /**
@@ -408,7 +407,7 @@ helpers.lt = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a < b, options, this);
+  return util.value(a < b, this, options);
 };
 
 /**
@@ -432,7 +431,7 @@ helpers.lte = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a <= b, options, this);
+  return util.value(a <= b, this, options);
 };
 
 /**
@@ -449,7 +448,7 @@ helpers.lte = function(a, b, options) {
  */
 
 helpers.neither = function(a, b, options) {
-  return util.value(!a && !b, options, this);
+  return util.value(!a && !b, this, options);
 };
 
 /**
@@ -463,7 +462,7 @@ helpers.neither = function(a, b, options) {
  */
 
 helpers.not = function(val, options) {
-  return util.value(!val, options, this);
+  return util.value(!val, this, options);
 };
 
 /**
@@ -495,7 +494,7 @@ helpers.or = function(/* any, any, ..., options */) {
       break;
     }
   }
-  return util.value(val, options, this);
+  return util.value(val, this, options);
 };
 
 /**
@@ -515,7 +514,7 @@ helpers.unlessEq = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a !== b, options, this);
+  return util.value(a !== b, this, options);
 };
 
 /**
@@ -535,7 +534,7 @@ helpers.unlessGt = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a <= b, options, this);
+  return util.value(a <= b, this, options);
 };
 
 /**
@@ -555,7 +554,7 @@ helpers.unlessLt = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a >= b, options, this);
+  return util.value(a >= b, this, options);
 };
 
 /**
@@ -575,7 +574,7 @@ helpers.unlessGteq = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a < b, options, this);
+  return util.value(a < b, this, options);
 };
 
 /**
@@ -595,5 +594,5 @@ helpers.unlessLteq = function(a, b, options) {
     options = b;
     b = options.hash.compare;
   }
-  return util.value(a > b, options, this);
+  return util.value(a > b, this, options);
 };