@verbaly/compiler 0.23.0 → 0.25.0

package/dist/index.d.ts

@@ -120,6 +120,7 @@ declare class MessageRegistry {
   remove(file: string): void;
   messages(): Map<string, TaggedMessage>;
   usedKeys(): Map<string, string[]>;
+  origins(): Map<string, string[]>;
 }
 //#endregion
 //#region src/check.d.ts
@@ -197,6 +198,7 @@ interface ExportOptions {
   format?: ExportFormat;
   out?: string;
   missing?: boolean;
+  origins?: Record<string, string[]>;
 }
 interface ExportedFile {
   locale: string;

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, localeDirection, normalizeLink, parse as parse$1, parseTags, safeAttribute } from "verbaly";
 import { pathToFileURL } from "node:url";
 import MagicString from "magic-string";
 import { glob } from "tinyglobby";
@@ -918,6 +918,15 @@ var MessageRegistry = class {
 		}
 		return out;
 	}
+	origins() {
+		const out = this.usedKeys();
+		for (const analysis of this.files.values()) for (const msg of analysis.tagged) {
+			const files = out.get(msg.key) ?? [];
+			if (!files.includes(msg.file)) files.push(msg.file);
+			out.set(msg.key, files);
+		}
+		return out;
+	}
 };
 //#endregion
 //#region src/extract.ts
@@ -1248,7 +1257,8 @@ function exportCatalogs(cfg, catalogs, options = {}) {
 		const all = Object.keys(source).filter((key) => source[key]).sort().map((key) => ({
 			key,
 			source: source[key],
-			target: catalog[key] ?? ""
+			target: catalog[key] ?? "",
+			location: options.origins?.[key]
 		}));
 		const untranslated = all.filter((entry) => !entry.target);
 		const entries = options.missing ? untranslated : all;
@@ -1344,8 +1354,13 @@ function parseExchangeFile(file, localeOverride) {
 	throw new Error(`[verbaly] ${file}: unsupported format, expected .xlf, .xliff or .csv.`);
 }
 function toXliff(sourceLocale, locale, entries) {
-	const units = entries.map(({ key, source, target }) => [
+	const units = entries.map(({ key, source, target, location }) => [
 		`    <unit id="${escapeXml(key)}">`,
+		...location?.length ? [
+			"      <notes>",
+			...location.map((file) => `        <note category="location">${escapeXml(file)}</note>`),
+			"      </notes>"
+		] : [],
 		`      <segment state="${target ? "translated" : "initial"}">`,
 		`        <source>${escapeXml(source)}</source>`,
 		`        <target>${escapeXml(target)}</target>`,
@@ -1395,8 +1410,8 @@ function unescapeXml(text) {
 }
 function toCsv(entries) {
 	return [
-		"key,source,target",
-		...entries.map(({ key, source, target }) => `${csvField(key)},${csvField(source)},${csvField(target)}`),
+		"key,source,target,location",
+		...entries.map(({ key, source, target, location }) => `${csvField(key)},${csvField(source)},${csvField(target)},${csvField(location?.join("; ") ?? "")}`),
 		""
 	].join("\r\n");
 }
@@ -1545,6 +1560,7 @@ function renderHtml(html, options) {
 		const chunkStart = m.index + 1 + rawName.length;
 		if (tagName === "html" && options.setLang !== false) {
 			setAttribute(ms, html, chunkStart, openEnd, attrChunk, "lang", options.locale);
+			setAttribute(ms, html, chunkStart, openEnd, attrChunk, "dir", localeDirection(options.locale));
 			continue;
 		}
 		const attrs = parseAttrs(attrChunk);
@@ -1574,12 +1590,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 +1758,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>`;