Merge 22711e6 into 34b520c

talyssonoc · Mar 22, 2019 · fa44042 · fa44042
2 parents 34b520c + 22711e6
commit fa44042
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.2 - 2019-03-22
+Fix:
+* The actual instance is passed to the dynamic defaults
+
 ## 1.3.0 - 2018-03-23
 Enhancements:
 * When using default function to initialize attributes you can now refer to another attribute values to compose value

diff --git a/dist/structure.js b/dist/structure.js
@@ -665,6 +665,14 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var initializationOrderFor = __webpack_require__(20);
 
+	function initializedValue(attrPassedValue, attrInitializer, attrDescriptor, instance) {
+	  if (attrPassedValue !== undefined) {
+	    return attrPassedValue;
+	  }
+
+	  return attrInitializer(attrDescriptor, instance);
+	}
+
 	module.exports = function forSchema(schema) {
 	  var initializationOrder = initializationOrderFor(schema);
 
@@ -680,11 +688,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        var attrDescriptor = schema[attrName];
 	        var attrPassedValue = attributes[attrName];
 
-	        if (attrPassedValue !== undefined) {
-	          instance[attrName] = attrPassedValue;
-	        } else {
-	          instance[attrName] = attrInitializer(attrDescriptor, instance);
-	        }
+	        instance[attrName] = initializedValue(attrPassedValue, attrInitializer, attrDescriptor, instance);
 	      }
 	    }
 	  };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "structure",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A simple schema/attributes library built on top of modern JavaScript",
   "main": "src/index.js",
   "browser": "dist/structure.js",