improvement: merge viewport and targeting

Author: foxted

src/__tests__/environment.test.ts

@@ -10,13 +10,12 @@ describe('Environment', function () {
  path: expect.any(String),
  query: expect.any(Object),
  }),
- viewport: expect.objectContaining({
+ targeting: expect.objectContaining({
  doNotTrack: expect.any(Boolean),
  width: expect.any(Number),
  height: expect.any(Number),
  userAgent: expect.any(String),
  }),
- targeting: expect.any(Object),
  }))
  });
 
@@ -34,13 +33,12 @@ describe('Environment', function () {
  path: expect.any(String),
  query: expect.any(Object),
  }),
- viewport: expect.objectContaining({
+ targeting: expect.objectContaining({
  doNotTrack: expect.any(Boolean),
  width: expect.any(Number),
  height: expect.any(Number),
  userAgent: expect.any(String),
  }),
- targeting: expect.any(Object),
  }));
  expect(variate.env.view.path).toBeDefined();
  expect(variate.env.view.path).toEqual('/');
@@ -60,13 +58,12 @@ describe('Environment', function () {
  path: expect.any(String),
  query: expect.any(Object),
  }),
- viewport: expect.objectContaining({
+ targeting: expect.objectContaining({
  doNotTrack: expect.any(Boolean),
  width: expect.any(Number),
  height: expect.any(Number),
  userAgent: expect.any(String),
  }),
- targeting: expect.any(Object),
  }))
  });
 

src/__tests__/non-browser.test.ts

@@ -17,12 +17,11 @@ it('Environment can degrade gracefully if window is undefined', () => {
  url: expect.any(String),
  query: expect.any(Object),
  }),
- viewport: expect.objectContaining({
+ targeting: expect.objectContaining({
  doNotTrack: expect.any(Boolean),
  width: expect.any(Number),
  height: expect.any(Number),
  userAgent: expect.any(Boolean),
  }),
- targeting: expect.any(Object),
  }))
 });

src/index.ts

@@ -95,7 +95,7 @@ class Variate {
  };
 
  // Viewport information
- const viewport = {
+ const targeting = {
  visitorId: this.getUUID(),
  doNotTrack: env.doNotTrack(),
  width: env.width(),
@@ -104,9 +104,15 @@ class Variate {
  };
 
  // Targeting information
- const targeting = get(value, 'targeting', {default: {}});
+ const customTargeting = get(value, 'targeting', {default: {}});
 
- this._env = Object.assign({}, this._env, {view, viewport, targeting});
+ this._env = Object.assign({}, this._env, {
+ view,
+ targeting: {
+ ...targeting,
+ ...customTargeting
+ }
+ });
 
  if (this._options.debug) {
  console.groupCollapsed(debug.SETUP_ENVIRONMENT);
@@ -225,8 +231,6 @@ class Variate {
  this.isReady = true;
  this._options.debug && console.timeEnd('[BENCHMARK] Variate Initialization');
 
- console.log('NAH', this._options.tracking.enabled, this._options.pageview);
-
  if (this._options.tracking.enabled && this._options.pageview) {
  this.track('Pageview', EventTypes.PAGEVIEW);
  }