@onehat/data 1.18.0 → 1.18.2

package/cypress/e2e/Repository/Repository.cy.js

@@ -1050,7 +1050,7 @@ describe('Repository Base', function() {
 
 	});
 
-	describe('misc', function() {
+	describe('utilities', function() {
 		it('setOptions', function() {
 
 			this.repository.setOptions({
@@ -1062,6 +1062,45 @@ describe('Repository Base', function() {
 			expect(this.repository.api.baseURL).to.be.eq('test123');
 		});
 
+		it('unmapData', function() {
+
+			// Setup
+			const
+				schema = new Schema({
+					name: 'baz',
+					model: {
+						idProperty: 'foo',
+						displayProperty: 'bar',
+						properties: [
+							{ name: 'foo', type: 'int' },
+							{ name: 'bar' },
+							{ name: 'baz', mapping: 'baz.test.val', type: 'bool', defaultValue: null, },
+							{ name: 'boo', mapping: 'baz.test.boo', type: 'bool', defaultValue: null, },
+						],
+					},
+				}),
+				data = {
+					foo: 1,
+					bar: 'one',
+					baz: {
+						test: {
+							val: true,
+							boo: false,
+						},
+					},
+				};
+			this.repository.schema = schema;
+
+			// Now do the test
+			const unmapped = this.repository.unmapData({
+				foo: 1,
+				bar: 'one',
+				baz: true,
+				boo: false,
+			});
+			expect(unmapped).to.be.eql(data);
+		});
+
 		it('toString', function() {
 			const str = this.repository.toString();
 			expect(str).to.be.eq('NullRepository {bar} - foo');

package/package.json

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

package/src/Repository/Ajax.js

@@ -966,7 +966,9 @@ class AjaxRepository extends Repository {
 
 							// Do we need to reload?
 							if (!this.eventsPaused) {
-								if (this._operations.add || this._operations.delete) {
+								if (this._operations.add && this.isRemotePhantomMode) {
+									// Do nothing, as we don't want to immediately reload on add for a remote phantom mode record. It won't appear, and it will cause all kinds of trouble!
+								} else if (this._operations.add || this._operations.delete) {
 									this.reload();
 								} else {
 									this.emit('changeData', this.entities);

package/src/Repository/Repository.js

@@ -1037,13 +1037,6 @@ 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. 
@@ -2020,13 +2013,11 @@ export default class Repository extends EventEmitter {
 
 
 
-
-	//    ____        __  _
-	//   / __ \____  / /_(_)___  ____  _____
-	//  / / / / __ \/ __/ / __ \/ __ \/ ___/
-	// / /_/ / /_/ / /_/ / /_/ / / / (__  )
-	// \____/ .___/\__/_/\____/_/ /_/____/
-	//     /_/
+	//    __  ____  _ ___ __  _          
+	//   / / / / /_(_) (_) /_(_)__  _____
+	//  / / / / __/ / / / __/ / _ \/ ___/
+	// / /_/ / /_/ / / / /_/ /  __(__  ) 
+	// \____/\__/_/_/_/\__/_/\___/____/  
 
 	/**
 	 * Set config options after Repository has already been initialized
@@ -2037,6 +2028,60 @@ export default class Repository extends EventEmitter {
 		_.merge(this, options);
 	}
 
+	unmapData = (mappedData) => {
+		const propertiesDef = this.schema?.model?.properties;
+		if (!propertiesDef) {
+			throw Error('No properties defined!');
+		}
+
+		// Simply the definitions
+		const
+			UNMAPPED = 'UNMAPPED',
+			properties = {};
+		_.each(propertiesDef, (def) => {
+			properties[def.name] = def.mapping || UNMAPPED;
+		});
+
+		// Build the unmapped data
+		const unmappedData = {};
+		_.forOwn(mappedData, (value, field) => {
+			const mapping = properties[field];
+			if (mapping === UNMAPPED) {
+				// Simple, just add the value
+				unmappedData[field] = value;
+			} else {
+				// This is the more complicated one. Need to build up the hierarchy of unmapped data
+
+				const
+					mapStack = mapping.split('.'),
+					rawValue = value;
+		
+				// Build up the hierarchy
+				let thisValue = {},
+					current = thisValue,
+					i,
+					total = mapStack.length;
+				for (i = 0; i < total; i++) {
+					let path = mapStack[i];
+					if (current && !current.hasOwnProperty(path)) {
+						current[path] = {}; // walk the path
+					}
+					if (i < total -1) {
+						current = current[path];
+					} else {
+						current[path] = rawValue; // Last one, so set the thisValue
+					}
+				}
+				_.merge(unmappedData, thisValue);
+
+			}
+		});
+
+
+
+		return unmappedData;
+	}
+
 	/**
 	 * Set error handler for this repository
 	 * @param {function} handler - the error handler