@verbaly/compiler 0.19.0 → 0.21.0

package/dist/cli.js

@@ -74,13 +74,13 @@ function formatCheckResult(result) {
 	if (result.missing.length > 0) {
 		lines.push("missing translations:");
 		for (const entry of result.missing) {
-			const hint = entry.source ? ` — "${truncate(entry.source, 40)}"` : "";
+			const hint = entry.source ? `: "${truncate(entry.source, 40)}"` : "";
 			lines.push(`  [${entry.locale}] ${entry.key}${hint}`);
 		}
 	}
 	if (result.unknown.length > 0) {
 		lines.push("unknown keys (not in any catalog):");
-		for (const entry of result.unknown) lines.push(`  ${entry.key} — used in ${entry.files.join(", ")}`);
+		for (const entry of result.unknown) lines.push(`  ${entry.key} (used in ${entry.files.join(", ")})`);
 	}
 	return lines.join("\n");
 }
@@ -127,17 +127,21 @@ function visit(nodes, out) {
 }
 function renderParamType(types) {
 	if (types.has("unknown") || types.size === 0) return "unknown";
-	const parts = [];
-	if (types.has("number")) parts.push("number");
-	if (types.has("string")) parts.push("string");
-	if (types.has("date")) parts.push("Date | number | string");
-	return parts.join(" | ");
+	const members = /* @__PURE__ */ new Set();
+	if (types.has("number")) members.add("number");
+	if (types.has("string")) members.add("string");
+	if (types.has("date")) for (const m of [
+		"Date",
+		"number",
+		"string"
+	]) members.add(m);
+	return [...members].join(" | ");
 }
 //#endregion
 //#region src/codegen.ts
