@onehat/data 1.8.30 → 1.8.32

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/cypress/integration/Schema.spec.js

@@ -25,9 +25,9 @@ describe('Schema', function() {
 		expect(_.isEqual(clone._originalConfig, this.schema._originalConfig)).to.be.true;
 	});
 
-	it('getProperty', function() {
-		const property = this.schema.getProperty('groups_users__id');
-		expect(_.isEqual(property.name, 'groups_users__id')).to.be.true;
+	it('getPropertyDefinition', function() {
+		const propertyDefinition = this.schema.getPropertyDefinition('groups_users__id');
+		expect(_.isEqual(propertyDefinition.name, 'groups_users__id')).to.be.true;
 	});
 
 });

package/package.json

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

package/src/Repository/Memory.js

@@ -429,6 +429,27 @@ class MemoryRepository extends Repository {
 	}
 	/* */
 
+	/**
+	 * 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
@@ -564,9 +585,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/Schema/Schema.js

@@ -59,7 +59,7 @@ export default class Schema extends EventEmitter {
 				displayProperty: null,
 
 				/**
-				 * @member {array} propertyDefinitions - Array of Property definition objects
+				 * @member {array} properties - Array of Property definition objects
 				 */
 				properties: [],
 
@@ -183,20 +183,20 @@ export default class Schema extends EventEmitter {
 
 	/**
 	 * Gets a single Property definition by name,
-	 * @param {string} propertyName - Name of the Property to retrieve
-	 * @return {object} property - The named Property
+	 * @param {string} propertyName - Name of the property definition to retrieve
+	 * @return {object} propertyDefinition - The property definition
 	 */
-	getProperty = (propertyName) => {
+	getPropertyDefinition = (propertyName) => {
 		if (this.isDestroyed) {
-			throw Error('this.getProperty is no longer valid. Schema has been destroyed.');
+			throw Error('this.getPropertyDefinition is no longer valid. Schema has been destroyed.');
 		}
-		const property = _.find(this.model.properties, (propertyDefinition) => {
+		const propertyDefinition = _.find(this.model.properties, (propertyDefinition) => {
 			return propertyDefinition.name === propertyName;
 		});
-		if (!property) {
-			throw new Error('Property ' + propertyName + ' not found. Are you sure you initialized this Entity?');
+		if (!propertyDefinition) {
+			throw new Error('Property definition ' + propertyName + ' not found.');
 		}
-		return property;
+		return propertyDefinition;
 	}
 
 	/**