@wuchale/svelte 0.17.8 → 0.18.0

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 import type { HeuristicFunc, Adapter, AdapterArgs, LoaderChoice, CreateHeuristicOpts } from 'wuchale';
+import { type RuntimeCtxSv } from "./transformer.js";
+export type { RuntimeCtxSv };
 export declare function createSvelteHeuristic(opts: CreateHeuristicOpts): HeuristicFunc;
 /** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
 export declare const svelteDefaultHeuristic: HeuristicFunc;
@@ -6,10 +8,9 @@ export declare const svelteKitDefaultHeuristic: HeuristicFunc;
 /** Default Svelte heuristic which requires `$derived` or `$derived.by` for top level variable assignments */
 export declare const svelteDefaultHeuristicDerivedReq: HeuristicFunc;
 type LoadersAvailable = 'svelte' | 'sveltekit';
-export type SvelteArgs = AdapterArgs<LoadersAvailable>;
+export type SvelteArgs = AdapterArgs<LoadersAvailable, RuntimeCtxSv>;
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;
 } | null;
 export declare const adapter: (args?: Partial<SvelteArgs>) => Adapter;
-export {};

package/dist/index.js

@@ -48,13 +48,13 @@ const defaultArgs = {
     generateLoadID: defaultGenerateLoadID,
     loader: 'svelte',
     runtime: {
-        useReactive: ({ file, funcName, additional }) => {
+        initReactive: ({ file, funcName, module }) => {
             const inTopLevel = funcName == null;
-            const inModule = file.endsWith('.svelte.js') || additional.module;
-            return {
-                init: inModule ? inTopLevel : (inTopLevel ? true : null),
-                use: inModule ? inTopLevel : true,
-            };
+            return file.endsWith('.svelte.js') || module ? inTopLevel : (inTopLevel ? true : null);
+        },
+        useReactive: ({ file, funcName, module }) => {
+            const inTopLevel = funcName == null;
+            return file.endsWith('.svelte.js') || module ? inTopLevel : true;
         },
         reactive: {
             wrapInit: expr => `$derived(${expr})`,

package/dist/transformer.d.ts

@@ -5,7 +5,10 @@ import { Transformer } from 'wuchale/adapter-vanilla';
 import type { IndexTracker, HeuristicFunc, TransformOutput, CatalogExpr, RuntimeConf, CodePattern, UrlMatcher } 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 {
+export type RuntimeCtxSv = {
+    module: boolean;
+};
+export declare class SvelteTransformer extends Transformer<RuntimeCtxSv> {
     currentElement?: string;
     inCompoundText: boolean;
     commentDirectivesStack: CommentDirectives[];
@@ -13,7 +16,7 @@ export declare class SvelteTransformer extends Transformer {
     currentSnippet: number;
     moduleExportRanges: [number, number][];
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf<RuntimeCtxSv>, matchUrl: UrlMatcher);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];
     visitVariableDeclarator: (node: VariableDeclarator) => Message[];
     initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;

package/dist/transformer.js

@@ -28,12 +28,13 @@ export class SvelteTransformer extends Transformer {
     mixedVisitor;
     constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl) {
         super(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl, [varNames.rt, rtModuleVar]);
+        this.heuristciDetails.insideProgram = false;
     }
     visitExpressionTag = (node) => this.visit(node.expression);
     visitVariableDeclarator = (node) => {
         const msgs = this.defaultVisitVariableDeclarator(node);
         const init = node.init;
-        if (!msgs.length || this.declaring != null || init == null || ['ArrowFunctionExpression', 'FunctionExpression'].includes(init.type)) {
+        if (!msgs.length || this.heuristciDetails.declaring != null || init == null || ['ArrowFunctionExpression', 'FunctionExpression'].includes(init.type)) {
             return msgs;
         }
         const needsWrapping = msgs.some(msg => {
@@ -61,7 +62,7 @@ export class SvelteTransformer extends Transformer {
         getRange: node => ({ start: node.start, end: node.end }),
         isText: node => node.type === 'Text',
         isComment: node => node.type === 'Comment',
-        leaveInPlace: node => node.type === 'ConstTag',
+        leaveInPlace: node => ['ConstTag', 'SnippetBlock'].includes(node.type),
         isExpression: node => node.type === 'ExpressionTag',
         getTextContent: (node) => node.data,
         getCommentData: (node) => node.data,
@@ -86,7 +87,7 @@ export class SvelteTransformer extends Transformer {
                 this.currentSnippet++;
                 const snippetBegin = `\n{#snippet ${snippetName}(${haveCtx ? this.vars().nestCtx : ''})}\n`;
                 this.mstr.appendRight(childStart, snippetBegin);
-                this.mstr.prependLeft(childEnd, '\n{/snippet}');
+                this.mstr.prependLeft(childEnd, '\n{/snippet}\n');
             }
             let begin = `\n<${rtComponent}`;
             if (snippets.length) {
@@ -266,17 +267,17 @@ export class SvelteTransformer extends Transformer {
         if (node.module) {
             const prevRtVar = this.currentRtVar;
             this.currentRtVar = rtModuleVar;
-            this.additionalState = { module: true };
+            this.runtimeCtx = { module: true };
             this.commentDirectives = {}; // reset
             // @ts-expect-error
             msgs.push(...this.visitProgram(node.module.content));
-            const runtimeInit = this.initRuntime(this.filename);
+            const runtimeInit = this.initRuntime();
             if (runtimeInit) {
                 this.mstr.appendRight(
                 // @ts-expect-error
                 this.getRealBodyStart(node.module.content.body) ?? node.module.content.start, runtimeInit);
             }
-            this.additionalState = {}; // reset
+            this.runtimeCtx = { module: false }; // reset
             this.currentRtVar = prevRtVar; // reset
         }
         if (node.instance) {
@@ -345,7 +346,7 @@ export class SvelteTransformer extends Transformer {
         }
     };
     transformSv = async () => {
-        const isComponent = this.filename.endsWith('.svelte');
+        const isComponent = this.heuristciDetails.file.endsWith('.svelte');
         let ast;
         if (isComponent) {
             const prepd = await preprocess(this.content, { style: removeSCSS });
@@ -362,7 +363,7 @@ export class SvelteTransformer extends Transformer {
             this.collectModuleExportRanges(ast.module);
         }
         const msgs = this.visitSv(ast);
-        const initRuntime = this.initRuntime(this.filename);
+        const initRuntime = this.initRuntime();
         if (ast.type === 'Program') {
             const bodyStart = this.getRealBodyStart(ast.body) ?? 0;
             if (initRuntime) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.17.8",
+    "version": "0.18.0",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -53,7 +53,7 @@
     "dependencies": {
         "svelte": "^5.37.0",
         "magic-string": "^0.30.21",
-        "wuchale": "^0.18.8"
+        "wuchale": "^0.19.0"
     },
     "devDependencies": {
         "acorn": "^8.15.0",