hamjest 4.0.1 → 4.1.1

package/index.js

@@ -61,11 +61,13 @@ module.exports.closeTo = require('./lib/matchers/IsCloseTo').closeTo;
 module.exports.allOf = require('./lib/matchers/AllOf').allOf;
 module.exports.anyOf = require('./lib/matchers/AnyOf').anyOf;
 module.exports.everyItem = require('./lib/matchers/Every').everyItem;
+module.exports.startsWithItems = require('./lib/matchers/IsArrayStartingWith').startsWithItems;
+module.exports.endsWithItems = require('./lib/matchers/IsArrayEndingWith').endsWithItems;
+module.exports.contains = require('./lib/matchers/IsArrayContaining').contains;
+module.exports.containsInAnyOrder = require('./lib/matchers/IsArrayContainingInAnyOrder').containsInAnyOrder;
 module.exports.hasItem = require('./lib/matchers/IsArrayWithItem').hasItem;
 module.exports.hasItems = require('./lib/matchers/IsArrayWithItems').hasItems;
 module.exports.hasExactlyOneItem = require('./lib/matchers/hasExactlyOneItem');
-module.exports.contains = require('./lib/matchers/IsArrayContaining').contains;
-module.exports.containsInAnyOrder = require('./lib/matchers/IsArrayContainingInAnyOrder').containsInAnyOrder;
 module.exports.orderedBy = require('./lib/matchers/IsArrayOrderedBy').orderedBy;
 module.exports.hasSize = require('./lib/matchers/hasSize');
 module.exports.isEmpty = require('./lib/matchers/isEmpty');

package/lib/Description.js

@@ -103,7 +103,11 @@ function Description() {
 					this.useJsonForObjects = oldJsonFlag;
 				}
 			} else {
-				this.append(value);
+				try {
+					this.append(value);
+				} catch (e) {
+					this.append('<' + e.stack + '>');
+				}
 			}
 			return this;
 		},

package/lib/assertThat.js

