Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sort the classes that appear in attribution selectors to reduce cardinality #518

Merged
merged 6 commits into from
Sep 27, 2024
Merged

Sort the classes that appear in attribution selectors to reduce cardinality #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c0c7e3
Sort class names in getSelector()
tunetheweb Aug 12, 2024
f907234
Remove debug comment
tunetheweb Aug 12, 2024
c0481e7
Review feedback
tunetheweb Sep 6, 2024
60b4a0c
Review feedback 2
tunetheweb Sep 6, 2024
334f994
Partially reverting last change
tunetheweb Sep 6, 2024
12145a2
Simplify code and add test case
philipwalton Sep 27, 2024
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
22 changes: 11 additions & 11 deletions src/lib/getSelector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ const getName = (node: Node) => {
: name.toUpperCase().replace(/^#/, '');
};

export const getSelector = (node: Node | null | undefined, maxLen?: number) => {
const MAX_LEN = 100;

export const getSelector = (node: Node | null | undefined) => {
let sel = '';

try {
while (node && node.nodeType !== 9) {
while (node?.nodeType !== 9) {
const el: Element = node as Element;
const part = el.id
? '#' + el.id
: getName(el) +
(el.classList &&
el.classList.value &&
el.classList.value.trim() &&
el.classList.value.trim().length
? '.' + el.classList.value.trim().replace(/\s+/g, '.')
: '');
if (sel.length + part.length > (maxLen || 100) - 1) return sel || part;
: [getName(el), ...Array.from(el.classList).sort()].join('.');
if (sel.length + part.length > MAX_LEN - 1) {
return sel || part;
}
sel = sel ? part + '>' + sel : part;
if (el.id) break;
if (el.id) {
break;
}
node = el.parentNode;
}
} catch (err) {
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/onLCP-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ describe('onLCP()', async function () {
assertStandardReportsAreCorrect([lcp]);

assert(lcp.attribution.url.endsWith('/test/img/square.png?delay=500'));
assert.equal(lcp.attribution.element, 'html>body>main>p>img');
assert.equal(lcp.attribution.element, 'html>body>main>p>img.bar.foo');
assert.equal(
lcp.attribution.timeToFirstByte +
lcp.attribution.resourceLoadDelay +
Expand Down Expand Up @@ -515,7 +515,7 @@ describe('onLCP()', async function () {
assertStandardReportsAreCorrect([lcp]);

assert(lcp.attribution.url.endsWith('/test/img/square.png?delay=500'));
assert.equal(lcp.attribution.element, 'html>body>main>p>img');
assert.equal(lcp.attribution.element, 'html>body>main>p>img.bar.foo');

// Specifically check that resourceLoadDelay falls back to `startTime`.
assert.equal(
Expand Down Expand Up @@ -565,7 +565,7 @@ describe('onLCP()', async function () {

assert(lcp.attribution.url.endsWith('/test/img/square.png?delay=500'));
assert.equal(lcp.navigationType, 'prerender');
assert.equal(lcp.attribution.element, 'html>body>main>p>img');
assert.equal(lcp.attribution.element, 'html>body>main>p>img.bar.foo');

// Assert each individual LCP sub-part accounts for `activationStart`
assert.equal(
Expand Down
2 changes: 1 addition & 1 deletion test/views/lcp.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{% if not imgDelay %}
{% set imgDelay = 500 %}
{% endif %}
<img elementtiming="main-image" {% if imgHidden %}hidden{% endif %} src="/test/img/square.png?delay={{ imgDelay }}">
<img class="foo bar" elementtiming="main-image" {% if imgHidden %}hidden{% endif %} src="/test/img/square.png?delay={{ imgDelay }}">
</p>
<p>Text below the image</p>

Expand Down