wuchale 0.22.4 → 0.22.6

package/dist/ai/index.js

@@ -67,11 +67,12 @@ export default class AIQueue {
         const logStart = this.#requestName(batch.id, batch.targetLocales);
         let translated = [];
         try {
-            const translatedstr = await this.ai.translate(JSON.stringify(batch.messages.map(item => ({
-                id: item.id,
+            const inputItems = batch.messages.map(item => ({
+                id: item.translations.get(this.sourceLocale),
                 context: item.context,
                 references: item.references,
-            }))), instruct(this.sourceLocale, batch.targetLocales));
+            }));
+            const translatedstr = await this.ai.translate(JSON.stringify(inputItems), instruct(this.sourceLocale, batch.targetLocales));
             translated = JSON.parse(translatedstr);
             if (Array.isArray(translated)) {
                 translated = translated.slice(0, batch.messages.length); // may return more

package/dist/handler/files.js

@@ -226,7 +226,7 @@ export class Files {
         return resolve(this.#localesDirAbs, generatedDir, `${ownerKey}.${id ?? ownerKey}.manifest.js`);
     }
     writeManifest = async (keys, id) => {
-        const content = `/** @type {(string | {text: string | string[], context?: string, isUrl?: boolean} | null)[]} */\n` +
+        const content = `/** @type {(string | string[] | {text: string | string[], context?: string, isUrl?: boolean})[]} */\n` +
             `export const keys = ${JSON.stringify(keys)}`;
         await this.#fs.write(this.getManifestFilePath(id), content);
     };

package/dist/handler/index.js

@@ -101,7 +101,7 @@ export class AdapterHandler {
             const isUrl = itemIsUrl(item);
             const id = item.translations.get(this.sourceLocale);
             const text = id.length === 1 ? id[0] : id;
-            if (!isUrl && item.context === undefined) {
+            if (!isUrl && item.context == null) {
                 manifest[index] = text;
                 continue;
             }
@@ -444,7 +444,7 @@ export class AdapterHandler {
             }
             const [hmrKeys, updatedItems] = await this.handleMessages(msgs, filename);
             updated = updatedItems;
-            if (msgs.length && hmrVersion >= 0) {
+            if (!forServer && msgs.length > 0 && hmrVersion >= 0) {
                 hmrData = { version: hmrVersion, data: {} };
                 for (const loc of this.#config.locales) {
                     hmrData.data[loc] =

package/dist/hub.js

@@ -115,6 +115,7 @@ export class Hub {
         const storage = adapter.storage({
             locales: this.#config.locales,
             root: this.#projectRoot,
+            localesDir: this.#config.localesDir,
             sourceLocale: sourceLocale,
             haveUrl: adapter.url != null,
             fs: this.#fs,
@@ -236,26 +237,24 @@ export class Hub {
             updated ||= (await Promise.all(filePaths.map(f => this.#visitFileHandl(f, handler)))).some(r => r);
         }
         // only owner adapter should clean
-        if (clean && handler.sharedState.ownerKey === handler.key) {
-            const logPrefix = logPrefixHandler(handler.key);
-            this.#log.info(`${logPrefix} Cleaning...`);
+        if (handler.sharedState.ownerKey === handler.key) {
             let cleaned = 0;
             for (const [key, item] of catalog) {
                 const initRefsN = item.references.length;
                 // check if file deleted or pattern no longer matches
                 item.references = item.references.filter(ref => existingFiles.has(ref.file));
-                if (itemIsObsolete(item)) {
-                    catalog.delete(key);
+                if (item.references.length < initRefsN) {
                     updated = true;
-                    cleaned++;
                 }
-                else if (item.references.length < initRefsN) {
-                    updated = true;
-                    cleaned++;
+                if (!clean || !itemIsObsolete(item)) {
+                    continue;
                 }
+                catalog.delete(key);
+                updated = true;
+                cleaned++;
             }
-            if (cleaned) {
-                this.#log.info(`${logPrefix} Cleaned ${cleaned} items`);
+            if (cleaned > 0) {
+                this.#log.info(`${logPrefixHandler(handler.key)} Cleaned ${cleaned} items`);
             }
         }
         if (updated) {

package/dist/pofile.js

@@ -230,6 +230,8 @@ export class POFile {
     }
 }
 export function pofile(pofOpts = {}) {
-    const pofOptsFull = deepMergeObjects(pofOpts, defaultOpts);
-    return opts => new POFile({ ...pofOptsFull, ...opts });
+    return opts => new POFile({
+        ...opts,
+        ...deepMergeObjects(pofOpts, { ...defaultOpts, dir: opts.localesDir }),
+    });
 }

package/dist/storage.d.ts

@@ -52,6 +52,8 @@ export type Catalog = Map<string, Item>;
 export type StorageFactoryOpts = {
     locales: string[];
     root: string;
+    /** shared locale artifacts directory from the top-level config */
+    localesDir: string;
     /** whether the url is configured, can use to load separate url files */
     haveUrl: boolean;
     sourceLocale: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.22.4",
+    "version": "0.22.6",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",
@@ -88,7 +88,7 @@
         "acorn": "^8.16.0",
         "chokidar": "^5.0.0",
         "magic-string": "^0.30.21",
-        "path-to-regexp": "^8.3.0",
+        "path-to-regexp": "^8.4.0",
         "picomatch": "^4.0.4",
         "pofile": "^1.1.4",
         "tinyglobby": "^0.2.15"