@wuchale/svelte 0.20.2 → 0.20.3

package/dist/transformer.d.ts

@@ -17,7 +17,7 @@ export declare class SvelteTransformer extends Transformer {
     visitExpressionTag(node: AST.ExpressionTag): Message[];
     visitVariableDeclarator(node: VariableDeclarator): Message[];
     initMixedVisitor(): MixedVisitorSvelte;
-    visitFragment(node: AST.Fragment): Message[];
+    visitFragment(node: AST.Fragment, nestable?: boolean): Message[];
     visitRegularElement(node: AST.ElementLike): Message[];
     visitComponent(node: AST.Component): Message[];
     visitSpreadAttribute(node: AST.SpreadAttribute): Message[];

package/dist/transformer.js

@@ -2,7 +2,6 @@ import { parse, preprocess } from 'svelte/compiler';
 import { getKey } from 'wuchale';
 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"`;
@@ -71,7 +70,6 @@ export class SvelteTransformer extends Transformer {
             isText: node => node.type === 'Text',
             isComment: node => node.type === 'Comment',
             leaveInPlace: node => ['ConstTag', 'SnippetBlock'].includes(node.type),
-            canHaveChildren: node => nodesWithChildren.includes(node.type),
             isExpression: node => node.type === 'ExpressionTag',
             getTextContent: node => node.data,
             getCommentData: node => node.data.trim(),
@@ -112,9 +110,10 @@ export class SvelteTransformer extends Transformer {
             },
         });
     }
-    visitFragment(node) {
+    visitFragment(node, nestable = false) {
         return this.mixedVisitor.visit({
             children: node.nodes,
+            nestable,
             commentDirectives: this.commentDirectives,
             scope: 'markup',
             element: this.currentElement,
@@ -128,7 +127,7 @@ export class SvelteTransformer extends Transformer {
         for (const attrib of node.attributes) {
             msgs.push(...this.visitSv(attrib));
         }
-        msgs.push(...this.visitFragment(node.fragment));
+        msgs.push(...this.visitFragment(node.fragment, true));
         this.currentElement = currentElement;
         return msgs;
     }
@@ -152,6 +151,7 @@ export class SvelteTransformer extends Transformer {
         if (values.length > 1) {
             const msgs = this.mixedVisitor.visit({
                 children: values,
+                nestable: false,
                 commentDirectives: this.commentDirectives,
                 scope: 'attribute',
                 element: this.currentElement,
@@ -228,41 +228,41 @@ export class SvelteTransformer extends Transformer {
         if (this.hasIdentifier(this.moduleExportExprs, node.expression.name)) {
             this.currentRtVar = rtModuleVar;
         }
-        const msgs = this.visitFragment(node.body);
+        const msgs = this.visitFragment(node.body, false);
         this.currentRtVar = prevRtVar;
         return msgs;
     }
     visitIfBlock(node) {
         const msgs = this.visit(node.test);
-        msgs.push(...this.visitSv(node.consequent));
+        msgs.push(...this.visitFragment(node.consequent, false));
         if (node.alternate) {
-            msgs.push(...this.visitSv(node.alternate));
+            msgs.push(...this.visitFragment(node.alternate, false));
         }
         return msgs;
     }
     visitEachBlock(node) {
-        const msgs = [...this.visit(node.expression), ...this.visitSv(node.body)];
+        const msgs = [...this.visit(node.expression), ...this.visitFragment(node.body, false)];
         if (node.key) {
             msgs.push(...this.visit(node.key));
         }
         if (node.fallback) {
-            msgs.push(...this.visitSv(node.fallback));
+            msgs.push(...this.visitFragment(node.fallback, false));
         }
         return msgs;
     }
     visitKeyBlock(node) {
-        return [...this.visit(node.expression), ...this.visitSv(node.fragment)];
+        return [...this.visit(node.expression), ...this.visitFragment(node.fragment, false)];
     }
     visitAwaitBlock(node) {
         const msgs = this.visit(node.expression);
         if (node.then) {
-            msgs.push(...this.visitFragment(node.then));
+            msgs.push(...this.visitFragment(node.then, false));
         }
         if (node.pending) {
-            msgs.push(...this.visitFragment(node.pending));
+            msgs.push(...this.visitFragment(node.pending, false));
         }
         if (node.catch) {
-            msgs.push(...this.visitFragment(node.catch));
+            msgs.push(...this.visitFragment(node.catch, false));
         }
         return msgs;
     }
@@ -280,7 +280,7 @@ export class SvelteTransformer extends Transformer {
         else {
             this.currentElement = 'svelte:element';
         }
-        const msgs = [...node.attributes.flatMap(n => this.visitSv(n)), ...this.visitFragment(node.fragment)];
+        const msgs = [...node.attributes.flatMap(n => this.visitSv(n)), ...this.visitFragment(node.fragment, true)];
         this.currentElement = currentElement;
         return msgs;
     }
@@ -318,7 +318,7 @@ export class SvelteTransformer extends Transformer {
             this.commentDirectives = {}; // reset
             msgs.push(...this.visitProgram(node.instance.content));
         }
-        msgs.push(...this.visitFragment(node.fragment), ...this.mixedVisitor.applyMod());
+        msgs.push(...this.visitFragment(node.fragment, false));
         return msgs;
     }
     visitSv(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.20.2",
+    "version": "0.20.3",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -54,7 +54,7 @@
         "svelte": "^5"
     },
     "dependencies": {
-        "wuchale": "^0.25.3"
+        "wuchale": "^0.25.4"
     },
     "devDependencies": {
         "@types/node": "~24.13.2",