wuchale 0.22.3 → 0.22.5

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;
             }

package/dist/handler/state.d.ts

@@ -1,4 +1,3 @@
-import { type Matcher } from 'picomatch';
 import { IndexTracker } from '../adapters.js';
 import { type CompiledElement } from '../compile.js';
 import { type Catalog, type CatalogStorage, type PluralRules } from '../storage.js';
@@ -11,7 +10,6 @@ export type CompiledCatalogs = Map<string, Compiled>;
 export declare class SharedState {
     ownerKey: string;
     sourceLocale: string;
-    otherFileMatches: Matcher[];
     compiled: CompiledCatalogs;
     indexTracker: IndexTracker;
     storage: CatalogStorage;

package/dist/handler/state.js

@@ -1,4 +1,3 @@
-import {} from 'picomatch';
 import { getKey, IndexTracker } from '../adapters.js';
 import {} from '../compile.js';
 import { defaultPluralRule, fillTranslations } from '../storage.js';
@@ -25,7 +24,6 @@ function validatePluralRule(body) {
 export class SharedState {
     ownerKey;
     sourceLocale;
-    otherFileMatches = [];
     compiled = new Map();
     indexTracker = new IndexTracker();
     // storage

package/dist/hub.js

@@ -3,7 +3,6 @@
  */
 import { relative, resolve } from 'node:path';
 import { watch as watchFS } from 'chokidar';
-import {} from 'picomatch';
 import { glob } from 'tinyglobby';
 import { compileTranslation, isEquivalent } from './compile.js';
 import { defaultFS } from './fs.js';
@@ -67,7 +66,7 @@ export class Hub {
         const handlersByLoaderPath = new Map();
         for (const [key, adapter] of adaptersData) {
             const handler = new AdapterHandler(adapter, key, this.#config, this.#mode, this.#fs, this.#projectRoot, this.#log);
-            await handler.init(this.#getSharedState(adapter, key, handler.sourceLocale, handler.fileMatches));
+            await handler.init(this.#getSharedState(adapter, key, handler.sourceLocale));
             handler.onBeforeSave = () => {
                 this.#lastSourceTriggeredCatalogWrite = performance.now();
             };
@@ -112,10 +111,11 @@ export class Hub {
         this.#confUpdateFile = normalizeSep(confUpdateFileAbs);
         await this.#fs.write(this.#confUpdateFile, '{}'); // only watch changes so prepare first
     };
-    #getSharedState = (adapter, key, sourceLocale, fileMatches) => {
+    #getSharedState = (adapter, key, sourceLocale) => {
         const storage = adapter.storage({
             locales: this.#config.locales,
             root: this.#projectRoot,
+            localesDir: this.#config.localesDir,
             sourceLocale: sourceLocale,
             haveUrl: adapter.url != null,
             fs: this.#fs,
@@ -129,7 +129,6 @@ export class Hub {
             if (sharedState.sourceLocale !== sourceLocale) {
                 throw new Error(`${logPrefix} Adapters with different source locales (${sharedState.ownerKey} and ${key}) cannot share catalogs.`);
             }
-            sharedState.otherFileMatches.push(fileMatches);
         }
         return sharedState;
     };
@@ -215,8 +214,18 @@ export class Hub {
         const [, updated] = await handler.transform(contents, filename);
         return updated;
     };
-    async #directVisitHandler(handler, clean, sync) {
+    async #directVisitHandler(handler, clean, sync, existingFilesByOwner) {
         const filePaths = await glob(...globConfToArgs(handler.adapter.files, this.#projectRoot, this.#config.localesDir, handler.adapter.outDir));
+        let existingFiles = existingFilesByOwner.get(handler.sharedState.ownerKey);
+        if (existingFiles) {
+            for (const file of filePaths) {
+                existingFiles.add(file);
+            }
+        }
+        else {
+            existingFiles = new Set(filePaths);
+            existingFilesByOwner.set(handler.sharedState.ownerKey, existingFiles);
+        }
         const catalog = handler.sharedState.catalog;
         let updated = false;
         if (sync) {
@@ -228,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;
-                item.references = item.references.filter(ref => handler.fileMatches(ref.file) ||
-                    handler.sharedState.otherFileMatches.some(match => match(ref.file)));
+                // check if file deleted or pattern no longer matches
+                item.references = item.references.filter(ref => existingFiles.has(ref.file));
                 if (item.references.length < initRefsN) {
                     updated = true;
-                    cleaned++;
                 }
-                if (itemIsObsolete(item)) {
-                    catalog.delete(key);
-                    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) {
@@ -265,9 +272,9 @@ export class Hub {
             const bOwner = b.sharedState.ownerKey === b.key;
             return aOwner === bOwner ? 0 : aOwner ? 1 : -1;
         });
-        // separate loop to make sure that all otherFileMatchers are collected
+        const existingFilesByOwner = new Map();
         for (const handler of handlers) {
-            await this.#directVisitHandler(handler, clean, sync);
+            await this.#directVisitHandler(handler, clean, sync, existingFilesByOwner);
         }
         if (!watch) {
             this.#log.info('Extraction finished.');
@@ -320,9 +327,10 @@ export class Hub {
         const errors = [];
         const syncs = [];
         let checkedItems = 0;
+        const existingFilesByOwner = new Map();
         for (const handler of this.#handlers.values()) {
             const state = handler.sharedState;
-            if (full && (await this.#directVisitHandler(handler, true, false))) {
+            if (full && (await this.#directVisitHandler(handler, true, false, existingFilesByOwner))) {
                 syncs.push(handler.key);
             }
             if (state.ownerKey !== handler.key) {

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.3",
+    "version": "0.22.5",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",