@wuchale/svelte 0.20.0 → 0.20.1

package/dist/transformer.d.ts

@@ -4,17 +4,13 @@ import type { CodePattern, HeuristicFunc, Message, RuntimeConf, TransformCtx, Tr
 import { MixedVisitor } from 'wuchale/adapter-utils';
 import { Transformer } from 'wuchale/adapter-vanilla';
 type MixedNodesTypes = AST.Text | AST.Tag | AST.ElementLike | AST.SvelteElement | AST.Block | AST.Comment;
-type AddCtx = {
-    currentSnippet: number;
-};
-type MixedVisitorSvelte = MixedVisitor<MixedNodesTypes, AddCtx, AST.Text, AST.Comment, AST.ExpressionTag>;
+type MixedVisitorSvelte = MixedVisitor<MixedNodesTypes, AST.Text, AST.Comment, AST.ExpressionTag>;
 export type RuntimeCtxSv = {
     module: boolean;
 };
 export declare class SvelteTransformer extends Transformer {
     currentElement?: string | undefined;
-    inCompoundText: boolean;
-    addCtx: AddCtx;
+    currentSnippet: number;
     moduleExportExprs: AnyNode[];
     mixedVisitor: MixedVisitorSvelte;
     constructor(ctx: TransformCtx, heuristic: HeuristicFunc, patterns: CodePattern[], rtConf: RuntimeConf);
@@ -24,7 +20,6 @@ export declare class SvelteTransformer extends Transformer {
     visitFragment(node: AST.Fragment): Message[];
     visitRegularElement(node: AST.ElementLike): Message[];
     visitComponent(node: AST.Component): Message[];
-    visitText(node: AST.Text): Message[];
     visitSpreadAttribute(node: AST.SpreadAttribute): Message[];
     visitAttribute(node: AST.Attribute): Message[];
     visitConstTag(node: AST.ConstTag): Message[];

package/dist/transformer.js

@@ -1,8 +1,7 @@
 import { parse, preprocess } from 'svelte/compiler';
 import { getKey } from 'wuchale';
-import { MixedVisitor, nonWhitespaceText, varNames } from 'wuchale/adapter-utils';
+import { MixedVisitor, varNames } from 'wuchale/adapter-utils';
 import { parseScript, Transformer } from 'wuchale/adapter-vanilla';
-const nodesWithChildren = ['RegularElement', 'Component', 'SvelteElement'];
 const noWrapTopCalls = ['$props', '$state', '$derived', '$effect'];
 const rtComponent = 'W_tx_';
 const headerAdd = `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"`;
@@ -17,8 +16,7 @@ const removeCSS = ({ content }) => ({
 export class SvelteTransformer extends Transformer {
     // state
     currentElement;
-    inCompoundText = false;
-    addCtx = { currentSnippet: 0 };
+    currentSnippet = 0;
     moduleExportExprs = []; // to choose which runtime var to use for snippets
     mixedVisitor;
     constructor(ctx, heuristic, patterns, rtConf) {
@@ -64,8 +62,10 @@ export class SvelteTransformer extends Transformer {
     }
     initMixedVisitor() {
         return new MixedVisitor({
-            vars: this.vars.bind(this),
+            mstr: this.mstr,
+            index: this.index,
             content: this.content,
+            vars: this.vars.bind(this),
             getRange: node => ({ start: node.start, end: node.end }),
             isText: node => node.type === 'Text',
             isComment: node => node.type === 'Comment',
@@ -73,18 +73,18 @@ export class SvelteTransformer extends Transformer {
             isExpression: node => node.type === 'ExpressionTag',
             getTextContent: node => node.data,
             getCommentData: node => node.data.trim(),
-            canHaveChildren: node => nodesWithChildren.includes(node.type),
-            visitFunc: MixedVisitor.withCtxRestore(this, this.visitSv.bind(this)),
+            visitFunc: this.visitSv.bind(this),
             fullHeuristicDetails: this.fullHeuristicDetails.bind(this),
             checkHeuristic: this.getHeuristicMessageType.bind(this),
-            wrapNested: (msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
+            wrapNested: (inNested, msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
                 const snippets = [];
+                const vars = this.vars();
                 // create and reference snippets
                 for (const [childStart, childEnd, haveCtx] of nestedRanges) {
-                    const snippetName = `${snipPrefix}${this.addCtx.currentSnippet}`;
+                    const snippetName = `${snipPrefix}${this.currentSnippet}`;
                     snippets.push(snippetName);
-                    this.addCtx.currentSnippet++;
-                    const snippetBegin = `\n{#snippet ${snippetName}(${haveCtx ? this.vars().nestCtx : ''})}\n`;
+                    this.currentSnippet++;
+                    const snippetBegin = `\n{#snippet ${snippetName}(${haveCtx ? vars.nestCtx : ''})}\n`;
                     this.mstr.appendRight(childStart, snippetBegin);
                     this.mstr.prependLeft(childEnd, '\n{/snippet}\n');
                 }
@@ -93,12 +93,12 @@ export class SvelteTransformer extends Transformer {
                     begin += ` t={[${snippets.join(', ')}]}`;
                 }
                 begin += ' x=';
-                if (this.inCompoundText) {
-                    begin += `{${this.vars().nestCtx}} n`;
+                if (inNested) {
+                    begin += `{${vars.nestCtx}} n`;
                 }
                 else {
                     const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
-                    begin += `{${this.vars().rtCtx}(${index})}`;
+                    begin += `{${vars.rtCtx}(${index})}`;
                 }
                 let end = ' />\n';
                 if (hasExprs) {
@@ -112,12 +112,8 @@ export class SvelteTransformer extends Transformer {
     }
     visitFragment(node) {
         return this.mixedVisitor.visit({
-            mstr: this.mstr,
-            index: this.index,
-            addCtx: this.addCtx,
             children: node.nodes,
             commentDirectives: this.commentDirectives,
-            inCompoundText: this.inCompoundText,
             scope: 'markup',
             element: this.currentElement,
             useComponent: this.currentElement !== 'title',
@@ -137,18 +133,6 @@ export class SvelteTransformer extends Transformer {
     visitComponent(node) {
         return this.visitRegularElement(node);
     }
-    visitText(node) {
-        const [startWh, trimmed, endWh] = nonWhitespaceText(node.data);
-        const [pass, msgInfo] = this.checkHeuristic(trimmed, {
-            scope: 'markup',
-            element: this.currentElement,
-        });
-        if (!pass) {
-            return [];
-        }
-        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.literalRepl(msgInfo)}}`);
-        return [msgInfo];
-    }
     visitSpreadAttribute(node) {
         return this.visit(node.expression);
     }
@@ -164,17 +148,15 @@ export class SvelteTransformer extends Transformer {
             values = [node.value];
         }
         if (values.length > 1) {
-            return this.mixedVisitor.visit({
-                mstr: this.mstr,
-                index: this.index,
-                addCtx: this.addCtx,
+            const msgs = this.mixedVisitor.visit({
                 children: values,
                 commentDirectives: this.commentDirectives,
-                inCompoundText: false,
                 scope: 'attribute',
                 element: this.currentElement,
                 attribute: node.name,
             });
+            msgs.push(...this.mixedVisitor.applyMod('attribute'));
+            return msgs;
         }
         const value = values[0];
         const heuDetails = {
@@ -334,7 +316,7 @@ export class SvelteTransformer extends Transformer {
             this.commentDirectives = {}; // reset
             msgs.push(...this.visitProgram(node.instance.content));
         }
-        msgs.push(...this.visitFragment(node.fragment));
+        msgs.push(...this.visitFragment(node.fragment), ...this.mixedVisitor.applyMod());
         return msgs;
     }
     visitSv(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.20.0",
+    "version": "0.20.1",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -54,12 +54,12 @@
         "svelte": "^5"
     },
     "dependencies": {
-        "wuchale": "^0.24.0"
+        "wuchale": "^0.25.0"
     },
     "devDependencies": {
-        "@types/node": "~24.13.1",
+        "@types/node": "~24.13.2",
         "svelte": "^5.56.3",
-        "acorn": "^8.16.0",
+        "acorn": "^8.17.0",
         "typescript": "^6.0.3"
     },
     "type": "module"