@onehat/data 1.10.3 → 1.10.5

package/cypress/integration/Entity.spec.js

@@ -112,6 +112,25 @@ 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

@@ -8,9 +8,9 @@ import KeyValues from '../../src/Schema/KeyValues.js';
 
 // NOTE: Cypress can't handle async functions for beforeEach,
 // so we have to manually apply it to every test. Ugh!
-async function beforeEach() {
-	this.oneHatData = new OneHatData();
-	this.schema = this.oneHatData.createSchema({
+async function beforeEach(that) {
+	that.oneHatData = new OneHatData();
+	that.schema = that.oneHatData.createSchema({
 		name: 'bar',
 		model: {
 			idProperty: 'key',
@@ -22,14 +22,14 @@ async function beforeEach() {
 		},
 		repository: 'memory',
 	});
-	await this.oneHatData.createRepository({
+	await that.oneHatData.createRepository({
 		id: 'foo',
-		schema: this.schema,
+		schema: that.schema,
 	}, true);
-	this.repository = this.oneHatData.getRepositoryById('foo');
+	that.repository = that.oneHatData.getRepositoryById('foo');
 }
-function afterEach() {
-	window.oneHatData.destroy();
+function afterEach(that) {
+	that.oneHatData.destroy();
 }
 
 describe('OneHatData', function() {
@@ -250,15 +250,30 @@ describe('OneHatData', function() {
 
 	it('getRepository', function() {
 		(async function() {
+
 			await beforeEach();
 
-			const result = this.oneHatData.getRepository('bar');
-			expect(result).to.be.eq(this.repository);
+			const result = that.oneHatData.getRepository('bar');
+			expect(result).to.be.eq(that.repository);
 
 			afterEach();
 		})();
 	});
 
+	it('getUniqueRepository', function() {
+		(async () => {
+			const that = {};
+			await beforeEach(that);
+
+			const
+				repo1 = that.oneHatData.getRepository('bar'),
+				repo2 = that.oneHatData.getRepository('bar', true);
+			expect(repo1 !== repo2).to.be.true;
+
+			afterEach(that);
+		})();
+	});
+
 	it('getRepositoriesBy', function() {
 		(async function() {
 			await beforeEach();
@@ -345,7 +360,6 @@ describe('OneHatData', function() {
 
 	it('isEntity', async function() {
 		(async function() {
-			debugger;
 			await beforeEach();
 			const oneHatData = this.oneHatData;
 			const repository = oneHatData.getRepository('bar');

package/package.json

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

package/src/Entity.js

@@ -23,7 +23,7 @@ import _ from 'lodash';
  * - entity.getPropertySubmitValue('users__last_name');
  * 
  * @extends EventEmitter
- * @fires ['change', 'reset', 'save', 'delete', 'destroy']
+ * @fires ['change', 'changeValidity', 'reset', 'reload', 'save', 'delete', 'undelete', 'destroy']
  */
 class Entity extends EventEmitter {
 
@@ -322,7 +322,7 @@ class Entity extends EventEmitter {
 	}
 
 	/**
-	 * Clones this Entity in its current state.
+	 * Creates an exact copy of this Entity in its current state.
 	 * @return {object} Entity - The clone
 	 * @memberOf Entity
 	 */
@@ -338,6 +338,28 @@ 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.

package/src/OneHatData.js

@@ -12,6 +12,9 @@ import {
 	default as Schema,
 	CoreSchemas,
 } from './Schema/index.js';
+import {
+	v4 as uuid,
+} from 'uuid';
 import _ from 'lodash';
 
 /**
@@ -443,7 +446,7 @@ export class OneHatData extends EventEmitter {
 	 * @param {string} name - Name of Schema
 	 * @return {Repository} repository
 	 */
-	getRepository = (name) => {
+	getRepository = (name, unique = false) => {
 		if (this.isDestroyed) {
 			throw new Error('this.getRepository is no longer valid. OneHatData has been destroyed.');
 		}
@@ -451,6 +454,16 @@ export class OneHatData extends EventEmitter {
 		if (!schema) {
 			return null;
 		}
+		if (unique) {
+			const
+				repoToClone = schema.getBoundRepository(),
+				clone = _.cloneDeep(repoToClone);
+			
+			const id = uuid();
+			clone.name = clone.name + '-' + id;
+			clone.id = id;
+			return clone;
+		}
 		return schema.getBoundRepository();
 	}
 

package/src/Property/Property.js

@@ -8,7 +8,7 @@ import _ from 'lodash';
  * This class should not be instantiated directly.
  * Rather, instantiate a subclass, like StringProperty
  * @extends EventEmitter
- * @fires ['change', 'destroy']
+ * @fires ['change', 'changeValidity', 'destroy']
  */
 export default class Property extends EventEmitter {
 

package/src/Repository/OneBuild.js

@@ -184,7 +184,11 @@ class OneBuildRepository extends AjaxRepository {
 		}
 		
 		if (this.isLoaded && this.autoLoad) {
-			return this.reload();
+			return this.reload().then(() => {
+				this.emit('changeSorters');
+			});
+		} else {
+			this.emit('changeSorters');
 		}
 	}
 

package/src/Repository/Repository.js

@@ -528,10 +528,10 @@ export default class Repository extends EventEmitter {
 			});
 
 			this.sorters = sorters;
-			this.emit('changeSorters');
 			if (this._onChangeSorters) {
 				return this._onChangeSorters();
 			}
+			this.emit('changeSorters');
 		}
 		return isChanged;
 	}