@@ -41,7 +41,7 @@ const assertThat = (...args) => {
 	} else {
 		if (global && global.expect) {
 			const expectation = global.expect();
-			if (expectation && expectation.nothing) {
+			if (expectation && 'nothing' in expectation) {
 				expectation.nothing();
 			}
 		}

package/lib/matchers/IsArrayEndingWith.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const _create = require('lodash/create');
+const _every = require('lodash/every');
+const _map = require('lodash/map');
+const IsArray = require('./IsArray');
+const asMatcher = require('../utils/asMatcher');
+const promiseAgnostic = require('./promiseAgnostic');
+
+const IsArrayEndingWith = function IsArrayEndingWith(itemsOrMatchers) {
+	const matchers = _map(itemsOrMatchers, asMatcher);
+	return _create(new IsArray(), {
+		matchesSafely: function (actual) {
+			if (actual.length < matchers.length) {
+				return false;
+			}
+
+			const results = _map(matchers, (matcher, index) => {
+				return matcher.matches(actual[actual.length - matchers.length + index]);
+			});
+
+			return promiseAgnostic.matchesAggregate(results, _every);
+		},
+		describeTo: function (description) {
+			description.appendList('[…, ', ', ', ']', matchers);
+		},
+		describeMismatchSafely: function (actual, description) {
+			const results = _map(matchers, (matcher, index) => {
+				const actualIndex = actual.length - matchers.length + index;
+				if (actualIndex >= 0) {
+					return matcher.matches(actual[actualIndex]);
+				}
+			});
+
+			let first = true;
+			return promiseAgnostic.describeMismatchAggregate(results, (result, index) => {
+				const actualIndex = actual.length - matchers.length + index;
+				if (result || actualIndex < 0) {
+					return;
+				}
+
+				if (!first) {
+					description.append('\n');
+				}
+				first = false;
+
+				description
+					.append('item ')
+					.append(actualIndex)
+					.append(': ');
+				return matchers[index].describeMismatch(actual[actualIndex], description);
+			}, () => {
+				if (!first) {
+					description.append('\n');
+				}
+
+				if (actual.length < matchers.length) {
+					description.indented(() => description.appendList('missing:\n', ',\n', '', matchers.slice(0, matchers.length - actual.length)));
+				}
+			});
+		}
+	});
+};
+
+IsArrayEndingWith.endsWithItems = function () {
+	return new IsArrayEndingWith(arguments);
+};
+
+module.exports = IsArrayEndingWith;
+

package/lib/matchers/IsArrayStartingWith.js

@@ -0,0 +1,67 @@
+'use strict';
+
+const _create = require('lodash/create');
+const _every = require('lodash/every');
+const _map = require('lodash/map');
+const IsArray = require('./IsArray');
+const asMatcher = require('../utils/asMatcher');
+const promiseAgnostic = require('./promiseAgnostic');
+
+const IsArrayStartingWith = function IsArrayStartingWith(itemsOrMatchers) {
+	const matchers = _map(itemsOrMatchers, asMatcher);
+	return _create(new IsArray(), {
+		matchesSafely: function (actual) {
+			if (actual.length < matchers.length) {
+				return false;
+			}
+
+			const results = _map(matchers, (matcher, index) => {
+				return matcher.matches(actual[index]);
+			});
+
+			return promiseAgnostic.matchesAggregate(results, _every);
+		},
+		describeTo: function (description) {
+			description.appendList('[', ', ', ', …]', matchers);
+		},
+		describeMismatchSafely: function (actual, description) {
+			const results = _map(matchers, (matcher, index) => {
+				if (index < actual.length) {
+					return matcher.matches(actual[index]);
+				}
+			});
+
+			let first = true;
+			return promiseAgnostic.describeMismatchAggregate(results, (result, index) => {
+				if (result || index >= actual.length) {
+					return;
+				}
+
+				if (!first) {
+					description.append('\n');
+				}
+				first = false;
+
+				description
+					.append('item ')
+					.append(index)
+					.append(': ');
+				return matchers[index].describeMismatch(actual[index], description);
+			}, () => {
+				if (!first) {
+					description.append('\n');
+				}
+
+				if (actual.length < matchers.length) {
+					description.indented(() => description.appendList('missing:\n', ',\n', '', matchers.slice(actual.length)));
+				}
+			});
+		}
+	});
+};
+
+IsArrayStartingWith.startsWithItems = function () {
+	return new IsArrayStartingWith(arguments);
+};
+
+module.exports = IsArrayStartingWith;

package/lib/matchers/IsArrayWithItem.js

@@ -27,17 +27,14 @@ function IsArrayWithItem(valueOrMatcher) {
 				description.append('was empty');
 				return;
 			}
-			const results = _map(actual, (value) => {
-				return matcher.matches(value);
-			});
 
-			return promiseAgnostic.describeMismatchAggregate(results, (__result, index) => {
+			return promiseAgnostic.describeMismatchAggregate(actual, (actualItem, index) => {
 				description.append('\n');
 				description
 					.append('item ')
 					.append(index)
 					.append(': ');
-				return description.indented(() => matcher.describeMismatch(actual[index], description));
+				return description.indented(() => matcher.describeMismatch(actualItem, description));
 			});
 		}
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hamjest",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "main": "index.js",
   "description": "A library of composable matchers for defining meaningful and readable assertions in JavaScript.",
   "homepage": "https://github.com/rluba/hamjest",
@@ -49,6 +49,7 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.4.2",
     "@typescript-eslint/eslint-plugin": "^2.30.0",
+    "@types/node": "16.11.6",
     "@typescript-eslint/parser": "^2.30.0",
     "babelify": "^10.0.0",
     "browserify": "^16.3.0",

package/test/node/assertThatSpec.js

@@ -114,4 +114,18 @@ describe('assertThat', () => {
 
 		assert.equal(expectNothingWasCalled, true);
 	});
+
+	it('should not throw when nothing is not available on expect (fix "Invalid Chai property" in vitest)', () => {
+		const chaiFake = {irrelevant: 'property'};
+
+		global.expect = () => new Proxy(chaiFake, {
+			get(target, property) {
+				if (!Object.keys(target).includes(property)) {
+					throw Error(`Invalid Chai property: ${property}`);
+				}
+			}
+		});
+
+		__.assertThat(true, __.is(__.equalTo(true)));
+	});
 });