@everymatrix/general-styling-wrapper 1.66.2 → 1.67.3

package/dist/cjs/general-styling-wrapper.cjs.entry.js

@@ -10,10 +10,15 @@ const mergeTranslations = (url, target) => {
             .then((res) => res.json())
             .then((data) => {
             Object.keys(data).forEach((item) => {
-                target[item] = target[item] ? target[item] : target['en'];
-                for (let key in data[item]) {
+                target[item] = target[item] || target['en'];
+                Object.keys(data[item]).forEach((key) => {
+                    //if there is not key in target, do nothing
+                    if (!target['en'][key]) {
+                        return;
+                    }
+                    // if the key is not in target, then take from en
+                    target[item][key] = target[item][key] || target['en'][key];
                     if (typeof data[item][key] === 'object') {
-                        target[item][key] = target[item][key] || target['en'][key];
                         Object.keys(data[item][key]).forEach((subKey) => {
                             target[item][key][subKey] = data[item][key][subKey];
                         });
@@ -21,7 +26,7 @@ const mergeTranslations = (url, target) => {
                     else {
                         target[item][key] = data[item][key];
                     }
-                }
+                });
             });
             resolve(true);
         });

package/dist/collection/utils/locale.utils.js

@@ -4,10 +4,15 @@ export const mergeTranslations = (url, target) => {
             .then((res) => res.json())
             .then((data) => {
             Object.keys(data).forEach((item) => {
-                target[item] = target[item] ? target[item] : target['en'];
-                for (let key in data[item]) {
+                target[item] = target[item] || target['en'];
+                Object.keys(data[item]).forEach((key) => {
+                    //if there is not key in target, do nothing
+                    if (!target['en'][key]) {
+                        return;
+                    }
+                    // if the key is not in target, then take from en
+                    target[item][key] = target[item][key] || target['en'][key];
                     if (typeof data[item][key] === 'object') {
-                        target[item][key] = target[item][key] || target['en'][key];
                         Object.keys(data[item][key]).forEach((subKey) => {
                             target[item][key][subKey] = data[item][key][subKey];
                         });
@@ -15,7 +20,7 @@ export const mergeTranslations = (url, target) => {
                     else {
                         target[item][key] = data[item][key];
                     }
-                }
+                });
             });
             resolve(true);
         });

package/dist/esm/general-styling-wrapper.entry.js

@@ -6,10 +6,15 @@ const mergeTranslations = (url, target) => {
             .then((res) => res.json())
             .then((data) => {
             Object.keys(data).forEach((item) => {
-                target[item] = target[item] ? target[item] : target['en'];
-                for (let key in data[item]) {
+                target[item] = target[item] || target['en'];
+                Object.keys(data[item]).forEach((key) => {
+                    //if there is not key in target, do nothing
+                    if (!target['en'][key]) {
+                        return;
+                    }
+                    // if the key is not in target, then take from en
+                    target[item][key] = target[item][key] || target['en'][key];
                     if (typeof data[item][key] === 'object') {
-                        target[item][key] = target[item][key] || target['en'][key];
                         Object.keys(data[item][key]).forEach((subKey) => {
                             target[item][key][subKey] = data[item][key][subKey];
                         });
@@ -17,7 +22,7 @@ const mergeTranslations = (url, target) => {
                     else {
                         target[item][key] = data[item][key];
                     }
-                }
+                });
             });
             resolve(true);
         });

package/dist/general-styling-wrapper/general-styling-wrapper.entry.js

@@ -1 +1 @@
-import{r as t,h as s,g as e}from"./index-5d1b44a7.js";const i=class{constructor(s){t(this,s),this.stylingAppends=!1,this.setClientStyling=()=>{let t=document.createElement("style");t.innerHTML=this.clientStyling,this.el.prepend(t)},this.setClientStylingURL=()=>{let t=new URL(this.clientStylingUrl),s=document.createElement("style");fetch(t.href).then((t=>t.text())).then((t=>{s.innerHTML=t,setTimeout((()=>{this.el.prepend(s)}),1)})).catch((t=>{console.log("error ",t)}))},this.clientStyling="",this.clientStylingUrl="",this.translationUrl="",this.targetTranslations=void 0}componentDidRender(){this.stylingAppends||(this.clientStyling&&this.setClientStyling(),this.clientStylingUrl&&this.setClientStylingURL(),this.stylingAppends=!0)}async componentWillLoad(){const t=[];if(this.translationUrl){const i=(s=this.translationUrl,e=this.targetTranslations,new Promise((t=>{fetch(s).then((t=>t.json())).then((s=>{Object.keys(s).forEach((t=>{e[t]=e[t]?e[t]:e.en;for(let i in s[t])"object"==typeof s[t][i]?(e[t][i]=e[t][i]||e.en[i],Object.keys(s[t][i]).forEach((o=>{e[t][i][o]=s[t][i][o]}))):e[t][i]=s[t][i]})),t(!0)}))})));t.push(i)}var s,e;return await Promise.all(t)}render(){return s("div",{key:"4d3414408c7662f88331dbe655966237f74d6958",class:"StyleShell"},s("slot",{key:"1d004644d84602c4314bdf5dfc26b55b160f57df",name:"mainContent"}))}get el(){return e(this)}};i.style=":host{display:block}";export{i as general_styling_wrapper}
+import{r as t,h as s,g as e}from"./index-5d1b44a7.js";const i=class{constructor(s){t(this,s),this.stylingAppends=!1,this.setClientStyling=()=>{let t=document.createElement("style");t.innerHTML=this.clientStyling,this.el.prepend(t)},this.setClientStylingURL=()=>{let t=new URL(this.clientStylingUrl),s=document.createElement("style");fetch(t.href).then((t=>t.text())).then((t=>{s.innerHTML=t,setTimeout((()=>{this.el.prepend(s)}),1)})).catch((t=>{console.log("error ",t)}))},this.clientStyling="",this.clientStylingUrl="",this.translationUrl="",this.targetTranslations=void 0}componentDidRender(){this.stylingAppends||(this.clientStyling&&this.setClientStyling(),this.clientStylingUrl&&this.setClientStylingURL(),this.stylingAppends=!0)}async componentWillLoad(){const t=[];if(this.translationUrl){const i=(s=this.translationUrl,e=this.targetTranslations,new Promise((t=>{fetch(s).then((t=>t.json())).then((s=>{Object.keys(s).forEach((t=>{e[t]=e[t]||e.en,Object.keys(s[t]).forEach((i=>{e.en[i]&&(e[t][i]=e[t][i]||e.en[i],"object"==typeof s[t][i]?Object.keys(s[t][i]).forEach((o=>{e[t][i][o]=s[t][i][o]})):e[t][i]=s[t][i])}))})),t(!0)}))})));t.push(i)}var s,e;return await Promise.all(t)}render(){return s("div",{key:"4d3414408c7662f88331dbe655966237f74d6958",class:"StyleShell"},s("slot",{key:"1d004644d84602c4314bdf5dfc26b55b160f57df",name:"mainContent"}))}get el(){return e(this)}};i.style=":host{display:block}";export{i as general_styling_wrapper}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/general-styling-wrapper",
-  "version": "1.66.2",
+  "version": "1.67.3",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.js",
   "es2015": "./dist/esm/index.mjs",