Merge 051a07d into 7e8038c

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
+## [0.3.2] - 2019-2-14
+### Changed
+- Replaced dependencies on clone and deepEqual with object-agent
+- Added ID and callback args to the methodQueue set option
+
 ## [0.3.1] - 2019-2-10
 ### Added
 - [castArray](docs/castArray.md)
@@ -102,6 +107,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial enforcers, methods, and documentation
 
+[0.3.2]: https://github.com/DarrenPaulWright/type-enforcer/compare/v0.3.1...c0.3.2
 [0.3.1]: https://github.com/DarrenPaulWright/type-enforcer/compare/v0.3.0...c0.3.1
 [0.3.0]: https://github.com/DarrenPaulWright/type-enforcer/compare/v0.2.4...c0.3.0
 [0.2.4]: https://github.com/DarrenPaulWright/type-enforcer/compare/v0.2.3...c0.2.4

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "type-enforcer",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"description": "Type enforcement library for javascript",
 	"main": "src/index.js",
 	"scripts": {
@@ -40,8 +40,7 @@
 	},
 	"homepage": "https://github.com/DarrenPaulWright/type-enforcer#readme",
 	"dependencies": {
-		"clone": "^2.1.2",
-		"deep-equal": "^1.0.1"
+		"object-agent": "^0.2.1"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.2.2",

src/methods/types/methodAny.js

@@ -1,5 +1,4 @@
-import clone from 'clone';
-import deepEqual from 'deep-equal';
+import { clone, deepEqual } from 'object-agent';
 import isArray from '../../checks/types/isArray';
 import enforceBoolean from '../../enforcer/types/enforceBoolean';
 import before from '../variants/before';

src/methods/types/methodKeyValue.js

@@ -1,5 +1,5 @@
+import { forOwn } from 'object-agent';
 import isObject from '../../checks/types/isObject';
-import forOwn from '../../utility/forOwn';
 
 /**
  * Builds a chainable method that accepts either:

src/methods/types/methodQueue.js

@@ -7,7 +7,7 @@ import Queue from '../../types/Queue';
  * @function method.queue
  *
  * @arg {Object}   [options]
- * @arg {Function} [options.set] - Called after a new callback is added to the queue. Provides a reference to the queue, sets the context to the methods constructor.
+ * @arg {Function} [options.set] - Called after a new callback is added to the queue. Provides a reference to the queue, the new ID for the callback, the callback, and sets the context to the methods constructor.
  *
  * @returns {Function} accepts a new value and returns the methods constructor (allows chaining), or if no args are passed returns the instance of Queue
  */
@@ -27,10 +27,10 @@ export default (options = {}) => {
 
 		if (arguments.length) {
 			if (isFunction(callback)) {
-				this[key].add(callback);
+				const ID = this[key].add(callback);
 
 				if (options.set) {
-					options.set.call(this, this[key]);
+					options.set.call(this, this[key], ID, callback);
 				}
 			}
 

src/types/Enum.js

@@ -1,4 +1,4 @@
-import forOwn from '../utility/forOwn';
+import { forOwn } from 'object-agent';
 
 const KEYS = Symbol();
 const VALUES = Symbol();

src/types/Queue.js

@@ -1,5 +1,5 @@
+import { forOwn } from 'object-agent';
 import isFunction from '../checks/types/isFunction';
-import forOwn from '../utility/forOwn';
 
 const CALLBACKS = Symbol();
 const CURRENT_ID = Symbol();
@@ -101,9 +101,7 @@ export default class Queue {
 		}
 		else {
 			forOwn(this[CALLBACKS], (callback) => {
-				if (callback) {
-					callback.function.apply(context, extraArguments);
-				}
+				callback.function.apply(context, extraArguments);
 			});
 		}
 		this[IS_BUSY] = false;
@@ -129,7 +127,7 @@ export default class Queue {
 		forOwn(this[CALLBACKS], (callback, ID) => {
 			callback.function.apply(context, extraArguments);
 			self.discard(ID);
-			return false;
+			return true;
 		});
 		this[IS_BUSY] = false;
 

tests/TestUtil.js

@@ -1,6 +1,6 @@
 import { assert } from 'chai';
+import { forOwn } from 'object-agent';
 import { isObject } from '../src';
-import forOwn from '../src/utility/forOwn';
 
 export const eachPair = (array1, array2, callback, isUnique = false) => {
 	let i;

tests/methods/methodTestUtility.js

@@ -2,7 +2,8 @@ import { assert } from 'chai';
 import powerset from 'powerset';
 import { enforceString, method, Point } from '../../src';
 import { processOutput } from '../../src/methods/variants/helper';
-import startCase from '../../src/utility/startCase';
+
+const startCase = (string) => string.split(' ').map((word) => word.charAt(0).toUpperCase()).join(' ');
 
 const TEST_METHOD = 'testMethod';
 const variantSet = powerset(['get', 'other', 'before', 'set']);

tests/mixins/Removable.Test.js

@@ -86,4 +86,14 @@ describe('Removable', () => {
 
 		assert.isTrue(testClass.isRemoved);
 	});
+
+	it('should not throw an error if remove is called without adding any onRemove callbacks', () => {
+		class TestClass extends Removable {}
+
+		const testClass = new TestClass();
+
+		assert.doesNotThrow(() => {
+			testClass.remove();
+		});
+	});
 });

tests/testValues.js

@@ -24,7 +24,11 @@ import {
 	VIEWPORT_WIDTH,
 	ZERO_PIXELS
 } from '../src';
-import difference from '../src/utility/difference';
+
+const difference = (array1, ...args) => {
+	let diffArrays = [].concat(...args);
+	return array1.filter((item1) => diffArrays.every((item2) => item1 !== item2));
+};
 
 export const validArrays = [[1], [2], [], new Array(), Array()];
 export const validBooleans = [true, false, new Boolean(true), Boolean()];

tests/utility/isElementInDom.Test.js

@@ -17,7 +17,7 @@ describe('isElementInDom', () => {
 	});
 	it('should return true for an element that is in the Dom', () => {
 		const element = document.createElement('div');
-		document.body.appendChild(element)
+		document.body.appendChild(element);
 		assert.isTrue(isElementInDom(element));
 	});
 });