@verbaly/compiler 0.19.0 → 0.20.0

package/README.md

@@ -11,7 +11,7 @@
 
 ---
 
-The compiler behind [Verbaly](https://github.com/AronSoto/verbaly): AST extraction of `t\`...\``**and JSX`<Trans>` children** into stable hashed keys — or **readable keys** via `` t.id('inbox.title')`…` `` and `<Trans id="inbox.title">…</Trans>` — flat JSON catalog sync, and typed codegen. It also ships the **`verbaly` CLI**.
+The compiler behind [Verbaly](https://github.com/AronSoto/verbaly): AST extraction of `t\`...\``**and JSX`<Trans>` children** into stable hashed keys — or **readable keys** via `` t.id('inbox.title')`…` `` and `<Trans id="inbox.title">…</Trans>` — flat JSON catalog sync, and typed codegen. It also ships the **`verbaly` CLI**. Extraction covers `.js/.ts/.jsx/.tsx` **and `.svelte`/`.vue` single-file components** (script blocks and markup, including Svelte's `$t` store form).
 
 > Most projects don't install this directly — [`@verbaly/vite`](https://www.npmjs.com/package/@verbaly/vite) wraps it with zero config. Reach for it when scripting extraction/checks yourself.
 

package/dist/cli.js

@@ -145,7 +145,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")}
@@ -323,7 +323,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 ?? {}
@@ -379,6 +379,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 +424,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 +437,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,20 +454,20 @@ 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;
@@ -445,7 +479,7 @@ function handleTrans(code, node, file, tagged, usedKeys) {
 		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,
@@ -472,7 +506,7 @@ 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),
@@ -489,14 +523,14 @@ function handleTrans(code, node, file, tagged, usedKeys) {
 		}
 	});
 }
-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 +540,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 +555,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 +608,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 +634,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({
@@ -654,37 +688,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 +801,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) {