@onehat/data 1.8.8 → 1.8.11

package/cypress/integration/Entity.spec.js

@@ -232,6 +232,17 @@ describe('Entity', function() {
 			expect(_.isEqual(this.entity.rawValues, expected)).to.be.true;
 		});
 
+		it('getParsedRawValues & parsedRawValues', function() {
+			const result = this.entity.getParsedRawValues(),
+				expected = {
+					foo: 1,
+					bar: 'one',
+					baz: true,
+				};
+			expect(_.isEqual(result, expected)).to.be.true;
+			expect(_.isEqual(this.entity.parsedRawValues, expected)).to.be.true;
+		});
+
 		it('getParsedValues & parsedValues', function() {
 			const result = this.entity.getParsedValues(),
 				expected = {

package/package.json

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

package/src/Entity.js

@@ -584,7 +584,7 @@ class Entity extends EventEmitter {
 	 */
 	getRawValues = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSubmitValues is no longer valid. Entity has been destroyed.');
+			throw Error('this.getRawValues is no longer valid. Entity has been destroyed.');
 		}
 		let propertyValues = {};
 		_.forOwn(this.properties, (property) => {
@@ -604,6 +604,33 @@ class Entity extends EventEmitter {
 		return this.getRawValues();
 	}
 
+	/**
+	 * Gets an object of values for this Entity,
+	 * Values are the "raw" values in their parsed form, not the "parsed" or "submit" or "display" values.
+	 * @return {object} propertyValues
+	 */
+	getParsedRawValues = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getParsedRawValues is no longer valid. Entity has been destroyed.');
+		}
+		let propertyValues = {};
+		_.forOwn(this.properties, (property) => {
+			propertyValues[property.name] = property.getParsedRawValue();
+		});
+		return propertyValues;
+	}
+
+	/**
+	 * Gets "raw" values in their parsed form for this Entity.
+	 * @return {object} values
+	 */
+	get parsedRawValues() {
+		if (this.isDestroyed) {
+			throw Error('this.parsedRawValues is no longer valid. Entity has been destroyed.');
+		}
+		return this.getParsedRawValues();
+	}
+
 	/**
 	 * Gets an object of values for this Entity,
 	 * Values are the "parsed" values, not the "raw" or "submit" or "display" values.
@@ -726,7 +753,7 @@ class Entity extends EventEmitter {
 	 */
 	getChanged = () => {
 		const original = this._originalDataParsed,
-			current = this.getRawValues(),
+			current = this.getParsedRawValues(),
 			diff = Object.keys(original).reduce((result, key) => { // from https://stackoverflow.com/a/40610459/9163076
 				if (current && !current.hasOwnProperty(key)) {
 					result.push(key);

package/src/Property/Property.js

@@ -183,7 +183,7 @@ export default class Property extends EventEmitter {
 	}
 
 	/**
-	 * Gets "raw" value, prior to any parsing
+	 * Gets "raw" value
 	 * @return {any} rawValue
 	 */
 	getRawValue = () => {
@@ -193,6 +193,17 @@ export default class Property extends EventEmitter {
 		return this.rawValue;
 	}
 
+	/**
+	 * Gets "raw" value in its parsed form
+	 * @return {any} rawValue
+	 */
+	getParsedRawValue = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getParsedRawValue is no longer valid. Property has been destroyed.');
+		}
+		return this.parse(this.rawValue);
+	}
+
 	/**
 	 * Gets "parsed" value, without any formatting applied
 	 * @return {any} parsedValue

package/src/Repository/Ajax.js

@@ -357,9 +357,10 @@ class AjaxRepository extends Repository {
 	 * Loads data into the Repository.
 	 * This loads only a single page of data.
 	 * @param {object} params - Params to send to server
+	 * @param {function} callback - Function to call after loading is complete
 	 * @fires beforeLoad,changeData,load,error
 	 */
-	load = async (params) => {
+	load = async (params, callback = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.load is no longer valid. Repository has been destroyed.');
 		}
@@ -417,6 +418,10 @@ class AjaxRepository extends Repository {
 
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
+
+						if (callback) {
+							callback(this.entities);
+						}
 					})
 					.finally(() => {
 						this.isLoading = false;
@@ -426,10 +431,11 @@ class AjaxRepository extends Repository {
 	/**
 	 * Reload a single entity from storage. 
 	 * If the entity is in the internal representation, update it.
+	 * @param {function} callback - Function to call after loading is complete
 	 * @returns {entity} The newly updated entity
 	 * @fires reloadEntity,beforeLoad,changeData,load,error
 	 */
-	reloadEntity = async (entity) => {
+	reloadEntity = async (entity, callback = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.reloadEntity is no longer valid. Repository has been destroyed.');
 		}
@@ -470,6 +476,10 @@ class AjaxRepository extends Repository {
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
 						this.emit('reloadEntity', entity);
+
+						if (callback) {
+							callback(entity);
+						}
 					})
 					.finally(() => {
 						this.isLoading = false;

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -285,7 +285,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Syncs local and remote repositories, based on operation mode.
 	 */
-	sync = async (entity) => {
+	sync = async (entity, callback = null) => {
 		try {
 			if (!this.isOnline) {
 				this._doAutoSync(true);
@@ -405,6 +405,9 @@ class LocalFromRemoteRepository extends EventEmitter {
 		} finally {
 			this.isSyncing = false;
 			this.emit('endSync', this);
+			if (callback) {
+				callback();
+			}
 		}
 	
 	}