move defaultEventParametersForInit and funcs to functions file

Author: dwyfrequency

packages/analytics/src/api.test.ts

@@ -29,6 +29,7 @@ import { AnalyticsError } from './errors';
 import * as init from './initialize-analytics';
 const fakeAppParams = { appId: 'abcdefgh12345:23405', apiKey: 'AAbbCCdd12345' };
 import * as factory from './factory';
+import { defaultEventParametersForInit } from './functions';
 
 describe('FirebaseAnalytics API tests', () => {
   let initStub: SinonStub = stub();
@@ -107,9 +108,7 @@ describe('FirebaseAnalytics API tests', () => {
     };
     app = getFullApp(fakeAppParams);
     setDefaultEventParameters(eventParametersForInit);
-    expect(factory.defaultEventParametersForInit).to.deep.equal(
-      eventParametersForInit
-    );
+    expect(defaultEventParametersForInit).to.deep.equal(eventParametersForInit);
   });
   it('setDefaultEventParameters() calls gtag set if wrappedGtagFunction exists', () => {
     const eventParametersForInit = {

packages/analytics/src/api.ts

@@ -39,16 +39,16 @@ import { ANALYTICS_TYPE, GtagCommand } from './constants';
 import {
   AnalyticsService,
   initializationPromisesMap,
-  wrappedGtagFunction,
-  _setDefaultEventParametersForInit
+  wrappedGtagFunction
 } from './factory';
 import { logger } from './logger';
 import {
   logEvent as internalLogEvent,
   setCurrentScreen as internalSetCurrentScreen,
   setUserId as internalSetUserId,
   setUserProperties as internalSetUserProperties,
-  setAnalyticsCollectionEnabled as internalSetAnalyticsCollectionEnabled
+  setAnalyticsCollectionEnabled as internalSetAnalyticsCollectionEnabled,
+  _setDefaultEventParametersForInit
 } from './functions';
 import { ERROR_FACTORY, AnalyticsError } from './errors';
 

packages/analytics/src/factory.ts

@@ -15,12 +15,7 @@
  * limitations under the License.
  */
 
-import {
-  SettingsOptions,
-  Analytics,
-  AnalyticsSettings,
-  CustomParams
-} from './public-types';
+import { SettingsOptions, Analytics, AnalyticsSettings } from './public-types';
 import { Gtag, DynamicConfig, MinimalDynamicConfig } from './types';
 import { getOrCreateDataLayer, wrapOrCreateGtag } from './helpers';
 import { AnalyticsError, ERROR_FACTORY } from './errors';
@@ -89,11 +84,6 @@ let gtagCoreFunction: Gtag;
  */
 export let wrappedGtagFunction: Gtag;
 
-/**
- * Event parameters to set on 'gtag' during initialization.
- */
-export let defaultEventParametersForInit: CustomParams | undefined;
-
 /**
  * Flag to ensure page initialization steps (creation or wrapping of
  * dataLayer and gtag script) are only run once per page load.
@@ -245,22 +235,3 @@ export function factory(
 
   return analyticsInstance;
 }
-
-/**
- * Sets the variable {@link defaultEventParametersForInit} for use in the initialization of
- * analytics.
- *
- * @param customParams Any custom params the user may pass to gtag.js.
- */
-export function _setDefaultEventParametersForInit(
-  customParams: CustomParams
-): void {
-  if (defaultEventParametersForInit) {
-    defaultEventParametersForInit = {
-      ...defaultEventParametersForInit,
-      ...customParams
-    };
-  } else {
-    defaultEventParametersForInit = customParams;
-  }
-}

packages/analytics/src/functions.test.ts

@@ -23,13 +23,11 @@ import {
   logEvent,
   setUserId,
   setUserProperties,
-  setAnalyticsCollectionEnabled
-} from './functions';
-import { GtagCommand } from './constants';
-import {
+  setAnalyticsCollectionEnabled,
   defaultEventParametersForInit,
   _setDefaultEventParametersForInit
-} from './factory';
+} from './functions';
+import { GtagCommand } from './constants';
 
 const fakeMeasurementId = 'abcd-efgh-ijkl';
 const fakeInitializationPromise = Promise.resolve(fakeMeasurementId);

packages/analytics/src/functions.ts

@@ -23,6 +23,12 @@ import {
 } from './public-types';
 import { Gtag } from './types';
 import { GtagCommand } from './constants';
+
+/**
+ * Event parameters to set on 'gtag' during initialization.
+ */
+export let defaultEventParametersForInit: CustomParams | undefined;
+
 /**
  * Logs an analytics event through the Firebase SDK.
  *
@@ -142,3 +148,22 @@ export async function setAnalyticsCollectionEnabled(
   const measurementId = await initializationPromise;
   window[`ga-disable-${measurementId}`] = !enabled;
 }
+
+/**
+ * Sets the variable {@link defaultEventParametersForInit} for use in the initialization of
+ * analytics.
+ *
+ * @param customParams Any custom params the user may pass to gtag.js.
+ */
+export function _setDefaultEventParametersForInit(
+  customParams: CustomParams
+): void {
+  if (defaultEventParametersForInit) {
+    defaultEventParametersForInit = {
+      ...defaultEventParametersForInit,
+      ...customParams
+    };
+  } else {
+    defaultEventParametersForInit = customParams;
+  }
+}

packages/analytics/src/initialize-analytics.ts

@@ -28,7 +28,7 @@ import {
 import { ERROR_FACTORY, AnalyticsError } from './errors';
 import { findGtagScriptOnPage, insertScriptTag } from './helpers';
 import { AnalyticsSettings } from './public-types';
-import { defaultEventParametersForInit } from './factory';
+import { defaultEventParametersForInit } from './functions';
 
 async function validateIndexedDB(): Promise<boolean> {
   if (!isIndexedDBAvailable()) {