@saykit/transform-jsx 0.6.0 → 0.7.0

package/dist/parser.mjs

@@ -1,4 +1,4 @@
-import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMessage, ElementMessage, LiteralMessage } from "@saykit/config/features/messages";
+import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMessage, ElementMessage, LiteralMessage, isArgumentType, validateArgumentStyle, validateBranchIdentifier } from "@saykit/config/features/messages";
 import { unwrapPlaceholder } from "@saykit/transform-js/parser";
 import * as t from "@babel/types";
 //#region src/parser.ts
@@ -16,9 +16,7 @@ function parseJSXContainerElement(element) {
 	const [accessor] = processed;
 	const children = element.children.reduce((p, c, i, a) => {
 		if (t.isJSXText(c)) {
-			let text = c.value.replace(/\s+/g, " ");
-			if (i === 0) text = text.trimStart();
-			if (i === a.length - 1) text = text.trimEnd();
+			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));
@@ -44,15 +42,23 @@ function parseJSXOpeningElement(element) {
 	const processed = processJSXOpeningElement(element);
 	if (!processed) return null;
 	const [accessor, kind] = processed;
+	const descriptorId = findAttributeValueIfStringLiteralAsString(element.attributes, "id");
+	const descriptorContext = findAttributeValueIfStringLiteralAsString(element.attributes, "context");
+	const wrap = (children) => new CompositeMessage({
+		id: descriptorId,
+		context: descriptorContext
+	}, [], getReferences(element), children, accessor);
 	if (typeof kind === "string" && [
 		"select",
 		"ordinal",
 		"plural"
 	].includes(kind)) {
+		const offset = kind === "select" ? void 0 : findPluralOffset(element.attributes);
 		const branches = element.attributes.reduce((b, a) => {
 			if (!t.isJSXAttribute(a)) return b;
 			let identifier = getAttributeNameAsString(a);
 			if (identifier === "_" || identifier === "id" || identifier === "context") return b;
+			if (offset !== void 0 && identifier === "offset") return b;
 			if (identifier.startsWith("_") && identifier.length > 1 && !Number.isNaN(+identifier.slice(1))) identifier = identifier.slice(1);
 			if (t.isStringLiteral(a.value)) b.push({
 				identifier,
@@ -77,17 +83,66 @@ function parseJSXOpeningElement(element) {
 			}
 			return b;
 		}, []);
+		for (const branch of branches) validateBranchIdentifier(kind, branch.identifier);
 		const initialiser = findAttributeValueIfExpressionOrStringLiteral(element.attributes, "_");
 		if (!initialiser) return null;
 		const [identifier, selector] = unwrapPlaceholder(initialiser);
-		const choice = new ChoiceMessage(kind, identifier, branches, selector);
-		return new CompositeMessage({
-			id: findAttributeValueIfStringLiteralAsString(element.attributes, "id"),
-			context: findAttributeValueIfStringLiteralAsString(element.attributes, "context")
-		}, [], getReferences(element), [choice], accessor);
+		return wrap([new ChoiceMessage(kind, identifier, branches, selector, offset)]);
+	}
+	if (typeof kind === "string" && isArgumentType(kind)) {
+		const initialiser = findAttributeValueIfExpressionOrStringLiteral(element.attributes, "_");
+		if (!initialiser) return null;
+		const style = findAttributeValueIfStringLiteralAsString(element.attributes, "style");
+		if (style !== void 0) validateArgumentStyle(kind, style);
+		const [identifier, value] = unwrapPlaceholder(initialiser);
+		return wrap([new ArgumentMessage(identifier, value, {
+			type: kind,
+			style
+		})]);
 	}
 	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;
+		if (getAttributeNameAsString(attribute) !== "offset") continue;
+		if (!t.isJSXExpressionContainer(attribute.value)) continue;
+		const { expression } = attribute.value;
+		if (!t.isNumericLiteral(expression)) continue;
+		if (!Number.isInteger(expression.value) || expression.value < 0) continue;
+		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 processJSXOpeningElement(element) {
 	if (t.isJSXIdentifier(element.name) && element.name.name === "Say") return [element.name, null];
 	if (t.isJSXMemberExpression(element.name) && t.isJSXIdentifier(element.name.object) && element.name.object.name === "Say" && t.isJSXIdentifier(element.name.property)) return [element.name.object, element.name.property.name.toLowerCase()];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saykit/transform-jsx",
-  "version": "0.6.0",
+  "version": "0.7.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.6.0",
-    "@saykit/transform-js": "^0.6.0"
+    "@saykit/config": "^0.7.0",
+    "@saykit/transform-js": "^0.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.29.7",