wuchale 0.18.11 → 0.19.0

package/dist/adapter-utils/index.js

@@ -7,13 +7,13 @@ export const varNames = {
 };
 export function runtimeVars(wrapFunc, base = varNames.rt) {
     return {
-        rtTrans: `${wrapFunc(base)}.t`,
-        rtTPlural: `${wrapFunc(base)}.tp`,
+        rtTrans: `${wrapFunc(base)}`,
+        rtTPlural: `${wrapFunc(base)}.p`,
         rtPlural: `${wrapFunc(base)}._.p`,
         rtLocale: `${wrapFunc(base)}.l`,
-        rtCtx: `${wrapFunc(base)}.cx`,
-        rtTransCtx: `${wrapFunc(base)}.tx`,
-        rtTransTag: `${wrapFunc(base)}.tt`,
+        rtCtx: `${wrapFunc(base)}.c`,
+        rtTransCtx: `${wrapFunc(base)}.x`,
+        rtTransTag: `${wrapFunc(base)}.t`,
         /** for when nesting, used in adapters with elements */
         nestCtx: '_w_ctx_',
     };

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

@@ -2,14 +2,13 @@ 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) => BasicNode;
+    getRange: (node: NodeT) => {
+        start: number;
+        end: number;
+    };
     isText: (node: NodeT) => boolean;
     isExpression: (node: NodeT) => boolean;
     isComment: (node: NodeT) => boolean;
@@ -34,7 +33,7 @@ type VisitProps<NodeT> = {
     attribute?: string;
     useComponent?: boolean;
 };
