wuchale 0.18.2 → 0.18.3

package/dist/handler.js

@@ -1,4 +1,4 @@
-import { basename, dirname, isAbsolute, resolve, normalize, relative, join } from 'node:path';
+import { dirname, isAbsolute, resolve, normalize, relative, join } from 'node:path';
 import { platform } from 'node:process';
 import { glob } from "tinyglobby";
 import { IndexTracker, Message } from "./adapters.js";
@@ -184,14 +184,24 @@ export class AdapterHandler {
         const ownerKey = this.sharedState.ownerKey;
         return join(this.#generatedDir, `${ownerKey}.${id ?? ownerKey}.${loc}.compiled.js`);
     }
-    #getCompiledImport(loc, id) {
-        return './' + basename(this.getCompiledFilePath(loc, id));
+    #getImportPath(filename, importer) {
+        filename = relative(dirname(importer ?? filename), filename);
+        if (platform === 'win32') {
+            filename = filename.replaceAll('\\', '/');
+        }
+        if (!filename.startsWith('.')) {
+            filename = `./${filename}`;
+        }
+        return filename;
     }
     getLoadIDs(forImport = false) {
         const loadIDs = [];
         if (this.#adapter.granularLoad) {
-            for (const loadID in this.granularStateByID) {
-                loadIDs.push(loadID);
+            for (const state of Object.values(this.granularStateByID)) {
+                // only the ones with ready messages
+                if (state.compiled[this.#config.sourceLocale].items.length) {
+                    loadIDs.push(state.id);
+                }
             }
         }
         else if (forImport) {
@@ -209,13 +219,14 @@ export class AdapterHandler {
         for (const [i, id] of loadIDs.entries()) {
             const importsByLocale = [];
             for (const loc of this.#locales) {
-                importsByLocale.push(`${objKeyLocale(loc)}: () => import('${this.#getCompiledImport(loc, loadIDsImport[i])}')`);
+                importsByLocale.push(`${objKeyLocale(loc)}: () => import('${this.#getImportPath(this.getCompiledFilePath(loc, loadIDsImport[i]))}')`);
             }
             imports.push(`${id}: {${importsByLocale.join(',')}}`);
         }
         return `
+            /** @type {{[loadID: string]: {[locale: string]: () => Promise<import('wuchale/runtime').CatalogModule>}}} */
             const catalogs = {${imports.join(',')}}
-            export const loadCatalog = (loadID, locale) => catalogs[loadID][locale]()
+            export const loadCatalog = (/** @type {string} */ loadID, /** @type {string} */ locale) => catalogs[loadID][locale]()
             export const loadIDs = ['${loadIDs.join("', '")}']
         `;
     }
@@ -228,15 +239,16 @@ export class AdapterHandler {
             const importedByLocale = [];
             for (const [i, loc] of this.#locales.entries()) {
                 const locKey = `_w_c_${id}_${i}_`;
-                imports.push(`import * as ${locKey} from '${this.#getCompiledImport(loc, loadIDsImport[il])}'`);
+                imports.push(`import * as ${locKey} from '${this.#getImportPath(this.getCompiledFilePath(loc, loadIDsImport[il]))}'`);
                 importedByLocale.push(`${objKeyLocale(loc)}: ${locKey}`);
             }
             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 = (loadID, locale) => catalogs[loadID][locale]
+            export const loadCatalog = (/** @type {string} */ loadID, /** @type {string} */ locale) => catalogs[loadID][locale]
             export const loadIDs = ['${loadIDs.join("', '")}']
         `;
     }
@@ -472,6 +484,7 @@ export class AdapterHandler {
             ${module}
             // only during dev, for HMR
             let latestVersion = ${hmrVersion}
+            // @ts-ignore
             export function update({ version, data }) {
                 if (latestVersion >= version) {
                     return
@@ -685,17 +698,6 @@ export class AdapterHandler {
         `;
     };
     #prepareHeader = (filename, loadID, hmrData, forServer) => {
-        let loaderRelTo = filename;
-        if (this.#adapter.outDir) {
-            loaderRelTo = resolve(this.#adapter.outDir + '/' + filename);
-        }
-        let loaderPath = relative(dirname(loaderRelTo), forServer ? this.loaderPath.server : this.loaderPath.client);
-        if (platform === 'win32') {
-            loaderPath = loaderPath.replaceAll('\\', '/');
-        }
-        if (!loaderPath.startsWith('.')) {
-            loaderPath = `./${loaderPath}`;
-        }
         let head = [];
         let getFuncImportPlain = getFuncPlain;
         let getFuncImportReactive = getFuncReactive;
@@ -705,6 +707,11 @@ export class AdapterHandler {
             getFuncImportReactive += 'hmr_';
             head.push(this.#hmrUpdateFunc(getFuncPlain, getFuncImportPlain), this.#hmrUpdateFunc(getFuncReactive, getFuncImportReactive));
         }
+        let loaderRelTo = filename;
+        if (this.#adapter.outDir) {
+            loaderRelTo = resolve(this.#adapter.outDir + '/' + filename);
+        }
+        const loaderPath = this.#getImportPath(forServer ? this.loaderPath.server : this.loaderPath.client, loaderRelTo);
         const importsFuncs = [
             `${loaderImportGetRuntime} as ${getFuncImportPlain}`,
             `${loaderImportGetRuntimeRx} as ${getFuncImportReactive}`,
@@ -720,7 +727,7 @@ export class AdapterHandler {
         const objElms = [];
         for (const [i, loc] of this.#locales.entries()) {
             const locKW = `_w_c_${i}_`;
-            const importFrom = relative(dirname(loaderRelTo), this.#getCompiledImport(loc, loadID));
+            const importFrom = this.#getImportPath(this.getCompiledFilePath(loc, loadID), loaderRelTo);
             imports.push(`import * as ${locKW} from '${importFrom}'`);
             objElms.push(`${objKeyLocale(loc)}: ${locKW}`);
         }

package/dist/runtime.d.ts

@@ -3,7 +3,7 @@ export declare const catalogVarName: "c";
 export type CatalogModule = {
     [catalogVarName]: CompiledElement[];
     p?: (n: number) => number;
-    update?: (callback: (newData: CompiledElement[]) => void) => void;
+    update?: Function;
 };
 declare let onInvalidFunc: (i: number, c: CompiledElement[]) => string;
 export declare function onInvalid(newOnInvalid: typeof onInvalidFunc): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.18.2",
+    "version": "0.18.3",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",