wuchale 0.23.4 → 0.24.0

package/dist/adapter-vanilla/transformer.js

@@ -4,6 +4,7 @@ import { Parser } from 'acorn';
 import MagicString from 'magic-string';
 import { restoreCommentDirectives, runtimeVars, updateCommentDirectives, varNames, } from '../adapter-utils/index.js';
 import { defaultHeuristicFuncOnly, getKey, newMessage } from '../adapters.js';
+import InertVisitors from './inertvisitors.js';
 export const scriptParseOptions = {
     sourceType: 'module',
     ecmaVersion: 'latest',
@@ -44,7 +45,13 @@ export function parseScript(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
     return [ScriptParser.parse(content, opts), comments];
 }
-export class Transformer {
+const extendPropDownTypes = [
+    'Literal',
+    'TemplateLiteral',
+    'TaggedTemplateExpression',
+    'ObjectExpression',
+];
+export class Transformer extends InertVisitors {
     index;
     heuristic;
     content;
@@ -53,6 +60,7 @@ export class Transformer {
     mstr;
     patterns;
     matchUrl;
+    initReactive;
     initRuntime;
     currentRtVar;
     vars;
@@ -63,20 +71,21 @@ export class Transformer {
     realBodyStarts = new Set();
     /** will be passed to decide which runtime variable to use */
     runtimeCtx = {};
-    constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl, rtBaseVars = [varNames.rt]) {
-        this.index = index;
+    constructor(ctx, heuristic, patterns, rtConf, rtBaseVars = [varNames.rt]) {
+        super();
+        this.index = ctx.index;
+        this.content = ctx.content;
+        this.matchUrl = ctx.matchUrl;
+        this.heuristciDetails.file = ctx.filename;
         this.heuristic = heuristic;
         this.patterns = patterns;
-        this.content = content;
         this.mstr = new MagicString(this.content);
-        this.heuristciDetails.file = filename;
-        this.matchUrl = matchUrl;
         const topLevelUseReactive = typeof rtConf.useReactive === 'boolean'
             ? rtConf.useReactive
             : (rtConf.useReactive({
                 funcName: undefined,
                 nested: false,
-                file: filename,
+                file: ctx.filename,
                 ctx: this.runtimeCtx,
             }) ?? false);
         const vars = {};
@@ -94,19 +103,20 @@ export class Transformer {
                 : (rtConf.useReactive({
                     funcName: this.heuristciDetails.funcName ?? undefined,
                     nested: this.heuristciDetails.funcIsNested ?? false,
-                    file: filename,
+                    file: ctx.filename,
                     ctx: this.runtimeCtx,
                 }) ?? topLevelUseReactive);
             const currentVars = vars[this.currentRtVar];
             return useReactive ? currentVars.reactive : currentVars.plain;
         };
+        this.initReactive = (funcName, parentFunc) => rtConf.initReactive({
+            funcName,
+            nested: parentFunc != null,
+            file: ctx.filename,
+            ctx: this.runtimeCtx,
+        });
         this.initRuntime = (funcName, parentFunc) => {
-            let initReactive = rtConf.initReactive({
-                funcName,
-                nested: parentFunc != null,
-                file: filename,
-                ctx: this.runtimeCtx,
-            });
+            let initReactive = this.initReactive(funcName, parentFunc);
             if (initReactive == null) {
                 return;
             }
@@ -114,15 +124,17 @@ export class Transformer {
                 initReactive = rtConf.useReactive; // should be consistent
             }
             const wrapInit = initReactive ? rtConf.reactive.wrapInit : rtConf.plain.wrapInit;
-            const expr = initReactive ? catalogExpr.reactive : catalogExpr.plain;
+            const expr = initReactive ? ctx.expr.reactive : ctx.expr.plain;
             return `\nconst ${this.currentRtVar} = ${wrapInit(expr)};\n`;
         };
     }
-    fullHeuristicDetails = (detailsBase) => ({
-        ...this.heuristciDetails,
-        ...detailsBase,
-    });
-    getHeuristicMessageType = (msg) => {
+    fullHeuristicDetails(detailsBase) {
+        return {
+            ...this.heuristciDetails,
+            ...detailsBase,
+        };
+    }
+    getHeuristicMessageType(msg) {
         const msgStr = msg.msgStr.join('\n');
         if (!msgStr) {
             // nothing to ask
@@ -136,8 +148,8 @@ export class Transformer {
             return false;
         }
         return this.commentDirectives.forceType || heuRes;
-    };
-    checkHeuristic = (msgStr, detailsBase) => {
+    }
+    checkHeuristic(msgStr, detailsBase) {
         if (!msgStr) {
             // nothing to ask
             return [false, null];
@@ -148,12 +160,13 @@ export class Transformer {
             context: this.commentDirectives.context,
         });
         const heuRes = this.getHeuristicMessageType(msg);
-        if (!heuRes) {
+        // not allowed here, or msg is new but new msgs are not allowed
+        if (!heuRes || !this.index.has(getKey(msg.msgStr, msg.context))) {
             return [false, null];
         }
         msg.type = heuRes;
         return [heuRes, msg];
-    };
+    }
     literalRepl(msgInfo) {
         const repl = `${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})`;
         if (msgInfo.type !== 'url') {
@@ -161,7 +174,7 @@ export class Transformer {
         }
         return `${varNames.urlLocalize}(${repl}, ${this.vars().rtLocale})`;
     }
-    visitLiteral = (node, heuristicDetailsBase) => {
+    visitLiteral(node, heuristicDetailsBase) {
         if (typeof node.value !== 'string') {
             return [];
         }
@@ -172,29 +185,61 @@ export class Transformer {
         }
         this.mstr.update(start, end, this.literalRepl(msgInfo));
         return [msgInfo];
-    };
-    visitArrayExpression = (node) => node.elements.flatMap(elm => (elm ? this.visit(elm) : []));
-    visitSequenceExpression = (node) => node.expressions.flatMap(this.visit);
-    visitObjectExpression = (node) => node.properties.flatMap(this.visit);
-    visitObjectPattern = (node) => node.properties.flatMap(this.visit);
-    visitRestElement = (node) => this.visit(node.argument);
-    visitProperty = (node) => {
+    }
+    visitArrayExpression(node) {
+        return node.elements.flatMap(elm => (elm ? this.visit(elm) : []));
+    }
+    visitSequenceExpression(node) {
+        return node.expressions.flatMap(n => this.visit(n));
+    }
+    visitObjectExpression(node) {
+        return node.properties.flatMap(n => this.visit(n));
+    }
+    visitObjectPattern(node) {
+        return node.properties.flatMap(n => this.visit(n));
+    }
+    visitRestElement(node) {
+        return this.visit(node.argument);
+    }
+    visitProperty(node) {
         const msgs = this.visit(node.key);
-        if (msgs.length && node.key.type === 'Literal' && typeof node.key.value === 'string' && !node.computed) {
+        let keyName = '[]';
+        let keyIsLiteral = false;
+        if (node.key.type === 'Identifier') {
+            keyName = node.key.name;
+        }
+        else if (node.key.type === 'Literal' && typeof node.key.value === 'string') {
+            keyIsLiteral = true;
+            keyName = node.key.value;
+        }
+        if (msgs.length && keyIsLiteral && !node.computed) {
             this.mstr.appendRight(node.key.start, '[');
             this.mstr.appendLeft(node.key.end, ']');
         }
+        const extendPropDown = extendPropDownTypes.includes(node.value.type);
+        const prevProp = this.heuristciDetails.property;
+        if (extendPropDown) {
+            this.heuristciDetails.property = prevProp ? `${prevProp}.${keyName}` : keyName;
+        }
         msgs.push(...this.visit(node.value));
+        if (extendPropDown) {
+            this.heuristciDetails.property = prevProp; // restore
+        }
         return msgs;
-    };
-    visitSpreadElement = (node) => this.visit(node.argument);
-    visitMemberExpression = (node) => [
-        ...this.visit(node.object),
-        ...this.visit(node.property),
-    ];
-    visitChainExpression = (node) => this.visit(node.expression);
-    visitNewExpression = (node) => node.arguments.flatMap(this.visit);
-    defaultVisitCallExpression = (node) => {
+    }
+    visitSpreadElement(node) {
+        return this.visit(node.argument);
+    }
+    visitMemberExpression(node) {
+        return [...this.visit(node.object), ...this.visit(node.property)];
+    }
+    visitChainExpression(node) {
+        return this.visit(node.expression);
+    }
+    visitNewExpression(node) {
+        return node.arguments.flatMap(n => this.visit(n));
+    }
+    defaultVisitCallExpression(node) {
         const msgs = this.visit(node.callee);
         const currentCall = this.heuristciDetails.call;
         this.heuristciDetails.call = this.getCalleeName(node.callee);
@@ -203,8 +248,8 @@ export class Transformer {
         }
         this.heuristciDetails.call = currentCall; // restore
         return msgs;
-    };
-    visitCallExpression = (node) => {
+    }
+    visitCallExpression(node) {
         if (node.callee.type !== 'Identifier') {
             return this.defaultVisitCallExpression(node);
         }
@@ -300,7 +345,6 @@ export class Transformer {
                 details: this.fullHeuristicDetails({ scope: 'script' }),
                 context: this.commentDirectives.context,
             });
-            msgInfo.plural = true;
             const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
             msgs.push(msgInfo);
             updates.push([argVal.start, argVal.end, `${this.vars().rtTPlural}(${index})`]);
@@ -312,38 +356,35 @@ export class Transformer {
             this.mstr.appendRight(index, insert);
         }
         return msgs;
-    };
-    visitBinaryExpression = (node) => [
-        ...this.visit(node.left),
-        ...this.visit(node.right),
-    ];
-    visitConditionalExpression = (node) => [
-        ...this.visit(node.test),
-        ...this.visit(node.consequent),
-        ...this.visit(node.alternate),
-    ];
-    visitUnaryExpression = (node) => this.visit(node.argument);
-    visitLogicalExpression = (node) => [
-        ...this.visit(node.left),
-        ...this.visit(node.right),
-    ];
-    visitAwaitExpression = (node) => this.visit(node.argument);
-    visitAssignmentExpression = this.visitBinaryExpression;
-    visitAssignmentPattern = (node) => [
-        ...this.visit(node.left),
-        ...this.visit(node.right),
-    ];
-    visitForOfStatement = (node) => [
-        ...this.visit(node.left),
-        ...this.visit(node.right),
-        ...this.visit(node.body),
-    ];
-    visitForInStatement = (node) => [
-        ...this.visit(node.left),
-        ...this.visit(node.right),
-        ...this.visit(node.body),
-    ];
-    visitForStatement = (node) => {
+    }
+    visitBinaryExpression(node) {
+        return [...this.visit(node.left), ...this.visit(node.right)];
+    }
+    visitConditionalExpression(node) {
+        return [...this.visit(node.test), ...this.visit(node.consequent), ...this.visit(node.alternate)];
+    }
+    visitUnaryExpression(node) {
+        return this.visit(node.argument);
+    }
+    visitLogicalExpression(node) {
+        return [...this.visit(node.left), ...this.visit(node.right)];
+    }
+    visitAwaitExpression(node) {
+        return this.visit(node.argument);
+    }
+    visitAssignmentExpression(node) {
+        return [...this.visit(node.left), ...this.visit(node.right)];
+    }
+    visitAssignmentPattern(node) {
+        return [...this.visit(node.left), ...this.visit(node.right)];
+    }
+    visitForOfStatement(node) {
+        return [...this.visit(node.left), ...this.visit(node.right), ...this.visit(node.body)];
+    }
+    visitForInStatement(node) {
+        return [...this.visit(node.left), ...this.visit(node.right), ...this.visit(node.body)];
+    }
+    visitForStatement(node) {
         const msgs = this.visit(node.body);
         if (node.init) {
             msgs.push(...this.visit(node.init));
@@ -355,8 +396,8 @@ export class Transformer {
             msgs.push(...this.visit(node.update));
         }
         return msgs;
-    };
-    getMemberChainName = (node) => {
+    }
+    getMemberChainName(node) {
         let name = '';
         if (node.object.type === 'Identifier') {
             name = node.object.name;
@@ -378,8 +419,8 @@ export class Transformer {
             name = `[${node.type}]`;
         }
         return name;
-    };
-    getCalleeName = (callee) => {
+    }
+    getCalleeName(callee) {
         if (callee.type === 'Identifier') {
             return callee.name;
         }
@@ -387,7 +428,7 @@ export class Transformer {
             return this.getMemberChainName(callee);
         }
         return `[${callee.type}]`;
-    };
+    }
     getActualExpression(expr) {
         if (!expr) {
             return null;
@@ -406,49 +447,60 @@ export class Transformer {
         }
         return msgs;
     }
-    defaultVisitVariableDeclarator = (node) => this.withUpdateTLDetails(topLevel => {
-        if (!node.init) {
-            return [];
-        }
-        const init = this.getActualExpression(node.init);
-        if (topLevel) {
-            if (init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression') {
-                this.heuristciDetails.declaring = 'function';
+    visitExpressionStatement(node) {
+        return this.withUpdateTLDetails(topLevel => {
+            const expr = this.getActualExpression(node.expression);
+            if (topLevel) {
+                this.heuristciDetails.declaring = 'expression';
+                if (expr.type === 'CallExpression') {
+                    this.heuristciDetails.topLevelCall = this.getCalleeName(expr.callee);
+                }
             }
-            else {
-                this.heuristciDetails.declaring = 'variable';
+            return this.visit(expr);
+        });
+    }
+    // for e.g. svelte to surrounded with $derived
+    visitVariableDeclarator(node) {
+        return this.withUpdateTLDetails(topLevel => {
+            if (!node.init) {
+                return [];
             }
-        }
-        this.heuristciDetails.leftSide = true;
-        const msgs = this.visit(node.id);
-        this.heuristciDetails.leftSide = false;
-        if (topLevel && this.heuristciDetails.declaring === 'variable' && init.type === 'CallExpression') {
-            this.heuristciDetails.topLevelCall = this.getCalleeName(init.callee);
-        }
-        delete this.heuristciDetails.leftSide;
-        return [...msgs, ...this.visit(node.init)];
-    });
-    visitExpressionStatement = (node) => this.withUpdateTLDetails(topLevel => {
-        const expr = this.getActualExpression(node.expression);
-        if (topLevel) {
-            this.heuristciDetails.declaring = 'expression';
-            if (expr.type === 'CallExpression') {
-                this.heuristciDetails.topLevelCall = this.getCalleeName(expr.callee);
+            const init = this.getActualExpression(node.init);
+            if (topLevel) {
+                if (init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression') {
+                    this.heuristciDetails.declaring = 'function';
+                }
+                else {
+                    this.heuristciDetails.declaring = 'variable';
+                }
             }
-        }
-        return this.visit(expr);
-    });
-    // for e.g. svelte to surrounded with $derived
-    visitVariableDeclarator = this.defaultVisitVariableDeclarator;
-    visitVariableDeclaration = (node) => node.declarations.flatMap(this.visitVariableDeclarator);
-    visitExportNamedDeclaration = (node) => {
+            this.heuristciDetails.leftSide = true;
+            const msgs = this.visit(node.id);
+            this.heuristciDetails.leftSide = false;
+            if (topLevel && this.heuristciDetails.declaring === 'variable' && init.type === 'CallExpression') {
+                this.heuristciDetails.topLevelCall = this.getCalleeName(init.callee);
+            }
+            delete this.heuristciDetails.leftSide;
+            if (node.id.type === 'Identifier' &&
+                (init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression')) {
+                return [...msgs, ...this.visitFunctionBody(init.body, node.id.name, init.end)];
+            }
+            return [...msgs, ...this.visit(node.init)];
+        });
+    }
+    visitVariableDeclaration(node) {
+        return node.declarations.flatMap(n => this.visitVariableDeclarator(n));
+    }
+    visitExportNamedDeclaration(node) {
         this.heuristciDetails.exported = true;
         const msgs = node.declaration ? this.visit(node.declaration) : [];
         delete this.heuristciDetails.exported;
         return msgs;
-    };
-    visitExportDefaultDeclaration = this.visitExportNamedDeclaration;
-    visitStatementsNSaveRealBodyStart = (nodes) => {
+    }
+    visitExportDefaultDeclaration(node) {
+        return this.visitExportNamedDeclaration(node);
+    }
+    visitStatementsNSaveRealBodyStart(nodes) {
         const msgs = [];
         let bodyStart = null;
         for (const bod of nodes) {
@@ -472,8 +524,8 @@ export class Transformer {
             this.realBodyStarts.add(bodyStart);
         }
         return msgs;
-    };
-    getRealBodyStart = (nodes) => {
+    }
+    getRealBodyStart(nodes) {
         let nonLiteralStart = null;
         for (const node of nodes) {
             if (this.realBodyStarts.has(node.start)) {
@@ -486,8 +538,8 @@ export class Transformer {
             }
         }
         return nonLiteralStart ?? nodes[0]?.start;
-    };
-    visitFunctionBody = (node, name, end) => {
+    }
+    visitFunctionBody(node, name, end) {
         const prevFuncDef = this.heuristciDetails.funcName;
         const prevFuncNested = this.heuristciDetails.funcIsNested;
         this.heuristciDetails.funcName = name;
@@ -520,46 +572,60 @@ export class Transformer {
         this.heuristciDetails.funcIsNested = prevFuncNested;
         this.heuristciDetails.funcName = prevFuncDef;
         return msgs;
-    };
-    visitFunctionDeclaration = (node) => {
+    }
+    visitFunctionDeclaration(node) {
         const declaring = this.heuristciDetails.declaring;
         this.heuristciDetails.declaring = 'function';
         const msgs = this.visitFunctionBody(node.body, node.id?.name ?? '');
         this.heuristciDetails.declaring = declaring;
         return msgs;
-    };
-    visitArrowFunctionExpression = (node) => this.visitFunctionBody(node.body, '', node.end);
-    visitFunctionExpression = (node) => this.visitFunctionBody(node.body, '');
-    visitBlockStatement = (node) => this.visitStatementsNSaveRealBodyStart(node.body);
-    visitReturnStatement = (node) => (node.argument ? this.visit(node.argument) : []);
-    visitIfStatement = (node) => {
+    }
+    visitArrowFunctionExpression(node) {
+        return this.visitFunctionBody(node.body, '', node.end);
+    }
+    visitFunctionExpression(node) {
+        return this.visitFunctionBody(node.body, '');
+    }
+    visitBlockStatement(node) {
+        return this.visitStatementsNSaveRealBodyStart(node.body);
+    }
+    visitReturnStatement(node) {
+        return node.argument ? this.visit(node.argument) : [];
+    }
+    visitIfStatement(node) {
         const msgs = this.visit(node.test);
         msgs.push(...this.visit(node.consequent));
         if (node.alternate) {
             msgs.push(...this.visit(node.alternate));
         }
         return msgs;
-    };
-    visitWhileStatement = (node) => [
-        ...this.visit(node.test),
-        ...this.visit(node.body),
-    ];
-    visitDoWhileStatement = (node) => [
-        ...this.visit(node.body),
-        ...this.visit(node.test),
-    ];
-    visitLabeledStatement = (node) => this.visit(node.body);
-    visitParenthesizedExpression = (node) => this.visit(node.expression);
-    visitSwitchStatement = (node) => node.cases.flatMap(this.visit);
-    visitSwitchCase = (node) => {
-        const msgs = node.consequent.flatMap(this.visit);
+    }
+    visitWhileStatement(node) {
+        return [...this.visit(node.test), ...this.visit(node.body)];
+    }
+    visitDoWhileStatement(node) {
+        return [...this.visit(node.body), ...this.visit(node.test)];
+    }
+    visitLabeledStatement(node) {
+        return this.visit(node.body);
+    }
+    visitParenthesizedExpression(node) {
+        return this.visit(node.expression);
+    }
+    visitSwitchStatement(node) {
+        return node.cases.flatMap(n => this.visit(n));
+    }
+    visitSwitchCase(node) {
+        const msgs = node.consequent.flatMap(n => this.visit(n));
         if (node.test) {
             return [...this.visit(node.test), ...msgs];
         }
         return msgs;
-    };
-    visitYieldExpression = (node) => (node.argument ? this.visit(node.argument) : []);
-    visitClassDeclaration = (node) => {
+    }
+    visitYieldExpression(node) {
+        return node.argument ? this.visit(node.argument) : [];
+    }
+    visitClassDeclaration(node) {
         const msgs = [];
         const prevDecl = this.heuristciDetails.declaring;
         this.heuristciDetails.declaring = 'class';
@@ -575,34 +641,26 @@ export class Transformer {
             else if (body.type === 'StaticBlock') {
                 const currentFuncDef = this.heuristciDetails.funcName;
                 this.heuristciDetails.funcName = `${node.id.name}.[static]`;
-                msgs.push(...body.body.flatMap(this.visit));
+                msgs.push(...body.body.flatMap(n => this.visit(n)));
                 this.heuristciDetails.funcName = currentFuncDef; // restore
             }
         }
         this.heuristciDetails.declaring = prevDecl; // restore
         return msgs;
-    };
-    checkHeuristicTemplateLiteral = (node, heurDetails) => {
-        let heurTxt = '';
-        for (const quasi of node.quasis) {
-            heurTxt += quasi.value.cooked ?? '';
-            if (!quasi.tail) {
-                heurTxt += '#';
-            }
-        }
-        heurTxt = heurTxt.trim();
-        const [pass] = this.checkHeuristic(heurTxt, heurDetails ?? { scope: 'script' });
-        return pass;
-    };
-    visitTemplateLiteralQuasis = (node, msgTyp) => {
+    }
+    visitTemplateLiteralQuasis(node, forHeuristic = false) {
         const msgs = [];
         let msgStr = node.quasis[0].value?.cooked ?? '';
         const placeholders = [];
         for (const [i, expr] of node.expressions.entries()) {
-            msgs.push(...this.visit(expr));
             const quasi = node.quasis[i + 1];
             msgStr += `{${i}}${quasi.value.cooked}`;
-            placeholders.push([i, this.content.slice(expr.start, expr.end)]);
+            placeholders.push([i.toString(), this.content.slice(expr.start, expr.end)]);
+            if (forHeuristic) {
+                // skip modifications and sub visits
+                continue;
+            }
+            msgs.push(...this.visit(expr));
             const { start, end } = quasi;
             this.mstr.remove(start - 1, end);
             if (i + 1 === node.expressions.length) {
@@ -614,23 +672,28 @@ export class Transformer {
             msgStr: [msgStr],
             details: this.fullHeuristicDetails({ scope: 'script' }),
             context: this.commentDirectives.context,
+            placeholders,
         });
-        msgInfo.type = msgTyp;
-        msgInfo.placeholders = placeholders;
-        const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
         msgs.push(msgInfo);
-        return [index, msgs];
-    };
-    visitTemplateLiteral = (node, heurDetails = false) => {
+        return [msgInfo, forHeuristic ? 0 : this.index.get(getKey(msgInfo.msgStr, msgInfo.context)), msgs];
+    }
+    visitTemplateLiteral(node, heurDetails = false) {
         let msgTyp = 'message';
-        if (heurDetails !== true) {
-            const heuRes = this.checkHeuristicTemplateLiteral(node, typeof heurDetails === 'boolean' ? undefined : heurDetails);
+        let visitRes;
+        if (heurDetails === true) {
+            visitRes = this.visitTemplateLiteralQuasis(node);
+        }
+        else {
+            const [msgInfoHeu] = this.visitTemplateLiteralQuasis(node, true);
+            const [heuRes] = this.checkHeuristic(msgInfoHeu.msgStr[0], heurDetails || { scope: 'script' });
             if (!heuRes) {
-                return node.expressions.flatMap(this.visit);
+                return node.expressions.flatMap(n => this.visit(n));
             }
             msgTyp = heuRes;
+            visitRes = this.visitTemplateLiteralQuasis(node);
         }
-        const [index, msgs] = this.visitTemplateLiteralQuasis(node, msgTyp);
+        const [msgInfo, index, msgs] = visitRes;
+        msgInfo.type = msgTyp;
         const { start: start0, end: end0 } = node.quasis[0];
         let begin = `${this.vars().rtTrans}(${index}`;
         let end = ')';
@@ -648,14 +711,16 @@ export class Transformer {
             this.mstr.update(start0 - 1, end0 + 1, begin + end);
         }
         return msgs;
-    };
-    visitTaggedTemplateExpression = (node) => {
+    }
+    visitTaggedTemplateExpression(node) {
         const prevCall = this.heuristciDetails.call;
         this.heuristciDetails.call = this.getCalleeName(node.tag);
         let msgs = [];
-        const heuRes = this.checkHeuristicTemplateLiteral(node.quasi);
+        const [msgInfoHeu] = this.visitTemplateLiteralQuasis(node.quasi, true);
+        const [heuRes] = this.checkHeuristic(msgInfoHeu.msgStr[0], { scope: 'script' });
         if (heuRes) {
-            const [index, msgsNew] = this.visitTemplateLiteralQuasis(node.quasi, heuRes);
+            const [msgInfo, index, msgsNew] = this.visitTemplateLiteralQuasis(node.quasi);
+            msgInfo.type = heuRes;
             msgs = msgsNew;
             this.mstr.appendRight(node.tag.start, `${this.vars().rtTransTag}(`);
             const { start, end, expressions } = node.quasi;
@@ -670,8 +735,8 @@ export class Transformer {
         }
         this.heuristciDetails.call = prevCall;
         return msgs;
-    };
-    visitTryStatement = (node) => {
+    }
+    visitTryStatement(node) {
         const msgs = this.visit(node.block);
         if (node.handler) {
             msgs.push(...this.visit(node.handler.body));
@@ -680,17 +745,23 @@ export class Transformer {
             msgs.push(...this.visit(node.finalizer));
         }
         return msgs;
-    };
-    visitTSAsExpression = (node) => this.visit(node.expression);
-    visitTSTypeAssertion = (node) => this.visit(node.expression);
-    visitTSSatisfiesExpression = (node) => this.visit(node.expression);
-    visitProgram = (node) => {
+    }
+    visitTSAsExpression(node) {
+        return this.visit(node.expression);
+    }
+    visitTSTypeAssertion(node) {
+        return this.visit(node.expression);
+    }
+    visitTSSatisfiesExpression(node) {
+        return this.visit(node.expression);
+    }
+    visitProgram(node) {
         this.heuristciDetails.insideProgram = true;
         const msgs = this.visitStatementsNSaveRealBodyStart(node.body);
         this.heuristciDetails.insideProgram = false;
         return msgs;
-    };
-    visitWithCommentDirectives = (node, func) => {
+    }
+    visitWithCommentDirectives(node, func) {
         const commentDirectives = { ...this.commentDirectives };
         // for estree
         const comments = this.comments[node.start];
@@ -704,61 +775,37 @@ export class Transformer {
         const res = func();
         restoreCommentDirectives(this.commentDirectives, commentDirectives);
         return res;
-    };
-    visitEmptyStatement = () => [];
-    visitArrayPattern = () => [];
-    visitBreakStatement = () => [];
-    visitCatchClause = () => [];
-    visitClassBody = () => [];
-    visitClassExpression = () => [];
-    visitContinueStatement = () => [];
-    visitDebuggerStatement = () => [];
-    visitExportAllDeclaration = () => [];
-    visitExportSpecifier = () => [];
-    visitIdentifier = () => [];
-    visitImportAttribute = () => [];
-    visitImportDeclaration = () => [];
-    visitImportDefaultSpecifier = () => [];
-    visitImportExpression = () => [];
-    visitImportNamespaceSpecifier = () => [];
-    visitImportSpecifier = () => [];
-    visitMetaProperty = () => [];
-    visitMethodDefinition = () => []; // handled inside visitClassDeclaration
-    visitPrivateIdentifier = () => [];
-    visitPropertyDefinition = () => [];
-    visitStaticBlock = () => []; // handled inside visitClassDeclaration
-    visitSuper = () => [];
-    visitTemplateElement = () => [];
-    visitThisExpression = () => [];
-    visitThrowStatement = () => [];
-    visitUpdateExpression = () => [];
-    visitWithStatement = () => [];
-    visit = (node) => this.visitWithCommentDirectives(node, () => {
-        if (this.commentDirectives.forceType === false) {
-            return [];
-        }
-        let msgs = [];
-        const visitor = this[`visit${node.type}`];
-        if (visitor != null) {
-            msgs = visitor(node);
-            // } else {
-            //     console.log(node)
-        }
-        return msgs;
-    });
-    finalize = (msgs, hmrHeaderIndex, additionalHeader = '') => ({
-        msgs,
-        output: header => {
-            this.mstr.prependRight(hmrHeaderIndex, `\n${header}\n${additionalHeader}\n`);
-            return {
-                code: this.mstr.toString(),
-                map: this.mstr.generateMap(),
-            };
-        },
-    });
-    transform = () => {
+    }
+    visit(node) {
+        return this.visitWithCommentDirectives(node, () => {
+            if (this.commentDirectives.forceType === false) {
+                return [];
+            }
+            let msgs = [];
+            const visitor = this[`visit${node.type}`];
+            if (visitor != null) {
+                msgs = visitor.bind(this)(node);
+                // } else {
+                //     console.log(node)
+            }
+            return msgs;
+        });
+    }
+    finalize(msgs, hmrHeaderIndex, additionalHeader = '') {
+        return {
+            msgs,
+            output: header => {
+                this.mstr.prependRight(hmrHeaderIndex, `\n${header}\n${additionalHeader}\n`);
+                return {
+                    code: this.mstr.toString(),
+                    map: this.mstr.generateMap(),
+                };
+            },
+        };
+    }
+    transform() {
         const [ast, comments] = parseScript(this.content);
         this.comments = comments;
         return this.finalize(this.visit(ast), this.getRealBodyStart(ast.body) ?? 0);
-    };
+    }
 }