Skip to content

Commit

Permalink
perf_hooks: align toStringTag with other Web Performance implementations
Browse files Browse the repository at this point in the history
This gets `Symbol.toStringTag` on Web Performance APIs to be aligned
with the other runtime implementations.

Signed-off-by: Daeyeon Jeong <daeyeon.dev@gmail.com>
PR-URL: #45157
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Feng Yu <F3n67u@outlook.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
daeyeon authored and RafaelGSS committed Nov 10, 2022
1 parent e60d905 commit dfe4237
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 12 deletions.
9 changes: 5 additions & 4 deletions lib/internal/perf/resource_timing.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ class PerformanceResourceTiming extends PerformanceEntry {
throw new ERR_ILLEGAL_CONSTRUCTOR();
}

get [SymbolToStringTag]() {
return 'PerformanceResourceTiming';
}

get name() {
validateInternalField(this, kRequestedUrl, 'PerformanceResourceTiming');
return this[kRequestedUrl];
Expand Down Expand Up @@ -185,6 +181,11 @@ ObjectDefineProperties(PerformanceResourceTiming.prototype, {
encodedBodySize: kEnumerableProperty,
decodedBodySize: kEnumerableProperty,
toJSON: kEnumerableProperty,
[SymbolToStringTag]: {
__proto__: null,
configurable: true,
value: 'PerformanceResourceTiming',
},
});

function createPerformanceResourceTiming(requestedUrl, initiatorType, timingInfo, cacheMode = '') {
Expand Down
18 changes: 10 additions & 8 deletions lib/internal/perf/usertiming.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ class PerformanceMark {
return this[kDetail];
}

get [SymbolToStringTag]() {
return 'PerformanceMark';
}

toJSON() {
return {
name: this.name,
Expand All @@ -116,6 +112,11 @@ ObjectSetPrototypeOf(PerformanceMark, PerformanceEntry);
ObjectSetPrototypeOf(PerformanceMark.prototype, PerformanceEntry.prototype);
ObjectDefineProperties(PerformanceMark.prototype, {
detail: kEnumerableProperty,
[SymbolToStringTag]: {
__proto__: null,
configurable: true,
value: 'PerformanceMark',
},
});

class PerformanceMeasure extends PerformanceEntry {
Expand All @@ -127,13 +128,14 @@ class PerformanceMeasure extends PerformanceEntry {
validateInternalField(this, kDetail, 'PerformanceMeasure');
return this[kDetail];
}

get [SymbolToStringTag]() {
return 'PerformanceMeasure';
}
}
ObjectDefineProperties(PerformanceMeasure.prototype, {
detail: kEnumerableProperty,
[SymbolToStringTag]: {
__proto__: null,
configurable: true,
value: 'PerformanceMeasure',
},
});

function createPerformanceMeasure(name, start, duration, detail) {
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-perf-hooks-resourcetiming.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ assert(PerformanceResourceTiming);
assert(performance.clearResourceTimings);
assert(performance.markResourceTiming);

assert.deepStrictEqual(
Object.getOwnPropertyDescriptor(PerformanceResourceTiming.prototype, Symbol.toStringTag),
{ configurable: true, enumerable: false, value: 'PerformanceResourceTiming', writable: false },
);

function createTimingInfo({
startTime = 0,
redirectStartTime = 0,
Expand Down
13 changes: 13 additions & 0 deletions test/parallel/test-perf-hooks-usertiming.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const {
PerformanceObserver,
PerformanceEntry,
PerformanceMark,
PerformanceMeasure,
performance,
performance: {
nodeTiming,
Expand All @@ -18,6 +19,18 @@ assert(PerformanceMark);
assert(performance.mark);
assert(performance.measure);

[PerformanceMark, PerformanceMeasure].forEach((c) => {
assert.deepStrictEqual(
Object.getOwnPropertyDescriptor(c.prototype, Symbol.toStringTag),
{
configurable: true,
enumerable: false,
writable: false,
value: c.name,
}
);
});

[undefined, 'a', 'null', 1, true].forEach((i) => {
const m = performance.mark(i);
assert(m instanceof PerformanceEntry);
Expand Down

0 comments on commit dfe4237

Please sign in to comment.