@saykit/transform-js 0.7.0 → 0.9.0

package/dist/parser.mjs

@@ -6,16 +6,19 @@ function parseTaggedTemplateExpression(tagged) {
 	const processed = processExpression(tagged.tag);
 	if (!processed) return null;
 	const [accessor, descriptor] = processed;
-	const children = tagged.quasi.quasis.reduce((c, q, i) => {
-		c.push(new LiteralMessage(q.value.cooked ?? q.value.raw));
-		if (t.isExpression(tagged.quasi.expressions[i])) c.push(parseExpression(tagged.quasi.expressions[i], true));
-		return c;
-	}, []);
+	const children = buildTemplateChildren(tagged.quasi);
 	return new CompositeMessage({
 		id: descriptor ? findPropertyValueIfStringLiteralAsString(descriptor, "id") : void 0,
 		context: descriptor ? findPropertyValueIfStringLiteralAsString(descriptor, "context") : void 0
 	}, getTranslatorComments(tagged.leadingComments ?? []), tagged.loc ? [`${tagged.loc.filename}:${tagged.loc.start.line}`] : [], children, accessor);
 }
+function buildTemplateChildren(template) {
+	return template.quasis.reduce((c, q, i) => {
+		c.push(new LiteralMessage(q.value.cooked ?? q.value.raw));
+		if (t.isExpression(template.expressions[i])) c.push(parseExpression(template.expressions[i], true));
+		return c;
+	}, []);
+}
 function parseCallExpression(call) {
 	const processed = processExpression(call.callee);
 	if (!processed) return null;
@@ -41,6 +44,7 @@ function parseCallExpression(call) {
 			if (offset !== void 0 && getPropertyNameAsString(p.key) === "offset") return c;
 			let message = null;
 			if (!message && t.isStringLiteral(p.value)) message = new LiteralMessage(p.value.value);
+			if (!message && t.isTemplateLiteral(p.value)) message = new CompositeMessage({}, [], [], buildTemplateChildren(p.value), p.value);
 			if (!message) message = parseExpression(p.value, true);
 			c.push({
 				identifier: getPropertyNameAsString(p.key),
@@ -69,15 +73,6 @@ function parseCallExpression(call) {
 	}
 	return null;
 }
-/**
-* The `offset` a plural subtracts from its selector before `#` is formatted, so
-* "You and 2 others" can select on a total of three.
-*
-* Read only from an integer literal: the offset is baked into the extracted
-* message, so it has to be known at build time, and a fractional or negative
-* one is not something ICU accepts. Anything else stays an ordinary branch and
-* is validated as the key it looks like.
-*/
 function findPluralOffset(object) {
 	for (const property of object.properties) {
 		if (!t.isObjectProperty(property) || property.computed) continue;
@@ -128,16 +123,6 @@ function getExpressionAsKey(node) {
 	if (t.isJSXIdentifier(node)) return node.name;
 	return AUTO_INCREMENT_IDENTIFIER;
 }
-/**
-* Read the name off a value written as a single-key object and hand back the
-* value alone, so the wrapper never reaches the output: `${{ total: sum() }}`
-* is `{total}` rather than `{0}`.
-*
-* An inline one-key object is the only shape this claims, and it is a shape
-* that could not mean anything else — interpolating an object stringifies it
-* to `[object Object]`, and rendering one in JSX throws. Anything else is
-* returned untouched and named the way it always was.
-*/
 function unwrapPlaceholder(expression) {
 	if (!t.isObjectExpression(expression) || expression.properties.length !== 1) return [getExpressionAsKey(expression), expression];
 	const [property] = expression.properties;
@@ -148,16 +133,6 @@ function unwrapPlaceholder(expression) {
 	if (!PLACEHOLDER_PATTERN.test(name)) throw new Error(`Invalid placeholder name '${name}', expected a letter or underscore followed by letters, digits, or underscores`);
 	return [name, property.value];
 }
-/**
-* Whether two placeholders sharing a name are the same placeholder, and so
-* compile to one prop a translator can move around the sentence freely.
-*
-* A value is compared whole: the same variable interpolated twice is one value,
-* while `${name}` beside `${{ name: author.name }}` is two things claiming one
-* name. An element is compared on its opening element alone — `say-tag` has
-* been stripped by the time this runs, and its children come from the
-* translation rather than the source.
-*/
 function isEquivalentPlaceholder(a, b) {
 	if (t.isJSXElement(a) || t.isJSXElement(b)) {
 		if (!t.isJSXElement(a) || !t.isJSXElement(b)) return false;

package/package.json

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