wuchale 0.17.1 → 0.17.3

package/dist/adapter-utils/index.d.ts

@@ -11,6 +11,7 @@ export declare function runtimeVars(wrapFunc: (expr: string) => string, base?: s
     rtLocale: string;
     rtCtx: string;
     rtTransCtx: string;
+    rtTransTag: string;
     /** for when nesting, used in adapters with elements */
     nestCtx: string;
 };

package/dist/adapter-utils/index.js

@@ -15,6 +15,7 @@ export function runtimeVars(wrapFunc, base = varNames.rt) {
         rtLocale: `${wrapFunc(base)}._.l`,
         rtCtx: `${wrapFunc(base)}.cx`,
         rtTransCtx: `${wrapFunc(base)}.tx`,
+        rtTransTag: `${wrapFunc(base)}.tt`,
         /** for when nesting, used in adapters with elements */
         nestCtx: '_w_ctx_',
     };

package/dist/adapter-vanilla/transformer.d.ts

@@ -73,7 +73,10 @@ export declare class Transformer {
     visitReturnStatement: (node: Estree.ReturnStatement) => Message[];
     visitIfStatement: (node: Estree.IfStatement) => Message[];
     visitClassDeclaration: (node: Estree.ClassDeclaration) => Message[];
-    visitTemplateLiteral: (node: Estree.TemplateLiteral) => Message[];
+    checkHeuristicTemplateLiteral: (node: Estree.TemplateLiteral) => boolean;
+    visitTemplateLiteralQuasis: (node: Estree.TemplateLiteral) => [number, Message[]];
+    visitTemplateLiteral: (node: Estree.TemplateLiteral, ignoreHeuristic?: boolean) => Message[];
+    visitTaggedTemplateExpression: (node: Estree.TaggedTemplateExpression) => Message[];
     visitProgram: (node: Estree.Program) => Message[];
     visit: (node: Estree.AnyNode) => Message[];
     finalize: (msgs: Message[], hmrHeaderIndex: number, additionalHeader?: string) => TransformOutput;

package/dist/adapter-vanilla/transformer.js

@@ -227,6 +227,10 @@ export class Transformer {
                 msgs.push(msgInfo);
                 continue;
             }
+            if (argVal.type === 'TemplateLiteral') {
+                msgs.push(...this.visitTemplateLiteral(argVal, true));
+                continue;
+            }
             if (argVal.type !== 'ArrayExpression') {
                 return this.defaultVisitCallExpression(node);
             }
@@ -425,7 +429,7 @@ export class Transformer {
         this.declaring = prevDecl; // restore
         return msgs;
     };
-    visitTemplateLiteral = (node) => {
+    checkHeuristicTemplateLiteral = (node) => {
         let heurTxt = '';
         for (const quasi of node.quasis) {
             heurTxt += quasi.value.cooked ?? '';
@@ -435,14 +439,11 @@ export class Transformer {
         }
         heurTxt = heurTxt.trim();
         const [pass] = this.checkHeuristic(heurTxt, { scope: 'script' });
-        if (!pass) {
-            return node.expressions.map(this.visit).flat();
-        }
+        return pass;
+    };
+    visitTemplateLiteralQuasis = (node) => {
         const msgs = [];
-        const quasi0 = node.quasis[0];
-        // @ts-ignore
-        const { start: start0, end: end0 } = quasi0;
-        let msgStr = quasi0.value?.cooked ?? '';
+        let msgStr = node.quasis[0].value?.cooked ?? '';
         const comments = [];
         for (const [i, expr] of node.expressions.entries()) {
             msgs.push(...this.visit(expr));
@@ -450,7 +451,6 @@ export class Transformer {
             const placeholder = `{${i}}`;
             msgStr += `${placeholder}${quasi.value.cooked}`;
             comments.push(`placeholder ${placeholder}: ${this.content.slice(expr.start, expr.end)}`);
-            // @ts-ignore
             const { start, end } = quasi;
             this.mstr.remove(start - 1, end);
             if (i + 1 === node.expressions.length) {
@@ -460,7 +460,19 @@ export class Transformer {
         }
         const msgInfo = new Message(msgStr, this.fullHeuristicDetails({ scope: 'script' }), this.commentDirectives.context);
         msgInfo.comments = comments;
-        let begin = `${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())}`;
+        const index = this.index.get(msgInfo.toKey());
+        msgs.push(msgInfo);
+        return [index, msgs];
+    };
+    visitTemplateLiteral = (node, ignoreHeuristic = false) => {
+        if (!ignoreHeuristic) {
+            if (!this.checkHeuristicTemplateLiteral(node)) {
+                return node.expressions.map(this.visit).flat();
+            }
+        }
+        const [index, msgs] = this.visitTemplateLiteralQuasis(node);
+        const { start: start0, end: end0 } = node.quasis[0];
+        let begin = `${this.vars().rtTrans}(${index}`;
         let end = ')';
         if (node.expressions.length) {
             begin += ', [';
@@ -472,7 +484,27 @@ export class Transformer {
         else {
             this.mstr.update(start0 - 1, end0 + 1, begin + end);
         }
-        msgs.push(msgInfo);
+        return msgs;
+    };
+    visitTaggedTemplateExpression = (node) => {
+        const prevCall = this.currentCall;
+        this.currentCall = this.getCalleeName(node.tag);
+        let msgs = [];
+        if (this.checkHeuristicTemplateLiteral(node.quasi)) {
+            const [index, msgsNew] = this.visitTemplateLiteralQuasis(node.quasi);
+            msgs = msgsNew;
+            this.mstr.appendRight(node.tag.start, `${this.vars().rtTransTag}(`);
+            const { start, end, expressions } = node.quasi;
+            if (expressions.length > 0) {
+                this.mstr.update(start, expressions[0].start, `, ${index}, [`);
+                this.mstr.update(end - 1, end, `])`);
+            }
+            else {
+                this.mstr.remove(start, start + 1);
+                this.mstr.update(start, end, `, ${index})`);
+            }
+        }
+        this.currentCall = prevCall;
         return msgs;
     };
     visitProgram = (node) => {

package/dist/runtime.d.ts

@@ -15,6 +15,8 @@ export declare class Runtime {
     cx: (id: number) => Mixed | import("./compile.js").Composite;
     /** get translation using composite context */
     tx: (ctx: Mixed, args?: any[], start?: number) => string;
+    /** for tagged template strings */
+    tt: (tag: CallableFunction, id: number, args?: any[]) => any;
     /** get translation for plural */
     tp: (id: number) => CompiledElement;
     /** get translation */

package/dist/runtime.js

@@ -44,6 +44,11 @@ export class Runtime {
         }
         return msgStr;
     };
+    /** for tagged template strings */
+    tt = (tag, id, args) => {
+        const ctx = this.cx(id);
+        return tag(ctx.filter(m => typeof m === 'string'), ...ctx.filter(m => typeof m === 'number').map(a => args?.[a]));
+    };
     /** get translation for plural */
     tp = (id) => this._.c[id] ?? [];
     /** get translation */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.17.1",
+    "version": "0.17.3",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",
@@ -83,9 +83,9 @@
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@types/node": "^24.5.2",
+        "@types/node": "^24.7.2",
         "@types/picomatch": "^4.0.1",
-        "typescript": "^5.8.3"
+        "typescript": "^5.9.3"
     },
     "type": "module"
 }