wuchale 0.22.11 → 0.23.0

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

@@ -27,3 +27,4 @@ export type CommentDirectives = {
     context?: string;
 };
 export declare function updateCommentDirectives(data: string, directives: CommentDirectives): void;
+export declare function restoreCommentDirectives(target: CommentDirectives, original: CommentDirectives): void;

package/dist/adapter-utils/index.js

@@ -59,3 +59,12 @@ export function updateCommentDirectives(data, directives) {
         directives.context = data.slice(commentDirectives.context.length).trim();
     }
 }
+/** for restore. like Object.assign but in reverse, pull the keys on the target from the source */
+function pullDirective(target, source, key) {
+    target[key] = source[key];
+}
+export function restoreCommentDirectives(target, original) {
+    for (const key in target) {
+        pullDirective(target, original, key); // restore
+    }
+}

package/dist/adapter-utils/mixed-visitor.d.ts

@@ -2,22 +2,22 @@ import type MagicString from 'magic-string';
 import { type HeuristicDetails, type HeuristicDetailsBase, type HeuristicFunc, type IndexTracker, type Message, type MessageType } from '../adapters.js';
 import { type CommentDirectives, type RuntimeVars } from './index.js';
 type NestedRanges = [number, number, boolean][];
-type InitProps<NodeT> = {
+type InitProps<MixNodeT, TxtT extends MixNodeT, ComT extends MixNodeT, ExprT extends MixNodeT> = {
     vars: () => RuntimeVars;
     mstr: MagicString;
-    getRange: (node: NodeT) => {
+    getRange: (node: MixNodeT) => {
         start: number;
         end: number;
     };
-    isText: (node: NodeT) => boolean;
-    isExpression: (node: NodeT) => boolean;
-    isComment: (node: NodeT) => boolean;
-    leaveInPlace: (node: NodeT) => boolean;
-    canHaveChildren: (node: NodeT) => boolean;
-    getTextContent: (node: NodeT) => string;
-    getCommentData: (node: NodeT) => string;
-    visitFunc: (node: NodeT, inCompoundText: boolean) => Message[];
-    visitExpressionTag: (node: NodeT) => Message[];
+    isText: (node: MixNodeT) => node is TxtT;
+    isExpression: (node: MixNodeT) => node is ExprT;
+    isComment: (node: MixNodeT) => node is ComT;
+    leaveInPlace: (node: MixNodeT) => boolean;
+    canHaveChildren: (node: MixNodeT) => boolean;
+    getTextContent: (node: TxtT) => string;
+    getCommentData: (node: ComT) => string;
+    visitFunc: (node: MixNodeT, inCompoundText: boolean) => Message[];
+    visitExpressionTag: (node: ExprT) => Message[];
     fullHeuristicDetails: (details: HeuristicDetailsBase) => HeuristicDetails;
     checkHeuristic: HeuristicFunc;
     wrapNested: (msgInfo: Message, hasExprs: boolean, nestedRanges: NestedRanges, lastChildEnd: number) => void;
@@ -36,12 +36,11 @@ type VisitProps<NodeT> = {
      * e.g. components in jsx to prevent `[object Object]` being rendered. */
     useComponent?: boolean;
 };
-export interface MixedVisitor<NodeT> extends InitProps<NodeT> {
-}
 type SeparateVisitRes = [boolean, boolean, boolean, MessageType, Message[]];
-export declare class MixedVisitor<NodeT> {
-    constructor(props: InitProps<NodeT>);
-    separatelyVisitChildren: (props: VisitProps<NodeT>) => SeparateVisitRes;
-    visit: (props: VisitProps<NodeT>) => Message[];
+export declare class MixedVisitor<MixNodeT, TxtT extends MixNodeT, ComT extends MixNodeT, ExprT extends MixNodeT> {
+    #private;
+    constructor(props: InitProps<MixNodeT, TxtT, ComT, ExprT>);
+    separatelyVisitChildren: (props: VisitProps<MixNodeT>) => SeparateVisitRes;
+    visit: (props: VisitProps<MixNodeT>) => Message[];
 }
 export {};

package/dist/adapter-utils/mixed-visitor.js

@@ -1,9 +1,10 @@
 // Shared logic between adapters for handling nested / mixed elements within elements / fragments
 import { getKey, newMessage, } from '../adapters.js';
-import { commentPrefix, nonWhitespaceText, updateCommentDirectives, varNames, } from './index.js';
+import { commentPrefix, nonWhitespaceText, restoreCommentDirectives, updateCommentDirectives, varNames, } from './index.js';
 export class MixedVisitor {
+    #props;
     constructor(props) {
-        Object.assign(this, props);
+        this.#props = props;
     }
     separatelyVisitChildren = (props) => {
         let hasTextChild = false;
@@ -11,20 +12,20 @@ export class MixedVisitor {
         let heurStr = '';
         let hasCommentDirectives = false;
         for (const child of props.children) {
-            if (this.isText(child)) {
-                const strContent = this.getTextContent(child);
+            if (this.#props.isText(child)) {
+                const strContent = this.#props.getTextContent(child);
                 if (!strContent.trim()) {
                     continue;
                 }
                 hasTextChild = true;
                 heurStr += strContent;
             }
-            else if (this.isComment(child)) {
-                if (this.getCommentData(child).trim().startsWith(commentPrefix)) {
+            else if (this.#props.isComment(child)) {
+                if (this.#props.getCommentData(child).trim().startsWith(commentPrefix)) {
                     hasCommentDirectives = true;
                 }
             }
-            else if (!this.leaveInPlace(child)) {
+            else if (!this.#props.leaveInPlace(child)) {
                 hasNonTextChild = true;
                 heurStr += `#`;
             }
@@ -32,13 +33,13 @@ export class MixedVisitor {
         heurStr = heurStr.trimEnd();
         const msg = newMessage({
             msgStr: [heurStr],
-            details: this.fullHeuristicDetails({
+            details: this.#props.fullHeuristicDetails({
                 scope: props.scope,
                 element: props.element,
                 attribute: props.attribute,
             }),
         });
-        const heurMsgType = this.checkHeuristic(msg);
+        const heurMsgType = this.#props.checkHeuristic(msg);
         if (heurMsgType || props.commentDirectives.unit) {
             const hasCompoundText = hasTextChild && hasNonTextChild;
             if (props.inCompoundText || props.commentDirectives.unit || (hasCompoundText && !hasCommentDirectives)) {
@@ -54,27 +55,24 @@ export class MixedVisitor {
         const commentDirectivesOrig = { ...props.commentDirectives };
         let lastVisitIsComment = false;
         for (const child of props.children) {
-            if (this.isComment(child)) {
-                updateCommentDirectives(this.getCommentData(child), props.commentDirectives);
+            if (this.#props.isComment(child)) {
+                updateCommentDirectives(this.#props.getCommentData(child), props.commentDirectives);
                 lastVisitIsComment = true;
                 continue;
             }
-            if (this.isText(child) && !this.getTextContent(child).trim()) {
+            if (this.#props.isText(child) && !this.#props.getTextContent(child).trim()) {
                 continue;
             }
             if (props.commentDirectives.ignoreFile) {
                 break;
             }
             if (props.commentDirectives.forceType !== false) {
-                msgs.push(...this.visitFunc(child, props.inCompoundText));
+                msgs.push(...this.#props.visitFunc(child, props.inCompoundText));
             }
             if (!lastVisitIsComment) {
                 continue;
             }
-            // restore. like Object.assign but in reverse for keys
-            for (const key in props.commentDirectives) {
-                props.commentDirectives[key] = commentDirectivesOrig[key];
-            }
+            restoreCommentDirectives(props.commentDirectives, commentDirectivesOrig);
             lastVisitIsComment = false;
         }
         return res;
@@ -90,21 +88,21 @@ export class MixedVisitor {
         let msgStr = '';
         let iArg = 0;
         let iTag = 0;
-        const lastChildEnd = this.getRange(props.children.slice(-1)[0]).end;
+        const lastChildEnd = this.#props.getRange(props.children.slice(-1)[0]).end;
         const childrenNestedRanges = [];
         let hasTextDescendants = false;
         const msgs = [];
         const placeholders = [];
         for (const child of props.children) {
-            if (this.isComment(child)) {
+            if (this.#props.isComment(child)) {
                 continue;
             }
-            const chRange = this.getRange(child);
-            if (this.isText(child)) {
-                const [startWh, trimmed, endWh] = nonWhitespaceText(this.getTextContent(child));
+            const chRange = this.#props.getRange(child);
+            if (this.#props.isText(child)) {
+                const [startWh, trimmed, endWh] = nonWhitespaceText(this.#props.getTextContent(child));
                 const msgInfo = newMessage({
                     msgStr: [trimmed],
-                    details: this.fullHeuristicDetails({ scope: props.scope }),
+                    details: this.#props.fullHeuristicDetails({ scope: props.scope }),
                     context: props.commentDirectives.context,
                 });
                 if (startWh && !msgStr.endsWith(' ')) {
@@ -118,36 +116,36 @@ export class MixedVisitor {
                 if (endWh) {
                     msgStr += ' ';
                 }
-                this.mstr.remove(chRange.start, chRange.end);
+                this.#props.mstr.remove(chRange.start, chRange.end);
                 continue;
             }
-            if (this.isExpression(child)) {
-                msgs.push(...this.visitExpressionTag(child));
+            if (this.#props.isExpression(child)) {
+                msgs.push(...this.#props.visitExpressionTag(child));
                 if (!hasCompoundText) {
                     continue;
                 }
                 msgStr += `{${iArg}}`;
-                placeholders.push([iArg, this.mstr.original.slice(chRange.start + 1, chRange.end - 1)]);
+                placeholders.push([iArg, this.#props.mstr.original.slice(chRange.start + 1, chRange.end - 1)]);
                 let moveStart = chRange.start;
                 if (iArg > 0) {
-                    this.mstr.update(chRange.start, chRange.start + 1, ', ');
+                    this.#props.mstr.update(chRange.start, chRange.start + 1, ', ');
                 }
                 else {
                     moveStart++;
-                    this.mstr.remove(chRange.start, chRange.start + 1);
+                    this.#props.mstr.remove(chRange.start, chRange.start + 1);
                 }
-                this.mstr.move(moveStart, chRange.end - 1, lastChildEnd);
-                this.mstr.remove(chRange.end - 1, chRange.end);
+                this.#props.mstr.move(moveStart, chRange.end - 1, lastChildEnd);
+                this.#props.mstr.remove(chRange.end - 1, chRange.end);
                 iArg++;
                 continue;
             }
-            if (this.leaveInPlace(child)) {
-                msgs.push(...this.visitFunc(child, this.canHaveChildren(child)));
+            if (this.#props.leaveInPlace(child)) {
+                msgs.push(...this.#props.visitFunc(child, this.#props.canHaveChildren(child)));
                 continue;
             }
             // elements, components and other things as well
-            const canHaveChildren = this.canHaveChildren(child);
-            const childMsgs = this.visitFunc(child, canHaveChildren);
+            const canHaveChildren = this.#props.canHaveChildren(child);
+            const childMsgs = this.#props.visitFunc(child, canHaveChildren);
             let nestedNeedsCtx = false;
             let chTxt = '';
             for (const msgInfo of childMsgs) {
@@ -178,7 +176,7 @@ export class MixedVisitor {
         }
         const msgInfo = newMessage({
             msgStr: [msgStr],
-            details: this.fullHeuristicDetails({ scope: props.scope }),
+            details: this.#props.fullHeuristicDetails({ scope: props.scope }),
             context: props.commentDirectives.context,
         });
         msgInfo.type = heurMsgType;
@@ -190,34 +188,34 @@ export class MixedVisitor {
             return msgs;
         }
         if (((props.useComponent ?? true) && props.scope === 'markup' && iArg > 0) || childrenNestedRanges.length > 0) {
-            this.wrapNested(msgInfo, iArg > 0, childrenNestedRanges, lastChildEnd);
+            this.#props.wrapNested(msgInfo, iArg > 0, childrenNestedRanges, lastChildEnd);
         }
         else {
             // no need for component use
             let begin = '{';
             let end = ')}';
             if (props.inCompoundText) {
-                begin += `${this.vars().rtTransCtx}(${this.vars().nestCtx}`;
+                begin += `${this.#props.vars().rtTransCtx}(${this.#props.vars().nestCtx}`;
             }
             else {
                 if (msgInfo.type === 'url') {
                     begin += `${varNames.urlLocalize}(`;
-                    end = `), ${this.vars().rtLocale}${end}`;
+                    end = `), ${this.#props.vars().rtLocale}${end}`;
                 }
-                begin += `${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))}`;
+                begin += `${this.#props.vars().rtTrans}(${this.#props.index.get(getKey(msgInfo.msgStr, msgInfo.context))}`;
             }
             if (iArg > 0) {
                 begin += ', [';
-                end = ']' + end;
+                end = `]${end}`;
             }
-            if (props.scope === 'attribute' && `'"`.includes(this.mstr.original[lastChildEnd])) {
+            if (props.scope === 'attribute' && `'"`.includes(this.#props.mstr.original[lastChildEnd])) {
                 const firstChild = props.children[0];
-                const { start } = this.getRange(firstChild);
-                this.mstr.remove(start - 1, start);
-                this.mstr.remove(lastChildEnd, lastChildEnd + 1);
+                const { start } = this.#props.getRange(firstChild);
+                this.#props.mstr.remove(start - 1, start);
+                this.#props.mstr.remove(lastChildEnd, lastChildEnd + 1);
             }
-            this.mstr.appendLeft(lastChildEnd, begin);
-            this.mstr.appendRight(lastChildEnd, end);
+            this.#props.mstr.appendLeft(lastChildEnd, begin);
+            this.#props.mstr.appendRight(lastChildEnd, end);
         }
         return msgs;
     };

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

@@ -1,7 +1,8 @@
 import type { Adapter, AdapterArgs, CodePattern, LoaderChoice } from '../adapters.js';
+import { type DeepPartial } from '../config.js';
 import { Transformer } from './transformer.js';
-export { Transformer };
 export { parseScript, scriptParseOptions, scriptParseOptionsWithComments } from './transformer.js';
+export { Transformer };
 export declare const pluralPattern: CodePattern;
 type LoadersAvailable = 'server' | 'vite';
 export type VanillaArgs = AdapterArgs<LoadersAvailable>;
@@ -10,4 +11,4 @@ export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailab
     client: string;
     server: string;
 } | null;
-export declare const adapter: (args?: Partial<VanillaArgs>) => Adapter;
+export declare const adapter: (args?: DeepPartial<VanillaArgs>) => Adapter;

package/dist/adapter-vanilla/index.js

@@ -1,11 +1,11 @@
 // $$ cd .. && npm run test
 import { loaderPathResolver } from '../adapter-utils/index.js';
 import { defaultGenerateLoadID, defaultHeuristicFuncOnly } from '../adapters.js';
-import { deepMergeObjects } from '../config.js';
+import { fillDefaults } from '../config.js';
 import { pofile } from '../pofile.js';
 import { Transformer } from './transformer.js';
-export { Transformer };
 export { parseScript, scriptParseOptions, scriptParseOptionsWithComments } from './transformer.js';
+export { Transformer };
 export const pluralPattern = {
     name: 'plural',
     args: ['other', 'message', 'pluralFunc'],
@@ -26,6 +26,10 @@ export const defaultArgs = {
             wrapInit: expr => expr,
             wrapUse: expr => expr,
         },
+        reactive: {
+            wrapInit: expr => expr,
+            wrapUse: expr => expr,
+        },
     },
 };
 const resolveLoaderPath = loaderPathResolver(import.meta.url, '../../src/adapter-vanilla/loaders', 'js');
@@ -45,7 +49,7 @@ export function getDefaultLoaderPath(loader, bundle) {
     return resolveLoaderPath(loader);
 }
 export const adapter = (args = defaultArgs) => {
-    const { heuristic, patterns, runtime, loader, ...rest } = deepMergeObjects(args, defaultArgs);
+    const { heuristic, patterns, runtime, loader, ...rest } = fillDefaults(args, defaultArgs);
     return {
         transform: ({ content, filename, index, expr, matchUrl }) => new Transformer(content, filename, index, heuristic, patterns, expr, runtime, matchUrl).transform(),
         loaderExts: ['.js', '.ts'],

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

@@ -7,7 +7,7 @@ export declare const scriptParseOptions: Estree.Options;
 export declare function scriptParseOptionsWithComments(): [Estree.Options, Estree.Comment[][]];
 export declare function parseScript(content: string): [Estree.Program, Estree.Comment[][]];
 type InitRuntimeFunc = (funcName?: string, parentFunc?: string) => string | undefined;
-export declare class Transformer<RTCtxT = {}> {
+export declare class Transformer {
     index: IndexTracker;
     heuristic: HeuristicFunc;
     content: string;
@@ -23,8 +23,8 @@ export declare class Transformer<RTCtxT = {}> {
     /** .start of the first statements in their respective parents, to put the runtime init before */
     realBodyStarts: Set<number>;
     /** will be passed to decide which runtime variable to use */
-    runtimeCtx: RTCtxT;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: RuntimeExpr, rtConf: RuntimeConf<RTCtxT>, matchUrl: UrlMatcher, rtBaseVars?: string[]);
+    runtimeCtx: {};
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: RuntimeExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher, rtBaseVars?: string[]);
     fullHeuristicDetails: (detailsBase: HeuristicDetailsBase) => HeuristicDetails;
     getHeuristicMessageType: (msg: Message) => HeuristicResultChecked;
     checkHeuristic: (msgStr: string, detailsBase: HeuristicDetailsBase) => [MessageType, Message] | [false, null];
@@ -71,17 +71,51 @@ export declare class Transformer<RTCtxT = {}> {
     visitBlockStatement: (node: Estree.BlockStatement) => Message[];
     visitReturnStatement: (node: Estree.ReturnStatement) => Message[];
     visitIfStatement: (node: Estree.IfStatement) => Message[];
+    visitWhileStatement: (node: Estree.WhileStatement) => Message[];
+    visitDoWhileStatement: (node: Estree.DoWhileStatement) => Message[];
+    visitLabeledStatement: (node: Estree.LabeledStatement) => Message[];
+    visitParenthesizedExpression: (node: Estree.ParenthesizedExpression) => Message[];
+    visitSwitchStatement: (node: Estree.SwitchStatement) => Message[];
+    visitSwitchCase: (node: Estree.SwitchCase) => Message[];
+    visitYieldExpression: (node: Estree.YieldExpression) => Message[];
     visitClassDeclaration: (node: Estree.ClassDeclaration) => Message[];
     checkHeuristicTemplateLiteral: (node: Estree.TemplateLiteral, heurDetails?: HeuristicDetailsBase) => HeuristicResultChecked;
     visitTemplateLiteralQuasis: (node: Estree.TemplateLiteral, msgTyp: MessageType) => [number, Message[]];
     visitTemplateLiteral: (node: Estree.TemplateLiteral, heurDetails?: HeuristicDetailsBase | boolean) => Message[];
     visitTaggedTemplateExpression: (node: Estree.TaggedTemplateExpression) => Message[];
-    visitSwitchStatement: (node: Estree.SwitchStatement) => Message[];
     visitTryStatement: (node: Estree.TryStatement) => Message[];
     visitTSAsExpression: (node: Estree.TSAsExpression) => Message[];
     visitTSTypeAssertion: (node: Estree.TSTypeAssertion) => Message[];
     visitProgram: (node: Estree.Program) => Message[];
-    visitWithCommentDirectives: (node: Estree.AnyNode, func: Function) => any;
+    visitWithCommentDirectives: (node: Estree.AnyNode, func: () => Message[]) => Message[];
+    visitEmptyStatement: () => Message[];
+    visitArrayPattern: () => Message[];
+    visitBreakStatement: () => Message[];
+    visitCatchClause: () => Message[];
+    visitClassBody: () => Message[];
+    visitClassExpression: () => Message[];
+    visitContinueStatement: () => Message[];
+    visitDebuggerStatement: () => Message[];
+    visitExportAllDeclaration: () => Message[];
+    visitExportSpecifier: () => Message[];
+    visitIdentifier: () => Message[];
+    visitImportAttribute: () => Message[];
+    visitImportDeclaration: () => Message[];
+    visitImportDefaultSpecifier: () => Message[];
+    visitImportExpression: () => Message[];
+    visitImportNamespaceSpecifier: () => Message[];
+    visitImportSpecifier: () => Message[];
+    visitMetaProperty: () => Message[];
+    visitMethodDefinition: () => Message[];
+    visitPrivateIdentifier: () => Message[];
+    visitPropertyDefinition: () => Message[];
+    visitStaticBlock: () => Message[];
+    visitSuper: () => Message[];
+    visitTemplateElement: () => Message[];
+    visitThisExpression: () => Message[];
+    visitThrowStatement: () => Message[];
+    visitUpdateExpression: () => Message[];
+    visitWithStatement: () => Message[];
     visit: (node: Estree.AnyNode) => Message[];
     finalize: (msgs: Message[], hmrHeaderIndex: number, additionalHeader?: string) => TransformOutput;
     transform: () => TransformOutput;

package/dist/adapter-vanilla/transformer.js

@@ -2,7 +2,7 @@
 import { tsPlugin } from '@sveltejs/acorn-typescript';
 import { Parser } from 'acorn';
 import MagicString from 'magic-string';
-import { runtimeVars, updateCommentDirectives, varNames, } from '../adapter-utils/index.js';
+import { restoreCommentDirectives, runtimeVars, updateCommentDirectives, varNames, } from '../adapter-utils/index.js';
 import { defaultHeuristicFuncOnly, getKey, newMessage } from '../adapters.js';
 export const scriptParseOptions = {
     sourceType: 'module',
@@ -68,21 +68,23 @@ export class Transformer {
         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
+            : (rtConf.useReactive({
+                funcName: undefined,
                 nested: false,
                 file: filename,
                 ctx: this.runtimeCtx,
-            };
+            }) ?? false);
         const vars = {};
         // to enable the use of different runtime vars for different places, right now for svelte <script module>s
         for (const baseVar of rtBaseVars) {
             vars[baseVar] = {
-                reactive: rtConf.reactive?.wrapUse && runtimeVars(rtConf.reactive.wrapUse, baseVar),
-                plain: rtConf.plain?.wrapUse && runtimeVars(rtConf.plain.wrapUse, baseVar),
+                reactive: runtimeVars(rtConf.reactive.wrapUse, baseVar),
+                plain: runtimeVars(rtConf.plain.wrapUse, baseVar),
             };
         }
         this.currentRtVar = rtBaseVars[0];
@@ -93,7 +95,7 @@ export class Transformer {
                     funcName: this.heuristciDetails.funcName ?? undefined,
                     nested: this.heuristciDetails.funcIsNested ?? false,
                     file: filename,
-                    ...this.runtimeCtx,
+                    ctx: this.runtimeCtx,
                 }) ?? topLevelUseReactive);
             const currentVars = vars[this.currentRtVar];
             return useReactive ? currentVars.reactive : currentVars.plain;
@@ -103,7 +105,7 @@ export class Transformer {
                 funcName,
                 nested: parentFunc != null,
                 file: filename,
-                ...this.runtimeCtx,
+                ctx: this.runtimeCtx,
             });
             if (initReactive == null) {
                 return;
@@ -153,7 +155,7 @@ export class Transformer {
         return [heuRes, msg];
     };
     literalRepl(msgInfo) {
-        let repl = `${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})`;
+        const repl = `${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})`;
         if (msgInfo.type !== 'url') {
             return repl;
         }
@@ -262,7 +264,7 @@ export class Transformer {
                 continue;
             }
             // message, always required
-            if (argVal === null) {
+            if (argVal == null) {
                 return this.defaultVisitCallExpression(node);
             }
             if (argVal.type === 'Literal') {
@@ -533,6 +535,25 @@ export class Transformer {
         }
         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);
+        if (node.test) {
+            return [...this.visit(node.test), ...msgs];
+        }
+        return msgs;
+    };
+    visitYieldExpression = (node) => (node.argument ? this.visit(node.argument) : []);
     visitClassDeclaration = (node) => {
         const msgs = [];
         const prevDecl = this.heuristciDetails.declaring;
@@ -614,7 +635,7 @@ export class Transformer {
         }
         if (node.expressions.length) {
             begin += ', [';
-            end = ']' + end;
+            end = `]${end}`;
             this.mstr.update(start0 - 1, end0 + 2, begin);
             this.mstr.update(node.end - 1, node.end, end);
         }
@@ -645,7 +666,6 @@ export class Transformer {
         this.heuristciDetails.call = prevCall;
         return msgs;
     };
-    visitSwitchStatement = (node) => node.cases.flatMap(c => c.consequent.map(this.visit)).flat();
     visitTryStatement = (node) => {
         const msgs = this.visit(node.block);
         if (node.handler) {
@@ -676,11 +696,37 @@ export class Transformer {
             return [];
         }
         const res = func();
-        for (const key in this.commentDirectives) {
-            this.commentDirectives[key] = commentDirectives[key]; // restore
-        }
+        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 [];
@@ -707,7 +753,6 @@ export class Transformer {
     transform = () => {
         const [ast, comments] = parseScript(this.content);
         this.comments = comments;
-        this.mstr = new MagicString(this.content);
         return this.finalize(this.visit(ast), this.getRealBodyStart(ast.body) ?? 0);
     };
 }