Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! lib: undefined values in dictionary should be ignored
  • Loading branch information
legendecas committed Jul 19, 2021
commit 58ac81abb88331179276e43c120bc1b52a33c233
4 changes: 2 additions & 2 deletions lib/internal/perf/usertiming.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class PerformanceMark extends InternalPerformanceEntry {
let detail = options.detail;
detail = detail != null ?
structuredClone(detail) :
detail;
null;
super(name, 'mark', startTime, 0, detail);
}

Expand Down Expand Up @@ -154,7 +154,7 @@ function measure(name, startOrMeasureOptions, endMark) {
duration,
} = calculateStartDuration(startOrMeasureOptions, endMark);
let detail = startOrMeasureOptions?.detail;
detail = detail != null ? structuredClone(detail) : detail;
detail = detail != null ? structuredClone(detail) : null;
const measure = new PerformanceMeasure(name, start, duration, detail);
enqueue(measure);
return measure;
Expand Down
10 changes: 8 additions & 2 deletions test/parallel/test-perf-hooks-usertiming.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ assert(measure);
assert.strictEqual(m.entryType, 'mark');
assert.strictEqual(typeof m.startTime, 'number');
assert.strictEqual(m.duration, 0);
assert.strictEqual(m.details, undefined);
assert.strictEqual(m.detail, null);
});

clearMarks();
Expand All @@ -38,7 +38,13 @@ assert.throws(() => mark(Symbol('a')), {
message: /Cannot convert a Symbol value to a string/
});

[undefined, null, 1, 'any', {}, []].forEach((detail) => {
[undefined, null].forEach((detail) => {
const m = mark('a', { detail });
assert.strictEqual(m.name, 'a');
assert.strictEqual(m.entryType, 'mark');
assert.deepStrictEqual(m.detail, null);
});
[1, 'any', {}, []].forEach((detail) => {
const m = mark('a', { detail });
assert.strictEqual(m.name, 'a');
assert.strictEqual(m.entryType, 'mark');
Expand Down