kareem 2.3.4 → 2.3.5

package/index.js

@@ -19,7 +19,7 @@ Kareem.prototype.execPre = function(name, context, args, callback) {
   var $args = args;
 
   if (!numPres) {
-    return process.nextTick(function() {
+    return nextTick(function() {
       callback(null);
     });
   }
@@ -57,24 +57,24 @@ Kareem.prototype.execPre = function(name, context, args, callback) {
 
       callMiddlewareFunction(pre.fn, context, args, args[0]);
     } else {
-      let maybePromise = null;
+      let maybePromiseLike = null;
       try {
-        maybePromise = pre.fn.call(context);
+        maybePromiseLike = pre.fn.call(context);
       } catch (err) {
         if (err != null) {
           return callback(err);
         }
       }
 
-      if (isPromise(maybePromise)) {
-        maybePromise.then(() => _next(), err => _next(err));
+      if (isPromiseLike(maybePromiseLike)) {
+        maybePromiseLike.then(() => _next(), err => _next(err));
       } else {
         if (++currentPre >= numPres) {
           if (asyncPresLeft > 0) {
             // Leave parallel hooks to run
             return;
           } else {
-            return process.nextTick(function() {
+            return nextTick(function() {
               callback(null);
             });
           }
@@ -132,7 +132,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
   }
 
   if (!numPosts) {
-    return process.nextTick(function() {
+    return nextTick(function() {
       callback.apply(null, [firstError].concat(args));
     });
   }
@@ -194,16 +194,16 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
         callMiddlewareFunction(post, context, newArgs.concat([_cb]), _cb);
       } else {
         let error;
-        let maybePromise;
+        let maybePromiseLike;
         try {
-          maybePromise = post.apply(context, newArgs);
+          maybePromiseLike = post.apply(context, newArgs);
         } catch (err) {
           error = err;
           firstError = err;
         }
 
-        if (isPromise(maybePromise)) {
-          return maybePromise.then(() => _cb(), err => _cb(err));
+        if (isPromiseLike(maybePromiseLike)) {
+          return maybePromiseLike.then(() => _cb(), err => _cb(err));
         }
 
         if (++currentPost >= numPosts) {
@@ -252,9 +252,8 @@ function _handleWrapError(instance, error, name, context, args, options, callbac
 
 Kareem.prototype.wrap = function(name, fn, context, args, options) {
   const lastArg = (args.length > 0 ? args[args.length - 1] : null);
-  const argsWithoutCb = typeof lastArg === 'function' ?
-    args.slice(0, args.length - 1) :
-    args;
+  const argsWithoutCb = Array.from(args);
+  typeof lastArg === 'function' && argsWithoutCb.pop();
   const _this = this;
 
   options = options || {};
@@ -271,17 +270,16 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
         options, lastArg);
     }
 
-    const end = (typeof lastArg === 'function' ? args.length - 1 : args.length);
     const numParameters = fn.length;
     let ret;
     try {
-      ret = fn.apply(context, args.slice(0, end).concat(_cb));
+      ret = fn.apply(context, argsWithoutCb.concat(_cb));
     } catch (err) {
       return _cb(err);
     }
 
     if (checkForPromise) {
-      if (ret != null && typeof ret.then === 'function') {
+      if (isPromiseLike(ret)) {
         // Thenable, use it
         return ret.then(
           res => _cb(null, res),
@@ -291,7 +289,7 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
 
       // If `fn()` doesn't have a callback argument and doesn't return a
       // promise, assume it is sync
-      if (numParameters < end + 1) {
+      if (numParameters < argsWithoutCb.length + 1) {
         return _cb(null, ret);
       }
     }
@@ -308,15 +306,12 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
           argsWithoutError, options, lastArg);
       } else {
         _this.execPost(name, context, argsWithoutError, function() {
-          if (arguments[0]) {
-            return typeof lastArg === 'function' ?
-              lastArg(arguments[0]) :
-              undefined;
+          if (lastArg === null) {
+            return;
           }
-
-          return typeof lastArg === 'function' ?
-            lastArg.apply(context, arguments) :
-            undefined;
+          arguments[0]
+            ? lastArg(arguments[0])
+            : lastArg.apply(context, arguments)
         });
       }
     }
@@ -369,7 +364,7 @@ Kareem.prototype.createWrapper = function(name, fn, context, options) {
     // Fast path: if there's no hooks for this function, just return the
     // function wrapped in a nextTick()
     return function() {
-      process.nextTick(() => fn.apply(this, arguments));
+      nextTick(() => fn.apply(this, arguments));
     };
   }
   return function() {
@@ -471,20 +466,20 @@ Kareem.prototype.merge = function(other, clone) {
 };
 
 function callMiddlewareFunction(fn, context, args, next) {
-  let maybePromise;
+  let maybePromiseLike;
   try {
-    maybePromise = fn.apply(context, args);
+    maybePromiseLike = fn.apply(context, args);
   } catch (error) {
     return next(error);
   }
 
-  if (isPromise(maybePromise)) {
-    maybePromise.then(() => next(), err => next(err));
+  if (isPromiseLike(maybePromiseLike)) {
+    maybePromiseLike.then(() => next(), err => next(err));
   }
 }
 
-function isPromise(v) {
-  return v != null && typeof v.then === 'function';
+function isPromiseLike(v) {
+  return (typeof v === 'object' && v !== null && typeof v.then === 'function');
 }
 
 function decorateNextFn(fn) {
@@ -498,8 +493,12 @@ function decorateNextFn(fn) {
     called = true;
     // Make sure to clear the stack so try/catch doesn't catch errors
     // in subsequent middleware
-    return process.nextTick(() => fn.apply(_this, arguments));
+    return nextTick(() => fn.apply(_this, arguments));
   };
 }
 
+const nextTick = typeof process === 'object' && process !== null && process.nextTick || function nextTick(cb) { 
+  setTimeout(cb, 0); 
+}
+
 module.exports = Kareem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kareem",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Next-generation take on pre/post function hooks",
   "main": "index.js",
   "scripts": {