@onehat/data 1.7.2 → 1.7.3

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

@@ -63,6 +63,43 @@ describe('Repository Base', function() {
 			})
 			expect(repository.id).to.be.not.eq('foo');
 		});
+
+		it('_createMethods', async function() {
+
+			// There is no test method by default
+			expect(this.repository.testMethod).to.not.exist;
+
+			// Set up custom repository with testMethod
+			const schema1 = new Schema({
+					name: 'baz',
+					model: {
+						idProperty: 'key',
+						displayProperty: 'value',
+						properties: [
+							{ name: 'key', type: 'int' },
+							{ name: 'value' },
+						],
+					},
+					repository: {
+						type: 'null',
+						methods: {
+							testMethod: function() {
+								this.bar = 'test me';
+							},
+						},
+					},
+				}),
+				repository = new this.Repository({
+					schema: schema1,
+					data: [],
+				});
+			await repository.initialize();
+			schema1.setBoundRepository(repository);
+
+			// Perform testMethod test
+			repository.testMethod();
+			expect(repository.bar).to.be.eq('test me');
+		});
 	});
 
 	describe('loading', function() {

package/package.json

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

package/src/Entity.js

@@ -165,12 +165,11 @@ class Entity extends EventEmitter {
 			throw Error('this._createMethods is no longer valid. Entity has been destroyed.');
 		}
 		const methodDefinitions = this.schema.entity.methods;
-		if (_.isEmpty(methodDefinitions)) {
-			return;
+		if (!_.isEmpty(methodDefinitions)) {
+			_.each(methodDefinitions, (method, name) => {
+				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
+			});
 		}
-		_.each(methodDefinitions, (method, name) => {
-			this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
-		});
 	}
 
 	/**

package/src/Repository/Ajax.js

@@ -238,9 +238,10 @@ class AjaxRepository extends Repository {
 			matches = name.match(re),
 			paramsToChange = isBaseParam ? this._baseParams : this._params;
 		
+		let first, second;
 		if (matches) { // name has array notation like 'conditions[username]'
-			const first = matches[1],
-				second = matches[2];
+			first = matches[1],
+			second = matches[2];
 			if (paramsToChange && !paramsToChange.hasOwnProperty(first)) {
 				paramsToChange[first] = [];
 			}

package/src/Repository/Repository.js

@@ -265,10 +265,28 @@ export default class Repository extends EventEmitter {
 			await this.sort();
 		}
 
+		this._createMethods();
+
 		this.isInitialized = true;
 		this.emit('initialize');
 	}
 
+	/**
+	 * Creates the methods for this Repository, based on Schema.
+	 * @private
+	 */
+	_createMethods = () => {
+		if (this.isDestroyed) {
+			throw Error('this._createMethods is no longer valid. Repository has been destroyed.');
+		}
+		const methodDefinitions = this.schema.repository.methods;
+		if (!_.isEmpty(methodDefinitions)) {
+			_.each(methodDefinitions, (method, name) => {
+				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
+			});
+		}
+	}
+
 
 	//     __                    __
 	//    / /   ____  ____ _____/ /