Naming collision detection during model deserialization + fix i.e. sk…

…ipping func registration if prop of the same name already exists.
jwaliszko · Aug 9, 2017 · f39e431 · f39e431
1 parent c01b93a
commit f39e431
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/src/expressive.annotations.validate.js b/src/expressive.annotations.validate.js
@@ -1,4 +1,4 @@
-/* expressive.annotations.validate.js - v2.7.1
+/* expressive.annotations.validate.js - v2.7.2
  * Client-side component of ExpressiveAnnotations - annotation-based conditional validation library.
  * https://github.com/jwaliszko/ExpressiveAnnotations
  *
@@ -128,6 +128,10 @@ var
             this.initialize();
             for (name in this.methods) {
                 if (this.methods.hasOwnProperty(name)) {
+                    if (model.hasOwnProperty(name)) {
+                        logger.warn(typeHelper.string.format('Skipping {0} function registration due to naming conflict (property of the same name already defined within the context).', name));
+                        continue;
+                    }
                     body = this.methods[name];
                     model[name] = body;
                 }