-export interface MixedVisitor<NodeT extends BasicNode> extends InitProps<NodeT> {
+export interface MixedVisitor<NodeT> extends InitProps<NodeT> {
 }
 export declare class MixedVisitor<NodeT> {
     constructor(props: InitProps<NodeT>);

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

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

package/dist/adapter-vanilla/index.js

@@ -19,10 +19,8 @@ const defaultArgs = {
     generateLoadID: defaultGenerateLoadID,
     loader: 'vite',
     runtime: {
-        useReactive: ({ nested }) => ({
-            init: nested ? null : false,
-            use: false,
-        }),
+        initReactive: ({ nested }) => nested ? null : false,
+        useReactive: false,
         plain: {
             wrapInit: expr => expr,
             wrapUse: expr => expr,

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

@@ -1,18 +1,17 @@
 import MagicString from "magic-string";
 import type * as Estree from "acorn";
 import { Message } from '../adapters.js';
-import type { HeuristicDetailsBase, HeuristicFunc, IndexTracker, ScriptDeclType, TransformOutput, HeuristicDetails, RuntimeConf, CatalogExpr, CodePattern, UrlMatcher, HeuristicResultChecked, MessageType } from "../adapters.js";
+import type { HeuristicDetailsBase, HeuristicFunc, IndexTracker, TransformOutput, HeuristicDetails, RuntimeConf, CatalogExpr, CodePattern, UrlMatcher, HeuristicResultChecked, MessageType } from "../adapters.js";
 import { type RuntimeVars, type CommentDirectives } from "../adapter-utils/index.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[][]];
-type InitRuntimeFunc = (file: string, funcName?: string, parentFunc?: string, additional?: object) => string | undefined;
-export declare class Transformer {
+type InitRuntimeFunc = (funcName?: string, parentFunc?: string) => string | undefined;
+export declare class Transformer<RTCtxT = {}> {
     index: IndexTracker;
     heuristic: HeuristicFunc;
     content: string;
     comments: Estree.Comment[][];
-    filename: string;
     mstr: MagicString;
     patterns: CodePattern[];
     matchUrl: UrlMatcher;
@@ -20,17 +19,12 @@ export declare class Transformer {
     currentRtVar: string;
     vars: () => RuntimeVars;
     commentDirectives: CommentDirectives;
-    insideProgram: boolean;
-    declaring?: ScriptDeclType;
-    currentFuncNested: boolean;
-    currentFuncDef?: string;
-    currentCall: string;
-    currentTopLevelCall?: string;
+    heuristciDetails: HeuristicDetails;
     /** .start of the first statements in their respective parents, to put the runtime init before */
     realBodyStarts: Set<number>;
-    /** for subclasses. right now for svelte, if in <script module> */
-    additionalState: object;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher, rtBaseVars?: string[]);
+    /** 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[]);
     fullHeuristicDetails: (detailsBase: HeuristicDetailsBase) => HeuristicDetails;
     getHeuristicMessageType: (msg: Message) => HeuristicResultChecked;
     checkHeuristic: (msgStr: string, detailsBase: HeuristicDetailsBase) => [MessageType, Message] | [false, null];

package/dist/adapter-vanilla/transformer.js

@@ -45,7 +45,6 @@ export class Transformer {
     content;
     /* for when the comments are not parsed as part of the AST */
     comments = [];
-    filename;
     mstr;
     patterns;
     matchUrl;
@@ -54,27 +53,22 @@ export class Transformer {
     vars;
     // state
     commentDirectives = {};
-    insideProgram = false;
-    declaring;
-    currentFuncNested = false;
-    currentFuncDef;
-    currentCall;
-    currentTopLevelCall;
+    heuristciDetails = { file: '', scope: 'script', insideProgram: true };
     /** .start of the first statements in their respective parents, to put the runtime init before */
     realBodyStarts = new Set();
-    /** for subclasses. right now for svelte, if in <script module> */
-    additionalState = {};
+    /** will be passed to decide which runtime variable to use */
+    runtimeCtx = {};
     constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl, rtBaseVars = [varNames.rt]) {
         this.index = index;
         this.heuristic = heuristic;
         this.patterns = patterns;
         this.content = content;
-        this.filename = filename;
+        this.heuristciDetails.file = filename;
         this.matchUrl = matchUrl;
-        const topLevelUseReactive = rtConf.useReactive({
+        const topLevelUseReactive = typeof rtConf.useReactive === 'boolean' ? () => rtConf.useReactive : ({
             nested: false,
             file: filename,
-            additional: this.additionalState,
+            ctx: this.runtimeCtx,
         });
         const vars = {};
         // to enable the use of different runtime vars for different places, right now for svelte <script module>s
@@ -86,35 +80,36 @@ export class Transformer {
         }
         this.currentRtVar = rtBaseVars[0];
         this.vars = () => {
-            const useReactive = rtConf.useReactive({
-                funcName: this.currentFuncDef,
-                nested: this.currentFuncNested,
+            const useReactive = typeof rtConf.useReactive === 'boolean' ? rtConf.useReactive : rtConf.useReactive({
+                funcName: this.heuristciDetails.funcName ?? undefined,
+                nested: this.heuristciDetails.funcIsNested ?? false,
                 file: filename,
-                additional: this.additionalState,
+                ...this.runtimeCtx,
             }) ?? topLevelUseReactive;
             const currentVars = vars[this.currentRtVar];
-            return useReactive.use ? currentVars.reactive : currentVars.plain;
+            return useReactive ? currentVars.reactive : currentVars.plain;
         };
-        this.initRuntime = (file, funcName, parentFunc, additional) => {
-            const useReactive = rtConf.useReactive({ funcName, nested: parentFunc != null, file, additional: additional ?? {} });
-            if (useReactive.init == null) {
+        this.initRuntime = (funcName, parentFunc) => {
+            let initReactive = rtConf.initReactive({
+                funcName,
+                nested: parentFunc != null,
+                file: filename,
+                ...this.runtimeCtx,
+            });
+            if (initReactive == null) {
                 return;
             }
-            const wrapInit = useReactive.init ? rtConf.reactive.wrapInit : rtConf.plain.wrapInit;
-            const expr = useReactive.init ? catalogExpr.reactive : catalogExpr.plain;
+            if (typeof rtConf.useReactive === 'boolean') {
+                initReactive = rtConf.useReactive; // should be consistent
+            }
+            const wrapInit = initReactive ? rtConf.reactive.wrapInit : rtConf.plain.wrapInit;
+            const expr = initReactive ? catalogExpr.reactive : catalogExpr.plain;
             return `\nconst ${this.currentRtVar} = ${wrapInit(expr)}\n`;
         };
     }
     fullHeuristicDetails = (detailsBase) => {
-        const details = {
-            file: this.filename,
-            call: this.currentCall,
-            declaring: this.declaring,
-            funcName: this.currentFuncDef,
-            topLevelCall: this.currentTopLevelCall,
-            ...detailsBase
-        };
-        if (details.declaring == null && this.insideProgram) {
+        const details = { ...this.heuristciDetails, ...detailsBase };
+        if (details.declaring == null && details.insideProgram) {
             details.declaring = 'expression';
         }
         return details;
@@ -182,12 +177,12 @@ export class Transformer {
     visitNewExpression = (node) => node.arguments.map(this.visit).flat();
     defaultVisitCallExpression = (node) => {
         const msgs = this.visit(node.callee);
-        const currentCall = this.currentCall;
-        this.currentCall = this.getCalleeName(node.callee);
+        const currentCall = this.heuristciDetails.call;
+        this.heuristciDetails.call = this.getCalleeName(node.callee);
         for (const arg of node.arguments) {
             msgs.push(...this.visit(arg));
         }
-        this.currentCall = currentCall; // restore
+        this.heuristciDetails.call = currentCall; // restore
         return msgs;
     };
     visitCallExpression = (node) => {
@@ -368,25 +363,25 @@ export class Transformer {
         return `[${callee.type}]`;
     };
     defaultVisitVariableDeclarator = (node) => {
-        let atTopLevelDefn = this.insideProgram && !this.declaring;
+        let atTopLevelDefn = this.heuristciDetails.insideProgram && !this.heuristciDetails.declaring;
         if (!node.init) {
             return [];
         }
         if (atTopLevelDefn) {
             if (node.init.type === 'ArrowFunctionExpression' || node.init.type === 'FunctionExpression') {
-                this.declaring = 'function';
+                this.heuristciDetails.declaring = 'function';
             }
             else {
-                this.declaring = 'variable';
+                this.heuristciDetails.declaring = 'variable';
                 if (node.init.type === 'CallExpression') {
-                    this.currentTopLevelCall = this.getCalleeName(node.init.callee);
+                    this.heuristciDetails.topLevelCall = this.getCalleeName(node.init.callee);
                 }
             }
         }
         const msgs = [...this.visit(node.id), ...this.visit(node.init)];
         if (atTopLevelDefn) {
-            this.currentTopLevelCall = undefined; // reset
-            this.declaring = undefined;
+            this.heuristciDetails.topLevelCall = undefined; // reset
+            this.heuristciDetails.declaring = undefined;
         }
         return msgs;
     };
@@ -432,13 +427,13 @@ export class Transformer {
         return nonLiteralStart ?? nodes[0]?.start;
     };
     visitFunctionBody = (node, name, end) => {
-        const prevFuncDef = this.currentFuncDef;
-        const prevFuncNested = this.currentFuncNested;
-        this.currentFuncDef = name;
-        this.currentFuncNested = name != null && prevFuncDef != null;
+        const prevFuncDef = this.heuristciDetails.funcName;
+        const prevFuncNested = this.heuristciDetails.funcIsNested;
+        this.heuristciDetails.funcName = name;
+        this.heuristciDetails.funcIsNested = name != null && prevFuncDef != null;
         const msgs = this.visit(node);
         if (msgs.length > 0) {
-            const initRuntime = this.initRuntime(this.filename, this.currentFuncDef, prevFuncDef, this.additionalState);
+            const initRuntime = this.initRuntime(this.heuristciDetails.funcName, prevFuncDef ?? undefined);
             if (initRuntime) {
                 if (node.type === 'BlockStatement') {
                     this.mstr.prependLeft(this.getRealBodyStart(node.body) ?? node.start, initRuntime);
@@ -461,15 +456,15 @@ export class Transformer {
                 }
             }
         }
-        this.currentFuncNested = prevFuncNested;
-        this.currentFuncDef = prevFuncDef;
+        this.heuristciDetails.funcIsNested = prevFuncNested;
+        this.heuristciDetails.funcName = prevFuncDef;
         return msgs;
     };
     visitFunctionDeclaration = (node) => {
-        const declaring = this.declaring;
-        this.declaring = 'function';
+        const declaring = this.heuristciDetails.declaring;
+        this.heuristciDetails.declaring = 'function';
         const msgs = this.visitFunctionBody(node.body, node.id?.name ?? '');
-        this.declaring = declaring;
+        this.heuristciDetails.declaring = declaring;
         return msgs;
     };
     visitArrowFunctionExpression = (node) => this.visitFunctionBody(node.body, '', node.end);
@@ -486,8 +481,8 @@ export class Transformer {
     };
     visitClassDeclaration = (node) => {
         const msgs = [];
-        const prevDecl = this.declaring;
-        this.declaring = 'class';
+        const prevDecl = this.heuristciDetails.declaring;
+        this.heuristciDetails.declaring = 'class';
         for (const body of node.body.body) {
             if (body.type === 'MethodDefinition') {
                 msgs.push(...this.visit(body.key));
@@ -497,13 +492,13 @@ export class Transformer {
                 }
             }
             else if (body.type === 'StaticBlock') {
-                const currentFuncDef = this.currentFuncDef;
-                this.currentFuncDef = `${node.id.name}.[static]`;
+                const currentFuncDef = this.heuristciDetails.funcName;
+                this.heuristciDetails.funcName = `${node.id.name}.[static]`;
                 msgs.push(...body.body.map(this.visit).flat());
-                this.currentFuncDef = currentFuncDef; // restore
+                this.heuristciDetails.funcName = currentFuncDef; // restore
             }
         }
-        this.declaring = prevDecl; // restore
+        this.heuristciDetails.declaring = prevDecl; // restore
         return msgs;
     };
     checkHeuristicTemplateLiteral = (node, heurDetails) => {
@@ -568,8 +563,8 @@ export class Transformer {
         return msgs;
     };
     visitTaggedTemplateExpression = (node) => {
-        const prevCall = this.currentCall;
-        this.currentCall = this.getCalleeName(node.tag);
+        const prevCall = this.heuristciDetails.call;
+        this.heuristciDetails.call = this.getCalleeName(node.tag);
         let msgs = [];
         const heuRes = this.checkHeuristicTemplateLiteral(node.quasi);
         if (heuRes) {
@@ -586,7 +581,7 @@ export class Transformer {
                 this.mstr.update(start, end, `, ${index})`);
             }
         }
-        this.currentCall = prevCall;
+        this.heuristciDetails.call = prevCall;
         return msgs;
     };
     visitSwitchStatement = (node) => node.cases.map(c => c.consequent.map(this.visit)).flat().flat();
@@ -603,9 +598,9 @@ export class Transformer {
     visitTSAsExpression = (node) => this.visit(node.expression);
     visitTSTypeAssertion = (node) => this.visit(node.expression);
     visitProgram = (node) => {
-        this.insideProgram = true;
+        this.heuristciDetails.insideProgram = true;
         const msgs = this.visitStatementsNSaveRealBodyStart(node.body);
-        this.insideProgram = false;
+        this.heuristciDetails.insideProgram = false;
         return msgs;
     };
     visitWithCommentDirectives = (node, func) => {

package/dist/adapters.d.ts

@@ -11,6 +11,8 @@ export type HeuristicDetails = HeuristicDetailsBase & {
     file: string;
     declaring?: ScriptDeclType;
     funcName?: string | null;
+    funcIsNested?: boolean;
+    insideProgram: boolean;
     topLevelCall?: string;
     call?: string;
 };
@@ -43,7 +45,7 @@ export declare const defaultHeuristic: HeuristicFunc;
 export declare const defaultHeuristicFuncOnly: HeuristicFunc;
 export declare const defaultGenerateLoadID: (filename: string) => string;
 export declare class IndexTracker {
-    indices: Record<string, number>;
+    indices: Map<string, number>;
     nextIndex: number;
     get: (msgStr: string) => number;
 }
@@ -55,9 +57,6 @@ export type CatalogExpr = {
     plain: string;
     reactive: string;
 };
-export type TransformHeader = {
-    head: string;
-};
 export type UrlMatcher = (url: string) => string | null | undefined;
 type TransformCtx = {
     content: string;
@@ -81,22 +80,19 @@ export type TransformOutput = {
 export type TransformFunc = (expr: TransformCtx) => TransformOutput;
 export type TransformFuncAsync = (expr: TransformCtx) => Promise<TransformOutput>;
 export type WrapFunc = (expr: string) => string;
-export type UseReactiveFunc = (details: {
+export type DecideReactiveDetails<RTCtxT> = RTCtxT & {
     funcName?: string;
     nested: boolean;
     file: string;
-    additional: object;
-}) => {
-    /** null to disable initializing */
-    init: boolean | null;
-    use: boolean;
 };
 type RuntimeConfDetails = {
     wrapInit: WrapFunc;
     wrapUse: WrapFunc;
 };
-export type RuntimeConf = {
-    useReactive: UseReactiveFunc;
+export type RuntimeConf<RTCtxT = {}> = {
+    /** return null to disable */
+    initReactive: (details: DecideReactiveDetails<RTCtxT>) => boolean | null;
+    useReactive: boolean | ((details: DecideReactiveDetails<RTCtxT>) => boolean);
     plain: RuntimeConfDetails;
     reactive: RuntimeConfDetails;
 };
@@ -104,7 +100,8 @@ export type LoaderPath = {
     client: string;
     server: string;
 };
-export type AdapterPassThruOpts = {
+export type AdapterPassThruOpts<RTCtxT extends {} = {}> = {
+    sourceLocale?: string;
     files: GlobConf;
     localesDir: string;
     /** if writing transformed code to a directory is desired, specify this */
@@ -116,9 +113,9 @@ export type AdapterPassThruOpts = {
         localize?: boolean | URLLocalizer;
     };
     generateLoadID: (filename: string) => string;
-    runtime: Partial<RuntimeConf>;
+    runtime: Partial<RuntimeConf<RTCtxT>>;
 };
-export type Adapter = AdapterPassThruOpts & {
+export type Adapter<RTCtxT extends {} = {}> = AdapterPassThruOpts<RTCtxT> & {
     transform: TransformFunc | TransformFuncAsync;
     /** possible filename extensions for loader. E.g. `.js` */
     loaderExts: string[];
@@ -132,7 +129,7 @@ export type CodePattern = {
     args: ('message' | 'pluralFunc' | 'locale' | 'other')[];
 };
 export type LoaderChoice<LoadersAvailable> = LoadersAvailable | string & {} | 'custom';
-export type AdapterArgs<LoadersAvailable> = AdapterPassThruOpts & {
+export type AdapterArgs<LoadersAvailable, RTCtxT extends {} = {}> = AdapterPassThruOpts<RTCtxT> & {
     loader: LoaderChoice<LoadersAvailable>;
     heuristic: HeuristicFunc;
     patterns: CodePattern[];

package/dist/adapters.js

@@ -1,4 +1,4 @@
-const someHeuDet = { file: '', scope: 'markup' };
+const someHeuDet = { file: '', scope: 'markup', insideProgram: true };
 export class Message {
     msgStr; // array for plurals
     plural = false;
@@ -93,14 +93,15 @@ export const defaultHeuristicFuncOnly = msg => {
 };
 export const defaultGenerateLoadID = (filename) => filename.replace(/[^a-zA-Z0-9_]+/g, '_');
 export class IndexTracker {
-    indices = {};
+    indices = new Map();
     nextIndex = 0;
     get = (msgStr) => {
-        if (msgStr in this.indices) {
-            return this.indices[msgStr];
+        let index = this.indices.get(msgStr);
+        if (index != null) {
+            return index;
         }
-        const index = this.nextIndex;
-        this.indices[msgStr] = index;
+        index = this.nextIndex;
+        this.indices.set(msgStr, index);
         this.nextIndex++;
         return index;
     };

package/dist/ai/gemini.d.ts

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

package/dist/ai/gemini.js

@@ -1,4 +1,4 @@
-const url = 'https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash:generateContent';
+const url = 'https://generativelanguage.googleapis.com/v1beta/models/';
 const headers = { 'Content-Type': 'application/json' };
 function prepareData(content, instruction, think) {
     return {
@@ -13,7 +13,7 @@ function prepareData(content, instruction, think) {
         }
     };
 }
-export function gemini({ apiKey = 'env', batchSize = 50, think = false, parallel = 4 } = {}) {
+export function gemini({ apiKey = 'env', model = 'gemini-2.5-flash', batchSize = 50, think = false, parallel = 4 } = {}) {
     if (apiKey === 'env') {
         apiKey = process.env.GEMINI_API_KEY ?? '';
     }
@@ -26,7 +26,7 @@ export function gemini({ apiKey = 'env', batchSize = 50, think = false, parallel
         parallel,
         translate: async (content, instruction) => {
             const data = prepareData(content, instruction, think);
-            const res = await fetch(url, {
+            const res = await fetch(`${url}${model}:generateContent`, {
                 method: 'POST',
                 headers: { ...headers, 'x-goog-api-key': apiKey },
                 body: JSON.stringify(data)

package/dist/cli/extract.js

@@ -2,20 +2,21 @@ import { AdapterHandler } from "../handler.js";
 import { color, Logger } from "../log.js";
 import { readFile } from "node:fs/promises";
 import { watch as watchFS } from 'chokidar';
-function extractor(handler) {
+function extractor(handler, logger) {
     const adapterName = color.magenta(handler.key);
     return async (filename) => {
-        console.info(`${adapterName}: Extract from ${color.cyan(filename)}`);
+        logger.info(`${adapterName}: Extract from ${color.cyan(filename)}`);
         const contents = await readFile(filename);
         await handler.transform(contents.toString(), filename);
     };
 }
 export async function extract(config, clean, watch, sync) {
-    !watch && console.info('Extracting...');
+    const logger = new Logger(config.logLevel);
+    !watch && logger.info('Extracting...');
     const handlers = [];
-    const sharedState = {};
+    const sharedState = new Map();
     for (const [key, adapter] of Object.entries(config.adapters)) {
-        const handler = new AdapterHandler(adapter, key, config, 'cli', process.cwd(), new Logger(config.logLevel));
+        const handler = new AdapterHandler(adapter, key, config, 'cli', process.cwd(), logger);
         await handler.init(sharedState);
         handlers.push(handler);
     }
@@ -24,12 +25,12 @@ export async function extract(config, clean, watch, sync) {
         await handler.directScanFS(clean, sync);
     }
     if (!watch) {
-        console.info('Extraction finished.');
+        logger.info('Extraction finished.');
         return;
     }
     // watch
-    console.info('Watching for changes');
-    const handlersWithExtr = handlers.map(h => [h.fileMatches, extractor(h)]);
+    logger.info('Watching for changes');
+    const handlersWithExtr = handlers.map(h => [h.fileMatches, extractor(h, logger)]);
     watchFS('.', { ignoreInitial: true }).on('all', async (event, filename) => {
         if (!['add', 'change'].includes(event)) {
             return;

package/dist/cli/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defaultConfigNames, getConfig } from "../config.js";
 import { parseArgs } from 'node:util';
-import { color } from "../log.js";
+import { color, logLevels } from "../log.js";
 import { extract } from "./extract.js";
 import { status } from "./status.js";
 const { positionals, values } = parseArgs({
@@ -23,6 +23,11 @@ const { positionals, values } = parseArgs({
             type: 'boolean',
             default: false,
         },
+        'log-level': {
+            type: 'string',
+            short: 'l',
+            default: 'info',
+        },
         help: {
             type: 'boolean',
             short: 'h',
@@ -41,16 +46,17 @@ Commands:
     ${color.cyan('status')}  Show current status
 
 Options:
-    ${color.cyan('--config')}     use another config file instead of ${defaultConfigNames.map(color.cyan).join('|')}
-    ${color.cyan('--clean')}, ${color.cyan('-c')}  (only when no commands) remove unused messages from catalogs
-    ${color.cyan('--watch')}, ${color.cyan('-w')}  (only when no commands) continuously watch for file changes
-    ${color.cyan('--sync')}       (only when no commands) extract sequentially instead of in parallel
-    ${color.cyan('--help')}, ${color.cyan('-h')}   Show this help
+    ${color.cyan('--config')}         use another config file instead of ${defaultConfigNames.map(color.cyan).join('|')}
+    ${color.cyan('--clean')}, ${color.cyan('-c')}      (only when no commands) remove unused messages from catalogs
+    ${color.cyan('--watch')}, ${color.cyan('-w')}      (only when no commands) continuously watch for file changes
+    ${color.cyan('--sync')}           (only when no commands) extract sequentially instead of in parallel
+    ${color.cyan('--log-level')}, ${color.cyan('-l')}  {${Object.keys(logLevels).map(color.cyan)}} (only when no commands) set log level
+    ${color.cyan('--help')}, ${color.cyan('-h')}       Show this help
 `;
 async function getConfigNLocales() {
     const config = await getConfig(values.config);
-    const locales = [config.sourceLocale, ...config.otherLocales];
-    return [config, locales];
+    config.logLevel = values["log-level"];
+    return [config, config.locales];
 }
 if (values.help) {
     console.log('wuchale cli');

package/dist/compile.js

@@ -1,3 +1,7 @@
+const OPEN = Symbol();
+const CLOSE = Symbol();
+const SELF_CLOSE = Symbol();
+const PLACEHOLDER = Symbol();
 const digitRange = ['0', '9'].map(d => d.charCodeAt(0));
 function extractSpecial(msgStr, start) {
     const inPlaceHolder = msgStr[start] === '{';
@@ -32,18 +36,18 @@ function extractSpecial(msgStr, start) {
         if (endChar !== '}') {
             return [null, null, start];
         }
-        return ['placeholder', n, i + 1];
+        return [PLACEHOLDER, n, i + 1];
     }
     if (endChar === '/' && msgStr[i + 1] === '>') {
-        return ['selfclose', n, i + 2];
+        return [SELF_CLOSE, n, i + 2];
     }
     if (endChar != '>') {
         return [null, null, start];
     }
     if (inClose) {
-        return ['close', n, i + 1];
+        return [CLOSE, n, i + 1];
     }
-    return ['open', n, i + 1];
+    return [OPEN, n, i + 1];
 }
 function compile(msgStr, start = 0, parentTag = null) {
     let curTxt = '';
@@ -63,14 +67,14 @@ function compile(msgStr, start = 0, parentTag = null) {
             compiled.push(curTxt);
             curTxt = '';
         }
-        if (type === 'open') {
+        if (type === OPEN) {
             currentOpenTag = n;
             const [subExt, newIc] = compile(msgStr, newI, n);
             compiled.push([n, ...subExt]);
             i = newIc;
             continue;
         }
-        if (type === 'close') {
+        if (type === CLOSE) {
             if (currentOpenTag != null) {
                 if (currentOpenTag != n) {
                     throw Error('Closing a different tag');
@@ -84,7 +88,7 @@ function compile(msgStr, start = 0, parentTag = null) {
                 throw Error('Closing a different tag');
             }
         }
-        else if (type === 'selfclose') {
+        else if (type === SELF_CLOSE) {
             compiled.push([n]);
         }
         else { // placeholder