wuchale 0.22.2 → 0.22.4

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,7 +111,7 @@ 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,
@@ -129,7 +128,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;
     };
@@ -139,7 +137,9 @@ export class Hub {
             const updateTxt = await read();
             const update = JSON.parse(updateTxt);
             this.#log.info(`${logPrefix} config update received: ${color.cyan(updateTxt)}`);
-            this.#config.hmr = update.hmr;
+            if (update.hmr !== undefined) {
+                this.#config.hmr = update.hmr;
+            }
             return ignoreChange;
         }
         if (!this.#config.hmr) {
@@ -213,8 +213,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) {
@@ -232,14 +242,14 @@ export class Hub {
             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)));
-                if (item.references.length < initRefsN) {
+                // 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);
                     updated = true;
                     cleaned++;
                 }
-                if (itemIsObsolete(item)) {
-                    catalog.delete(key);
+                else if (item.references.length < initRefsN) {
                     updated = true;
                     cleaned++;
                 }
@@ -263,9 +273,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.');
@@ -318,9 +328,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/package.json

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