@saykit/transform-jsx 0.1.0 → 0.3.0

package/README.md

@@ -2,6 +2,8 @@
 
 > JSX and TSX transformer for [SayKit](https://saykit.js.org).
 
+[![Coverage](https://codecov.io/gh/k0d13/saykit/graph/badge.svg?flag=transform-jsx)](https://codecov.io/gh/k0d13/saykit?flags%5B0%5D=transform-jsx)
+
 Extracts and rewrites the `<Say>` macro (and its `<Say.Plural>`, `<Say.Ordinal>`, `<Say.Select>` sub-components) in `.jsx` and `.tsx` files. Used inside a `saykit.config.ts` bucket alongside [`@saykit/transform-js`](https://github.com/k0d13/saykit/tree/main/packages/transform-js).
 
 ## Install

package/dist/generator.mjs

@@ -4,7 +4,11 @@ import * as t from "@babel/types";
 function generateSayJSXElement(message) {
 	const id = message.descriptor.id ?? message.toHashString();
 	const children = generateChildExpressions(message.children);
-	const attributes = [t.jsxAttribute(t.jsxIdentifier("id"), t.stringLiteral(id)), ...children.map(([k, e]) => t.jsxAttribute(t.jsxIdentifier(Number.isNaN(+k) ? k : `_${k}`), t.jsxExpressionContainer(e)))];
+	const attributes = [
+		t.jsxAttribute(t.jsxIdentifier("id"), t.stringLiteral(id)),
+		...message.whitespace === void 0 ? [] : [t.jsxAttribute(t.jsxIdentifier("whitespace"), t.jsxExpressionContainer(t.booleanLiteral(message.whitespace)))],
+		...children.map(([k, e]) => t.jsxAttribute(t.jsxIdentifier(Number.isNaN(+k) ? k : `_${k}`), t.jsxExpressionContainer(e)))
+	];
 	return t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("Say"), attributes, true), null, []);
 }
 function generateChildExpressions(messages) {

package/dist/parser.mjs

@@ -20,10 +20,13 @@ function parseJSXContainerElement(element) {
 		}
 		return p;
 	}, []);
+	const descriptorId = findAttributeValueIfStringLiteralAsString(element.openingElement.attributes, "id");
+	const descriptorContext = findAttributeValueIfStringLiteralAsString(element.openingElement.attributes, "context");
+	const whitespace = findAttributeValueAsBoolean(element.openingElement.attributes, "whitespace");
 	return new CompositeMessage({
-		id: findAttributeValueIfStringLiteralAsString(element.openingElement.attributes, "id"),
-		context: findAttributeValueIfStringLiteralAsString(element.openingElement.attributes, "context")
-	}, [], [], children, accessor);
+		id: descriptorId,
+		context: descriptorContext
+	}, [], [], children, accessor, whitespace);
 }
 function parseJSXOpeningElement(element) {
 	if (!element.selfClosing) return null;
@@ -80,13 +83,10 @@ function parseJSXElement(element, fallback) {
 	if (message) return message;
 	if (!fallback) return null;
 	if (element.openingElement.selfClosing) return new ElementMessage(AUTO_INCREMENT_IDENTIFIER, [], element);
-	const wrapped = parseJSXElement(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("Say"), []), t.jsxClosingElement(t.jsxIdentifier("Say")), element.children), true);
-	if (wrapped) return new ElementMessage(AUTO_INCREMENT_IDENTIFIER, [wrapped], element);
-	return null;
+	return new ElementMessage(AUTO_INCREMENT_IDENTIFIER, [parseJSXElement(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("Say"), []), t.jsxClosingElement(t.jsxIdentifier("Say")), element.children), true)], element);
 }
 function getAttributeNameAsString(attribute) {
-	if (t.isJSXIdentifier(attribute.name)) return attribute.name.name;
-	if (t.isJSXNamespacedName(attribute.name)) return attribute.name.name.name;
+	return t.isJSXIdentifier(attribute.name) ? attribute.name.name : attribute.name.name.name;
 }
 function findAttributeValueIfStringLiteralAsString(attributes, identifier) {
 	for (const attribute of attributes) {
@@ -105,8 +105,17 @@ function findAttributeValueIfExpressionOrStringLiteral(attributes, identifier) {
 		}
 	}
 }
+function findAttributeValueAsBoolean(attributes, identifier) {
+	for (const attribute of attributes) {
+		if (!t.isJSXAttribute(attribute)) continue;
+		if (!t.isJSXIdentifier(attribute.name) || attribute.name.name !== identifier) continue;
+		if (attribute.value == null) return true;
+		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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saykit/transform-jsx",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "JSX and TSX source transformer for SayKit",
   "keywords": [
     "i18n",
@@ -43,23 +43,21 @@
     "provenance": true
   },
   "dependencies": {
-    "@babel/generator": "^7.29.1",
-    "@babel/parser": "^7.29.3",
-    "@babel/traverse": "^7.29.0",
-    "@babel/types": "^7.29.0",
-    "@saykit/config": "^0.1.0",
-    "@saykit/transform-js": "^0.1.0"
+    "@babel/generator": "^7.29.7",
+    "@babel/parser": "^7.29.7",
+    "@babel/traverse": "^7.29.7",
+    "@babel/types": "^7.29.7",
+    "@saykit/config": "^0.3.0",
+    "@saykit/transform-js": "^0.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.0",
+    "@babel/core": "^7.29.7",
     "@types/babel__core": "^7.20.5",
     "@types/babel__generator": "^7.27.0",
     "@types/babel__traverse": "^7.28.0"
   },
   "scripts": {
     "check": "tsc --noEmit",
-    "test": "vitest",
-    "coverage": "vitest run --coverage",
     "build": "tsdown"
   }
 }