@verbaly/compiler 0.15.0 → 0.17.0

package/dist/index.d.ts

@@ -92,6 +92,7 @@ interface ResolvedConfig {
 declare function resolveConfig(config?: VerbalyConfig): ResolvedConfig;
 declare function findConfigFile(root: string): string | undefined;
 declare function loadConfigFile(root: string): Promise<VerbalyConfig>;
+declare function targetLocales(cfg: ResolvedConfig, override?: string[]): string[];
 declare function loadConfig(root: string, overrides?: VerbalyConfig): Promise<ResolvedConfig>;
 //#endregion
 //#region src/catalog.d.ts
@@ -137,6 +138,15 @@ declare function generateLocaleModule(catalog: Catalog): string;
 declare function generateDts(entries: Map<string, string>): string;
 declare function writeDts(cfg: ResolvedConfig, entries: Map<string, string>): void;
 //#endregion
+//#region src/plugin.d.ts
+declare const RESOLVED_VIRTUAL_ID: string;
+declare const LOCALE_MODULE_PREFIX = "\0virtual:verbaly/locale/";
+declare const SOURCE_FILE_RE: RegExp;
+declare function resolveVirtualId(id: string): string | undefined;
+declare function loadVirtualModule(id: string, cfg: ResolvedConfig, catalogs: Catalogs): string | undefined;
+declare function isTransformTarget(id: string): boolean;
+declare function runBuildGate(cfg: ResolvedConfig, registry: MessageRegistry): void;
+//#endregion
 //#region src/doctor.d.ts
 interface DoctorEntry {
   level: 'ok' | 'warn' | 'error';
@@ -279,5 +289,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, MessageRegistry, type MissingEntry, PSEUDO_LOCALE, type ParamType, type RenderConfig, type RenderHtmlOptions, type RenderHtmlResult, type RenderSiteOptions, type RenderSiteResult, type ResolvedConfig, 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, loadCatalogs, loadConfig, loadConfigFile, parseExchangeFile, pruneCatalogs, pseudoCatalogs, pseudoLocalize, readCatalog, renderHtml, renderParamType, renderSite, resolveConfig, serializeCatalog, stableKey, structureMatches, syncCatalogs, transformCode, translateCatalogs, writeCatalog, writeDts };
+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 };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -148,7 +148,7 @@ function buildTransMessage(code, children) {
 				text += escapeText(expr.value);
 				continue;
 			}
