@miaskiewicz/turbo-dom 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miaskiewicz/turbo-dom",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Faster, more spec-correct DOM for test runners — native html5ever (Rust/WASM) parser + lazy copy-on-write DOM. A drop-in-style alternative to jsdom/happy-dom for vitest & jest.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/environment/vitest.mjs

@@ -17,9 +17,10 @@ import { installGlobals } from './install.mjs';
 
 const environment = {
   name: 'turbo-dom',
-  // vitest 3/4 read `viteEnvironment`; older versions read `transformMode`.
+  // vitest 3/4 read `viteEnvironment` (this). vitest <3 used `transformMode: 'web'`
+  // — omitted here to avoid the v4 deprecation warning; on vitest <3 set
+  // `test.transformMode` (or add transformMode:'web' to this object) if needed.
   viteEnvironment: 'client',
-  transformMode: 'web',
 
   setup(global, options) {
     const opts = (options && options.turboDom) || {};

package/src/runtime/dom.mjs

@@ -573,14 +573,25 @@ export class Element extends Node {
     }
   }
   focus() {
-    this.ownerDocument.__setActive(this);
-    this.dispatchEvent(new Event('focus'));
-    this.dispatchEvent(new Event('focusin', { bubbles: true }));
+    const doc = this.ownerDocument;
+    const prev = doc.__active;
+    if (prev === this) return;
+    // moving focus blurs the previously-focused element first
+    if (prev && prev !== doc.body && typeof prev.dispatchEvent === 'function') {
+      doc.__active = null;
+      prev.dispatchEvent(new FocusEvent('blur', { relatedTarget: this }));
+      prev.dispatchEvent(new FocusEvent('focusout', { bubbles: true, relatedTarget: this }));
+    }
+    doc.__setActive(this);
+    this.dispatchEvent(new FocusEvent('focus', { relatedTarget: prev || null }));
+    this.dispatchEvent(new FocusEvent('focusin', { bubbles: true, relatedTarget: prev || null }));
   }
   blur() {
-    this.ownerDocument.__setActive(this.ownerDocument.body);
-    this.dispatchEvent(new Event('blur'));
-    this.dispatchEvent(new Event('focusout', { bubbles: true }));
+    const doc = this.ownerDocument;
+    if (doc.__active !== this) return;
+    doc.__setActive(doc.body);
+    this.dispatchEvent(new FocusEvent('blur'));
+    this.dispatchEvent(new FocusEvent('focusout', { bubbles: true }));
   }
   getBoundingClientRect() { return zeroRect(); }
   getClientRects() { return []; }
@@ -807,35 +818,42 @@ export class XMLSerializer {
 
 // minimal inline-style CSSOM (honest: only inline + explicitly set props)
 function makeStyle(el) {
+  // parse → { values: Map<prop,value>, prio: Map<prop,'important'|''> } (handles !important)
   const parse = () => {
-    const map = new Map();
+    const values = new Map();
+    const prio = new Map();
     for (const decl of (el.getAttribute('style') || '').split(';')) {
       const i = decl.indexOf(':');
       if (i === -1) continue;
       const prop = decl.slice(0, i).trim();
-      const val = decl.slice(i + 1).trim();
-      if (prop) map.set(prop, val);
+      let val = decl.slice(i + 1).trim();
+      if (!prop) continue;
+      const m = /\s*!\s*important\s*$/i.exec(val);
+      if (m) { val = val.slice(0, m.index).trim(); prio.set(prop, 'important'); }
+      values.set(prop, val);
     }
-    return map;
+    return { values, prio };
+  };
+  const write = ({ values, prio }) => {
+    el.setAttribute('style', [...values].map(([k, v]) => `${k}: ${v}${prio.get(k) === 'important' ? ' !important' : ''}`).join('; '));
   };
-  const write = (map) => el.setAttribute('style', [...map].map(([k, v]) => `${k}: ${v}`).join('; '));
   return new Proxy({}, {
     get(_t, key) {
-      if (key === 'getPropertyValue') return (p) => parse().get(p) ?? '';
-      if (key === 'getPropertyPriority') return () => ''; // we don't model !important
-      if (key === 'setProperty') return (p, v) => { const m = parse(); m.set(p, v); write(m); };
-      if (key === 'removeProperty') return (p) => { const m = parse(); const v = m.get(p) ?? ''; m.delete(p); write(m); return v; };
-      if (key === 'item') return (i) => [...parse().keys()][i] ?? '';
-      if (key === 'length') return parse().size;
+      if (key === 'getPropertyValue') return (p) => parse().values.get(p) ?? '';
+      if (key === 'getPropertyPriority') return (p) => parse().prio.get(p) ?? '';
+      if (key === 'setProperty') return (p, v, priority) => { const s = parse(); s.values.set(p, String(v)); if (priority) s.prio.set(p, 'important'); else s.prio.delete(p); write(s); };
+      if (key === 'removeProperty') return (p) => { const s = parse(); const v = s.values.get(p) ?? ''; s.values.delete(p); s.prio.delete(p); write(s); return v; };
+      if (key === 'item') return (i) => [...parse().values.keys()][i] ?? '';
+      if (key === 'length') return parse().values.size;
       if (key === 'cssText') return el.getAttribute('style') || '';
-      if (key === 'cssFloat') return parse().get('float') ?? '';
-      if (key === Symbol.iterator) { const keys = [...parse().keys()]; return keys[Symbol.iterator].bind(keys); }
+      if (key === 'cssFloat') return parse().values.get('float') ?? '';
+      if (key === Symbol.iterator) { const keys = [...parse().values.keys()]; return keys[Symbol.iterator].bind(keys); }
       if (typeof key !== 'string') return undefined;
-      return parse().get(kebab(key)) ?? '';
+      return parse().values.get(kebab(key)) ?? '';
     },
     set(_t, key, value) {
       if (key === 'cssText') { el.setAttribute('style', String(value)); return true; }
-      const m = parse(); m.set(kebab(key), String(value)); write(m); return true;
+      const s = parse(); s.values.set(kebab(key), String(value)); write(s); return true;
     },
     has(_t, key) { return typeof key === 'string'; },
   });

package/src/runtime/window.mjs

@@ -31,6 +31,32 @@ class ClipboardEvent extends Event {
   constructor(type, init = {}) { super(type, init); this.clipboardData = init.clipboardData ?? new DataTransfer(); }
 }
 
+// FormData that preserves File/Blob identity. Node's global FormData clones
+// entries into anonymous Blobs (losing the File reference + filename); tests that
+// assert `fd.get('file') === file` need the original kept.
+class TurboFormData {
+  constructor() { this.__entries = []; }
+  append(name, value, filename) { this.__entries.push([String(name), this.__wrap(value, filename)]); }
+  set(name, value, filename) { this.delete(name); this.append(name, value, filename); }
+  __wrap(value, filename) {
+    // string values coerce; File/Blob are kept by reference (optionally re-named)
+    if (value == null || typeof value !== 'object') return String(value);
+    if (filename !== undefined && globalThis.Blob && value instanceof globalThis.Blob && value.name !== filename) {
+      const F = makeFile(); return new F([value], String(filename), { type: value.type });
+    }
+    return value;
+  }
+  get(name) { const e = this.__entries.find((x) => x[0] === String(name)); return e ? e[1] : null; }
+  getAll(name) { return this.__entries.filter((x) => x[0] === String(name)).map((x) => x[1]); }
+  has(name) { return this.__entries.some((x) => x[0] === String(name)); }
+  delete(name) { this.__entries = this.__entries.filter((x) => x[0] !== String(name)); }
+  forEach(cb, thisArg) { for (const [k, v] of this.__entries) cb.call(thisArg, v, k, this); }
+  *entries() { for (const e of this.__entries) yield [e[0], e[1]]; }
+  *keys() { for (const e of this.__entries) yield e[0]; }
+  *values() { for (const e of this.__entries) yield e[1]; }
+  [Symbol.iterator]() { return this.entries(); }
+}
+
 // Capture host functions at module load — BEFORE any installGlobals() can shadow
 // the bare names on globalThis (which would make these delegates call themselves).
 const hostSetTimeout = globalThis.setTimeout;
@@ -78,7 +104,7 @@ export function createWindow(document, { url = 'http://localhost/' } = {}) {
     // web platform globals Node already provides
     fetch: globalThis.fetch ? (...a) => globalThis.fetch(...a) : undefined,
     Headers: globalThis.Headers, Request: globalThis.Request, Response: globalThis.Response,
-    FormData: globalThis.FormData, ReadableStream: globalThis.ReadableStream,
+    FormData: TurboFormData, ReadableStream: globalThis.ReadableStream,
     crypto: globalThis.crypto, Crypto: globalThis.Crypto, SubtleCrypto: globalThis.SubtleCrypto,
     btoa: (s) => Buffer.from(String(s), 'binary').toString('base64'),
     atob: (s) => Buffer.from(String(s), 'base64').toString('binary'),
@@ -102,6 +128,9 @@ export function createWindow(document, { url = 'http://localhost/' } = {}) {
     structuredClone: (...a) => hostStructuredClone(...a),
     getSelection: () => document.getSelection(),
     scrollTo() {}, scroll() {}, scrollBy() {},
+    // window methods libraries/tests spy on — must exist as own props for vi.spyOn
+    open: () => null, close() {}, stop() {}, print() {}, focus() {}, blur() {},
+    moveTo() {}, moveBy() {}, resizeTo() {}, resizeBy() {},
     alert() {}, confirm: () => false, prompt: () => null,
     dispatchEvent: (e) => document.dispatchEvent(e),
     addEventListener: (...a) => document.addEventListener(...a),