Skip to content

fix: re-check for scripts after DOM loaded to find unprocessed entities #770

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

Merged
alexiglesias93 merged 1 commit into from
Dec 11, 2025
Merged

fix: re-check for scripts after DOM loaded to find unprocessed entities #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/four-turtles-kneel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@finsweet/attributes': patch
---

fix: re-check for scripts after DOM loaded to find unprocessed entities
43 changes: 24 additions & 19 deletions packages/attributes/src/attributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@ const init = () => {
* Inits all Attributes that are defined in the current script
* or in the DOM if fs-attributes-auto is enabled.
*/
const initAttributes = () => {
const initAttributes = async () => {
let autoLoad = false;

const scripts = document.querySelectorAll<HTMLScriptElement>(`script[type="module"][src="${import.meta.url}"]`);
const getScripts = () =>
document.querySelectorAll<HTMLScriptElement>(`script[type="module"][src="${import.meta.url}"]`);

for (const script of scripts) {
if (window.FinsweetAttributes.scripts.includes(script)) continue;
const initScript = (script: HTMLScriptElement) => {
if (window.FinsweetAttributes.scripts.includes(script)) return;

window.FinsweetAttributes.scripts.push(script);

Expand All @@ -84,29 +85,33 @@ const initAttributes = () => {

initAttribute(key);
}
}
};

getScripts().forEach(initScript);

await waitDOMReady();

getScripts().forEach(initScript);

if (!autoLoad) return;

waitDOMReady().then(() => {
const usedAttributes = new Set<FinsweetAttributeKey>();
const allElements = document.querySelectorAll('*');
const usedAttributes = new Set<FinsweetAttributeKey>();
const allElements = document.querySelectorAll('*');

for (const element of allElements) {
for (const name of element.getAttributeNames()) {
const fsMatch = name.match(/^fs-([^-]+)/);
const key = fsMatch?.[1] as FinsweetAttributeKey | undefined;
for (const element of allElements) {
for (const name of element.getAttributeNames()) {
const fsMatch = name.match(/^fs-([^-]+)/);
const key = fsMatch?.[1] as FinsweetAttributeKey | undefined;

if (key && ATTRIBUTE_KEYS.has(key)) {
usedAttributes.add(key);
}
if (key && ATTRIBUTE_KEYS.has(key)) {
usedAttributes.add(key);
}
}
}

for (const attribute of usedAttributes) {
initAttribute(attribute);
}
});
for (const attribute of usedAttributes) {
initAttribute(attribute);
}
};

/**
Expand Down