@onehat/data 1.6.1 → 1.6.3

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

@@ -685,6 +685,11 @@ describe('Repository Base', function() {
 
 	describe('deleting', function() {
 
+		it('clear', function() {
+			this.repository.clear();
+			expect(this.repository.entities.length).to.be.eq(0);
+		});
+
 		it('delete', function() {
 			let didFire = false;
 			this.repository.on('delete', () => {
@@ -698,6 +703,13 @@ describe('Repository Base', function() {
 			expect(didFire).to.be.true;
 		});
 
+		it('delete() / removeEntity', async function() {
+			this.repository.setAutoSave(false);
+			const entity = await this.repository.add({ value: 'six' });
+			this.repository.delete(entity);
+			expect(this.repository.entities.length).to.be.eq(5);
+		});
+
 
 		// I'm going to skip these, as they're just combinations of other, tested functions
 		// deleteByIx

package/package.json

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

package/src/Repository/Ajax.js

@@ -678,15 +678,6 @@ class AjaxRepository extends Repository {
 			}));
 	}
 
-	/**
-	 * Deletes all locally cached entities in repository,
-	 * usually, the current "page".
-	 * Does not actually affect anything on the server.
-	 */
-	clear = async () => {
-		this._destroyEntities();
-	}
-
 }
 
 AjaxRepository.className = 'Ajax';

package/src/Repository/Repository.js

@@ -972,6 +972,15 @@ export default class Repository extends EventEmitter {
 		this.entities = [];
 	}
 
+	/**
+	 * Deletes all locally cached entities in repository,
+	 * usually, the current "page".
+	 * Does not actually affect anything on the server.
+	 */
+	clear = async () => {
+		this._destroyEntities();
+	}
+
 	/**
 	 * Gets an array of "submit" values objects for the entities
 	 * @return {array} map - 
@@ -1365,7 +1374,7 @@ export default class Repository extends EventEmitter {
 	
 	/**
 	 * Marks entities for deletion from storage medium.
-	 * Actual deletion takes place in save()
+	 * Actual deletion takes place in save(), unless isPhantom
 	 * @param {object|array} entities - one or more entities to delete
 	 * @fires delete
 	 */
@@ -1381,7 +1390,12 @@ export default class Repository extends EventEmitter {
 			return;
 		}
 		_.each(entities, (entity) => {
-			entity.markDeleted(); // Entity is still there, it's just marked for deletion
+			if (entity.isPhantom) {
+				// Just auto-remove it. Don't bother saving to storage medium.
+				this.removeEntity(entity);
+			} else {
+				entity.markDeleted(); // Entity is still there, it's just marked for deletion
+			}
 		});
 
 		this.emit('delete', entities);
@@ -1391,6 +1405,16 @@ export default class Repository extends EventEmitter {
 		}
 	}
 
+	/**
+	 * Removes an Entity from the current page
+	 * Mainly used for phantom Entities
+	 * Helper for delete()
+	 */
+	 removeEntity = async (entity) => {
+		 this.entities = _.filter(this.entities, e => e !== entity);
+		 entity.destroy();
+	}
+
 	/**
 	 * Deletes a single Entity by its index (zero-indexed) on the current page
 	 * @param {integer} ix - Index