fix argument resolver

Author: silesky

packages/browser/src/browser/__tests__/page-enrichment.integration.test.ts

@@ -165,7 +165,7 @@ describe('Page Enrichment', () => {
   })
 
   it('in page events, event.name overrides event.properties.name', async () => {
-    const ctx = await ajs.page('My Event', undefined, undefined, {
+    const ctx = await ajs.page('My Event', undefined, {
       name: 'some propery name',
     })
     expect(ctx.event.properties!.name).toBe('My Event')

packages/browser/src/core/arguments-resolver/index.ts

@@ -51,9 +51,6 @@ export function resolveArguments(
   return [name, data, opts, cb]
 }
 
-const isNil = (val: any): val is null | undefined =>
-  val === null || val === undefined
-
 /**
  * Helper for page, screen methods
  */
@@ -70,12 +67,34 @@ export function resolvePageArguments(
   Options,
   Callback | undefined
 ] {
-  let resolvedCategory: string | undefined | null = null
-  let resolvedName: string | undefined | null = null
   let resolvedProperties: EventProperties
   let resolvedOptions: Options
+  let resolvedCategory: string | undefined | null = null
+  let resolvedName: string | undefined | null = null
   const args = [category, name, properties, options, callback]
 
+  // The legacy logic is basically:
+  // - If there is a string, it's the name
+  // - If there are two strings, it's category and name
+  const strings = args.filter(isString)
+  if (strings.length === 1) {
+    if (isString(args[1])) {
+      resolvedName = args[1]
+      resolvedCategory = null
+    } else {
+      resolvedName = strings[0]
+      resolvedCategory = null
+    }
+  } else if (strings.length === 2) {
+    if (typeof args[0] === 'string') {
+      resolvedCategory = args[0]
+    }
+    if (typeof args[1] === 'string') {
+      resolvedName = args[1]
+    }
+  }
+
+  // handle: analytics.page('category', 'name', properties, options, callback)
   const resolvedCallback = args.find(isFunction) as Callback | undefined
 
   // handle:
@@ -89,46 +108,26 @@ export function resolvePageArguments(
   // - analytics.page('category', 'name', properties, options, callback)
   // - analytics.page('category', 'name', callback)
   // - analytics.page(callback), etc
-  args.forEach((arg, argIdx) => {
-    if (isString(arg)) {
-      if (argIdx === 0) {
-        if (isString(arg)) {
-          resolvedName = arg
-        }
-      }
-      if (argIdx === 1) {
-        resolvedCategory = args[0] as string | undefined | null
-        resolvedName = arg
-      }
-    }
-
-    if (isPlainObject(arg)) {
-      if (argIdx === 0) {
-        resolvedProperties = arg
-      }
-
-      if (argIdx === 1 || argIdx == 2) {
-        if (isNil(resolvedProperties)) {
-          resolvedProperties = arg
-        } else {
-          resolvedOptions = arg
-        }
-      }
 
-      if (argIdx === 3) {
-        resolvedOptions = arg
-      }
-    }
-
-    if (isNil(arg)) {
-      if (argIdx === 1) {
-        if (isString(args[0])) {
-          resolvedName = arg
-          resolvedCategory = args[0]
-        }
-      }
+  // The legacy logic is basically:
+  // - If there is a plain object, it's the properties
+  // - If there are two plain objects, it's properties and options
+  const objects = args.filter(isPlainObject)
+  if (objects.length === 1) {
+    if (isPlainObject(args[2])) {
+      resolvedOptions = {}
+      resolvedProperties = args[2]
+    } else if (isPlainObject(args[3])) {
+      resolvedProperties = {}
+      resolvedOptions = args[3]
+    } else {
+      resolvedProperties = objects[0]
+      resolvedOptions = {}
     }
-  })
+  } else if (objects.length === 2) {
+    resolvedProperties = objects[0]
+    resolvedOptions = objects[1]
+  }
 
   return [
     resolvedCategory,