@wuchale/svelte 0.17.6 → 0.17.8

package/dist/index.d.ts

@@ -10,6 +10,6 @@ export type SvelteArgs = AdapterArgs<LoadersAvailable>;
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;
-};
-export declare const adapter: (args?: SvelteArgs) => Adapter;
+} | null;
+export declare const adapter: (args?: Partial<SvelteArgs>) => Adapter;
 export {};

package/dist/transformer.d.ts

@@ -2,7 +2,7 @@ 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, CodePattern } from 'wuchale';
+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 {
@@ -13,7 +13,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: (url: string) => string);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];
     visitVariableDeclarator: (node: VariableDeclarator) => Message[];
     initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;
@@ -41,6 +41,6 @@ export declare class SvelteTransformer extends Transformer {
     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;
+    transformSv: () => Promise<TransformOutput>;
 }
 export {};

package/dist/transformer.js

@@ -1,5 +1,5 @@
 import MagicString from "magic-string";
-import { parse } from "svelte/compiler";
+import { parse, preprocess } from "svelte/compiler";
 import { Message } from 'wuchale';
 import { Transformer, parseScript } from 'wuchale/adapter-vanilla';
 import { MixedVisitor, nonWhitespaceText, processCommentDirectives, varNames } from "wuchale/adapter-utils";
@@ -7,6 +7,16 @@ const nodesWithChildren = ['RegularElement', 'Component'];
 const rtComponent = 'W_tx_';
 const snipPrefix = '_w_snippet_';
 const rtModuleVar = varNames.rt + 'mod_';
+// for use before actually parsing the code,
+// to remove the contents of e.g. <style lang="scss">
+// without messing up indices for magic-string
+const removeSCSS = ({ attributes, content }) => {
+    if (attributes.lang) {
+        return {
+            code: ' '.repeat(content.length),
+        };
+    }
+};
 export class SvelteTransformer extends Transformer {
     // state
     currentElement;
@@ -22,11 +32,12 @@ export class SvelteTransformer extends Transformer {
     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)) {
+        const init = node.init;
+        if (!msgs.length || this.declaring != null || init == null || ['ArrowFunctionExpression', 'FunctionExpression'].includes(init.type)) {
             return msgs;
         }
         const needsWrapping = msgs.some(msg => {
-            if (['$props', '$state', '$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
+            if (msg.details.topLevelCall && ['$props', '$state', '$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
                 return false;
             }
             if (msg.details.declaring !== 'variable') {
@@ -37,10 +48,10 @@ export class SvelteTransformer extends Transformer {
         if (!needsWrapping) {
             return msgs;
         }
-        const isExported = this.moduleExportRanges.some(([start, end]) => node.init.start >= start && node.init.end <= end);
+        const isExported = this.moduleExportRanges.some(([start, end]) => init.start >= start && init.end <= end);
         if (!isExported) {
-            this.mstr.appendLeft(node.init.start, '$derived(');
-            this.mstr.appendRight(node.init.end, ')');
+            this.mstr.appendLeft(init.start, '$derived(');
+            this.mstr.appendRight(init.end, ')');
         }
         return msgs;
     };
@@ -228,10 +239,10 @@ export class SvelteTransformer extends Transformer {
         ];
     };
     visitAwaitBlock = (node) => {
-        const msgs = [
-            ...this.visit(node.expression),
-            ...this.visitFragment(node.then),
-        ];
+        const msgs = this.visit(node.expression);
+        if (node.then) {
+            msgs.push(...this.visitFragment(node.then));
+        }
         if (node.pending) {
             msgs.push(...this.visitFragment(node.pending));
         }
@@ -259,9 +270,12 @@ export class SvelteTransformer extends Transformer {
             this.commentDirectives = {}; // reset
             // @ts-expect-error
             msgs.push(...this.visitProgram(node.module.content));
-            this.mstr.appendRight(
-            // @ts-expect-error
-            this.getRealBodyStart(node.module.content.body) ?? node.module.content.start, this.initRuntime(this.filename, null, null, {}));
+            const runtimeInit = this.initRuntime(this.filename);
+            if (runtimeInit) {
+                this.mstr.appendRight(
+                // @ts-expect-error
+                this.getRealBodyStart(node.module.content.body) ?? node.module.content.start, runtimeInit);
+            }
             this.additionalState = {}; // reset
             this.currentRtVar = prevRtVar; // reset
         }
@@ -330,11 +344,12 @@ export class SvelteTransformer extends Transformer {
             }
         }
     };
-    transformSv = () => {
+    transformSv = async () => {
         const isComponent = this.filename.endsWith('.svelte');
         let ast;
         if (isComponent) {
-            ast = parse(this.content, { modern: true });
+            const prepd = await preprocess(this.content, { style: removeSCSS });
+            ast = parse(prepd.code, { modern: true });
         }
         else {
             const [pAst, comments] = parseScript(this.content);
@@ -347,10 +362,12 @@ export class SvelteTransformer extends Transformer {
             this.collectModuleExportRanges(ast.module);
         }
         const msgs = this.visitSv(ast);
-        const initRuntime = this.initRuntime(this.filename, null, null, {});
+        const initRuntime = this.initRuntime(this.filename);
         if (ast.type === 'Program') {
             const bodyStart = this.getRealBodyStart(ast.body) ?? 0;
-            this.mstr.appendRight(bodyStart, initRuntime);
+            if (initRuntime) {
+                this.mstr.appendRight(bodyStart, initRuntime);
+            }
             return this.finalize(msgs, bodyStart);
         }
         let headerIndex = 0;
@@ -364,7 +381,9 @@ export class SvelteTransformer extends Transformer {
             if (!ast.module) {
                 headerIndex = instanceBodyStart;
             }
-            this.mstr.appendRight(instanceBodyStart, initRuntime);
+            if (initRuntime) {
+                this.mstr.appendRight(instanceBodyStart, initRuntime);
+            }
         }
         else {
             const instanceStart = ast.module?.end ?? 0;

package/package.json

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