@wuchale/vite-plugin 0.16.1 → 0.16.3

package/dist/index.d.ts

@@ -15,7 +15,7 @@ type HotUpdateCtx = {
 declare class Wuchale {
     #private;
     name: string;
-    constructor(configPath?: string);
+    constructor(configPath?: string, hmrDelayThreshold?: number);
     configResolved: (config: {
         env: {
             DEV?: boolean;
@@ -33,5 +33,5 @@ declare class Wuchale {
         }>;
     };
 }
-export declare const wuchale: (configPath?: string) => Wuchale;
+export declare const wuchale: (configPath?: string, hmrDelayThreshold?: number) => Wuchale;
 export {};

package/dist/index.js

@@ -1,7 +1,6 @@
 // $$ cd ../.. && npm run test
-import { relative, resolve } from "node:path";
-import { platform } from "node:process";
-import { getConfig as getConfig, Logger, AdapterHandler } from "wuchale";
+import { relative, resolve } from 'node:path';
+import { AdapterHandler, getConfig, Logger, normalizeSep } from 'wuchale';
 const pluginName = 'wuchale';
 const confUpdateName = 'confUpdate.json';
 class Wuchale {
@@ -17,9 +16,12 @@ class Wuchale {
     #mode;
     #configPath;
     #hmrVersion = -1;
+    #hmrDelayThreshold;
     #lastSourceTriggeredPOWrite = 0;
-    constructor(configPath) {
+    constructor(configPath, hmrDelayThreshold = 1000) {
         this.#configPath = configPath;
+        // threshold to consider po file change is manual edit instead of a sideeffect of editing code
+        this.#hmrDelayThreshold = hmrDelayThreshold;
     }
     #init = async () => {
         this.#config = await getConfig(this.#configPath);
@@ -42,15 +44,11 @@ class Wuchale {
             }
             else {
                 for (const locale of this.#config.locales) {
-                    this.#singleCompiledCatalogs.add(resolve(handler.getCompiledFilePath(locale, null)));
+                    this.#singleCompiledCatalogs.add(normalizeSep(resolve(handler.getCompiledFilePath(locale, null))));
                 }
             }
             for (const path of Object.values(handler.loaderPath)) {
-                let loaderPath = resolve(path);
-                if (platform === 'win32') {
-                    // seems vite does this for the importer field in the resolveId hook
-                    loaderPath = loaderPath.replaceAll('\\', '/');
-                }
+                const loaderPath = normalizeSep(resolve(path));
                 if (adaptersByLoaderPath.has(loaderPath)) {
                     const otherKey = adaptersByLoaderPath.get(loaderPath)?.key;
                     if (otherKey === key) {
@@ -60,12 +58,12 @@ class Wuchale {
                     throw new Error([
                         'While catalogs can be shared, the same loader cannot be used by multiple adapters',
                         `Conflicting: ${key} and ${otherKey}`,
-                        'Specify a different loaderPath for one of them.'
+                        'Specify a different loaderPath for one of them.',
                     ].join('\n'));
                 }
                 adaptersByLoaderPath.set(loaderPath, handler);
             }
-            for (const fname of Object.keys(handler.catalogPathsToLocales)) {
+            for (const fname of handler.catalogPathsToLocales.keys()) {
                 const handlers = this.#adaptersByCatalogPath.get(fname);
                 if (handlers) {
                     handlers.push(handler);
@@ -74,7 +72,7 @@ class Wuchale {
                     this.#adaptersByCatalogPath.set(fname, [handler]);
                 }
             }
-            this.#adaptersByConfUpdate.set(resolve(adapter.localesDir, confUpdateName), handler);
+            this.#adaptersByConfUpdate.set(normalizeSep(resolve(adapter.localesDir, confUpdateName)), handler);
         }
     };
     configResolved = async (config) => {
@@ -108,8 +106,8 @@ class Wuchale {
             // for granular as well
             for (const adapter of this.#granularLoadAdapters) {
                 for (const loc of this.#config.locales) {
-                    for (const id in adapter.granularStateByID) {
-                        if (resolve(adapter.getCompiledFilePath(loc, id)) === ctx.file) {
+                    for (const id of adapter.granularStateByID.keys()) {
+                        if (normalizeSep(resolve(adapter.getCompiledFilePath(loc, id))) === ctx.file) {
                             return [];
                         }
                     }
@@ -119,15 +117,15 @@ class Wuchale {
             return;
         }
         // catalog changed
-        const sourceTriggered = performance.now() - this.#lastSourceTriggeredPOWrite < 1000; // long enough threshold
+        const sourceTriggered = performance.now() - this.#lastSourceTriggeredPOWrite < this.#hmrDelayThreshold;
         const invalidatedModules = new Set();
         for (const adapter of adapters) {
-            const loc = adapter.catalogPathsToLocales[ctx.file];
+            const loc = adapter.catalogPathsToLocales.get(ctx.file);
             if (!sourceTriggered) {
                 await adapter.loadCatalogNCompile(loc, this.#hmrVersion);
             }
             for (const loadID of adapter.getLoadIDs()) {
-                const fileID = resolve(adapter.getCompiledFilePath(loc, loadID));
+                const fileID = normalizeSep(resolve(adapter.getCompiledFilePath(loc, loadID)));
                 for (const module of ctx.server.moduleGraph.getModulesByFile(fileID) ?? []) {
                     ctx.server.moduleGraph.invalidateModule(module, invalidatedModules, ctx.timestamp, false);
                 }
@@ -160,4 +158,4 @@ class Wuchale {
     };
     transform = { order: 'pre', handler: this.#transformHandler };
 }
-export const wuchale = (configPath) => new Wuchale(configPath);
+export const wuchale = (configPath, hmrDelayThreshold = 1000) => new Wuchale(configPath, hmrDelayThreshold);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/vite-plugin",
-    "version": "0.16.1",
+    "version": "0.16.3",
     "description": "Protobuf-like i18n from plain code: Vite plugin",
     "scripts": {
         "dev": "tsc --watch",
@@ -40,7 +40,7 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "wuchale": "^0.19.0"
+        "wuchale": "^0.19.3"
     },
     "devDependencies": {
         "typescript": "^5.9.3"