@onehat/data 1.4.13 → 1.4.14

package/cypress/integration/Entity.spec.js

@@ -14,7 +14,7 @@ describe('Entity', function() {
 				properties: [
 					{ name: 'foo', type: 'int' },
 					{ name: 'bar' },
-					{ name: 'baz', mapping: 'baz.test.val', type: 'bool' },
+					{ name: 'baz', mapping: 'baz.test.val', type: 'bool', defaultValue: null, },
 				],
 			},
 		});

package/package.json

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

package/src/Entity.js

@@ -32,8 +32,10 @@ class Entity extends EventEmitter {
 	 * @constructor
 	 * @param {Schema} schema - Schema object
 	 * @param {object} rawData - Raw data object. Keys are Property names, Values are Property values.
+	 * @param {Repository} repository
+	 * @param {boolean} - Has rawData already been mapped according to schema?
 	 */
-	constructor(schema, rawData = {}, repository = null) {
+	constructor(schema, rawData = {}, repository = null, originalIsMapped = false) {
 		super(...arguments);
 
 		if (!schema) {
@@ -86,6 +88,12 @@ class Entity extends EventEmitter {
 		 */
 		this._originalDataParsed = null;
 
+		/**
+		 * @member {boolean} originalIsMapped - Has the original data already been mapped according to schema?
+		 * @private
+		 */
+		this.originalIsMapped = originalIsMapped;
+
 		/**
 		 * @member {Object} properties - Object of all Properties, keyed by id (for quick access)
 		 * These properties are actually created in the initialize() function.
@@ -204,6 +212,11 @@ class Entity extends EventEmitter {
 				throw new Error('PropertyType ' + type + ' does not exist.');
 			}
 
+			if (this.originalIsMapped) {
+				// Data has already been mapped according to schema, so alter definition
+				definition = _.clone(definition); // Clone it so you don't alter original in schema
+				definition.mapping = definition.name;
+			}
 			const Property = PropertyTypes[type],
 				property = new Property(definition, this._proxy);
 			

package/src/Repository/Repository.js

@@ -847,10 +847,11 @@ export default class Repository extends EventEmitter {
 	 * Creates a single new Entity in storage medium.
 	 * @param {object} data - Either raw data object or Entity. If raw data, keys are Property names, Values are Property values.
 	 * @param {boolean} isPersisted - Whether the new entity should be marked as already being persisted in storage medium.
+	 * @param {boolean} originalIsMapped - Has data already been mapped according to schema?
 	 * @return {object} entity - new Entity object
 	 * @fires add
 	 */
-	add = async (data, isPersisted) => {
+	add = async (data, isPersisted = false, originalIsMapped = false) => {
 		if (this.isDestroyed) {
 			throw Error('this.add is no longer valid. Repository has been destroyed.');
 		}
@@ -858,7 +859,7 @@ export default class Repository extends EventEmitter {
 		let entity = data;
 		if (!(data instanceof Entity)) {
 			// Create the new entity
-			entity = Repository._createEntity(this.schema, data, this, isPersisted);
+			entity = Repository._createEntity(this.schema, data, this, isPersisted, originalIsMapped);
 		}
 		this._relayEntityEvents(entity);
 		this.entities.push(entity);
@@ -877,20 +878,27 @@ export default class Repository extends EventEmitter {
 		return entity;
 	}
 
+	/**
+	 * Convenience function to add entity with mapped data.
+	 */
+	addMapped = (data, isPersisted = false) => {
+		return this.add(data, isPersisted, true);
+	}
+
 	/**
 	 * Convenience function to create multiple new Entities in storage medium.
 	 * @param {array} data - Array of data objects or Entities. 
 	 * @param {boolean} isPersisted - Whether the new entities should be marked as already being persisted in storage medium.
 	 * @return {array} entities - new Entity objects
 	 */
-	addMultiple = async (allData, isPersisted) => {
+	addMultiple = async (allData, isPersisted = false, originalIsMapped = false) => {
 
 		let entities = [],
 			i;
 
 		for (i = 0; i < allData.length; i++) {
 			const data = allData[i],
-				entity = await this.add(data, isPersisted);
+				entity = await this.add(data, isPersisted, originalIsMapped);
 			entities.push(entity);
 		};
 		
@@ -907,8 +915,8 @@ export default class Repository extends EventEmitter {
 	 * @return {object} entity - new Entity object
 	 * @private
 	 */
-	static _createEntity = (schema, rawData, repository = null, isPersisted = false) => {
-		const entity = new Entity(schema, rawData, repository);
+	static _createEntity = (schema, rawData, repository = null, isPersisted = false, originalIsMapped = false) => {
+		const entity = new Entity(schema, rawData, repository, originalIsMapped);
 		entity.initialize();
 		entity.isPersisted = isPersisted;
 		return entity;