-			if (expr.type === "TaggedTemplateExpression") return void 0;
+			if (containsTaggedT(expr)) return void 0;
 			const source = code.slice(expr.start, expr.end);
 			const name = uniqueName(deriveName(expr, params.length), source, takenParams);
 			params.push({
@@ -201,6 +201,15 @@ function selfClosedSource(code, opening) {
 	const src = code.slice(opening.start, opening.end);
 	return src.endsWith("/>") ? src : `${src.slice(0, -1).trimEnd()} />`;
 }
+function containsTaggedT(node) {
+	let found = false;
+	walk(node, (n) => {
+		if (n.type !== "TaggedTemplateExpression") return;
+		const tag = n.tag;
+		if (isTReference(tag) || explicitId(tag)) found = true;
+	});
+	return found;
+}
 function isTReference(node) {
 	if (node.type === "Identifier") return node.name === "t";
 	if (node.type === "MemberExpression" && !node.computed) {
@@ -218,6 +227,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;
 		const source = code.slice(expr.start, expr.end);
 		const name = uniqueName(deriveName(expr, i), source, taken);
 		params.push({
@@ -402,18 +412,34 @@ const VIRTUAL_ID = "virtual:verbaly";
 function generateRuntimeModule(cfg) {
 	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('${VIRTUAL_ID}/locale/${locale}'),`).join("\n");
 	return `import { createVerbaly } from 'verbaly';
 import source from '${VIRTUAL_ID}/locale/${cfg.sourceLocale}';
 
-const v = createVerbaly({
-  locale: ${src},
-  fallback: ${src},
-  messages: { [${src}]: source },
-  loaders: {
+export const sourceLocale = ${src};
+export const locales = ${JSON.stringify(cfg.locales)};
+
+// 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}
-  },
-});
+    },
+    ...options,
+  });
+}
+
+// the no-FOUC contract in one call: fresh instance + catalog awaited before render
+export async function createRequestInstance(locale) {
+  const instance = createInstance({ locale });
+  await instance.loadLocale(locale);
+  return instance;
+}
+
+const v = createInstance();
 
 export const verbaly = v;
 export const t = v.t;
@@ -454,6 +480,15 @@ ${lines.join("\n")}
 
   export const verbaly: import('verbaly').Verbaly<VerbalyKey>;
 
+  export const sourceLocale: string;
+  export const locales: string[];
+  export function createInstance(
+    options?: import('verbaly').VerbalyOptions<VerbalyKey>,
+  ): import('verbaly').Verbaly<VerbalyKey>;
+  export function createRequestInstance(
+    locale: string,
+  ): Promise<import('verbaly').Verbaly<VerbalyKey>>;
+
   export function t<K extends VerbalyKey>(
     key: K,
     ...args: [VerbalyMessages[K]] extends [never] ? [] : [VerbalyMessages[K]]
@@ -480,6 +515,125 @@ function writeDts(cfg, entries) {
 	writeFileSync(join(cfg.root, "verbaly.d.ts"), generateDts(entries));
 }
 //#endregion
+//#region src/pseudo.ts
+const PSEUDO_LOCALE = "en-XA";
+const ACCENTS = {
+	a: "á",
+	b: "ƀ",
+	c: "ç",
+	d: "đ",
+	e: "é",
+	f: "ƒ",
+	g: "ğ",
+	h: "ĥ",
+	i: "í",
+	j: "ĵ",
+	k: "ķ",
+	l: "ĺ",
+	m: "ɱ",
+	n: "ñ",
+	o: "ó",
+	p: "þ",
+	q: "ǫ",
+	r: "ŕ",
+	s: "š",
+	t: "ţ",
+	u: "ú",
+	v: "ṽ",
+	w: "ŵ",
+	x: "ẋ",
+	y: "ý",
+	z: "ž",
+	A: "Á",
+	B: "Ɓ",
+	C: "Ç",
+	D: "Đ",
+	E: "É",
+	F: "Ƒ",
+	G: "Ğ",
+	H: "Ĥ",
+	I: "Í",
+	J: "Ĵ",
+	K: "Ķ",
+	L: "Ĺ",
+	M: "Ḿ",
+	N: "Ñ",
+	O: "Ó",
+	P: "Þ",
+	Q: "Ǫ",
+	R: "Ŕ",
+	S: "Š",
+	T: "Ţ",
+	U: "Ú",
+	V: "Ṽ",
+	W: "Ŵ",
+	X: "Ẍ",
+	Y: "Ý",
+	Z: "Ž"
+};
+const TAG_AT = /<\/?[a-zA-Z][\w-]*\/?>/y;
+function pseudoLocalize(message) {
+	let out = "";
+	let letters = 0;
+	let i = 0;
+	while (i < message.length) {
+		const two = message.slice(i, i + 2);
+		if (two === "{{" || two === "}}" || two === "||" || two === "##") {
+			out += two;
+			i += 2;
+			continue;
+		}
+		const ch = message[i];
+		if (ch === "{") {
+			const end = matchBrace(message, i);
+			out += message.slice(i, end);
+			i = end;
+			continue;
+		}
+		if (ch === "<") {
+			TAG_AT.lastIndex = i;
+			const m = TAG_AT.exec(message);
+			if (m) {
+				out += m[0];
+				i += m[0].length;
+				continue;
+			}
+		}
+		const mapped = ACCENTS[ch];
+		if (mapped) {
+			out += mapped;
+			letters += 1;
+		} else out += ch;
+		i += 1;
+	}
+	const pad = "~".repeat(Math.ceil(letters / 3));
+	return `⟦${out}${pad ? " " + pad : ""}⟧`;
+}
+function matchBrace(message, start) {
+	let depth = 0;
+	for (let i = start; i < message.length; i++) {
+		const two = message.slice(i, i + 2);
+		if (two === "{{" || two === "}}") {
+			i += 1;
+			continue;
+		}
+		const ch = message[i];
+		if (ch === "{") depth += 1;
+		else if (ch === "}") {
+			depth -= 1;
+			if (depth === 0) return i + 1;
+		}
+	}
+	return message.length;
+}
+function pseudoCatalogs(cfg, catalogs, locale = PSEUDO_LOCALE) {
+	const source = catalogs[cfg.sourceLocale] ?? {};
+	const target = {};
+	for (const [key, msg] of Object.entries(source)) target[key] = msg ? pseudoLocalize(msg) : "";
+	catalogs[locale] = target;
+	return Object.keys(target).filter((key) => target[key]);
+}
+//#endregion
 //#region src/config.ts
 function resolveConfig(config = {}) {
 	const root = resolve(config.root ?? process.cwd());
@@ -487,7 +641,7 @@ function resolveConfig(config = {}) {
 	const sourceLocale = config.sourceLocale ?? "en";
 	const locales = /* @__PURE__ */ new Set([sourceLocale, ...config.locales ?? []]);
 	if (existsSync(dir)) {
-		for (const file of readdirSync(dir)) if (file.endsWith(".json")) locales.add(file.slice(0, -5));
+		for (const file of readdirSync(dir)) if (file.endsWith(".json") && file !== `en-XA.json`) locales.add(file.slice(0, -5));
 	}
 	return {
 		root,
@@ -529,13 +683,16 @@ async function loadTsConfig(path) {
 		const { mod } = await bundleRequire({ filepath: path });
 		return mod.default ?? {};
 	} catch (error) {
-		if (isModuleNotFound$1(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: pnpm add -D esbuild`, { cause: error });
 		throw error;
 	}
 }
-function isModuleNotFound$1(error, name) {
+function isModuleNotFound(error, name) {
 	return error instanceof Error && error.code === "ERR_MODULE_NOT_FOUND" && error.message.includes(name);
 }
+function targetLocales(cfg, override) {
+	return (override ?? cfg.locales).filter((locale) => locale !== cfg.sourceLocale && cfg.locales.includes(locale));
+}
 async function loadConfig(root, overrides = {}) {
 	return resolveConfig({
 		...await loadConfigFile(root),
@@ -547,6 +704,25 @@ function definedOnly(config) {
 	return Object.fromEntries(Object.entries(config).filter(([, value]) => value !== void 0));
 }
 //#endregion
+//#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?$/;
+function resolveVirtualId(id) {
+	if (id === "virtual:verbaly" || id.startsWith(`virtual:verbaly/`)) return "\0" + id;
+}
+function loadVirtualModule(id, cfg, catalogs) {
+	if (id === RESOLVED_VIRTUAL_ID) return generateRuntimeModule(cfg);
+	if (id.startsWith(LOCALE_MODULE_PREFIX)) return generateLocaleModule(catalogs[id.slice(LOCALE_MODULE_PREFIX.length)] ?? {});
+}
+function isTransformTarget(id) {
+	return SOURCE_FILE_RE.test(id) && !id.includes("node_modules") && !id.startsWith("\0");
+}
+function runBuildGate(cfg, registry) {
+	const result = check(cfg, loadCatalogs(cfg), registry);
+	if (!result.ok) throw new Error(`[verbaly] build blocked\n${formatCheckResult(result)}\nRun \`npx verbaly extract\` and fill the missing translations.`);
+}
+//#endregion
 //#region src/registry.ts
 var MessageRegistry = class {
 	files = /* @__PURE__ */ new Map();
@@ -797,7 +973,7 @@ function readDeps(root) {
 //#region src/translate.ts
 async function translateCatalogs(cfg, catalogs, provider, options = {}) {
 	const batchSize = options.batchSize ?? 20;
-	const targets = (options.locales ?? cfg.locales).filter((locale) => locale !== cfg.sourceLocale && cfg.locales.includes(locale));
+	const targets = targetLocales(cfg, options.locales);
 	const source = catalogs[cfg.sourceLocale] ?? {};
 	const result = {
 		translated: {},
@@ -856,7 +1032,7 @@ function exportCatalogs(cfg, catalogs, options = {}) {
 	const format = options.format ?? "xliff";
 	const dir = resolve(cfg.root, options.out ?? "verbaly-export");
 	const source = catalogs[cfg.sourceLocale] ?? {};
-	const targets = (options.locales ?? cfg.locales).filter((locale) => locale !== cfg.sourceLocale && cfg.locales.includes(locale));
+	const targets = targetLocales(cfg, options.locales);
 	const files = [];
 	mkdirSync(dir, { recursive: true });
 	for (const locale of targets) {
@@ -1081,128 +1257,6 @@ async function loadSdk(load = () => import("@anthropic-ai/sdk")) {
 		throw error;
 	}
 }
-function isModuleNotFound(error, name) {
-	return error instanceof Error && error.code === "ERR_MODULE_NOT_FOUND" && error.message.includes(name);
-}
-//#endregion
-//#region src/pseudo.ts
-const PSEUDO_LOCALE = "en-XA";
-const ACCENTS = {
-	a: "á",
-	b: "ƀ",
-	c: "ç",
-	d: "đ",
-	e: "é",
-	f: "ƒ",
-	g: "ğ",
-	h: "ĥ",
-	i: "í",
-	j: "ĵ",
-	k: "ķ",
-	l: "ĺ",
-	m: "ɱ",
-	n: "ñ",
-	o: "ó",
-	p: "þ",
-	q: "ǫ",
-	r: "ŕ",
-	s: "š",
-	t: "ţ",
-	u: "ú",
-	v: "ṽ",
-	w: "ŵ",
-	x: "ẋ",
-	y: "ý",
-	z: "ž",
-	A: "Á",
-	B: "Ɓ",
-	C: "Ç",
-	D: "Đ",
-	E: "É",
-	F: "Ƒ",
-	G: "Ğ",
-	H: "Ĥ",
-	I: "Í",
-	J: "Ĵ",
-	K: "Ķ",
-	L: "Ĺ",
-	M: "Ḿ",
-	N: "Ñ",
-	O: "Ó",
-	P: "Þ",
-	Q: "Ǫ",
-	R: "Ŕ",
-	S: "Š",
-	T: "Ţ",
-	U: "Ú",
-	V: "Ṽ",
-	W: "Ŵ",
-	X: "Ẍ",
-	Y: "Ý",
-	Z: "Ž"
-};
-const TAG_AT = /<\/?[a-zA-Z][\w-]*\/?>/y;
-function pseudoLocalize(message) {
-	let out = "";
-	let letters = 0;
-	let i = 0;
-	while (i < message.length) {
-		const two = message.slice(i, i + 2);
-		if (two === "{{" || two === "}}" || two === "||" || two === "##") {
-			out += two;
-			i += 2;
-			continue;
-		}
-		const ch = message[i];
-		if (ch === "{") {
-			const end = matchBrace(message, i);
-			out += message.slice(i, end);
-			i = end;
-			continue;
-		}
-		if (ch === "<") {
-			TAG_AT.lastIndex = i;
-			const m = TAG_AT.exec(message);
-			if (m) {
-				out += m[0];
-				i += m[0].length;
-				continue;
-			}
-		}
-		const mapped = ACCENTS[ch];
-		if (mapped) {
-			out += mapped;
-			letters += 1;
-		} else out += ch;
-		i += 1;
-	}
-	const pad = "~".repeat(Math.ceil(letters / 3));
-	return `⟦${out}${pad ? " " + pad : ""}⟧`;
-}
-function matchBrace(message, start) {
-	let depth = 0;
-	for (let i = start; i < message.length; i++) {
-		const two = message.slice(i, i + 2);
-		if (two === "{{" || two === "}}") {
-			i += 1;
-			continue;
-		}
-		const ch = message[i];
-		if (ch === "{") depth += 1;
-		else if (ch === "}") {
-			depth -= 1;
-			if (depth === 0) return i + 1;
-		}
-	}
-	return message.length;
-}
-function pseudoCatalogs(cfg, catalogs, locale = PSEUDO_LOCALE) {
-	const source = catalogs[cfg.sourceLocale] ?? {};
-	const target = {};
-	for (const [key, msg] of Object.entries(source)) target[key] = msg ? pseudoLocalize(msg) : "";
-	catalogs[locale] = target;
-	return Object.keys(target).filter((key) => target[key]);
-}
 //#endregion
 //#region src/render.ts
 const HREFLANG_OPEN = "<!--verbaly:hreflang-->";
@@ -1499,6 +1553,6 @@ function transformCode(code, file, analysis) {
 	};
 }
 //#endregion
-export { MessageRegistry, PSEUDO_LOCALE, VIRTUAL_ID, analyze, catalogPath, check, claudeProvider, collectParams, detectBundler, doctor, exportCatalogs, extractProject, findConfigFile, formatCheckResult, generateDts, generateLocaleModule, generateRuntimeModule, importCatalogs, init, loadCatalogs, loadConfig, loadConfigFile, parseExchangeFile, pruneCatalogs, pseudoCatalogs, pseudoLocalize, readCatalog, renderHtml, renderParamType, renderSite, resolveConfig, serializeCatalog, stableKey, structureMatches, syncCatalogs, transformCode, translateCatalogs, writeCatalog, writeDts };
+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 };
 
 //# sourceMappingURL=index.js.map