@onehat/data 1.8.32 → 1.8.34

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

@@ -210,6 +210,19 @@ describe('MemoryRepository', function() {
 			expect(result.value).to.be.eq('four');
 		});
 
+		it.only('getIxById', function() {
+			this.repository.setPage(1);
+			this.repository.setPageSize(2);
+			let ix = this.repository.getIxById(1);
+			expect(ix).to.be.eq(0);
+
+			ix = this.repository.getIxById(2);
+			expect(ix).to.be.eq(1);
+
+			ix = this.repository.getIxById(3);
+			expect(ix).to.be.undefined;
+		});
+
 		it('getBy', function() {
 			const results = this.repository.getBy((entity) => {
 				return entity.id > 2;

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

@@ -652,6 +652,14 @@ describe('Repository Base', function() {
 			expect(result.value).to.be.eq('three');
 		});
 
+		it('getIxById', function() {
+			let ix = this.repository.getIxById(1);
+			expect(ix).to.be.eq(0);
+
+			ix = this.repository.getIxById(3);
+			expect(ix).to.be.eq(2);
+		});
+
 		it('getBy', function() {
 			const result = this.repository.getBy(entity => entity.id === 2 || entity.id === 3);
 			expect(result.length).to.be.eq(2);

package/package.json

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

package/src/Repository/Memory.js

@@ -417,36 +417,33 @@ class MemoryRepository extends Repository {
 	}
 
 	/**
-	 * Get an array of all active Entities,
-	 * with sorting and filtering applied.
-	 * @return {array} Entities that passed through filter
+	 * Get a single Entity's index by its id.
+	 * Overrides Repository method, to limite results to only the current page.
+	 * @param {integer} id - id of record to retrieve
+	 * @return {integer} The numerical index, or undefined
 	 */
-	getEntities = () => {
+	getIxById = (id) => {
 		if (this.isDestroyed) {
-			throw Error('this.getAll is no longer valid. Repository has been destroyed.');
+			throw Error('this.getIxById is no longer valid. Repository has been destroyed.');
 		}
-		return this._getActiveEntities();
+
+		const ix = this.getEntitiesOnPage().findIndex((entity) => entity.id === id);
+		if (ix >= 0) {
+			return ix;
+		}
+		return undefined;
 	}
-	/* */
 
 	/**
-	 * Get an array of all active Entities on current page,
-	 * 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
 	 */
-	getEntitiesOnPage = () => {
+	getEntities = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getPagedEntities is no longer valid. Repository has been destroyed.');
+			throw Error('this.getEntities 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);
+		return this._getActiveEntities();
 	}
 	/* */
 

package/src/Repository/Repository.js

@@ -1166,6 +1166,23 @@ export default class Repository extends EventEmitter {
 		return this.getFirstBy(entity => entity.id === id);
 	}
 
+	/**
+	 * Get a single Entity's index by its id.
+	 * @param {integer} id - id of record to retrieve
+	 * @return {integer} The numerical index, or undefined
+	 */
+	getIxById = (id) => {
+		if (this.isDestroyed) {
+			throw Error('this.getIxById is no longer valid. Repository has been destroyed.');
+		}
+
+		const ix = this.entities.findIndex((entity) => entity.id === id);
+		if (ix >= 0) {
+			return ix;
+		}
+		return undefined;
+	}
+
 	/**
 	 * Get an array of Entities by supplied filter function
 	 * @param {function} filter - Filter function to apply to all entities
@@ -1224,6 +1241,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