@saykit/transform-jsx 0.6.1 → 0.7.0

package/dist/parser.mjs

@@ -1,4 +1,4 @@
-import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMessage, ElementMessage, LiteralMessage, validateBranchIdentifier } 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
@@ -42,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,
@@ -79,15 +87,38 @@ function parseJSXOpeningElement(element) {
 		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.

package/package.json

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