@wuchale/svelte 0.14.3 → 0.15.1

package/dist/index.js

@@ -1,16 +1,11 @@
-// $$ cd .. && npm run test
 import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wuchale';
 import { SvelteTransformer } from "./transformer.js";
 import { getDependencies, loaderPathResolver } from 'wuchale/adapter-utils';
 const topLevelDeclarationsInside = ['$derived', '$derived.by'];
-const ignoreElements = ['style', 'path'];
 const svelteHeuristic = (msgStr, details) => {
     if (!defaultHeuristic(msgStr, details)) {
         return false;
     }
-    if (ignoreElements.includes(details.element)) {
-        return false;
-    }
     if (details.scope !== 'script') {
         return true;
     }

package/dist/transformer.d.ts

@@ -2,8 +2,8 @@ import type { AnyNode } from "acorn";
 import { type AST } from "svelte/compiler";
 import { Message } from 'wuchale';
 import { Transformer } from 'wuchale/adapter-vanilla';
-import type { IndexTracker, HeuristicFunc, TransformOutput, CommentDirectives, CatalogExpr, RuntimeConf } from 'wuchale';
-import { MixedVisitor } from "wuchale/adapter-utils";
+import type { IndexTracker, HeuristicFunc, TransformOutput, CatalogExpr, RuntimeConf } from 'wuchale';
+import { MixedVisitor, type CommentDirectives } from "wuchale/adapter-utils";
 type MixedNodesTypes = AST.Text | AST.Tag | AST.ElementLike | AST.Block | AST.Comment;
 export declare class SvelteTransformer extends Transformer {
     currentElement?: string;

package/dist/transformer.js

@@ -2,7 +2,7 @@ import MagicString from "magic-string";
 import { parse } from "svelte/compiler";
 import { Message } from 'wuchale';
 import { Transformer, parseScript } from 'wuchale/adapter-vanilla';
-import { MixedVisitor, nonWhitespaceText, varNames } from "wuchale/adapter-utils";
+import { MixedVisitor, nonWhitespaceText, processCommentDirectives, varNames } from "wuchale/adapter-utils";
 const nodesWithChildren = ['RegularElement', 'Component'];
 const rtComponent = 'W_tx_';
 const snipPrefix = '_w_snippet_';
@@ -77,6 +77,7 @@ export class SvelteTransformer extends Transformer {
         inCompoundText: this.inCompoundText,
         scope: 'markup',
         element: this.currentElement,
+        useComponent: this.currentElement !== 'title'
     });
     visitRegularElement = (node) => {
         const currentElement = this.currentElement;
@@ -192,7 +193,7 @@ export class SvelteTransformer extends Transformer {
         ...this.visitSv(node.fragment),
     ];
     visitSvelteHead = (node) => this.visitSv(node.fragment);
-    visitTitleElement = (node) => this.visitSv(node.fragment);
+    visitTitleElement = (node) => this.visitRegularElement(node);
     visitSvelteWindow = (node) => node.attributes.map(this.visitSv).flat();
     visitRoot = (node) => {
         const msgs = [];
@@ -206,7 +207,7 @@ export class SvelteTransformer extends Transformer {
             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.getRealBodyStart(node.module.content.body) ?? node.module.content.start, this.initRuntime(this.filename, null, null, {}));
             this.additionalState = {}; // reset
             this.currentRtVar = prevRtVar; // reset
         }
@@ -219,12 +220,12 @@ export class SvelteTransformer extends Transformer {
     };
     visitSv = (node) => {
         if (node.type === 'Comment') {
-            const directives = this.processCommentDirectives(node.data.trim());
+            this.commentDirectives = processCommentDirectives(node.data.trim(), this.commentDirectives);
             if (this.lastVisitIsComment) {
-                this.commentDirectivesStack[this.commentDirectivesStack.length - 1] = directives;
+                this.commentDirectivesStack[this.commentDirectivesStack.length - 1] = this.commentDirectives;
             }
             else {
-                this.commentDirectivesStack.push(directives);
+                this.commentDirectivesStack.push(this.commentDirectives);
             }
             this.lastVisitIsComment = true;
             return [];
@@ -238,6 +239,9 @@ export class SvelteTransformer extends Transformer {
             this.commentDirectives = this.commentDirectivesStack.pop();
             this.lastVisitIsComment = false;
         }
+        if (this.commentDirectives.ignoreFile) {
+            return [];
+        }
         if (this.commentDirectives.forceInclude !== false) {
             msgs = this.visit(node);
         }
@@ -260,27 +264,28 @@ export class SvelteTransformer extends Transformer {
         const msgs = this.visitSv(ast);
         const initRuntime = this.initRuntime(this.filename, null, null, {});
         if (ast.type === 'Program') {
-            const bodyStart = this.getRealBodyStart(ast.body);
+            const bodyStart = this.getRealBodyStart(ast.body) ?? 0;
             this.mstr.appendRight(bodyStart, initRuntime);
             return this.finalize(msgs, bodyStart);
         }
         let headerIndex = 0;
         if (ast.module) {
             // @ts-ignore
-            headerIndex = this.getRealBodyStart(ast.module.content.body);
+            headerIndex = this.getRealBodyStart(ast.module.content.body) ?? ast.module.content.start;
         }
         if (ast.instance) {
+            // @ts-expect-error
+            const instanceBodyStart = this.getRealBodyStart(ast.instance.content.body) ?? ast.instance.content.start;
             if (!ast.module) {
-                // @ts-expect-error
-                headerIndex = this.getRealBodyStart(ast.instance.content.body);
+                headerIndex = instanceBodyStart;
             }
-            // @ts-expect-error
-            this.mstr.appendRight(this.getRealBodyStart(ast.instance.content.body), initRuntime);
+            this.mstr.appendRight(instanceBodyStart, initRuntime);
         }
         else {
-            this.mstr.prepend('<script>');
+            const instanceStart = ast.module?.end ?? 0;
+            this.mstr.prependLeft(instanceStart, '\n<script>');
             // account index for hmr data here
-            this.mstr.prependRight(0, `${initRuntime}\n</script>\n`);
+            this.mstr.prependRight(instanceStart, `${initRuntime}\n</script>\n`);
             // now hmr data can be prependRight(0, ...)
         }
         const headerAdd = `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.14.3",
+    "version": "0.15.1",
     "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.8"
+        "wuchale": "^0.16.4"
     },
     "devDependencies": {
         "acorn": "^8.15.0",