@wuchale/svelte 0.14.0 → 0.14.1

package/dist/index.js

@@ -1,3 +1,4 @@
+// $$ cd .. && npm run test
 import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wuchale';
 import { SvelteTransformer } from "./transformer.js";
 import { getDependencies } from 'wuchale/adapter-utils';
@@ -54,8 +55,8 @@ const defaultArgs = {
 export const adapter = (args = defaultArgs) => {
     const { heuristic, pluralsFunc, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
     return {
-        transform: ({ content, filename, index, header }) => {
-            return new SvelteTransformer(content, filename, index, heuristic, pluralsFunc, header.expr, runtime).transformSv(header.head);
+        transform: ({ content, filename, index, expr }) => {
+            return new SvelteTransformer(content, filename, index, heuristic, pluralsFunc, expr, runtime).transformSv();
         },
         loaderExts: ['.svelte.js', '.svelte.ts', '.js', '.ts'],
         defaultLoaders: async () => {

package/dist/transformer.d.ts

@@ -34,6 +34,6 @@ export declare class SvelteTransformer extends Transformer {
     visitSvelteWindow: (node: AST.SvelteWindow) => Message[];
     visitRoot: (node: AST.Root) => Message[];
     visitSv: (node: AST.SvelteNode | AnyNode) => Message[];
-    transformSv: (headerHead: string) => TransformOutput;
+    transformSv: () => TransformOutput;
 }
 export {};

package/dist/transformer.js

@@ -4,8 +4,8 @@ import { Message } from 'wuchale';
 import { Transformer, parseScript } from 'wuchale/adapter-vanilla';
 import { MixedVisitor, nonWhitespaceText } from "wuchale/adapter-utils";
 const nodesWithChildren = ['RegularElement', 'Component'];
-const rtComponent = 'WuchaleTrans';
-const snipPrefix = 'wuchaleSnippet';
+const rtComponent = 'W_tx_';
+const snipPrefix = '_w_snippet_';
 export class SvelteTransformer extends Transformer {
     // state
     currentElement;
@@ -49,9 +49,13 @@ export class SvelteTransformer extends Transformer {
                 this.mstr.appendRight(childStart, snippetBegin);
                 this.mstr.prependLeft(childEnd, '\n{/snippet}');
             }
-            let begin = `\n<${rtComponent} tags={[${snippets.join(', ')}]} ctx=`;
+            let begin = `\n<${rtComponent}`;
+            if (snippets.length) {
+                begin += ` t={[${snippets.join(', ')}]}`;
+            }
+            begin += ' x=';
             if (this.inCompoundText) {
-                begin += `{${this.vars().nestCtx}} nest`;
+                begin += `{${this.vars().nestCtx}} n`;
             }
             else {
                 const index = this.index.get(msgInfo.toKey());
@@ -59,7 +63,7 @@ export class SvelteTransformer extends Transformer {
             }
             let end = ' />\n';
             if (hasExprs) {
-                begin += ' args={[';
+                begin += ' a={[';
                 end = ']}' + end;
             }
             this.mstr.appendLeft(lastChildEnd, begin);
@@ -232,7 +236,7 @@ export class SvelteTransformer extends Transformer {
         this.commentDirectives = commentDirectivesPrev;
         return msgs;
     };
-    transformSv = (headerHead) => {
+    transformSv = () => {
         const isComponent = this.filename.endsWith('.svelte');
         let ast;
         if (isComponent) {
@@ -246,37 +250,30 @@ export class SvelteTransformer extends Transformer {
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
         const msgs = this.visitSv(ast);
-        if (!msgs.length) {
-            return this.finalize(msgs, 0);
-        }
         const headerLines = [
             isComponent ? `\nimport ${rtComponent} from "@wuchale/svelte/runtime.svelte"` : '',
-            headerHead,
             this.initRuntime(this.filename, null, null, {}),
         ];
         const headerFin = headerLines.join('\n');
         if (ast.type === 'Program') {
             const bodyStart = this.getRealBodyStart(ast.body);
-            this.mstr.appendRight(bodyStart, headerFin + '\n');
-            return this.finalize(msgs, bodyStart);
+            return this.finalize(msgs, bodyStart, headerFin);
         }
         let hmrHeaderIndex = 0;
         if (ast.module) {
             // @ts-ignore
             hmrHeaderIndex = this.getRealBodyStart(ast.module.content.body);
-            this.mstr.appendRight(hmrHeaderIndex, headerFin);
         }
         else if (ast.instance) {
             // @ts-ignore
             hmrHeaderIndex = this.getRealBodyStart(ast.instance.content.body);
-            this.mstr.appendRight(hmrHeaderIndex, headerFin);
         }
         else {
             this.mstr.prepend('<script>');
             // account index for hmr data here
-            this.mstr.prependRight(0, `${headerFin}</script>\n`);
+            this.mstr.prependRight(0, `</script>\n`);
             // now hmr data can be prependRight(0, ...)
         }
-        return this.finalize(msgs, hmrHeaderIndex);
+        return this.finalize(msgs, hmrHeaderIndex, headerFin);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.14.0",
+    "version": "0.14.1",
     "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.15.0"
+        "wuchale": "^0.15.4"
     },
     "devDependencies": {
         "acorn": "^8.15.0",

package/src/runtime.svelte

@@ -1,16 +1,16 @@
 <script>
-    const {nest = false, ctx, tags, args} = $props()
+    const {n = false, x, t, a} = $props()
 </script>
 
-{#each ctx as fragment, i}
+{#each x as fragment, i}
     {#if typeof fragment === 'string'}
         {fragment}
     {:else if typeof fragment === 'number'}
-        {#if !nest || i > 0}
-            {args[fragment]}
+        {#if !n || i > 0}
+            {a[fragment]}
         {/if}
     {:else}
-        {@const tag = tags[fragment[0]]}
+        {@const tag = t[fragment[0]]}
         {#if tag == null}
             [i18n-404:tag]
         {:else}