x4js 1.5.33 → 1.5.34

package/lib/esm/index.mjs

@@ -402,23 +402,57 @@ function addTranslation(name, ...parts) {
   }
   const lang = languages[name];
   parts.forEach((p) => {
-    _patch(lang.src_translations, p, lang.base);
+    _patch(lang.src_translations, p);
   });
-  lang.translations = _mk_proxy(lang.src_translations, lang.base, true);
+  lang.translations = _proxyfy(lang.src_translations, lang.base, true);
 }
 __name(addTranslation, "addTranslation");
-function _patch(obj, by, def) {
+function _patch(obj, by) {
   for (let n in by) {
-    if (obj[n] instanceof Object) {
-      _patch(obj[n], by[n], def);
-    } else {
-      obj[n] = by[n];
-      obj[n] = _mk_proxy(obj[n], def, false);
+    const src = by[n];
+    if (typeof src === "string") {
+      obj[n] = src;
+    } else {
+      if (Array.isArray(src) && (!obj[n] || !Array.isArray(obj[n]))) {
+        obj[n] = [...src];
+      } else if (!obj[n] || typeof obj[n] !== "object") {
+        obj[n] = { ...src };
+      } else {
+        _patch(obj[n], by[n]);
+      }
     }
   }
-  return obj;
 }
 __name(_patch, "_patch");
+function _proxyfy(obj, base, root) {
+  const result = {};
+  for (const n in obj) {
+    if (typeof obj[n] !== "string" && !Array.isArray(obj[n])) {
+      result[n] = _proxyfy(obj[n], base, false);
+    } else {
+      result[n] = obj[n];
+    }
+  }
+  return _mk_proxy(result, base, root);
+}
+__name(_proxyfy, "_proxyfy");
+function _mk_proxy(obj, base, root) {
+  return new Proxy(obj, {
+    get: (target, prop) => {
+      if (root) {
+        req_path = [prop];
+      } else {
+        req_path.push(prop);
+      }
+      let value = target[prop];
+      if (value === void 0 && base) {
+        value = _findBaseTrans(base);
+      }
+      return value;
+    }
+  });
+}
+__name(_mk_proxy, "_mk_proxy");
 var req_path;
 function _findBaseTrans(base) {
   while (base) {
@@ -441,24 +475,6 @@ function _findBaseTrans(base) {
   return void 0;
 }
 __name(_findBaseTrans, "_findBaseTrans");
-function _mk_proxy(obj, base, root) {
-  return new Proxy(obj, {
-    get: (target, prop) => {
-      if (root) {
-        req_path = [prop];
-      } else {
-        req_path.push(prop);
-      }
-      let value = target[prop];
-      if (value === void 0 && base) {
-        value = _findBaseTrans(base);
-        target[prop] = value;
-      }
-      return value;
-    }
-  });
-}
-__name(_mk_proxy, "_mk_proxy");
 var _tr = {};
 function selectLanguage(name) {
   if (!isLanguage(name)) {
@@ -15711,7 +15727,7 @@ function setupWSMessaging(closeCB) {
 __name(setupWSMessaging, "setupWSMessaging");
 
 // src/version.ts
-var x4js_version = "1.5.33";
+var x4js_version = "1.5.34";
 export {
   AbsLayout,
   Application,