@let-value/translate-extract 1.0.11 → 1.0.13

package/dist/src/index.js

@@ -1,4 +1,4 @@
-import { run } from "../run-Dl-tr2kf.js";
+import { run } from "../run-CQoAsNNE.js";
 import path, { basename, dirname, extname, join, relative, resolve } from "node:path";
 import fs, { readFile } from "node:fs/promises";
 import * as gettextParser from "gettext-parser";
@@ -10,6 +10,7 @@ import { ResolverFactory } from "oxc-resolver";
 import { getFormula, getNPlurals } from "plural-forms";
 
 //#region src/plugins/cleanup/cleanup.ts
+const namespace$2 = "cleanup";
 function cleanup() {
 	return {
 		name: "cleanup",
@@ -18,14 +19,14 @@ function cleanup() {
 			const processedDirs = /* @__PURE__ */ new Set();
 			const generated = /* @__PURE__ */ new Set();
 			build.onResolve({
-				namespace: "cleanup",
+				namespace: namespace$2,
 				filter: /.*/
 			}, (args) => {
 				generated.add(args.path);
 				return args;
 			});
 			build.onProcess({
-				namespace: "cleanup",
+				namespace: namespace$2,
 				filter: /.*/
 			}, async ({ path: path$1 }) => {
 				await build.defer("translate");
@@ -39,14 +40,12 @@ function cleanup() {
 					const contents = await fs.readFile(full).catch(() => void 0);
 					if (!contents) continue;
 					const parsed = gettextParser.po.parse(contents);
-					const hasTranslations = Object.entries(parsed.translations || {}).some(([ctx, msgs]) => Object.keys(msgs).some((id) => !(ctx === "" && id === "")));
-					if (hasTranslations) build.context.logger?.warn({ path: full }, "stray translation file");
+					if (Object.entries(parsed.translations || {}).some(([ctx, msgs]) => Object.keys(msgs).some((id) => !(ctx === "" && id === "")))) build.context.logger?.warn({ path: full }, "stray translation file");
 					else {
 						await fs.unlink(full);
 						build.context.logger?.info({ path: full }, "removed empty translation file");
 					}
 				}
-				return void 0;
 			});
 		}
 	};
@@ -56,8 +55,7 @@ function cleanup() {
 //#region src/plugins/core/queries/comment.ts
 function getReference(node, { path: path$1 }) {
 	const line = node.startPosition.row + 1;
-	const rel = relative(process.cwd(), path$1).replace(/\\+/g, "/");
-	return `${rel}:${line}`;
+	return `${relative(process.cwd(), path$1).replace(/\\+/g, "/")}:${line}`;
 }
 function getComment(node) {
 	const text = node.text;
@@ -109,8 +107,7 @@ const importQuery = {
     ]
   `,
 	extract(match) {
-		const node = match.captures.find((c) => c.name === "import")?.node;
-		return node?.text;
+		return (match.captures.find((c) => c.name === "import")?.node)?.text;
 	}
 };
 
@@ -152,7 +149,7 @@ const notInPlural = (query) => ({
 					"ngettext",
 					"pgettext",
 					"npgettext"
-				].includes(fn.childForFieldName("property")?.text ?? "")) return void 0;
+				].includes(fn.childForFieldName("property")?.text ?? "")) return;
 			}
 		}
 		return result;
@@ -180,7 +177,7 @@ const messageArg = `[
 const messageArgs = `[ (arguments ${messageArg}) (template_string) @tpl ]`;
 const extractMessage = (name) => (match) => {
 	const node = match.captures.find((c) => c.name === "call")?.node;
-	if (!node) return void 0;
+	if (!node) return;
 	const msgid = match.captures.find((c) => c.name === "msgid")?.node.text;
 	if (msgid) return {
 		node,
@@ -211,13 +208,12 @@ const extractMessage = (name) => (match) => {
 	const id = match.captures.find((c) => c.name === "id")?.node.text;
 	const message = match.captures.find((c) => c.name === "message")?.node.text;
 	const msgId = id ?? message;
-	if (!msgId) return void 0;
-	const msgstr = message ?? id ?? "";
+	if (!msgId) return;
 	return {
 		node,
 		translation: {
 			id: msgId,
-			message: [msgstr]
+			message: [message ?? id ?? ""]
 		}
 	};
 };
@@ -235,8 +231,8 @@ const messageInvalidQuery = notInPlural({
 	extract(match) {
 		const call = match.captures.find((c) => c.name === "call")?.node;
 		const node = match.captures.find((c) => c.name === "arg")?.node;
-		if (!call || !node) return void 0;
-		if (allowed$1.has(node.type)) return void 0;
+		if (!call || !node) return;
+		if (allowed$1.has(node.type)) return;
 		return {
 			node,
 			error: "message() argument must be a string literal, object literal, or template literal"
@@ -249,7 +245,7 @@ const messageInvalidQuery = notInPlural({
 const extractPluralForms = (name) => (match) => {
 	const call = match.captures.find((c) => c.name === "call")?.node;
 	const n = match.captures.find((c) => c.name === "n")?.node;
-	if (!call || !n || n.nextNamedSibling) return void 0;
+	if (!call || !n || n.nextNamedSibling) return;
 	const msgctxt = match.captures.find((c) => c.name === "msgctxt")?.node?.text;
 	const msgNodes = match.captures.filter((c) => c.name === "msg").map((c) => c.node);
 	const ids = [];
@@ -279,7 +275,7 @@ const extractPluralForms = (name) => (match) => {
 			strs.push(result.translation.message[0] ?? "");
 		}
 	}
-	if (ids.length === 0) return void 0;
+	if (ids.length === 0) return;
 	const translation = {
 		id: ids[0],
 		plural: ids[1],
@@ -340,12 +336,12 @@ const contextInvalidQuery = withComment({
 	pattern: ctxCall,
 	extract(match) {
 		const call = match.captures.find((c) => c.name === "ctx")?.node;
-		if (!call) return void 0;
+		if (!call) return;
 		const parent = call.parent;
 		if (parent && parent.type === "member_expression" && parent.childForFieldName("object")?.id === call.id) {
 			const property = parent.childForFieldName("property")?.text;
 			const grandparent = parent.parent;
-			if (grandparent && grandparent.type === "call_expression" && grandparent.childForFieldName("function")?.id === parent.id && (property === "message" || property === "plural")) return void 0;
+			if (grandparent && grandparent.type === "call_expression" && grandparent.childForFieldName("function")?.id === parent.id && (property === "message" || property === "plural")) return;
 		}
 		return {
 			node: call,
@@ -372,8 +368,8 @@ const gettextInvalidQuery = {
 	extract(match) {
 		const call = match.captures.find((c) => c.name === "call")?.node;
 		const node = match.captures.find((c) => c.name === "arg")?.node;
-		if (!call || !node) return void 0;
-		if (allowed.has(node.type)) return void 0;
+		if (!call || !node) return;
+		if (allowed.has(node.type)) return;
 		return {
 			node,
 			error: "gettext() argument must be a string literal, object literal, or template literal"
@@ -541,7 +537,7 @@ function findTsconfig(dir) {
 		const config = path.join(current, "tsconfig.json");
 		if (fs$1.existsSync(config)) return config;
 		const parent = path.dirname(current);
-		if (parent === current) return void 0;
+		if (parent === current) return;
 		current = parent;
 	}
 }
@@ -634,7 +630,6 @@ function core() {
 					namespace: "translate",
 					data: translations
 				});
-				return void 0;
 			});
 		}
 	};
@@ -780,7 +775,7 @@ function po() {
 				filter: /.*/,
 				namespace
 			}, async ({ entrypoint, path: path$1, data }) => {
-				if (!data || !Array.isArray(data)) return void 0;
+				if (!data || !Array.isArray(data)) return;
 				for (const locale of build.context.config.locales) {
 					const destination = build.context.config.destination({
 						entrypoint,
@@ -802,7 +797,6 @@ function po() {
 						namespace
 					});
 				});
-				return void 0;
 			});
 			build.onLoad({
 				filter: /.*\.po$/,
@@ -823,7 +817,7 @@ function po() {
 				const collected = collections.get(path$1);
 				if (!collected) {
 					build.context.logger?.warn({ path: path$1 }, "no translations collected for this path");
-					return void 0;
+					return;
 				}
 				const { locale, translations } = collected;
 				const record = collect(translations, locale);
@@ -880,8 +874,7 @@ function resolvePlugins(user) {
 function defineConfig(config) {
 	const defaultLocale = config.defaultLocale ?? "en";
 	const plugins = resolvePlugins(config.plugins);
-	const raw = Array.isArray(config.entrypoints) ? config.entrypoints : [config.entrypoints];
-	const entrypoints = raw.map(resolveEntrypoint);
+	const entrypoints = (Array.isArray(config.entrypoints) ? config.entrypoints : [config.entrypoints]).map(resolveEntrypoint);
 	return {
 		plugins,
 		entrypoints,
@@ -898,43 +891,96 @@ function defineConfig(config) {
 //#endregion
 //#region src/plugins/react/queries/utils.ts
 function buildTemplate(node) {
+	const source = node.tree.rootNode.text;
+	const open = node.childForFieldName("open_tag");
+	const close = node.childForFieldName("close_tag");
+	const contentStart = open?.endIndex ?? node.startIndex;
+	const contentEnd = close?.startIndex ?? node.endIndex;
+	const parts = [];
+	let segmentStart = contentStart;
+	const pushRawText = (endIndex) => {
+		if (endIndex <= segmentStart) {
+			segmentStart = Math.max(segmentStart, endIndex);
+			return;
+		}
+		const text$1 = source.slice(segmentStart, endIndex);
+		if (text$1) parts.push({
+			kind: "text",
+			text: text$1,
+			raw: true
+		});
+		segmentStart = endIndex;
+	};
 	const children = node.namedChildren.slice(1, -1);
-	const strings = [""];
-	const values = [];
-	for (let i = 0; i < children.length; i++) {
-		const child = children[i];
-		if (child.type === "jsx_text") {
-			let text$1 = child.text;
-			if (i === 0) text$1 = text$1.replace(/^\s+/, "");
-			if (i === children.length - 1) text$1 = text$1.replace(/\s+$/, "");
-			if (text$1) strings[strings.length - 1] += text$1;
-		} else if (child.type === "jsx_expression") {
-			const expr = child.namedChildren[0];
-			if (!expr) return {
-				text: "",
-				error: "Empty JSX expression"
-			};
-			if (expr.type === "identifier") {
-				values.push(expr.text);
-				strings.push("");
-			} else if (expr.type === "string") strings[strings.length - 1] += expr.text.slice(1, -1);
-			else if (expr.type === "template_string") {
-				const hasSubstitutions = expr.children.some((c) => c.type === "template_substitution");
-				if (hasSubstitutions) return {
-					text: "",
-					error: "JSX expressions with template substitutions are not supported"
-				};
-				const content = expr.text.slice(1, -1);
-				strings[strings.length - 1] += content;
-			} else return {
+	for (const child of children) if (child.type === "jsx_expression") {
+		pushRawText(child.startIndex);
+		const expr = child.namedChildren[0];
+		if (!expr) return {
+			text: "",
+			error: "Empty JSX expression"
+		};
+		if (expr.type === "identifier") parts.push({
+			kind: "expr",
+			value: expr.text
+		});
+		else if (expr.type === "string") parts.push({
+			kind: "text",
+			text: expr.text.slice(1, -1),
+			raw: false
+		});
+		else if (expr.type === "template_string") {
+			if (expr.children.some((c) => c.type === "template_substitution")) return {
 				text: "",
-				error: "JSX expressions must be simple identifiers, strings, or template literals"
+				error: "JSX expressions with template substitutions are not supported"
 			};
-		} else if (child.type === "string") strings[strings.length - 1] += child.text.slice(1, -1);
-		else return {
+			parts.push({
+				kind: "text",
+				text: expr.text.slice(1, -1),
+				raw: false
+			});
+		} else return {
 			text: "",
-			error: "Unsupported JSX child"
+			error: "JSX expressions must be simple identifiers, strings, or template literals"
 		};
+		segmentStart = child.endIndex;
+	} else if (child.type === "string") {
+		pushRawText(child.startIndex);
+		parts.push({
+			kind: "text",
+			text: child.text.slice(1, -1),
+			raw: false
+		});
+		segmentStart = child.endIndex;
+	} else if (child.type === "jsx_text" || child.type === "html_character_reference" || child.isError) continue;
+	else return {
+		text: "",
+		error: "Unsupported JSX child"
+	};
+	pushRawText(contentEnd);
+	const firstRawIndex = parts.findIndex((part) => part.kind === "text" && part.raw);
+	if (firstRawIndex === 0) {
+		const part = parts[firstRawIndex];
+		part.text = part.text.replace(/^\s+/, "");
+	}
+	let lastRawIndex = -1;
+	for (let i = parts.length - 1; i >= 0; i--) {
+		const part = parts[i];
+		if (part.kind === "text" && part.raw) {
+			lastRawIndex = i;
+			break;
+		}
+	}
+	if (lastRawIndex !== -1 && lastRawIndex === parts.length - 1) {
+		const part = parts[lastRawIndex];
+		part.text = part.text.replace(/\s+$/, "");
+	}
+	const strings = [""];
+	const values = [];
+	for (const part of parts) if (part.kind === "text") {
+		if (part.text) strings[strings.length - 1] += part.text;
+	} else {
+		values.push(part.value);
+		strings.push("");
 	}
 	let text = "";
 	for (let i = 0; i < strings.length; i++) {
@@ -954,13 +1000,11 @@ function buildAttrValue(node) {
 		if (expr.type === "identifier") return { text: `\${${expr.text}}` };
 		else if (expr.type === "string") return { text: expr.text.slice(1, -1) };
 		else if (expr.type === "template_string") {
-			const hasSubstitutions = expr.children.some((c) => c.type === "template_substitution");
-			if (hasSubstitutions) return {
+			if (expr.children.some((c) => c.type === "template_substitution")) return {
 				text: "",
 				error: "JSX expressions with template substitutions are not supported"
 			};
-			const content = expr.text.slice(1, -1);
-			return { text: content };
+			return { text: expr.text.slice(1, -1) };
 		} else return {
 			text: "",
 			error: "JSX expressions must be simple identifiers, strings, or template literals"
@@ -1150,22 +1194,22 @@ function react() {
 			build.onResolve({
 				filter: /.*/,
 				namespace: "source"
-			}, ({ entrypoint, path: path$1, namespace: namespace$2 }) => {
+			}, ({ entrypoint, path: path$1, namespace: namespace$3 }) => {
 				return {
 					entrypoint,
-					namespace: namespace$2,
+					namespace: namespace$3,
 					path: resolve(path$1)
 				};
 			});
 			build.onLoad({
 				filter,
 				namespace: "source"
-			}, async ({ entrypoint, path: path$1, namespace: namespace$2 }) => {
+			}, async ({ entrypoint, path: path$1, namespace: namespace$3 }) => {
 				const data = await readFile(path$1, "utf8");
 				return {
 					entrypoint,
 					path: path$1,
-					namespace: namespace$2,
+					namespace: namespace$3,
 					data
 				};
 			});
@@ -1181,7 +1225,6 @@ function react() {
 					namespace: "translate",
 					data: translations
 				});
-				return void 0;
 			});
 		}
 	};