@cossackframework/renderer 0.8.0 → 0.8.2

package/dist/component.d.ts

@@ -1,4 +1,4 @@
-import { CossackElement } from './cossack-element';
+import { CossackElement } from './cossack-element.js';
 export interface ComponentResult {
     _type: 'COMPONENT';
     clazz: new () => CossackElement;

package/dist/component.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./component.d.ts"
 //#region src/component.ts
 var e = (e) => typeof e == "object" && !!e && e._type === "COMPONENT";
 //#endregion

package/dist/context.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./context.d.ts"
 //#region src/context.ts
 function e(e) {
 	return {

package/dist/cossack-element.d.ts

@@ -1,6 +1,6 @@
-import { TemplateResult } from './cossack-html';
-import { Context } from './context';
-import type { CSSResultGroup } from './css';
+import { TemplateResult } from './cossack-html.js';
+import { Context } from './context.js';
+import type { CSSResultGroup } from './css.js';
 export type PropertyDeclaration = {
     type?: unknown;
     reflect?: boolean;

package/dist/cossack-element.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./cossack-element.d.ts"
 import { getFinalizedStyles as e } from "./css.js";
 import { TemplateResult as t, html as n, hydrate as r, isTemplateResult as i, render as a } from "./cossack-html.js";
 //#region src/cossack-element.ts

package/dist/cossack-html.d.ts

@@ -1,4 +1,4 @@
-import { CossackElement } from './cossack-element';
+import { CossackElement } from './cossack-element.js';
 export type TemplateResultType = 1 | 2;
 export declare class TemplateResult<T extends TemplateResultType = TemplateResultType> {
     readonly strings: TemplateStringsArray;

package/dist/cossack-html.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./cossack-html.d.ts"
 import { isComponentResult as e } from "./component.js";
 import { CossackElement as t, popCurrentInstance as n, pushCurrentInstance as r } from "./cossack-element.js";
 import { BindResult as i, CacheResult as a, GuardResult as o, IfDefinedResult as s, KeyResult as c, LiveResult as l, PreventDefaultResult as u, RepeatResult as d, resolveField as f, setField as p } from "./directives.js";
@@ -334,7 +335,7 @@ var m = class {
 				if (t) if (t = !1, y(e)) try {
 					this._adoptTemplate(e);
 				} catch (t) {
-					if (t instanceof U) this.clear(), this._clearTemplateCache(), this.updateNode(e);
+					if (t instanceof W) this.clear(), this._clearTemplateCache(), this.updateNode(e);
 					else throw t;
 				}
 				else e == null ? this.clear() : this.updateNode(e);
@@ -345,8 +346,8 @@ var m = class {
 		Object.assign(r, e.props), "props" in r && (r.props = e.props), r.children = e.children, r.requestUpdate();
 	}
 	_adoptSequence(e, t) {
-		let r = K(this._nodesBetween());
-		if (r.length !== e.length) throw new U(`sequence length mismatch: SSR has ${r.length} items, client has ${e.length}`);
+		let r = q(this._nodesBetween());
+		if (r.length !== e.length) throw new W(`sequence length mismatch: SSR has ${r.length} items, client has ${e.length}`);
 		this._childParts = [], this._partKeys = t ? [] : this._partKeys;
 		for (let i = 0; i < e.length; i++) {
 			let [a, o] = r[i], s = new n(a, o);
@@ -354,8 +355,8 @@ var m = class {
 		}
 	}
 	_adoptTemplate(e) {
-		let { fragment: t, parts: n } = V(e), r = this._nodesBetween(), i = /* @__PURE__ */ new Map();
-		q(t.childNodes, r, i), J(n, i);
+		let { fragment: t, parts: n } = H(e), r = this._nodesBetween(), i = /* @__PURE__ */ new Map();
+		J(t.childNodes, r, i), Y(n, i);
 		for (let t = 0; t < e.values.length; t++) n[t] && n[t].update(e.values[t]);
 		this._cachedTemplateIdentity = F(e), this._cachedParts = n;
 	}
@@ -473,8 +474,8 @@ var m = class {
 		else {
 			this._clearTemplateCache(), this.clear();
 			let e = document.createDocumentFragment();
-			H(t, e), this.startNode.parentNode.insertBefore(e, this.endNode);
-			let n = B.get(e.firstChild?.childNodes[0] || e);
+			U(t, e), this.startNode.parentNode.insertBefore(e, this.endNode);
+			let n = V.get(e.firstChild?.childNodes[0] || e);
 			n && (this._cachedTemplateIdentity = n.identity, this._cachedParts = n.parts);
 		}
 		else if (S(t)) {
@@ -484,7 +485,7 @@ var m = class {
 		} else if (e(t) || typeof t == "object" && t && !(t instanceof Node) && !Array.isArray(t)) {
 			this._clearTemplateCache(), this.clear();
 			let e = document.createDocumentFragment();
-			H(h`${t}`, e), this.startNode.parentNode.insertBefore(e, this.endNode);
+			U(h`${t}`, e), this.startNode.parentNode.insertBefore(e, this.endNode);
 		} else if (t instanceof Node) this._clearTemplateCache(), this.clear(), this.startNode.parentNode.insertBefore(t, this.endNode);
 		else if (t === _ || t === "" || t == null || t === !1) this._clearTemplateCache(), this.clear();
 		else {
@@ -574,9 +575,9 @@ var m = class {
 			(!o || o.lastKind !== "checked" || o.lastValue !== e) && (r.checked = e);
 		} else {
 			let e = a == null ? "" : String(a);
-			(!o || o.lastKind !== "value" || String(o.lastValue) !== e) && (r.value = e);
+			(!o || o.lastKind !== "value" || String(o.lastValue) !== e || this.element instanceof HTMLSelectElement && r.value !== e) && (r.value = e);
 		}
-		let s = z(this.element, t), c = !!o && (o.boundComponent !== i || o.boundField !== n.fieldName || o.listener.__eventName !== s);
+		let s = B(this.element, t), c = !!o && (o.boundComponent !== i || o.boundField !== n.fieldName || o.listener.__eventName !== s);
 		if (o && c && (this.element.removeEventListener(o.listener.__eventName, o.listener), this.bindStates.delete(e), o = void 0), o) o.lastKind = t, o.lastValue = t === "checked" ? !!a : a == null ? "" : String(a);
 		else {
 			let r = (e) => {
@@ -589,7 +590,7 @@ var m = class {
 				lastValue: t === "checked" ? !!a : a == null ? "" : String(a),
 				boundComponent: i,
 				boundField: n.fieldName
-			}, this.bindStates.set(e, o);
+			}, this.bindStates.set(e, o), t === "value" && z(this.element, () => this.bindStates.get(e) === o, () => f(o.boundComponent, o.boundField));
 		}
 	}
 }, R = class {
@@ -700,19 +701,28 @@ var m = class {
 			(this.lastFormKind !== "checked" || this.lastFormValue !== e) && (n.checked = e, this.lastFormValue = e, this.lastFormKind = "checked");
 		} else {
 			let e = i == null ? "" : String(i);
-			(this.lastFormKind !== "value" || String(this.lastFormValue) !== e) && (n.value = e, this.lastFormValue = e, this.lastFormKind = "value");
+			(this.lastFormKind !== "value" || String(this.lastFormValue) !== e || this.element instanceof HTMLSelectElement && n.value !== e) && (n.value = e, this.lastFormValue = e, this.lastFormKind = "value");
 		}
-		let a = z(this.element, t);
+		let a = B(this.element, t);
 		if (this.bindListener && (this.boundPropName !== t || this.boundComponent !== r || this.boundFieldName !== e.fieldName || this.bindListener.__eventName !== a) && this._detachBindListener(), !this.bindListener) {
 			let n = (n) => {
 				let i = n.currentTarget, a = t === "checked" ? !!i[t] : i[t];
 				r && p(r, e.fieldName, a);
 			};
-			n.__eventName = a, this.bindListener = n, this.boundPropName = t, this.boundComponent = r, this.boundFieldName = e.fieldName, this.element.addEventListener(a, n);
+			if (n.__eventName = a, this.bindListener = n, this.boundPropName = t, this.boundComponent = r, this.boundFieldName = e.fieldName, this.element.addEventListener(a, n), t === "value") {
+				let e = n;
+				z(this.element, () => this.bindListener === e, () => f(this.boundComponent, this.boundFieldName));
+			}
 		}
 		this.element.hasAttribute(this.name) && this.element.removeAttribute(this.name);
 	}
-}, z = (e, t) => {
+}, z = (e, t, n) => {
+	e instanceof HTMLSelectElement && queueMicrotask(() => {
+		if (!t()) return;
+		let r = n(), i = r == null ? "" : String(r);
+		e.value !== i && (e.value = i);
+	});
+}, B = (e, t) => {
 	if (e instanceof HTMLSelectElement) return "change";
 	if (e instanceof HTMLTextAreaElement) return "input";
 	if (e instanceof HTMLInputElement) {
@@ -720,7 +730,7 @@ var m = class {
 		return t === "checked" || n === "checkbox" || n === "radio" || n === "range" ? "change" : "input";
 	}
 	return "input";
-}, B = /* @__PURE__ */ new WeakMap(), V = (e) => {
+}, V = /* @__PURE__ */ new WeakMap(), H = (e) => {
 	let t = [], n = A(e.strings, e.__cossackScope), r = "", i = !1, a = null, o = /(\.\.\.|[.@?]?[a-zA-Z0-9_:-]+)=["']?$/;
 	for (let e = 0; e < n.length - 1; e++) {
 		let t = n[e];
@@ -789,8 +799,8 @@ var m = class {
 		fragment: l,
 		parts: t
 	};
-}, H = (e, t) => {
-	let n = B.get(t), r = F(e);
+}, U = (e, t) => {
+	let n = V.get(t), r = F(e);
 	if (n && n.identity === r) {
 		n.parts.forEach((t, n) => {
 			t.update(e.values[n]);
@@ -798,22 +808,22 @@ var m = class {
 		return;
 	}
 	if (n) for (let e of n.parts) e && typeof e.dispose == "function" && e.dispose();
-	let { fragment: i, parts: a } = V(e), o = e.values;
+	let { fragment: i, parts: a } = H(e), o = e.values;
 	for (let e = 0; e < o.length; e++) a[e] && a[e].update(o[e]);
 	if (typeof HTMLElement < "u" && t instanceof HTMLElement || typeof ShadowRoot < "u" && t instanceof ShadowRoot) t.innerHTML = "";
 	else for (; t.firstChild;) t.removeChild(t.firstChild);
-	t.appendChild(i), B.set(t, {
+	t.appendChild(i), V.set(t, {
 		identity: r,
 		parts: a
 	});
-}, U = class extends Error {}, W = (e) => e ? e.nodeType === Node.ELEMENT_NODE ? `<${e.nodeName.toLowerCase()}>` : e.nodeType === Node.COMMENT_NODE ? `<!--${e.nodeValue}-->` : e.nodeType === Node.TEXT_NODE ? `text"${(e.nodeValue || "").slice(0, 30)}"` : `nodeType:${e.nodeType}` : "<none>", G = (e) => {
+}, W = class extends Error {}, G = (e) => e ? e.nodeType === Node.ELEMENT_NODE ? `<${e.nodeName.toLowerCase()}>` : e.nodeType === Node.COMMENT_NODE ? `<!--${e.nodeValue}-->` : e.nodeType === Node.TEXT_NODE ? `text"${(e.nodeValue || "").slice(0, 30)}"` : `nodeType:${e.nodeType}` : "<none>", K = (e) => {
 	if (e.nodeType === Node.TEXT_NODE) return (e.nodeValue || "").trim() === "";
 	if (e.nodeType === Node.COMMENT_NODE) {
 		let t = e.nodeValue || "";
 		return !/^CRP_\d+$/.test(t) && t !== "/CRP" && t !== "CSA-S" && t !== "CSA-E";
 	}
 	return !1;
-}, K = (e) => {
+}, q = (e) => {
 	let t = [], n = [];
 	for (let r of e) {
 		if (r.nodeType !== Node.COMMENT_NODE) continue;
@@ -825,19 +835,19 @@ var m = class {
 		}
 	}
 	return t;
-}, q = (e, t, n) => {
+}, J = (e, t, n) => {
 	let r = 0;
 	for (let i = 0; i < e.length; i++) {
 		let a = e[i];
-		if (G(a)) continue;
-		for (; r < t.length && G(t[r]);) r++;
+		if (K(a)) continue;
+		for (; r < t.length && K(t[r]);) r++;
 		let o = t[r];
-		if (!o) throw new U(`existing shorter than blueprint (expected ${W(a)})`);
+		if (!o) throw new W(`existing shorter than blueprint (expected ${G(a)})`);
 		if (a.nodeType === Node.ELEMENT_NODE) {
-			if (o.nodeType !== Node.ELEMENT_NODE || a.nodeName !== o.nodeName || a.namespaceURI !== o.namespaceURI) throw new U(`tag mismatch: blueprint ${W(a)} vs existing ${W(o)}`);
-			n.set(a, o), q(a.childNodes, Array.from(o.childNodes), n);
+			if (o.nodeType !== Node.ELEMENT_NODE || a.nodeName !== o.nodeName || a.namespaceURI !== o.namespaceURI) throw new W(`tag mismatch: blueprint ${G(a)} vs existing ${G(o)}`);
+			n.set(a, o), J(a.childNodes, Array.from(o.childNodes), n);
 		} else {
-			if (a.nodeType !== o.nodeType) throw new U(`type mismatch: blueprint ${W(a)} vs existing ${W(o)}`);
+			if (a.nodeType !== o.nodeType) throw new W(`type mismatch: blueprint ${G(a)} vs existing ${G(o)}`);
 			n.set(a, o);
 		}
 		if (r++, a.nodeType === Node.COMMENT_NODE && /^CRP_\d+$/.test(a.nodeValue || "")) {
@@ -852,23 +862,23 @@ var m = class {
 			}
 		}
 	}
-	for (; r < t.length && G(t[r]);) r++;
-	if (r < t.length) throw new U(`existing longer than blueprint (unexpected ${W(t[r])})`);
-}, J = (e, t) => {
+	for (; r < t.length && K(t[r]);) r++;
+	if (r < t.length) throw new W(`existing longer than blueprint (unexpected ${G(t[r])})`);
+}, Y = (e, t) => {
 	for (let n of e) if (n) {
 		if (n instanceof I) {
 			let e = t.get(n.startNode), r = t.get(n.endNode);
-			if (!e || !r) throw new U("node part anchors not found");
+			if (!e || !r) throw new W("node part anchors not found");
 			n.startNode = e, n.endNode = r, n._beginHydration();
 		} else if (n instanceof R || n instanceof L) {
 			let e = t.get(n.element);
-			if (!e) throw new U("attribute part element not found");
+			if (!e) throw new W("attribute part element not found");
 			n.element = e;
 		}
 	}
-}, Y = (e, t) => {
-	if (!t.hasChildNodes()) return H(e, t);
-	let n = B.get(t), r = F(e);
+}, X = (e, t) => {
+	if (!t.hasChildNodes()) return U(e, t);
+	let n = V.get(t), r = F(e);
 	if (n && n.identity === r) {
 		n.parts.forEach((t, n) => t.update(e.values[n]));
 		return;
@@ -876,19 +886,19 @@ var m = class {
 	if (n) for (let e of n.parts) e && typeof e.dispose == "function" && e.dispose();
 	let i;
 	try {
-		let { fragment: n, parts: r } = V(e);
+		let { fragment: n, parts: r } = H(e);
 		i = r;
 		let a = /* @__PURE__ */ new Map();
-		q(n.childNodes, Array.from(t.childNodes), a), J(i, a);
+		J(n.childNodes, Array.from(t.childNodes), a), Y(i, a);
 		for (let t = 0; t < e.values.length; t++) i[t] && i[t].update(e.values[t]);
 	} catch (n) {
-		if (n instanceof U) return console.warn("[cossack] hydration mismatch, falling back to render:", n.message), H(e, t);
+		if (n instanceof W) return console.warn("[cossack] hydration mismatch, falling back to render:", n.message), U(e, t);
 		throw n;
 	}
-	B.set(t, {
+	V.set(t, {
 		identity: r,
 		parts: i
 	});
 };
 //#endregion
-export { m as TemplateResult, b as UnsafeHTMLResult, v as component, C as escapeHtml, h as html, Y as hydrate, y as isTemplateResult, S as isUnsafeHTML, _ as nothing, H as render, N as renderToString, g as svg, x as unsafeHTML };
+export { m as TemplateResult, b as UnsafeHTMLResult, v as component, C as escapeHtml, h as html, X as hydrate, y as isTemplateResult, S as isUnsafeHTML, _ as nothing, U as render, N as renderToString, g as svg, x as unsafeHTML };

package/dist/css.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./css.d.ts"
 import e from "css-tree/parser";
 import t from "css-tree/generator";
 import n from "css-tree/walker";

package/dist/directives.d.ts

@@ -2,11 +2,11 @@ export declare class LiveResult {
     readonly value: unknown;
     constructor(value: unknown);
 }
-export declare class RepeatResult {
-    readonly items: unknown[];
-    readonly keyFn: (item: any, index: number) => unknown;
-    readonly templateFn: (item: any, index: number) => unknown;
-    constructor(items: unknown[], keyFn: (item: any, index: number) => unknown, templateFn: (item: any, index: number) => unknown);
+export declare class RepeatResult<T = unknown> {
+    readonly items: readonly T[];
+    readonly keyFn: (item: T, index: number) => unknown;
+    readonly templateFn: (item: T, index: number) => unknown;
+    constructor(items: readonly T[], keyFn: (item: T, index: number) => unknown, templateFn: (item: T, index: number) => unknown);
 }
 export declare class KeyResult {
     readonly value: unknown;
@@ -45,7 +45,8 @@ export declare const live: (value: unknown) => LiveResult;
  * Repeats a template for each item in an array, using a key to maintain state.
  * Usage: repeat(items, (item) => item.id, (item) => html`...`)
  */
-export declare const repeat: (items: unknown[], keyFnOrTemplate: (item: any, index: number) => unknown, template?: (item: any, index: number) => unknown) => RepeatResult;
+export declare function repeat<T>(items: readonly T[], template: (item: T, index: number) => unknown): RepeatResult<T>;
+export declare function repeat<T>(items: readonly T[], keyFn: (item: T, index: number) => unknown, template: (item: T, index: number) => unknown): RepeatResult<T>;
 /**
  * Generates a class string from an object.
  * Usage: class="${classMap({ active: isActive })}"

package/dist/directives.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./directives.d.ts"
 //#region src/directives.ts
 var e = class {
 	value;
@@ -45,7 +46,11 @@ var e = class {
 	constructor(e) {
 		this.value = e;
 	}
-}, c = (t) => new e(t), l = (e, n, r) => r === void 0 ? new t(e, (e, t) => t, n) : new t(e, n, r), u = (e) => Object.keys(e).filter((t) => e[t]).join(" "), d = (e) => Object.keys(e).filter((t) => e[t] != null).map((t) => `${t}:${e[t]}`).join(";"), f = (e, t) => new n(e, t), p = (e, t) => new r(e, t);
+}, c = (t) => new e(t);
+function l(e, n, r) {
+	return r === void 0 ? new t(e, (e, t) => t, n) : new t(e, n, r);
+}
+var u = (e) => Object.keys(e).filter((t) => e[t]).join(" "), d = (e) => Object.keys(e).filter((t) => e[t] != null).map((t) => `${t}:${e[t]}`).join(";"), f = (e, t) => new n(e, t), p = (e, t) => new r(e, t);
 function m(e, t) {
 	let n = e;
 	if (!t.includes(".")) return n?.[t];

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export * from './cossack-html';
-export * from './cossack-element';
-export * from './component';
-export * from './context';
-export * from './directives';
-export { css, unsafeCSS, CSSResult } from './css';
-export type { CSSResultGroup } from './css';
+export * from './cossack-html.js';
+export * from './cossack-element.js';
+export * from './component.js';
+export * from './context.js';
+export * from './directives.js';
+export { css, unsafeCSS, CSSResult } from './css.js';
+export type { CSSResultGroup } from './css.js';

package/dist/index.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./index.d.ts"
 import { isComponentResult as e } from "./component.js";
 import { CSSResult as t, css as n, unsafeCSS as r } from "./css.js";
 import { CossackElement as i, instanceStack as a, popCurrentInstance as o, pushCurrentInstance as s } from "./cossack-element.js";

package/dist/minify-html.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./minify-html.d.ts"
 //#region src/minify-html.ts
 var e = /<(script|style|pre|textarea)\b[^>]*>[\s\S]*?<\/\1>/gi, t = RegExp(`<(${[.../* @__PURE__ */ new Set([
 	"area",
@@ -14,7 +15,7 @@ var e = /<(script|style|pre|textarea)\b[^>]*>[\s\S]*?<\/\1>/gi, t = RegExp(`<(${
 	"source",
 	"track",
 	"wbr"
-])].join("|")})(\\s[^>]*)?\\/\\s*>`, "gi"), n = /\s+type\s*=\s*["']text\/(javascript|css)["']/gi, r = /(\w[\w-]*)\s*=\s*["']([a-zA-Z0-9_.-]+)["'](?=\s|\/?>)/g;
+])].join("|")})(\\s[^>]*)?\\/\\s*>`, "gi"), n = /\s+type\s*=\s*["']text\/(javascript|css)["']/gi, r = /(\w[\w-]*)\s*=\s*["']([a-zA-Z0-9_.-]+)["'](?=(\s|\/?>))/g;
 function i(t) {
 	let r = [];
 	return {
@@ -30,7 +31,7 @@ function a(e, t) {
 }
 function o(e) {
 	let { html: o, blocks: s } = i(e), c = o.replace(/<!--(?!\[if\s|\/?CRP|CSA-[SE])[\s\S]*?-->/g, "");
-	return c = c.replace(n, ""), c = c.replace(/\s+/g, " "), c = c.replace(/>\s+</g, "><"), c = c.replace(r, (e, t, n) => `${t}=${n}`), c = c.replace(t, (e, t, n) => `<${t}${n ? n.trimEnd() : ""}>`), c = a(c, s), c = c.replace(/>\s+</g, "><"), c = c.trim(), c;
+	return c = c.replace(n, ""), c = c.replace(/\s+/g, " "), c = c.replace(/>\s+</g, "><"), c = c.replace(r, (e, t, n, r) => r === "/>" ? e : `${t}=${n}`), c = c.replace(t, (e, t, n) => `<${t}${n ? n.trimEnd() : ""}>`), c = a(c, s), c = c.replace(/>\s+</g, "><"), c = c.trim(), c;
 }
 //#endregion
 export { o as minifyHtml };

package/dist/server.d.ts

@@ -1,6 +1,6 @@
-export { renderToString, escapeHtml } from './cossack-html';
-export { html, svg, nothing, TemplateResult } from './cossack-html';
-export type { SVGTemplateResult, ValueSanitizer, SanitizerFactory } from './cossack-html';
-export { css, unsafeCSS, CSSResult } from './css';
-export type { CSSResultGroup } from './css';
-export { minifyHtml } from './minify-html';
+export { renderToString, escapeHtml } from './cossack-html.js';
+export { html, svg, nothing, TemplateResult } from './cossack-html.js';
+export type { SVGTemplateResult, ValueSanitizer, SanitizerFactory } from './cossack-html.js';
+export { css, unsafeCSS, CSSResult } from './css.js';
+export type { CSSResultGroup } from './css.js';
+export { minifyHtml } from './minify-html.js';

package/dist/server.js

@@ -1,3 +1,4 @@
+// @ts-self-types="./server.d.ts"
 import { CSSResult as e, css as t, unsafeCSS as n } from "./css.js";
 import { TemplateResult as r, escapeHtml as i, html as a, nothing as o, renderToString as s, svg as c } from "./cossack-html.js";
 import { minifyHtml as l } from "./minify-html.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cossackframework/renderer",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "type": "module",
   "sideEffects": false,
   "description": "The rendering engine for Cossack Framework. Lit inspired, light dom, ssr",
@@ -18,12 +18,12 @@
   ],
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     },
     "./server": {
-      "import": "./dist/server.js",
-      "types": "./dist/server.d.ts"
+      "types": "./dist/server.d.ts",
+      "import": "./dist/server.js"
     }
   },
   "publishConfig": {
@@ -33,13 +33,14 @@
     "css-tree": "^3.2.1"
   },
   "devDependencies": {
+    "happy-dom": "^20.11.1",
     "oxlint": "^1.41.0",
     "typescript": "^7.0.2",
     "vite": "^8.1.4",
     "vitest": "^4.1.10"
   },
   "scripts": {
-    "build": "vite build && tsc -p tsconfig.declarations.json",
+    "build": "vite build && tsc -p tsconfig.declarations.json && node ../../scripts/rewrite-declaration-imports.mjs dist",
     "test": "vitest",
     "lint": "oxlint"
   }