kareem 2.4.0 → 2.4.1

package/.eslintrc.json

@@ -0,0 +1,16 @@
+{
+  "extends": [
+    "@masteringjs"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2020
+  },
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "rules": {
+    "no-var": "off",
+    "prefer-const": "off"
+  }
+}

package/.github/workflows/test.yml

@@ -13,9 +13,6 @@ jobs:
       matrix:
         node: [12, 14, 16, 18]
         os: [ubuntu-20.04]
-        include:
-          - os: ubuntu-20.04
-            mongo-os: ubuntu2004
     name: Node ${{ matrix.node }}
     steps:
       - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3
@@ -27,4 +24,24 @@ jobs:
 
       - run: npm install
 
-      - run: npm test
+      - run: npm test
+
+  lint:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [18]
+        os: [ubuntu-20.04]
+    name: Lint
+    steps:
+      - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3
+
+      - name: Setup node
+        uses: actions/setup-node@5b52f097d36d4b0b2f94ed6de710023fbb8b2236 # v3.1.0
+        with:
+          node-version: ${{ matrix.node }}
+
+      - run: npm install
+
+      - run: npm run lint

package/docs.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var acquit = require('acquit');
 
 require('acquit-ignore')();

package/index.js

@@ -242,7 +242,12 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
         }
 
         if (isPromiseLike(maybePromiseLike)) {
-          return maybePromiseLike.then((res) => _cb(res), err => _cb(err));
+          return maybePromiseLike.then(
+            (res) => {
+              _cb(res instanceof Kareem.overwriteResult ? res : null);
+            },
+            err => _cb(err)
+          );
         }
 
         if (maybePromiseLike instanceof Kareem.overwriteResult) {
@@ -286,7 +291,7 @@ Kareem.prototype.createWrapperSync = function(name, fn) {
 
     return result[0];
   };
-}
+};
 
 function _handleWrapError(instance, error, name, context, args, options, callback) {
   if (options.useErrorHandlers) {
@@ -365,7 +370,7 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
           }
           arguments[0]
             ? lastArg(arguments[0])
-            : lastArg.apply(context, arguments)
+            : lastArg.apply(context, arguments);
         });
       }
     }
@@ -553,6 +558,6 @@ function decorateNextFn(fn) {
 
 const nextTick = typeof process === 'object' && process !== null && process.nextTick || function nextTick(cb) { 
   setTimeout(cb, 0); 
-}
+};
 
 module.exports = Kareem;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "kareem",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Next-generation take on pre/post function hooks",
   "main": "index.js",
   "scripts": {
+    "lint": "eslint .",
     "test": "mocha ./test/*",
     "test-travis": "nyc mocha ./test/*"
   },
@@ -12,8 +13,10 @@
     "url": "git://github.com/vkarpov15/kareem.git"
   },
   "devDependencies": {
+    "@masteringjs/eslint-config": "0.0.1",
     "acquit": "1.x",
     "acquit-ignore": "0.1.x",
+    "eslint": "8.15.0",
     "mocha": "9.2.0",
     "nyc": "15.1.0"
   },

package/test/examples.test.js

@@ -1,4 +1,7 @@
+'use strict';
+
 var assert = require('assert');
+const { beforeEach, describe, it } = require('mocha');
 var Kareem = require('../');
 
 /* Much like [hooks](https://npmjs.org/package/hooks), kareem lets you define

package/test/misc.test.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert');
 const Kareem = require('../');
+const { describe, it } = require('mocha');
 
 describe('hasHooks', function() {
   it('returns false for toString (Automattic/mongoose#6538)', function() {
@@ -14,7 +15,6 @@ describe('merge', function() {
   it('handles async pres if source doesnt have them', function() {
     const k1 = new Kareem();
     k1.pre('cook', true, function(next, done) {
-      execed.first = true;
       setTimeout(
         function() {
           done('error!');

package/test/post.test.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert');
 const Kareem = require('../');
+const { beforeEach, describe, it } = require('mocha');
 
 describe('execPost', function() {
   var hooks;

package/test/pre.test.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert');
 const Kareem = require('../');
+const { beforeEach, describe, it } = require('mocha');
 
 describe('execPre', function() {
   var hooks;

package/test/wrap.test.js

@@ -1,5 +1,8 @@
+'use strict';
+
 var assert = require('assert');
 var Kareem = require('../');
+const { beforeEach, describe, it } = require('mocha');
 
 describe('wrap()', function() {
   var hooks;

package/gulpfile.js

@@ -1,18 +0,0 @@
-var gulp = require('gulp');
-var mocha = require('gulp-mocha');
-var config = require('./package.json');
-var jscs = require('gulp-jscs');
-
-gulp.task('mocha', function() {
-  return gulp.src('./test/*').
-    pipe(mocha({ reporter: 'dot' }));
-});
-
-gulp.task('jscs', function() {
-  return gulp.src('./index.js').
-    pipe(jscs(config.jscsConfig));
-});
-
-gulp.task('watch', function() {
-  gulp.watch('./index.js', ['jscs', 'mocha']);
-});