@onehat/data 1.6.4 → 1.6.5

package/cypress/integration/Schema.spec.js

@@ -10,8 +10,9 @@ describe('Schema', function() {
 	it('schema is valid', function() {
 		expect(this.schema instanceof Schema).to.be.true;
 		expect(this.schema.name).to.be.eq('GroupsUsers');
-		expect(this.schema.repository.type).to.be.eq('onebuild');
+		expect(this.schema.model.associations.hasOne).to.be.an('array');
 		expect(this.schema.entity.methods.testMethod).to.be.a('function');
+		expect(this.schema.repository.type).to.be.eq('onebuild');
 	});
 
 	it('clone', function() {

package/package.json

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

package/src/Entity.js

@@ -851,6 +851,31 @@ class Entity extends EventEmitter {
 		return this._originalData;
 	}
 
+	/**
+	 * Gets the associated Repository
+	 * @param {string} repositoryName - Name of the Repository to retrieve
+	 * @return {boolean} hasProperty
+	 */
+	getAssociatedRepository = (repositoryName) => {
+		if (this.isDestroyed) {
+			throw Error('this.getAssociatedRepository is no longer valid. Entity has been destroyed.');
+		}
+
+		const schema = this.getSchema();
+		if (!schema.associations.hasOne.includes(repositoryName) &&
+			!schema.associations.hasMany.includes(repositoryName) &&
+			!schema.associations.belongsTo.includes(repositoryName) &&
+			!schema.associations.belongsToMany.includes(repositoryName)
+			) {
+			throw Error(repositoryName + ' is not associated with ' + this.getRepository().name);
+		}
+		const repository = this.getRepository();
+		if (!repository.oneHatData) {
+			throw Error('No global oneHatData object');
+		}
+		return repository.oneHatData.getRepository(repositoryName);
+	}
+
 
 
 	//    _____      __  __

package/src/OneHatData.js

@@ -254,8 +254,8 @@ export class OneHatData extends EventEmitter {
 			}
 
 			// Apply the general config settings to each specific one
-			const localConfig = _.assign({}, generalConfig, config.local),
-				remoteConfig = _.assign({}, generalConfig, config.remote);
+			const localConfig = _.merge({}, generalConfig, config.local),
+				remoteConfig = _.merge({}, generalConfig, config.remote);
 			
 			// Actually create the local and remote repositories
 			config.local = await this.createRepository(localConfig);
@@ -263,7 +263,7 @@ export class OneHatData extends EventEmitter {
 		}
 
 		const Repository = this._repositoryTypes[config.type],
-			repository = new Repository(config);
+			repository = new Repository(config, this);
 		await repository.initialize();
 		
 		return repository;

package/src/Repository/Ajax.js

@@ -370,7 +370,7 @@ class AjaxRepository extends Repository {
 		}
 
 		const repository = this;
-		const data = _.assign({}, this._baseParams, this._params);
+		const data = _.merge({}, this._baseParams, this._params);
 		
 		return this._send(this.methods.get, this.api.get, data)
 					.then(result => {

package/src/Repository/Repository.js

@@ -23,7 +23,7 @@ export default class Repository extends EventEmitter {
 	 * - name {string} - Optional. Defaults to schema.name
 	 * - schema - Schema object
 	 */
-	constructor(config = {}) {
+	constructor(config = {}, oneHatData = null) {
 		super(...arguments);
 		
 		const { schema } = config;
@@ -214,6 +214,11 @@ export default class Repository extends EventEmitter {
 		 */
 		this.isDestroyed = false;
 
+		/**
+		 * @member {boolean} oneHatData - The global @onehat/data object
+		 */
+		this.oneHatData = oneHatData;
+
 		this.registerEvents([
 			'add',
 			'beforeSave',

package/src/Schema/Schema.js

@@ -109,7 +109,7 @@ export default class Schema extends EventEmitter {
 
 		};
 
-		this._originalConfig = _.assign({}, defaults, config);
+		this._originalConfig = _.merge({}, defaults, config);
 		_.merge(this, this._originalConfig);
 
 		/**