Skip to content

Commit 749cf54

Browse files
author
John Doe
committed
fix: unit tests
1 parent 4f1602b commit 749cf54

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

packages/utils/src/lib/user-timing-extensibility-api-utils.ts

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,21 @@ export type MergeResult<
186186
export function mergeDevtoolsPayload<
187187
const P extends readonly Partial<TrackEntryPayload | MarkerPayload>[],
188188
>(...parts: P): MergeResult<P> {
189-
return parts.reduce((acc, cur) => ({
190-
...acc,
191-
...cur,
192-
...(cur.properties || acc.properties
193-
? {
194-
properties: mergePropertiesWithOverwrite(
195-
acc.properties ?? [],
196-
cur.properties ?? [],
197-
),
198-
}
199-
: {}),
200-
})) as MergeResult<P>;
189+
return parts.reduce(
190+
(acc, cur) => ({
191+
...acc,
192+
...cur,
193+
...(cur.properties || acc.properties
194+
? {
195+
properties: mergePropertiesWithOverwrite(
196+
acc.properties ?? [],
197+
cur.properties ?? [],
198+
),
199+
}
200+
: {}),
201+
}),
202+
{},
203+
) as MergeResult<P>;
201204
}
202205

203206
export function mergeDevtoolsPayloadAction<
@@ -219,10 +222,15 @@ export function setupTracks<
219222
const T extends Record<string, Partial<ActionTrack>>,
220223
const D extends ActionTrack,
221224
>(defaults: D, tracks: T) {
222-
return objectToEntries(tracks).reduce((result, [key, track]) => ({
223-
...result,
224-
[key]: mergeDevtoolsPayload(defaults, track),
225-
})) as Record<keyof T, ActionTrack>;
225+
return objectToEntries(tracks).reduce(
226+
(result, [key, track]) => ({
227+
...result,
228+
[key]: mergeDevtoolsPayload(defaults, track, {
229+
dataType: dataTypeTrackEntry,
230+
}),
231+
}),
232+
{} as Record<keyof T, ActionTrack>,
233+
) as Record<keyof T, ActionTrack>;
226234
}
227235

228236
/**

packages/utils/src/lib/user-timing-extensibility-api-utils.unit.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ describe('mergeDevtoolsPayload', () => {
367367
color: 'primary',
368368
properties: [['key1', 'value1']],
369369
};
370-
expect(mergeDevtoolsPayload(payload)).toBe(payload);
370+
expect(mergeDevtoolsPayload(payload)).toStrictEqual(payload);
371371
});
372372

373373
it('should merge multiple track entry payloads', () => {
@@ -425,7 +425,7 @@ describe('mergeDevtoolsPayload', () => {
425425

426426
expect(mergeDevtoolsPayload(payload1, payload2)).toStrictEqual({
427427
track: 'Test',
428-
properties: [['key1', 'value1']],
428+
properties: undefined,
429429
});
430430
});
431431
});

0 commit comments

Comments
 (0)