wuchale 0.23.0 → 0.23.2

package/dist/config.js

@@ -12,6 +12,9 @@ export const defaultConfig = {
 function deepFill(target, defaults) {
     for (const [key, def] of Object.entries(defaults)) {
         const value = target[key];
+        if (Array.isArray(value)) {
+            continue;
+        }
         if (!def || Array.isArray(def) || typeof def !== 'object') {
             if (value === undefined) {
                 target[key] = def;
@@ -19,7 +22,7 @@ function deepFill(target, defaults) {
             continue;
         }
         // def is an object. force prepare an object on the destination
-        if (!value || Array.isArray(value) || typeof value !== 'object') {
+        if (!value || typeof value !== 'object') {
             target[key] = {};
         }
         deepFill(target[key], def);

package/dist/handler/files.js

@@ -112,7 +112,7 @@ export class Files {
     getImportPath(filename, importer) {
         const relTo = importer ? resolve(this.#opts.root, importer) : filename;
         filename = normalizeSep(relative(dirname(relTo), filename));
-        if (!filename.startsWith('.')) {
+        if (!filename.startsWith('../') && !filename.startsWith('./')) {
             filename = `./${filename}`;
         }
         return filename;

package/dist/hub.js

@@ -59,6 +59,7 @@ export class Hub {
     #formatTransformErr = e => e;
     #hmrVersion = -1;
     #lastSourceTriggeredCatalogWrite = 0;
+    #lastAdapterForFile = new Map();
     constructor(opts) {
         this.#opts = opts;
         this.#handlers = opts.handlers;
@@ -197,24 +198,26 @@ export class Hub {
         }
         const filename = normalizeSep(relative(this.#opts.root, filePath));
         let output = null;
-        let lastAdapterKey = null;
         for (const adapter of this.#handlers.values()) {
-            if (adapter.fileMatches(filename)) {
-                if (lastAdapterKey != null) {
-                    throw new Error(`${logPrefix} ${filename} matches both adapters ${lastAdapterKey} and ${adapter.key}`);
-                }
-                try {
-                    output = await adapter.transform(code, filename, this.#hmrVersion, forServer);
-                }
-                catch (e) {
-                    throw this.#formatTransformErr(e, adapter.key, filename);
-                }
-                lastAdapterKey = adapter.key;
+            if (!adapter.fileMatches(filename)) {
+                continue;
             }
+            try {
+                output = await adapter.transform(code, filename, this.#hmrVersion, forServer);
+            }
+            catch (e) {
+                throw this.#formatTransformErr(e, adapter.key, filename);
+            }
+            break;
         }
         return output ?? [{}, false];
     };
     #visitFileHandl = async (filename, handler) => {
+        const lastAdapterKey = this.#lastAdapterForFile.get(filename);
+        if (lastAdapterKey && lastAdapterKey !== handler.key) {
+            this.#opts.log.warn(`${filename} matches both adapters '${lastAdapterKey}' and '${handler.key}'`);
+        }
+        this.#lastAdapterForFile.set(filename, handler.key);
         this.#opts.log.info(`${logPrefixHandler(handler.key)} Extract from ${color.cyan(filename)}`);
         const contents = await this.#opts.fs.read(resolve(this.#opts.root, filename));
         const [, updated] = await handler.transform(contents, filename);

package/package.json

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