Skip to content

Send error information to event #108

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
merged 5 commits into from
May 19, 2025
Merged

Send error information to event #108

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ffb1f9
Send error to event
manuelpuyol May 19, 2025
ad2af2d
enforce Error type and add test
manuelpuyol May 19, 2025
b439bf6
typo
manuelpuyol May 19, 2025
4d5d1fe
restore custom-elements
manuelpuyol May 19, 2025
45014a6
Update test/test.js
manuelpuyol May 19, 2025
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
31 changes: 16 additions & 15 deletions custom-elements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
{
"kind": "variable",
"name": "IncludeFragmentElement",
"default": "class extends HTMLElement {\n constructor() {\n super(...arguments);\n _IncludeFragmentElement_instances.add(this);\n _IncludeFragmentElement_busy.set(this, false);\n _IncludeFragmentElement_observer.set(this, new IntersectionObserver((entries) => {\n for (const entry of entries) {\n if (entry.isIntersecting) {\n const { target } = entry;\n __classPrivateFieldGet(this, _IncludeFragmentElement_observer, \"f\").unobserve(target);\n if (!(target instanceof IncludeFragmentElement))\n return;\n if (target.loading === \"lazy\") {\n __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_handleData).call(this);\n }\n }\n }\n }, {\n rootMargin: \"0px 0px 256px 0px\",\n threshold: 0.01\n }));\n }\n static define(tag = \"include-fragment\", registry = customElements) {\n registry.define(tag, this);\n return this;\n }\n static setCSPTrustedTypesPolicy(policy) {\n cspTrustedTypesPolicyPromise = policy === null ? policy : Promise.resolve(policy);\n }\n static get observedAttributes() {\n return [\"src\", \"loading\"];\n }\n get src() {\n const src = this.getAttribute(\"src\");\n if (src) {\n const link = this.ownerDocument.createElement(\"a\");\n link.href = src;\n return link.href;\n } else {\n return \"\";\n }\n }\n set src(val) {\n this.setAttribute(\"src\", val);\n }\n get loading() {\n if (this.getAttribute(\"loading\") === \"lazy\")\n return \"lazy\";\n return \"eager\";\n }\n set loading(value) {\n this.setAttribute(\"loading\", value);\n }\n get accept() {\n return this.getAttribute(\"accept\") || \"\";\n }\n set accept(val) {\n this.setAttribute(\"accept\", val);\n }\n get data() {\n return __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_getStringOrErrorData).call(this);\n }\n attributeChangedCallback(attribute, oldVal) {\n if (attribute === \"src\") {\n if (this.isConnected && this.loading === \"eager\") {\n __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_handleData).call(this);\n }\n } else if (attribute === \"loading\") {\n if (this.isConnected && oldVal !== \"eager\" && this.loading === \"eager\") {\n __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_handleData).call(this);\n }\n }\n }\n connectedCallback() {\n if (!this.shadowRoot) {\n this.attachShadow({ mode: \"open\" });\n const style = document.createElement(\"style\");\n style.textContent = `:host {display: block;}`;\n this.shadowRoot.append(style, document.createElement(\"slot\"));\n }\n if (this.src && this.loading === \"eager\") {\n __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_handleData).call(this);\n }\n if (this.loading === \"lazy\") {\n __classPrivateFieldGet(this, _IncludeFragmentElement_observer, \"f\").observe(this);\n }\n }\n request() {\n const src = this.src;\n if (!src) {\n throw new Error(\"missing src\");\n }\n return new Request(src, {\n method: \"GET\",\n credentials: \"same-origin\",\n headers: {\n Accept: this.accept || \"text/html\"\n }\n });\n }\n load() {\n return __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_getStringOrErrorData).call(this);\n }\n fetch(request) {\n return fetch(request);\n }\n refetch() {\n privateData.delete(this);\n __classPrivateFieldGet(this, _IncludeFragmentElement_instances, \"m\", _IncludeFragmentElement_handleData).call(this);\n }\n}"
"default": "class _IncludeFragmentElement extends HTMLElement {\n static"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is unusual how it's cut off at static"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh idk why this file changed at all

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not really sure if it's important? like why would we store code in a json object 🤔

},
{
"kind": "variable",
"name": "dist_default",
"name": "index_default",
"default": "IncludeFragmentElement"
}
],
Expand All @@ -30,7 +30,7 @@
"kind": "js",
"name": "default",
"declaration": {
"name": "dist_default",
"name": "index_default",
"module": "dist/bundle.js"
}
}
Expand Down Expand Up @@ -188,12 +188,6 @@
}
]
},
{
"kind": "javascript-module",
"path": "test/test.js",
"declarations": [],
"exports": []
},
{
"kind": "javascript-module",
"path": "src/include-fragment-element-define.ts",
Expand Down Expand Up @@ -383,6 +377,13 @@
"type": {
"text": "string[]"
}
},
{
"name": "error",
"optional": true,
"type": {
"text": "Error"
}
}
]
},
Expand All @@ -408,12 +409,6 @@
"type": {
"text": "CustomEvent"
}
},
{
"name": "eventType",
"type": {
"text": "Event"
}
}
],
"attributes": [
Expand Down Expand Up @@ -471,6 +466,12 @@
}
}
]
},
{
"kind": "javascript-module",
"path": "test/test.js",
"declarations": [],
"exports": []
}
]
}
6 changes: 3 additions & 3 deletions src/include-fragment-element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,10 @@ export class IncludeFragmentElement extends HTMLElement {
}

// Functional stand in for the W3 spec "queue a task" paradigm
async #task(eventsToDispatch: string[]): Promise<void> {
async #task(eventsToDispatch: string[], error?: Error): Promise<void> {
await new Promise(resolve => setTimeout(resolve, 0))
for (const eventType of eventsToDispatch) {
this.dispatchEvent(new Event(eventType))
this.dispatchEvent(error ? new CustomEvent(eventType, {detail: {error}}) : new Event(eventType))
}
}

Expand Down Expand Up @@ -258,7 +258,7 @@ export class IncludeFragmentElement extends HTMLElement {
// Dispatch `error` and `loadend` async to allow
// the `load()` promise to resolve _before_ these
// events are fired.
this.#task(['error', 'loadend'])
this.#task(['error', 'loadend'], error as Error)
throw error
}
}
Expand Down
1 change: 1 addition & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ suite('include-fragment-element', function () {
const event = await when(div.firstChild, 'error')
assert.equal(event.bubbles, false)
assert.equal(event.cancelable, false)
assert.equal(event.detail.error, 'Error: Failed to load resource: the server responded with a status of 500')
})

test('adds is-error class on 500 status', async function () {
Expand Down