wuchale 0.18.4 → 0.18.6

package/dist/adapter-utils/mixed-visitor.d.ts

@@ -2,13 +2,14 @@ import type MagicString from "magic-string";
 import { IndexTracker, Message, type HeuristicDetails, type HeuristicDetailsBase, type HeuristicFunc, type MessageType } from "../adapters.js";
 import { type RuntimeVars, type CommentDirectives } from "./index.js";
 type NestedRanges = [number, number, boolean][];
+type BasicNode = {
+    start: number;
+    end: number;
+};
 type InitProps<NodeT> = {
     vars: () => RuntimeVars;
     mstr: MagicString;
-    getRange: (node: NodeT) => {
-        start: number;
-        end: number;
-    };
+    getRange: (node: NodeT) => BasicNode;
     isText: (node: NodeT) => boolean;
     isExpression: (node: NodeT) => boolean;
     isComment: (node: NodeT) => boolean;
@@ -33,7 +34,7 @@ type VisitProps<NodeT> = {
     attribute?: string;
     useComponent?: boolean;
 };
-export interface MixedVisitor<NodeT> extends InitProps<NodeT> {
+export interface MixedVisitor<NodeT extends BasicNode> extends InitProps<NodeT> {
 }
 export declare class MixedVisitor<NodeT> {
     constructor(props: InitProps<NodeT>);

package/dist/adapter-utils/mixed-visitor.js

@@ -169,6 +169,11 @@ export class MixedVisitor {
                 begin += ', [';
                 end = ']' + end;
             }
+            if (props.scope === 'attribute' && `'"`.includes(this.mstr.original[lastChildEnd])) {
+                const firstChild = props.children[0];
+                this.mstr.remove(firstChild.start - 1, firstChild.start);
+                this.mstr.remove(lastChildEnd, lastChildEnd + 1);
+            }
             this.mstr.appendLeft(lastChildEnd, begin);
             this.mstr.appendRight(lastChildEnd, end);
         }

package/dist/adapter-vanilla/index.d.ts

@@ -4,8 +4,9 @@ export { Transformer };
 export { parseScript, scriptParseOptions, scriptParseOptionsWithComments } from './transformer.js';
 export declare const pluralPattern: CodePattern;
 type LoadersAvailable = 'server' | 'vite';
+export type VanillaArgs = AdapterArgs<LoadersAvailable>;
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;
 };
-export declare const adapter: (args?: AdapterArgs<LoadersAvailable>) => Adapter;
+export declare const adapter: (args?: VanillaArgs) => Adapter;

package/dist/adapter-vanilla/transformer.d.ts

@@ -79,6 +79,14 @@ export declare class Transformer {
     visitTemplateLiteralQuasis: (node: Estree.TemplateLiteral, msgTyp: MessageType) => [number, Message[]];
     visitTemplateLiteral: (node: Estree.TemplateLiteral, heurDetails?: HeuristicDetailsBase | boolean) => Message[];
     visitTaggedTemplateExpression: (node: Estree.TaggedTemplateExpression) => Message[];
+    visitSwitchStatement: (node: Estree.SwitchStatement) => Message[];
+    visitTryStatement: (node: Estree.TryStatement) => Message[];
+    visitTSAsExpression: (node: {
+        expression: Estree.AnyNode;
+    }) => Message[];
+    visitTSTypeAssertion: (node: {
+        expression: Estree.AnyNode;
+    }) => Message[];
     visitProgram: (node: Estree.Program) => Message[];
     visitWithCommentDirectives: (node: Estree.AnyNode, func: Function) => any;
     visit: (node: Estree.AnyNode) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -322,12 +322,19 @@ export class Transformer {
         ...this.visit(node.right),
         ...this.visit(node.body),
     ];
-    visitForStatement = (node) => [
-        ...this.visit(node.init),
-        ...this.visit(node.test),
-        ...this.visit(node.update),
-        ...this.visit(node.body),
-    ];
+    visitForStatement = (node) => {
+        const msgs = this.visit(node.body);
+        if (node.init) {
+            msgs.push(...this.visit(node.init));
+        }
+        if (node.test) {
+            msgs.push(...this.visit(node.test));
+        }
+        if (node.update) {
+            msgs.push(...this.visit(node.update));
+        }
+        return msgs;
+    };
     getMemberChainName = (node) => {
         let name = '';
         if (node.object.type === 'Identifier') {
@@ -485,7 +492,9 @@ export class Transformer {
             if (body.type === 'MethodDefinition') {
                 msgs.push(...this.visit(body.key));
                 const methodName = this.content.slice(body.key.start, body.key.end);
-                msgs.push(...this.visitFunctionBody(body.value.body, `${node.id.name}.${methodName}`));
+                if (body.value.type === 'FunctionExpression') { // and not e.g. TSDeclareMethod
+                    msgs.push(...this.visitFunctionBody(body.value.body, `${node.id.name}.${methodName}`));
+                }
             }
             else if (body.type === 'StaticBlock') {
                 const currentFuncDef = this.currentFuncDef;
@@ -580,6 +589,19 @@ export class Transformer {
         this.currentCall = prevCall;
         return msgs;
     };
+    visitSwitchStatement = (node) => node.cases.map(c => c.consequent.map(this.visit)).flat().flat();
+    visitTryStatement = (node) => {
+        const msgs = this.visit(node.block);
+        if (node.handler) {
+            msgs.push(...this.visit(node.handler.body));
+        }
+        if (node.finalizer) {
+            msgs.push(...this.visit(node.finalizer));
+        }
+        return msgs;
+    };
+    visitTSAsExpression = (node) => this.visit(node.expression);
+    visitTSTypeAssertion = (node) => this.visit(node.expression);
     visitProgram = (node) => {
         this.insideProgram = true;
         const msgs = this.visitStatementsNSaveRealBodyStart(node.body);

package/dist/adapters.d.ts

@@ -123,6 +123,8 @@ export type Adapter = AdapterPassThruOpts & {
     loaderExts: string[];
     /** default loaders to copy, `null` means custom */
     defaultLoaderPath: LoaderPath | string | null;
+    /** names to import from loaders, should avoid collision with code variables */
+    getRuntimeVars?: Partial<CatalogExpr>;
 };
 export type CodePattern = {
     name: string;

package/dist/compile.d.ts

@@ -1,5 +1,5 @@
-export type Mixed = (number | string)[];
-export type CompositePayload = CompiledElement | number;
+export type CompositePayload = number | string | Composite;
 export type Composite = [number, ...CompositePayload[]];
-export type CompiledElement = string | Mixed | Composite;
+export type Mixed = (string | number)[];
+export type CompiledElement = string | Mixed | CompositePayload[];
 export declare function compileTranslation(msgStr: string, fallback: CompiledElement): CompiledElement;

package/dist/handler.js

@@ -23,13 +23,9 @@ export const urlPatternFlag = 'url-pattern';
 const urlExtractedFlag = 'url-extracted';
 const loaderImportGetRuntime = 'getRuntime';
 const loaderImportGetRuntimeRx = 'getRuntimeRx';
-const getFuncPlain = '_w_load_';
-const getFuncReactive = getFuncPlain + 'rx_';
+const getFuncPlainDefault = '_w_load_';
+const getFuncReactiveDefault = getFuncPlainDefault + 'rx_';
 const bundleCatalogsVarName = '_w_catalogs_';
-const bundledCatalogExpr = {
-    plain: `${getFuncPlain}(${bundleCatalogsVarName})`,
-    reactive: `${getFuncReactive}(${bundleCatalogsVarName})`,
-};
 const objKeyLocale = (locale) => locale.includes('-') ? `'${locale}'` : locale;
 export async function loadPOFile(filename) {
     return new Promise((res, rej) => {
@@ -473,7 +469,7 @@ export class AdapterHandler {
         }
         const compiledItems = JSON.stringify(compiledData.items);
         const plural = `n => ${this.sharedState.poFilesByLoc[locale].pluralRule.plural}`;
-        let module = `export let ${catalogVarName} = ${compiledItems}`;
+        let module = `/** @type import('wuchale').CompiledElement[] */\nexport let ${catalogVarName} = ${compiledItems}`;
         if (compiledData.hasPlurals) {
             module = `${module}\nexport let p = ${plural}`;
         }
@@ -698,15 +694,20 @@ export class AdapterHandler {
             }
         `;
     };
+    #getRuntimeVars = () => ({
+        plain: this.#adapter.getRuntimeVars?.plain ?? getFuncPlainDefault,
+        reactive: this.#adapter.getRuntimeVars?.reactive ?? getFuncReactiveDefault,
+    });
     #prepareHeader = (filename, loadID, hmrData, forServer) => {
         let head = [];
-        let getFuncImportPlain = getFuncPlain;
-        let getFuncImportReactive = getFuncReactive;
+        const getRuntimeVars = this.#getRuntimeVars();
+        let getRuntimePlain = getRuntimeVars.plain;
+        let getRuntimeReactive = getRuntimeVars.reactive;
         if (hmrData != null) {
             head.push(`const ${varNames.hmrUpdate} = ${JSON.stringify(hmrData)}`);
-            getFuncImportPlain += 'hmr_';
-            getFuncImportReactive += 'hmr_';
-            head.push(this.#hmrUpdateFunc(getFuncPlain, getFuncImportPlain), this.#hmrUpdateFunc(getFuncReactive, getFuncImportReactive));
+            getRuntimePlain += 'hmr_';
+            getRuntimeReactive += 'hmr_';
+            head.push(this.#hmrUpdateFunc(getRuntimeVars.plain, getRuntimePlain), this.#hmrUpdateFunc(getRuntimeVars.reactive, getRuntimeReactive));
         }
         let loaderRelTo = filename;
         if (this.#adapter.outDir) {
@@ -714,8 +715,8 @@ export class AdapterHandler {
         }
         const loaderPath = this.#getImportPath(forServer ? this.loaderPath.server : this.loaderPath.client, loaderRelTo);
         const importsFuncs = [
-            `${loaderImportGetRuntime} as ${getFuncImportPlain}`,
-            `${loaderImportGetRuntimeRx} as ${getFuncImportReactive}`,
+            `${loaderImportGetRuntime} as ${getRuntimePlain}`,
+            `${loaderImportGetRuntimeRx} as ${getRuntimeReactive}`,
         ];
         head = [
             `import {${importsFuncs.join(', ')}} from "${loaderPath}"`,
@@ -739,12 +740,16 @@ export class AdapterHandler {
         ].join('\n');
     };
     #prepareRuntimeExpr = (loadID) => {
+        const importLoaderVars = this.#getRuntimeVars();
         if (this.#adapter.bundleLoad) {
-            return bundledCatalogExpr;
+            return {
+                plain: `${importLoaderVars.plain}(${bundleCatalogsVarName})`,
+                reactive: `${importLoaderVars.reactive}(${bundleCatalogsVarName})`,
+            };
         }
         return {
-            plain: `${getFuncPlain}('${loadID}')`,
-            reactive: `${getFuncReactive}('${loadID}')`,
+            plain: `${importLoaderVars.plain}('${loadID}')`,
+            reactive: `${importLoaderVars.reactive}('${loadID}')`,
         };
     };
     handleMessages = async (loc, msgs, filename) => {

package/dist/runtime.d.ts

@@ -1,4 +1,4 @@
-import type { Mixed, CompiledElement, Composite } from "./compile.js";
+import type { Mixed, CompiledElement, CompositePayload } from "./compile.js";
 export declare const catalogVarName: "c";
 export type CatalogModule = {
     [catalogVarName]: CompiledElement[];
@@ -10,7 +10,7 @@ export declare function onInvalid(newOnInvalid: typeof onInvalidFunc): void;
 export type Runtime = {
     _: CatalogModule;
     l: string;
-    cx: (id: number) => Mixed | Composite;
+    cx: (id: number) => Mixed | CompositePayload[];
     tx: (ctx: Mixed, args?: any[], start?: number) => string;
     tt: (tag: CallableFunction, id: number, args?: any[]) => any;
     tp: (id: number) => any;

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "wuchale",
-    "version": "0.18.4",
+    "version": "0.18.6",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",
         "build": "tsc",
-        "test": "node tests"
+        "test": "node tests/index.ts"
     },
     "keywords": [
         "i18n",
@@ -77,7 +77,7 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "@sveltejs/acorn-typescript": "^1.0.6",
+        "@sveltejs/acorn-typescript": "^1.0.7",
         "acorn": "^8.15.0",
         "chokidar": "^4.0.3",
         "magic-string": "^0.30.21",
@@ -87,7 +87,7 @@
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@types/node": "^24.10.0",
+        "@types/node": "^24.10.1",
         "@types/picomatch": "^4.0.1",
         "typescript": "^5.9.3"
     },