Merge pull request #14 from mbland/improve-error-rethrows

Rethrow Jsdom import errors properly
mbland · Jan 5, 2024 · de8bc48 · de8bc48
2 parents cd9a3f3 + fc06c9a
commit de8bc48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/jsdom.js b/lib/jsdom.js
@@ -71,7 +71,7 @@ export default class JsdomPageOpener {
     try {
       await this.#importModules(window, document)
     } catch (err) {
-      throw new Error(`error importing modules from ${pagePath}: ${err}`)
+      throw new Error(`opening ${pagePath}`, { cause: err })
     }
     return { window, document, close() { window.close() } }
   }
@@ -159,6 +159,6 @@ function importModules(doc) {
   const modules = Array.from(doc.querySelectorAll('script[type="module"]'))
   return Promise.all(modules.filter(m => m.src).map(async m => {
     try { await import(m.src) }
-    catch (err) { throw new Error(`error importing ${m.src}: ${err}`) }
+    catch (err) { throw new Error(`importing ${m.src}`, { cause: err }) }
   }))
 }
diff --git a/test/jsdom.test.js b/test/jsdom.test.js
@@ -17,8 +17,12 @@ describe.skipIf(globalThis.window !== undefined)('JsdomPageOpener', () => {
     const pagePath = './test-modules/error.html'
     const moduleUrl = pathToFileURL('./test-modules/error.js')
 
-    await expect(() => opener.open('unused', pagePath)).rejects
-      .toThrowError(`error importing modules from ${pagePath}: ` +
-        `Error: error importing ${moduleUrl.href}: Error: test error`)
+    const result = opener.open('unused', pagePath)
+
+    await expect(result).rejects.toThrowError(`opening ${pagePath}`)
+    await result.catch(err => {
+      expect(err.cause.message).toBe(`importing ${moduleUrl.href}`)
+      expect(err.cause.cause.message).toBe('test error')
+    })
   })
 })