Update gtagWrapper to take variable number of args for potential fallthrough case

Author: dwyfrequency

packages/analytics/src/api.ts

@@ -189,7 +189,7 @@ export async function getGoogleAnalyticsClientId(
         GtagCommand.GET,
         measurementId,
         'client_id',
-        fieldName => {
+        (fieldName: string) => {
           if (!fieldName) {
             reject('There was an issue retrieving the `client_id`');
           }

packages/analytics/src/helpers.test.ts

@@ -281,6 +281,19 @@ describe('Gtag wrapping functions', () => {
       expect((window['dataLayer'] as DataLayer).length).to.equal(1);
     });
 
+    it('new window.gtag function does not wait when sending an unknown command', async () => {
+      wrapOrCreateGtag(
+        { [fakeAppId]: Promise.resolve(fakeMeasurementId) },
+        fakeDynamicConfigPromises,
+        {},
+        'dataLayer',
+        'gtag'
+      );
+      window['dataLayer'] = [];
+      (window['gtag'] as Gtag)('new-command-from-gtag-team', fakeMeasurementId);
+      expect((window['dataLayer'] as DataLayer).length).to.equal(1);
+    });
+
     it('new window.gtag function waits for initialization promise when sending "config" calls', async () => {
       const initPromise1 = new Deferred<string>();
       wrapOrCreateGtag(

packages/analytics/src/helpers.ts

@@ -227,45 +227,50 @@ function wrapGtag(
    * @param gtagParams Params if event is EVENT/CONFIG.
    */
   async function gtagWrapper(
-    command: 'config' | 'set' | 'event' | 'consent' | 'get',
-    idOrNameOrParams: string | ControlParams,
-    gtagParams?: GtagConfigOrEventParams | ConsentSettings | string,
-    callback?: (s: string) => void
+    command: 'config' | 'set' | 'event' | 'consent' | 'get' | string,
+    ...args: unknown[]
   ): Promise<void> {
     try {
       // If event, check that relevant initialization promises have completed.
       if (command === GtagCommand.EVENT) {
+        const [measurementId, gtagParams] = args;
         // If EVENT, second arg must be measurementId.
         await gtagOnEvent(
           gtagCore,
           initializationPromisesMap,
           dynamicConfigPromisesList,
-          idOrNameOrParams as string,
+          measurementId as string,
           gtagParams as GtagConfigOrEventParams
         );
       } else if (command === GtagCommand.CONFIG) {
+        const [measurementId, gtagParams] = args;
         // If CONFIG, second arg must be measurementId.
         await gtagOnConfig(
           gtagCore,
           initializationPromisesMap,
           dynamicConfigPromisesList,
           measurementIdToAppId,
-          idOrNameOrParams as string,
+          measurementId as string,
           gtagParams as GtagConfigOrEventParams
         );
       } else if (command === GtagCommand.CONSENT) {
+        const [gtagParams] = args;
         // If CONFIG, second arg must be measurementId.
         gtagCore(GtagCommand.CONSENT, 'update', gtagParams as ConsentSettings);
       } else if (command === GtagCommand.GET) {
+        const [targetId, fieldName, callback] = args;
         gtagCore(
           GtagCommand.GET,
-          idOrNameOrParams as string,
-          gtagParams as string,
-          callback as (fieldName: string) => void
+          targetId as string,
+          fieldName as string,
+          callback as (...args: unknown[]) => void
         );
-      } else {
+      } else if (command === GtagCommand.SET) {
+        const [customParams] = args;
         // If SET, second arg must be params.
-        gtagCore(GtagCommand.SET, idOrNameOrParams as CustomParams);
+        gtagCore(GtagCommand.SET, customParams as CustomParams);
+      } else {
+        gtagCore(command, ...args);
       }
     } catch (e) {
       logger.error(e);

packages/analytics/src/types.ts

@@ -53,6 +53,7 @@ export interface MinimalDynamicConfig {
   measurementId: string;
 }
 
+// We can kill this interface as it'll all be unknown
 /**
  * Standard `gtag` function provided by gtag.js.
  */
@@ -77,8 +78,9 @@ export interface Gtag {
     command: 'get',
     targetId: string,
     fieldName: string,
-    callback: (s: string) => void
+    callback: (...args: unknown[]) => void
   ): void;
+  (command: string, ...args: unknown[]): void;
 }
 
 export type DataLayer = IArguments[];