fix(jsdom): correctly resolve buffer on typed arrays (#3998)

vitest-dev · Aug 24, 2023 · b42cf36 · b42cf36
1 parent 8caabaa
commit b42cf36
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/packages/vitest/src/integrations/env/edge-runtime.ts b/packages/vitest/src/integrations/env/edge-runtime.ts
@@ -1,6 +1,7 @@
 import { importModule } from 'local-pkg'
 import type { Environment } from '../../types'
 import { populateGlobal } from './utils'
+import { KEYS } from './jsdom-keys'
 
 export default <Environment>({
   name: 'edge-runtime',
@@ -29,6 +30,10 @@ export default <Environment>({
       extend: (context) => {
         context.global = context
         context.Buffer = Buffer
+        KEYS.forEach((key) => {
+          if (key in global)
+            context[key] = global[key]
+        })
         return context
       },
     })

diff --git a/packages/vitest/src/integrations/env/happy-dom.ts b/packages/vitest/src/integrations/env/happy-dom.ts
@@ -14,7 +14,6 @@ export default <Environment>({
 
     // TODO: browser doesn't expose Buffer, but a lot of dependencies use it
     win.Buffer = Buffer
-    win.Uint8Array = Uint8Array
 
     // inject structuredClone if it exists
     if (typeof structuredClone !== 'undefined' && !win.structuredClone)
@@ -24,8 +23,8 @@ export default <Environment>({
       getVmContext() {
         return win
       },
-      teardown() {
-        win.happyDOM.cancelAsync()
+      async teardown() {
+        await win.happyDOM.cancelAsync()
       },
     }
   },

diff --git a/packages/vitest/src/integrations/env/jsdom-keys.ts b/packages/vitest/src/integrations/env/jsdom-keys.ts
@@ -163,6 +163,16 @@ const LIVING_KEYS = [
   'Headers',
   'AbortController',
   'AbortSignal',
+
+  'Uint8Array',
+  'Uint16Array',
+  'Uint32Array',
+  'Uint8ClampedArray',
+  'Int8Array',
+  'Int16Array',
+  'Int32Array',
+  'Float32Array',
+  'Float64Array',
   'ArrayBuffer',
   'DOMRectReadOnly',
   'DOMRect',

diff --git a/packages/vitest/src/integrations/env/jsdom.ts b/packages/vitest/src/integrations/env/jsdom.ts
@@ -68,8 +68,6 @@ export default <Environment>({
 
     // TODO: browser doesn't expose Buffer, but a lot of dependencies use it
     dom.window.Buffer = Buffer
-    // Buffer extends Uint8Array
-    dom.window.Uint8Array = Uint8Array
 
     // inject structuredClone if it exists
     if (typeof structuredClone !== 'undefined' && !dom.window.structuredClone)

diff --git a/test/core/test/dom.test.ts b/test/core/test/dom.test.ts
@@ -164,6 +164,25 @@ it('uses jsdom ArrayBuffer', async () => {
   expect(arraybuffer.constructor === ArrayBuffer).toBeTruthy()
 })
 
+it.each([
+  'Uint8Array',
+  'Uint16Array',
+  'Uint32Array',
+  'Uint8ClampedArray',
+  'Int16Array',
+  'Int32Array',
+  'Int8Array',
+  'Float32Array',
+  'Float64Array',
+] as const)('%s has buffer as ArrayBuffer', async (constructorName) => {
+  const Constructor = globalThis[constructorName]
+  const typedArray = new Constructor([1])
+  expect(typedArray.constructor.name).toBe(constructorName)
+  expect(typedArray instanceof Constructor).toBeTruthy()
+  expect(ArrayBuffer.isView(typedArray)).toBeTruthy()
+  expect(typedArray.buffer instanceof ArrayBuffer).toBeTruthy()
+})
+
 it('doesn\'t throw, if listening for error', () => {
   const spy = vi.fn((e: Event) => e.preventDefault())
   window.addEventListener('error', spy)