remove merge flag form MapNode

Author: stschr

src/dash/parser/maps/CommonProperty.js

@@ -31,20 +31,13 @@
 /**
  * @classdesc a node at some level in a ValueMap
  */
-import CommonProperty from './CommonProperty.js';
 
 class MapNode {
     constructor(name, properties, exceptions, children) {
         this._name = name || '';
-        this._properties = [];
+        this._properties = properties || [];
         this._exceptions = exceptions || {};
         this._children = children || [];
-
-        if (Array.isArray(properties)) {
-            properties.forEach(p => {
-                this._properties.push(new CommonProperty(p));
-            });
-        }
     }
 
     get name() {

src/dash/parser/maps/MapNode.js

@@ -46,15 +46,12 @@ function ObjectIron(mappers) {
         return allowMapping;
     }
 
-    function _conditionallyMapProperty(exception, propertyParentElement, parentIsArray, parentEl, child, mergeFlag) {
+    function _conditionallyMapProperty(exception, propertyParentElement, parentIsArray, parentEl, child) {
         if (_mappingAllowed(parentEl, exception)) {
             if (child[propertyParentElement]) {
                 // property already exists
-                // check to see if we should merge
-                if (mergeFlag) {
-                    if (parentIsArray) {
-                        child[propertyParentElement].push(parentEl);
-                    }
+                if (parentIsArray) {
+                    child[propertyParentElement].push(parentEl);
                 }
             } else {
                 // just add the property
@@ -71,15 +68,15 @@ function ObjectIron(mappers) {
         for (let i = 0, len = properties.length; i < len; ++i) {
             const property = properties[i];
 
-            if (parent[property.name]) {
-                const propertyParentElement = parent[property.name];
+            if (parent[property]) {
+                const propertyParentElement = parent[property];
 
                 if (Array.isArray(propertyParentElement)) {
                     propertyParentElement.forEach(propParentEl => {
-                        _conditionallyMapProperty(exceptions[property.name], property.name, true, propParentEl, child, property.merge);
+                        _conditionallyMapProperty(exceptions[property], property, true, propParentEl, child);
                     });
                 } else {
-                    _conditionallyMapProperty(exceptions[property.name], property.name, false, propertyParentElement, child, property.merge);
+                    _conditionallyMapProperty(exceptions[property], property, false, propertyParentElement, child);
                 }
             }
         }

src/dash/parser/objectiron.js

@@ -1,5 +1,4 @@
 import MapNode from '../../../../src/dash/parser/maps/MapNode.js';
-import CommonProperty from '../../../../src/dash/parser/maps/CommonProperty.js';
 import {expect} from 'chai';
 
 describe('MapNode', function () {
@@ -13,25 +12,16 @@ describe('MapNode', function () {
         expect(mapNode.properties).to.be.empty; // jshint ignore:line
         expect(mapNode.children).to.be.instanceOf(Array); // jshint ignore:line
         expect(mapNode.children).to.be.empty; // jshint ignore:line
+        expect(mapNode.exceptions).to.be.instanceOf(Object); // jshint ignore:line
+        expect(mapNode.exceptions).to.be.empty; // jshint ignore:line
     });
 
     it('should throw an exception if attempting to use setters', () => {
         const mapNode = new MapNode();
 
-        ['name', 'properties', 'children'].forEach(p => {
+        ['name', 'properties', 'children', 'exceptions'].forEach(p => {
             const f = () => mapNode[p] = p;
             expect(f).to.throw(Error);
         });
     });
-
-    it('should have CommonProperty\'s', () => {
-        const name = '';
-        const properties = ['test'];
-
-        const mapNode = new MapNode(name, properties);
-
-        expect(mapNode.properties).to.be.instanceOf(Array); // jshint ignore:line
-        expect(mapNode.properties).not.to.be.empty; // jshint ignore:line
-        expect(mapNode.properties[0]).to.be.instanceOf(CommonProperty); // jshint ignore:line
-    });
 });