@onehat/data 1.8.29 → 1.8.31

package/cypress/integration/Schema.spec.js

@@ -25,9 +25,9 @@ describe('Schema', function() {
 		expect(_.isEqual(clone._originalConfig, this.schema._originalConfig)).to.be.true;
 	});
 
-	it('getProperty', function() {
-		const property = this.schema.getProperty('groups_users__id');
-		expect(_.isEqual(property.name, 'groups_users__id')).to.be.true;
+	it('getPropertyDefinition', function() {
+		const propertyDefinition = this.schema.getPropertyDefinition('groups_users__id');
+		expect(_.isEqual(propertyDefinition.name, 'groups_users__id')).to.be.true;
 	});
 
 });

package/package.json

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

package/src/Schema/Schema.js

@@ -59,7 +59,7 @@ export default class Schema extends EventEmitter {
 				displayProperty: null,
 
 				/**
-				 * @member {array} propertyDefinitions - Array of Property definition objects
+				 * @member {array} properties - Array of Property definition objects
 				 */
 				properties: [],
 
@@ -183,20 +183,20 @@ export default class Schema extends EventEmitter {
 
 	/**
 	 * Gets a single Property definition by name,
-	 * @param {string} propertyName - Name of the Property to retrieve
-	 * @return {object} property - The named Property
+	 * @param {string} propertyName - Name of the property definition to retrieve
+	 * @return {object} propertyDefinition - The property definition
 	 */
-	getProperty = (propertyName) => {
+	getPropertyDefinition = (propertyName) => {
 		if (this.isDestroyed) {
-			throw Error('this.getProperty is no longer valid. Schema has been destroyed.');
+			throw Error('this.getPropertyDefinition is no longer valid. Schema has been destroyed.');
 		}
-		const property = _.find(this.properties, (propertyDefinition) => {
-			propertyDefinition.name === propertyName;
+		const propertyDefinition = _.find(this.model.properties, (propertyDefinition) => {
+			return propertyDefinition.name === propertyName;
 		});
-		if (!property) {
-			throw new Error('Property ' + propertyName + ' not found. Are you sure you initialized this Entity?');
+		if (!propertyDefinition) {
+			throw new Error('Property definition ' + propertyName + ' not found.');
 		}
-		return property;
+		return propertyDefinition;
 	}
 
 	/**