@saykit/transform-jsx 0.0.0-beta-20260729112211 → 0.0.0-beta-20260729131250

package/dist/index.mjs

@@ -1,11 +1,11 @@
 import { generateSayJSXElement } from "./generator.mjs";
-import { isEquivalentElement, parseJSXElement } from "./parser.mjs";
+import { parseJSXElement } from "./parser.mjs";
 import { generate } from "@babel/generator";
 import * as parser from "@babel/parser";
 import traverse_ from "@babel/traverse";
 import { assignSequenceIdentifiers } from "@saykit/config/features/messages";
 import { generateSayCallExpression } from "@saykit/transform-js/generator";
-import { parseExpression } from "@saykit/transform-js/parser";
+import { isEquivalentPlaceholder, parseExpression } from "@saykit/transform-js/parser";
 //#region src/index.ts
 const traverse = traverse_.default || traverse_;
 function createProgram(code, id) {
@@ -40,7 +40,7 @@ function createJsxTransformer() {
 					path.node.leadingComments = path.node.leadingComments ?? [];
 					const message = parseExpression(path.node);
 					if (message) {
-						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentElement);
+						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentPlaceholder);
 						messages.push(message);
 						path.skip();
 					}
@@ -49,7 +49,7 @@ function createJsxTransformer() {
 					path.node.leadingComments = path.node.leadingComments ?? [];
 					const message = parseJSXElement(path.node);
 					if (message) {
-						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentElement);
+						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentPlaceholder);
 						messages.push(message);
 						path.skip();
 					}
@@ -71,7 +71,7 @@ function createJsxTransformer() {
 					path.node.leadingComments = path.node.leadingComments ?? [];
 					const message = parseExpression(path.node);
 					if (message) {
-						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentElement);
+						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentPlaceholder);
 						const replacement = generateSayCallExpression(message);
 						path.replaceWith(replacement);
 						path.skip();
@@ -81,7 +81,7 @@ function createJsxTransformer() {
 					path.node.leadingComments = path.node.leadingComments ?? [];
 					const message = parseJSXElement(path.node);
 					if (message) {
-						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentElement);
+						assignSequenceIdentifiers(message, { current: 0 }, isEquivalentPlaceholder);
 						const replacement = generateSayJSXElement(message);
 						path.replaceWith(replacement);
 						path.skip();

package/dist/parser.d.mts

@@ -5,12 +5,5 @@ declare function parseJSXContainerElement(element: t.JSXElement): CompositeMessa
 declare function parseJSXOpeningElement(element: t.JSXOpeningElement): CompositeMessage | null;
 declare function parseJSXElement(element: t.JSXElement, fallback?: false): CompositeMessage | null;
 declare function parseJSXElement(element: t.JSXElement, fallback: true): CompositeMessage | ElementMessage;
-/**
- * Whether two elements sharing a tag are the same element, and so compile to
- * one prop a translator can use interchangeably. `say-tag` has been stripped by
- * the time this runs, so it compares the element name and the props left over,
- * not the children: those come from the translation, not the source.
- */
-declare function isEquivalentElement(a: any, b: any): boolean;
 //#endregion
-export { isEquivalentElement, parseJSXContainerElement, parseJSXElement, parseJSXOpeningElement };
+export { parseJSXContainerElement, parseJSXElement, parseJSXOpeningElement };

package/dist/parser.mjs

@@ -1,4 +1,5 @@
 import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMessage, ElementMessage, LiteralMessage } from "@saykit/config/features/messages";
+import { unwrapPlaceholder } from "@saykit/transform-js/parser";
 import * as t from "@babel/types";
 //#region src/parser.ts
 /**
@@ -23,7 +24,10 @@ function parseJSXContainerElement(element) {
 		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)) p.push(new ArgumentMessage(getExpressionAsIdentifier(c.expression), c.expression));
+			if (t.isExpression(c.expression)) {
+				const [identifier, value] = unwrapPlaceholder(c.expression);
+				p.push(new ArgumentMessage(identifier, value));
+			}
 		}
 		return p;
 	}, []);
@@ -63,16 +67,20 @@ function parseJSXOpeningElement(element) {
 					identifier,
 					value: new ElementMessage(AUTO_INCREMENT_IDENTIFIER, [], a.value.expression)
 				});
-				else if (t.isExpression(a.value.expression)) b.push({
-					identifier,
-					value: new ArgumentMessage(getExpressionAsIdentifier(a.value.expression), a.value.expression)
-				});
+				else if (t.isExpression(a.value.expression)) {
+					const [name, value] = unwrapPlaceholder(a.value.expression);
+					b.push({
+						identifier,
+						value: new ArgumentMessage(name, value)
+					});
+				}
 			}
 			return b;
 		}, []);
 		const initialiser = findAttributeValueIfExpressionOrStringLiteral(element.attributes, "_");
 		if (!initialiser) return null;
-		const choice = new ChoiceMessage(kind, getExpressionAsIdentifier(initialiser), branches, initialiser);
+		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")
@@ -111,16 +119,6 @@ function takeElementTag(element) {
 	attributes.splice(index, 1);
 	return tag;
 }
-/**
-* Whether two elements sharing a tag are the same element, and so compile to
-* one prop a translator can use interchangeably. `say-tag` has been stripped by
-* the time this runs, so it compares the element name and the props left over,
-* not the children: those come from the translation, not the source.
-*/
-function isEquivalentElement(a, b) {
-	if (!t.isJSXElement(a) || !t.isJSXElement(b)) return false;
-	return t.isNodesEquivalent(a.openingElement, b.openingElement);
-}
 function getReferences(node) {
 	if (!node.loc?.filename) return [];
 	return [`${node.loc.filename}:${node.loc.start.line}`];
@@ -153,11 +151,5 @@ function findAttributeValueAsBoolean(attributes, identifier) {
 		if (t.isJSXExpressionContainer(attribute.value) && t.isBooleanLiteral(attribute.value.expression)) return attribute.value.expression.value;
 	}
 }
-function getExpressionAsIdentifier(node) {
-	if (t.isIdentifier(node)) return node.name;
-	/* v8 ignore next */
-	if (t.isJSXIdentifier(node)) return node.name;
-	return AUTO_INCREMENT_IDENTIFIER;
-}
 //#endregion
-export { isEquivalentElement, parseJSXContainerElement, parseJSXElement, parseJSXOpeningElement };
+export { parseJSXContainerElement, parseJSXElement, parseJSXOpeningElement };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saykit/transform-jsx",
-  "version": "0.0.0-beta-20260729112211",
+  "version": "0.0.0-beta-20260729131250",
   "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.0.0-beta-20260729112211",
-    "@saykit/transform-js": "^0.0.0-beta-20260729112211"
+    "@saykit/config": "^0.0.0-beta-20260729131250",
+    "@saykit/transform-js": "^0.0.0-beta-20260729131250"
   },
   "devDependencies": {
     "@babel/core": "^7.29.7",