@wuchale/svelte 0.19.1 → 0.19.3

package/dist/transformer.d.ts

@@ -11,7 +11,7 @@ export declare class SvelteTransformer extends Transformer<RuntimeCtxSv> {
     currentElement?: string;
     inCompoundText: boolean;
     currentSnippet: number;
-    moduleExportRanges: [number, number][];
+    moduleExportExprs: AnyNode[];
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
     constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf<RuntimeCtxSv>, matchUrl: UrlMatcher);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];
@@ -25,6 +25,9 @@ export declare class SvelteTransformer extends Transformer<RuntimeCtxSv> {
     visitAttribute: (node: AST.Attribute) => Message[];
     visitConstTag: (node: AST.ConstTag) => Message[];
     visitRenderTag: (node: AST.RenderTag) => Message[];
+    visitHtmlTag: (node: AST.HtmlTag) => Message[];
+    visitOnDirective: (node: AST.OnDirective) => Message[];
+    hasIdentifier: (node: AnyNode | AnyNode[], name: string) => boolean;
     visitSnippetBlock: (node: AST.SnippetBlock) => Message[];
     visitIfBlock: (node: AST.IfBlock) => Message[];
     visitEachBlock: (node: AST.EachBlock) => Message[];
@@ -40,7 +43,7 @@ export declare class SvelteTransformer extends Transformer<RuntimeCtxSv> {
     visitRoot: (node: AST.Root) => Message[];
     visitSv: (node: AST.SvelteNode | AnyNode) => Message[];
     /** collects the ranges that will be checked if a snippet identifier is exported using RegExp test to simplify */
-    collectModuleExportRanges: (script: AST.Script) => void;
+    collectModuleExportExprs: (script: AST.Script) => void;
     transformSv: () => Promise<TransformOutput>;
 }
 export {};

package/dist/transformer.js

@@ -20,7 +20,7 @@ export class SvelteTransformer extends Transformer {
     currentElement;
     inCompoundText = false;
     currentSnippet = 0;
-    moduleExportRanges = []; // to choose which runtime var to use for snippets
+    moduleExportExprs = []; // to choose which runtime var to use for snippets
     mixedVisitor;
     constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl) {
         super(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl, [varNames.rt, rtModuleVar]);
@@ -37,6 +37,9 @@ export class SvelteTransformer extends Transformer {
             return msgs;
         }
         const needsWrapping = msgs.some(msg => {
+            if (msg.details.leftSide) {
+                return false;
+            }
             const topCall = msg.details.topLevelCall ?? '';
             if (noWrapTopCalls.includes(topCall) || noWrapTopCalls.some(c => topCall.startsWith(`${c}.`))) {
                 return false;
@@ -49,7 +52,7 @@ export class SvelteTransformer extends Transformer {
         if (!needsWrapping) {
             return msgs;
         }
-        const isExported = this.moduleExportRanges.some(([start, end]) => init.start >= start && init.end <= end);
+        const isExported = this.moduleExportExprs.some(node => init.start >= node.start && init.end <= node.end);
         if (!isExported) {
             this.mstr.appendLeft(init.start, '$derived(');
             this.mstr.appendRight(init.end, ')');
@@ -139,7 +142,7 @@ export class SvelteTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})}`);
+        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.literalRepl(msgInfo)}}`);
         return [msgInfo];
     };
     visitSpreadAttribute = (node) => this.visit(node.expression);
@@ -197,15 +200,25 @@ export class SvelteTransformer extends Transformer {
         // @ts-expect-error
         return this.visitVariableDeclaration(node.declaration);
     };
-    visitRenderTag = (node) => {
-        // @ts-expect-error
-        return this.visit(node.expression);
+    visitRenderTag = (node) => this.visit(node.expression);
+    visitHtmlTag = (node) => this.visit(node.expression);
+    visitOnDirective = (node) => this.visit(node.expression);
+    hasIdentifier = (node, name) => {
+        if (!node || typeof node !== 'object') {
+            return false;
+        }
+        if (Array.isArray(node)) {
+            return node.some(child => this.hasIdentifier(child, name));
+        }
+        if (node.type === 'Identifier') {
+            return node.name === name;
+        }
+        return Object.values(node).some(value => this.hasIdentifier(value, name));
     };
     visitSnippetBlock = (node) => {
         // use module runtime var because the snippet may be exported from the module
         const prevRtVar = this.currentRtVar;
-        const pattern = new RegExp(`\\b${node.expression.name}\\b`);
-        if (this.moduleExportRanges.some(([start, end]) => pattern.test(this.content.slice(start, end)))) {
+        if (this.hasIdentifier(this.moduleExportExprs, node.expression.name)) {
             this.currentRtVar = rtModuleVar;
         }
         const msgs = this.visitFragment(node.body);
@@ -283,7 +296,7 @@ export class SvelteTransformer extends Transformer {
     };
     visitSv = (node) => this.visit(node);
     /** collects the ranges that will be checked if a snippet identifier is exported using RegExp test to simplify */
-    collectModuleExportRanges = (script) => {
+    collectModuleExportExprs = (script) => {
         for (const stmt of script.content.body) {
             if (stmt.type !== 'ExportNamedDeclaration') {
                 continue;
@@ -291,7 +304,7 @@ export class SvelteTransformer extends Transformer {
             for (const spec of stmt.specifiers) {
                 if (spec.local.type === 'Identifier') {
                     const local = spec.local;
-                    this.moduleExportRanges.push([local.start, local.end]);
+                    this.moduleExportExprs.push(local);
                 }
             }
             const declaration = stmt.declaration;
@@ -299,14 +312,14 @@ export class SvelteTransformer extends Transformer {
                 continue;
             }
             if (declaration.type === 'FunctionDeclaration' || declaration.type === 'ClassDeclaration') {
-                this.moduleExportRanges.push([declaration.start, declaration.end]);
+                this.moduleExportExprs.push(declaration);
                 continue;
             }
             for (const decl of declaration?.declarations ?? []) {
                 if (!decl.init) {
                     continue;
                 }
-                this.moduleExportRanges.push([decl.init.start, decl.init.end]);
+                this.moduleExportExprs.push(decl.init);
             }
         }
     };
@@ -324,7 +337,7 @@ export class SvelteTransformer extends Transformer {
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
         if (ast.type === 'Root' && ast.module) {
-            this.collectModuleExportRanges(ast.module);
+            this.collectModuleExportExprs(ast.module);
         }
         const msgs = this.visitSv(ast);
         const initRuntime = this.initRuntime();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.19.1",
+    "version": "0.19.3",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -53,7 +53,7 @@
     "dependencies": {
         "magic-string": "^0.30.21",
         "svelte": "^5",
-        "wuchale": "^0.21.2"
+        "wuchale": "^0.22.1"
     },
     "devDependencies": {
         "acorn": "^8.16.0",