@wuchale/vite-plugin 0.15.7 → 0.16.1

package/dist/index.d.ts

@@ -9,6 +9,7 @@ type HotUpdateCtx = {
             invalidateModule: Function;
         };
     };
+    read: () => string | Promise<string>;
     timestamp: number;
 };
 declare class Wuchale {
@@ -25,7 +26,7 @@ declare class Wuchale {
     transform: {
         order: "pre";
         handler: (code: string, id: string, options?: {
-            ssr?: boolean;
+            ssr?: boolean | undefined;
         }) => Promise<{
             code?: string;
             map?: any;

package/dist/index.js

@@ -3,16 +3,16 @@ import { relative, resolve } from "node:path";
 import { platform } from "node:process";
 import { getConfig as getConfig, Logger, AdapterHandler } from "wuchale";
 const pluginName = 'wuchale';
+const confUpdateName = 'confUpdate.json';
 class Wuchale {
     name = pluginName;
     #config;
     #projectRoot = '';
-    #adapters = {};
-    #adaptersByLoaderPath = {};
-    #adaptersByCatalogPath = {};
+    #adapters = new Map();
+    #adaptersByConfUpdate = new Map();
+    #adaptersByCatalogPath = new Map();
     #granularLoadAdapters = [];
     #singleCompiledCatalogs = new Set();
-    #locales = [];
     #log;
     #mode;
     #configPath;
@@ -24,23 +24,24 @@ class Wuchale {
     #init = async () => {
         this.#config = await getConfig(this.#configPath);
         this.#log = new Logger(this.#config.logLevel);
-        this.#locales = [this.#config.sourceLocale, ...this.#config.otherLocales];
-        if (Object.keys(this.#config.adapters).length === 0) {
+        const adaptersData = Object.entries(this.#config.adapters);
+        if (adaptersData.length === 0) {
             throw Error('At least one adapter is needed.');
         }
-        const sharedState = {};
-        for (const [key, adapter] of Object.entries(this.#config.adapters)) {
+        const sharedState = new Map();
+        const adaptersByLoaderPath = new Map();
+        for (const [key, adapter] of adaptersData) {
             const handler = new AdapterHandler(adapter, key, this.#config, this.#mode, this.#projectRoot, this.#log);
             await handler.init(sharedState);
             handler.onBeforeWritePO = () => {
                 this.#lastSourceTriggeredPOWrite = performance.now();
             };
-            this.#adapters[key] = handler;
+            this.#adapters.set(key, handler);
             if (adapter.granularLoad) {
                 this.#granularLoadAdapters.push(handler);
             }
             else {
-                for (const locale of this.#locales) {
+                for (const locale of this.#config.locales) {
                     this.#singleCompiledCatalogs.add(resolve(handler.getCompiledFilePath(locale, null)));
                 }
             }
@@ -50,8 +51,8 @@ class Wuchale {
                     // seems vite does this for the importer field in the resolveId hook
                     loaderPath = loaderPath.replaceAll('\\', '/');
                 }
-                if (loaderPath in this.#adaptersByLoaderPath) {
-                    const otherKey = this.#adaptersByLoaderPath[loaderPath].key;
+                if (adaptersByLoaderPath.has(loaderPath)) {
+                    const otherKey = adaptersByLoaderPath.get(loaderPath)?.key;
                     if (otherKey === key) {
                         // same loader for both ssr and client, no problem
                         continue;
@@ -62,12 +63,18 @@ class Wuchale {
                         'Specify a different loaderPath for one of them.'
                     ].join('\n'));
                 }
-                this.#adaptersByLoaderPath[loaderPath] = handler;
+                adaptersByLoaderPath.set(loaderPath, handler);
             }
             for (const fname of Object.keys(handler.catalogPathsToLocales)) {
-                this.#adaptersByCatalogPath[fname] ??= [];
-                this.#adaptersByCatalogPath[fname].push(handler);
+                const handlers = this.#adaptersByCatalogPath.get(fname);
+                if (handlers) {
+                    handlers.push(handler);
+                }
+                else {
+                    this.#adaptersByCatalogPath.set(fname, [handler]);
+                }
             }
+            this.#adaptersByConfUpdate.set(resolve(adapter.localesDir, confUpdateName), handler);
         }
     };
     configResolved = async (config) => {
@@ -81,11 +88,18 @@ class Wuchale {
         await this.#init();
     };
     handleHotUpdate = async (ctx) => {
+        if (this.#adaptersByConfUpdate.has(ctx.file)) {
+            const update = JSON.parse(await ctx.read());
+            console.log(`${pluginName}: config update received:`, update);
+            this.#config.hmr = update.hmr;
+            return [];
+        }
         if (!this.#config.hmr) {
             return;
         }
         // This is mainly to make sure that PO catalog changes result in a page reload with new catalogs
-        if (!(ctx.file in this.#adaptersByCatalogPath)) {
+        const adapters = this.#adaptersByCatalogPath.get(ctx.file);
+        if (adapters == null) {
             // prevent reloading whole app because of a change in compiled catalog
             // triggered by extraction from single file, hmr handled by embedding patch
             if (this.#singleCompiledCatalogs.has(ctx.file)) {
@@ -93,7 +107,7 @@ class Wuchale {
             }
             // for granular as well
             for (const adapter of this.#granularLoadAdapters) {
-                for (const loc of this.#locales) {
+                for (const loc of this.#config.locales) {
                     for (const id in adapter.granularStateByID) {
                         if (resolve(adapter.getCompiledFilePath(loc, id)) === ctx.file) {
                             return [];
@@ -107,7 +121,7 @@ class Wuchale {
         // catalog changed
         const sourceTriggered = performance.now() - this.#lastSourceTriggeredPOWrite < 1000; // long enough threshold
         const invalidatedModules = new Set();
-        for (const adapter of this.#adaptersByCatalogPath[ctx.file]) {
+        for (const adapter of adapters) {
             const loc = adapter.catalogPathsToLocales[ctx.file];
             if (!sourceTriggered) {
                 await adapter.loadCatalogNCompile(loc, this.#hmrVersion);
@@ -128,8 +142,16 @@ class Wuchale {
         if (this.#mode === 'dev' && !this.#config.hmr) {
             return {};
         }
-        const filename = relative(this.#projectRoot, id);
-        for (const adapter of Object.values(this.#adapters)) {
+        let filename = relative(this.#projectRoot, id);
+        const queryIndex = filename.indexOf('?');
+        if (queryIndex >= 0) {
+            const query = new URLSearchParams(filename.slice(queryIndex));
+            if (query.size === 1 && query.has('v')) {
+                // trim after this, like ?v=b65b2c3b when it's from node_modules
+                filename = filename.slice(0, queryIndex);
+            }
+        }
+        for (const adapter of this.#adapters.values()) {
             if (adapter.fileMatches(filename)) {
                 return await adapter.transform(code, filename, this.#hmrVersion, options?.ssr);
             }

package/package.json

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