wuchale 0.17.0 → 0.17.2

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

@@ -73,7 +73,7 @@ export declare class Transformer {
     visitReturnStatement: (node: Estree.ReturnStatement) => Message[];
     visitIfStatement: (node: Estree.IfStatement) => Message[];
     visitClassDeclaration: (node: Estree.ClassDeclaration) => Message[];
-    visitTemplateLiteral: (node: Estree.TemplateLiteral) => Message[];
+    visitTemplateLiteral: (node: Estree.TemplateLiteral, ignoreHeuristic?: boolean) => 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,18 +429,20 @@ export class Transformer {
         this.declaring = prevDecl; // restore
         return msgs;
     };
-    visitTemplateLiteral = (node) => {
-        let heurTxt = '';
-        for (const quasi of node.quasis) {
-            heurTxt += quasi.value.cooked ?? '';
-            if (!quasi.tail) {
-                heurTxt += '#';
+    visitTemplateLiteral = (node, ignoreHeuristic = false) => {
+        if (!ignoreHeuristic) {
+            let heurTxt = '';
+            for (const quasi of node.quasis) {
+                heurTxt += quasi.value.cooked ?? '';
+                if (!quasi.tail) {
+                    heurTxt += '#';
+                }
+            }
+            heurTxt = heurTxt.trim();
+            const [pass] = this.checkHeuristic(heurTxt, { scope: 'script' });
+            if (!pass) {
+                return node.expressions.map(this.visit).flat();
             }
-        }
-        heurTxt = heurTxt.trim();
-        const [pass] = this.checkHeuristic(heurTxt, { scope: 'script' });
-        if (!pass) {
-            return node.expressions.map(this.visit).flat();
         }
         const msgs = [];
         const quasi0 = node.quasis[0];

package/dist/adapters.d.ts

@@ -23,7 +23,9 @@ export declare class Message {
     toKey: () => string;
 }
 export type HeuristicFunc = (msg: Message) => boolean | null | undefined;
+/** Default heuristic */
 export declare function defaultHeuristic(msg: Message): boolean;
+/** Default heuristic which ignores messages outside functions in the `script` scope */
 export declare const defaultHeuristicFuncOnly: HeuristicFunc;
 export declare const defaultGenerateLoadID: (filename: string) => string;
 export declare class IndexTracker {

package/dist/adapters.js

@@ -19,6 +19,7 @@ export class Message {
 }
 const ignoreElements = ['style', 'path', 'code', 'pre'];
 const ignoreAttribs = [['form', 'method']];
+/** Default heuristic */
 export function defaultHeuristic(msg) {
     const msgStr = msg.msgStr.join('\n');
     if (msgStr.search(/\p{L}/u) === -1) {
@@ -50,7 +51,7 @@ export function defaultHeuristic(msg) {
     }
     return !msg.details.call?.startsWith('console.') && msg.details.call !== 'fetch';
 }
-// only allow inside function definitions for script scope
+/** Default heuristic which ignores messages outside functions in the `script` scope */
 export const defaultHeuristicFuncOnly = msg => {
     return defaultHeuristic(msg) && (msg.details.scope !== 'script' || msg.details.funcName != null);
 };

package/dist/config.js

@@ -19,7 +19,7 @@ function deepAssign(fromObj, toObj) {
             continue;
         }
         // objects
-        if (!toObj[key]) {
+        if (!toObj[key] || Array.isArray(toObj[key]) || typeof toObj[key] !== 'object') {
             toObj[key] = {};
         }
         deepAssign(fromObj[key], toObj[key]);

package/dist/handler.js

@@ -564,13 +564,13 @@ export class AdapterHandler {
         });
         if (this.#log.checkLevel('verbose')) {
             if (msgs.length) {
-                this.#log.verbose(`Extracted ${msgs.length} messages from ${filename}:`);
+                this.#log.verbose(`${this.key}: ${msgs.length} messages from ${filename}:`);
                 for (const msg of msgs) {
                     this.#log.verbose(`  ${msg.msgStr.join(', ')} [${msg.details.scope}]`);
                 }
             }
             else {
-                this.#log.verbose(`No messages extracted from ${filename}.`);
+                this.#log.verbose(`${this.key}: No messages from ${filename}.`);
             }
         }
         const hmrKeys = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.17.0",
+    "version": "0.17.2",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",