@wuchale/svelte 0.16.0 → 0.16.2

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;
+    moduleExportRanges: [number, number][];
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
     constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];
@@ -36,6 +37,8 @@ export declare class SvelteTransformer extends Transformer {
     visitSvelteWindow: (node: AST.SvelteWindow) => Message[];
     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;
     transformSv: () => TransformOutput;
 }
 export {};

package/dist/transformer.js

@@ -14,6 +14,7 @@ export class SvelteTransformer extends Transformer {
     commentDirectivesStack = [];
     lastVisitIsComment = false;
     currentSnippet = 0;
+    moduleExportRanges = []; // 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]);
@@ -25,7 +26,7 @@ export class SvelteTransformer extends Transformer {
             return msgs;
         }
         const needsWrapping = msgs.some(msg => {
-            if (['$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
+            if (['$props', '$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
                 return false;
             }
             if (msg.details.declaring !== 'variable') {
@@ -165,7 +166,17 @@ 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;
+        const pattern = new RegExp(`\\b${node.expression.name}\\b`);
+        if (this.moduleExportRanges.some(([start, end]) => pattern.test(this.content.slice(start, end)))) {
+            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 +229,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;
@@ -269,6 +279,34 @@ export class SvelteTransformer extends Transformer {
         this.commentDirectives = commentDirectivesPrev;
         return msgs;
     };
+    /** collects the ranges that will be checked if a snippet identifier is exported using RegExp test to simplify */
+    collectModuleExportRanges = (script) => {
+        for (const stmt of script.content.body) {
+            if (stmt.type !== 'ExportNamedDeclaration') {
+                continue;
+            }
+            for (const spec of stmt.specifiers) {
+                if (spec.local.type === 'Identifier') {
+                    const local = spec.local;
+                    this.moduleExportRanges.push([local.start, local.end]);
+                }
+            }
+            const declaration = stmt.declaration;
+            if (!declaration) {
+                continue;
+            }
+            if (declaration.type === 'FunctionDeclaration' || declaration.type === 'ClassDeclaration') {
+                this.moduleExportRanges.push([declaration.start, declaration.end]);
+                continue;
+            }
+            for (const decl of declaration.declarations) {
+                if (!decl.init) {
+                    continue;
+                }
+                this.moduleExportRanges.push([decl.init.start, decl.init.end]);
+            }
+        }
+    };
     transformSv = () => {
         const isComponent = this.filename.endsWith('.svelte');
         let ast;
@@ -282,6 +320,9 @@ 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);
+        }
         const msgs = this.visitSv(ast);
         const initRuntime = this.initRuntime(this.filename, null, null, {});
         if (ast.type === 'Program') {
@@ -291,7 +332,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.2",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -52,11 +52,11 @@
     "license": "MIT",
     "dependencies": {
         "svelte": "^5.37.0",
-        "wuchale": "^0.17.0"
+        "wuchale": "^0.17.1"
     },
     "devDependencies": {
         "acorn": "^8.15.0",
-        "typescript": "^5.8.3"
+        "typescript": "^5.9.3"
     },
     "type": "module"
 }