@verbaly/compiler 0.23.0 → 0.24.0

package/dist/index.js

@@ -2,7 +2,7 @@ import { parse } from "@babel/parser";
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, watch, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
-import { RICH_TAGS, createVerbaly, parse as parse$1, parseTags, safeHref } from "verbaly";
+import { RICH_TAGS, createVerbaly, normalizeLink, parse as parse$1, parseTags, safeAttribute } from "verbaly";
 import { pathToFileURL } from "node:url";
 import MagicString from "magic-string";
 import { glob } from "tinyglobby";
@@ -1574,12 +1574,13 @@ function renderHtml(html, options) {
 		if (attrMapRaw !== void 0) {
 			const map = parseArgs(attrMapRaw);
 			if (map) for (const [name, attrKey] of Object.entries(map)) {
-				if (typeof attrKey !== "string" || name.toLowerCase().startsWith("on")) continue;
+				if (typeof attrKey !== "string") continue;
 				if (!v.has(attrKey)) {
 					missing.add(attrKey);
 					continue;
 				}
-				setAttribute(ms, html, chunkStart, openEnd, attrChunk, name, t(attrKey, args));
+				const value = safeAttribute(name, t(attrKey, args));
+				if (value !== void 0) setAttribute(ms, html, chunkStart, openEnd, attrChunk, name, value);
 			}
 		}
 	}
@@ -1741,10 +1742,8 @@ function richToHtml(nodes, allowed, links) {
 	let out = "";
 	for (const node of nodes) if (typeof node === "string") out += escapeHtml(node);
 	else if (links?.[node.name] !== void 0) {
-		const link = links[node.name];
-		const { href, target, rel } = typeof link === "string" ? { href: link } : link;
-		const safe = safeHref(href);
-		let attrs = safe !== void 0 ? ` href="${escapeAttr(safe)}"` : "";
+		const { href, target, rel } = normalizeLink(links[node.name]);
+		let attrs = href !== void 0 ? ` href="${escapeAttr(href)}"` : "";
 		if (target) attrs += ` target="${escapeAttr(target)}"`;
 		if (rel) attrs += ` rel="${escapeAttr(rel)}"`;
 		out += `<a${attrs}>${richToHtml(node.children, allowed, links)}</a>`;