@onehat/data 1.8.6 → 1.8.9

package/package.json

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

package/src/OneHatData.js

@@ -50,6 +50,12 @@ export class OneHatData extends EventEmitter {
 		 * @private
 		 */
 		this.repositories = {};
+
+		/**
+		 * @member {Object} uniqueRepositoriesMap - Object map of all unique Repositories, with signature of { mapName: id }
+		 * @private
+		 */
+		this.uniqueRepositoriesMap = {};
 		
 		/**
 		 * @member {boolean} isDestroyed - Whether this object has been destroyed
@@ -442,6 +448,34 @@ export class OneHatData extends EventEmitter {
 		return schema.getBoundRepository();
 	}
 
+	/**
+	 * Gets or creates a unique repository with the supplied schemaName and name
+	 * @param {string} schemaName - Name of Schema
+	 * @param {string} mapName - Name of unique repository (will be internally mapped to an id)
+	 * @return {Repository} repository
+	 */
+	getOrCreateUniqueRepository = async (mapName, schemaName) => {
+		if (this.isDestroyed) {
+			throw new Error('this.getUniqueRepository is no longer valid. OneHatData has been destroyed.');
+		}
+		
+		// Try to get it
+		const id = this.uniqueRepositoriesMap[mapName];
+		if (id) {
+			return this.getRepositoryById(id);
+		}
+
+		// Try to create it
+		const schema = this.getSchema(schemaName);
+		if (!schema) {
+			return null;
+		}
+
+		const repository = await this.createRepository(schemaName);
+		this.uniqueRepositoriesMap[mapName] = repository.id;
+		return repository;
+	}
+
 	/**
 	 * Checks whether the requested bound Repository exists.
 	 * @param {string} name - Name of Schema

package/src/Repository/Ajax.js

@@ -357,9 +357,10 @@ class AjaxRepository extends Repository {
 	 * Loads data into the Repository.
 	 * This loads only a single page of data.
 	 * @param {object} params - Params to send to server
+	 * @param {function} callback - Function to call after loading is complete
 	 * @fires beforeLoad,changeData,load,error
 	 */
-	load = async (params) => {
+	load = async (params, callback = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.load is no longer valid. Repository has been destroyed.');
 		}
@@ -417,6 +418,10 @@ class AjaxRepository extends Repository {
 
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
+
+						if (callback) {
+							callback(this.entities);
+						}
 					})
 					.finally(() => {
 						this.isLoading = false;
@@ -426,10 +431,11 @@ class AjaxRepository extends Repository {
 	/**
 	 * Reload a single entity from storage. 
 	 * If the entity is in the internal representation, update it.
+	 * @param {function} callback - Function to call after loading is complete
 	 * @returns {entity} The newly updated entity
 	 * @fires reloadEntity,beforeLoad,changeData,load,error
 	 */
-	reloadEntity = async (entity) => {
+	reloadEntity = async (entity, callback = null) => {
 		if (this.isDestroyed) {
 			throw Error('this.reloadEntity is no longer valid. Repository has been destroyed.');
 		}
@@ -470,6 +476,10 @@ class AjaxRepository extends Repository {
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
 						this.emit('reloadEntity', entity);
+
+						if (callback) {
+							callback(entity);
+						}
 					})
 					.finally(() => {
 						this.isLoading = false;

package/src/Repository/OneBuild.js

@@ -163,7 +163,7 @@ class OneBuildRepository extends AjaxRepository {
 			}
 		});
 
-		if (this.isLoaded) {
+		if (this.isLoaded && this.autoLoad) {
 			return this.reload();
 		}
 	}
@@ -183,7 +183,7 @@ class OneBuildRepository extends AjaxRepository {
 			this.setBaseParam('order', sorterStrings.join(','));
 		}
 		
-		if (this.isLoaded) {
+		if (this.isLoaded && this.autoLoad) {
 			return this.reload();
 		}
 	}