kareem 2.3.3 → 2.3.4

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+<a name="2.3.4"></a>
+## 2.3.4 (2022-02-10)
+
+* perf: various performance improvements #27 #24 #23 #22 #21 #20
+
 <a name="2.3.3"></a>
 ## 2.3.3 (2021-12-26)
 

package/index.js

@@ -10,7 +10,7 @@ Kareem.prototype.execPre = function(name, context, args, callback) {
     callback = args;
     args = [];
   }
-  var pres = get(this._pres, name, []);
+  var pres = this._pres.get(name) || [];
   var numPres = pres.length;
   var numAsyncPres = pres.numAsync || 0;
   var currentPre = 0;
@@ -109,7 +109,7 @@ Kareem.prototype.execPre = function(name, context, args, callback) {
 };
 
 Kareem.prototype.execPreSync = function(name, context, args) {
-  var pres = get(this._pres, name, []);
+  var pres = this._pres.get(name) || [];
   var numPres = pres.length;
 
   for (var i = 0; i < numPres; ++i) {
@@ -122,7 +122,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
     callback = options;
     options = null;
   }
-  var posts = get(this._posts, name, []);
+  var posts = this._posts.get(name) || [];
   var numPosts = posts.length;
   var currentPost = 0;
 
@@ -151,7 +151,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
 
     if (firstError) {
       if (post.length === numArgs + 2) {
-        var _cb = decorateNextFn(function(error) {
+        const _cb = decorateNextFn(function(error) {
           if (error) {
             firstError = error;
           }
@@ -210,7 +210,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
           return callback.apply(null, [error].concat(args));
         }
 
-        next(error);
+        next();
       }
     }
   };
@@ -219,7 +219,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
 };
 
 Kareem.prototype.execPostSync = function(name, context, args) {
-  const posts = get(this._posts, name, []);
+  const posts = this._posts.get(name) || [];
   const numPosts = posts.length;
 
   for (let i = 0; i < numPosts; ++i) {
@@ -242,14 +242,11 @@ Kareem.prototype.createWrapperSync = function(name, fn) {
 
 function _handleWrapError(instance, error, name, context, args, options, callback) {
   if (options.useErrorHandlers) {
-    var _options = { error: error };
-    return instance.execPost(name, context, args, _options, function(error) {
+    return instance.execPost(name, context, args, { error: error }, function(error) {
       return typeof callback === 'function' && callback(error);
     });
   } else {
-    return typeof callback === 'function' ?
-      callback(error) :
-      undefined;
+    return typeof callback === 'function' && callback(error);
   }
 }
 
@@ -300,8 +297,8 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
     }
 
     function _cb() {
-      const args = arguments;
-      const argsWithoutError = Array.prototype.slice.call(arguments, 1);
+      const argsWithoutError = Array.from(arguments);
+      argsWithoutError.shift();
       if (options.nullResultByDefault && argsWithoutError.length === 0) {
         argsWithoutError.push(null);
       }
@@ -377,23 +374,21 @@ Kareem.prototype.createWrapper = function(name, fn, context, options) {
   }
   return function() {
     var _context = context || this;
-    var args = Array.prototype.slice.call(arguments);
-    _this.wrap(name, fn, _context, args, options);
+    _this.wrap(name, fn, _context, Array.from(arguments), options);
   };
 };
 
 Kareem.prototype.pre = function(name, isAsync, fn, error, unshift) {
   let options = {};
-  if (typeof isAsync === 'object' && isAsync != null) {
+  if (typeof isAsync === 'object' && isAsync !== null) {
     options = isAsync;
     isAsync = options.isAsync;
   } else if (typeof arguments[1] !== 'boolean') {
-    error = fn;
     fn = isAsync;
     isAsync = false;
   }
 
-  const pres = get(this._pres, name, []);
+  const pres = this._pres.get(name) || [];
   this._pres.set(name, pres);
 
   if (isAsync) {
@@ -415,7 +410,7 @@ Kareem.prototype.pre = function(name, isAsync, fn, error, unshift) {
 };
 
 Kareem.prototype.post = function(name, options, fn, unshift) {
-  const hooks = get(this._posts, name, []);
+  const hooks = this._posts.get(name) || [];
 
   if (typeof options === 'function') {
     unshift = !!fn;
@@ -456,7 +451,7 @@ Kareem.prototype.merge = function(other, clone) {
   var ret = clone ? this.clone() : this;
 
   for (let key of other._pres.keys()) {
-    const sourcePres = get(ret._pres, key, []);
+    const sourcePres = ret._pres.get(key) || [];
     const deduplicated = other._pres.get(key).
       // Deduplicate based on `fn`
       filter(p => sourcePres.map(_p => _p.fn).indexOf(p.fn) === -1);
@@ -466,7 +461,7 @@ Kareem.prototype.merge = function(other, clone) {
     ret._pres.set(key, combined);
   }
   for (let key of other._posts.keys()) {
-    const sourcePosts = get(ret._posts, key, []);
+    const sourcePosts = ret._posts.get(key) || [];
     const deduplicated = other._posts.get(key).
       filter(p => sourcePosts.indexOf(p) === -1);
     ret._posts.set(key, sourcePosts.concat(deduplicated));
@@ -475,13 +470,6 @@ Kareem.prototype.merge = function(other, clone) {
   return ret;
 };
 
-function get(map, key, def) {
-  if (map.has(key)) {
-    return map.get(key);
-  }
-  return def;
-}
-
 function callMiddlewareFunction(fn, context, args, next) {
   let maybePromise;
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kareem",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Next-generation take on pre/post function hooks",
   "main": "index.js",
   "scripts": {
@@ -14,8 +14,8 @@
   "devDependencies": {
     "acquit": "1.x",
     "acquit-ignore": "0.1.x",
-    "nyc": "11.x",
-    "mocha": "5.x"
+    "mocha": "9.2.0",
+    "nyc": "15.1.0"
   },
   "author": "Valeri Karpov <val@karpov.io>",
   "license": "Apache-2.0"