enforce Error type and add test

manuelpuyol · manuelpuyol · commit ad2af2d8c5da · 2025-05-19T14:23:35.000-07:00
diff --git a/custom-elements.json b/custom-elements.json
@@ -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"
         },
         {
           "kind": "variable",
-          "name": "dist_default",
+          "name": "index_default",
           "default": "IncludeFragmentElement"
         }
       ],
@@ -30,7 +30,7 @@
           "kind": "js",
           "name": "default",
           "declaration": {
-            "name": "dist_default",
+            "name": "index_default",
             "module": "dist/bundle.js"
           }
         }
@@ -188,12 +188,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "test/test.js",
-      "declarations": [],
-      "exports": []
-    },
     {
       "kind": "javascript-module",
       "path": "src/include-fragment-element-define.ts",
@@ -383,6 +377,13 @@
                   "type": {
                     "text": "string[]"
                   }
+                },
+                {
+                  "name": "error",
+                  "optional": true,
+                  "type": {
+                    "text": "Error"
+                  }
                 }
               ]
             },
@@ -408,12 +409,6 @@
               "type": {
                 "text": "CustomEvent"
               }
-            },
-            {
-              "name": "eventType",
-              "type": {
-                "text": "Event"
-              }
             }
           ],
           "attributes": [
@@ -471,6 +466,12 @@
           }
         }
       ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "test/test.js",
+      "declarations": [],
+      "exports": []
     }
   ]
 }
diff --git a/src/include-fragment-element.ts b/src/include-fragment-element.ts
@@ -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'], error)
+      this.#task(['error', 'loadend'], error as Error)
       throw error
     }
   }
diff --git a/test/test.js b/test/test.js
@@ -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, 'Failed to load resource: the server responded with a status of 500')
   })
 
   test('adds is-error class on 500 status', async function () {

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@`
`9`	`9`	`{`
`10`	`10`	`"kind": "variable",`
`11`	`11`	`"name": "IncludeFragmentElement",`
`12`		- "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}"
	`12`	`+ "default": "class _IncludeFragmentElement extends HTMLElement {\n static"`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"kind": "variable",`
`16`		`- "name": "dist_default",`
	`16`	`+ "name": "index_default",`
`17`	`17`	`"default": "IncludeFragmentElement"`
`18`	`18`	`}`
`19`	`19`	`],`
`@@ -30,7 +30,7 @@`
`30`	`30`	`"kind": "js",`
`31`	`31`	`"name": "default",`
`32`	`32`	`"declaration": {`
`33`		`- "name": "dist_default",`
	`33`	`+ "name": "index_default",`
`34`	`34`	`"module": "dist/bundle.js"`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -188,12 +188,6 @@`
`188`	`188`	`}`
`189`	`189`	`]`
`190`	`190`	`},`
`191`		`- {`
`192`		`- "kind": "javascript-module",`
`193`		`- "path": "test/test.js",`
`194`		`- "declarations": [],`
`195`		`- "exports": []`
`196`		`- },`
`197`	`191`	`{`
`198`	`192`	`"kind": "javascript-module",`
`199`	`193`	`"path": "src/include-fragment-element-define.ts",`
`@@ -383,6 +377,13 @@`
`383`	`377`	`"type": {`
`384`	`378`	`"text": "string[]"`
`385`	`379`	`}`
	`380`	`+ },`
	`381`	`+ {`
	`382`	`+ "name": "error",`
	`383`	`+ "optional": true,`
	`384`	`+ "type": {`
	`385`	`+ "text": "Error"`
	`386`	`+ }`
`386`	`387`	`}`
`387`	`388`	`]`
`388`	`389`	`},`
`@@ -408,12 +409,6 @@`
`408`	`409`	`"type": {`
`409`	`410`	`"text": "CustomEvent"`
`410`	`411`	`}`
`411`		`- },`
`412`		`- {`
`413`		`- "name": "eventType",`
`414`		`- "type": {`
`415`		`- "text": "Event"`
`416`		`- }`
`417`	`412`	`}`
`418`	`413`	`],`
`419`	`414`	`"attributes": [`
`@@ -471,6 +466,12 @@`
`471`	`466`	`}`
`472`	`467`	`}`
`473`	`468`	`]`
	`469`	`+ },`
	`470`	`+ {`
	`471`	`+ "kind": "javascript-module",`
	`472`	`+ "path": "test/test.js",`
	`473`	`+ "declarations": [],`
	`474`	`+ "exports": []`
`474`	`475`	`}`
`475`	`476`	`]`
`476`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ export class IncludeFragmentElement extends HTMLElement {`
`258`	`258`	// Dispatch `error` and `loadend` async to allow
`259`	`259`	// the `load()` promise to resolve _before_ these
`260`	`260`	`// events are fired.`
`261`		`- this.#task(['error', 'loadend'], error)`
	`261`	`+ this.#task(['error', 'loadend'], error as Error)`
`262`	`262`	`throw error`
`263`	`263`	`}`
`264`	`264`	`}`