@onehat/data 1.20.9 → 1.21.1

package/src/Repository/Ajax.js

@@ -187,7 +187,7 @@ class AjaxRepository extends Repository {
 	 * Helper for initialize
 	 * Sets the query params for initial loading
 	 */
-	_setInitialQueryParams = () => {
+	_setInitialQueryParams() {
 		// Pagination
 		if (this.isPaginated) {
 			this._onChangePagination();
@@ -215,7 +215,7 @@ class AjaxRepository extends Repository {
 	 * @param {any} value - Param value to set.
 	 * @param {boolean} isBaseParam - Whether param is a base param (to be sent on every request).
 	 */
-	setParam = (name, value, isBaseParam = false) => {
+	setParam(name, value, isBaseParam = false) {
 		const re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
 			paramsToChange = isBaseParam ? this._baseParams : this._params;
@@ -246,7 +246,7 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name to set.
 	 * @param {boolean} isBaseParam - Whether param is a base param (to be sent on every request).
 	 */
-	setValuelessParam = (name, isBaseParam = false) => {
+	setValuelessParam(name, isBaseParam = false) {
 		const re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
 			paramsToChange = isBaseParam ? this._baseParams : this._params;
@@ -272,9 +272,10 @@ class AjaxRepository extends Repository {
 	 * Sets query params
 	 * @param {object} params - Params to set. Key is parameter name, value is parameter value
 	 */
-	setParams = (params) => {
+	setParams(params) {
+		const oThis = this;
 		_.each(params, (value, name) => {
-			this.setParam(name, value);
+			oThis.setParam(name, value);
 		});
 	}
 
@@ -282,7 +283,7 @@ class AjaxRepository extends Repository {
 	 * Determines if base query param exists
 	 * @param {string} name - Param name
 	 */
-	hasBaseParam = (name) => {
+	hasBaseParam(name) {
 		return this._baseParams.hasOwnProperty(name);
 	}
 
@@ -290,7 +291,7 @@ class AjaxRepository extends Repository {
 	 * Determines if query param exists
 	 * @param {string} name - Param name
 	 */
-	hasParam = (name) => {
+	hasParam(name) {
 		return this._params.hasOwnProperty(name);
 	}
 
@@ -299,7 +300,7 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name to set.
 	 * @param {any} value - Param value to set.
 	 */
-	setBaseParam = (name, value) => {
+	setBaseParam(name, value) {
 		this.setParam(name, value, true);
 	}
 
@@ -307,9 +308,10 @@ class AjaxRepository extends Repository {
 	 * Sets base query params. These params are sent on every request.
 	 * @param {object} params - Base params to set. Key is parameter name, value is parameter value
 	 */
-	setBaseParams = (params) => {
+	setBaseParams(params) {
+		const oThis = this;
 		_.each(params, (value, name) => {
-			this.setBaseParam(name, value);
+			oThis.setBaseParam(name, value);
 		});
 	}
 
@@ -318,7 +320,7 @@ class AjaxRepository extends Repository {
 	 * *Not intended for normal usage,* but rather for testing.
 	 * @param {boolean} reload - Whether to reload repository. Defaults to false.
 	 */
-	clearParams = (reload = false, clearBase = false) => {
+	clearParams(reload = false, clearBase = false) {
 		this._params = {};
 		if (clearBase) {
 			this._baseParams = {};
@@ -333,7 +335,7 @@ class AjaxRepository extends Repository {
 	 * Only one sorter is allowed with this Repository type.
 	 * Refreshes entities.
 	 */
-	_onChangeSorters = () => {
+	_onChangeSorters() {
 		const sorter = this.sorters[0];
 		this.setBaseParam(this.paramSort, sorter.name);
 		this.setBaseParam(this.paramDirection, sorter.direction);
@@ -347,9 +349,10 @@ class AjaxRepository extends Repository {
 	 * Sets filter params.
 	 * Refreshes entities.
 	 */
-	_onChangeFilters = () => {
+	_onChangeFilters() {
+		const oThis = this;
 		_.each(this.filters, (value, name) => {
-			this.setParam(name, value);
+			oThis.setParam(name, value);
 		});
 
 		if (this.isLoaded && !this.eventsPaused) {
@@ -361,7 +364,7 @@ class AjaxRepository extends Repository {
 	 * Sets pagination params.
 	 * Refreshes entities.
 	 */
-	_onChangePagination = () => {
+	_onChangePagination() {
 		this.setBaseParam(this.paramPageNum, this.isPaginated ? this.page : null);
 		this.setBaseParam(this.paramPageSize, this.isPaginated ? this.pageSize : null);
 
@@ -384,7 +387,7 @@ class AjaxRepository extends Repository {
 	 * @param {function} callback - Function to call after loading is complete
 	 * @fires beforeLoad,changeData,load,error
 	 */
-	load = async (params, callback = null) => {
+	async load(params, callback = null) {
 		if (this.isTree && this.loadRootNodes) {
 			return this.loadRootNodes();
 		}
@@ -437,11 +440,12 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 
+						const oThis = this;
 						if (this.isShowingMore) {
 							// Add to the current entities
 							const newEntities = _.map(root, (data) => {
-								const entity = Repository._createEntity(this.schema, data, repository, true);
-								this._relayEntityEvents(entity);
+								const entity = Repository._createEntity(oThis.schema, data, repository, true);
+								oThis._relayEntityEvents(entity);
 								return entity;
 							});
 							this.entities = this.entities.concat(newEntities);
@@ -449,8 +453,8 @@ class AjaxRepository extends Repository {
 							// Replace the current entities
 							this._destroyEntities();
 							this.entities = _.map(root, (data) => {
-								const entity = Repository._createEntity(this.schema, data, repository, true);
-								this._relayEntityEvents(entity);
+								const entity = Repository._createEntity(oThis.schema, data, repository, true);
+								oThis._relayEntityEvents(entity);
 								return entity;
 							});
 						}
@@ -476,7 +480,7 @@ class AjaxRepository extends Repository {
 					});
 	}
 
-	showMore = (params = {}, callback) => {
+	showMore(params = {}, callback) {
 		params.showMore = true;
 		return this.load(params, callback);
 	}
@@ -560,7 +564,7 @@ class AjaxRepository extends Repository {
 	 * Helper for save.
 	 * @private
 	 */
-	_onBeforeSave = () => {
+	_onBeforeSave() {
 		this._operations = {
 			add: false,
 			edit: false,
@@ -961,7 +965,7 @@ class AjaxRepository extends Repository {
 	 * Fires off axios request to server
 	 * @private
 	 */
-	_send = (method, url, data) => {
+	_send(method, url, data) {
 
 		if (!url) {
 			this.throwError('No url submitted');
@@ -1013,7 +1017,7 @@ class AjaxRepository extends Repository {
 	 * @fires error
 	 * @private
 	 */
-	_processServerResponse = (result) => {
+	_processServerResponse(result) {
 		return this.reader.read(result);
 	}
 
@@ -1022,7 +1026,7 @@ class AjaxRepository extends Repository {
 	 * This is mainly used to sort isPhantom entities,
 	 * since the server normally sorts, and they haven't yet gone to server.
 	 */
-	sortInMemory = () => {
+	sortInMemory() {
 		const sorters = this.sorters;
 		let sortNames = [],
 			sortDirections = [];
@@ -1043,7 +1047,7 @@ class AjaxRepository extends Repository {
 	 * @fires save, changeData
 	 * @private
 	 */
-	_finalizeSave = (promises) => {
+	_finalizeSave(promises) {
 		if (!promises.length) {
 			return;
 		}
@@ -1066,9 +1070,10 @@ class AjaxRepository extends Repository {
 									}
 									if (this._operations.deletePhantom) {
 										// sweep existing deleted records and remove them
+										const oThis = this;
 										_.each(this.entities, (entity) => {
 											if (entity.isDeleted && entity.isDestroyed) {
-												this.removeEntity(entity);
+												oThis.removeEntity(entity);
 											}
 										})
 									}
@@ -1081,7 +1086,7 @@ class AjaxRepository extends Repository {
 						}));
 	}
 
-	setIsOnline = (isOnline) => {
+	setIsOnline(isOnline) {
 		this.isOnline = !!isOnline; // force convert type to boolean
 	}
 

package/src/Repository/LocalFromRemote/Command.js

@@ -35,7 +35,7 @@ export default class Command extends EventEmitter {
 	 * Register a handler for this command.
 	 * @param {function} handler - The event handler
 	 */
-	registerHandler = (handler) => {
+	registerHandler(handler) {
 		this.on('handleServerResponse', handler);
 	}
 
@@ -43,7 +43,7 @@ export default class Command extends EventEmitter {
 	 * Register a handler for this command.
 	 * @param {function} handler - The event handler
 	 */
-	unregisterHandler = (handler) => {
+	unregisterHandler(handler) {
 		this.off('handleServerResponse', handler);
 	}
 
@@ -51,7 +51,7 @@ export default class Command extends EventEmitter {
 	 * Detect whether this command has any handlers.
 	 * @return {int} count - Number of handlers this command has
 	 */
-	hasHandlers = () => {
+	hasHandlers() {
 		return this.listenerCount('handleServerResponse');
 	}
 
@@ -59,7 +59,7 @@ export default class Command extends EventEmitter {
 	 * Convenience function to invoke handlers
 	 * @return {boolean} results - Results of running all handlers
 	 */
-	processResponse = async (entity) => {
+	async processResponse(entity) {
 		return await this.emitAsync('handleServerResponse', entity);
 	}
 
@@ -68,7 +68,7 @@ export default class Command extends EventEmitter {
 	 * - Removes event listeners
 	 * @fires destroy
 	 */
-	destroy = () => {
+	destroy() {
 		this.emit('destroy');
 		this.isDestroyed = true;
 		

package/src/Repository/LocalFromRemote/CommandRepository.js

@@ -29,7 +29,7 @@ class CommandRepository extends OneBuildRepository {
 	 * Override Ajax._finalizeSave because we *don't* want to automatically
 	 * reload after the save.
 	 */
-	_finalizeSave = (promises) => {
+	_finalizeSave(promises) {
 		return this.axios.all(promises);
 	}
 

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -214,10 +214,11 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Registers multiple commands for when syncing in MODE_COMMAND_QUEUE mode.
 	 */
-	registerCommands = (commands) => {
+	registerCommands(commands) {
+		const oThis = this;
 		_.each(commands, (name) => {
-			if (!this.isRegisteredCommand(name)) {
-				this.commands[name] = new Command(name);
+			if (!oThis.isRegisteredCommand(name)) {
+				oThis.commands[name] = new Command(name);
 			}
 		});
 	}
@@ -227,7 +228,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * @param {string} name - The command name
 	 * @return {function} handler - The handler function
 	 */
-	registerCommandHandler = (name, handler) => {
+	registerCommandHandler(name, handler) {
 		const command = this.getCommand(name);
 		if (!command) {
 			return false;
@@ -242,7 +243,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * @param {string} name - The command name
 	 * @return {function} handler - The handler function
 	 */
-	unregisterCommandHandler = (name, handler) => {
+	unregisterCommandHandler(name, handler) {
 		const command = this.getCommand(name);
 		if (!command) {
 			return false;
@@ -256,7 +257,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * @param {string} name - The command name
 	 * @return {boolean} isRegisteredCommand
 	 */
-	isRegisteredCommand = (name) => {
+	isRegisteredCommand(name) {
 		return _.indexOf(this.commands, name) !== -1;
 	}
 
@@ -265,7 +266,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * @param {string} name - The command name
 	 * @return {boolean} isRegisteredCommand
 	 */
-	getCommand = (name) => {
+	getCommand(name) {
 		return this.commands[name] || null;
 	}
 
@@ -273,7 +274,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * Adds a hook into the normal Repository.add() method,
 	 * so we can sync immediately after add for MODE_COMMAND_QUEUE mode.
 	 */
-	add = async (data) => {
+	async add(data) {
 		// NORMAL PROCESS, basically call super()
 		// This adds to the local repository, so we can sync later,
 		// if needed.
@@ -289,7 +290,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Syncs local and remote repositories, based on operation mode.
 	 */
-	sync = async (entity, callback = null) => {
+	async sync(entity, callback = null) {
 
 		if (this.debugMode) {
 			console.log('sync');
@@ -433,7 +434,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * if isRetry, we are retrying to sync, due to being offline.
 	 * This will schedule the next sync based on nextRetryDate.
 	 */
-	_doAutoSync = async (isRetry = false) => {
+	async _doAutoSync(isRetry = false) {
 
 		const now = moment(),
 			nowMs = now.valueOf();
@@ -496,7 +497,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * Gets lastSync from private variable, 
 	 * or from local storage medium, if possible.
 	 */
-	getLastSync = async () => {
+	async getLastSync() {
 		if (!this.lastSync && this.local.getLastSync) {
 			const lastSync = await this.local.getLastSync();
 			// const lastSync = null;
@@ -511,7 +512,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	 * Sets lastSync to now and saves to local storage medium, if possible.
 	 * @private
 	 */
-	_setLastSync = async () => {
+	async _setLastSync() {
 		const now = moment();
 		this.lastSync = now;
 		if (this.local.setLastSync) {
@@ -519,7 +520,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 		}
 	};
 
-	getNextRetry = () => {
+	getNextRetry() {
 		const date = moment().relativeTime(this.retryRate);
 		if (!isNaN(date) && date.isValid()) {
 			return date;
@@ -527,7 +528,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 		return null;
 	}
 
-	getNextSync = () => {
+	getNextSync() {
 		const oneMinuteAgo = moment().relativeTime('-1 minute');
 		if (!this.lastSync) {
 			return oneMinuteAgo;
@@ -584,7 +585,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Sets autoSync. If autoSync is enabled, it immediately starts autosync process.
 	 */
-	setAutoSync = async (isAutoSync) => {
+	async setAutoSync(isAutoSync) {
 		let isChanged = false
 		if (this.isAutoSync !== isAutoSync) {
 			isChanged = true;
@@ -601,7 +602,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Sets options on the repositories.
 	 */
-	setOptions = (options) => {
+	setOptions(options) {
 		this.local.setOptions(options);
 		this.remote.setOptions(options);
 	}
@@ -609,7 +610,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Sets isOnline. If isOnline and autoSync is enabled, it immediately starts isAutosync process.
 	 */
-	setIsOnline = (isOnline) => {
+	setIsOnline(isOnline) {
 		this.isOnline = !!isOnline; // force convert type to boolean
 		if (isOnline && this.isAutoSync) {
 			this._doAutoSync();

package/src/Repository/Memory.js

@@ -89,7 +89,7 @@ class MemoryRepository extends Repository {
 	 * @param {array} data - Optional array of rawData or entities 
 	 * to load. If null, data will be loaded from storage medium.
 	 */
-	load = async (data = null) => {
+	async load(data = null) {
 		
 		if (this.isDestroyed) {
 			this.throwError('this.load is no longer valid. Repository has been destroyed.');
@@ -127,18 +127,19 @@ class MemoryRepository extends Repository {
 		const repository = this;
 		if (!_.isEmpty(data) && !(data[0] instanceof Entity)) {
 			entities = _.map(data, (dataRow) => {
-				const entity = Repository._createEntity(this.schema, dataRow, repository, true);
-				this._relayEntityEvents(entity);
+				const entity = Repository._createEntity(repository.schema, dataRow, repository, true);
+				repository._relayEntityEvents(entity);
 				return entity;
 			});
 		}
 		
 		// Add to internal store
+		const oThis = this;
 		_.each(entities, (entity) => {
 			if (entity.isPhantom) {
 				entity.createTempId();
 			}
-			this._keyedEntities[entity.id] = entity;
+			oThis._keyedEntities[entity.id] = entity;
 		});
 
 		if (isDirectLoad && this._saveToStorage) {
@@ -158,7 +159,7 @@ class MemoryRepository extends Repository {
 	 * This is mainly used for subclasses of MemoryRepository.
 	 * @return {array} data - Array of rawData objects
 	 */
-	_loadFromStorage = async () => {
+	async _loadFromStorage() {
 		return this.data || []; // this.data may have come from initial config of Repository
 	}
 
@@ -175,7 +176,7 @@ class MemoryRepository extends Repository {
 	 * Override base Repository, just return the entity from storage
 	 * @abstract
 	 */
-	reloadEntity = async (entity) => {
+	async reloadEntity(entity) {
 		const reloadedEntity = this.getById(entity.id);
 		reloadedEntity.emit('reload', reloadedEntity);
 
@@ -199,7 +200,7 @@ class MemoryRepository extends Repository {
 	 * Internally applies all sorters
 	 * @private
 	 */
-	_applySorters = () => {
+	_applySorters() {
 		if (this.isDestroyed) {
 			this.throwError('this._applySorters is no longer valid. Repository has been destroyed.');
 			return;
@@ -252,7 +253,7 @@ class MemoryRepository extends Repository {
 	 * @private
 	 * @static
 	 */
-	static _getNatSort = (sorter) => {
+	static _getNatSort(sorter) {
 		const
 			name = sorter.name,
 			direction = sorter.direction.toUpperCase();
@@ -276,7 +277,7 @@ class MemoryRepository extends Repository {
 	 * @private
 	 * @static
 	 */
-	static _getCompareFunction = (sorter) => {
+	static _getCompareFunction(sorter) {
 		const
 			name = sorter.name,
 			direction = sorter.direction.toUpperCase();
@@ -309,7 +310,7 @@ class MemoryRepository extends Repository {
 	 * @fires changeFilter
 	 * @private
 	 */
-	_applyFilters = () => {
+	_applyFilters() {
 		if (this.isDestroyed) {
 			this.throwError('this._applyFilters is no longer valid. Repository has been destroyed.');
 			return;
@@ -399,7 +400,7 @@ class MemoryRepository extends Repository {
 	 * @return {string} id
 	 * @private
 	 */
-	_generateUniqueId = () => {
+	_generateUniqueId() {
 		let isUnique = false,
 			id;
 		while(!isUnique) {
@@ -458,7 +459,7 @@ class MemoryRepository extends Repository {
 	/**
 	 * Deletes all entities in repository
 	 */
-	deleteAll = async () => {
+	async deleteAll() {
 		const entities = _.map(this._keyedEntities, entity => entity);
 		await this.delete(entities);
 	}
@@ -467,7 +468,7 @@ class MemoryRepository extends Repository {
 	 * Get an entity directly from its id.
 	 * @return {object} entity
 	 */
-	getById = (id) => {
+	getById(id) {
 		if (this.isDestroyed) {
 			this.throwError('this.getById is no longer valid. Repository has been destroyed.');
 			return;
@@ -481,7 +482,7 @@ class MemoryRepository extends Repository {
 	 * @param {integer} id - id of record to retrieve
 	 * @return {integer} The numerical index, or undefined
 	 */
-	getIxById = (id) => {
+	getIxById(id) {
 		if (this.isDestroyed) {
 			this.throwError('this.getIxById is no longer valid. Repository has been destroyed.');
 			return;
@@ -499,7 +500,7 @@ class MemoryRepository extends Repository {
 	 * all *active* Entities, with sorting and filtering applied.
 	 * @return {array} Entities that passed through filter
 	 */
-	getEntities = () => {
+	getEntities() {
 		if (this.isDestroyed) {
 			this.throwError('this.getEntities is no longer valid. Repository has been destroyed.');
 			return;
@@ -512,7 +513,7 @@ class MemoryRepository extends Repository {
 	 * Get an array of all Entities
 	 * @return {Entity[]} Entities that passed through filter
 	 * /
-	getAllData = () => {
+	getAllData() {
 		if (this.isDestroyed) {
 			this.throwError('this.getAllData is no longer valid. Repository has been destroyed.');
 			return;
@@ -550,7 +551,7 @@ class MemoryRepository extends Repository {
 	 * @return {array} entities - The slice of entities
 	 * @private
 	 */
-	_paginate = (entities) => {
+	_paginate(entities) {
 		if (this.isDestroyed) {
 			this.throwError('this._paginate is no longer valid. Repository has been destroyed.');
 			return;
@@ -575,7 +576,7 @@ class MemoryRepository extends Repository {
 	 * @fires changeData
 	 * @private
 	 */
-	_recalculate = () => {
+	_recalculate() {
 		if (this.isDestroyed) {
 			this.throwError('this._recalculate is no longer valid. Repository has been destroyed.');
 			return;
@@ -609,7 +610,7 @@ class MemoryRepository extends Repository {
 	}
 
 
-	_insertBefore = (newEntity, entity = null) => {
+	_insertBefore(newEntity, entity = null) {
 		throw Error('Not yet implemented');
 	}
 
@@ -618,7 +619,7 @@ class MemoryRepository extends Repository {
 	 * before any sorting or filtering is applied.
 	 * @return {integer} count - The total number of unsorted, unfiltered entities
 	 */
-	getGrandTotal = () => {
+	getGrandTotal() {
 		if (this.isDestroyed) {
 			this.throwError('this.getGrandTotal is no longer valid. Repository has been destroyed.');
 			return;
@@ -633,7 +634,7 @@ class MemoryRepository extends Repository {
 	 * Otherwise, this is equal to the 
 	 * @return {integer} count - The total number of unsorted, unfiltered entities
 	 */
-	_getActiveEntities = () => {
+	_getActiveEntities() {
 		if (this.isDestroyed) {
 			this.throwError('this._getActiveEntities is no longer valid. Repository has been destroyed.');
 			return;

package/src/Repository/Null.js

@@ -41,7 +41,7 @@ class NullRepository extends Repository {
 	 * @param {object} data - Data to immediately load
 	 * @fires load
 	 */
-	load = (data = this.data) => {
+	load(data = this.data) {
 		if (this.isDestroyed) {
 			this.throwError('this.load is no longer valid. Repository has been destroyed.');
 			return;
@@ -54,8 +54,8 @@ class NullRepository extends Repository {
 			if (data[0] instanceof Entity === false) {
 				const repository = this;
 				entities = _.map(data, (item) => {
-					const entity = Repository._createEntity(this.schema, item, repository, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(repository.schema, item, repository, true);
+					repository._relayEntityEvents(entity);
 					return entity;
 				});
 			}
@@ -75,7 +75,7 @@ class NullRepository extends Repository {
 	 * Helper for load().
 	 * @private
 	 */
-	_updateSize = () => {
+	_updateSize() {
 		this.total = _.size(this.entities);
 	}
 
@@ -118,7 +118,7 @@ class NullRepository extends Repository {
 		return true;
 	}
 
-	_doDeleteNonPersisted = (entity) => {
+	_doDeleteNonPersisted(entity) {
 		return this._doDelete(entity);
 	}