Skip to content

Commit 5dfb899

Browse files
authored
Merge pull request #87 from github/throw-errors-rather-than-resolving-them
throw errors rather than resolving them
2 parents c56996d + fc4f707 commit 5dfb899

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/index.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
interface CachedData {
22
src: string
3-
data: Promise<string | CSPTrustedHTMLToStringable | Error>
3+
data: Promise<string | CSPTrustedHTMLToStringable>
44
}
55
const privateData = new WeakMap<IncludeFragmentElement, CachedData>()
66

@@ -65,7 +65,7 @@ export default class IncludeFragmentElement extends HTMLElement {
6565

6666
// We will return string or error for API backwards compatibility. We can consider
6767
// returning TrustedHTML in the future.
68-
get data(): Promise<string | Error> {
68+
get data(): Promise<string> {
6969
return this.#getStringOrErrorData()
7070
}
7171

@@ -117,7 +117,7 @@ export default class IncludeFragmentElement extends HTMLElement {
117117
})
118118
}
119119

120-
load(): Promise<string | Error> {
120+
load(): Promise<string> {
121121
return this.#getStringOrErrorData()
122122
}
123123

@@ -177,13 +177,13 @@ export default class IncludeFragmentElement extends HTMLElement {
177177
}
178178
}
179179

180-
async #getData(): Promise<string | CSPTrustedHTMLToStringable | Error> {
180+
async #getData(): Promise<string | CSPTrustedHTMLToStringable> {
181181
const src = this.src
182182
const cachedData = privateData.get(this)
183183
if (cachedData && cachedData.src === src) {
184184
return cachedData.data
185185
} else {
186-
let data: Promise<string | CSPTrustedHTMLToStringable | Error>
186+
let data: Promise<string | CSPTrustedHTMLToStringable>
187187
if (src) {
188188
data = this.#fetchDataWithEvents()
189189
} else {
@@ -194,10 +194,10 @@ export default class IncludeFragmentElement extends HTMLElement {
194194
}
195195
}
196196

197-
async #getStringOrErrorData(): Promise<string | Error> {
197+
async #getStringOrErrorData(): Promise<string> {
198198
const data = await this.#getData()
199199
if (data instanceof Error) {
200-
return data
200+
throw data
201201
}
202202
return data.toString()
203203
}

0 commit comments

Comments
 (0)