@x18n/builtins 0.0.12 → 0.0.13

package/dist/checks.mjs

@@ -32,7 +32,7 @@ const missingKey = {
 const missingTranslation = {
 	id: "missing-translation",
 	defaultSeverity: "warning",
-	description: "A source-locale key that target locales lack. One diagnostic per key, at the source entry.",
+	description: "A source-locale key that target locales lack, or a plural form their language needs. One diagnostic per key, at the source entry.",
 	*run(ctx) {
 		const missing = /* @__PURE__ */ new Map();
 		for (const coverage of ctx.coverage()) {
@@ -44,7 +44,8 @@ const missingTranslation = {
 			}
 		}
 		for (const [key, locales] of missing) {
-			const source = ctx.message(key, ctx.sourceLocale);
+			const other = ctx.formOf(key)?.keyOf("other");
+			const source = ctx.message(key, ctx.sourceLocale) ?? (other === void 0 ? void 0 : ctx.message(other, ctx.sourceLocale));
 			yield {
 				key,
 				locale: ctx.sourceLocale,

package/dist/extractors.d.mts

@@ -3,12 +3,12 @@ import { ExtractItem, ExtractOptions, ExtractTemplate, HardString, KeyString, Pr
 export type Score = "must-include" | "should-include" | "none" | "should-exclude" | "must-exclude";
 export interface ExtractionRule {
   readonly id: string;
-  readonly test: (text: string, kind: string) => Score;
+  readonly test: (text: string, kind: string, attribute: string | undefined) => Score;
 }
 /** Built-in rules, applied in order. A `must-*` wins at once; otherwise the last `should-*` decides. */
 export declare const rules: readonly ExtractionRule[];
 /** Folds rule scores the i18n-ally way (`shouldExtract`). */
-export declare function shouldExtract(text: string, kind: string, list?: readonly ExtractionRule[]): boolean;
+export declare function shouldExtract(text: string, kind: string, list?: readonly ExtractionRule[], attribute?: string): boolean;
 export type KeyCase = "camel" | "snake" | "kebab" | "dot";
 /** "Forgot password?" becomes `forgotPassword` (camel), `forgot_password`, `forgot-password` or `forgot.password`. */
 export declare function slugify(text: string, keyCase?: KeyCase, maxLength?: number): string;

package/dist/extractors.mjs

@@ -43,6 +43,14 @@ const rules = [
 			return tokens.every((t) => /^!?[a-z][\w:/[\].#%!-]*$/.test(t)) && tokens.filter((t) => /[-:!/[\d]/.test(t)).length * 2 > tokens.length ? "must-exclude" : "none";
 		}
 	},
+	{
+		id: "attributify",
+		test: (text, kind, attribute) => kind.endsWith("attribute") && (attribute === "text" || attribute?.includes(":") === true) && text.trim().split(/\s+/).every((t) => /^!?-?[a-z\d$[(][\w:/[\]().,#%!$+~-]*$/.test(t)) ? "must-exclude" : "none"
+	},
+	{
+		id: "css-value",
+		test: (text) => /^-?[a-z][\w-]*\(.*\)$/s.test(text.trim()) || /\bvar\(--/.test(text) ? "must-exclude" : "none"
+	},
 	{
 		id: "non-ascii",
 		test: (text) => /\P{ASCII}/u.test(text) && /\p{L}/u.test(text) ? "must-include" : "none"
@@ -80,10 +88,10 @@ function isExtractableFile(path) {
 	return !nonUiFiles.some((pattern) => pattern.test(path));
 }
 /** Folds rule scores the i18n-ally way (`shouldExtract`). */
-function shouldExtract(text, kind, list = rules) {
+function shouldExtract(text, kind, list = rules, attribute) {
 	let result = "none";
 	for (const rule of list) {
-		const score = rule.test(text, kind);
+		const score = rule.test(text, kind, attribute);
 		if (score === "must-include") return true;
 		if (score === "must-exclude") return false;
 		if (score !== "none") result = score;
@@ -216,7 +224,7 @@ function commentIgnores(text) {
 function* extractableHardStrings(options, hardStrings, textOf) {
 	const ignores = /* @__PURE__ */ new Map();
 	for (const hard of hardStrings) {
-		if (!isExtractableFile(hard.path) || !shouldExtract(hard.text, hard.kind) || ignoredByConfig(options, hard)) continue;
+		if (!isExtractableFile(hard.path) || !shouldExtract(hard.text, hard.kind, rules, hard.attribute) || ignoredByConfig(options, hard)) continue;
 		let ignored = ignores.get(hard.path);
 		if (!ignored) {
 			const text = textOf(hard.path);

package/dist/finders.mjs

@@ -1,3 +1,3 @@
 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-BIPqKcvd.mjs";
+import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BqQ8m9rX.mjs";
 export { compilePattern, guessResources, namespaceFromPath, pattern, patternFinder, sfcBlocks, sfcFluentBlocks };

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import { recommended } from "./checks.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-CFkM5co0.mjs";
-import { i as js, n as vue } from "./vue-5GFR5hft.mjs";
+import { a as js, n as vue } from "./vue-CF4pe-Yr.mjs";
 import { manifests } from "./manifests.mjs";
-import { n as regex } from "./regex-B9TBGgXC.mjs";
-import { t as presets } from "./presets-DJrGl3HR.mjs";
+import { n as regex } from "./regex-AYVhuSb6.mjs";
+import { t as presets } from "./presets-Co5SlnKr.mjs";
 import { reporters } from "./reporters.mjs";
-import { t as svelte } from "./scanners-B27IEH4_.mjs";
+import { t as svelte } from "./scanners-DhnnVp7s.mjs";
 //#region src/index.ts
 /** Plugins that are always on, and the presets that `'auto'` detects. */
 function createBuiltins() {

package/dist/{presets-DJrGl3HR.mjs → presets-Co5SlnKr.mjs}

@@ -1,7 +1,7 @@
 import { defaultTemplates } from "./extractors.mjs";
-import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BIPqKcvd.mjs";
+import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BqQ8m9rX.mjs";
 import { braces, colon, dollars, doubleBraces, fluent, icu, linked, nesting, percentBraces, placeholders, printf } from "./placeholders.mjs";
-import { r as regexScopes } from "./regex-B9TBGgXC.mjs";
+import { r as regexScopes } from "./regex-AYVhuSb6.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. */
@@ -295,7 +295,11 @@ const i18nextPlugin = library({
 			types: ["TFunction"]
 		}
 	],
-	derivedKeys: ["{key}_*"],
+	derivedKeys: [
+		"{key}_ordinal_{ordinal}",
+		"{key}_{plural}",
+		"{key}_*"
+	],
 	translatePrompt: (draft, ctx) => {
 		draft.notes.push(`i18next plural keys end in _${ctx.localeInfo.pluralCategories.join(", _")} for ${ctx.targetLocale}; write one key per category.`);
 	},
@@ -350,6 +354,10 @@ function reactI18next() {
 						namespace: {
 							arg: 0,
 							property: "ns"
+						},
+						keyPrefix: {
+							arg: 0,
+							property: "keyPrefix"
 						}
 					}
 				],
@@ -363,7 +371,7 @@ function reactI18next() {
 					imports: ["import i18next from 'i18next'"]
 				}]
 			}),
-			regexScopes("\\bwithTranslation\\(\\s*\\[?\\s*['\"`]([^'\"`]+)['\"`]", "react-i18next-hoc", {
+			regexScopes("\\bwithTranslation\\(\\s*(?:\\[?\\s*['\"`](?<namespace>[^'\"`]+)['\"`])?(?:[^)]*?\\bkeyPrefix\\s*:\\s*['\"`](?<keyPrefix>[^'\"`]+)['\"`])?", "react-i18next-hoc", {
 				wholeFile: true,
 				extensions: scriptExtensions
 			})
@@ -764,15 +772,10 @@ function nextTranslate() {
 }
 /** Shopify's i18next format: plural and ordinal forms as nested keys (`{key}.one`). */
 function i18nextShopify() {
-	const forms = [
-		"plural",
-		"zero",
-		"one",
-		"two",
-		"few",
-		"many",
-		"other",
-		...Array.from({ length: 10 }, (_, i) => String(i))
+	const derivedKeys = [
+		"{key}.ordinal.{ordinal}",
+		"{key}.{plural}",
+		...["plural", ...Array.from({ length: 10 }, (_, i) => String(i))].map((form) => `{key}.${form}`)
 	];
 	return {
 		name: "i18next-shopify",
@@ -781,7 +784,7 @@ function i18nextShopify() {
 			...reactI18next().plugins,
 			library({
 				name: "i18next-shopify",
-				derivedKeys: forms.map((form) => `{key}.${form}`),
+				derivedKeys,
 				keyStyle: "nested"
 			}),
 			placeholders(braces)

package/dist/presets.mjs

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

package/dist/{regex-B9TBGgXC.mjs → regex-AYVhuSb6.mjs}

@@ -63,8 +63,9 @@ 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`. With `wholeFile`, the first match scopes the whole file.
+* Regions after each match of `pattern` (group 1 = namespace, or key prefix with `as: 'keyPrefix'`; or the
+* named groups `namespace` and `keyPrefix`), up to the next match: i18n-ally `scopeRangeRegex`.
+* With `wholeFile`, the first match scopes the whole file. Matches that capture nothing are skipped.
 */
 function regexScopes(pattern, id = "scopes", options = {}) {
 	const re = new RegExp(pattern, "g");
@@ -74,19 +75,25 @@ function regexScopes(pattern, id = "scopes", options = {}) {
 			id,
 			extensions: options.extensions ?? ["*"],
 			scan(file) {
-				const matches = [...file.text.matchAll(re)];
-				if (options.wholeFile) matches.splice(1);
+				const found = [...file.text.matchAll(re)].map((match) => ({
+					match,
+					values: match.groups ? {
+						namespace: match.groups.namespace,
+						keyPrefix: match.groups.keyPrefix
+					} : options.as === "keyPrefix" ? { keyPrefix: match[1] } : { namespace: match[1] }
+				})).filter(({ values }) => values.namespace !== void 0 || values.keyPrefix !== void 0);
+				if (options.wholeFile) found.splice(1);
 				return {
 					usages: [],
-					scopes: matches.map((match, i) => ({
+					scopes: found.map(({ match, values }, i) => ({
 						range: options.wholeFile ? {
 							start: 0,
 							end: file.text.length
 						} : {
 							start: match.index + match[0].length,
-							end: matches[i + 1]?.index ?? file.text.length
+							end: found[i + 1]?.match.index ?? file.text.length
 						},
-						...options.as === "keyPrefix" ? { keyPrefix: match[1] } : { namespace: match[1] }
+						...values
 					}))
 				};
 			}

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

@@ -1,4 +1,4 @@
-import { a as loadParser, o as scanSource } from "./vue-5GFR5hft.mjs";
+import { i as isTextAttribute, o as loadParser, s as scanSource } from "./vue-CF4pe-Yr.mjs";
 //#region src/scanners/svelte.ts
 let compiler;
 function isSvelteNode(value) {
@@ -14,33 +14,18 @@ const expressionTypes = /* @__PURE__ */ new Set([
 	"AwaitBlock",
 	"KeyBlock"
 ]);
-const ignoredAttributes = /* @__PURE__ */ new Set([
-	"class",
-	"style",
-	"id",
-	"name",
-	"type",
-	"href",
-	"src",
-	"for",
-	"role",
-	"lang",
-	"rel",
-	"target"
-]);
-function textHardString(node, data, attribute, out) {
+function textHardString(node, data, attribute, textAttributes, out) {
 	const text = data.trim();
-	const name = typeof attribute?.name === "string" ? attribute.name : void 0;
-	if (!text || !/\p{L}/u.test(text) || name !== void 0 && ignoredAttributes.has(name)) return;
+	if (!text || !/\p{L}/u.test(text)) return;
 	if (attribute) {
-		out.push({
+		if (typeof attribute.name === "string" && isTextAttribute(attribute.name, textAttributes)) out.push({
 			text,
 			range: {
 				start: attribute.start,
 				end: attribute.end
 			},
 			kind: "svelte-attribute",
-			...name ? { attribute: name } : {}
+			attribute: attribute.name
 		});
 		return;
 	}
@@ -101,7 +86,7 @@ function svelte() {
 						return;
 					}
 					if (expressionTypes.has(node.type) && "expression" in node && isSvelteNode(node.expression)) scan(file.text.slice(node.expression.start, node.expression.end), node.expression.start, true);
-					if (node.type === "Text" && "data" in node && typeof node.data === "string") textHardString(node, node.data, parentType === "Attribute" ? attribute : void 0, hardStrings);
+					if (node.type === "Text" && "data" in node && typeof node.data === "string") textHardString(node, node.data, parentType === "Attribute" ? attribute : void 0, ctx.config.extract.attributes, hardStrings);
 					const owner = node.type === "Attribute" ? node : attribute;
 					for (const [key, child] of Object.entries(node)) if (key !== "expression" && typeof child === "object") visit(child, node.type, owner);
 				};

package/dist/scanners.d.mts

@@ -17,6 +17,8 @@ interface ScanSourceOptions {
   readonly expression?: boolean;
   /** Callees whose string arguments are never hard strings (`extract.ignoreCallees`). */
   readonly ignoreCallees?: readonly string[] | undefined;
+  /** Attributes whose values are text, on top of the built-in ones (`extract.attributes`). */
+  readonly textAttributes?: readonly string[] | undefined;
 }
 export declare function scanSource(parse: ParseSync, text: string, options: ScanSourceOptions): ScanResult;
 /** The AST scanner for JS and TS, driven by call specs (`usage.calls`). */
@@ -29,8 +31,9 @@ export declare function scanWithRegex(text: string, regexes: readonly RegExp[]):
 /** The `regex` scanner over `usage.regex` specs, plus extra specs given here (YAML plugins). */
 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`. With `wholeFile`, the first match scopes the whole file.
+ * Regions after each match of `pattern` (group 1 = namespace, or key prefix with `as: 'keyPrefix'`; or the
+ * named groups `namespace` and `keyPrefix`), up to the next match: i18n-ally `scopeRangeRegex`.
+ * With `wholeFile`, the first match scopes the whole file. Matches that capture nothing are skipped.
  */
 export declare function regexScopes(pattern: string, id?: string, options?: {
   readonly as?: "namespace" | "keyPrefix";

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-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";
+import { a as js, n as vue, o as loadParser, r as calleeName, s as scanSource } from "./vue-CF4pe-Yr.mjs";
+import { i as scanWithRegex, n as regex, r as regexScopes, t as compileUsagePattern } from "./regex-AYVhuSb6.mjs";
+import { t as svelte } from "./scanners-DhnnVp7s.mjs";
 export { calleeName, compileUsagePattern, js, loadParser, regex, regexScopes, scanSource, scanWithRegex, svelte, vue };

package/dist/{sfc-blocks-BIPqKcvd.mjs → sfc-blocks-BqQ8m9rX.mjs}

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

package/dist/{vue-5GFR5hft.mjs → vue-CF4pe-Yr.mjs}

@@ -1,30 +1,30 @@
 //#region src/scanners/js.ts
-const hardStringIgnoredAttributes = /* @__PURE__ */ new Set([
-	"class",
-	"className",
-	"style",
-	"key",
-	"ref",
-	"id",
-	"href",
-	"src",
-	"type",
-	"name",
-	"for",
-	"htmlFor",
-	"role",
-	"slot",
-	"as",
-	"to",
-	"target",
-	"rel",
-	"lang",
-	"xmlns",
-	"viewBox",
-	"d",
-	"fill",
-	"stroke"
+const textAttributeWords = /* @__PURE__ */ new Set([
+	"title",
+	"subtitle",
+	"label",
+	"text",
+	"placeholder",
+	"alt",
+	"content",
+	"description",
+	"caption",
+	"message",
+	"tooltip",
+	"hint",
+	"summary",
+	"heading",
+	"headline"
 ]);
+/**
+* Markup attributes whose values users read: those whose last word is a text word (`title`, `aria-label`,
+* `confirmText`, `empty-message`), plus `extract.attributes`. Every other attribute holds code: classes,
+* URLs, ids, SVG geometry, attributify utilities.
+*/
+function isTextAttribute(name, extra = []) {
+	const last = name.replace(/([a-z\d])([A-Z])/g, "$1-$2").toLowerCase().split(/[-_:.]/).at(-1);
+	return textAttributeWords.has(last) || extra.includes(name);
+}
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && typeof value.type === "string" && "start" in value;
 }
@@ -73,6 +73,7 @@ var FileScan = class {
 	offset;
 	collectHardStrings;
 	ignoredCallees;
+	textAttributes;
 	usages = [];
 	keySlots = [];
 	hardStrings = [];
@@ -83,11 +84,14 @@ var FileScan = class {
 	factories = /* @__PURE__ */ new Map();
 	typed = /* @__PURE__ */ new Map();
 	consumed = /* @__PURE__ */ new Set();
-	constructor(text, offset, calls, collectHardStrings, ignoredCallees = /* @__PURE__ */ new Set()) {
+	/** Render-prop functions of factory components (`<Translation>{t => ...}</Translation>`), by start offset. */
+	renderProps = /* @__PURE__ */ new Map();
+	constructor(text, offset, calls, collectHardStrings, ignoredCallees = /* @__PURE__ */ new Set(), textAttributes = []) {
 		this.text = text;
 		this.offset = offset;
 		this.collectHardStrings = collectHardStrings;
 		this.ignoredCallees = ignoredCallees;
+		this.textAttributes = textAttributes;
 		for (const spec of calls) for (const name of [spec.callee].flat()) if (spec.factory) {
 			const list = this.factories.get(name) ?? [];
 			this.factories.set(name, list);
@@ -160,18 +164,21 @@ var FileScan = class {
 		return object.properties.flatMap((p) => p.type === "Property" ? [p.value] : []);
 	}
 	/** ---- Usages ---- */
-	addKey(value, binding, namespace) {
+	/** `expression` is the call holding `value`, kept only when the key is the call's own literal. */
+	addKey(value, binding, namespace, expression) {
 		if ("props" in value) return;
 		const node = unwrap(value);
 		const base = {
 			namespace: namespace ?? binding.namespace,
 			keyPrefix: binding.keyPrefix
 		};
+		const call = expression ? { expression: this.range(expression) } : {};
 		if (isStringLiteral(node)) {
 			this.consumed.add(node.start);
 			this.keySlots.push(this.range(innerRange(node)));
 			this.usages.push({
 				...base,
+				...call,
 				raw: node.value,
 				range: this.range(innerRange(node)),
 				kind: "call",
@@ -193,6 +200,7 @@ var FileScan = class {
 			});
 			this.usages.push({
 				...base,
+				...call,
 				raw,
 				range,
 				kind: "call",
@@ -256,30 +264,42 @@ var FileScan = class {
 		const object = this.constants.get(node.object.name);
 		return object && object.type === "ObjectExpression" ? objectProperty(object, node.property.name) : void 0;
 	}
-	handleCall(name, args) {
+	handleCall(name, args, expression) {
 		const bindings = this.lookupAll(name).filter((binding) => !binding.spec.factory);
 		for (const binding of bindings) {
 			const namespace = binding.spec.namespace ? this.stringArg(this.argValues(args, binding.spec.namespace, 1)[0]) : void 0;
 			for (const value of this.argValues(args, binding.spec.key, 0)) {
 				if (bindings.length > 1 && !("props" in value) && unwrap(value).type === "ObjectExpression") continue;
-				this.addKey(value, binding, namespace);
+				this.addKey(value, binding, namespace, expression);
 			}
 		}
 		return bindings.length > 0;
 	}
 	call(node) {
 		const name = calleeName(node.callee);
-		if (name !== void 0) this.handleCall(name, node.arguments);
+		if (name !== void 0) this.handleCall(name, node.arguments, {
+			start: node.start,
+			end: node.end
+		});
 	}
-	jsx(node) {
-		const name = jsxName(node.name);
-		if (!name || !this.lookup(name)) return;
+	jsxProps(node) {
 		const props = /* @__PURE__ */ new Map();
 		for (const attribute of node.attributes) if (attribute.type === "JSXAttribute" && attribute.value && attribute.name.type === "JSXIdentifier") {
 			props.set(attribute.name.name, attribute.value);
 			if (isStringLiteral(attribute.value)) this.consumed.add(attribute.value.start);
 		}
-		this.handleCall(name, [{ props }]);
+		return { props };
+	}
+	jsx(node) {
+		const name = jsxName(node.name);
+		if (name && this.lookup(name)) this.handleCall(name, [this.jsxProps(node)]);
+	}
+	jsxElement(node) {
+		const name = jsxName(node.openingElement.name);
+		const specs = name ? this.factories.get(name) : void 0;
+		if (!specs) return;
+		const binding = this.pickFactory([this.jsxProps(node.openingElement)], specs);
+		for (const child of node.children) if (child.type === "JSXExpressionContainer" && (child.expression.type === "ArrowFunctionExpression" || child.expression.type === "FunctionExpression")) this.renderProps.set(child.expression.start, binding);
 	}
 	/** ---- Bindings ---- */
 	declarator(id, init) {
@@ -289,7 +309,7 @@ var FileScan = class {
 		if (value.type === "CallExpression") {
 			const factory = calleeName(value.callee);
 			const specs = factory ? this.factories.get(factory) : void 0;
-			if (specs) this.bindFactory(id, value, specs);
+			if (specs) this.bindFactory(id, value.arguments, specs);
 			return;
 		}
 		if (id.type === "Identifier" && (value.type === "Identifier" || value.type === "MemberExpression")) {
@@ -299,10 +319,10 @@ var FileScan = class {
 		}
 	}
 	/** The first factory spec whose namespace and prefix sources all resolve, else the first spec. */
-	pickFactory(call, specs) {
+	pickFactory(args, specs) {
 		const resolved = specs.map((spec) => {
-			const namespace = spec.namespace ? this.stringArg(this.argValues(call.arguments, spec.namespace, 0)[0]) : void 0;
-			const keyPrefix = spec.keyPrefix ? this.stringArg(this.argValues(call.arguments, spec.keyPrefix, 0)[0]) : void 0;
+			const namespace = spec.namespace ? this.stringArg(this.argValues(args, spec.namespace, 0)[0]) : void 0;
+			const keyPrefix = spec.keyPrefix ? this.stringArg(this.argValues(args, spec.keyPrefix, 0)[0]) : void 0;
 			const complete = (!spec.namespace || namespace !== void 0) && (!spec.keyPrefix || keyPrefix !== void 0);
 			return {
 				binding: {
@@ -318,8 +338,8 @@ var FileScan = class {
 		});
 		return (resolved.find((r) => r.complete) ?? resolved[0]).binding;
 	}
-	bindFactory(id, call, specs) {
-		const binding = this.pickFactory(call, specs);
+	bindFactory(id, args, specs) {
+		const binding = this.pickFactory(args, specs);
 		const returns = (binding.spec.returns ?? ["t"]).filter((name) => !name.includes("."));
 		if (id.type === "Identifier") {
 			this.bind(id.name, binding);
@@ -383,6 +403,9 @@ var FileScan = class {
 			case "CallExpression":
 				this.call(node);
 				break;
+			case "JSXElement":
+				this.jsxElement(node);
+				break;
 			case "JSXOpeningElement":
 				this.jsx(node);
 				break;
@@ -391,9 +414,12 @@ var FileScan = class {
 				break;
 			case "FunctionDeclaration":
 			case "FunctionExpression":
-			case "ArrowFunctionExpression":
+			case "ArrowFunctionExpression": {
 				this.params(node.params);
+				const binding = this.renderProps.get(node.start);
+				if (binding && node.params[0]?.type === "Identifier") this.bind(node.params[0].name, binding);
 				break;
+			}
 			case "ImportSpecifier":
 				this.importSpecifier(node);
 				break;
@@ -413,7 +439,7 @@ var FileScan = class {
 		if (this.consumed.has(node.start) || !parent) return;
 		if (parent.type === "JSXAttribute") {
 			const name = parent.name.type === "JSXIdentifier" ? parent.name.name : "";
-			if (isStringLiteral(node) && !hardStringIgnoredAttributes.has(name) && !name.startsWith("data-") && !name.startsWith("aria-")) this.hard(node.value, {
+			if (isStringLiteral(node) && isTextAttribute(name, this.textAttributes)) this.hard(node.value, {
 				start: parent.start,
 				end: parent.end
 			}, "jsx-attribute", name);
@@ -505,7 +531,7 @@ function scanSource(parse, text, options) {
 		sourceType: "module",
 		range: false
 	});
-	const scan = new FileScan(source, (options.offset ?? 0) + shift, options.calls, options.hardStrings !== false, new Set(options.ignoreCallees));
+	const scan = new FileScan(source, (options.offset ?? 0) + shift, options.calls, options.hardStrings !== false, new Set(options.ignoreCallees), options.textAttributes);
 	scan.walk(result.program, void 0, "");
 	scan.markers(result.program, result.comments);
 	return scan.result();
@@ -531,7 +557,8 @@ function js() {
 					calls: ctx.calls,
 					filename: file.path,
 					hardStrings: true,
-					ignoreCallees: ctx.config.extract.ignoreCallees
+					ignoreCallees: ctx.config.extract.ignoreCallees,
+					textAttributes: ctx.config.extract.attributes
 				});
 			}
 		}]
@@ -553,25 +580,6 @@ const ATTRIBUTE = 6;
 function isKeyAttribute(tag, name) {
 	return name === "keypath" || name === "path" && (tag === "i18n" || tag === "i18n-d");
 }
-const ignoredAttributes = /* @__PURE__ */ new Set([
-	"class",
-	"style",
-	"key",
-	"ref",
-	"id",
-	"name",
-	"type",
-	"href",
-	"src",
-	"to",
-	"for",
-	"role",
-	"lang",
-	"target",
-	"rel",
-	"is",
-	"slot"
-]);
 function merge(into, result) {
 	into.usages.push(...result.usages);
 	into.keySlots.push(...result.keySlots ?? []);
@@ -580,14 +588,16 @@ function merge(into, result) {
 var TemplateScan = class {
 	parse;
 	calls;
+	textAttributes;
 	out = {
 		usages: [],
 		keySlots: [],
 		hardStrings: []
 	};
-	constructor(parse, calls) {
+	constructor(parse, calls, textAttributes) {
 		this.parse = parse;
 		this.calls = calls;
+		this.textAttributes = textAttributes;
 	}
 	expression(content, offset) {
 		if (!content.trim()) return;
@@ -605,12 +615,16 @@ var TemplateScan = class {
 	keyExpression(content, offset) {
 		const callee = "__x18nKey(";
 		try {
-			merge(this.out, scanSource(this.parse, `${callee}${content})`, {
+			const result = scanSource(this.parse, `${callee}${content})`, {
 				calls: [{ callee: "__x18nKey" }],
 				offset: offset - 10,
 				filename: "template.ts",
 				hardStrings: false
-			}));
+			});
+			merge(this.out, {
+				...result,
+				usages: result.usages.map(({ expression: _, ...usage }) => usage)
+			});
 		} catch {}
 	}
 	/** `v-t="'key'"` and `v-t="{ path: 'key' }"`. */
@@ -649,7 +663,7 @@ var TemplateScan = class {
 					dynamic: false
 				});
 				this.out.keySlots.push(range);
-			} else if (!ignoredAttributes.has(prop.name) && !prop.name.startsWith("data-") && /\p{L}/u.test(value.content)) this.out.hardStrings.push({
+			} else if (isTextAttribute(prop.name, this.textAttributes) && /\p{L}/u.test(value.content)) this.out.hardStrings.push({
 				text: value.content,
 				range: {
 					start: prop.loc.start.offset,
@@ -706,13 +720,14 @@ function vue() {
 					sourceMap: false,
 					ignoreEmpty: false
 				});
-				const template = new TemplateScan(parseJs, ctx.calls);
+				const template = new TemplateScan(parseJs, ctx.calls, ctx.config.extract.attributes);
 				for (const script of [descriptor.script, descriptor.scriptSetup]) {
 					if (!script) continue;
 					const lang = script.lang ?? "js";
 					merge(template.out, scanSource(parseJs, script.content, {
 						calls: ctx.calls,
 						ignoreCallees: ctx.config.extract.ignoreCallees,
+						textAttributes: ctx.config.extract.attributes,
 						offset: script.loc.start.offset,
 						filename: `script.${lang === "tsx" || lang === "jsx" ? lang : lang === "ts" ? "ts" : "js"}`
 					}));
@@ -724,4 +739,4 @@ function vue() {
 	};
 }
 //#endregion
-export { loadParser as a, js as i, vue as n, scanSource as o, calleeName as r, loadVueCompiler as t };
+export { js as a, isTextAttribute as i, vue as n, loadParser as o, calleeName as r, scanSource as s, loadVueCompiler as t };

package/dist/yaml-plugin.mjs

@@ -1,5 +1,5 @@
 import { placeholderFromShape } from "./placeholders.mjs";
-import { r as regexScopes } from "./regex-B9TBGgXC.mjs";
+import { r as regexScopes } from "./regex-AYVhuSb6.mjs";
 //#region src/yaml-plugin/index.ts
 /**
 * Compiles a validated YAML plugin into plugin objects. Each section maps to the

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@x18n/builtins",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "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.12",
+    "@x18n/core": "0.0.13",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.3.1",
     "oxc-parser": "^0.155.0",