@websolutespa/bom-core 1.8.0 → 1.8.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @websolutespa/bom-core
 
+## 1.8.1
+
+### Patch Changes
+
+- Modified: Market & Language
+
 ## 1.8.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -306,9 +306,9 @@ type ILocale = IEntity & {
 type IMarket = IEntity & {
     id: string;
     title?: string;
-    countries?: string[];
-    languages?: string[];
-    defaultLanguage?: string;
+    countries?: string[] | IEntity[];
+    languages?: string[] | IEntity[];
+    defaultLanguage?: string | IEntity;
     isActive?: boolean;
     isDefault?: boolean;
     isHidden?: boolean;

package/dist/index.js

@@ -1345,7 +1345,7 @@ function collectRoutes(store, categories, markets, locales) {
         if (rootCategory && item.category === rootCategory.id) {
           const defaultLocale2 = locales.find((x) => x.isDefault) || locales[0];
           const defaultMarket2 = markets.find((x) => x.isDefault) || markets[0];
-          const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? defaultMarket2.defaultLanguage : defaultLocale2.id;
+          const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
           const title = localize(item.title, defaultMarketLocale);
           const pickedProps = getPickedProps(item);
           const route = {
@@ -1387,7 +1387,7 @@ function eachMarketLocale(markets, locales, callback) {
   locales = locales.filter((x) => x.isActive !== false);
   markets = markets.filter((x) => x.isActive !== false);
   markets.forEach((market) => {
-    const marketLocales = market.languages && market.languages.length > 0 ? market.languages.map((id) => locales.find((x) => x.id === id)).filter((x) => x !== void 0) : locales;
+    const marketLocales = market.languages && market.languages.length > 0 ? market.languages.map((idOrEntity) => locales.find((x) => x.id === asEntityId(idOrEntity))).filter((x) => x !== void 0) : locales;
     marketLocales.forEach((locale) => {
       callback(market, locale, markets, locales);
     });

package/dist/index.mjs

@@ -1202,7 +1202,7 @@ function collectRoutes(store, categories, markets, locales) {
         if (rootCategory && item.category === rootCategory.id) {
           const defaultLocale2 = locales.find((x) => x.isDefault) || locales[0];
           const defaultMarket2 = markets.find((x) => x.isDefault) || markets[0];
-          const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? defaultMarket2.defaultLanguage : defaultLocale2.id;
+          const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
           const title = localize(item.title, defaultMarketLocale);
           const pickedProps = getPickedProps(item);
           const route = {
@@ -1244,7 +1244,7 @@ function eachMarketLocale(markets, locales, callback) {
   locales = locales.filter((x) => x.isActive !== false);
   markets = markets.filter((x) => x.isActive !== false);
   markets.forEach((market) => {
-    const marketLocales = market.languages && market.languages.length > 0 ? market.languages.map((id) => locales.find((x) => x.id === id)).filter((x) => x !== void 0) : locales;
+    const marketLocales = market.languages && market.languages.length > 0 ? market.languages.map((idOrEntity) => locales.find((x) => x.id === asEntityId(idOrEntity))).filter((x) => x !== void 0) : locales;
     marketLocales.forEach((locale) => {
       callback(market, locale, markets, locales);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",