@onehat/data 1.7.15 → 1.8.1

package/cypress/integration/Entity.spec.js

@@ -476,15 +476,40 @@ describe('Entity', function() {
 		it('setValues', function() {
 			expect(this.entity.foo).to.be.eq(1);
 			expect(this.entity.bar).to.be.eq('one');
+			expect(this.entity.baz).to.be.eq(true);
 			expect(this.entity.isDirty).to.be.false;
 	
 			this.entity.setValues({
 				foo: 2,
 				bar: 'two',
+				baz: false,
 			});
 			
 			expect(this.entity.foo).to.be.eq(2);
 			expect(this.entity.bar).to.be.eq('two');
+			expect(this.entity.baz).to.be.eq(false);
+			expect(this.entity.isDirty).to.be.true;
+		});
+
+		it('setRawValues', function() {
+			expect(this.entity.foo).to.be.eq(1);
+			expect(this.entity.bar).to.be.eq('one');
+			expect(this.entity.baz).to.be.eq(true);
+			expect(this.entity.isDirty).to.be.false;
+	
+			this.entity.setRawValues({
+				foo: 2,
+				bar: 'two',
+				baz: {
+					test: {
+						val: false,
+					},
+				},
+			});
+			
+			expect(this.entity.foo).to.be.eq(2);
+			expect(this.entity.bar).to.be.eq('two');
+			expect(this.entity.baz).to.be.eq(false);
 			expect(this.entity.isDirty).to.be.true;
 		});
 

package/cypress/integration/Repository/Repository.spec.js

@@ -553,6 +553,30 @@ describe('Repository Base', function() {
 			expect(didFireAdd).to.be.true;
 		});
 
+		it('add already existing', async function() {
+			const value = 'another one';
+			await this.repository.add({ key: 6, value: 'six' });
+			await this.repository.add({ key: 6, value });
+			expect(_.size(this.repository.entities)).to.be.eq(6);
+
+			const entity = this.repository.getById(6);
+			expect(entity.value).to.be.eq(value);
+		})
+
+		it('add with an existing id', async function() {
+			this.repository.autoSave = false;
+
+			// ID suppied; should not be temp ID or phantom
+			const entity = await this.repository.add({ key: 6, value: 'six' });
+			expect(entity.isTempId).to.be.false;
+			expect(entity.isPhantom).to.be.false;
+
+			// No ID suppled. Make it phantom and temp ID
+			const entity2 = await this.repository.add({ value: 'seven' });
+			expect(entity2.isTempId).to.be.true;
+			expect(entity2.isPhantom).to.be.true;
+		});
+
 		it('createStandaloneEntity', async function() {
 			const entity = await this.repository.createStandaloneEntity({ key: 6, value: 'six' });
 			expect(entity.id).to.be.eq(6);

package/package.json

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

package/src/Entity.js

@@ -1022,23 +1022,58 @@ class Entity extends EventEmitter {
 		propertyValues[propertyName] = rawValue;
 		return this.setValues(propertyValues);
 	}
+	
+	/**
+	 * Sets Property values
+	 * @param {object} rawData - Raw data object. These are prior to mapping, 
+	 * similar to what you'd use to create a brand new Entity. Make sure *all*
+	 * values are here, not just a few.
+	 * @return {boolean} isChanged - Whether any values were actually changed
+	 */
+	 setRawValues = (rawData) => {
+		if (this.isDestroyed) {
+			throw Error('this.setRawValues is no longer valid. Entity has been destroyed.');
+		}
+
+		const [dependentProperties, nonDependentProperties] = _.partition(this.properties, (property) => {
+			return property.hasDepends;
+		});
+		const mappedData = {};
+		function setMappedValue(property) {
+			let rawValue;
+			if (property.hasMapping) {
+				rawValue = Entity.getMappedValue(property.mapping, rawData);
+			} else {
+				rawValue = rawData[property.name];
+			}
+			if (_.isNil(rawValue)) {
+				rawValue = property.getDefaultValue();
+			}
+			mappedData[property.name] = rawValue;
+		}
+		
+		_.each(nonDependentProperties, setMappedValue);
+		_.each(dependentProperties, setMappedValue);
+
+		return this.setValues(mappedData);
+	}
 
 	/**
 	 * Sets Property values
-	 * @param {object} rawData - Raw data object. Keys are Property names, Values are Property values.
+	 * @param {object} data - Raw data object. Keys are Property names, Values are Property values.
 	 * @return {boolean} isChanged - Whether any values were actually changed
 	 * @fires change
 	 */
-	setValues = (rawData) => {
+	setValues = (data) => {
 		if (this.isDestroyed) {
 			throw Error('this.setValues is no longer valid. Entity has been destroyed.');
 		}
-		if (_.indexOf(rawData, this.getIdProperty().name) !== -1) {
+		if (_.indexOf(data, this.getIdProperty().name) !== -1) {
 			throw new Error('Cannot change id via entity.setValues(). Must use entity.setId() first.');
 		}
 
 		let isChanged = false;
-		_.each(rawData, (value, propertyName) => {
+		_.each(data, (value, propertyName) => {
 			const property = this.getProperty(propertyName);
 			property.pauseEvents(); // We don't need property_change to fire
 			if (property.setValue(value)) {

package/src/Repository/Ajax.js

@@ -102,6 +102,11 @@ class AjaxRepository extends Repository {
 		 */
 		this.allowsMultiSort = false;
 
+		/**
+		 * @member {object} lastSendOptions - Last options sent to server
+		 */
+		this.lastSendOptions = null;
+
 		/**
 		 * @member {Object} _params - Object of query params to submit to server
 		 * @private
@@ -786,6 +791,8 @@ class AjaxRepository extends Repository {
 			console.log(url, options);
 		}
 		
+		this.lastSendOptions = options;
+		
 		return this.axios(options)
 					.catch(error => {
 						if (this.debugMode) {

package/src/Repository/OneBuild.js

@@ -113,6 +113,8 @@ class OneBuildRepository extends AjaxRepository {
 			console.log(url, options);
 		}
 		
+		this.lastSendOptions = options;
+		
 		return this.axios(options)
 					.catch(error => {
 						// BEGIN MOD

package/src/Repository/Repository.js

@@ -274,8 +274,9 @@ export default class Repository extends EventEmitter {
 		this._createMethods();
 		this._createStatics();
 
-		if (this.schema.repository.init) {
-			await this.schema.repository.init.call(this);
+		const init = this.schema.repository.init || this.originalConfig.init; // The latter is mainly for lfr repositories
+		if (init) {
+			await init.call(this);
 		}
 
 		this.isInitialized = true;
@@ -290,7 +291,7 @@ export default class Repository extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this._createMethods is no longer valid. Repository has been destroyed.');
 		}
-		const methodDefinitions = this.schema.repository.methods;
+		const methodDefinitions = this.schema.repository.methods || this.originalConfig.methods; // The latter is mainly for lfr repositories
 		if (!_.isEmpty(methodDefinitions)) {
 			_.each(methodDefinitions, (method, name) => {
 				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
@@ -306,7 +307,7 @@ export default class Repository extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this._createStatics is no longer valid. Entity has been destroyed.');
 		}
-		const staticsDefinitions = this.schema.repository.statics;
+		const staticsDefinitions = this.schema.repository.statics || this.originalConfig.statics; // The latter is mainly for lfr repositories
 		if (!_.isEmpty(staticsDefinitions)) {
 			_.each(staticsDefinitions, (value, key) => {
 				this[key] = value;
@@ -922,6 +923,19 @@ export default class Repository extends EventEmitter {
 			throw Error('this.add is no longer valid. Repository has been destroyed.');
 		}
 		
+		// Does it already exist? If so, edit the existing
+		const idProperty = this.getSchema().model.idProperty;
+		if (data.hasOwnProperty(idProperty)) {
+			if (this.isInRepository(data[idProperty])) {
+				const existing = this.getById(data[idProperty]);
+				existing.setRawValues(data);
+				if (this.autoSave && !existing.isPersisted) {
+					await this.save(existing);
+				}
+				return existing;
+			}
+		}
+
 		let entity = data;
 		if (!(data instanceof Entity)) {
 			// Create the new entity