intor-translator 1.6.1 → 1.6.2

package/dist/index.cjs

@@ -226,6 +226,28 @@ var resolveLocales = rura.rura.createHook(
 );
 
 // src/shared/utils/find-message-in-locales.ts
+function findMessageByPath(candidate, segments, start = 0) {
+  if (start >= segments.length) {
+    return candidate;
+  }
+  if (candidate === null || typeof candidate !== "object") {
+    return void 0;
+  }
+  const objectCandidate = candidate;
+  for (let end = segments.length; end > start; end--) {
+    const segment = segments.slice(start, end).join(".");
+    if (!(segment in objectCandidate)) continue;
+    const next = objectCandidate[segment];
+    if (end === segments.length) {
+      return next;
+    }
+    const resolved = findMessageByPath(next, segments, end);
+    if (resolved !== void 0) {
+      return resolved;
+    }
+  }
+  return void 0;
+}
 var findMessageInLocales = ({
   messages,
   candidateLocales,
@@ -234,19 +256,7 @@ var findMessageInLocales = ({
   for (const locale of candidateLocales) {
     const messagesForLocale = messages[locale];
     if (!messagesForLocale) continue;
-    if (key in messagesForLocale) {
-      return messagesForLocale[key];
-    }
-    let candidate = messagesForLocale;
-    const keys = key.split(".");
-    for (const key2 of keys) {
-      if (candidate !== null && typeof candidate === "object" && key2 in candidate) {
-        candidate = candidate[key2];
-      } else {
-        candidate = void 0;
-        break;
-      }
-    }
+    const candidate = findMessageByPath(messagesForLocale, key.split("."));
     if (candidate !== void 0) {
       return candidate;
     }

package/dist/index.js

@@ -225,6 +225,28 @@ var resolveLocales = rura.createHook(
 );
 
 // src/shared/utils/find-message-in-locales.ts
+function findMessageByPath(candidate, segments, start = 0) {
+  if (start >= segments.length) {
+    return candidate;
+  }
+  if (candidate === null || typeof candidate !== "object") {
+    return void 0;
+  }
+  const objectCandidate = candidate;
+  for (let end = segments.length; end > start; end--) {
+    const segment = segments.slice(start, end).join(".");
+    if (!(segment in objectCandidate)) continue;
+    const next = objectCandidate[segment];
+    if (end === segments.length) {
+      return next;
+    }
+    const resolved = findMessageByPath(next, segments, end);
+    if (resolved !== void 0) {
+      return resolved;
+    }
+  }
+  return void 0;
+}
 var findMessageInLocales = ({
   messages,
   candidateLocales,
@@ -233,19 +255,7 @@ var findMessageInLocales = ({
   for (const locale of candidateLocales) {
     const messagesForLocale = messages[locale];
     if (!messagesForLocale) continue;
-    if (key in messagesForLocale) {
-      return messagesForLocale[key];
-    }
-    let candidate = messagesForLocale;
-    const keys = key.split(".");
-    for (const key2 of keys) {
-      if (candidate !== null && typeof candidate === "object" && key2 in candidate) {
-        candidate = candidate[key2];
-      } else {
-        candidate = void 0;
-        break;
-      }
-    }
+    const candidate = findMessageByPath(messagesForLocale, key.split("."));
     if (candidate !== void 0) {
       return candidate;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor-translator",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "The Intor translation engine",
   "author": {
     "name": "Yiming Liao",