@onehat/data 1.19.26 → 1.19.28

package/package.json

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

package/src/Entity/Entity.js

@@ -602,9 +602,6 @@ class Entity extends EventEmitter {
 	 * @return {object} values
 	 */
 	get submitValues() {
-		if (this.isDestroyed) {
-			throw Error('this.submitValues is no longer valid. Entity has been destroyed.');
-		}
 		return this.getSubmitValues();
 	}
 
@@ -632,9 +629,6 @@ class Entity extends EventEmitter {
 	 * @return {object} values
 	 */
 	get submitValuesMapped() {
-		if (this.isDestroyed) {
-			throw Error('this.submitValuesMapped is no longer valid. Entity has been destroyed.');
-		}
 		return this.getSubmitValuesMapped();
 	}
 
@@ -645,7 +639,7 @@ class Entity extends EventEmitter {
 	 */
 	getDisplayValues = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSubmitValues is no longer valid. Entity has been destroyed.');
+			throw Error('this.getDisplayValues is no longer valid. Entity has been destroyed.');
 		}
 		let propertyValues = {};
 		_.forOwn(this.properties, (property) => {
@@ -659,9 +653,6 @@ class Entity extends EventEmitter {
 	 * @return {object} values
 	 */
 	get displayValues() {
-		if (this.isDestroyed) {
-			throw Error('this.displayValues is no longer valid. Entity has been destroyed.');
-		}
 		return this.getDisplayValues();
 	}
 
@@ -686,9 +677,6 @@ class Entity extends EventEmitter {
 	 * @return {object} values
 	 */
 	get rawValues() {
-		if (this.isDestroyed) {
-			throw Error('this.rawValues is no longer valid. Entity has been destroyed.');
-		}
 		return this.getRawValues();
 	}
 
@@ -713,9 +701,6 @@ class Entity extends EventEmitter {
 	 * @return {object} values
 	 */
 	get parsedRawValues() {
-		if (this.isDestroyed) {
-			throw Error('this.parsedRawValues is no longer valid. Entity has been destroyed.');
-		}
 		return this.getParsedRawValues();
 	}
 
@@ -726,7 +711,7 @@ class Entity extends EventEmitter {
 	 */
 	getParsedValues = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSubmitValues is no longer valid. Entity has been destroyed.');
+			throw Error('this.getParsedValues is no longer valid. Entity has been destroyed.');
 		}
 		let propertyValues = {};
 		_.forOwn(this.properties, (property) => {
@@ -740,9 +725,6 @@ class Entity extends EventEmitter {
 	 * @return {object} values
 	 */
 	get parsedValues() {
-		if (this.isDestroyed) {
-			throw Error('this.parsedValues is no longer valid. Entity has been destroyed.');
-		}
 		return this.getParsedValues();
 	}
 

package/src/Integration/ReactNative/useOneHatData.js

@@ -33,6 +33,7 @@ export default function useOneHatData(schemaName, uniqueRepository = false) {
 
 			if (uniqueRepository) {
 				repository = await oneHatData.createRepository(schemaName);
+				repository.isUnique = true;
 			} else if (_.isObject(schemaName)) {
 				if (schemaName.id) {
 					repository = oneHatData.getRepositoryById(schemaName.id);

package/src/OneHatData.js

@@ -487,6 +487,7 @@ export class OneHatData extends EventEmitter {
 			const id = uuid();
 			clone.name = clone.name + '-' + id;
 			clone.id = id;
+			clone.isUnique = true;
 			return clone;
 		}
 		return schema.getBoundRepository();
@@ -517,6 +518,7 @@ export class OneHatData extends EventEmitter {
 
 		const repository = await this.createRepository(schemaName);
 		this.uniqueRepositoriesMap[mapName] = repository.id;
+		repository.isUnique = true;
 		return repository;
 	}
 

package/src/Repository/Memory.js

@@ -331,6 +331,11 @@ class MemoryRepository extends Repository {
 						passedAll = false;
 						return false; // break the forEach loop
 					}
+				} else if (!_.isNil(filter.fn)) {
+					if (!filter.fn(entity)) {
+						passedAll = false;
+						return false; // break the forEach loop
+					}
 				} else {
 					const { name, value } = filter,
 						property = entity.getProperty(name);

package/src/Repository/Offline.js

@@ -175,7 +175,7 @@ class OfflineRepository extends MemoryRepository {
 		let storageResult;
 		try {
 			storageResult = await this._storageSetValue(entity.id, entity.getOriginalData());
-			this._addToIndex(entity.id);
+			await this._addToIndex(entity.id);
 		} catch (e) {
 			// Revert to clone
 			delete this._keyedEntities[entity.id];
@@ -236,7 +236,7 @@ class OfflineRepository extends MemoryRepository {
 		let storageResult;
 		try {
 			storageResult = await this._storageDeleteValue(entity.id);
-			this._deleteFromIndex(entity.id);
+			await this._deleteFromIndex(entity.id);
 		} catch (e) {
 			// Revert to clone
 			this._keyedEntities[clone.id] = clone;

package/src/Repository/Repository.js

@@ -47,6 +47,11 @@ export default class Repository extends EventEmitter {
 			 */
 			name: schema.name,
 
+			/**
+			 * @member {boolean} isUnique - Whether this repository is classified as 'unique'
+			 */
+			isUnique: false,
+
 			/**
 			 * @member {boolean} isAutoLoad - Whether to immediately load this repository's data on instantiation
 			 */
@@ -611,10 +616,6 @@ export default class Repository extends EventEmitter {
 	 * @member {boolean} hasFilters - Whether or not any filters are applied
 	 */
 	get hasFilters() {
-		if (this.isDestroyed) {
-			this.throwError('this.hasFilters is no longer valid. Repository has been destroyed.');
-			return;
-		}
 		return this.filters.length > 0;
 	}
 
@@ -622,9 +623,7 @@ export default class Repository extends EventEmitter {
 		if (!this.hasFilters) {
 			return false;
 		}
-		const found = _.find(this.filters, (filter) => {
-			return filter.name === name;
-		});
+		const found = _.find(this.filters, (filter) => filter.name === name);
 		return !!found;
 	}
 
@@ -697,14 +696,14 @@ export default class Repository extends EventEmitter {
 		// Set up new filters
 		let filters = clearFirst ? 
 						[] : // Clear existing filters
-						_.map(this.filters, filter => filter); // Add to or modify existing filters. Work with a copy, so we can detect changes in _setFilters
+						_.clone(this.filters); // so we can detect changes in _setFilters
 		
 		_.each(newFilters, (newFilter) => {
 
 			let deleteExisting = false,
 				addNew = true;
 
-			if (!_.isFunction(newFilter)) {
+			if (!_.isFunction(newFilter) && _.isNil(newFilter.fn)) {
 				if (_.isNil(newFilter.value)) {
 					deleteExisting = true;
 					addNew = false;