@x18n/builtins 0.0.0 → 0.0.3

package/dist/checks.mjs

@@ -1,5 +1,5 @@
 import { shouldExtract } from "./extractors.mjs";
-import { localeSpellingKey } from "@x18n/core";
+import { createPlaceholderComparer, localeSpellingKey } from "@x18n/core";
 //#region src/checks/index.ts
 function list(items) {
 	return items.join(", ");
@@ -159,25 +159,20 @@ const unusedKey = {
 		};
 	}
 };
-function placeholderNames(ctx, value) {
-	return ctx.placeholders(value).map((p) => p.name).sort();
-}
 const placeholderMismatch = {
 	id: "placeholder-mismatch",
 	defaultSeverity: "error",
 	description: "Target value placeholders differ from the source value.",
 	*run(ctx) {
+		const compare = createPlaceholderComparer(ctx.placeholderSyntaxes, ctx.placeholders);
 		for (const key of ctx.keys()) {
 			const source = ctx.message(key, ctx.sourceLocale);
 			if (typeof source?.value !== "string") continue;
-			const expected = placeholderNames(ctx, source.value);
 			for (const locale of ctx.locales) {
 				if (locale === ctx.sourceLocale) continue;
 				const target = ctx.message(key, locale);
 				if (typeof target?.value !== "string" || target.value === "") continue;
-				const actual = placeholderNames(ctx, target.value);
-				const missing = expected.filter((name) => !actual.includes(name));
-				const extra = actual.filter((name) => !expected.includes(name));
+				const { missing, extra } = compare(source.value, target.value);
 				if (missing.length || extra.length) {
 					const parts = [missing.length ? `missing ${list(missing)}` : "", extra.length ? `unexpected ${list(extra)}` : ""].filter(Boolean);
 					yield {
@@ -279,16 +274,20 @@ const hardString = {
 		};
 	}
 };
+/** A term as a whole word, so "Home" does not match "Homepage". */
+function wordPattern(term) {
+	return new RegExp(`(?<![\\p{L}\\p{N}])${term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?![\\p{L}\\p{N}])`, "iu");
+}
 function* glossaryDiagnostics(ctx, entry) {
-	const term = entry.term.toLowerCase();
+	const term = wordPattern(entry.term);
 	for (const key of ctx.keys()) {
 		const source = ctx.message(key, ctx.sourceLocale)?.value;
-		if (typeof source !== "string" || !source.toLowerCase().includes(term)) continue;
+		if (typeof source !== "string" || !term.test(source)) continue;
 		for (const locale of ctx.locales) {
 			const value = ctx.message(key, locale)?.value;
 			const expected = entry.doNotTranslate ? entry.term : entry.translations?.[locale];
 			if (locale === ctx.sourceLocale || typeof value !== "string" || value === "" || !expected) continue;
-			if (!value.toLowerCase().includes(expected.toLowerCase())) yield {
+			if (!wordPattern(expected).test(value)) yield {
 				key,
 				locale,
 				message: `"${key}" in ${locale} should use "${expected}" for "${entry.term}".`

package/dist/extractors.mjs

@@ -48,6 +48,10 @@ const rules = [
 		id: "single-word",
 		test: (text, kind) => !textKinds.has(kind) && !kind.endsWith("attribute") && !/\s/.test(text.trim()) ? "should-exclude" : "none"
 	},
+	{
+		id: "attribute-token",
+		test: (text, kind) => kind.endsWith("attribute") && /^[a-z][\w-]*$/.test(text.trim()) ? "must-exclude" : "none"
+	},
 	{
 		id: "identifier",
 		test: (text) => /^[a-z]+(?:[A-Z][a-z\d]*)+$/.test(text) || /^[A-Z\d]+(?:_[A-Z\d]+)+$/.test(text) || /^[a-z\d]+(?:[-_.:][a-z\d]+)+$/.test(text) ? "should-exclude" : "none"
@@ -187,6 +191,20 @@ function rawKeyFor(project, key) {
 	const ns = project.config.namespace.default;
 	return project.namespaced && ns && key.startsWith(`${ns}:`) ? key.slice(ns.length + 1) : key;
 }
+/**
+* Escapes a key for the quotes around `{key}` in a template, since `keygen: 'source'` keys hold any text:
+* backslashes inside a JS string, entities inside a double-quoted attribute (`:title="$t('{key}')"`).
+*/
+function quoteKey(before, key) {
+	const quote = before.at(-1);
+	const inAttribute = /="[^"]*$/.test(before);
+	let out = key;
+	if (quote === "'" || quote === "`" || quote === "\"" && !inAttribute) out = out.replace(quote === "`" ? /[\\`]|\$\{/g : new RegExp(`[\\\\${quote}]`, "g"), (c) => `\\${c}`);
+	return inAttribute ? out.replace(/&/g, "&").replace(/"/g, """) : out;
+}
+function fillTemplate(template, values) {
+	return template.replace(/\{(key|attr|args)\}/g, (_, name, at) => name === "key" ? quoteKey(template.slice(0, at), values.key) : values[name]);
+}
 /** Hard strings worth extracting, with proposed keys, values and replacements. */
 function findCandidates(project, options = {}) {
 	const inFiles = options.files?.length ? pathMatcher(options.files) : void 0;
@@ -214,7 +232,11 @@ function findCandidates(project, options = {}) {
 			key,
 			reused,
 			value,
-			replacement: chosen.replace("{key}", rawKeyFor(project, key)).replace("{attr}", hard.attribute ?? "").replace("{args}", args),
+			replacement: fillTemplate(chosen, {
+				key: rawKeyFor(project, key),
+				attr: hard.attribute ?? "",
+				args
+			}),
 			imports: template?.imports ?? [],
 			alternatives: templates.slice(1)
 		});

package/dist/{finders-Cf-IEaDm.mjs → finders-CqTGh4OJ.mjs}

@@ -83,7 +83,7 @@ function compilePattern(pattern, extensions) {
 			const extension = groups.ext ?? path.slice(path.lastIndexOf(".") + 1);
 			return {
 				locale: groups.locale,
-				namespace: groups.namespace?.replace(/\//g, "."),
+				namespace: groups.namespace,
 				ext: extension
 			};
 		}
@@ -135,7 +135,13 @@ async function guessResources(ctx) {
 	}
 	return specs;
 }
-async function findBySpecs(ctx, specs, guessed) {
+/** A namespace from a path in the style of `namespace.fromPath`. Transloco camelCases scope folders, as its `toCamelCase`. */
+function namespaceFromPath(path, style) {
+	if (style === "slash") return path;
+	if (style === "camel") return path.replace(/[-_/\s]+(.)/g, (_, c) => c.toUpperCase()).replace(/^./, (c) => c.toLowerCase());
+	return path.replace(/\//g, ".");
+}
+async function findBySpecs(ctx, specs, strictLocales) {
 	const out = [];
 	for (const spec of specs) {
 		const compiled = compilePattern(spec.pattern, ctx.extensions);
@@ -148,11 +154,12 @@ async function findBySpecs(ctx, specs, guessed) {
 			const matched = compiled.match(path);
 			if (!matched) continue;
 			const locale = fixed ?? matched.locale ?? (spec.pattern.includes("{locale?}") ? ctx.config.sourceLocale : void 0);
-			if (!locale || guessed && !isLocaleCode(locale)) continue;
+			if (!locale || strictLocales && !isLocaleCode(locale)) continue;
+			const namespace = spec.namespace ?? (matched.namespace === void 0 ? void 0 : namespaceFromPath(matched.namespace, ctx.config.namespace.fromPath));
 			out.push({
 				path,
 				locale,
-				namespace: spec.namespace ?? matched.namespace,
+				namespace,
 				format: spec.format,
 				readonly: spec.execute === true
 			});
@@ -163,16 +170,18 @@ async function findBySpecs(ctx, specs, guessed) {
 const patternFinder = {
 	id: "pattern",
 	resolveNew(target, ctx) {
+		const style = ctx.config.namespace.fromPath;
 		for (const spec of ctx.config.resources) {
-			if (/\{namespaces?\}/.test(spec.pattern) !== (target.namespace !== void 0) || spec.execute || !spec.pattern.includes("{locale")) continue;
-			const path = spec.pattern.replace(/^\.\//, "").replace(/\{locale\??\}/g, target.locale).replace("{namespaces}", (target.namespace ?? "").replace(/\./g, "/")).replace("{namespace}", target.namespace ?? "").replace("{ext}", spec.format === "yaml" ? "yml" : spec.format ?? "json");
+			const wantsNamespace = /\{namespaces?\}/.test(spec.pattern);
+			if (wantsNamespace !== (target.namespace !== void 0) || wantsNamespace && style === "camel" || spec.execute || !spec.pattern.includes("{locale")) continue;
+			const path = spec.pattern.replace(/^\.\//, "").replace(/\{locale\??\}/g, target.locale).replace("{namespaces}", style === "slash" ? target.namespace ?? "" : (target.namespace ?? "").replace(/\./g, "/")).replace("{namespace}", target.namespace ?? "").replace("{ext}", spec.format === "yaml" ? "yml" : spec.format ?? "json");
 			if (!/[*?{}[\]]/.test(path)) return path;
 		}
 	},
 	async find(ctx) {
 		const configured = ctx.config.resources;
-		const found = configured.length > 0 ? await findBySpecs(ctx, configured, false) : [];
 		const fromUser = ctx.config.origins.resources === "user" || ctx.config.origins.resources === "parent";
+		const found = configured.length > 0 ? await findBySpecs(ctx, configured, !fromUser) : [];
 		if (found.length > 0 || fromUser) return found;
 		return findBySpecs(ctx, await guessResources(ctx), true);
 	}
@@ -185,4 +194,4 @@ function pattern() {
 	};
 }
 //#endregion
-export { patternFinder as i, guessResources as n, pattern as r, compilePattern as t };
+export { patternFinder as a, pattern as i, guessResources as n, namespaceFromPath as r, compilePattern as t };

package/dist/finders.d.mts

@@ -1,4 +1,4 @@
-import { FinderContext, LocaleFinder, Plugin, ResourceSpec } from "@x18n/core";
+import { FinderContext, LocaleFinder, NamespaceFromPath, Plugin, ResourceSpec } from "@x18n/core";
 //#region src/finders/pattern.d.ts
 interface CompiledPattern {
   /** Glob for the host. */
@@ -16,6 +16,8 @@ interface CompiledPattern {
 export declare function compilePattern(pattern: string, extensions: readonly string[]): CompiledPattern;
 /** Guesses resource patterns from directories named like `locales`, as i18n-ally did without `localesPaths`. */
 export declare function guessResources(ctx: FinderContext): Promise<ResourceSpec[]>;
+/** A namespace from a path in the style of `namespace.fromPath`. Transloco camelCases scope folders, as its `toCamelCase`. */
+export declare function namespaceFromPath(path: string, style: NamespaceFromPath): string;
 export declare const patternFinder: LocaleFinder;
 /** The `pattern` locale finder: files that match `resources[].pattern`, or guessed locale directories. */
 export declare function pattern(): Plugin;

package/dist/finders.mjs

@@ -1,3 +1,3 @@
-import { i as patternFinder, n as guessResources, r as pattern, t as compilePattern } from "./finders-Cf-IEaDm.mjs";
-import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-CQhgEeT6.mjs";
-export { compilePattern, guessResources, pattern, patternFinder, sfcBlocks, sfcFluentBlocks };
+import { a as patternFinder, i as pattern, n as guessResources, r as namespaceFromPath, t as compilePattern } from "./finders-CqTGh4OJ.mjs";
+import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BwJwCUka.mjs";
+export { compilePattern, guessResources, namespaceFromPath, pattern, patternFinder, sfcBlocks, sfcFluentBlocks };

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import { recommended } from "./checks.mjs";
-import { r as pattern } from "./finders-Cf-IEaDm.mjs";
+import { i as pattern } from "./finders-CqTGh4OJ.mjs";
 import { a as json5, c as ini, i as php, l as ftl, n as properties, o as json, r as po, s as jsonc, t as yaml, u as ecmascript } from "./formats-BAogSrvw.mjs";
-import { i as js, n as vue } from "./vue-6FYzIrQl.mjs";
+import { i as js, n as vue } from "./vue-5GFR5hft.mjs";
 import { manifests } from "./manifests.mjs";
-import { n as regex } from "./regex-350J_An-.mjs";
-import { t as presets } from "./presets-CxJ8CsTD.mjs";
+import { n as regex } from "./regex-B9TBGgXC.mjs";
+import { t as presets } from "./presets-DNnE_2MQ.mjs";
 import { reporters } from "./reporters.mjs";
-import { t as svelte } from "./scanners--prozYaE.mjs";
+import { t as svelte } from "./scanners-B27IEH4_.mjs";
 //#region src/index.ts
 /** Plugins that are always on, and the presets that `'auto'` detects. */
 function createBuiltins() {

package/dist/{presets-CxJ8CsTD.mjs → presets-DNnE_2MQ.mjs}

@@ -1,7 +1,7 @@
 import { defaultTemplates } from "./extractors.mjs";
-import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-CQhgEeT6.mjs";
+import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BwJwCUka.mjs";
 import { braces, colon, dollars, doubleBraces, fluent, icu, linked, nesting, percentBraces, placeholders, printf } from "./placeholders.mjs";
-import { r as regexScopes } from "./regex-350J_An-.mjs";
+import { r as regexScopes } from "./regex-B9TBGgXC.mjs";
 import { isMessageLeaf } from "@x18n/core";
 //#region src/presets/shared.ts
 /** One plugin holding a library's call specs, regexes, namespace rules, defaults and extraction templates. */
@@ -10,8 +10,9 @@ function library(options) {
 		name: `x18n:${options.name}`,
 		async config(draft, ctx) {
 			if (options.namespace) draft.namespace = {
-				separator: options.namespace.separator,
-				default: draft.namespace.default ?? options.namespace.default
+				separator: options.namespace.separator ?? draft.namespace.separator,
+				default: draft.namespace.default ?? options.namespace.default,
+				fromPath: options.namespace.fromPath ?? draft.namespace.fromPath
 			};
 			if (options.resources) draft.resources = [...draft.resources, ...options.resources.filter((spec) => !draft.resources.some((r) => r.pattern === spec.pattern))];
 			if (options.keyStyle && draft.keyStyle === "auto" && !ctx.user.keyStyle) draft.keyStyle = options.keyStyle;
@@ -21,7 +22,7 @@ function library(options) {
 				regex: [...draft.usage.regex, ...options.regex ?? []],
 				derivedKeys: [...draft.usage.derivedKeys, ...options.derivedKeys ?? []]
 			};
-			await options.extra?.(draft);
+			await options.extra?.(draft, ctx);
 		},
 		localeFinders: options.finders,
 		normalizeKey: options.normalizeKey,
@@ -96,6 +97,7 @@ function transloco() {
 		plugins: [
 			library({
 				name: "transloco",
+				namespace: { fromPath: "camel" },
 				calls: [{ callee: [
 					"translate",
 					"translocoService.translate",
@@ -213,7 +215,10 @@ function vueI18n() {
 					}
 				]
 			}),
-			placeholders(braces, linked),
+			placeholders({
+				...braces,
+				implicit: ["n", "count"]
+			}, linked),
 			sfcBlocks()
 		]
 	};
@@ -237,11 +242,30 @@ function nuxtI18n() {
 		}]
 	};
 }
+/** `defaultNS` from the i18next init code (`i18n.ts`, `next-i18next.config.js`), as keys without a namespace use it. */
+async function findDefaultNamespace(host) {
+	const files = await host.glob(["**/*i18n*.{js,mjs,cjs,ts,mts,cts}", "**/i18n/index.{js,ts}"], {
+		ignore: ["**/node_modules/**", "**/dist/**"],
+		gitignore: true
+	});
+	for (const file of files.slice(0, 20)) {
+		const found = /\bdefaultNS\s*:\s*['"`]([^'"`]+)['"`]/.exec(await host.readFile(file) ?? "");
+		if (found) return found[1];
+	}
+}
 const i18nextPlugin = library({
 	name: "i18next",
 	namespace: {
 		separator: ":",
-		default: "translation"
+		default: "translation",
+		fromPath: "slash"
+	},
+	extra: async (draft, ctx) => {
+		const found = ctx.user.namespace?.default ? void 0 : await findDefaultNamespace(ctx.host);
+		if (found) draft.namespace = {
+			...draft.namespace,
+			default: found
+		};
 	},
 	calls: [
 		{
@@ -338,6 +362,10 @@ function reactI18next() {
 					kinds: ["jsx-attribute"],
 					imports: ["import i18next from 'i18next'"]
 				}]
+			}),
+			regexScopes("\\bwithTranslation\\(\\s*\\[?\\s*['\"`]([^'\"`]+)['\"`]", "react-i18next-hoc", {
+				wholeFile: true,
+				extensions: scriptExtensions
 			})
 		]
 	};

package/dist/presets.mjs

@@ -1 +1 @@
-export { n as chromeExtension, r as emberIntl, i as fluentVue, b as flutter, x as general, a as globalize, o as i18nJs, s as i18nTag, S as i18next, c as i18nextShopify, m as jekyll, h as laravel, l as lingui, u as nextInternational, C as nextIntl, d as nextTranslate, A as ngxTranslate, w as nuxtI18n, g as phpGettext, _ as phpJoomla, f as polyglot, t as presets, v as railsLazyKey, T as reactI18next, E as reactIntl, y as rubyRails, D as svelteI18n, j as transloco, p as ui5, O as vscodeExtension, k as vueI18n } from "./presets-CxJ8CsTD.mjs";
+export { n as chromeExtension, r as emberIntl, i as fluentVue, b as flutter, x as general, a as globalize, o as i18nJs, s as i18nTag, S as i18next, c as i18nextShopify, m as jekyll, h as laravel, l as lingui, u as nextInternational, C as nextIntl, d as nextTranslate, A as ngxTranslate, w as nuxtI18n, g as phpGettext, _ as phpJoomla, f as polyglot, t as presets, v as railsLazyKey, T as reactI18next, E as reactIntl, y as rubyRails, D as svelteI18n, j as transloco, p as ui5, O as vscodeExtension, k as vueI18n } from "./presets-DNnE_2MQ.mjs";

package/dist/{regex-350J_An-.mjs → regex-B9TBGgXC.mjs}

@@ -47,7 +47,11 @@ function regex(specs = [], id = "regex") {
 		},
 		scan(file, ctx) {
 			const all = [...specs, ...ctx.config.usage.regex];
-			return { usages: scanWithRegex(file.text, regexesFor(file.extension, all)) };
+			const usages = scanWithRegex(file.text, regexesFor(file.extension, all));
+			return {
+				usages,
+				keySlots: usages.map((usage) => usage.range)
+			};
 		}
 	};
 	return {
@@ -60,7 +64,7 @@ function regex(specs = [], id = "regex") {
 }
 /**
 * Regions after each match of `pattern` (group 1 = namespace, or key prefix with `as: 'keyPrefix'`),
-* up to the next match: i18n-ally `scopeRangeRegex`.
+* up to the next match: i18n-ally `scopeRangeRegex`. With `wholeFile`, the first match scopes the whole file.
 */
 function regexScopes(pattern, id = "scopes", options = {}) {
 	const re = new RegExp(pattern, "g");
@@ -71,10 +75,14 @@ function regexScopes(pattern, id = "scopes", options = {}) {
 			extensions: options.extensions ?? ["*"],
 			scan(file) {
 				const matches = [...file.text.matchAll(re)];
+				if (options.wholeFile) matches.splice(1);
 				return {
 					usages: [],
 					scopes: matches.map((match, i) => ({
-						range: {
+						range: options.wholeFile ? {
+							start: 0,
+							end: file.text.length
+						} : {
 							start: match.index + match[0].length,
 							end: matches[i + 1]?.index ?? file.text.length
 						},

package/dist/{scanners--prozYaE.mjs → scanners-B27IEH4_.mjs}

@@ -1,4 +1,4 @@
-import { a as loadParser, o as scanSource } from "./vue-6FYzIrQl.mjs";
+import { a as loadParser, o as scanSource } from "./vue-5GFR5hft.mjs";
 //#region src/scanners/svelte.ts
 let compiler;
 function isSvelteNode(value) {

package/dist/scanners.d.mts

@@ -30,11 +30,12 @@ export declare function scanWithRegex(text: string, regexes: readonly RegExp[]):
 export declare function regex(specs?: readonly RegexScannerSpec[], id?: string): Plugin;
 /**
  * Regions after each match of `pattern` (group 1 = namespace, or key prefix with `as: 'keyPrefix'`),
- * up to the next match: i18n-ally `scopeRangeRegex`.
+ * up to the next match: i18n-ally `scopeRangeRegex`. With `wholeFile`, the first match scopes the whole file.
  */
 export declare function regexScopes(pattern: string, id?: string, options?: {
   readonly as?: "namespace" | "keyPrefix";
   readonly extensions?: readonly string[];
+  readonly wholeFile?: boolean;
 }): Plugin;
 //#endregion
 //#region src/scanners/svelte.d.ts

package/dist/scanners.mjs

@@ -1,4 +1,4 @@
-import { a as loadParser, i as js, n as vue, o as scanSource, r as calleeName } from "./vue-6FYzIrQl.mjs";
-import { i as scanWithRegex, n as regex, r as regexScopes, t as compileUsagePattern } from "./regex-350J_An-.mjs";
-import { t as svelte } from "./scanners--prozYaE.mjs";
+import { a as loadParser, i as js, n as vue, o as scanSource, r as calleeName } from "./vue-5GFR5hft.mjs";
+import { i as scanWithRegex, n as regex, r as regexScopes, t as compileUsagePattern } from "./regex-B9TBGgXC.mjs";
+import { t as svelte } from "./scanners-B27IEH4_.mjs";
 export { calleeName, compileUsagePattern, js, loadParser, regex, regexScopes, scanSource, scanWithRegex, svelte, vue };

package/dist/{sfc-blocks-CQhgEeT6.mjs → sfc-blocks-BwJwCUka.mjs}

@@ -1,5 +1,5 @@
 import { a as json5, o as json, t as yaml } from "./formats-BAogSrvw.mjs";
-import { t as loadVueCompiler } from "./vue-6FYzIrQl.mjs";
+import { t as loadVueCompiler } from "./vue-5GFR5hft.mjs";
 import { isMessageLeaf, pathId } from "@x18n/core";
 //#region src/finders/sfc-blocks.ts
 const formatOfLang = {

package/dist/{vue-6FYzIrQl.mjs → vue-5GFR5hft.mjs}

@@ -549,12 +549,10 @@ const TEXT = 2;
 const SIMPLE_EXPRESSION = 4;
 const INTERPOLATION = 5;
 const ATTRIBUTE = 6;
-const keyPathComponents = /* @__PURE__ */ new Map([
-	["i18n-t", "keypath"],
-	["I18nT", "keypath"],
-	["i18n", "path"],
-	["i18n-d", "path"]
-]);
+/** `keypath` is the vue-i18n prop for a key, on `<i18n-t>` and on the app's own wrappers of it; `path` on the legacy components. */
+function isKeyAttribute(tag, name) {
+	return name === "keypath" || name === "path" && (tag === "i18n" || tag === "i18n-d");
+}
 const ignoredAttributes = /* @__PURE__ */ new Set([
 	"class",
 	"style",
@@ -603,6 +601,18 @@ var TemplateScan = class {
 			}));
 		} catch {}
 	}
+	/** `:keypath="cond ? 'a' : 'b'"`: the expression is read as the key argument of a translate call. */
+	keyExpression(content, offset) {
+		const callee = "__x18nKey(";
+		try {
+			merge(this.out, scanSource(this.parse, `${callee}${content})`, {
+				calls: [{ callee: "__x18nKey" }],
+				offset: offset - 10,
+				filename: "template.ts",
+				hardStrings: false
+			}));
+		} catch {}
+	}
 	/** `v-t="'key'"` and `v-t="{ path: 'key' }"`. */
 	vt(dir) {
 		const exp = dir.exp;
@@ -631,7 +641,7 @@ var TemplateScan = class {
 				start: value.loc.start.offset + 1,
 				end: value.loc.end.offset - 1
 			};
-			if (keyPathComponents.get(element.tag) === prop.name) {
+			if (isKeyAttribute(element.tag, prop.name)) {
 				this.out.usages.push({
 					raw: value.content,
 					range,
@@ -656,21 +666,8 @@ var TemplateScan = class {
 		}
 		const exp = prop.exp;
 		if (exp && "content" in exp) {
-			if (prop.name === "bind" && prop.arg && "content" in prop.arg && keyPathComponents.get(element.tag) === prop.arg.content && /^\s*(['"`]).*\1\s*$/.test(exp.content)) {
-				const start = exp.loc.start.offset + exp.content.search(/['"`]/) + 1;
-				const raw = exp.content.trim().slice(1, -1);
-				this.out.usages.push({
-					raw,
-					range: {
-						start,
-						end: start + raw.length
-					},
-					kind: "call",
-					dynamic: false
-				});
-				return;
-			}
-			this.expression(exp.content, exp.loc.start.offset);
+			if (prop.name === "bind" && prop.arg && "content" in prop.arg && isKeyAttribute(element.tag, prop.arg.content)) this.keyExpression(exp.content, exp.loc.start.offset);
+			else this.expression(exp.content, exp.loc.start.offset);
 		}
 	}
 	node(node) {

package/dist/yaml-plugin.mjs

@@ -1,5 +1,5 @@
 import { placeholderFromShape } from "./placeholders.mjs";
-import { r as regexScopes } from "./regex-350J_An-.mjs";
+import { r as regexScopes } from "./regex-B9TBGgXC.mjs";
 //#region src/yaml-plugin/index.ts
 /**
 * Compiles a validated YAML plugin into plugin objects. Each section maps to the
@@ -21,7 +21,8 @@ function compileYamlPlugin(data) {
 			if (defaults?.keyStyle) draft.keyStyle = defaults.keyStyle;
 			if (defaults?.namespace) draft.namespace = {
 				separator: defaults.namespace.separator ?? draft.namespace.separator,
-				default: defaults.namespace.default ?? draft.namespace.default
+				default: defaults.namespace.default ?? draft.namespace.default,
+				fromPath: defaults.namespace.fromPath ?? draft.namespace.fromPath
 			};
 			draft.usage = {
 				...draft.usage,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@x18n/builtins",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.3",
   "description": "Built-in x18n plugins and presets: formats, locale finders, scanners, checks and reporters",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@vue/compiler-sfc": "^3.5.44",
-    "@x18n/core": "0.0.0",
+    "@x18n/core": "0.0.3",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.3.1",
     "oxc-parser": "^0.154.0",