@onehat/data 1.19.13 → 1.19.15

package/package.json

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

package/src/Property/Property.js

@@ -192,10 +192,14 @@ export default class Property extends EventEmitter {
 	 * @return {any} defaultValue
 	 */
 	getDefaultValue() {
+		let value = null;
 		if (!_.isNil(this.defaultValue)) {
-			return this.defaultValue;
+			value = this.defaultValue;
 		}
-		return null;
+		if (_.isFunction(value)) {
+			value = value();
+		}
+		return value;
 	}
 
 	/**

package/src/Schema/Schema.js

@@ -236,9 +236,15 @@ export default class Schema extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this.getPropertyDefinition is no longer valid. Schema has been destroyed.');
 		}
-		return _.find(this.model.properties, (propertyDefinition) => {
+		const found = _.clone(_.find(this.model.properties, (propertyDefinition) => {
 			return propertyDefinition.name === propertyName;
-		});
+		}));
+
+		if (this.model?.validator?.fields && this.model.validator.fields[propertyName]) {
+			found.validator = this.model?.validator?.fields[propertyName];
+		}
+
+		return found;
 	}
 	
 	getTitles = () => {