@onehat/data 1.10.2 → 1.10.4

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.only('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.2",
+	"version": "1.10.4",
 	"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 {
 

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/Memory.js

@@ -253,8 +253,11 @@ class MemoryRepository extends Repository {
 	static _getNatSort = (sorter) => {
 		const
 			name = sorter.name,
-			direction = sorter.direction.toUpperCase(),
-			sortFn = natsort.default({ desc: direction !== 'ASC', });
+			direction = sorter.direction.toUpperCase();
+	
+		const ns = natsort.default || natsort; // When imported into cypress, natsort has default, when in React Native, it doesn't.
+
+		const sortFn = ns({ desc: direction !== 'ASC', });
 		return (entity1, entity2) => {
 			const
 				a = entity1[name],