@saykit/transform-jsx 0.7.0 → 0.9.0

package/dist/parser.mjs

@@ -2,11 +2,6 @@ import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMes
 import { unwrapPlaceholder } from "@saykit/transform-js/parser";
 import * as t from "@babel/types";
 //#region src/parser.ts
-/**
-* Attribute used to name the ICU tag an embedded element extracts as, e.g.
-* `<a say-tag="link">` becomes `<link></link>` rather than `<0></0>`. It never
-* reaches the real element.
-*/
 const TAG_ATTRIBUTE = "say-tag";
 const TAG_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function parseJSXContainerElement(element) {
@@ -14,21 +9,7 @@ function parseJSXContainerElement(element) {
 	const processed = processJSXOpeningElement(element.openingElement);
 	if (!processed) return null;
 	const [accessor] = processed;
-	const children = element.children.reduce((p, c, i, a) => {
-		if (t.isJSXText(c)) {
-			const text = normalizeJSXText(c.value, i === 0, i === a.length - 1);
-			if (text) p.push(new LiteralMessage(text));
-		}
-		if (t.isJSXElement(c)) p.push(parseJSXElement(c, true));
-		else if (t.isJSXFragment(c)) p.push(new ElementMessage(AUTO_INCREMENT_IDENTIFIER, [], c));
-		else if (t.isJSXExpressionContainer(c)) {
-			if (t.isExpression(c.expression)) {
-				const [identifier, value] = unwrapPlaceholder(c.expression);
-				p.push(new ArgumentMessage(identifier, value));
-			}
-		}
-		return p;
-	}, []);
+	const children = buildMessageChildren(element);
 	const descriptorId = findAttributeValueIfStringLiteralAsString(element.openingElement.attributes, "id");
 	const descriptorContext = findAttributeValueIfStringLiteralAsString(element.openingElement.attributes, "context");
 	const whitespace = findAttributeValueAsBoolean(element.openingElement.attributes, "whitespace");
@@ -69,11 +50,13 @@ function parseJSXOpeningElement(element) {
 					identifier,
 					value: parseJSXElement(a.value.expression, true)
 				});
-				else if (t.isJSXFragment(a.value.expression)) b.push({
-					identifier,
-					value: new ElementMessage(AUTO_INCREMENT_IDENTIFIER, [], a.value.expression)
-				});
-				else if (t.isExpression(a.value.expression)) {
+				else if (t.isJSXFragment(a.value.expression)) {
+					const fragment = a.value.expression;
+					b.push({
+						identifier,
+						value: new CompositeMessage({}, [], [], buildMessageChildren(fragment), fragment)
+					});
+				} else if (t.isExpression(a.value.expression)) {
 					const [name, value] = unwrapPlaceholder(a.value.expression);
 					b.push({
 						identifier,
@@ -102,11 +85,6 @@ function parseJSXOpeningElement(element) {
 	}
 	return null;
 }
-/**
-* The `offset` a plural subtracts from its selector before `#` is formatted.
-* See the JS parser's counterpart — the constraints are the same, only the
-* syntax carrying it differs.
-*/
 function findPluralOffset(attributes) {
 	for (const attribute of attributes) {
 		if (!t.isJSXAttribute(attribute)) continue;
@@ -118,30 +96,35 @@ function findPluralOffset(attributes) {
 		return expression.value;
 	}
 }
-/**
-* Punctuation that never takes a space in front of it. A formatter wrapping
-* long JSX regularly strands these at the start of a line, on their own or
-* ahead of the rest of a clause.
-*/
-const CLOSING_PUNCTUATION = /^[.,;:!?)\]}»”’]/;
-/**
-* Collapse the whitespace in a JSX text child the way the source reads.
-*
-* A line break between a word and its neighbour is only how a formatter wrapped
-* a long line, so it still means a space. Dropping it would run the words
-* together — and because ids are content hashes, silently orphan every existing
-* translation for the message.
-*
-* The exception is a line that begins with punctuation, which belongs tight
-* against whatever precedes it. Only an implicit break is treated this way: a
-* space the author wrote on the same line is deliberate and always survives.
-*/
-function normalizeJSXText(value, isFirst, isLast) {
-	let text = value.replace(/\s+/g, " ");
-	if (isFirst) text = text.trimStart();
-	else if (text.startsWith(" ") && /^[^\S\n]*\n/.test(value) && CLOSING_PUNCTUATION.test(text.slice(1))) text = text.slice(1);
-	if (isLast) text = text.trimEnd();
-	return text;
+function buildMessageChildren(element, into = []) {
+	return t.react.buildChildren(element).reduce((p, c) => {
+		const literal = getExpressionAsLiteralText(c);
+		if (literal !== void 0) pushLiteral(p, literal);
+		else if (t.isJSXElement(c)) p.push(parseJSXElement(c, true));
+		else if (t.isJSXFragment(c)) buildMessageChildren(c, p);
+		else if (t.isExpression(c)) {
+			const [identifier, value] = unwrapPlaceholder(c);
+			p.push(new ArgumentMessage(identifier, value));
+		}
+		return p;
+	}, into);
+}
+function pushLiteral(messages, text) {
+	if (!text) return;
+	const last = messages.at(-1);
+	if (last instanceof LiteralMessage) messages[messages.length - 1] = new LiteralMessage(last.text + text);
+	else messages.push(new LiteralMessage(text));
+}
+function getExpressionAsLiteralText(expression) {
+	if (t.isStringLiteral(expression)) return expression.value;
+	if (t.isNumericLiteral(expression)) return String(expression.value);
+	if (t.isUnaryExpression(expression) && (expression.operator === "-" || expression.operator === "+") && t.isNumericLiteral(expression.argument)) return String(expression.operator === "-" ? -expression.argument.value : expression.argument.value);
+	if (t.isBooleanLiteral(expression) || t.isNullLiteral(expression)) return "";
+	if (t.isTemplateLiteral(expression) && expression.expressions.length === 0) {
+		const [chunk] = expression.quasis;
+		/* v8 ignore next */
+		return chunk?.value.cooked ?? "";
+	}
 }
 function processJSXOpeningElement(element) {
 	if (t.isJSXIdentifier(element.name) && element.name.name === "Say") return [element.name, null];
@@ -156,12 +139,6 @@ function parseJSXElement(element, fallback) {
 	if (element.openingElement.selfClosing) return new ElementMessage(identifier, [], element);
 	return new ElementMessage(identifier, [parseJSXElement(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("Say"), []), t.jsxClosingElement(t.jsxIdentifier("Say")), element.children), true)], element);
 }
-/**
-* Read the tag name off an embedded element and remove the attribute so it
-* never reaches the rendered element. Only static strings name a tag; anything
-* else is left in place and the element falls back to an auto-incremented
-* identifier.
-*/
 function takeElementTag(element) {
 	const attributes = element.openingElement.attributes;
 	const index = attributes.findIndex((a) => t.isJSXAttribute(a) && getAttributeNameAsString(a) === TAG_ATTRIBUTE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saykit/transform-jsx",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "JSX and TSX source transformer for SayKit",
   "keywords": [
     "i18n",
@@ -47,8 +47,8 @@
     "@babel/parser": "^7.29.7",
     "@babel/traverse": "^7.29.7",
     "@babel/types": "^7.29.7",
-    "@saykit/config": "^0.7.0",
-    "@saykit/transform-js": "^0.7.0"
+    "@saykit/config": "^0.9.0",
+    "@saykit/transform-js": "^0.9.0"
   },
   "devDependencies": {
     "@babel/core": "^7.29.7",