@wuchale/svelte 0.18.2 → 0.19.1

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts } from 'wuchale';
+import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts, pofile } from 'wuchale';
 import { loaderPathResolver } from 'wuchale/adapter-utils';
 import { pluralPattern } from 'wuchale/adapter-vanilla';
 import { SvelteTransformer } from './transformer.js';
@@ -40,7 +40,7 @@ export const svelteDefaultHeuristicDerivedReq = msg => {
 };
 export const defaultArgs = {
     files: ['src/**/*.svelte', 'src/**/*.svelte.{js,ts}'],
-    localesDir: './src/locales',
+    storage: pofile(),
     patterns: [pluralPattern],
     heuristic: svelteKitDefaultHeuristic,
     granularLoad: false,

package/dist/transformer.js

@@ -1,8 +1,10 @@
 import MagicString from 'magic-string';
 import { parse, preprocess } from 'svelte/compiler';
+import { getKey } from 'wuchale';
 import { MixedVisitor, nonWhitespaceText, varNames } from 'wuchale/adapter-utils';
 import { parseScript, Transformer } from 'wuchale/adapter-vanilla';
 const nodesWithChildren = ['RegularElement', 'Component'];
+const noWrapTopCalls = ['$props', '$state', '$derived', '$effect'];
 const rtComponent = 'W_tx_';
 const headerAdd = `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"`;
 const snipPrefix = '_w_snippet_';
@@ -35,8 +37,8 @@ export class SvelteTransformer extends Transformer {
             return msgs;
         }
         const needsWrapping = msgs.some(msg => {
-            if (msg.details.topLevelCall &&
-                ['$props', '$state', '$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
+            const topCall = msg.details.topLevelCall ?? '';
+            if (noWrapTopCalls.includes(topCall) || noWrapTopCalls.some(c => topCall.startsWith(`${c}.`))) {
                 return false;
             }
             if (msg.details.declaring !== 'variable') {
@@ -96,7 +98,7 @@ export class SvelteTransformer extends Transformer {
                 begin += `{${this.vars().nestCtx}} n`;
             }
             else {
-                const index = this.index.get(msgInfo.toKey());
+                const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
                 begin += `{${this.vars().rtCtx}(${index})}`;
             }
             let end = ' />\n';
@@ -137,7 +139,7 @@ export class SvelteTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})}`);
         return [msgInfo];
     };
     visitSpreadAttribute = (node) => this.visit(node.expression);
@@ -184,7 +186,7 @@ export class SvelteTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(value.start, value.end, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(value.start, value.end, `{${this.literalRepl(msgInfo)}}`);
         if (`'"`.includes(this.content[value.start - 1])) {
             this.mstr.remove(value.start - 1, value.start);
             this.mstr.remove(value.end, value.end + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.18.2",
+    "version": "0.19.1",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -52,11 +52,11 @@
     "license": "MIT",
     "dependencies": {
         "magic-string": "^0.30.21",
-        "svelte": "^5.53.1",
-        "wuchale": "^0.20.0"
+        "svelte": "^5",
+        "wuchale": "^0.21.2"
     },
     "devDependencies": {
-        "acorn": "^8.15.0",
+        "acorn": "^8.16.0",
         "typescript": "^5.9.3"
     },
     "type": "module"

package/src/loaders/bundle.svelte.js

@@ -4,7 +4,7 @@ import { locales } from '${DATA}'
 let locale = $state(locales[0])
 
 /**
- * @param {string} newLocale
+ * @param {import('${DATA}').Locale} newLocale
  */
 export function setLocale(newLocale) {
     locale = newLocale