From 121a3171eba0b4a59f74f4cb57c32d08849dd801 Mon Sep 17 00:00:00 2001
From: Oscar Bazaldua <511911+oscb@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:05:29 -0700
Subject: [PATCH 1/2] fix: handle null as the first argument in identify

---
 .changeset/nasty-tables-sort.md               |  5 ++
 .../__tests__/index.test.ts                   | 27 +++++++++
 .../src/core/arguments-resolver/index.ts      | 58 +++++++++++++++----
 3 files changed, 78 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/nasty-tables-sort.md

diff --git a/.changeset/nasty-tables-sort.md b/.changeset/nasty-tables-sort.md
new file mode 100644
index 000000000..1a864c9d1
--- /dev/null
+++ b/.changeset/nasty-tables-sort.md
@@ -0,0 +1,5 @@
+---
+'@segment/analytics-next': patch
+---
+
+Fixes calls to .identify() with null as id
diff --git a/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts b/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts
index 7c56255d3..57c4f08ea 100644
--- a/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts
+++ b/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts
@@ -429,6 +429,33 @@ describe(resolveUserArguments, () => {
     expect(traits).toEqual(userTraits)
     expect(options).toEqual({})
   })
+
+  it('should accept (undefined, traits)', () => {
+    user.reset()
+    const [id, traits, options] = resolver(undefined, userTraits)
+    expect(traits).toEqual(userTraits)
+    expect(options).toEqual({})
+    expect(id).toEqual(null)
+  })
+
+  it('should accept (null, traits) with unknown identity', () => {
+    user.reset()
+    const [id, traits, options] = resolver(null, userTraits)
+    console.log(id, traits, options)
+    expect(traits).toEqual(userTraits)
+    expect(options).toEqual({})
+    expect(id).toEqual(null)
+  })
+
+  it('should accept (null, traits) when identity is set', () => {
+    user.reset()
+    user.identify('something')
+    const [id, traits, options] = resolver(null, userTraits)
+    console.log(id, traits, options)
+    expect(traits).toEqual(userTraits)
+    expect(options).toEqual({})
+    expect(id).toEqual('something')
+  })
 })
 
 describe(resolveAliasArguments, () => {
diff --git a/packages/browser/src/core/arguments-resolver/index.ts b/packages/browser/src/core/arguments-resolver/index.ts
index 2274d6926..795381e9e 100644
--- a/packages/browser/src/core/arguments-resolver/index.ts
+++ b/packages/browser/src/core/arguments-resolver/index.ts
@@ -111,22 +111,56 @@ export const resolveUserArguments = <T extends Traits, U extends User>(
   user: U
 ): ResolveUser<T> => {
   return (...args): ReturnType<ResolveUser<T>> => {
-    let id: string | ID | null = null
-    id = args.find(isString) ?? args.find(isNumber)?.toString() ?? user.id()
-
-    const objects = args.filter((obj) => {
-      if (id === null) {
-        return isPlainObject(obj)
+    const values: {
+      id?: ID
+      traits?: T | null
+      options?: Options
+      callback?: Callback
+    } = {}
+    // It's a stack so it's reversed so that we go through each of the expected arguments
+    const orderStack: Array<keyof typeof values> = [
+      'callback',
+      'options',
+      'traits',
+      'id',
+    ]
+
+    // Read each argument and eval the possible values here
+    for (const arg of args) {
+      let current = orderStack.pop()
+      if (current === 'id') {
+        if (isString(arg) || isNumber(arg)) {
+          values.id = arg.toString()
+          continue
+        }
+        if (arg === null || arg === undefined) {
+          continue
+        }
+        // First argument should always be the id, if it is not a valid value we can skip it
+        current = orderStack.pop()
       }
-      return isPlainObject(obj) || obj === null
-    }) as Array<Traits | null>
 
-    const traits = (objects[0] ?? {}) as T
-    const opts = (objects[1] ?? {}) as Options
+      // Traits and Options
+      if (
+        (current === 'traits' || current === 'options') &&
+        (arg === null || arg === undefined || isPlainObject(arg))
+      ) {
+        values[current] = arg as T
+      }
 
-    const resolvedCallback = args.find(isFunction) as Callback | undefined
+      // Callback
+      if (isFunction(arg)) {
+        values.callback = arg as Callback
+        break // This is always the last argument
+      }
+    }
 
-    return [id, traits, opts, resolvedCallback]
+    return [
+      values.id ?? user.id(),
+      (values.traits ?? {}) as T,
+      values.options ?? {},
+      values.callback,
+    ]
   }
 }
 

From 0e8a7ae5cb15c39e0657cbbe15eedb13f47611dc Mon Sep 17 00:00:00 2001
From: Oscar Bazaldua <511911+oscb@users.noreply.github.com>
Date: Fri, 29 Sep 2023 10:12:19 -0700
Subject: [PATCH 2/2] chore: remove console logs

---
 .../browser/src/core/arguments-resolver/__tests__/index.test.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts b/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts
index 57c4f08ea..2bc6f6572 100644
--- a/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts
+++ b/packages/browser/src/core/arguments-resolver/__tests__/index.test.ts
@@ -441,7 +441,6 @@ describe(resolveUserArguments, () => {
   it('should accept (null, traits) with unknown identity', () => {
     user.reset()
     const [id, traits, options] = resolver(null, userTraits)
-    console.log(id, traits, options)
     expect(traits).toEqual(userTraits)
     expect(options).toEqual({})
     expect(id).toEqual(null)
@@ -451,7 +450,6 @@ describe(resolveUserArguments, () => {
     user.reset()
     user.identify('something')
     const [id, traits, options] = resolver(null, userTraits)
-    console.log(id, traits, options)
     expect(traits).toEqual(userTraits)
     expect(options).toEqual({})
     expect(id).toEqual('something')