@onehat/data 1.7.5 → 1.7.9

package/cypress/integration/Entity.spec.js

@@ -525,6 +525,7 @@ describe('Entity', function() {
 			entity.bar = 'Test';
 			entity.markSaved();
 			expect(entity.isTempId).to.be.false;
+			expect(entity.isStaged).to.be.false;
 
 			expect(entity.isPersisted).to.be.true;
 			const expected = {
@@ -557,6 +558,16 @@ describe('Entity', function() {
 			this.entity.undelete();
 			expect(this.entity.isDeleted).to.be.false;
 		});
+
+		it('markStaged, stage', function() {
+			expect(this.entity.isStaged).to.be.false;
+
+			this.entity.stage();
+			expect(this.entity.isStaged).to.be.true;
+
+			this.entity.markStaged(false);
+			expect(this.entity.isStaged).to.be.false;
+		});
 	});
 
 	describe('events', function() {

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

@@ -650,8 +650,12 @@ describe('Repository Base', function() {
 		it('getNonPersisted', async function() {
 			this.repository.setAutoSave(false);
 			const entity = await this.repository.add({ value: 'six' }),
-				nonPersisted = this.repository.getNonPersisted();
+				entities = this.repository.entities;
 
+			let nonPersisted = this.repository.getNonPersisted();
+			expect(_.isEqual(entity, nonPersisted[0])).to.be.true;
+			
+			nonPersisted = this.repository.getNonPersisted(entities);
 			expect(_.isEqual(entity, nonPersisted[0])).to.be.true;
 		});
 
@@ -690,6 +694,15 @@ describe('Repository Base', function() {
 			expect(_.isEqual(entity, deleted[0])).to.be.true;
 		});
 
+		it('getStaged', function() {
+			this.repository.setAutoSave(false);
+			const entity = this.repository.getByIx(0);
+			
+			entity.isStaged = true;	
+			const staged = this.repository.getStaged();
+			expect(_.isEqual(entity, staged[0])).to.be.true;
+		});
+
 		it('isInRepository, hasId', function() {
 			this.repository.setAutoSave(false);
 			const id = 1,
@@ -720,6 +733,9 @@ describe('Repository Base', function() {
 			this.repository.add({ value: 'six' });
 			
 			expect(didFire).to.be.true;
+
+			// TODO: Need comprehensive test of save(), not just event firing
+
 		});
 
 		it('save by entity', async function() {

package/package.json

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

package/src/Entity.js

@@ -117,6 +117,12 @@ class Entity extends EventEmitter {
 		 */
 		this.isDeleted = false;
 
+		/**
+		 * @member {boolean} isStaged - Whether this object has been marked for saving
+		 * @private
+		 */
+		this.isStaged = false;
+
 		/**
 		 * @member {boolean} isDestroyed - Whether this object has been destroyed
 		 * @private
@@ -152,6 +158,7 @@ class Entity extends EventEmitter {
 	initialize = () => {
 		this.properties = this._createProperties();
 		this._createMethods();
+		this._createStatics();
 		this.reset();
 		this.isInitialized = true;
 	}
@@ -164,14 +171,30 @@ class Entity extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this._createMethods is no longer valid. Entity has been destroyed.');
 		}
-		const methodDefinitions = this.schema.entity.methods;
-		if (!_.isEmpty(methodDefinitions)) {
-			_.each(methodDefinitions, (method, name) => {
+		const methodsDefinitions = this.schema.entity.methods;
+		if (!_.isEmpty(methodsDefinitions)) {
+			_.each(methodsDefinitions, (method, name) => {
 				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
 			});
 		}
 	}
 
+	/**
+	 * Creates the static properties for this Entity, based on Schema.
+	 * @private
+	 */
+	 _createStatics = () => {
+		if (this.isDestroyed) {
+			throw Error('this._createStatics is no longer valid. Entity has been destroyed.');
+		}
+		const staticsDefinitions = this.schema.entity.statics;
+		if (!_.isEmpty(staticsDefinitions)) {
+			_.each(staticsDefinitions, (value, key) => {
+				this[key] = value;
+			});
+		}
+	}
+
 	/**
 	 * Generates a new unique id and assigns it to this entity.
 	 */
@@ -1057,6 +1080,7 @@ class Entity extends EventEmitter {
 		this.getIdProperty().isTempId = false;
 		this._originalData = this._getReconstructedOriginalData();
 		this._originalDataParsed = this.getParsedValues();
+		this.markStaged(false);
 	}
 
 	/**
@@ -1102,6 +1126,24 @@ class Entity extends EventEmitter {
 		this.emit('undelete', this._proxy);
 	}
 
+	/**
+	 * Marks an entity as having been staged for saving.
+	 * @param {boolean} bool - How it should be marked. Defaults to true.
+	 */
+	markStaged = (bool = true) => {
+		if (this.isDestroyed) {
+			throw Error('this.markStaged is no longer valid. Entity has been destroyed.');
+		}
+		this.isStaged = bool;
+	}
+
+	/**
+	 * Convenience function.
+	 */
+	stage = () => {
+		this.markStaged(true);
+	}
+
 	/**
 	 * Destroy this object.
 	 * - Removes all circular references to parent objects

package/src/Repository/Ajax.js

@@ -834,6 +834,9 @@ class AjaxRepository extends Repository {
 	 * @private
 	 */
 	_finalizeSave = (promises) => {
+		if (!promises.length) {
+			return;
+		}
 		return this.axios.all(promises)
 						.then(this.axios.spread((...batchOperationResults) => {
 							// All requests are now complete

package/src/Repository/Repository.js

@@ -1135,52 +1135,120 @@ export default class Repository extends EventEmitter {
 
 	/**
 	 * Get all phantom (unsaved) Entities
+	 * @param {array} entities - Array of entities to filter. Optional. Defaults to this.entities
 	 * @return {Entity[]} Array of phantom Entities, or []
 	 */
-	getPhantom = () => {
+	getPhantom = (entities = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.getPhantom is no longer valid. Repository has been destroyed.');
 		}
-		return _.filter(this.entities, (entity) => entity.isPhantom);
+		if (!entities) {
+			entities = this.entities;
+		}
+		return _.filter(this.entities, entity => entity.isPhantom);
 	}
 
 	/**
 	 * Get all Entities not yet persisted to a storage medium
+	 * @param {array} entities - Array of entities to filter. Optional. Defaults to this.entities
 	 * @return {Entity[]} Array of dirty Entities, or []
 	 */
-	getNonPersisted = () => {
+	getNonPersisted = (entities = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.getDirty is no longer valid. Repository has been destroyed.');
 		}
-		return _.filter(this.entities, (entity) => {
-			return !entity.isPersisted;
-		});
+		if (!entities) {
+			entities = this.entities;
+		}
+		return _.filter(this.entities, entity => !entity.isPersisted);
 	}
 
 	/**
 	 * Get all dirty (having unsaved changes) Entities
+	 * @param {array} entities - Array of entities to filter. Optional. Defaults to this.entities
 	 * @return {Entity[]} Array of dirty Entities, or []
 	 */
-	getDirty = () => {
+	getDirty = (entities = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.getDirty is no longer valid. Repository has been destroyed.');
 		}
-		return _.filter(this.entities, (entity) => {
-			return entity.isDirty;
-		});
+		if (!entities) {
+			entities = this.entities;
+		}
+		return _.filter(entities, entity => entity.isDirty);
 	}
 
 	/**
 	 * Get all deleted Entities
+	 * @param {array} entities - Array of entities to filter. Optional. Defaults to this.entities
 	 * @return {Entity[]} Array of deleted Entities, or []
 	 */
-	getDeleted = () => {
+	getDeleted = (entities = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.getDeleted is no longer valid. Repository has been destroyed.');
 		}
-		return _.filter(this.entities, (entity) => {
-			return entity.isDeleted;
-		});
+		if (!entities) {
+			entities = this.entities;
+		}
+		return _.filter(entities, entity => entity.isDeleted);
+	}
+
+	/**
+	 * Get all staged Entities
+	 * @param {array} entities - Array of entities to filter. Optional. Defaults to this.entities
+	 * @return {Entity[]} Array of deleted Entities, or []
+	 */
+	getStaged = (entities = null) => {
+		if (this.isDestroyed) {
+			throw Error('this.getStaged is no longer valid. Repository has been destroyed.');
+		}
+		if (!entities) {
+			entities = this.entities;
+		}
+		return _.filter(entities, entity => entity.isStaged);
+	}
+
+	/**
+	 * Gets the Schema object
+	 * @return {Schema} schema
+	 */
+	getSchema = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getSchema is no longer valid. Entity has been destroyed.');
+		}
+		return this.schema;
+	}
+
+	/**
+	 * Gets the associated Repository
+	 * @param {string} repositoryName - Name of the Repository to retrieve
+	 * @return {boolean} hasProperty
+	 */
+	getAssociatedRepository = (repositoryName) => {
+		if (this.isDestroyed) {
+			throw Error('this.getAssociatedRepository is no longer valid. Entity has been destroyed.');
+		}
+
+		const schema = this.getSchema();
+		if (!schema.model.associations.hasOne.includes(repositoryName) &&
+			!schema.model.associations.hasMany.includes(repositoryName) &&
+			!schema.model.associations.belongsTo.includes(repositoryName) &&
+			!schema.model.associations.belongsToMany.includes(repositoryName)
+			) {
+			throw Error(repositoryName + ' is not associated with this schema');
+		}
+
+		const oneHatData = this.oneHatData;
+		if (!oneHatData) {
+			throw Error('No global oneHatData object');
+		}
+
+		const associatedRepository = oneHatData.getRepository(repositoryName);
+		if (!associatedRepository) {
+			throw Error('Repository ' + repositoryName + ' cannot be found');
+		}
+		
+		return associatedRepository;
 	}
 
 	/**
@@ -1263,6 +1331,13 @@ export default class Repository extends EventEmitter {
 		return this.isInRepository(id);
 	}
 
+	/**
+	 * Convenience function
+	 */
+	saveStaged = () => {
+		return this.save(null, true);
+	}
+
 	/**
 	 * Queues up batch operations for saving
 	 * new, edited, and deleted entities to storage medium.
@@ -1271,8 +1346,9 @@ export default class Repository extends EventEmitter {
 	 * this.entities until all operations have completed. We leave it to subclasses
 	 * to implement that.
 	 * @param {object} entity - Optional single entity to save (instead of doing a batch operation on everything)
+	 * @param {boolean} useStaged - Save only the staged items, not all
 	 */
-	save = async (entity = null) => {
+	save = async (entity = null, useStaged = false) => {
 		if (this.isDestroyed) {
 			throw Error('this.save is no longer valid. Repository has been destroyed.');
 		}
@@ -1315,11 +1391,16 @@ export default class Repository extends EventEmitter {
 				switch(operation) {
 					case 'add':
 						entities = this.getNonPersisted();
+						if (useStaged) {
+							entities = this.getStaged(entities);
+						}
 						if (_.size(entities) > 0) {
 							if (this.combineBatch) {
 
 								result = this.batchAsSynchronous ? await this._doBatchAdd(entities) : this._doBatchAdd(entities);
-								results.push(result);
+								if (result) {
+									results.push(result);
+								}
 		
 							} else {
 								for (i = 0; i < entities.length; i++) {
@@ -1332,18 +1413,25 @@ export default class Repository extends EventEmitter {
 									}
 	
 									result = this.batchAsSynchronous ? await this._doAdd(entity) : this._doAdd(entity);
-									results.push(result);
+									if (result) {
+										results.push(result);
+									}
 								}
 							}
 						}
 						break;
 					case 'edit':
 						entities = this.getDirty();
+						if (useStaged) {
+							entities = this.getStaged(entities);
+						}
 						if (_.size(entities) > 0) {
 							if (this.combineBatch) {
 
 								result = this.batchAsSynchronous ? await this._doBatchEdit(entities) : this._doBatchEdit(entities);
-								results.push(result);
+								if (result) {
+									results.push(result);
+								}
 
 							} else {
 								for (i = 0; i < entities.length; i++) {
@@ -1356,18 +1444,25 @@ export default class Repository extends EventEmitter {
 									}
 
 									result = this.batchAsSynchronous ? await this._doEdit(entity) : this._doEdit(entity);
-									results.push(result);
+									if (result) {
+										results.push(result);
+									}
 								}
 							}
 						}
 						break;
 					case 'delete':
 						entities = this.getDeleted();
+						if (useStaged) {
+							entities = this.getStaged(entities);
+						}
 						if (_.size(entities) > 0) {
 							if (this.combineBatch) {
 
 								result = this.batchAsSynchronous ? await this._doBatchDelete(entities) : this._doBatchDelete(entities);
-								results.push(result);
+								if (result) {
+									results.push(result);
+								}
 
 							} else {
 								for (i = 0; i < entities.length; i++) {
@@ -1378,7 +1473,9 @@ export default class Repository extends EventEmitter {
 									} else {
 										result = this.batchAsSynchronous ? await this._doDelete(entity) : this._doDelete(entity);
 									}
-									results.push(result);
+									if (result) {
+										results.push(result);
+									}
 								}
 							}
 						}
@@ -1520,7 +1617,7 @@ export default class Repository extends EventEmitter {
 	 * Mainly used for phantom Entities
 	 * Helper for delete()
 	 */
-	 removeEntity = async (entity) => {
+	removeEntity = async (entity) => {
 		this.entities = _.filter(this.entities, e => e !== entity);
 		entity.destroy();
 	}

package/src/Schema/Schema.js

@@ -100,6 +100,7 @@ export default class Schema extends EventEmitter {
 			
 			entity: {
 				methods: {}, // NOTE: Methods must be defined as "function() {}", not as "() => {}" so "this" will be assigned correctly
+				statics: {},
 			},
 
 			/**