-function generateDts(entries) {
+function generateDts(catalog) {
 	const lines = [];
-	for (const [key, message] of [...entries.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+	for (const [key, message] of Object.entries(catalog).sort(([a], [b]) => a.localeCompare(b))) {
 		const params = collectParams(message);
 		if (params.size === 0) lines.push(`    ${JSON.stringify(key)}: never;`);
 		else {
@@ -145,7 +149,7 @@ function generateDts(entries) {
 			lines.push(`    ${JSON.stringify(key)}: { ${fields} };`);
 		}
 	}
-	return `// generated by verbaly — do not edit
+	return `// generated by verbaly: do not edit
 declare module 'virtual:verbaly' {
   export interface VerbalyMessages {
 ${lines.join("\n")}
@@ -186,8 +190,13 @@ declare module 'virtual:verbaly/locale/*' {
 }
 `;
 }
-function writeDts(cfg, entries) {
-	writeFileSync(join(cfg.root, "verbaly.d.ts"), generateDts(entries));
+function writeDts(cfg, catalog) {
+	const file = join(cfg.root, "verbaly.d.ts");
+	const content = generateDts(catalog);
+	try {
+		if (readFileSync(file, "utf8") === content) return;
+	} catch {}
+	writeFileSync(file, content);
 }
 //#endregion
 //#region src/pseudo.ts
@@ -323,7 +332,7 @@ function resolveConfig(config = {}) {
 		dir,
 		sourceLocale,
 		locales: [...locales],
-		include: config.include ?? ["src/**/*.{js,jsx,ts,tsx,mjs,mts}"],
+		include: config.include ?? ["{src,app}/**/*.{js,jsx,ts,tsx,mjs,mts,svelte,vue}"],
 		exclude: config.exclude ?? ["**/node_modules/**", "**/dist/**"],
 		translate: config.translate ?? {},
 		render: config.render ?? {}
@@ -358,7 +367,7 @@ async function loadTsConfig(path) {
 		const { mod } = await bundleRequire({ filepath: path });
 		return mod.default ?? {};
 	} catch (error) {
-		if (isModuleNotFound(error, "esbuild")) throw new Error(`[verbaly] ${path} needs esbuild — install it: pnpm add -D esbuild`, { cause: error });
+		if (isModuleNotFound(error, "esbuild")) throw new Error(`[verbaly] ${path} needs esbuild: install it with pnpm add -D esbuild`, { cause: error });
 		throw error;
 	}
 }
@@ -379,6 +388,38 @@ function definedOnly(config) {
 	return Object.fromEntries(Object.entries(config).filter(([, value]) => value !== void 0));
 }
 //#endregion
+//#region src/registry.ts
+var MessageRegistry = class {
+	files = /* @__PURE__ */ new Map();
+	update(file, analysis) {
+		this.files.set(file, analysis);
+	}
+	remove(file) {
+		this.files.delete(file);
+	}
+	messages() {
+		const out = /* @__PURE__ */ new Map();
+		for (const analysis of this.files.values()) for (const msg of analysis.tagged) {
+			const existing = out.get(msg.key);
+			if (existing) {
+				if (existing.message !== msg.message) console.warn(`[verbaly] key collision "${msg.key}": ${JSON.stringify(existing.message)} vs ${JSON.stringify(msg.message)}, second dropped.`);
+				continue;
+			}
+			out.set(msg.key, msg);
+		}
+		return out;
+	}
+	usedKeys() {
+		const out = /* @__PURE__ */ new Map();
+		for (const analysis of this.files.values()) for (const used of analysis.usedKeys) {
+			const files = out.get(used.key) ?? [];
+			if (!files.includes(used.file)) files.push(used.file);
+			out.set(used.key, files);
+		}
+		return out;
+	}
+};
+//#endregion
 //#region src/key.ts
 function stableKey(message) {
 	return createHash("sha256").update(message).digest("base64url").slice(0, 8);
@@ -392,7 +433,9 @@ const SKIP_KEYS = /* @__PURE__ */ new Set([
 	"innerComments",
 	"extra"
 ]);
-function analyze(code, file) {
+const DEFAULT_T_NAMES = ["t"];
+function analyze(code, file, options = {}) {
+	const names = new Set(options.tNames ?? DEFAULT_T_NAMES);
 	const ast = parse$1(code, {
 		sourceType: "module",
 		errorRecovery: true,
@@ -403,10 +446,10 @@ function analyze(code, file) {
 	walk(ast.program, (node) => {
 		if (node.type === "TaggedTemplateExpression") {
 			const tag = node.tag;
-			const explicit = explicitId(tag);
-			if (!explicit && !isTReference(tag)) return;
+			const explicit = explicitId(tag, names);
+			if (!explicit && !isTReference(tag, names)) return;
 			const quasi = node.quasi;
-			const message = buildMessage(code, quasi);
+			const message = buildMessage(code, quasi, names);
 			if (!message) return;
 			tagged.push({
 				key: explicit ? explicit.key : stableKey(message.text),
@@ -420,47 +463,48 @@ function analyze(code, file) {
 			});
 		} else if (node.type === "CallExpression") {
 			const callee = node.callee;
-			if (!isTReference(callee)) return;
+			if (!isTReference(callee, names)) return;
 			const first = node.arguments[0];
 			if (first?.type === "StringLiteral") usedKeys.push({
 				key: first.value,
 				file
 			});
-		} else if (node.type === "JSXElement") handleTrans(code, node, file, tagged, usedKeys);
+		} else if (node.type === "JSXElement") handleTrans(code, node, file, tagged, usedKeys, names);
 	});
 	return {
 		tagged,
 		usedKeys
 	};
 }
-function handleTrans(code, node, file, tagged, usedKeys) {
+function handleTrans(code, node, file, tagged, usedKeys, names) {
 	const opening = node.openingElement;
 	const nameNode = opening.name;
 	if (nameNode.type !== "JSXIdentifier" || nameNode.name !== "Trans") return;
 	const attrs = opening.attributes;
 	const idAttr = attrs.find((a) => a.type === "JSXAttribute" && a.name.name === "id");
 	const children = node.children;
+	const push = (key, built) => tagged.push({
+		key,
+		message: built.text,
+		params: built.params,
+		start: node.start,
+		end: node.end,
+		tagStart: nameNode.start,
+		tagEnd: nameNode.end,
+		file,
+		jsx: {
+			name: nameNode.name,
+			components: built.components
+		}
+	});
 	if (idAttr) {
 		const value = idAttr.value;
 		if (value?.type !== "StringLiteral") return;
 		const id = value.value;
 		if (attrs.length === 1 && children?.length) {
-			const built = buildTransMessage(code, children);
+			const built = buildTransMessage(code, children, names);
 			if (built?.text.trim()) {
-				tagged.push({
-					key: id,
-					message: built.text,
-					params: built.params,
-					start: node.start,
-					end: node.end,
-					tagStart: nameNode.start,
-					tagEnd: nameNode.end,
-					file,
-					jsx: {
-						name: nameNode.name,
-						components: built.components
-					}
-				});
+				push(id, built);
 				return;
 			}
 		}
@@ -472,31 +516,18 @@ function handleTrans(code, node, file, tagged, usedKeys) {
 	}
 	if (attrs.length > 0) return;
 	if (!children?.length) return;
-	const built = buildTransMessage(code, children);
+	const built = buildTransMessage(code, children, names);
 	if (!built || !built.text.trim()) return;
-	tagged.push({
-		key: stableKey(built.text),
-		message: built.text,
-		params: built.params,
-		start: node.start,
-		end: node.end,
-		tagStart: nameNode.start,
-		tagEnd: nameNode.end,
-		file,
-		jsx: {
-			name: nameNode.name,
-			components: built.components
-		}
-	});
+	push(stableKey(built.text), built);
 }
-function explicitId(tag) {
+function explicitId(tag, names) {
 	if (tag.type !== "CallExpression") return void 0;
 	const callee = tag.callee;
 	if (callee.type !== "MemberExpression" || callee.computed) return void 0;
 	const prop = callee.property;
 	if (prop.type !== "Identifier" || prop.name !== "id") return void 0;
 	const obj = callee.object;
-	if (!isTReference(obj)) return void 0;
+	if (!isTReference(obj, names)) return void 0;
 	const args = tag.arguments;
 	const first = args[0];
 	if (args.length !== 1 || first?.type !== "StringLiteral") return void 0;
@@ -506,7 +537,7 @@ function explicitId(tag) {
 		refEnd: obj.end
 	};
 }
-function buildTransMessage(code, children) {
+function buildTransMessage(code, children, names) {
 	const params = [];
 	const components = [];
 	const takenParams = /* @__PURE__ */ new Map();
@@ -521,7 +552,7 @@ function buildTransMessage(code, children) {
 				text += escapeText(expr.value);
 				continue;
 			}
-			if (containsTaggedT(expr)) return void 0;
+			if (containsTaggedT(expr, names)) return void 0;
 			const source = code.slice(expr.start, expr.end);
 			const name = uniqueName(deriveName(expr, params.length), source, takenParams);
 			params.push({
@@ -574,24 +605,24 @@ function selfClosedSource(code, opening) {
 	const src = code.slice(opening.start, opening.end);
 	return src.endsWith("/>") ? src : `${src.slice(0, -1).trimEnd()} />`;
 }
-function containsTaggedT(node) {
+function containsTaggedT(node, names) {
 	let found = false;
 	walk(node, (n) => {
 		if (n.type !== "TaggedTemplateExpression") return;
 		const tag = n.tag;
-		if (isTReference(tag) || explicitId(tag)) found = true;
+		if (isTReference(tag, names) || explicitId(tag, names)) found = true;
 	});
 	return found;
 }
-function isTReference(node) {
-	if (node.type === "Identifier") return node.name === "t";
+function isTReference(node, names) {
+	if (node.type === "Identifier") return names.has(node.name);
 	if (node.type === "MemberExpression" && !node.computed) {
 		const prop = node.property;
-		return prop.type === "Identifier" && prop.name === "t";
+		return prop.type === "Identifier" && names.has(prop.name);
 	}
 	return false;
 }
-function buildMessage(code, quasi) {
+function buildMessage(code, quasi, names) {
 	const quasis = quasi.quasis;
 	const expressions = quasi.expressions;
 	const params = [];
@@ -600,7 +631,7 @@ function buildMessage(code, quasi) {
 	for (let i = 0; i < expressions.length; i++) {
 		const expr = expressions[i];
 		if (!expr) return void 0;
-		if (containsTaggedT(expr)) return void 0;
+		if (containsTaggedT(expr, names)) return void 0;
 		const source = code.slice(expr.start, expr.end);
 		const name = uniqueName(deriveName(expr, i), source, taken);
 		params.push({
@@ -643,8 +674,9 @@ function uniqueName(base, source, taken) {
 }
 function walk(node, visit) {
 	visit(node);
-	for (const [key, value] of Object.entries(node)) {
+	for (const key in node) {
 		if (SKIP_KEYS.has(key)) continue;
+		const value = node[key];
 		if (Array.isArray(value)) {
 			for (const item of value) if (isNode(item)) walk(item, visit);
 		} else if (isNode(value)) walk(value, visit);
@@ -654,37 +686,110 @@ function isNode(value) {
 	return typeof value === "object" && value !== null && typeof value.type === "string";
 }
 //#endregion
-//#region src/registry.ts
-var MessageRegistry = class {
-	files = /* @__PURE__ */ new Map();
-	update(file, analysis) {
-		this.files.set(file, analysis);
+//#region src/sfc.ts
+const SFC_FILE_RE = /\.(?:svelte|vue)$/;
+function analyzeFile(code, file) {
+	return SFC_FILE_RE.test(file) ? analyzeSfc(code, file) : analyze(code, file);
+}
+const SCRIPT_RE = /(<script\b[^>]*>)([\s\S]*?)(<\/script\s*>)/gi;
+const STYLE_RE = /<style\b[^>]*>[\s\S]*?<\/style\s*>/gi;
+const COMMENT_RE = /<!--[\s\S]*?-->/g;
+const CANDIDATE_SVELTE = /(?<![\w$])\$?t(?=[`(]|\.id\()/g;
+const CANDIDATE_VUE = /(?<![\w$])t(?=[`(]|\.id\()/g;
+function analyzeSfc(code, file) {
+	const svelte = file.endsWith(".svelte");
+	const options = svelte ? { tNames: ["t", "$t"] } : void 0;
+	const tagged = [];
+	const usedKeys = [];
+	for (const match of code.matchAll(SCRIPT_RE)) {
+		const content = match[2];
+		if (!content) continue;
+		merge(analyzeSegment(content, file, options), match.index + match[1].length, false);
 	}
-	remove(file) {
-		this.files.delete(file);
+	const markup = blank(blank(blank(code, SCRIPT_RE), STYLE_RE), COMMENT_RE);
+	const candidates = svelte ? CANDIDATE_SVELTE : CANDIDATE_VUE;
+	let consumedTo = 0;
+	for (const match of markup.matchAll(candidates)) {
+		const start = match.index;
+		if (start < consumedTo) continue;
+		const end = expressionExtent(markup, start);
+		if (end === void 0) continue;
+		merge(analyzeSegment(code.slice(start, end), file, options), start, true);
+		consumedTo = end;
 	}
-	messages() {
-		const out = /* @__PURE__ */ new Map();
-		for (const analysis of this.files.values()) for (const msg of analysis.tagged) {
-			const existing = out.get(msg.key);
-			if (existing) {
-				if (existing.message !== msg.message) console.warn(`[verbaly] key collision "${msg.key}": ${JSON.stringify(existing.message)} vs ${JSON.stringify(msg.message)} — second dropped.`);
-				continue;
-			}
-			out.set(msg.key, msg);
-		}
-		return out;
+	return {
+		tagged,
+		usedKeys
+	};
+	function merge(analysis, offset, markupSegment) {
+		if (!analysis) return;
+		for (const msg of analysis.tagged) tagged.push({
+			...msg,
+			start: msg.start + offset,
+			end: msg.end + offset,
+			tagStart: msg.tagStart + offset,
+			tagEnd: msg.tagEnd + offset,
+			params: msg.params.map((p) => ({
+				...p,
+				start: p.start + offset,
+				end: p.end + offset
+			})),
+			...markupSegment && { singleQuote: true }
+		});
+		usedKeys.push(...analysis.usedKeys);
 	}
-	usedKeys() {
-		const out = /* @__PURE__ */ new Map();
-		for (const analysis of this.files.values()) for (const used of analysis.usedKeys) {
-			const files = out.get(used.key) ?? [];
-			if (!files.includes(used.file)) files.push(used.file);
-			out.set(used.key, files);
+}
+function analyzeSegment(code, file, options) {
+	try {
+		return analyze(code, file, options);
+	} catch {
+		return;
+	}
+}
+function blank(source, re) {
+	return source.replace(re, (m) => " ".repeat(m.length));
+}
+function expressionExtent(code, start) {
+	let i = start;
+	if (code[i] === "$") i += 1;
+	i += 1;
+	if (code.startsWith(".id(", i)) {
+		const close = balancedEnd(code, i + 3);
+		if (close === void 0 || code[close] !== "`") return void 0;
+		return balancedEnd(code, close);
+	}
+	if (code[i] === "`" || code[i] === "(") return balancedEnd(code, i);
+}
+function balancedEnd(code, open) {
+	const stack = [];
+	let i = open;
+	while (i < code.length) {
+		const ch = code[i];
+		if (stack[stack.length - 1] === "`") {
+			if (ch === "\\") i += 1;
+			else if (ch === "`") stack.pop();
+			else if (ch === "$" && code[i + 1] === "{") {
+				stack.push("{");
+				i += 1;
+			}
+		} else if (ch === "'" || ch === "\"") i = stringEnd(code, i);
+		else if (ch === "`" || ch === "(" || ch === "{") stack.push(ch);
+		else if (ch === ")" || ch === "}") {
+			if (stack[stack.length - 1] !== (ch === ")" ? "(" : "{")) return void 0;
+			stack.pop();
 		}
-		return out;
+		i += 1;
+		if (stack.length === 0) return i;
 	}
-};
+}
+function stringEnd(code, start) {
+	const quote = code[start];
+	let i = start + 1;
+	while (i < code.length) if (code[i] === "\\") i += 2;
+	else if (code[i] === quote) return i;
+	else i += 1;
+	return code.length;
+}
 //#endregion
 //#region src/extract.ts
 async function extractProject(cfg) {
@@ -694,7 +799,7 @@ async function extractProject(cfg) {
 		absolute: true
 	});
 	const registry = new MessageRegistry();
-	for (const file of files) registry.update(file, analyze(readFileSync(file, "utf8"), file));
+	for (const file of files) registry.update(file, analyzeFile(readFileSync(file, "utf8"), file));
 	return registry;
 }
 function syncCatalogs(cfg, catalogs, registry) {
@@ -800,27 +905,27 @@ function init(options = {}) {
 const PREVIEW = 5;
 async function doctor(cfg) {
 	const entries = [];
-	const ok = (check, message) => entries.push({
+	const ok = (name, message) => entries.push({
 		level: "ok",
-		check,
+		check: name,
 		message
 	});
-	const warn = (check, message, fix) => entries.push({
+	const warn = (name, message, fix) => entries.push({
 		level: "warn",
-		check,
+		check: name,
 		message,
 		fix
 	});
-	const error = (check, message, fix) => entries.push({
+	const error = (name, message, fix) => entries.push({
 		level: "error",
-		check,
+		check: name,
 		message,
 		fix
 	});
 	const rel = (path) => relative(cfg.root, path).replaceAll("\\", "/");
 	const configFile = findConfigFile(cfg.root);
 	if (configFile) ok("config", `${configFile} found`);
-	else warn("config", "no config file — running on defaults", "run `npx verbaly init`");
+	else warn("config", "no config file, running on defaults", "run `npx verbaly init`");
 	const catalogs = {};
 	let catalogsHealthy = true;
 	if (!existsSync(cfg.dir)) {
@@ -853,14 +958,14 @@ async function doctor(cfg) {
 	const deps = readDeps(cfg.root);
 	const bundler = detectBundler(cfg.root);
 	const wired = deps["@verbaly/vite"] || deps["@verbaly/unplugin"];
-	if (!bundler) ok("plugin", "no bundler detected — CLI flow (extract/check) applies");
+	if (!bundler) ok("plugin", "no bundler detected, the CLI flow (extract/check) applies");
 	else if (wired) ok("plugin", `${deps["@verbaly/vite"] ? "@verbaly/vite" : "@verbaly/unplugin"} installed for ${bundler}`);
 	else if (bundler === "vite") warn("plugin", "vite detected but @verbaly/vite is not installed", "pnpm add -D @verbaly/vite and add verbaly() to the plugins in vite.config");
 	else warn("plugin", `${bundler} detected but @verbaly/unplugin is not installed`, `pnpm add -D @verbaly/unplugin and add the verbaly ${bundler} plugin to your build config`);
 	if (source) {
 		const dtsPath = join(cfg.root, "verbaly.d.ts");
 		if (!existsSync(dtsPath)) warn("types", "verbaly.d.ts has not been generated", "run `npx verbaly extract`");
-		else if (readFileSync(dtsPath, "utf8") !== generateDts(new Map(Object.entries(source)))) warn("types", "verbaly.d.ts is stale", "run `npx verbaly extract`");
+		else if (readFileSync(dtsPath, "utf8") !== generateDts(source)) warn("types", "verbaly.d.ts is stale", "run `npx verbaly extract`");
 		else ok("types", "verbaly.d.ts is up to date");
 	}
 	const registry = await extractProject(cfg);
@@ -873,10 +978,10 @@ async function doctor(cfg) {
 	}
 	if (catalogsHealthy) {
 		const result = check(cfg, catalogs, registry);
-		if (result.unknown.length > 0) error("keys", `${result.unknown.length} unknown ${result.unknown.length === 1 ? "key" : "keys"} used in code (${preview(result.unknown.map((u) => u.key))})`, "fix the key or add it to the catalogs — `npx verbaly check` for details");
+		if (result.unknown.length > 0) error("keys", `${result.unknown.length} unknown ${result.unknown.length === 1 ? "key" : "keys"} used in code (${preview(result.unknown.map((u) => u.key))})`, "fix the key or add it to the catalogs (`npx verbaly check` for details)");
 		if (result.missing.length > 0) {
 			const locales = [...new Set(result.missing.map((m) => m.locale))];
-			warn("translations", `${result.missing.length} missing ${result.missing.length === 1 ? "translation" : "translations"} (${locales.join(", ")})`, "run `npx verbaly translate` or fill the catalogs — `npx verbaly check` for details");
+			warn("translations", `${result.missing.length} missing ${result.missing.length === 1 ? "translation" : "translations"} (${locales.join(", ")})`, "run `npx verbaly translate` or fill the catalogs (`npx verbaly check` for details)");
 		}
 		if (result.ok) ok("translations", "all translations complete");
 	}
@@ -968,19 +1073,20 @@ function exportCatalogs(cfg, catalogs, options = {}) {
 	mkdirSync(dir, { recursive: true });
 	for (const locale of targets) {
 		const catalog = catalogs[locale] ?? {};
-		let entries = Object.keys(source).filter((key) => source[key]).sort().map((key) => ({
+		const all = Object.keys(source).filter((key) => source[key]).sort().map((key) => ({
 			key,
 			source: source[key],
 			target: catalog[key] ?? ""
 		}));
-		if (options.missing) entries = entries.filter((entry) => !entry.target);
+		const untranslated = all.filter((entry) => !entry.target);
+		const entries = options.missing ? untranslated : all;
 		const path = join(dir, `${locale}.${format === "csv" ? "csv" : "xlf"}`);
 		writeFileSync(path, format === "csv" ? toCsv(entries) : toXliff(cfg.sourceLocale, locale, entries));
 		files.push({
 			locale,
 			path,
 			total: entries.length,
-			untranslated: entries.filter((entry) => !entry.target).length
+			untranslated: untranslated.length
 		});
 	}
 	return {
@@ -1000,8 +1106,8 @@ function importCatalogs(cfg, catalogs, files, options = {}) {
 	for (const file of files) {
 		const parsed = parseExchangeFile(file, options.locale);
 		const locale = parsed.locale;
-		if (!/^[a-zA-Z]{2,3}([-_][a-zA-Z0-9]+)*$/.test(locale)) throw new Error(`[verbaly] ${file}: "${locale}" doesn't look like a locale — pass --locale <id>.`);
-		if (locale === cfg.sourceLocale) throw new Error(`[verbaly] ${file} targets the source locale "${locale}" — import fills translations, not the source. Pass --locale if the detection is wrong.`);
+		if (!/^[a-zA-Z]{2,3}([-_][a-zA-Z0-9]+)*$/.test(locale)) throw new Error(`[verbaly] ${file}: "${locale}" doesn't look like a locale, pass --locale <id>.`);
+		if (locale === cfg.sourceLocale) throw new Error(`[verbaly] ${file} targets the source locale "${locale}": import fills translations, not the source. Pass --locale if the detection is wrong.`);
 		const catalog = catalogs[locale] ??= {};
 		for (const [key, text] of Object.entries(parsed.entries)) {
 			if (!text.trim()) continue;
@@ -1028,7 +1134,7 @@ function parseExchangeFile(file, localeOverride) {
 	if (/\.(xlf|xliff)$/i.test(file)) {
 		const parsed = parseXliff(content);
 		const locale = localeOverride ?? parsed.locale;
-		if (!locale) throw new Error(`[verbaly] ${file} has no trgLang/target-language — pass --locale <id>.`);
+		if (!locale) throw new Error(`[verbaly] ${file} has no trgLang/target-language, pass --locale <id>.`);
 		return {
 			locale,
 			entries: parsed.entries
@@ -1038,7 +1144,7 @@ function parseExchangeFile(file, localeOverride) {
 		locale: localeOverride ?? basename(file).replace(/\.csv$/i, ""),
 		entries: parseCsv(content)
 	};
-	throw new Error(`[verbaly] ${file}: unsupported format — expected .xlf, .xliff or .csv.`);
+	throw new Error(`[verbaly] ${file}: unsupported format, expected .xlf, .xliff or .csv.`);
 }
 function toXliff(sourceLocale, locale, entries) {
 	const units = entries.map(({ key, source, target }) => [
@@ -1413,7 +1519,7 @@ function decodeEntities(text) {
 }
 //#endregion
 //#region src/run.ts
-const HELP = `verbaly — i18n compiler
+const HELP = `verbaly · i18n compiler
 
 Usage:
   verbaly init       scaffold config + locale catalogs (detects your bundler)
@@ -1441,7 +1547,7 @@ Options:
   --locale <id>      pseudo-locale id (pseudo) / target-locale override (import)
   --site <path>      built site directory (render, default: dist)
   --attribute <name> base data attribute (render, default: data-verbaly)
-  --base-url <url>   site origin — enables hreflang alternates (render)
+  --base-url <url>   site origin, enables hreflang alternates (render)
   --sitemap          emit sitemap-i18n.xml with per-locale alternates (render)
   --clean            remove existing locale dirs before mirroring (render)
 
@@ -1508,7 +1614,7 @@ async function runCli(args = process.argv.slice(2)) {
 			warn: "⚠",
 			error: "✗"
 		};
-		console.log(`[verbaly] doctor — ${result.entries.length} checks`);
+		console.log(`[verbaly] doctor: ${result.entries.length} checks`);
 		for (const entry of result.entries) {
 			const line = `  ${icon[entry.level]} ${entry.check}: ${entry.message}`;
 			if (entry.level === "error") console.error(line);
@@ -1529,12 +1635,12 @@ async function runCli(args = process.argv.slice(2)) {
 		const catalogs = loadCatalogs(cfg);
 		if (values.prune) {
 			const removed = pruneCatalogs(cfg, catalogs, registry);
-			for (const [locale, keys] of Object.entries(removed)) console.log(dryRun ? `  ${locale}: would prune ${keys.length} — ${keys.join(", ")}` : `  ${locale}: -${keys.length} pruned`);
+			for (const [locale, keys] of Object.entries(removed)) console.log(dryRun ? `  ${locale}: would prune ${keys.length}: ${keys.join(", ")}` : `  ${locale}: -${keys.length} pruned`);
 		}
 		const { added } = syncCatalogs(cfg, catalogs, registry);
 		if (!dryRun) {
 			for (const locale of cfg.locales) writeCatalog(cfg, locale, catalogs[locale] ?? {});
-			writeDts(cfg, new Map(Object.entries(catalogs[cfg.sourceLocale] ?? {})));
+			writeDts(cfg, catalogs[cfg.sourceLocale] ?? {});
 		}
 		const total = registry.messages().size;
 		console.log(`[verbaly] ${total} messages · locales: ${cfg.locales.join(", ")}${dryRun ? " (dry run, nothing written)" : ""}`);
@@ -1565,7 +1671,7 @@ async function runCli(args = process.argv.slice(2)) {
 				console.log("[verbaly] nothing to translate ✓");
 				return;
 			}
-			for (const [locale, keys] of entries) console.log(`  ${locale}: ${keys.length} missing — ${keys.join(", ")}`);
+			for (const [locale, keys] of entries) console.log(`  ${locale}: ${keys.length} missing: ${keys.join(", ")}`);
 			return;
 		}
 		for (const locale of Object.keys(result.translated)) {
@@ -1579,7 +1685,7 @@ async function runCli(args = process.argv.slice(2)) {
 	if (command === "export") {
 		const format = values.format ?? "xliff";
 		if (format !== "xliff" && format !== "csv") {
-			console.error(`[verbaly] unknown format "${values.format}" — use xliff or csv`);
+			console.error(`[verbaly] unknown format "${values.format}", use xliff or csv`);
 			process.exitCode = 1;
 			return;
 		}
@@ -1631,7 +1737,7 @@ async function runCli(args = process.argv.slice(2)) {
 			clean: values.clean
 		});
 		console.log(`[verbaly] ${result.files} pages × ${result.locales.length} locales (${result.locales.join(", ")})`);
-		for (const [locale, keys] of Object.entries(result.missing)) console.warn(`  ${locale}: ${keys.length} keys not pre-filled — ${keys.join(", ")}`);
+		for (const [locale, keys] of Object.entries(result.missing)) console.warn(`  ${locale}: ${keys.length} keys not pre-filled: ${keys.join(", ")}`);
 		return;
 	}
 	if (command === "pseudo") {
@@ -1683,14 +1789,14 @@ function rejectStrayFlags(command, values) {
 	const allowed = /* @__PURE__ */ new Set([...COMMON_FLAGS, ...own]);
 	const stray = Object.keys(values).filter((k) => values[k] !== void 0 && !allowed.has(k));
 	if (stray.length === 0) return false;
-	for (const flag of stray) console.error(`[verbaly] --${flag} is not a "${command}" flag${flag === "locale" ? " — did you mean --locales?" : ""}`);
+	for (const flag of stray) console.error(`[verbaly] --${flag} is not a "${command}" flag${flag === "locale" ? " (did you mean --locales?)" : ""}`);
 	process.exitCode = 1;
 	return true;
 }
 async function resolveProvider(cfg, model) {
 	const configured = cfg.translate.provider;
 	if (typeof configured === "function") return configured;
-	const { claudeProvider } = await import("./claude-mpjdqqnY.js");
+	const { claudeProvider } = await import("./claude-C-ETlqsW.js");
 	return claudeProvider({ model: model ?? cfg.translate.model });
 }
 //#endregion