@onehat/data 1.10.5 → 1.11.1

package/cypress/fixtures/Definitions/GroupsUsers.js

@@ -44,7 +44,7 @@ const GroupsUsers = {
 
 	repository: {
 		type: 'onebuild',
-		autoSave: false,
+		isAutoSave: false,
 	},
 
 };

package/cypress/integration/Async.spec.js

@@ -66,7 +66,7 @@ describe('Async playground', function() {
 
 	});
 
-	it.skip('autoLoad & autoSave', function() {
+	it.skip('isAutoLoad & isAutoSave', function() {
 
 		(async () => {
 			const oneHatData = new OneHatData();
@@ -83,8 +83,8 @@ describe('Async playground', function() {
 					},
 					repository: {
 						type: 'memory',
-						autoLoad: true,
-						autoSave: true,
+						isAutoLoad: true,
+						isAutoSave: true,
 						data: [
 							{ key: 1, value: 'one', },
 							{ key: 2, value: 'two', },
@@ -140,8 +140,8 @@ describe('Async playground', function() {
 				},
 				repository: {
 					type: 'memory',
-					autoLoad: false,
-					autoSave: false,
+					isAutoLoad: false,
+					isAutoSave: false,
 					data: [
 						{ key: 1, value: 'one', },
 						{ key: 2, value: 'two', },

package/cypress/integration/Entity.spec.js

@@ -112,25 +112,6 @@ describe('Entity', function() {
 			expect(_.isEqual(entity.getSubmitValues(), clone.getSubmitValues())).to.be.true;
 		});
 	
-		it.skip('duplicate', function() {
-			const entity = this.entity;
-
-			const duplicate = entity.duplicate();
-
-			expect(entity === duplicate).to.be.false;
-			expect(_.isEqual(entity.id, duplicate.id)).to.be.true;
-			expect(_.isEqual(entity.displayValue, duplicate.displayValue)).to.be.true;
-			expect(_.isEqual(entity.isDirty, duplicate.isDirty)).to.be.true;
-			expect(_.isEqual(entity.isPersisted, duplicate.isPersisted)).to.be.true;
-			expect(_.isEqual(entity.isDeleted, duplicate.isDeleted)).to.be.true;
-			expect(_.isEqual(entity._originalData, duplicate._originalData)).to.be.true;
-			expect(_.isEqual(entity.getOriginalData(), duplicate.getOriginalData())).to.be.true;
-			expect(_.isEqual(entity.getRawValues(), duplicate.getRawValues())).to.be.true;
-			expect(_.isEqual(entity.getParsedValues(), duplicate.getParsedValues())).to.be.true;
-			expect(_.isEqual(entity.getDisplayValues(), duplicate.getDisplayValues())).to.be.true;
-			expect(_.isEqual(entity.getSubmitValues(), duplicate.getSubmitValues())).to.be.true;
-		});
-	
 		it('_createProperties', function() {
 			const entity = this.entity;
 			expect(_.size(entity.properties)).to.be.eq(3);

package/cypress/integration/OneHatData.spec.js

@@ -465,16 +465,16 @@ describe('OneHatData', function() {
 				name: 'bar',
 				repository: {
 					type: 'lfr',
-					autoSync: true,
+					isAutoSync: true,
 					local: {
 						type: 'memory',
-						autoLoad: false,
+						isAutoLoad: false,
 						isRemote: false,
 						isLocal: true,
 					},
 					remote: {
 						type: 'memory',
-						autoLoad: false,
+						isAutoLoad: false,
 						isRemote: true, // hack
 						isLocal: false,
 					},

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

@@ -18,7 +18,7 @@ describe('OneBuildRepository', function() {
 		this.repository = new this.Repository({
 			id: 'foo',
 			schema: this.schema,
-			autoSave: false,
+			isAutoSave: false,
 		});
 		this.repository.initialize();
 		this.schema.setBoundRepository(this.repository);

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

@@ -44,7 +44,7 @@ describe('LocalFromRemote', function() {
 		this.repository = new this.Repository({
 			local,
 			remote,
-			autoSync: false,
+			isAutoSync: false,
 			retryRate: '+1 minute',
 		});
 		this.repository.initialize();
@@ -204,7 +204,7 @@ describe('LocalFromRemote', function() {
 					remote,
 					mode: MODE_COMMAND_QUEUE,
 					isOnline: false,
-					autoSync: false,
+					isAutoSync: false,
 					retryRate: '+1 minute',
 				});
 			

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

@@ -25,8 +25,8 @@ describe('Repository Base', function() {
 		this.repository = new this.Repository({
 			id: 'foo',
 			schema: this.schema,
-			autoLoad: true,
-			autoSave: true,
+			isAutoLoad: true,
+			isAutoSave: true,
 			isPaginated: true,
 			data: [
 				{ key: 1, value: 'one', },
@@ -142,9 +142,9 @@ describe('Repository Base', function() {
 		});
 
 		it('setAutoSave', function() {
-			expect(this.repository.autoSave).to.be.true;
+			expect(this.repository.isAutoSave).to.be.true;
 			this.repository.setAutoSave(false);
-			expect(this.repository.autoSave).to.be.false;
+			expect(this.repository.isAutoSave).to.be.false;
 		});
 
 	});
@@ -609,7 +609,7 @@ describe('Repository Base', function() {
 		})
 
 		it('add with an existing id', async function() {
-			this.repository.autoSave = false;
+			this.repository.isAutoSave = false;
 
 			// ID suppied; should not be temp ID or phantom
 			const entity = await this.repository.add({ key: 6, value: 'six' });

package/package.json

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

package/src/Entity.js

@@ -338,28 +338,6 @@ class Entity extends EventEmitter {
 		return clone;
 	}
 
-	/**
-	 * Duplicates this Entity and inserts the copy into the Repository.
-	 * @return {object} Entity - The clone
-	 * @memberOf Entity
-	 */
-	duplicate = () => {
-		let duplicate;
-		if (this.repository) {
-			duplicate = this.repository.add(this.rawData, false);
-		}
-		// const duplicate = new Entity(this.schema, this._originalData, this.repository);
-		// duplicate.initialize();
-		// if (this.isDirty) {
-		// 	duplicate.setValues( this.getRawValues() );
-		// }
-		// duplicate.isPersisted = false;
-		// duplicate.id = newId;
-		// duplicate.isDeleted = false;
-
-		return duplicate;
-	}
-
 	/**
 	 * Resets the Entity to a state as if it had just been created,
 	 * Gets data to restore from _originalData.
@@ -1275,7 +1253,7 @@ class Entity extends EventEmitter {
 
 	/**
 	 * Marks a deleted entity as undeleted.
-	 * Only works when autoSave is off for the containing repository
+	 * Only works when isAutoSave is off for the containing repository
 	 * @fires delete
 	 */
 	undelete = () => {
@@ -1286,8 +1264,8 @@ class Entity extends EventEmitter {
 			throw Error('this.undelete is no longer valid. Entity has been destroyed.');
 		}
 		const repository = this.getRepository();
-		if (repository && repository.autoSave) {
-			throw Error('Cannot undelete entities on an autoSave repository.');
+		if (repository && repository.isAutoSave) {
+			throw Error('Cannot undelete entities on an isAutoSave repository.');
 		}
 		this.markDeleted(false);
 		this.emit('undelete', this._proxy);

package/src/Repository/Ajax.js

@@ -186,7 +186,7 @@ class AjaxRepository extends Repository {
 		}
 
 		// Sorting
-		if (this.autoSort) {
+		if (this.isAutoSort) {
 			if (!this.sorters.length) {
 				this.sorters = this.getDefaultSorters(); // Need this here, because _setInitialQueryParams() runs before this.load() in super.initialize()
 			}

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -94,9 +94,9 @@ class LocalFromRemoteRepository extends EventEmitter {
 			mode: MODE_LOCAL_MIRROR,
 
 			/**
-			 * @member {boolean} autoSync - Whether to auto sync this repository on initialization
+			 * @member {boolean} isAutoSync - Whether to auto sync this repository on initialization
 			 */
-			autoSync: false,
+			isAutoSync: false,
 
 			/**
 			 * @member {string} syncRate - Interval with which to sync local with remote.
@@ -201,7 +201,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 			this.registerCommands(commands);
 		}
 
-		if (this.autoSync) {
+		if (this.isAutoSync) {
 			this._doAutoSync();
 		}
 	}
@@ -302,14 +302,14 @@ class LocalFromRemoteRepository extends EventEmitter {
 		
 					// Load remote data into local
 					// Local <-- Remote
-					if (!this.remote.autoLoad) {
+					if (!this.remote.isAutoLoad) {
 						await this.remote.load();
 					}
 
 					remoteData = this.remote.getOriginalData();
 					await this.local.load(remoteData);
 
-					if (!this.local.autoSave) {
+					if (!this.local.isAutoSave) {
 						await this.local.save();
 					}
 					
@@ -334,7 +334,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 
 						// local --> remote
 						const remoteItem = await this.remote.add(localItem.getOriginalData());
-						if (!this.remote.autoSave) {
+						if (!this.remote.isAutoSave) {
 							await this.remote.save();
 						}
 	
@@ -369,14 +369,14 @@ class LocalFromRemoteRepository extends EventEmitter {
 
 					// Load remote data into local
 					// Local <-- Remote
-					if (!this.remote.autoLoad) {
+					if (!this.remote.isAutoLoad) {
 						await this.remote.load();
 					}
 
 					remoteData = this.remote.getOriginalData();
 					await this.local.load(remoteData);
 
-					if (!this.local.autoSave) {
+					if (!this.local.isAutoSave) {
 						await this.local.save();
 					}
 					
@@ -572,12 +572,12 @@ class LocalFromRemoteRepository extends EventEmitter {
 	/**
 	 * Sets autoSync. If autoSync is enabled, it immediately starts autosync process.
 	 */
-	setAutoSync = async (autoSync) => {
+	setAutoSync = async (isAutoSync) => {
 		let isChanged = false
-		if (this.autoSync !== autoSync) {
+		if (this.isAutoSync !== isAutoSync) {
 			isChanged = true;
-			this.autoSync = autoSync;
-			if (autoSync) {
+			this.isAutoSync = isAutoSync;
+			if (isAutoSync) {
 				await this._doAutoSync();
 			} else {
 				clearTimeout(this._timeout);
@@ -595,11 +595,11 @@ class LocalFromRemoteRepository extends EventEmitter {
 	}
 
 	/**
-	 * Sets isOnline. If isOnline and autoSync is enabled, it immediately starts autosync process.
+	 * Sets isOnline. If isOnline and autoSync is enabled, it immediately starts isAutosync process.
 	 */
 	setIsOnline = (isOnline) => {
 		this.isOnline = !!isOnline; // force convert type to boolean
-		if (isOnline && this.autoSync) {
+		if (isOnline && this.isAutoSync) {
 			this._doAutoSync();
 		}
 	}

package/src/Repository/Memory.js

@@ -21,9 +21,9 @@ class MemoryRepository extends Repository {
 
 		const defaults = {
 			isLocal: true,
-			autoSort: true,
-			autoLoad: true,
-			autoSave: true,
+			isAutoSort: true,
+			isAutoLoad: true,
+			isAutoSave: true,
 		};
 		_.merge(this, defaults, config);
 	}

package/src/Repository/OneBuild.js

@@ -31,8 +31,8 @@ class OneBuildRepository extends AjaxRepository {
 
 		const defaults = {
 
-			autoLoad: false,
-			autoSave: true,
+			isAutoLoad: false,
+			isAutoSave: true,
 
 			api: {
 				get: this.name + '/get',
@@ -163,7 +163,7 @@ class OneBuildRepository extends AjaxRepository {
 			}
 		});
 
-		if (this.isLoaded && this.autoLoad) {
+		if (this.isLoaded && this.isAutoLoad) {
 			return this.reload();
 		}
 	}
@@ -183,7 +183,7 @@ class OneBuildRepository extends AjaxRepository {
 			this.setBaseParam('order', sorterStrings.join(','));
 		}
 		
-		if (this.isLoaded && this.autoLoad) {
+		if (this.isLoaded && this.isAutoLoad) {
 			return this.reload().then(() => {
 				this.emit('changeSorters');
 			});

package/src/Repository/Repository.js

@@ -46,19 +46,19 @@ export default class Repository extends EventEmitter {
 			name: schema.name,
 
 			/**
-			 * @member {boolean} autoLoad - Whether to immediately load this repository's data on instantiation
+			 * @member {boolean} isAutoLoad - Whether to immediately load this repository's data on instantiation
 			 */
-			autoLoad: false,
+			isAutoLoad: false,
 
 			/**
-			 * @member {boolean} autoSave - Whether to automatically save entity changes to permanent storage
+			 * @member {boolean} isAutoSave - Whether to automatically save entity changes to permanent storage
 			 */
-			autoSave: false,
+			isAutoSave: false,
 
 			/**
-			 * @member {boolean} autoSort - Whether to automatically sort entities in permanent storage
+			 * @member {boolean} isAutoSort - Whether to automatically sort entities in permanent storage
 			 */
-			autoSort: true,
+			isAutoSort: true,
 
 			/**
 			 * @member {boolean} isLocal - Whether this Repository saves its data to local permanent storage
@@ -253,22 +253,22 @@ export default class Repository extends EventEmitter {
 	 */
 	async initialize() {
 		// Create default sorters if none supplied
-		if (this.autoSort && !this.sorters.length) {
+		if (this.isAutoSort && !this.sorters.length) {
 			this.sorters = this.getDefaultSorters();
 		}
 		
 		// Assign event handlers
 		this.on('entity_change', async (entity) => { // Entity changed its value
-			if (this.autoSave) {
+			if (this.isAutoSave) {
 				return await this.save(entity);
 			}
 		});
 
 		// Auto load & sort
-		if (this.autoLoad) {
+		if (this.isAutoLoad) {
 			await this.load();
 		}
-		if (!this.isSorted && this.autoSort && !this.isRemoteSort) { // load may have sorted, in which case this will be skipped.
+		if (!this.isSorted && this.isAutoSort && !this.isRemoteSort) { // load may have sorted, in which case this will be skipped.
 			await this.sort();
 		}
 
@@ -365,25 +365,25 @@ export default class Repository extends EventEmitter {
 	}
 
 	/**
-	 * Sets the autoSave setting of this Repository
-	 * @param {boolean} autoSave
+	 * Sets the isAutoSave setting of this Repository
+	 * @param {boolean} isAutoSave
 	 */
-	setAutoSave = (autoSave) => {
+	setAutoSave = (isAutoSave) => {
 		if (this.isDestroyed) {
 			throw Error('this.setAutoSave is no longer valid. Repository has been destroyed.');
 		}
-		this.autoSave = autoSave
+		this.isAutoSave = isAutoSave
 	}
 
 	/**
-	 * Sets the autoLoad setting of this Repository
-	 * @param {boolean} autoLoad
+	 * Sets the isAutoLoad setting of this Repository
+	 * @param {boolean} isAutoLoad
 	 */
-	setAutoLoad = (autoLoad) => {
+	setAutoLoad = (isAutoLoad) => {
 		if (this.isDestroyed) {
 			throw Error('this.setAutoLoad is no longer valid. Repository has been destroyed.');
 		}
-		this.autoLoad = autoLoad
+		this.isAutoLoad = isAutoLoad
 	}
 
 
@@ -937,7 +937,7 @@ export default class Repository extends EventEmitter {
 			if (this.isInRepository(data[idProperty])) {
 				const existing = this.getById(data[idProperty]);
 				existing.setRawValues(data);
-				if (this.autoSave && !existing.isPersisted) {
+				if (this.isAutoSave && !existing.isPersisted) {
 					await this.save(existing);
 				}
 				return existing;
@@ -959,7 +959,7 @@ export default class Repository extends EventEmitter {
 
 		this.emit('add', entity);
 
-		if (this.autoSave && !entity.isPersisted) {
+		if (this.isAutoSave && !entity.isPersisted) {
 			await this.save(entity);
 		}
 
@@ -1728,7 +1728,7 @@ export default class Repository extends EventEmitter {
 
 		this.emit('delete', entities);
 
-		if (this.autoSave) {
+		if (this.isAutoSave) {
 			await this.save();
 		}
 	}

package/src/Util/Formatters.js

@@ -78,7 +78,7 @@ class Formatters {
 				return moment(date).format(format);
 			}
 		}
-		return '';
+		return null;
 	}
 
 	static FormatDateTime = (value, format = 'MMM DD, YYYY HH:mm:ss') => {
@@ -94,7 +94,7 @@ class Formatters {
 				return moment(date).format(format);
 			}
 		}
-		return '';
+		return null;
 	}
 
 	static FormatTime = (value) => {
@@ -111,7 +111,7 @@ class Formatters {
 				return moment(date).format(format);
 			}
 		}
-		return '';
+		return null;
 	}
 
 	static FormatHours = (value) => {