ref(replay): Avoid nullish coalescing operator

Author: mydea

packages/replay/src/session/Session.ts

@@ -41,11 +41,10 @@ export interface Session {
 export function makeSession(session: Partial<Session>, { sessionSampleRate, errorSampleRate }: SampleRates): Session {
   const now = new Date().getTime();
   const id = session.id || uuid4();
-  const started = session.started ?? now;
-  const lastActivity = session.lastActivity ?? now;
-  const segmentId = session.segmentId ?? 0;
-  const sampled =
-    session.sampled ?? (isSampled(sessionSampleRate) ? 'session' : isSampled(errorSampleRate) ? 'error' : false);
+  const started = session.started || now;
+  const lastActivity = session.lastActivity || now;
+  const segmentId = session.segmentId || 0;
+  const sampled = sampleSession(session.sampled, { sessionSampleRate, errorSampleRate });
 
   return {
     id,
@@ -55,3 +54,11 @@ export function makeSession(session: Partial<Session>, { sessionSampleRate, erro
     sampled,
   };
 }
+
+function sampleSession(sampled: Sampled | undefined, { sessionSampleRate, errorSampleRate }: SampleRates): Sampled {
+  if (typeof sampled !== 'undefined') {
+    return sampled;
+  }
+
+  return isSampled(sessionSampleRate) ? 'session' : isSampled(errorSampleRate) ? 'error' : false;
+}

packages/replay/test/unit/util/isSessionExpired.test.ts

@@ -4,8 +4,9 @@ import { isSessionExpired } from '../../../src/util/isSessionExpired';
 function createSession(extra?: Record<string, any>) {
   return makeSession(
     {
-      started: 0,
-      lastActivity: 0,
+      // Setting started/lastActivity to 0 makes it use the default, which is `Date.now()`
+      started: 1,
+      lastActivity: 1,
       segmentId: 0,
       ...extra,
     },
@@ -26,5 +27,5 @@ it('session age is not older than max session life', function () {
 });
 
 it('session age is older than max session life', function () {
-  expect(isSessionExpired(createSession(), 1_800_000, 1_800_000)).toBe(true); // Session expires at ts >= 1_800_000
+  expect(isSessionExpired(createSession(), 1_800_000, 1_800_001)).toBe(true); // Session expires at ts >= 1_800_000
 });