wuchale 0.20.0 → 0.21.1

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

@@ -3,6 +3,7 @@ import type { HeuristicResultChecked } from '../adapters.js';
 export declare const varNames: {
     rt: string;
     hmrUpdate: string;
+    urlLocalize: string;
 };
 export declare function runtimeVars(wrapFunc: (expr: string) => string, base?: string): {
     rtTrans: string;
@@ -21,6 +22,7 @@ export declare function loaderPathResolver(importMetaUrl: string, baseDir: strin
 export declare const commentPrefix = "@wc-";
 export type CommentDirectives = {
     ignoreFile?: boolean;
+    unit?: boolean;
     forceType?: HeuristicResultChecked;
     context?: string;
 };

package/dist/adapter-utils/index.js

@@ -4,6 +4,7 @@ import { fileURLToPath } from 'node:url';
 export const varNames = {
     rt: '_w_runtime_',
     hmrUpdate: '_w_hmrUpdate_',
+    urlLocalize: '_w_localize_',
 };
 export function runtimeVars(wrapFunc, base = varNames.rt) {
     return {
@@ -34,19 +35,23 @@ const commentDirectives = {
     ignore: `${commentPrefix}ignore`,
     ignoreFile: `${commentPrefix}ignore-file`,
     include: `${commentPrefix}include`,
+    unit: `${commentPrefix}unit`,
     url: `${commentPrefix}url`,
     context: `${commentPrefix}context:`,
 };
 export function updateCommentDirectives(data, directives) {
-    if (data === commentDirectives.ignore) {
-        directives.forceType = false;
-    }
     if (data === commentDirectives.include) {
         directives.forceType = 'message';
     }
     if (data === commentDirectives.url) {
         directives.forceType = 'url';
     }
+    if (data === commentDirectives.unit) {
+        directives.unit = true;
+    }
+    if (data === commentDirectives.ignore) {
+        directives.forceType = false;
+    }
     if (data === commentDirectives.ignoreFile) {
         directives.ignoreFile = true;
     }

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

@@ -1,5 +1,5 @@
 import type MagicString from 'magic-string';
-import { type HeuristicDetails, type HeuristicDetailsBase, type HeuristicFunc, type IndexTracker, Message, type MessageType } from '../adapters.js';
+import { type HeuristicDetails, type HeuristicDetailsBase, type HeuristicFunc, type IndexTracker, type Message, type MessageType } from '../adapters.js';
 import { type CommentDirectives, type RuntimeVars } from './index.js';
 type NestedRanges = [number, number, boolean][];
 type InitProps<NodeT> = {

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

@@ -1,6 +1,6 @@
 // Shared logic between adapters for handling nested / mixed elements within elements / fragments
-import { Message, } from '../adapters.js';
-import { commentPrefix, nonWhitespaceText, updateCommentDirectives, } from './index.js';
+import { getKey, newMessage, } from '../adapters.js';
+import { commentPrefix, nonWhitespaceText, updateCommentDirectives, varNames, } from './index.js';
 export class MixedVisitor {
     constructor(props) {
         Object.assign(this, props);
@@ -30,16 +30,19 @@ export class MixedVisitor {
             }
         }
         heurStr = heurStr.trimEnd();
-        const msg = new Message(heurStr, this.fullHeuristicDetails({
-            scope: props.scope,
-            element: props.element,
-            attribute: props.attribute,
-        }));
+        const msg = newMessage({
+            msgStr: [heurStr],
+            details: this.fullHeuristicDetails({
+                scope: props.scope,
+                element: props.element,
+                attribute: props.attribute,
+            }),
+        });
         const heurMsgType = this.checkHeuristic(msg);
-        if (heurMsgType) {
+        if (heurMsgType || props.commentDirectives.unit) {
             const hasCompoundText = hasTextChild && hasNonTextChild;
-            if (props.inCompoundText || (hasCompoundText && !hasCommentDirectives)) {
-                return [false, hasTextChild, hasCompoundText, heurMsgType, []];
+            if (props.inCompoundText || props.commentDirectives.unit || (hasCompoundText && !hasCommentDirectives)) {
+                return [false, hasTextChild, hasCompoundText, heurMsgType || 'message', []];
             }
         }
         // can't be extracted as one; visit each separately if markup
@@ -99,7 +102,11 @@ export class MixedVisitor {
             const chRange = this.getRange(child);
             if (this.isText(child)) {
                 const [startWh, trimmed, endWh] = nonWhitespaceText(this.getTextContent(child));
-                const msgInfo = new Message(trimmed, this.fullHeuristicDetails({ scope: props.scope }), props.commentDirectives.context);
+                const msgInfo = newMessage({
+                    msgStr: [trimmed],
+                    details: this.fullHeuristicDetails({ scope: props.scope }),
+                    context: props.commentDirectives.context,
+                });
                 if (startWh && !msgStr.endsWith(' ')) {
                     msgStr += ' ';
                 }
@@ -169,7 +176,11 @@ export class MixedVisitor {
         if (!msgStr) {
             return msgs;
         }
-        const msgInfo = new Message(msgStr, this.fullHeuristicDetails({ scope: props.scope }), props.commentDirectives.context);
+        const msgInfo = newMessage({
+            msgStr: [msgStr],
+            details: this.fullHeuristicDetails({ scope: props.scope }),
+            context: props.commentDirectives.context,
+        });
         msgInfo.type = heurMsgType;
         msgInfo.placeholders = placeholders;
         if (hasTextChild || hasTextDescendants) {
@@ -189,7 +200,11 @@ export class MixedVisitor {
                 begin += `${this.vars().rtTransCtx}(${this.vars().nestCtx}`;
             }
             else {
-                begin += `${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())}`;
+                if (msgInfo.type === 'url') {
+                    begin += `${varNames.urlLocalize}(`;
+                    end = `), ${this.vars().rtLocale}${end}`;
+                }
+                begin += `${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))}`;
             }
             if (iArg > 0) {
                 begin += ', [';

package/dist/adapter-vanilla/index.js

@@ -2,6 +2,7 @@
 import { loaderPathResolver } from '../adapter-utils/index.js';
 import { defaultGenerateLoadID, defaultHeuristicFuncOnly } from '../adapters.js';
 import { deepMergeObjects } from '../config.js';
+import { pofile } from '../pofile.js';
 import { Transformer } from './transformer.js';
 export { Transformer };
 export { parseScript, scriptParseOptions, scriptParseOptionsWithComments } from './transformer.js';
@@ -11,7 +12,7 @@ export const pluralPattern = {
 };
 export const defaultArgs = {
     files: { include: 'src/**/*.{js,ts}', ignore: '**/*.d.ts' },
-    localesDir: './src/locales',
+    storage: pofile(),
     patterns: [pluralPattern],
     heuristic: defaultHeuristicFuncOnly,
     granularLoad: false,

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

@@ -1,8 +1,8 @@
 import type * as Estree from 'acorn';
 import MagicString from 'magic-string';
 import { type CommentDirectives, type RuntimeVars } from '../adapter-utils/index.js';
-import type { CatalogExpr, CodePattern, HeuristicDetails, HeuristicDetailsBase, HeuristicFunc, HeuristicResultChecked, IndexTracker, MessageType, RuntimeConf, TransformOutput, UrlMatcher } from '../adapters.js';
-import { Message } from '../adapters.js';
+import type { CodePattern, HeuristicDetails, HeuristicDetailsBase, HeuristicFunc, HeuristicResultChecked, IndexTracker, MessageType, RuntimeConf, RuntimeExpr, TransformOutput, UrlMatcher } from '../adapters.js';
+import { type Message } from '../adapters.js';
 export declare const scriptParseOptions: Estree.Options;
 export declare function scriptParseOptionsWithComments(): [Estree.Options, Estree.Comment[][]];
 export declare function parseScript(content: string): [Estree.Program, Estree.Comment[][]];
@@ -24,10 +24,11 @@ export declare class Transformer<RTCtxT = {}> {
     realBodyStarts: Set<number>;
     /** will be passed to decide which runtime variable to use */
     runtimeCtx: RTCtxT;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf<RTCtxT>, matchUrl: UrlMatcher, rtBaseVars?: string[]);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: RuntimeExpr, rtConf: RuntimeConf<RTCtxT>, matchUrl: UrlMatcher, rtBaseVars?: string[]);
     fullHeuristicDetails: (detailsBase: HeuristicDetailsBase) => HeuristicDetails;
     getHeuristicMessageType: (msg: Message) => HeuristicResultChecked;
     checkHeuristic: (msgStr: string, detailsBase: HeuristicDetailsBase) => [MessageType, Message] | [false, null];
+    literalRepl(msgInfo: Message): string;
     visitLiteral: (node: Estree.Literal, heuristicDetailsBase?: HeuristicDetailsBase) => Message[];
     visitArrayExpression: (node: Estree.ArrayExpression) => Message[];
     visitSequenceExpression: (node: Estree.SequenceExpression) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -3,7 +3,7 @@ import { tsPlugin } from '@sveltejs/acorn-typescript';
 import { Parser } from 'acorn';
 import MagicString from 'magic-string';
 import { runtimeVars, updateCommentDirectives, varNames, } from '../adapter-utils/index.js';
-import { defaultHeuristicFuncOnly, Message } from '../adapters.js';
+import { defaultHeuristicFuncOnly, getKey, newMessage } from '../adapters.js';
 export const scriptParseOptions = {
     sourceType: 'module',
     ecmaVersion: 'latest',
@@ -143,7 +143,11 @@ export class Transformer {
             // nothing to ask
             return [false, null];
         }
-        const msg = new Message(msgStr, this.fullHeuristicDetails(detailsBase), this.commentDirectives.context);
+        const msg = newMessage({
+            msgStr: [msgStr],
+            details: this.fullHeuristicDetails(detailsBase),
+            context: this.commentDirectives.context,
+        });
         const heuRes = this.getHeuristicMessageType(msg);
         if (!heuRes) {
             return [false, null];
@@ -151,6 +155,13 @@ export class Transformer {
         msg.type = heuRes;
         return [heuRes, msg];
     };
+    literalRepl(msgInfo) {
+        let repl = `${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})`;
+        if (msgInfo.type !== 'url') {
+            return repl;
+        }
+        return `${varNames.urlLocalize}(${repl}, ${this.vars().rtLocale})`;
+    }
     visitLiteral = (node, heuristicDetailsBase) => {
         if (typeof node.value !== 'string') {
             return [];
@@ -160,7 +171,7 @@ export class Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(start, end, `${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})`);
+        this.mstr.update(start, end, this.literalRepl(msgInfo));
         return [msgInfo];
     };
     visitArrayExpression = (node) => node.elements.flatMap(elm => (elm ? this.visit(elm) : []));
@@ -261,8 +272,12 @@ export class Transformer {
                 if (typeof argVal.value !== 'string') {
                     return this.defaultVisitCallExpression(node);
                 }
-                const msgInfo = new Message(argVal.value, this.fullHeuristicDetails({ scope: 'script' }), this.commentDirectives.context);
-                updates.push([argVal.start, argVal.end, `${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})`]);
+                const msgInfo = newMessage({
+                    msgStr: [argVal.value],
+                    details: this.fullHeuristicDetails({ scope: 'script' }),
+                    context: this.commentDirectives.context,
+                });
+                updates.push([argVal.start, argVal.end, this.literalRepl(msgInfo)]);
                 msgs.push(msgInfo);
                 continue;
             }
@@ -281,9 +296,13 @@ export class Transformer {
                 candidates.push(elm.value);
             }
             // plural(num, ['Form one', 'Form two'])
-            const msgInfo = new Message(candidates, this.fullHeuristicDetails({ scope: 'script' }), this.commentDirectives.context);
+            const msgInfo = newMessage({
+                msgStr: candidates,
+                details: this.fullHeuristicDetails({ scope: 'script' }),
+                context: this.commentDirectives.context,
+            });
             msgInfo.plural = true;
-            const index = this.index.get(msgInfo.toKey());
+            const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
             msgs.push(msgInfo);
             updates.push([argVal.start, argVal.end, `${this.vars().rtTPlural}(${index})`]);
         }
@@ -542,10 +561,14 @@ export class Transformer {
             }
             this.mstr.update(end, end + 2, ', ');
         }
-        const msgInfo = new Message(msgStr, this.fullHeuristicDetails({ scope: 'script' }), this.commentDirectives.context);
+        const msgInfo = newMessage({
+            msgStr: [msgStr],
+            details: this.fullHeuristicDetails({ scope: 'script' }),
+            context: this.commentDirectives.context,
+        });
         msgInfo.type = msgTyp;
         msgInfo.placeholders = placeholders;
-        const index = this.index.get(msgInfo.toKey());
+        const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
         msgs.push(msgInfo);
         return [index, msgs];
     };
@@ -562,6 +585,10 @@ export class Transformer {
         const { start: start0, end: end0 } = node.quasis[0];
         let begin = `${this.vars().rtTrans}(${index}`;
         let end = ')';
+        if (msgTyp === 'url') {
+            begin = `${varNames.urlLocalize}(${begin}`;
+            end += `, ${this.vars().rtLocale})`;
+        }
         if (node.expressions.length) {
             begin += ', [';
             end = ']' + end;

package/dist/adapters.d.ts

@@ -1,5 +1,5 @@
 import type { CompiledElement } from './compile.js';
-import type { URLLocalizer } from './url.js';
+import type { StorageFactory } from './storage.js';
 type TxtScope = 'script' | 'markup' | 'attribute';
 export type HeuristicDetailsBase = {
     scope: TxtScope;
@@ -17,16 +17,16 @@ export type HeuristicDetails = HeuristicDetailsBase & {
     call?: string;
 };
 export type MessageType = 'message' | 'url';
-export declare class Message {
+export type Message = {
     msgStr: string[];
     plural: boolean;
     context?: string;
     placeholders: [number, string][];
     details: HeuristicDetails;
     type: MessageType;
-    constructor(msgStr: string | (string | null | undefined)[], heuristicDetails?: HeuristicDetails, context?: string);
-    toKey: () => string;
-}
+};
+export declare function newMessage(init: Partial<Message>): Message;
+export declare const getKey: (text: string[], context?: string) => string;
 export type HeuristicResultChecked = MessageType | false;
 export type HeuristicResult = HeuristicResultChecked | null | undefined;
 export type HeuristicFunc = (msg: Message) => HeuristicResult;
@@ -53,7 +53,7 @@ export type GlobConf = string | string[] | {
     include: string | string[];
     ignore: string | string[];
 };
-export type CatalogExpr = {
+export type RuntimeExpr = {
     plain: string;
     reactive: string;
 };
@@ -62,17 +62,18 @@ type TransformCtx = {
     content: string;
     filename: string;
     index: IndexTracker;
-    expr: CatalogExpr;
+    expr: RuntimeExpr;
     matchUrl: UrlMatcher;
 };
 export type HMRData = {
     version: number;
     data: Record<string, [number, CompiledElement][]>;
 };
-export type TransformOutputFunc = (header: string) => {
+export type TransformOutputCode = {
     code?: string;
     map?: any;
 };
+export type TransformOutputFunc = (header: string) => TransformOutputCode;
 export type TransformOutput = {
     output: TransformOutputFunc;
     msgs: Message[];
@@ -102,12 +103,12 @@ export type LoaderPath = {
 };
 export type URLConf = {
     patterns?: string[];
-    localize?: boolean | URLLocalizer;
+    localize?: boolean | string;
 };
 export type AdapterPassThruOpts<RTCtxT extends {} = {}> = {
     sourceLocale?: string;
     files: GlobConf;
-    localesDir: string;
+    storage: StorageFactory;
     /** if writing transformed code to a directory is desired, specify this */
     outDir?: string;
     granularLoad: boolean;
@@ -123,7 +124,7 @@ export type Adapter<RTCtxT extends {} = {}> = AdapterPassThruOpts<RTCtxT> & {
     /** 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>;
+    getRuntimeVars?: Partial<RuntimeExpr>;
 };
 export type CodePattern = {
     name: string;

package/dist/adapters.js

@@ -1,27 +1,22 @@
-const someHeuDet = { file: '', scope: 'markup', insideProgram: true };
-export class Message {
-    msgStr; // array for plurals
-    plural = false;
-    context;
-    placeholders = [];
-    details;
-    type = 'message';
-    constructor(msgStr, heuristicDetails = someHeuDet, context) {
-        if (typeof msgStr === 'string') {
-            this.msgStr = [msgStr];
-        }
-        else {
-            this.msgStr = msgStr.filter(str => str != null);
-        }
-        this.msgStr = this.msgStr.map(msg => msg
-            .split('\n')
-            .map(line => line.trim())
-            .join('\n'));
-        this.details = heuristicDetails;
-        this.context = context;
+export function newMessage(init) {
+    init.msgStr = init.msgStr?.filter(str => str != null) ?? [];
+    if (init.details?.scope === 'markup') {
+        init.msgStr = init.msgStr.map(msg => msg.replace(/\s+/g, ' ').trim());
     }
-    toKey = () => `${this.msgStr.slice(0, 2).join('\n')}\n${this.context ?? ''}`.trim();
+    return {
+        msgStr: init.msgStr,
+        plural: init.plural ?? false,
+        placeholders: init.placeholders ?? [],
+        type: init.type ?? 'message',
+        context: init.context,
+        details: init.details ?? {
+            file: '',
+            scope: 'markup',
+            insideProgram: true,
+        },
+    };
 }
+export const getKey = (text, context) => `${text.join('\n')}\n${context ?? ''}`.trim();
 export const defaultHeuristicOpts = {
     ignoreElements: ['script', 'style', 'path', 'code', 'pre'],
     ignoreAttribs: [['form', 'method']],

package/dist/ai/gemini.d.ts

@@ -1,11 +1,9 @@
-import type { AI } from './index.js';
-type GeminiOpts = {
-    apiKey?: string;
-    model?: string;
-    batchSize?: number;
-    think?: boolean;
-    parallel?: number;
-};
-export declare function gemini({ apiKey, model, batchSize, think, parallel, }?: GeminiOpts): AI | null;
+import type { AI, AIPassThruOpts } from './index.js';
+type GeminiOpts = Partial<AIPassThruOpts & {
+    apiKey: string;
+    model: string;
+    think: boolean;
+}>;
+export declare function gemini({ apiKey, model, group, batchSize, think, parallel, }?: GeminiOpts): AI | null;
 export declare const defaultGemini: AI | null;
 export {};

package/dist/ai/gemini.js

@@ -15,7 +15,7 @@ function prepareData(content, instruction, think) {
             },
     };
 }
-export function gemini({ apiKey = 'env', model = 'gemini-2.5-flash', batchSize = 50, think = false, parallel = 4, } = {}) {
+export function gemini({ apiKey = 'env', model = 'gemini-2.5-flash', group = {}, batchSize = 50, think = false, parallel = 4, } = {}) {
     if (apiKey === 'env') {
         apiKey = process.env.GEMINI_API_KEY ?? '';
     }
@@ -25,6 +25,7 @@ export function gemini({ apiKey = 'env', model = 'gemini-2.5-flash', batchSize =
     return {
         name: 'Gemini',
         batchSize,
+        group,
         parallel,
         translate: async (content, instruction) => {
             const data = prepareData(content, instruction, think);

package/dist/ai/index.d.ts

@@ -1,27 +1,30 @@
-import { type Item } from '../handler/pofile.js';
 import { type Logger } from '../log.js';
+import type { Item } from '../storage.js';
 type Batch = {
     id: number;
+    targetLocales: string[];
     messages: Item[];
 };
-export type AI = {
-    name: string;
+export type AIPassThruOpts = {
     batchSize: number;
-    translate: (messages: string, instruction: string) => Promise<string>;
     parallel: number;
+    group: Record<string, string[][]>;
+};
+export type AI = AIPassThruOpts & {
+    name: string;
+    translate: (messages: string, instruction: string) => Promise<string>;
 };
 export default class AIQueue {
     #private;
     batches: Batch[];
     nextBatchId: number;
     running: Promise<void> | null;
-    sourceLang: string;
-    targetLang: string;
+    sourceLocale: string;
     ai: AI;
     instruction: string;
     onComplete: () => Promise<void>;
     log: Logger;
-    constructor(sourceLang: string, targetLang: string, ai: AI, onComplete: () => Promise<void>, log: Logger);
+    constructor(sourceLocale: string, ai: AI, onComplete: () => Promise<void>, log: Logger);
     translate: (batch: Batch, attempt?: number) => Promise<void>;
     run: () => Promise<void>;
     add: (messages: Item[]) => void;