wuchale 0.18.7 → 0.18.9

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

@@ -34,7 +34,7 @@ export class MixedVisitor {
             scope: props.scope,
             element: props.element,
             attribute: props.attribute,
-        }), null);
+        }));
         const heurMsgType = this.checkHeuristic(msg);
         if (heurMsgType) {
             let hasCompoundText = hasTextChild && hasNonTextChild;

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

@@ -8,5 +8,5 @@ export type VanillaArgs = AdapterArgs<LoadersAvailable>;
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;
-};
-export declare const adapter: (args?: VanillaArgs) => Adapter;
+} | null;
+export declare const adapter: (args?: Partial<VanillaArgs>) => Adapter;

package/dist/adapter-vanilla/index.js

@@ -21,7 +21,7 @@ const defaultArgs = {
     runtime: {
         useReactive: ({ nested }) => ({
             init: nested ? null : false,
-            use: nested ? null : false,
+            use: false,
         }),
         plain: {
             wrapInit: expr => expr,

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

@@ -6,7 +6,7 @@ import { type RuntimeVars, type CommentDirectives } from "../adapter-utils/index
 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;
+type InitRuntimeFunc = (file: string, funcName?: string, parentFunc?: string, additional?: object) => string | undefined;
 export declare class Transformer {
     index: IndexTracker;
     heuristic: HeuristicFunc;
@@ -21,19 +21,19 @@ export declare class Transformer {
     vars: () => RuntimeVars;
     commentDirectives: CommentDirectives;
     insideProgram: boolean;
-    declaring: ScriptDeclType;
+    declaring?: ScriptDeclType;
     currentFuncNested: boolean;
-    currentFuncDef: string | null;
+    currentFuncDef?: string;
     currentCall: string;
-    currentTopLevelCall: string;
+    currentTopLevelCall?: string;
     /** .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: (url: string) => string, rtBaseVars?: string[]);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher, rtBaseVars?: string[]);
     fullHeuristicDetails: (detailsBase: HeuristicDetailsBase) => HeuristicDetails;
     getHeuristicMessageType: (msg: Message) => HeuristicResultChecked;
-    checkHeuristic: (msgStr: string, detailsBase: HeuristicDetailsBase) => [HeuristicResultChecked, Message];
+    checkHeuristic: (msgStr: string, detailsBase: HeuristicDetailsBase) => [MessageType, Message] | [false, null];
     visitLiteral: (node: Estree.Literal, heuristicDetailsBase?: HeuristicDetailsBase) => Message[];
     visitArrayExpression: (node: Estree.ArrayExpression) => Message[];
     visitSequenceExpression: (node: Estree.SequenceExpression) => Message[];
@@ -67,7 +67,7 @@ export declare class Transformer {
     visitExportDefaultDeclaration: (node: Estree.ExportNamedDeclaration) => Message[];
     visitStatementsNSaveRealBodyStart: (nodes: (Estree.Statement | Estree.ModuleDeclaration)[]) => Message[];
     getRealBodyStart: (nodes: (Estree.Statement | Estree.ModuleDeclaration)[]) => number | undefined;
-    visitFunctionBody: (node: Estree.BlockStatement | Estree.Expression, name: string | null, end?: number) => Message[];
+    visitFunctionBody: (node: Estree.BlockStatement | Estree.Expression, name?: string, end?: number) => Message[];
     visitFunctionDeclaration: (node: Estree.FunctionDeclaration) => Message[];
     visitArrowFunctionExpression: (node: Estree.ArrowFunctionExpression) => Message[];
     visitFunctionExpression: (node: Estree.FunctionExpression) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -27,8 +27,8 @@ export function scriptParseOptionsWithComments() {
                 accumulateComments.push({
                     type: block ? 'Block' : 'Line',
                     value: comment,
-                    start: null,
-                    end: null,
+                    start: -1,
+                    end: -1,
                 });
             }
         },
@@ -55,9 +55,9 @@ export class Transformer {
     // state
     commentDirectives = {};
     insideProgram = false;
-    declaring = null;
+    declaring;
     currentFuncNested = false;
-    currentFuncDef = null;
+    currentFuncDef;
     currentCall;
     currentTopLevelCall;
     /** .start of the first statements in their respective parents, to put the runtime init before */
@@ -72,7 +72,6 @@ export class Transformer {
         this.filename = filename;
         this.matchUrl = matchUrl;
         const topLevelUseReactive = rtConf.useReactive({
-            funcName: null,
             nested: false,
             file: filename,
             additional: this.additionalState,
@@ -97,7 +96,7 @@ export class Transformer {
             return useReactive.use ? currentVars.reactive : currentVars.plain;
         };
         this.initRuntime = (file, funcName, parentFunc, additional) => {
-            const useReactive = rtConf.useReactive({ funcName, nested: parentFunc != null, file, additional });
+            const useReactive = rtConf.useReactive({ funcName, nested: parentFunc != null, file, additional: additional ?? {} });
             if (useReactive.init == null) {
                 return;
             }
@@ -142,9 +141,10 @@ export class Transformer {
         }
         const msg = new Message(msgStr, this.fullHeuristicDetails(detailsBase), this.commentDirectives.context);
         const heuRes = this.getHeuristicMessageType(msg);
-        if (heuRes) {
-            msg.type = heuRes;
+        if (!heuRes) {
+            return [false, null];
         }
+        msg.type = heuRes;
         return [heuRes, msg];
     };
     visitLiteral = (node, heuristicDetailsBase) => {
@@ -159,7 +159,7 @@ export class Transformer {
         this.mstr.update(start, end, `${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})`);
         return [msgInfo];
     };
-    visitArrayExpression = (node) => node.elements.map(this.visit).flat();
+    visitArrayExpression = (node) => node.elements.map(elm => elm ? this.visit(elm) : []).flat();
     visitSequenceExpression = (node) => node.expressions.map(this.visit).flat();
     visitObjectExpression = (node) => node.properties.map(this.visit).flat();
     visitObjectPattern = (node) => node.properties.map(this.visit).flat();
@@ -208,10 +208,10 @@ export class Transformer {
         const msgs = [];
         const updates = [];
         const appends = [];
-        let lastArgEnd;
+        let lastArgEnd = null;
         for (const [i, arg] of pattern.args.entries()) {
             const argVal = node.arguments[i];
-            let argInsertIndex;
+            let argInsertIndex = 0; // for now
             if (argVal == null) {
                 argInsertIndex = lastArgEnd ?? node.callee.end + 1;
                 if (lastArgEnd == null) {
@@ -271,7 +271,7 @@ export class Transformer {
             }
             const candidates = [];
             for (const elm of argVal.elements) {
-                if (elm.type !== 'Literal' || typeof elm.value !== 'string') {
+                if (!elm || elm.type !== 'Literal' || typeof elm.value !== 'string') {
                     return this.defaultVisitCallExpression(node);
                 }
                 candidates.push(elm.value);
@@ -385,8 +385,8 @@ export class Transformer {
         }
         const msgs = [...this.visit(node.id), ...this.visit(node.init)];
         if (atTopLevelDefn) {
-            this.currentTopLevelCall = null; // reset
-            this.declaring = null;
+            this.currentTopLevelCall = undefined; // reset
+            this.declaring = undefined;
         }
         return msgs;
     };
@@ -399,7 +399,7 @@ export class Transformer {
         const msgs = [];
         let bodyStart = null;
         for (const bod of nodes) {
-            let currentContent;
+            let currentContent = ''; // for now
             if (bodyStart == null) {
                 currentContent = this.mstr.toString();
             }

package/dist/adapters.d.ts

@@ -18,11 +18,11 @@ export type MessageType = 'message' | 'url';
 export declare class Message {
     msgStr: string[];
     plural: boolean;
-    context: string;
+    context?: string;
     comments: string[];
     details: HeuristicDetails;
     type: MessageType;
-    constructor(msgStr: string | string[], heuristicDetails: HeuristicDetails, context: string | null);
+    constructor(msgStr: string | (string | null | undefined)[], heuristicDetails?: HeuristicDetails, context?: string);
     toKey: () => string;
 }
 export type HeuristicResultChecked = MessageType | false;
@@ -33,7 +33,7 @@ export declare const defaultHeuristicOpts: {
     ignoreAttribs: string[][];
     ignoreCalls: string[];
     urlAttribs: string[][];
-    urlCalls: any[];
+    urlCalls: string[];
 };
 export type CreateHeuristicOpts = typeof defaultHeuristicOpts;
 export declare function createHeuristic(opts: CreateHeuristicOpts): HeuristicFunc;
@@ -111,7 +111,7 @@ export type AdapterPassThruOpts = {
     outDir?: string;
     granularLoad: boolean;
     bundleLoad: boolean;
-    url: {
+    url?: {
         patterns?: string[];
         localize?: boolean | URLLocalizer;
     };
@@ -132,9 +132,9 @@ export type CodePattern = {
     args: ('message' | 'pluralFunc' | 'locale' | 'other')[];
 };
 export type LoaderChoice<LoadersAvailable> = LoadersAvailable | string & {} | 'custom';
-export type AdapterArgs<LoadersAvailable> = Partial<AdapterPassThruOpts> & {
+export type AdapterArgs<LoadersAvailable> = AdapterPassThruOpts & {
     loader: LoaderChoice<LoadersAvailable>;
-    heuristic?: HeuristicFunc;
-    patterns?: CodePattern[];
+    heuristic: HeuristicFunc;
+    patterns: CodePattern[];
 };
 export {};

package/dist/adapters.js

@@ -1,3 +1,4 @@
+const someHeuDet = { file: '', scope: 'markup' };
 export class Message {
     msgStr; // array for plurals
     plural = false;
@@ -5,7 +6,7 @@ export class Message {
     comments = [];
     details;
     type = 'message';
-    constructor(msgStr, heuristicDetails, context) {
+    constructor(msgStr, heuristicDetails = someHeuDet, context) {
         if (typeof msgStr === 'string') {
             this.msgStr = [msgStr];
         }
@@ -14,7 +15,7 @@ export class Message {
         }
         this.msgStr = this.msgStr.map(msg => msg.split('\n').map(line => line.trim()).join('\n'));
         this.details = heuristicDetails;
-        this.context = context ?? null;
+        this.context = context;
     }
     toKey = () => `${this.msgStr.slice(0, 2).join('\n')}\n${this.context ?? ''}`.trim();
 }
@@ -75,7 +76,7 @@ export function createHeuristic(opts) {
         if (msg.details.declaring === 'expression' && !msg.details.funcName) {
             return false;
         }
-        if (!msg.details.call?.startsWith('console.') && !opts.ignoreCalls.includes(msg.details.call)) {
+        if (!msg.details.call || !msg.details.call.startsWith('console.') && !opts.ignoreCalls.includes(msg.details.call)) {
             return 'message';
         }
         return false;

package/dist/ai/gemini.d.ts

@@ -5,6 +5,6 @@ type GeminiOpts = {
     think?: boolean;
     parallel?: number;
 };
-export declare function gemini({ apiKey, batchSize, think, parallel }?: GeminiOpts): AI;
-export declare const defaultGemini: AI;
+export declare function gemini({ apiKey, 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', batchSize = 50, think = false, parallel = 4 } = {}) {
     if (apiKey === 'env') {
-        apiKey = process.env.GEMINI_API_KEY;
+        apiKey = process.env.GEMINI_API_KEY ?? '';
     }
     if (!apiKey) {
         return null;
@@ -35,7 +35,7 @@ export function gemini({ apiKey = 'env', batchSize = 50, think = false, parallel
             if (json.error) {
                 throw new Error(`error: ${json.error.code} ${json.error.message}`);
             }
-            return json.candidates[0]?.content.parts[0].text;
+            return json.candidates?.[0]?.content.parts[0].text ?? '';
         },
     };
 }

package/dist/cli/extract.js

@@ -17,9 +17,12 @@ export async function extract(config, clean, watch, sync) {
     for (const [key, adapter] of Object.entries(config.adapters)) {
         const handler = new AdapterHandler(adapter, key, config, 'cli', process.cwd(), new Logger(config.logLevel));
         await handler.init(sharedState);
-        await handler.directScanFS(clean, sync);
         handlers.push(handler);
     }
+    // other loop to make sure that all otherFileMatchers are collected
+    for (const handler of handlers) {
+        await handler.directScanFS(clean, sync);
+    }
     if (!watch) {
         console.info('Extraction finished.');
         return;

package/dist/cli/index.js

@@ -12,13 +12,16 @@ const { positionals, values } = parseArgs({
         clean: {
             type: 'boolean',
             short: 'c',
+            default: false,
         },
         watch: {
             type: 'boolean',
             short: 'w',
+            default: false,
         },
         sync: {
             type: 'boolean',
+            default: false,
         },
         help: {
             type: 'boolean',

package/dist/config.d.ts

@@ -2,18 +2,20 @@ import { type Adapter } from "./adapters.js";
 import type { AI } from "./ai/index.js";
 export type LogLevel = 'error' | 'warn' | 'info' | 'verbose';
 export type ConfigPartial = {
-    sourceLocale?: string;
-    otherLocales?: string[];
-    ai?: AI;
-    logLevel?: LogLevel;
+    sourceLocale: string;
+    otherLocales: string[];
+    ai: AI | null;
+    logLevel: LogLevel;
 };
 export type Config = ConfigPartial & {
-    adapters?: Record<string, Adapter>;
-    hmr?: boolean;
+    adapters: Record<string, Adapter>;
+    hmr: boolean;
 };
+type ConfigWithOptional = Partial<Config>;
 export declare const defaultConfig: Config;
-export declare function defineConfig(config: Config): Config;
-export declare function deepMergeObjects<Type>(source: Type, target: Type): Type;
+export declare function defineConfig(config: ConfigWithOptional): Partial<Config>;
+export declare function deepMergeObjects<Type extends {}>(source: Partial<Type>, target: Type): Type;
 export declare const defaultConfigNames: string[];
 export declare const getLanguageName: (code: string) => string;
 export declare function getConfig(configPath?: string): Promise<Config>;
+export {};

package/dist/config.js

@@ -35,7 +35,7 @@ export function deepMergeObjects(source, target) {
 }
 export const defaultConfigNames = ['js', 'mjs'].map(ext => `wuchale.config.${ext}`);
 const displayName = new Intl.DisplayNames(['en'], { type: 'language' });
-export const getLanguageName = (code) => displayName.of(code);
+export const getLanguageName = (code) => displayName.of(code) ?? code;
 function checkValidLocale(locale) {
     try {
         getLanguageName(locale);
@@ -45,17 +45,18 @@ function checkValidLocale(locale) {
     }
 }
 export async function getConfig(configPath) {
-    let module;
+    let module = null;
     for (const confName of [configPath, ...defaultConfigNames]) {
         if (!confName) {
             continue;
         }
+        const fileUrl = `file://${resolve(confName)}`;
         try {
-            module = await import(`file://${resolve(confName)}`);
+            module = await import(fileUrl);
             break;
         }
         catch (err) {
-            if (err.code !== 'ERR_MODULE_NOT_FOUND') {
+            if (err.code !== 'ERR_MODULE_NOT_FOUND' || err.url != fileUrl) {
                 throw err;
             }
         }

package/dist/handler.d.ts

@@ -28,6 +28,7 @@ type Compiled = {
 type CompiledCatalogs = Record<string, Compiled>;
 type SharedState = {
     ownerKey: string;
+    otherFileMatches: Matcher[];
     poFilesByLoc: Record<string, POFile>;
     compiled: CompiledCatalogs;
     extractedUrls: Record<string, Catalog>;
@@ -61,6 +62,7 @@ export declare class AdapterHandler {
     getLoaderPath(): Promise<LoaderPath>;
     getCompiledFilePath(loc: string, id: string | null): string;
     getLoadIDs(forImport?: boolean): string[];
+    genProxy(catalogs: string[], loadIDs: string[], syncImports?: string[]): string;
     getProxy(): string;
     getProxySync(): string;
     getData(): string;
@@ -70,12 +72,12 @@ export declare class AdapterHandler {
     init: (sharedStates: SharedStates) => Promise<void>;
     urlPatternToTranslate: (pattern: string) => string;
     initUrlPatterns: () => Promise<void>;
-    loadCatalogNCompile: (loc: string) => Promise<void>;
-    loadCatalogModule: (locale: string, loadID: string, hmrVersion?: number) => string;
-    matchUrl: (url: string) => string;
+    loadCatalogNCompile: (loc: string, hmrVersion?: number) => Promise<void>;
+    loadCatalogModule: (locale: string, loadID: string | null, hmrVersion: number) => string;
+    matchUrl: (url: string) => string | null;
     getUrlToCompile: (key: string, locale: string) => string;
-    compile: (loc: string) => Promise<void>;
-    writeCompiled: (loc: string) => Promise<void>;
+    compile: (loc: string, hmrVersion?: number) => Promise<void>;
+    writeCompiled: (loc: string, hmrVersion?: number) => Promise<void>;
     writeProxies: () => Promise<void>;
     writeTransformed: (filename: string, content: string) => Promise<void>;
     globConfToArgs: (conf: GlobConf) => [string[], {

package/dist/handler.js

@@ -43,7 +43,7 @@ async function loadCatalogFromPO(filename) {
     const po = await loadPOFile(filename);
     const catalog = {};
     for (const item of po.items) {
-        const msgInfo = new Message([item.msgid, item.msgid_plural], null, item.msgctxt);
+        const msgInfo = new Message([item.msgid, item.msgid_plural], undefined, item.msgctxt);
         catalog[msgInfo.toKey()] = item;
     }
     let pluralRule;
@@ -55,7 +55,12 @@ async function loadCatalogFromPO(filename) {
     else {
         pluralRule = defaultPluralRule;
     }
-    return { catalog, pluralRule, headers: po.headers };
+    return {
+        catalog,
+        pluralRule,
+        // @ts-expect-error
+        headers: po.headers
+    };
 }
 function poDumpToString(items) {
     const po = new PO();
@@ -74,7 +79,7 @@ async function saveCatalogToPO(catalog, filename, headers = {}) {
                 rej(err);
             }
             else {
-                res(null);
+                res();
             }
         });
     });
@@ -208,6 +213,21 @@ export class AdapterHandler {
         }
         return loadIDs;
     }
+    // typed to work regardless of user's noUncheckedIndexedAccess setting in tsconfig
+    genProxy(catalogs, loadIDs, syncImports) {
+        const baseType = 'import("wuchale/runtime").CatalogModule';
+        return `
+            ${syncImports?.join('\n') ?? ''}
+            /** @typedef {${syncImports ? baseType : `() => Promise<${baseType}>`}} CatalogMod
+            /** @typedef {{[locale: string]: CatalogMod}} KeyCatalogs
+            /** @type {{[loadID: string]: KeyCatalogs}} */
+            const catalogs = {${catalogs.join(',')}}
+            export const loadCatalog = (/** @type {string} */ loadID, /** @type {string} */ locale) => {
+                return /** @type {CatalogMod} */ (/** @type {KeyCatalogs} */ (catalogs[loadID])[locale])${syncImports ? '' : '()'}
+            }
+            export const loadIDs = ['${loadIDs.join("', '")}']
+        `;
+    }
     getProxy() {
         const imports = [];
         const loadIDs = this.getLoadIDs();
@@ -219,12 +239,7 @@ export class AdapterHandler {
             }
             imports.push(`${id}: {${importsByLocale.join(',')}}`);
         }
-        return `
-            /** @type {{[loadID: string]: {[locale: string]: () => Promise<import('wuchale/runtime').CatalogModule>}}} */
-            const catalogs = {${imports.join(',')}}
-            export const loadCatalog = (/** @type {string} */ loadID, /** @type {string} */ locale) => catalogs[loadID][locale]()
-            export const loadIDs = ['${loadIDs.join("', '")}']
-        `;
+        return this.genProxy(imports, loadIDs);
     }
     getProxySync() {
         const loadIDs = this.getLoadIDs();
@@ -240,13 +255,7 @@ export class AdapterHandler {
             }
             object.push(`${id}: {${importedByLocale.join(',')}}`);
         }
-        return `
-            ${imports.join('\n')}
-            /** @type {{[loadID: string]: {[locale: string]: import('wuchale/runtime').CatalogModule}}} */
-            const catalogs = {${object.join(',')}}
-            export const loadCatalog = (/** @type {string} */ loadID, /** @type {string} */ locale) => catalogs[loadID][locale]
-            export const loadIDs = ['${loadIDs.join("', '")}']
-        `;
+        return this.genProxy(object, loadIDs, imports);
     }
     getData() {
         return [
@@ -343,6 +352,7 @@ export class AdapterHandler {
         if (this.sharedState == null) {
             this.sharedState = {
                 ownerKey: this.key,
+                otherFileMatches: [],
                 poFilesByLoc: {},
                 indexTracker: new IndexTracker(),
                 compiled: {},
@@ -350,12 +360,15 @@ export class AdapterHandler {
             };
             sharedStates[this.#adapter.localesDir] = this.sharedState;
         }
+        else {
+            this.sharedState.otherFileMatches.push(this.fileMatches);
+        }
         this.catalogPathsToLocales = {};
         for (const loc of this.#locales) {
             this.#catalogsFname[loc] = this.catalogFileName(loc);
             // for handleHotUpdate
             this.catalogPathsToLocales[this.#catalogsFname[loc]] = loc;
-            if (loc !== this.#config.sourceLocale) {
+            if (loc !== this.#config.sourceLocale && this.#config.ai) {
                 this.#geminiQueue[loc] = new AIQueue(sourceLocaleName, getLanguageName(loc), this.#config.ai, async () => await this.savePoAndCompile(loc), this.#log);
             }
             if (this.sharedState.ownerKey === this.key) {
@@ -390,11 +403,11 @@ export class AdapterHandler {
             const urlPatternsForTranslate = urlPatterns.map(this.urlPatternToTranslate);
             const urlPatternMsgs = urlPatterns.map((patt, i) => {
                 const locPattern = urlPatternsForTranslate[i];
-                let context = null;
+                let context;
                 if (locPattern !== patt) {
                     context = `original: ${patt}`;
                 }
-                return new Message(locPattern, null, context);
+                return new Message(locPattern, undefined, context);
             });
             const urlPatternCatKeys = urlPatternMsgs.map(msg => msg.toKey());
             for (const [key, item] of Object.entries(catalog)) {
@@ -448,7 +461,7 @@ export class AdapterHandler {
         }
         await this.writeUrlFiles();
     };
-    loadCatalogNCompile = async (loc) => {
+    loadCatalogNCompile = async (loc, hmrVersion = -1) => {
         if (this.sharedState.ownerKey === this.key) {
             try {
                 this.sharedState.poFilesByLoc[loc] = await loadCatalogFromPO(this.#catalogsFname[loc]);
@@ -460,12 +473,12 @@ export class AdapterHandler {
                 this.#log.warn(`${color.magenta(this.key)}: Catalog not found for ${color.cyan(loc)}`);
             }
         }
-        await this.compile(loc);
+        await this.compile(loc, hmrVersion);
     };
-    loadCatalogModule = (locale, loadID, hmrVersion = -1) => {
+    loadCatalogModule = (locale, loadID, hmrVersion) => {
         let compiledData = this.sharedState.compiled[locale];
         if (this.#adapter.granularLoad) {
-            compiledData = this.granularStateByID[loadID]?.compiled?.[locale] ?? { hasPlurals: false, items: [] };
+            compiledData = loadID && this.granularStateByID[loadID]?.compiled?.[locale] || { hasPlurals: false, items: [] };
         }
         const compiledItems = JSON.stringify(compiledData.items);
         const plural = `n => ${this.sharedState.poFilesByLoc[locale].pluralRule.plural}`;
@@ -556,7 +569,7 @@ export class AdapterHandler {
         }
         return toCompile;
     };
-    compile = async (loc) => {
+    compile = async (loc, hmrVersion = -1) => {
         this.sharedState.compiled[loc] ??= { hasPlurals: false, items: [] };
         const catalog = this.sharedState.poFilesByLoc[loc].catalog;
         for (const [key, poItem] of Object.entries({ ...catalog, ...this.sharedState.extractedUrls[loc] })) {
@@ -596,15 +609,15 @@ export class AdapterHandler {
                 state.compiled[loc].items[state.indexTracker.get(key)] = compiled;
             }
         }
-        await this.writeCompiled(loc);
+        await this.writeCompiled(loc, hmrVersion);
     };
-    writeCompiled = async (loc) => {
-        await writeFile(this.getCompiledFilePath(loc, null), this.loadCatalogModule(loc, null));
+    writeCompiled = async (loc, hmrVersion = -1) => {
+        await writeFile(this.getCompiledFilePath(loc, null), this.loadCatalogModule(loc, null, hmrVersion));
         if (!this.#adapter.granularLoad) {
             return;
         }
         for (const state of Object.values(this.granularStateByID)) {
-            await writeFile(this.getCompiledFilePath(loc, state.id), this.loadCatalogModule(loc, state.id));
+            await writeFile(this.getCompiledFilePath(loc, state.id), this.loadCatalogModule(loc, state.id, hmrVersion));
         }
     };
     writeProxies = async () => {
@@ -760,7 +773,7 @@ export class AdapterHandler {
             if (!item.references.includes(filename)) {
                 continue;
             }
-            const key = new Message([item.msgid, item.msgid_plural], null, item.msgctxt).toKey();
+            const key = new Message([item.msgid, item.msgid_plural], undefined, item.msgctxt).toKey();
             previousReferences[key] = { count: 0, indices: [] };
             for (const [i, ref] of item.references.entries()) {
                 if (ref !== filename) {
@@ -802,7 +815,7 @@ export class AdapterHandler {
             let iStartComm;
             if (key in previousReferences) {
                 const prevRef = previousReferences[key];
-                iStartComm = prevRef.indices.shift() * newComments.length; // cannot be pop for determinism
+                iStartComm = (prevRef.indices.shift() ?? 0) * newComments.length; // cannot be pop for determinism
                 const prevComments = poItem.extractedComments.slice(iStartComm, iStartComm + newComments.length);
                 if (prevComments.length !== newComments.length || prevComments.some((c, i) => c !== newComments[i])) {
                     commentsChanged = true;
@@ -947,7 +960,15 @@ export class AdapterHandler {
                     }
                     else {
                         // don't touch other adapters' files. related extracted comments handled by handler
-                        item.references = item.references.filter(ref => !this.fileMatches(ref));
+                        item.references = item.references.filter(ref => {
+                            if (this.fileMatches(ref)) {
+                                return false;
+                            }
+                            if (this.sharedState.ownerKey !== this.key) {
+                                return true;
+                            }
+                            return this.sharedState.otherFileMatches.some(match => match(ref));
+                        });
                     }
                 }
             }

package/dist/load-utils/server.js

@@ -3,6 +3,7 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 // by locale
 const runtimes = {};
 const runtimeCtx = new AsyncLocalStorage();
+const emptyRuntime = toRuntime();
 let warningShown = {};
 export function currentRuntime(key, loadID) {
     const runtime = runtimeCtx.getStore()?.[key]?.[loadID];
@@ -11,10 +12,11 @@ export function currentRuntime(key, loadID) {
     }
     const warnKey = `${key}.${loadID}`;
     if (warningShown[warnKey]) {
-        return;
+        return emptyRuntime;
     }
     console.warn(`Catalog for '${warnKey}' not found.\n  Either 'runWithLocale' was not called or the environment has a problem.`);
     warningShown[warnKey] = true;
+    return emptyRuntime;
 }
 export async function loadLocales(key, loadIDs, load, locales) {
     if (loadIDs == null) {

package/dist/runtime.d.ts

@@ -9,7 +9,7 @@ declare let onInvalidFunc: (i: number, c: CompiledElement[]) => string;
 export declare function onInvalid(newOnInvalid: typeof onInvalidFunc): void;
 export type Runtime = {
     _: CatalogModule;
-    l: string;
+    l?: string;
     cx: (id: number) => Mixed | CompositePayload[];
     tx: (ctx: Mixed, args?: any[], start?: number) => string;
     tt: (tag: CallableFunction, id: number, args?: any[]) => any;

package/dist/url.d.ts

@@ -7,11 +7,11 @@ type GetLocale = (url: URL, locales: string[]) => string | null;
 export type URLLocalizer = (url: string, locale: string) => string;
 export declare const localizeDefault: URLLocalizer;
 export declare const getLocaleDefault: GetLocale;
-type MatchParams = Record<string, string | string[]>;
+type MatchParams = Partial<Record<string, string | string[]>>;
 export declare const fillParams: (params: MatchParams, destPattern: string) => string;
 type MatchResult = {
-    path: string;
-    locale: string;
+    path: string | null;
+    locale: string | null;
     params: MatchParams;
     altPatterns: Record<string, string>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.18.7",
+    "version": "0.18.9",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",
@@ -87,7 +87,7 @@
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@types/node": "^24.10.1",
+        "@types/node": "~24.10.1",
         "@types/picomatch": "^4.0.1",
         "typescript": "^5.9.3"
     },