@wuchale/svelte 0.16.0 → 0.16.1

package/dist/index.d.ts

@@ -1,2 +1,6 @@
-import type { Adapter, AdapterArgs } from 'wuchale';
+import type { HeuristicFunc, Adapter, AdapterArgs } from 'wuchale';
+/** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
+export declare const svelteDefaultHeuristic: HeuristicFunc;
+/** Default Svelte heuristic which requires `$derived` or `$derived.by` for top level variable assignments */
+export declare const svelteDefaultHeuristicDerivedReq: HeuristicFunc;
 export declare const adapter: (args?: AdapterArgs) => Adapter;

package/dist/index.js

@@ -2,7 +2,8 @@ import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wucha
 import { SvelteTransformer } from "./transformer.js";
 import { getDependencies, loaderPathResolver } from 'wuchale/adapter-utils';
 import { pluralPattern } from 'wuchale/adapter-vanilla';
-const svelteHeuristic = msg => {
+/** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
+export const svelteDefaultHeuristic = msg => {
     if (!defaultHeuristic(msg)) {
         return false;
     }
@@ -14,11 +15,24 @@ const svelteHeuristic = msg => {
     }
     return true;
 };
+/** Default Svelte heuristic which requires `$derived` or `$derived.by` for top level variable assignments */
+export const svelteDefaultHeuristicDerivedReq = msg => {
+    if (!svelteDefaultHeuristic(msg)) {
+        return false;
+    }
+    if (msg.details.scope !== 'script' || msg.details.declaring !== 'variable') {
+        return true;
+    }
+    if (!msg.details.topLevelCall) {
+        return false;
+    }
+    return ['$derived', '$derived.by'].includes(msg.details.topLevelCall);
+};
 const defaultArgs = {
     files: ['src/**/*.svelte', 'src/**/*.svelte.{js,ts}'],
     catalog: './src/locales/{locale}',
     patterns: [pluralPattern],
-    heuristic: svelteHeuristic,
+    heuristic: svelteDefaultHeuristic,
     granularLoad: false,
     bundleLoad: false,
     generateLoadID: defaultGenerateLoadID,

package/dist/transformer.d.ts

@@ -11,6 +11,7 @@ export declare class SvelteTransformer extends Transformer {
     commentDirectivesStack: CommentDirectives[];
     lastVisitIsComment: boolean;
     currentSnippet: number;
+    hasModuleScript: boolean;
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
     constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];

package/dist/transformer.js

@@ -14,6 +14,7 @@ export class SvelteTransformer extends Transformer {
     commentDirectivesStack = [];
     lastVisitIsComment = false;
     currentSnippet = 0;
+    hasModuleScript = false; // to choose which runtime var to use for snippets
     mixedVisitor;
     constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf) {
         super(content, filename, index, heuristic, patterns, catalogExpr, rtConf, [varNames.rt, rtModuleVar]);
@@ -165,7 +166,16 @@ export class SvelteTransformer extends Transformer {
         }
         return [msgInfo];
     };
-    visitSnippetBlock = (node) => this.visitFragment(node.body);
+    visitSnippetBlock = (node) => {
+        // use module runtime var because the snippet may be exported from the module
+        const prevRtVar = this.currentRtVar;
+        if (this.hasModuleScript) {
+            this.currentRtVar = rtModuleVar;
+        }
+        const msgs = this.visitFragment(node.body);
+        this.currentRtVar = prevRtVar;
+        return msgs;
+    };
     visitIfBlock = (node) => {
         const msgs = this.visit(node.test);
         msgs.push(...this.visitSv(node.consequent));
@@ -218,7 +228,6 @@ export class SvelteTransformer extends Transformer {
     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;
@@ -282,6 +291,7 @@ export class SvelteTransformer extends Transformer {
         }
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
+        this.hasModuleScript = ast.type === 'Root' && ast.module != null;
         const msgs = this.visitSv(ast);
         const initRuntime = this.initRuntime(this.filename, null, null, {});
         if (ast.type === 'Program') {
@@ -291,7 +301,7 @@ export class SvelteTransformer extends Transformer {
         }
         let headerIndex = 0;
         if (ast.module) {
-            // @ts-ignore
+            // @ts-expect-error
             headerIndex = this.getRealBodyStart(ast.module.content.body) ?? ast.module.content.start;
         }
         if (ast.instance) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.16.0",
+    "version": "0.16.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.17.0"
+        "wuchale": "^0.17.1"
     },
     "devDependencies": {
         "acorn": "^8.15.0",