@onehat/data 1.8.31 → 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/cypress/integration/Repository/Memory.spec.js

@@ -8,6 +8,12 @@ describe('MemoryRepository', function() {
 			model: {
 				idProperty: 'key',
 				displayProperty: 'value',
+				sorters: [
+					{
+						name: 'key',
+						direction: 'ASC',
+					},
+				],
 				properties: [
 					{ name: 'key', type: 'int' },
 					{ name: 'value' },
@@ -19,6 +25,7 @@ describe('MemoryRepository', function() {
 			id: 'foo',
 			schema: this.schema,
 			isPaginated: true,
+			isSorted: true,
 			data: [
 				{ key: 1, value: 'one', },
 				{ key: 2, value: 'two', },
@@ -148,11 +155,19 @@ describe('MemoryRepository', function() {
 	
 			// setPageSize
 			this.repository.setPageSize(2);
+			this.repository.setPage(2);
 			expect(this.repository.pageTotal).to.be.eq(2);
+			let entitiesOnPage = this.repository.getEntitiesOnPage();
+			expect(_.size(entitiesOnPage)).to.be.eq(2);
+
+			expect(entitiesOnPage[0].id).to.be.eq(3);
+			expect(entitiesOnPage[1].id).to.be.eq(4);
 	
 			// setPage
 			this.repository.setPage(3);
 			expect(this.repository.pageTotal).to.be.eq(1);
+			entitiesOnPage = this.repository.getEntitiesOnPage();
+			expect(_.size(entitiesOnPage)).to.be.eq(1);
 	
 			// prevPage
 			this.repository.prevPage();
@@ -206,7 +221,7 @@ describe('MemoryRepository', function() {
 			const result = this.repository.getFirstBy((entity) => {
 				return entity.id > 2;
 			});
-			expect(result.id).to.be.eq(5);
+			expect(result.id).to.be.eq(3);
 		});
 
 		it('Repository.* retrieve methods, after delete/add', async function() {
@@ -465,9 +480,13 @@ describe('MemoryRepository', function() {
 
 	});
 
-	it('toString', function() {
-		const str = this.repository.toString();
-		expect(str).to.be.eq('MemoryRepository {bar} - foo');
+	describe('toString', function() {
+
+		it('toString', function() {
+			const str = this.repository.toString();
+			expect(str).to.be.eq('MemoryRepository {bar} - foo');
+		});
+
 	});
 
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.8.31",
+	"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,13 +417,13 @@ 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();
 	}
@@ -564,9 +564,6 @@ class MemoryRepository extends Repository {
 
 	destroy() {
 		// objects associated with this RepositoryType
-		_.each(this._keyedEntities, (entity) => {
-			entity.destroy();
-		})
 		this._keyedEntities = null;
 		this._unsortedEntities = null;
 		this._filteredEntities = null;

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