wuchale 0.18.1 → 0.18.2

package/dist/adapter-vanilla/index.js

@@ -31,6 +31,9 @@ const defaultArgs = {
 };
 const resolveLoaderPath = loaderPathResolver(import.meta.url, '../../src/adapter-vanilla/loaders', 'js');
 export function getDefaultLoaderPath(loader, bundle) {
+    if (loader === 'custom') {
+        return null;
+    }
     if (bundle) {
         return resolveLoaderPath('bundle');
     }

package/dist/adapter-vanilla/transformer.js

@@ -396,12 +396,13 @@ export class Transformer {
             if (bodyStart == null) {
                 currentContent = this.mstr.toString();
             }
-            const msgsBod = this.visit(bod);
-            if (bodyStart == null && this.mstr.toString() !== currentContent) {
-                bodyStart = bod.start;
+            msgs.push(...this.visit(bod));
+            if (bodyStart != null) {
+                continue;
             }
-            if (msgsBod.length) {
-                msgs.push(...msgsBod);
+            // TODO: use deep return checks after using state passing to visitors
+            if (this.mstr.toString() !== currentContent || bod.type === 'IfStatement' && bod.consequent.type === 'BlockStatement' && bod.consequent.body.some(n => n.type === 'ReturnStatement')) {
+                bodyStart = bod.start;
             }
         }
         if (bodyStart) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.18.1",
+    "version": "0.18.2",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",
@@ -87,7 +87,7 @@
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@types/node": "^24.9.1",
+        "@types/node": "^24.10.0",
         "@types/picomatch": "^4.0.1",
         "typescript": "^5.9.3"
     },

package/src/adapter-vanilla/loaders/bundle.js

@@ -1,9 +1,7 @@
-// This is just the default loader.
-// You can customize it however you want, it will not be overwritten once it exists and is not empty.
-
 import toRuntime from "wuchale/runtime"
+import { locales } from '${DATA}'
 
-let locale = 'en'
+let locale = locales[0]
 
 /**
  * @param {string} newLocale

package/src/adapter-vanilla/loaders/server.js

@@ -1,10 +1,8 @@
-// This is just the default loader.
-// You can customize it however you want, it will not be overwritten once it exists and is not empty.
-
 import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
 import { locales } from '${DATA}'
 import { loadLocales } from 'wuchale/load-utils/server'
 
+export { loadIDs, loadCatalog }
 export const key = '${KEY}'
 
 // two exports

package/src/adapter-vanilla/loaders/vite.js

@@ -1,6 +1,3 @@
-// This is just the default loader.
-// You can customize it however you want, it will not be overwritten once it exists and is not empty.
-
 import { loadCatalog, loadIDs } from '${PROXY}'
 import { registerLoaders } from 'wuchale/load-utils'
 

package/src/adapter-vanilla/loaders/vite.ssr.js

@@ -1,6 +1,3 @@
-// This is just the default loader.
-// You can customize it however you want, it will not be overwritten once it exists and is not empty.
-
 import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
 import { currentRuntime } from 'wuchale/load-utils/server'