@saykit/transform-js 0.9.1 → 0.11.0

package/README.md

@@ -18,7 +18,7 @@ pnpm add -D @saykit/transform-js
 import js from '@saykit/transform-js';
 
 // inside a bucket:
-transformer: js();
+transformer: js(),
 ```
 
 For JSX/TSX, combine with [`@saykit/transform-jsx`](https://github.com/k0d13/saykit/tree/main/packages/transform-jsx):
@@ -28,7 +28,7 @@ import js from '@saykit/transform-js';
 import jsx from '@saykit/transform-jsx';
 
 // inside a bucket:
-transformer: [js(), jsx()];
+transformer: [js(), jsx()],
 ```
 
 ## Documentation

package/dist/generator.d.mts

@@ -1,6 +1,19 @@
 import { CompositeMessage } from "@saykit/config/features/messages";
 import * as t from "@babel/types";
 //#region src/generator.d.ts
+/**
+ * Whether a message is one formatted value and nothing else: `say.date(x)` on
+ * its own rather than inside a sentence. The style and the locale already
+ * decide what it renders as, so there is nothing in it for a translator to
+ * change: it is never extracted, and the call carries the message itself
+ * rather than an id to look one up by.
+ */
+declare function isLoneArgument(message: CompositeMessage): boolean;
+/**
+ * The property a call looks its message up by: an id into the catalogue, or
+ * the ICU message itself when nothing was extracted.
+ */
+declare function generateDescriptorProperty(message: CompositeMessage): t.ObjectProperty;
 declare function generateSayCallExpression(message: CompositeMessage): t.CallExpression;
 //#endregion
-export { generateSayCallExpression };
+export { generateDescriptorProperty, generateSayCallExpression, isLoneArgument };

package/dist/generator.mjs

@@ -1,10 +1,18 @@
 import { ArgumentMessage, ChoiceMessage, CompositeMessage, ElementMessage } from "@saykit/config/features/messages";
 import * as t from "@babel/types";
 //#region src/generator.ts
-function generateSayCallExpression(message) {
+function isLoneArgument(message) {
+	const [child] = message.children;
+	return message.children.length === 1 && child instanceof ArgumentMessage && !!child.format;
+}
+function generateDescriptorProperty(message) {
+	if (isLoneArgument(message)) return t.objectProperty(t.identifier("message"), t.stringLiteral(message.toICUString()));
 	const id = message.descriptor.id ?? message.toHashString();
+	return t.objectProperty(t.identifier("id"), t.stringLiteral(id));
+}
+function generateSayCallExpression(message) {
 	const children = generateChildExpressions(message.children);
-	const properties = t.objectExpression([t.objectProperty(t.identifier("id"), t.stringLiteral(id)), ...[...new Map(children).entries()].map(([ident, expr]) => t.objectProperty(t.identifier(`_${ident}`), expr))]);
+	const properties = t.objectExpression([generateDescriptorProperty(message), ...[...new Map(children).entries()].map(([ident, expr]) => t.objectProperty(t.identifier(`_${ident}`), expr))]);
 	return t.callExpression(t.memberExpression(message.accessor, t.identifier("call")), [properties]);
 }
 function generateChildExpressions(messages) {
@@ -23,4 +31,4 @@ function generateChildExpressions(messages) {
 	}, []);
 }
 //#endregion
-export { generateSayCallExpression };
+export { generateDescriptorProperty, generateSayCallExpression, isLoneArgument };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { generateSayCallExpression } from "./generator.mjs";
+import { generateSayCallExpression, isLoneArgument } from "./generator.mjs";
 import { collectLeadingComments, isEquivalentPlaceholder, parseExpression } from "./parser.mjs";
 import { generate } from "@babel/generator";
 import * as parser from "@babel/parser";
@@ -49,7 +49,7 @@ function createJsTransformer() {
 					path.skip();
 				}
 			} });
-			return messages.map((message) => ({
+			return messages.filter((message) => !isLoneArgument(message)).map((message) => ({
 				message: message.toICUString(),
 				translation: void 0,
 				id: message.descriptor.id,

package/dist/parser.d.mts

@@ -10,10 +10,9 @@ declare function processExpression(expression: t.Node): [t.Expression, t.ObjectE
  * 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.
+ * An inline one-key object is the only shape this claims, and it could not mean
+ * anything else: interpolating an object stringifies it to `[object Object]`.
+ * Anything else is returned untouched.
  */
 declare function unwrapPlaceholder(expression: t.Expression): [string | typeof AUTO_INCREMENT_IDENTIFIER, t.Expression];
 /**
@@ -22,27 +21,24 @@ declare function unwrapPlaceholder(expression: t.Expression): [string | typeof A
  *
  * 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.
+ * name. An element is compared on its opening element alone, since its children
+ * come from the translation rather than the source.
  */
 declare function isEquivalentPlaceholder(a: any, b: any): boolean;
 declare function parseExpression(expression: t.Expression, fallback?: false): CompositeMessage | null;
 declare function parseExpression(expression: t.Expression, fallback: true): CompositeMessage | ArgumentMessage;
 /**
- * The notes a translator is meant to read, taken from the comments written
- * above a message — `// TRANSLATORS: keep this under 20 characters`. A comment
- * that does not open with the marker is a note to whoever is reading the code,
- * and stays there.
+ * The notes a translator is meant to read, taken from the comments above a
+ * message: `// TRANSLATORS: keep this under 20 characters`. A comment without
+ * the marker is a note to whoever is reading the code, and stays there.
  */
 declare function getTranslatorComments(comments: readonly t.Comment[] | null | undefined): string[];
 /**
  * The comments written in front of a message, in the order they were written.
  *
- * A comment on its own line is attached by Babel to whatever node happens to
- * begin at it — `const a = say\`Hi\`` puts it on the declaration, not on the
- * template — so a message is rarely the node holding its own notes. Walking out
- * to the statement gathers them from wherever they landed.
+ * Babel attaches a comment on its own line to whatever node begins at it, so a
+ * message is rarely the node holding its own notes. Walking out to the
+ * statement gathers them from wherever they landed.
  */
 declare function collectLeadingComments(path: NodePath<t.Node>): t.Comment[];
 //#endregion

package/package.json

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