@wuchale/svelte 0.18.0 → 0.18.2

package/README.md

@@ -10,5 +10,5 @@ automatically extracts and replaces translatable strings at build time.
 
 - Main documentation: [wuchale.dev](https://wuchale.dev)
 - Setup instructions: [Getting started](https://wuchale.dev/intro/start/)
-- Adapter docs: [JSX](https://wuchale.dev/adapters/svelte)
+- Adapter docs: [Svelte](https://wuchale.dev/adapters/svelte)
 - Repository: [wuchalejs/wuchale](https://github.com/wuchalejs/wuchale)

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import type { HeuristicFunc, Adapter, AdapterArgs, LoaderChoice, CreateHeuristicOpts } from 'wuchale';
-import { type RuntimeCtxSv } from "./transformer.js";
+import type { Adapter, AdapterArgs, CreateHeuristicOpts, HeuristicFunc, LoaderChoice } 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 */
@@ -9,6 +9,7 @@ export declare const svelteKitDefaultHeuristic: HeuristicFunc;
 export declare const svelteDefaultHeuristicDerivedReq: HeuristicFunc;
 type LoadersAvailable = 'svelte' | 'sveltekit';
 export type SvelteArgs = AdapterArgs<LoadersAvailable, RuntimeCtxSv>;
+export declare const defaultArgs: SvelteArgs;
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;

package/dist/index.js

@@ -1,7 +1,7 @@
-import { defaultGenerateLoadID, deepMergeObjects, createHeuristic, defaultHeuristicOpts } from 'wuchale';
-import { SvelteTransformer } from "./transformer.js";
+import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts } from 'wuchale';
 import { loaderPathResolver } from 'wuchale/adapter-utils';
 import { pluralPattern } from 'wuchale/adapter-vanilla';
+import { SvelteTransformer } from './transformer.js';
 export function createSvelteHeuristic(opts) {
     const defaultHeuristic = createHeuristic(opts);
     return msg => {
@@ -38,7 +38,7 @@ export const svelteDefaultHeuristicDerivedReq = msg => {
     }
     return false;
 };
-const defaultArgs = {
+export const defaultArgs = {
     files: ['src/**/*.svelte', 'src/**/*.svelte.{js,ts}'],
     localesDir: './src/locales',
     patterns: [pluralPattern],
@@ -50,7 +50,7 @@ const defaultArgs = {
     runtime: {
         initReactive: ({ file, funcName, module }) => {
             const inTopLevel = funcName == null;
-            return file.endsWith('.svelte.js') || module ? inTopLevel : (inTopLevel ? true : null);
+            return file.endsWith('.svelte.js') || module ? inTopLevel : inTopLevel ? true : null;
         },
         useReactive: ({ file, funcName, module }) => {
             const inTopLevel = funcName == null;

package/dist/transformer.d.ts

@@ -1,9 +1,8 @@
-import type { AnyNode, VariableDeclarator } from "acorn";
-import { type AST } from "svelte/compiler";
-import { Message } from 'wuchale';
+import type { AnyNode, VariableDeclarator } from 'acorn';
+import { type AST } from 'svelte/compiler';
+import type { CatalogExpr, CodePattern, HeuristicFunc, IndexTracker, Message, RuntimeConf, TransformOutput, UrlMatcher } from 'wuchale';
+import { MixedVisitor } from 'wuchale/adapter-utils';
 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 type RuntimeCtxSv = {
     module: boolean;
@@ -11,8 +10,6 @@ export type RuntimeCtxSv = {
 export declare class SvelteTransformer extends Transformer<RuntimeCtxSv> {
     currentElement?: string;
     inCompoundText: boolean;
-    commentDirectivesStack: CommentDirectives[];
-    lastVisitIsComment: boolean;
     currentSnippet: number;
     moduleExportRanges: [number, number][];
     mixedVisitor: MixedVisitor<MixedNodesTypes>;

package/dist/transformer.js

@@ -1,28 +1,22 @@
-import MagicString from "magic-string";
-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";
+import MagicString from 'magic-string';
+import { parse, preprocess } from 'svelte/compiler';
+import { MixedVisitor, nonWhitespaceText, varNames } from 'wuchale/adapter-utils';
+import { parseScript, Transformer } from 'wuchale/adapter-vanilla';
 const nodesWithChildren = ['RegularElement', 'Component'];
 const rtComponent = 'W_tx_';
+const headerAdd = `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"`;
 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">
+// to remove the contents of e.g. <style lang="scss"> which can cause parse errors
 // without messing up indices for magic-string
-const removeSCSS = ({ attributes, content }) => {
-    if (attributes.lang) {
-        return {
-            code: ' '.repeat(content.length),
-        };
-    }
-};
+const removeCSS = ({ content }) => ({
+    code: ' '.repeat(content.length),
+});
 export class SvelteTransformer extends Transformer {
     // state
     currentElement;
     inCompoundText = false;
-    commentDirectivesStack = [];
-    lastVisitIsComment = false;
     currentSnippet = 0;
     moduleExportRanges = []; // to choose which runtime var to use for snippets
     mixedVisitor;
@@ -34,11 +28,15 @@ export class SvelteTransformer extends Transformer {
     visitVariableDeclarator = (node) => {
         const msgs = this.defaultVisitVariableDeclarator(node);
         const init = node.init;
-        if (!msgs.length || this.heuristciDetails.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 => {
-            if (msg.details.topLevelCall && ['$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') {
@@ -65,7 +63,7 @@ export class SvelteTransformer extends Transformer {
         leaveInPlace: node => ['ConstTag', 'SnippetBlock'].includes(node.type),
         isExpression: node => node.type === 'ExpressionTag',
         getTextContent: (node) => node.data,
-        getCommentData: (node) => node.data,
+        getCommentData: (node) => node.data.trim(),
         canHaveChildren: (node) => nodesWithChildren.includes(node.type),
         visitFunc: (child, inCompoundText) => {
             const inCompoundTextPrev = this.inCompoundText;
@@ -116,7 +114,7 @@ export class SvelteTransformer extends Transformer {
         inCompoundText: this.inCompoundText,
         scope: 'markup',
         element: this.currentElement,
-        useComponent: this.currentElement !== 'title'
+        useComponent: this.currentElement !== 'title',
     });
     visitRegularElement = (node) => {
         const currentElement = this.currentElement;
@@ -221,10 +219,7 @@ export class SvelteTransformer extends Transformer {
         return msgs;
     };
     visitEachBlock = (node) => {
-        const msgs = [
-            ...this.visit(node.expression),
-            ...this.visitSv(node.body),
-        ];
+        const msgs = [...this.visit(node.expression), ...this.visitSv(node.body)];
         if (node.key) {
             msgs.push(...this.visit(node.key));
         }
@@ -234,10 +229,7 @@ export class SvelteTransformer extends Transformer {
         return msgs;
     };
     visitKeyBlock = (node) => {
-        return [
-            ...this.visit(node.expression),
-            ...this.visitSv(node.fragment),
-        ];
+        return [...this.visit(node.expression), ...this.visitSv(node.fragment)];
     };
     visitAwaitBlock = (node) => {
         const msgs = this.visit(node.expression);
@@ -252,16 +244,16 @@ export class SvelteTransformer extends Transformer {
         }
         return msgs;
     };
-    visitSvelteBody = (node) => node.attributes.map(this.visitSv).flat();
-    visitSvelteDocument = (node) => node.attributes.map(this.visitSv).flat();
-    visitSvelteElement = (node) => node.attributes.map(this.visitSv).flat();
+    visitSvelteBody = (node) => node.attributes.flatMap(this.visitSv);
+    visitSvelteDocument = (node) => node.attributes.flatMap(this.visitSv);
+    visitSvelteElement = (node) => node.attributes.flatMap(this.visitSv);
     visitSvelteBoundary = (node) => [
-        ...node.attributes.map(this.visitSv).flat(),
+        ...node.attributes.flatMap(this.visitSv),
         ...this.visitSv(node.fragment),
     ];
     visitSvelteHead = (node) => this.visitSv(node.fragment);
     visitTitleElement = (node) => this.visitRegularElement(node);
-    visitSvelteWindow = (node) => node.attributes.map(this.visitSv).flat();
+    visitSvelteWindow = (node) => node.attributes.flatMap(this.visitSv);
     visitRoot = (node) => {
         const msgs = [];
         if (node.module) {
@@ -287,36 +279,7 @@ export class SvelteTransformer extends Transformer {
         msgs.push(...this.visitFragment(node.fragment));
         return msgs;
     };
-    visitSv = (node) => {
-        if (node.type === 'Comment') {
-            this.commentDirectives = processCommentDirectives(node.data.trim(), this.commentDirectives);
-            if (this.lastVisitIsComment) {
-                this.commentDirectivesStack[this.commentDirectivesStack.length - 1] = this.commentDirectives;
-            }
-            else {
-                this.commentDirectivesStack.push(this.commentDirectives);
-            }
-            this.lastVisitIsComment = true;
-            return [];
-        }
-        if (node.type === 'Text' && !node.data.trim()) {
-            return [];
-        }
-        let msgs = [];
-        const commentDirectivesPrev = this.commentDirectives;
-        if (this.lastVisitIsComment) {
-            this.commentDirectives = this.commentDirectivesStack.pop();
-            this.lastVisitIsComment = false;
-        }
-        if (this.commentDirectives.ignoreFile) {
-            return [];
-        }
-        if (this.commentDirectives.forceType !== false) {
-            msgs = this.visit(node);
-        }
-        this.commentDirectives = commentDirectivesPrev;
-        return msgs;
-    };
+    visitSv = (node) => this.visit(node);
     /** 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) {
@@ -349,13 +312,12 @@ export class SvelteTransformer extends Transformer {
         const isComponent = this.heuristciDetails.file.endsWith('.svelte');
         let ast;
         if (isComponent) {
-            const prepd = await preprocess(this.content, { style: removeSCSS });
+            const prepd = await preprocess(this.content, { style: removeCSS });
             ast = parse(prepd.code, { modern: true });
         }
         else {
-            const [pAst, comments] = parseScript(this.content);
-            ast = pAst;
-            this.comments = comments;
+            ;
+            [ast, this.comments] = parseScript(this.content);
         }
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
@@ -393,7 +355,6 @@ export class SvelteTransformer extends Transformer {
             this.mstr.prependRight(instanceStart, `${initRuntime}\n</script>\n`);
             // now hmr data can be prependRight(0, ...)
         }
-        const headerAdd = `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"`;
         return this.finalize(msgs, headerIndex, headerAdd);
     };
 }

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.18.0",
+    "version": "0.18.2",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
         "build": "tsc",
-        "test": "node tests/index.ts"
+        "test": "node --import ../wuchale/testing/resolve.ts --test"
     },
     "keywords": [
         "i18n",
@@ -51,9 +51,9 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "svelte": "^5.37.0",
         "magic-string": "^0.30.21",
-        "wuchale": "^0.19.0"
+        "svelte": "^5.53.1",
+        "wuchale": "^0.20.0"
     },
     "devDependencies": {
         "acorn": "^8.15.0",

package/src/loaders/bundle.svelte.js

@@ -1,11 +1,11 @@
-import toRuntime from "wuchale/runtime"
+import toRuntime from 'wuchale/runtime'
 import { locales } from '${DATA}'
 
 let locale = $state(locales[0])
 
 /**
  * @param {string} newLocale
-*/
+ */
 export function setLocale(newLocale) {
     locale = newLocale
 }
@@ -13,7 +13,7 @@ export function setLocale(newLocale) {
 // for non-reactive
 /**
  * @param {{ [locale: string]: import("wuchale/runtime").CatalogModule }} catalogs
-*/ 
+ */
 export const getRuntime = catalogs => toRuntime(catalogs[locale], locale)
 
 // same function, only will be inside $derived when used

package/src/loaders/svelte.svelte.js

@@ -1,5 +1,5 @@
+import { defaultCollection, registerLoaders } from 'wuchale/load-utils'
 import { loadCatalog, loadIDs } from '${PROXY}'
-import { registerLoaders, defaultCollection } from 'wuchale/load-utils'
 
 const key = '${KEY}'
 

package/src/loaders/sveltekit.ssr.svelte.js

@@ -1,5 +1,5 @@
-import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
 import { currentRuntime } from 'wuchale/load-utils/server'
+import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
 
 const key = '${KEY}'
 

package/src/runtime.svelte

@@ -1,5 +1,5 @@
 <script>
-    const {n = false, x, t, a} = $props()
+const { n = false, x, t, a } = $props()
 </script>
 
 {#each x as fragment, i}