Bugfix/only merge targeting (#88)

* [SB] Prevent leaking of variables between ads

* [SB] Prep for release

Author: stephenbaldwin

docs/error.md

@@ -39,10 +39,14 @@ Example:
  ```
 
 ## Error 3
-Description: Sizes must be of type `Array` unless breakpoints have been specified
+Description: Sizes are required
 
 
 ## Error 4
+Description: Sizes must be of type `Array` unless breakpoints have been specified
+
+  
+## Error 5
 Description: An ad must be passed into the GenericPlugin class. If your Plugin inherits from GenericPlugin
 		and overrides the constructor make sure you are calling "super" and that you are passing in an
 		instance of an ad as the first parameter. Alternatively, you can hook into the onCreate method
@@ -69,19 +73,19 @@ Description: An ad must be passed into the GenericPlugin class. If your Plugin i
 		  }
  ```
 
-## Error 5
-Description: Parent element required for sticky plugin.
-
-  
 ## Error 6
-Description: Ad does not have an id
+Description: Parent element required for sticky plugin.
 
 
-## Error 7
+## Error 8
 Description: Sizes must be defined.
 
 
-## Error 8
+## Error 9
 Description: Ad Path must be defined.
 
+  
+## Error 7
+Description: Ad does not have an id
+
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adjs",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.17",
   "description": "Ad Library to simplify and optimize integration with ad networks such as DFP",
   "main": "./core.js",
   "types": "./types.d.ts",

src/Ad.ts

@@ -183,20 +183,16 @@ class Ad implements IAd {
      */
     this.promiseStack = this.promiseStack.then(() => this.page.promiseStack);
 
-    this.configuration = this.page.defaults;
-
-    if (localConfiguration) {
-      Object.entries(localConfiguration).forEach(([key, value]) => {
-        if (typeof value === 'object') {
-          this.configuration[key] =  {
-              ...this.configuration[key],
-              ...value,
-          };
-        } else {
-          this.configuration[key] = value;
-        }
-      });
-    }
+    this.configuration = {
+      ...this.page.defaults,
+      ...localConfiguration,
+
+      // Targeting is the only value that should merge
+      targeting: {
+        ...(this.page.defaults && this.page.defaults.targeting),
+        ...(localConfiguration && localConfiguration.targeting),
+      },
+    };
 
     this.id = nextId();
     this.container = insertElement('div', { style: 'position: relative;' }, el);

tests/ad.test.js

@@ -9,29 +9,33 @@ describe('Ad', () => {
 
   beforeEach(() => {
     global.AdJS = AdJS;
-    page = new AdJS.Page(MockNetwork);
+    page = new AdJS.Page(MockNetwork, {
+      defaults: {
+        targeting: { existing: true }
+      }
+    });
 
-    ad = page.createAd(el, { sizes: [], breakpoints: {}, targeting: { existing: true } });
+    ad = page.createAd(el, { sizes: [], breakpoints: {} });
   });
 
   describe('configuration', () => {
     it('should have the correct key vals', async () => {
       const overrides = {
         someNewKey: 'true',
+        sizes: [],
         targeting: {
           newValues: 'moreTrue',
         },
       };
 
       const expected = {
-        sizes: {},
-        breakpoints: {},
+        sizes: [],
         targeting: {
           existing: true,
           newValues: 'moreTrue'
         },
         someNewKey: 'true',
-      }
+      };
 
       const ad = page.createAd(el, overrides);
       expect(ad.configuration).toEqual(expected);