@verbaly/compiler 0.18.0 → 0.20.0

package/dist/index.d.ts

@@ -23,6 +23,7 @@ interface TaggedMessage {
     name: string;
     components: TransComponent[];
   };
+  singleQuote?: boolean;
 }
 interface UsedKey {
   key: string;
@@ -32,7 +33,15 @@ interface Analysis {
   tagged: TaggedMessage[];
   usedKeys: UsedKey[];
 }
-declare function analyze(code: string, file: string): Analysis;
+interface AnalyzeOptions {
+  tNames?: readonly string[];
+}
+declare function analyze(code: string, file: string, options?: AnalyzeOptions): Analysis;
+//#endregion
+//#region src/sfc.d.ts
+declare const SFC_FILE_RE: RegExp;
+declare function analyzeFile(code: string, file: string): Analysis;
+declare function analyzeSfc(code: string, file: string): Analysis;
 //#endregion
 //#region src/translate.d.ts
 interface TranslateRequest {
@@ -133,7 +142,11 @@ declare function formatCheckResult(result: CheckResult): string;
 //#endregion
 //#region src/codegen.d.ts
 declare const VIRTUAL_ID = "virtual:verbaly";
-declare function generateRuntimeModule(cfg: ResolvedConfig): string;
+interface RuntimeModuleOptions {
+  localeImport?: (locale: string) => string;
+  extraExports?: string;
+}
+declare function generateRuntimeModule(cfg: ResolvedConfig, options?: RuntimeModuleOptions): string;
 declare function generateLocaleModule(catalog: Catalog): string;
 declare function generateDts(entries: Map<string, string>): string;
 declare function writeDts(cfg: ResolvedConfig, entries: Map<string, string>): void;
@@ -289,5 +302,5 @@ interface TransformResult {
 }
 declare function transformCode(code: string, file: string, analysis?: Analysis): TransformResult | null;
 //#endregion
-export { type Alternate, type Analysis, type Catalog, type Catalogs, type CheckResult, type ClaudeProviderOptions, type DoctorEntry, type DoctorResult, type ExchangeFormat, type ExportOptions, type ExportResult, type ExportedFile, type ImportOptions, type ImportResult, type InitOptions, type InitResult, LOCALE_MODULE_PREFIX, MessageRegistry, type MissingEntry, PSEUDO_LOCALE, type ParamType, RESOLVED_VIRTUAL_ID, type RenderConfig, type RenderHtmlOptions, type RenderHtmlResult, type RenderSiteOptions, type RenderSiteResult, type ResolvedConfig, SOURCE_FILE_RE, type SyncResult, type TaggedMessage, type TaggedParam, type TransComponent, type TransformResult, type TranslateConfig, type TranslateOptions, type TranslateProvider, type TranslateRequest, type TranslateResult, type UnknownEntry, type UsedKey, VIRTUAL_ID, type VerbalyConfig, analyze, catalogPath, check, claudeProvider, collectParams, detectBundler, doctor, exportCatalogs, extractProject, findConfigFile, formatCheckResult, generateDts, generateLocaleModule, generateRuntimeModule, importCatalogs, init, isTransformTarget, loadCatalogs, loadConfig, loadConfigFile, loadVirtualModule, parseExchangeFile, pruneCatalogs, pseudoCatalogs, pseudoLocalize, readCatalog, renderHtml, renderParamType, renderSite, resolveConfig, resolveVirtualId, runBuildGate, serializeCatalog, stableKey, structureMatches, syncCatalogs, targetLocales, transformCode, translateCatalogs, writeCatalog, writeDts };
+export { type Alternate, type Analysis, type AnalyzeOptions, type Catalog, type Catalogs, type CheckResult, type ClaudeProviderOptions, type DoctorEntry, type DoctorResult, type ExchangeFormat, type ExportOptions, type ExportResult, type ExportedFile, type ImportOptions, type ImportResult, type InitOptions, type InitResult, LOCALE_MODULE_PREFIX, MessageRegistry, type MissingEntry, PSEUDO_LOCALE, type ParamType, RESOLVED_VIRTUAL_ID, type RenderConfig, type RenderHtmlOptions, type RenderHtmlResult, type RenderSiteOptions, type RenderSiteResult, type ResolvedConfig, type RuntimeModuleOptions, SFC_FILE_RE, SOURCE_FILE_RE, type SyncResult, type TaggedMessage, type TaggedParam, type TransComponent, type TransformResult, type TranslateConfig, type TranslateOptions, type TranslateProvider, type TranslateRequest, type TranslateResult, type UnknownEntry, type UsedKey, VIRTUAL_ID, type VerbalyConfig, analyze, analyzeFile, analyzeSfc, catalogPath, check, claudeProvider, collectParams, detectBundler, doctor, exportCatalogs, extractProject, findConfigFile, formatCheckResult, generateDts, generateLocaleModule, generateRuntimeModule, importCatalogs, init, isTransformTarget, loadCatalogs, loadConfig, loadConfigFile, loadVirtualModule, parseExchangeFile, pruneCatalogs, pseudoCatalogs, pseudoLocalize, readCatalog, renderHtml, renderParamType, renderSite, resolveConfig, resolveVirtualId, runBuildGate, serializeCatalog, stableKey, structureMatches, syncCatalogs, targetLocales, transformCode, translateCatalogs, writeCatalog, writeDts };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -19,7 +19,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(code, {
 		sourceType: "module",
 		errorRecovery: true,
@@ -30,10 +32,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),
@@ -47,20 +49,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;
@@ -72,7 +74,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,
@@ -99,7 +101,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),
@@ -116,14 +118,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;
@@ -133,7 +135,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();
@@ -148,7 +150,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({
@@ -201,24 +203,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 = [];
@@ -227,7 +229,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({
@@ -281,6 +283,111 @@ function isNode(value) {
 	return typeof value === "object" && value !== null && typeof value.type === "string";
 }
 //#endregion
+//#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);
+	}
+	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;
+	}
+	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);
+	}
+}
+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();
+		}
+		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/catalog.ts
 function catalogPath(cfg, locale) {
 	return join(cfg.dir, `${locale}.json`);
@@ -409,25 +516,35 @@ function renderParamType(types) {
 //#endregion
 //#region src/codegen.ts
 const VIRTUAL_ID = "virtual:verbaly";
-function generateRuntimeModule(cfg) {
+function generateRuntimeModule(cfg, options = {}) {
+	const importPath = options.localeImport ?? ((locale) => `virtual:verbaly/locale/${locale}`);
 	const others = cfg.locales.filter((locale) => locale !== cfg.sourceLocale);
 	const src = JSON.stringify(cfg.sourceLocale);
-	const loaders = others.map((locale) => `      ${JSON.stringify(locale)}: () => import('${VIRTUAL_ID}/locale/${locale}'),`).join("\n");
+	const loaders = others.map((locale) => `  ${JSON.stringify(locale)}: () => import('${importPath(locale)}'),`).join("\n");
 	return `import { createVerbaly } from 'verbaly';
-import source from '${VIRTUAL_ID}/locale/${cfg.sourceLocale}';
+import source from '${importPath(cfg.sourceLocale)}';
 
 export const sourceLocale = ${src};
 export const locales = ${JSON.stringify(cfg.locales)};
 
-// per-request/per-instance factory (SSR) — the singleton below is browser/SPA-only
+const localeLoaders = {
+${loaders}
+};
+
+// raw catalog access: SSR integrations serialize it across the client boundary
+export async function loadMessages(locale) {
+  if (locale === ${src}) return source;
+  const loader = localeLoaders[locale];
+  return loader ? (await loader()).default : {};
+}
+
+// per-request/per-instance factory (SSR): the singleton below is browser/SPA-only
 export function createInstance(options) {
   return createVerbaly({
     locale: ${src},
     fallback: ${src},
     messages: { [${src}]: source },
-    loaders: {
-${loaders}
-    },
+    loaders: localeLoaders,
     ...options,
   });
 }
@@ -456,7 +573,7 @@ export async function setLocale(locale) {
   await v.loadLocale(locale);
   v.setLocale(locale);
 }
-`;
+${options.extraExports ?? ""}`;
 }
 function generateLocaleModule(catalog) {
 	return `export default ${JSON.stringify(catalog)};\n`;
@@ -471,7 +588,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")}
@@ -482,6 +599,7 @@ ${lines.join("\n")}
 
   export const sourceLocale: string;
   export const locales: string[];
+  export function loadMessages(locale: string): Promise<Record<string, string>>;
   export function createInstance(
     options?: import('verbaly').VerbalyOptions<VerbalyKey>,
   ): import('verbaly').Verbaly<VerbalyKey>;
@@ -648,7 +766,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 ?? {}
@@ -707,7 +825,7 @@ function definedOnly(config) {
 //#region src/plugin.ts
 const RESOLVED_VIRTUAL_ID = "\0virtual:verbaly";
 const LOCALE_MODULE_PREFIX = `${RESOLVED_VIRTUAL_ID}/locale/`;
-const SOURCE_FILE_RE = /\.[cm]?[jt]sx?$/;
+const SOURCE_FILE_RE = /\.(?:[cm]?[jt]sx?|svelte|vue)$/;
 function resolveVirtualId(id) {
 	if (id === "virtual:verbaly" || id.startsWith(`virtual:verbaly/`)) return "\0" + id;
 }
@@ -763,7 +881,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) {
@@ -1529,14 +1647,18 @@ function decodeEntities(text) {
 }
 //#endregion
 //#region src/transform.ts
+function quote(text, single) {
+	if (!single) return JSON.stringify(text);
+	return `'${text.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}'`;
+}
 function transformCode(code, file, analysis) {
-	const { tagged } = analysis ?? analyze(code, file);
+	const { tagged } = analysis ?? analyzeFile(code, file);
 	if (tagged.length === 0) return null;
 	const s = new MagicString(code);
 	for (const msg of tagged) {
 		const seen = /* @__PURE__ */ new Set();
 		const entries = msg.params.filter((p) => !seen.has(p.name) && seen.add(p.name));
-		const pairs = entries.map((p) => `${JSON.stringify(p.name)}: ${code.slice(p.start, p.end)}`).join(", ");
+		const pairs = entries.map((p) => `${quote(p.name, msg.singleQuote)}: ${code.slice(p.start, p.end)}`).join(", ");
 		if (msg.jsx) {
 			const values = entries.length ? ` values={{ ${pairs} }}` : "";
 			const components = msg.jsx.components.length ? ` components={{ ${msg.jsx.components.map((c) => `${JSON.stringify(c.name)}: ${c.source}`).join(", ")} }}` : "";
@@ -1545,7 +1667,7 @@ function transformCode(code, file, analysis) {
 		}
 		const tagSource = code.slice(msg.tagStart, msg.tagEnd);
 		const args = entries.length ? `, { ${pairs} }` : "";
-		s.overwrite(msg.start, msg.end, `${tagSource}(${JSON.stringify(msg.key)}${args})`);
+		s.overwrite(msg.start, msg.end, `${tagSource}(${quote(msg.key, msg.singleQuote)}${args})`);
 	}
 	return {
 		code: s.toString(),
@@ -1553,6 +1675,6 @@ function transformCode(code, file, analysis) {
 	};
 }
 //#endregion
-export { LOCALE_MODULE_PREFIX, MessageRegistry, PSEUDO_LOCALE, RESOLVED_VIRTUAL_ID, SOURCE_FILE_RE, VIRTUAL_ID, analyze, catalogPath, check, claudeProvider, collectParams, detectBundler, doctor, exportCatalogs, extractProject, findConfigFile, formatCheckResult, generateDts, generateLocaleModule, generateRuntimeModule, importCatalogs, init, isTransformTarget, loadCatalogs, loadConfig, loadConfigFile, loadVirtualModule, parseExchangeFile, pruneCatalogs, pseudoCatalogs, pseudoLocalize, readCatalog, renderHtml, renderParamType, renderSite, resolveConfig, resolveVirtualId, runBuildGate, serializeCatalog, stableKey, structureMatches, syncCatalogs, targetLocales, transformCode, translateCatalogs, writeCatalog, writeDts };
+export { LOCALE_MODULE_PREFIX, MessageRegistry, PSEUDO_LOCALE, RESOLVED_VIRTUAL_ID, SFC_FILE_RE, SOURCE_FILE_RE, VIRTUAL_ID, analyze, analyzeFile, analyzeSfc, catalogPath, check, claudeProvider, collectParams, detectBundler, doctor, exportCatalogs, extractProject, findConfigFile, formatCheckResult, generateDts, generateLocaleModule, generateRuntimeModule, importCatalogs, init, isTransformTarget, loadCatalogs, loadConfig, loadConfigFile, loadVirtualModule, parseExchangeFile, pruneCatalogs, pseudoCatalogs, pseudoLocalize, readCatalog, renderHtml, renderParamType, renderSite, resolveConfig, resolveVirtualId, runBuildGate, serializeCatalog, stableKey, structureMatches, syncCatalogs, targetLocales, transformCode, translateCatalogs, writeCatalog, writeDts };
 
 //# sourceMappingURL=index.js.map