@wuchale/svelte 0.15.0 → 0.16.0

package/dist/index.js

@@ -1,23 +1,15 @@
-// $$ 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', 'code', 'pre'];
-const svelteHeuristic = (msgStr, details) => {
-    if (!defaultHeuristic(msgStr, details)) {
+import { pluralPattern } from 'wuchale/adapter-vanilla';
+const svelteHeuristic = msg => {
+    if (!defaultHeuristic(msg)) {
         return false;
     }
-    if (ignoreElements.includes(details.element)) {
-        return false;
-    }
-    if (details.scope !== 'script') {
+    if (msg.details.scope !== 'script') {
         return true;
     }
-    if (details.declaring === 'variable' && !topLevelDeclarationsInside.includes(details.topLevelCall)) {
-        return false;
-    }
-    if (details.call === '$inspect') {
+    if (msg.details.call === '$inspect') {
         return false;
     }
     return true;
@@ -25,7 +17,7 @@ const svelteHeuristic = (msgStr, details) => {
 const defaultArgs = {
     files: ['src/**/*.svelte', 'src/**/*.svelte.{js,ts}'],
     catalog: './src/locales/{locale}',
-    pluralsFunc: 'plural',
+    patterns: [pluralPattern],
     heuristic: svelteHeuristic,
     granularLoad: false,
     bundleLoad: false,
@@ -54,10 +46,10 @@ const defaultArgs = {
 };
 const resolveLoaderPath = loaderPathResolver(import.meta.url, '../src/loaders', 'svelte.js');
 export const adapter = (args = defaultArgs) => {
-    const { heuristic, pluralsFunc, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
+    const { heuristic, patterns, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
     return {
         transform: ({ content, filename, index, expr }) => {
-            return new SvelteTransformer(content, filename, index, heuristic, pluralsFunc, expr, runtime).transformSv();
+            return new SvelteTransformer(content, filename, index, heuristic, patterns, expr, runtime).transformSv();
         },
         loaderExts: ['.svelte.js', '.svelte.ts', '.js', '.ts'],
         defaultLoaders: async () => {
@@ -75,7 +67,7 @@ export const adapter = (args = defaultArgs) => {
             if (loader === 'sveltekit') {
                 return {
                     client: resolveLoaderPath('svelte'),
-                    ssr: resolveLoaderPath('sveltekit.ssr'),
+                    server: resolveLoaderPath('sveltekit.ssr'),
                 };
             }
             return resolveLoaderPath(loader);

package/dist/transformer.d.ts

@@ -1,8 +1,8 @@
-import type { AnyNode } from "acorn";
+import type { AnyNode, VariableDeclarator } from "acorn";
 import { type AST } from "svelte/compiler";
 import { Message } from 'wuchale';
 import { Transformer } from 'wuchale/adapter-vanilla';
-import type { IndexTracker, HeuristicFunc, TransformOutput, CatalogExpr, RuntimeConf } from 'wuchale';
+import type { IndexTracker, HeuristicFunc, TransformOutput, CatalogExpr, RuntimeConf, CodePattern } 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 {
@@ -12,8 +12,9 @@ export declare class SvelteTransformer extends Transformer {
     lastVisitIsComment: boolean;
     currentSnippet: number;
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, catalogExpr: CatalogExpr, rtConf: RuntimeConf);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];
+    visitVariableDeclarator: (node: VariableDeclarator) => Message[];
     initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;
     visitFragment: (node: AST.Fragment) => Message[];
     visitRegularElement: (node: AST.ElementLike) => Message[];

package/dist/transformer.js

@@ -15,10 +15,30 @@ export class SvelteTransformer extends Transformer {
     lastVisitIsComment = false;
     currentSnippet = 0;
     mixedVisitor;
-    constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf) {
-        super(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf, [varNames.rt, rtModuleVar]);
+    constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf) {
+        super(content, filename, index, heuristic, patterns, catalogExpr, rtConf, [varNames.rt, rtModuleVar]);
     }
     visitExpressionTag = (node) => this.visit(node.expression);
+    visitVariableDeclarator = (node) => {
+        const msgs = this.defaultVisitVariableDeclarator(node);
+        if (!msgs.length || this.declaring != null || ['ArrowFunctionExpression', 'FunctionExpression'].includes(node.init.type)) {
+            return msgs;
+        }
+        const needsWrapping = msgs.some(msg => {
+            if (['$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
+                return false;
+            }
+            if (msg.details.declaring !== 'variable') {
+                return false;
+            }
+            return true;
+        });
+        if (needsWrapping) {
+            this.mstr.appendLeft(node.init.start, '$derived(');
+            this.mstr.appendRight(node.init.end, ')');
+        }
+        return msgs;
+    };
     initMixedVisitor = () => new MixedVisitor({
         mstr: this.mstr,
         vars: this.vars,
@@ -37,6 +57,7 @@ export class SvelteTransformer extends Transformer {
             return childTxts;
         },
         visitExpressionTag: this.visitExpressionTag,
+        fullHeuristicDetails: this.fullHeuristicDetails,
         checkHeuristic: this.checkHeuristicBool,
         index: this.index,
         wrapNested: (msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
@@ -207,7 +228,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
         }
@@ -264,27 +285,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.15.0",
+    "version": "0.16.0",
     "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.16.0"
+        "wuchale": "^0.17.0"
     },
     "devDependencies": {
         "acorn": "^8.15.0",