feat: native promises instead bluebird

Author: dlenroc

dist/hamjest.js

@@ -1,7 +1,5 @@
 'use strict';
 
-process.env.BLUEBIRD_DEBUG = 1;
-
 const gulp = require('gulp');
 const gulpEslint = require('gulp-eslint');
 const gulpMocha = require('gulp-mocha');

dist/hamjest.min.js

@@ -9,7 +9,6 @@ const _isRegExp = require('lodash/isRegExp');
 const _isString = require('lodash/isString');
 const _isUndefined = require('lodash/isUndefined');
 const _padEnd = require('lodash/padEnd');
-const Bluebird = require('bluebird');
 
 function asSelfDescribing(value) {
 	if (!value || !_isFunction(value.describeTo)) {
@@ -47,7 +46,7 @@ function Description() {
 			this.indentation += 1;
 			const result = describingfn();
 			if (result && _isFunction(result.then)) {
-				return Bluebird.resolve(result)
+				return Promise.resolve(result)
 				.finally(() => {
 					this.indentation -= 1;
 				});

gulpfile.js

@@ -6,20 +6,35 @@ const _isArray = require('lodash/isArray');
 const _isFunction = require('lodash/isFunction');
 const _reduce = require('lodash/reduce');
 const _some = require('lodash/some');
-const Bluebird = require('bluebird');
 
 function resolve(promises) {
 	if (_isArray(promises)) {
-		return Bluebird.all(promises);
+		return Promise.all(promises);
 	} else {
-		return Bluebird.props(promises);
+		return Promise.resolve(promises)
+			.then((object) =>
+				Promise.all(
+					Object.entries(object).map(([key, value]) =>
+						Promise.resolve(value).then((value) => [key, value])
+					)
+				)
+			)
+			.then((items) => {
+				const results = {};
+
+				for (const [key, value] of items) {
+					results[key] = value;
+				}
+
+				return results;
+			});
 	}
 }
 
 const promiseAgnostic = {
 	matches: function (result, handler) {
 		if (isPromise(result)) {
-			return Bluebird.resolve(result).then(handler);
+			return Promise.resolve(result).then(handler);
 		} else {
 			return handler(result);
 		}
@@ -36,7 +51,7 @@ const promiseAgnostic = {
 			return resolve(results).then((results) => {
 				return _reduce(results, (chain, result, key) => {
 					return chain.then(() => handler(result, key));
-				}, Bluebird.resolve());
+				}, Promise.resolve());
 			})
 			.then(suffixFn || _identity);
 		} else {
@@ -50,7 +65,7 @@ const promiseAgnostic = {
 	},
 	describeMismatch: function (result, handler, suffixFn) {
 		if (isPromise(result)) {
-			return Bluebird.resolve(result)
+			return Promise.resolve(result)
 			.then(handler)
 			.then(suffixFn || _identity);
 		} else {

lib/Description.js

@@ -2,8 +2,6 @@
 
 const _isFunction = require('lodash/isFunction');
 const AssertionError = require('assertion-error');
-const Bluebird = require('bluebird');
-
 const Description = require('./Description');
 
 function promiseThat(reason, actual, matcher) {
@@ -13,24 +11,24 @@ function promiseThat(reason, actual, matcher) {
 		reason = '';
 	}
 
-	return Bluebird.try(() => matcher.matches(actual)).then((result) => {
+	return Promise.resolve().then(() => matcher.matches(actual)).then((result) => {
 		if (!result) {
 			const description = new Description();
 			description.append(reason)
 				.append('\nExpected: ')
 				.appendDescriptionOf(matcher)
 				.append('\n     but: ');
-			return Bluebird.try(() => matcher.describeMismatch(actual, description))
+			return Promise.resolve().then(() => matcher.describeMismatch(actual, description))
 			.then(() => {
 				if (!_isFunction(matcher.getExpectedForDiff) ||
 					!_isFunction(matcher.formatActualForDiff)) {
 					return {};
 				}
 
-				return Bluebird.all([
+				return Promise.all([
 					matcher.getExpectedForDiff(),
 					matcher.formatActualForDiff(actual)
-				]).spread((expected, actual) => {
+				]).then(([expected, actual]) => {
 					return {
 						showDiff: true,
 						expected: expected,

lib/matchers/promiseAgnostic.js

@@ -43,7 +43,6 @@
   ],
   "dependencies": {
     "assertion-error": "^1.1.0",
-    "bluebird": "^3.3.4",
     "lodash": "^4.17.15"
   },
   "devDependencies": {

lib/promiseThat.js

@@ -1,9 +1,7 @@
 'use strict';
 
 const assert = require('assert');
-
 const AssertionError = require('assertion-error');
-const Bluebird = require('bluebird');
 
 const __ = require('../..');
 const TestMatcher = require('./TestMatcher');
@@ -93,7 +91,7 @@ describe('assertThat', () => {
 		let thrown;
 
 		try {
-			__.assertThat('a value', new TestMatcher(() => Bluebird.resolve(true)));
+			__.assertThat('a value', new TestMatcher(() => Promise.resolve(true)));
 		} catch (e) {
 			thrown = e;
 		}

package.json

@@ -1,19 +1,17 @@
 'use strict';
 
-const Bluebird = require('bluebird');
-
 function deferMatcher(matcher) {
 	return {
 		matches: function (actual) {
-			return Bluebird.try(() => matcher.matches(actual));
+			return Promise.resolve().then(() => matcher.matches(actual));
 		},
 		describeTo: function (description) {
 			description.append('deferred: ');
 			matcher.describeTo(description);
 		},
 		describeMismatch: function (actual, description) {
 			description.append('deferred: ');
-			return Bluebird.try(() => matcher.describeMismatch(actual, description));
+			return Promise.resolve().then(() => matcher.describeMismatch(actual, description));
 		}
 	};
 }