@wuchale/vite-plugin 0.14.7 → 0.15.0

package/dist/index.d.ts

@@ -22,8 +22,6 @@ declare class Wuchale {
         root: string;
     }) => Promise<void>;
     handleHotUpdate: (ctx: HotUpdateCtx) => Promise<any[]>;
-    resolveId: (source: string, importer?: string) => string;
-    load: (id: string) => string;
     transform: {
         order: "pre";
         handler: (code: string, id: string, options?: {

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 virtualPrefix = `virtual:${pluginName}/`;
-const virtualResolvedPrefix = '\0';
 class Wuchale {
     name = pluginName;
     #config;
-    #locales = [];
     #projectRoot = '';
     #adapters = {};
     #adaptersByLoaderPath = {};
     #adaptersByCatalogPath = {};
+    #granularLoadAdapters = [];
+    #singleCompiledCatalogs = new Set();
+    #locales = [];
     #log;
     #configPath;
     #hmrVersion = -1;
@@ -22,19 +22,27 @@ class Wuchale {
     }
     #init = async (mode) => {
         this.#config = await getConfig(this.#configPath);
-        this.#locales = [this.#config.sourceLocale, ...this.#config.otherLocales];
         this.#log = new Logger(this.#config.logLevel);
+        this.#locales = [this.#config.sourceLocale, ...this.#config.otherLocales];
         if (Object.keys(this.#config.adapters).length === 0) {
             throw Error('At least one adapter is needed.');
         }
         const sharedState = {};
         for (const [key, adapter] of Object.entries(this.#config.adapters)) {
-            const handler = new AdapterHandler(adapter, key, this.#config, mode, virtualPrefix, this.#projectRoot, this.#log);
+            const handler = new AdapterHandler(adapter, key, this.#config, mode, this.#projectRoot, this.#log);
             await handler.init(sharedState);
             handler.onBeforeWritePO = () => {
                 this.#lastSourceTriggeredPOWrite = performance.now();
             };
             this.#adapters[key] = handler;
+            if (adapter.granularLoad) {
+                this.#granularLoadAdapters.push(handler);
+            }
+            else {
+                for (const locale of this.#locales) {
+                    this.#singleCompiledCatalogs.add(resolve(handler.getCompiledFilePath(locale, null)));
+                }
+            }
             for (const path of Object.values(handler.loaderPath)) {
                 let loaderPath = resolve(path);
                 if (platform === 'win32') {
@@ -67,13 +75,25 @@ class Wuchale {
             mode = 'dev';
         }
         else {
-            mode = 'prod';
+            mode = 'build';
         }
         this.#projectRoot = config.root;
         await this.#init(mode);
     };
     handleHotUpdate = async (ctx) => {
         if (!(ctx.file in this.#adaptersByCatalogPath)) {
+            if (this.#singleCompiledCatalogs.has(ctx.file)) {
+                return [];
+            }
+            for (const adapter of this.#granularLoadAdapters) {
+                for (const loc of this.#locales) {
+                    for (const id in adapter.granularStateByID) {
+                        if (resolve(adapter.getCompiledFilePath(loc, id)) === id) {
+                            return [];
+                        }
+                    }
+                }
+            }
             this.#hmrVersion++;
             return;
         }
@@ -85,7 +105,7 @@ class Wuchale {
                 await adapter.loadCatalogNCompile(loc);
             }
             for (const loadID of adapter.getLoadIDs()) {
-                const fileID = `${virtualResolvedPrefix}${adapter.virtModEvent(loc, loadID)}`;
+                const fileID = resolve(adapter.getCompiledFilePath(loc, loadID));
                 for (const module of ctx.server.moduleGraph.getModulesByFile(fileID) ?? []) {
                     ctx.server.moduleGraph.invalidateModule(module, invalidatedModules, ctx.timestamp, false);
                 }
@@ -96,46 +116,6 @@ class Wuchale {
             return [];
         }
     };
-    resolveId = (source, importer) => {
-        if (!source.startsWith(virtualPrefix)) {
-            return null;
-        }
-        return `${virtualResolvedPrefix}${source}?importer=${importer}`;
-    };
-    load = (id) => {
-        const prefix = virtualResolvedPrefix + virtualPrefix;
-        if (!id.startsWith(prefix)) {
-            return null;
-        }
-        const [path, importer] = id.slice(prefix.length).split('?importer=');
-        const [part, ...rest] = path.split('/');
-        if (part === 'catalog') {
-            const [adapterKey, loadID, locale] = rest;
-            const adapter = this.#adapters[adapterKey];
-            if (adapter == null) {
-                this.#log.error(`Adapter not found for key: ${adapterKey}`);
-                return null;
-            }
-            return adapter.loadCatalogModule(locale, loadID, this.#hmrVersion);
-        }
-        if (part === 'locales') {
-            return `export const locales = ['${this.#locales.join("', '")}']`;
-        }
-        if (part !== 'proxy') {
-            this.#log.error(`Unknown virtual request: ${id}`);
-            return null;
-        }
-        // loader proxy
-        const adapter = this.#adaptersByLoaderPath[importer];
-        if (adapter == null) {
-            this.#log.error(`Adapter not found for filename: ${importer}`);
-            return;
-        }
-        if (rest[0] === 'sync') {
-            return adapter.getProxySync();
-        }
-        return adapter.getProxy();
-    };
     #transformHandler = async (code, id, options) => {
         if (!this.#config.hmr) {
             return {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/vite-plugin",
-    "version": "0.14.7",
+    "version": "0.15.0",
     "description": "Protobuf-like i18n from plain code: Vite plugin",
     "scripts": {
         "dev": "tsc --watch",
@@ -40,10 +40,10 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "wuchale": "^0.17.0"
+        "wuchale": "^0.18.0"
     },
     "devDependencies": {
-        "typescript": "^5.8.3"
+        "typescript": "^5.9.3"
     },
     "type": "module"
 }