@saykit/transform-js 0.6.1 → 0.8.0

package/dist/parser.mjs

@@ -1,4 +1,4 @@
-import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMessage, LiteralMessage, validateBranchIdentifier } from "@saykit/config/features/messages";
+import { AUTO_INCREMENT_IDENTIFIER, ArgumentMessage, ChoiceMessage, CompositeMessage, LiteralMessage, isArgumentType, validateArgumentStyle, validateBranchIdentifier } from "@saykit/config/features/messages";
 import * as t from "@babel/types";
 //#region src/parser.ts
 const PLACEHOLDER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
@@ -6,20 +6,33 @@ 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);
 }
+/**
+* The text and the values of a template literal, in the order they were
+* written — the message the template spells out.
+*/
+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;
 	const [accessor, descriptor, kind] = processed;
+	const descriptorId = descriptor ? findPropertyValueIfStringLiteralAsString(descriptor, "id") : void 0;
+	const descriptorContext = descriptor ? findPropertyValueIfStringLiteralAsString(descriptor, "context") : void 0;
+	const wrap = (children) => new CompositeMessage({
+		id: descriptorId,
+		context: descriptorContext
+	}, [], call.loc ? [`${call.loc.filename}:${call.loc.start.line}`] : [], children, accessor);
 	if (typeof kind === "string" && [
 		"select",
 		"ordinal",
@@ -28,10 +41,14 @@ function parseCallExpression(call) {
 		if (call.arguments.length !== 2) return null;
 		if (!t.isExpression(call.arguments[0])) return null;
 		if (!t.isObjectExpression(call.arguments[1])) return null;
-		const branches = call.arguments[1].properties.reduce((c, p) => {
+		const object = call.arguments[1];
+		const offset = kind === "select" ? void 0 : findPluralOffset(object);
+		const branches = object.properties.reduce((c, p) => {
 			if (!t.isObjectProperty(p) || !t.isExpression(p.value)) return c;
+			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),
@@ -41,14 +58,43 @@ function parseCallExpression(call) {
 		}, []);
 		for (const branch of branches) validateBranchIdentifier(kind, branch.identifier);
 		const [identifier, value] = unwrapPlaceholder(call.arguments[0]);
-		const choice = new ChoiceMessage(kind, identifier, branches, value);
-		return new CompositeMessage({
-			id: descriptor ? findPropertyValueIfStringLiteralAsString(descriptor, "id") : void 0,
-			context: descriptor ? findPropertyValueIfStringLiteralAsString(descriptor, "context") : void 0
-		}, [], call.loc ? [`${call.loc.filename}:${call.loc.start.line}`] : [], [choice], accessor);
+		return wrap([new ChoiceMessage(kind, identifier, branches, value, offset)]);
+	}
+	if (typeof kind === "string" && isArgumentType(kind)) {
+		if (call.arguments.length < 1 || call.arguments.length > 2) return null;
+		if (!t.isExpression(call.arguments[0])) return null;
+		let style;
+		if (call.arguments.length === 2) {
+			if (!t.isObjectExpression(call.arguments[1])) return null;
+			style = findPropertyValueIfStringLiteralAsString(call.arguments[1], "style");
+			if (style !== void 0) validateArgumentStyle(kind, style);
+		}
+		const [identifier, value] = unwrapPlaceholder(call.arguments[0]);
+		return wrap([new ArgumentMessage(identifier, value, {
+			type: kind,
+			style
+		})]);
 	}
 	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;
+		if (getPropertyNameAsString(property.key) !== "offset") continue;
+		if (!t.isNumericLiteral(property.value)) continue;
+		if (!Number.isInteger(property.value.value) || property.value.value < 0) continue;
+		return property.value.value;
+	}
+}
 function processExpression(expression) {
 	if (t.isIdentifier(expression) && expression.name === "say") return [
 		expression,

package/package.json

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