@wuchale/svelte 0.14.1 → 0.14.2

package/dist/transformer.d.ts

@@ -31,6 +31,7 @@ export declare class SvelteTransformer extends Transformer {
     visitSvelteElement: (node: AST.SvelteElement) => Message[];
     visitSvelteBoundary: (node: AST.SvelteBoundary) => Message[];
     visitSvelteHead: (node: AST.SvelteHead) => Message[];
+    visitTitleElement: (node: AST.TitleElement) => Message[];
     visitSvelteWindow: (node: AST.SvelteWindow) => Message[];
     visitRoot: (node: AST.Root) => Message[];
     visitSv: (node: AST.SvelteNode | AnyNode) => Message[];

package/dist/transformer.js

@@ -2,10 +2,11 @@ import MagicString from "magic-string";
 import { parse } from "svelte/compiler";
 import { Message } from 'wuchale';
 import { Transformer, parseScript } from 'wuchale/adapter-vanilla';
-import { MixedVisitor, nonWhitespaceText } from "wuchale/adapter-utils";
+import { MixedVisitor, nonWhitespaceText, varNames } from "wuchale/adapter-utils";
 const nodesWithChildren = ['RegularElement', 'Component'];
 const rtComponent = 'W_tx_';
 const snipPrefix = '_w_snippet_';
+const rtModuleVar = varNames.rt + 'mod_';
 export class SvelteTransformer extends Transformer {
     // state
     currentElement;
@@ -15,7 +16,7 @@ export class SvelteTransformer extends Transformer {
     currentSnippet = 0;
     mixedVisitor;
     constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf) {
-        super(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf);
+        super(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf, [varNames.rt, rtModuleVar]);
     }
     visitExpressionTag = (node) => this.visit(node.expression);
     initMixedVisitor = () => new MixedVisitor({
@@ -191,16 +192,23 @@ export class SvelteTransformer extends Transformer {
         ...this.visitSv(node.fragment),
     ];
     visitSvelteHead = (node) => this.visitSv(node.fragment);
+    visitTitleElement = (node) => this.visitSv(node.fragment);
     visitSvelteWindow = (node) => node.attributes.map(this.visitSv).flat();
     visitRoot = (node) => {
         const msgs = [];
         // @ts-ignore: module is a reserved keyword, not sure how to specify the type
         if (node.module) {
+            const prevRtVar = this.currentRtVar;
+            this.currentRtVar = rtModuleVar;
             this.additionalState = { module: true };
             this.commentDirectives = {}; // reset
-            // @ts-ignore
+            // @ts-expect-error
             msgs.push(...this.visitProgram(node.module.content));
+            this.mstr.appendRight(
+            // @ts-expect-error
+            this.getRealBodyStart(node.module.content.body), this.initRuntime(this.filename, null, null, {}));
             this.additionalState = {}; // reset
+            this.currentRtVar = prevRtVar; // reset
         }
         if (node.instance) {
             this.commentDirectives = {}; // reset
@@ -250,30 +258,32 @@ export class SvelteTransformer extends Transformer {
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
         const msgs = this.visitSv(ast);
-        const headerLines = [
-            isComponent ? `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"` : '',
-            this.initRuntime(this.filename, null, null, {}),
-        ];
-        const headerFin = headerLines.join('\n');
+        const initRuntime = this.initRuntime(this.filename, null, null, {});
         if (ast.type === 'Program') {
             const bodyStart = this.getRealBodyStart(ast.body);
-            return this.finalize(msgs, bodyStart, headerFin);
+            this.mstr.appendRight(bodyStart, initRuntime);
+            return this.finalize(msgs, bodyStart);
         }
-        let hmrHeaderIndex = 0;
+        let headerIndex = 0;
         if (ast.module) {
             // @ts-ignore
-            hmrHeaderIndex = this.getRealBodyStart(ast.module.content.body);
+            headerIndex = this.getRealBodyStart(ast.module.content.body);
         }
-        else if (ast.instance) {
-            // @ts-ignore
-            hmrHeaderIndex = this.getRealBodyStart(ast.instance.content.body);
+        if (ast.instance) {
+            if (!ast.module) {
+                // @ts-expect-error
+                headerIndex = this.getRealBodyStart(ast.instance.content.body);
+            }
+            // @ts-expect-error
+            this.mstr.appendRight(this.getRealBodyStart(ast.instance.content.body), initRuntime);
         }
         else {
             this.mstr.prepend('<script>');
             // account index for hmr data here
-            this.mstr.prependRight(0, `</script>\n`);
+            this.mstr.prependRight(0, `${initRuntime}\n</script>\n`);
             // now hmr data can be prependRight(0, ...)
         }
-        return this.finalize(msgs, hmrHeaderIndex, headerFin);
+        const headerAdd = `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"`;
+        return this.finalize(msgs, headerIndex, headerAdd);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.14.1",
+    "version": "0.14.2",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -52,7 +52,7 @@
     "license": "MIT",
     "dependencies": {
         "svelte": "^5.37.0",
-        "wuchale": "^0.15.4"
+        "wuchale": "^0.15.6"
     },
     "devDependencies": {
         "acorn": "^8.15.0",