@onehat/data 1.11.1 → 1.11.3

package/cypress/integration/Entity.spec.js

@@ -470,6 +470,14 @@ describe('Entity', function() {
 			expect(_.isEqual(result, this.data)).to.be.true;
 		});
 
+		it('hash', function() {
+			expect(this.entity.hash).to.be.eq(4635951664292355);
+
+			// change a property & check again
+			this.entity.foo = 3;
+			expect(this.entity.hash).to.be.eq(1510366977941323);
+		});
+
 	});
 
 	describe('setters', function() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.11.1",
+	"version": "1.11.3",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Entity.js

@@ -965,6 +965,41 @@ class Entity extends EventEmitter {
 		return !_.isEqualWith(this._originalDataParsed, this.getParsedValues());
 	}
 
+	/**
+	 * Gets the a hash of the current submitValues.
+	 * This allows easy detection of changes in data.
+	 * @return {integer} hash
+	 */
+	getHash = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getHash is no longer valid. Entity has been destroyed.');
+		}
+
+		const str = JSON.stringify(this.submitValues);
+
+		// from https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
+		const seed = 0;
+		let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+		for (let i = 0, ch; i < str.length; i++) {
+			ch = str.charCodeAt(i);
+			h1 = Math.imul(h1 ^ ch, 2654435761);
+			h2 = Math.imul(h2 ^ ch, 1597334677);
+		}
+		h1 = Math.imul(h1 ^ (h1>>>16), 2246822507) ^ Math.imul(h2 ^ (h2>>>13), 3266489909);
+		h2 = Math.imul(h2 ^ (h2>>>16), 2246822507) ^ Math.imul(h1 ^ (h1>>>13), 3266489909);
+		const hash = 4294967296 * (2097151 & h2) + (h1>>>0);
+
+		return hash;
+	}
+
+	/**
+	 * Getter of the hash for this Entity.
+	 * @return {integer} hash
+	 */
+	get hash() {
+		return this.getHash();
+	}
+
 	/**
 	 * Gets the original data object for this Entity.
 	 * This is either what was persisted to storage medium, or what was

package/src/Util/Parsers.js

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import momentAlt from 'relative-time-parser'; // Notice this version of moment is imported from 'relative-time-parser', and may be out of sync with our general 'moment' package
 import accounting from 'accounting-js';
-// import * as chrono from 'chrono-node';
+import * as chrono from 'chrono-node';
 import _ from 'lodash';
 
 class Parsers {
@@ -85,21 +85,24 @@ class Parsers {
 	 * @return {object} moment - A moment object
 	 */
 	static ParseDate = (value, format = null) => {
+		if (moment.isMoment(value)) {
+			return value;
+		}
 		let result;
 		try {
 			result = moment(value, format);
 		} catch(err) {}
 		
-		// if ((!result || !result.isValid() && chrono)) {
-		// 	// try using chrono
-		// 	const parsed = chrono.parse(value);
-		// 	if (parsed && parsed[0] && parsed[0].date) {
-		// 		const dateString = parsed[0].date();
-		// 		try {
-		// 			result = moment(dateString);
-		// 		} catch(err) {}
-		// 	}
-		// }
+		if ((!result || !result.isValid() && chrono)) {
+			// try using chrono
+			const parsed = chrono.parse(value);
+			if (parsed && parsed[0] && parsed[0].date) {
+				const dateString = parsed[0].date();
+				try {
+					result = moment(dateString);
+				} catch(err) {}
+			}
+		}
 		return result;
 	}