@onehat/data 1.8.32 → 1.8.33

package/cypress/integration/Entity.spec.js

@@ -39,8 +39,12 @@ describe('Entity', function() {
 	});
 
 	afterEach(function() {
-		this.entity.destroy();
-		this.schema.destroy();
+		if (!this.entity.isDestroyed) {
+			this.entity.destroy();
+		}
+		if (!this.schema.isDestroyed) {
+			this.schema.destroy();
+		}
 	});
 
 	describe('constructor', function() {

package/package.json

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

package/src/Repository/Memory.js

@@ -417,39 +417,18 @@ class MemoryRepository extends Repository {
 	}
 
 	/**
-	 * Get an array of all active Entities,
-	 * with sorting and filtering applied.
+	 * Override Repository.getEntities, so we can get an array of 
+	 * all *active* Entities, with sorting and filtering applied.
 	 * @return {array} Entities that passed through filter
 	 */
 	getEntities = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getAll is no longer valid. Repository has been destroyed.');
+			throw Error('this.getEntities is no longer valid. Repository has been destroyed.');
 		}
 		return this._getActiveEntities();
 	}
 	/* */
 
-	/**
-	 * Get an array of all active Entities on current page,
-	 * with sorting and filtering applied.
-	 * @return {array} Entities that passed through filter
-	 */
-	getEntitiesOnPage = () => {
-		if (this.isDestroyed) {
-			throw Error('this.getPagedEntities is no longer valid. Repository has been destroyed.');
-		}
-		const entities = this.getEntities();
-		if (!this.isPaginated) {
-			return entities;
-		}
-		const
-			pageIx = this.page -1, // zero-indexed page#
-			start = pageIx * this.pageSize,
-			end = start + this.pageSize;
-		return entities.slice(start, end);
-	}
-	/* */
-
 	/**
 	 * Get an array of all Entities
 	 * @return {Entity[]} Entities that passed through filter

package/src/Repository/Repository.js

@@ -1224,6 +1224,41 @@ export default class Repository extends EventEmitter {
 		return _.filter(this.entities, entity => !entity.isPersisted);
 	}
 
+	/**
+	 * Get an array of all Entities.
+	 * Can be overridden by subclasses.
+	 * @return {array} Entities that passed through filter
+	 */
+	getEntities = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getEntities is no longer valid. Repository has been destroyed.');
+		}
+		return this.entities;
+	}
+	/* */
+
+	/**
+	 * Get an array of all Entities on current page,
+	 * which for the base Repository, means all entities.
+	 * Subclasses may change this behavior.
+	 * @return {array} Entities
+	 */
+	getEntitiesOnPage = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getPagedEntities is no longer valid. Repository has been destroyed.');
+		}
+		const entities = this.getEntities();
+		if (!this.isPaginated) {
+			return entities;
+		}
+		const
+			pageIx = this.page -1, // zero-indexed page#
+			start = pageIx * this.pageSize,
+			end = start + this.pageSize;
+		return entities.slice(start, end);
+	}
+	/* */
+
 	/**
 	 * Get all dirty (having unsaved changes) Entities
 	 * @param {array} entities - Array of entities to filter. Optional. Defaults to this.entities