@websolutespa/bom-mixer-store 1.7.9 → 1.8.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.0
+
+### Minor Changes
+
+- f8a1d97: Modified: extracted all website sample components & features
+
+### Patch Changes
+
+- Updated dependencies [f8a1d97]
+  - @websolutespa/bom-core@1.8.0
+
 ## 1.7.9
 
 ### Patch Changes

package/dist/index.js

@@ -476,7 +476,9 @@ function decorateMenuRoute_(item) {
   return decoratedItem;
 }
 async function decorateMenuPage_(item, routes, store, params = {}) {
-  const id = (0, import_bom_core3.isEquatable)(item.page.value) ? item.page.value : item.page.value.id;
+  const values = Array.isArray(item.page.value) ? item.page.value : [item.page.value];
+  const value = values[0];
+  const id = (0, import_bom_core3.isEquatable)(value) ? value : value.id;
   const route = routes.find(
     (x) => x.schema === item.page.relationTo && x.page === id
   );
@@ -562,17 +564,12 @@ function decorateNav__(item, routes) {
 }
 
 // src/decorators/optimize.ts
-var import_bom_core5 = require("@websolutespa/bom-core");
 async function optimizeOne_(item) {
   const validEntries = Object.entries(item).filter(([key, value]) => {
     switch (key) {
       case "components":
       case "meta":
         return false;
-      default:
-        if ((0, import_bom_core5.isUnresolvedRelation)(value) || Array.isArray(value) && value.reduce((p, c) => p && (0, import_bom_core5.isUnresolvedRelation)(c), true)) {
-          return false;
-        }
     }
     return true;
   });
@@ -588,7 +585,7 @@ async function optimizeMany_(items) {
 }
 
 // src/decorators/relation.ts
-var import_bom_core6 = require("@websolutespa/bom-core");
+var import_bom_core5 = require("@websolutespa/bom-core");
 var SERVICE_DEFAULT_DEPTH = 3;
 async function decorateRelation_(store, item, params = {}) {
   const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
@@ -605,7 +602,7 @@ async function decorateRelations_(store, items, params = {}) {
   return items;
 }
 async function collectRelations_(context, item, relations = []) {
-  if ((0, import_bom_core6.isUnresolvedRelation)(item)) {
+  if ((0, import_bom_core5.isUnresolvedRelation)(item)) {
     const index = relations.findIndex(
       (x) => x.relationTo === item.relationTo && x.value === item.value
     );
@@ -634,13 +631,13 @@ async function collectRelations_(context, item, relations = []) {
     } else {
       return relations[index].resolvedValue;
     }
-  } else if ((0, import_bom_core6.isArray)(item)) {
+  } else if ((0, import_bom_core5.isArray)(item)) {
     const items = [];
     for (let i = 0; i < item.length; i++) {
       items[i] = await collectRelations_(context, item[i], relations);
     }
     return items;
-  } else if ((0, import_bom_core6.isObject)(item)) {
+  } else if ((0, import_bom_core5.isObject)(item)) {
     for (const [key, value] of Object.entries(item)) {
       item[key] = await collectRelations_(context, value, relations);
     }
@@ -659,12 +656,12 @@ async function decorateSchemas_(store, items, schema) {
 }
 
 // src/local/local.api.ts
-var import_bom_core7 = require("@websolutespa/bom-core");
+var import_bom_core6 = require("@websolutespa/bom-core");
 var API_URL = process.env.NEXT_PUBLIC_URL === "https://" ? process.env.NEXT_PUBLIC_MOCK_FALLBACK_URL : process.env.NEXT_PUBLIC_URL;
 var API_BASE = process.env.NEXT_PUBLIC_API || "/api";
 function getLocalApiUrl(pathname) {
-  let url = `${import_bom_core7.isBrowser ? window.location.origin : API_URL}${API_BASE}${pathname}`;
-  url = import_bom_core7.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  let url = `${import_bom_core6.isBrowser ? window.location.origin : API_URL}${API_BASE}${pathname}`;
+  url = import_bom_core6.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
   return url;
 }
 async function localApiFetch(pathname, options = {}, serviceOptions) {
@@ -673,9 +670,9 @@ async function localApiFetch(pathname, options = {}, serviceOptions) {
     url.searchParams.append("locale", serviceOptions.locale);
     url.searchParams.append("market", serviceOptions.market);
   }
-  const apiOptions = (0, import_bom_core7.merge)({ ...getLocalApiRequestOptions() }, options);
+  const apiOptions = (0, import_bom_core6.merge)({ ...getLocalApiRequestOptions() }, options);
   console.log("localApiFetch", apiOptions.method, url.href);
-  const apiResponse = await (0, import_bom_core7.httpFetch)(url.href, apiOptions);
+  const apiResponse = await (0, import_bom_core6.httpFetch)(url.href, apiOptions);
   return apiResponse;
 }
 async function localApiGet(url, options = {}, serviceOptions) {
@@ -714,8 +711,8 @@ function isApiRequest(request) {
 }
 
 // src/mock/mock.service.ts
-var import_bom_core8 = require("@websolutespa/bom-core");
-var MockService = class extends import_bom_core8.JsonService {
+var import_bom_core7 = require("@websolutespa/bom-core");
+var MockService = class extends import_bom_core7.JsonService {
   constructor(items, store) {
     super(items);
     this.store = store;
@@ -795,24 +792,29 @@ var MockPageService = class extends MockService {
     decoratedItems = await decorateCategories_(store, decoratedItems, params);
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
+    decoratedItems = await decorateRelations_(store, decoratedItems, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     return decoratedItems;
   }
 };
 
 // src/mock/mock.api.ts
-var import_bom_core9 = require("@websolutespa/bom-core");
+var import_bom_core8 = require("@websolutespa/bom-core");
 var API_URL2 = process.env.NEXT_PUBLIC_URL;
 var API_BASE3 = process.env.NEXT_PUBLIC_API || "/api";
 function getMockApiUrl(pathname) {
   let url = `${API_URL2}${API_BASE3}/_mock${pathname}`;
-  url = import_bom_core9.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  url = import_bom_core8.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
   return url;
 }
 async function mockApiFetch(pathname, options = {}) {
   const url = getMockApiUrl(pathname);
-  const apiOptions = (0, import_bom_core9.merge)({ ...getLocalApiRequestOptions() }, options);
+  const apiOptions = (0, import_bom_core8.merge)({ ...getLocalApiRequestOptions() }, options);
   console.log("mockApiFetch", apiOptions.method, url);
-  const apiResponse = await (0, import_bom_core9.httpFetch)(url, apiOptions);
+  const apiResponse = await (0, import_bom_core8.httpFetch)(url, apiOptions);
   return apiResponse;
 }
 async function mockApiGet(url, options = {}) {
@@ -832,7 +834,7 @@ async function mockApiDelete(url, options = {}) {
 }
 
 // src/store/store.handler.ts
-var import_bom_core15 = require("@websolutespa/bom-core");
+var import_bom_core14 = require("@websolutespa/bom-core");
 
 // src/static/static.ts
 var staticCollections = [{
@@ -905,6 +907,28 @@ var staticCollections = [{
       type: "text"
     }
   ]
+}, {
+  src: "https://actarian.github.io/cms-i18n-react/api/language.json",
+  slug: "i18n_country_zone",
+  fields: [
+    {
+      name: "id",
+      type: "text"
+    },
+    {
+      name: "name",
+      type: "text",
+      localized: true
+    },
+    {
+      name: "englishName",
+      type: "text"
+    },
+    {
+      name: "nativeName",
+      type: "text"
+    }
+  ]
 }, {
   src: "https://actarian.github.io/cms-i18n-react/api/municipality.json",
   slug: "i18n_municipality",
@@ -1107,7 +1131,7 @@ var KNOWN_COLLECTIONS = [
 var COLLECTIONS = [...ENV_COLLECTIONS, ...KNOWN_COLLECTIONS];
 
 // src/mock/mock.store.ts
-var import_bom_core11 = require("@websolutespa/bom-core");
+var import_bom_core10 = require("@websolutespa/bom-core");
 
 // src/fs/fs.service.ts
 var fs = __toESM(require("fs"));
@@ -1135,8 +1159,8 @@ async function fsReadJson(pathname) {
 }
 
 // src/static/static.service.ts
-var import_bom_core10 = require("@websolutespa/bom-core");
-var StaticService = class extends import_bom_core10.JsonService {
+var import_bom_core9 = require("@websolutespa/bom-core");
+var StaticService = class extends import_bom_core9.JsonService {
   constructor(config, store) {
     super([]);
     this.loaded = false;
@@ -1164,7 +1188,7 @@ var StaticService = class extends import_bom_core10.JsonService {
       const config = this.config;
       const src = config.src;
       if (typeof src === "string") {
-        const response = await (0, import_bom_core10.httpGet)(src, {});
+        const response = await (0, import_bom_core9.httpGet)(src, {});
         items = response.items;
       } else if (typeof src === "function") {
         if (src instanceof Promise) {
@@ -1280,7 +1304,7 @@ function getMockStoreFromData_(data) {
   return store;
 }
 async function getStoreData_() {
-  if (import_bom_core11.isDevelopment) {
+  if (import_bom_core10.isDevelopment) {
     const path = require("path");
     const pathname = path.join(process.cwd(), ".mixer", "store.json");
     return await fsReadJson(pathname) || {};
@@ -1296,17 +1320,17 @@ async function getMockStore_() {
 }
 async function getMockStore() {
   return fromCache(async () => {
-    if (!import_bom_core11.isDevelopment) {
+    if (!import_bom_core10.isDevelopment) {
       console.warn("getMockStore");
     }
     const store = await getMockStore_();
     return store;
-  }, import_bom_core11.isDevelopment ? void 0 : "STORE_MOCK_");
+  }, import_bom_core10.isDevelopment ? void 0 : "STORE_MOCK_");
 }
 
 // src/cached/cached.service.ts
-var import_bom_core12 = require("@websolutespa/bom-core");
-var CachedService = class extends import_bom_core12.JsonService {
+var import_bom_core11 = require("@websolutespa/bom-core");
+var CachedService = class extends import_bom_core11.JsonService {
   constructor(service, options = {}) {
     super([]);
     this.cache_ = /* @__PURE__ */ new Map();
@@ -1345,7 +1369,7 @@ var CachedService = class extends import_bom_core12.JsonService {
     });
   }
   async findOne(id, params = {}) {
-    const serializedParams = (0, import_bom_core12.qsSerialize)(params);
+    const serializedParams = (0, import_bom_core11.qsSerialize)(params);
     const key = `findOne[${id}]?${serializedParams}`;
     return await this.fromCache_(async () => {
       return await this.service_.findOne(id, params);
@@ -1354,7 +1378,7 @@ var CachedService = class extends import_bom_core12.JsonService {
   async findMany(params = {}) {
     if (storeStrategy === "decoratedApi" /* DecoratedApi */) {
       const { market, locale, ...otherParams } = params;
-      const serializedParams = (0, import_bom_core12.qsSerialize)({ market, locale });
+      const serializedParams = (0, import_bom_core11.qsSerialize)({ market, locale });
       const key = `findMany?${serializedParams}`;
       let items = await this.fromCache_(async () => {
         return await this.service_.findMany({ market, locale });
@@ -1367,7 +1391,7 @@ var CachedService = class extends import_bom_core12.JsonService {
       }
       return items;
     } else {
-      const serializedParams = (0, import_bom_core12.qsSerialize)(params);
+      const serializedParams = (0, import_bom_core11.qsSerialize)(params);
       const key = `findMany?${serializedParams}`;
       return await this.fromCache_(async () => {
         return await this.service_.findMany(params);
@@ -1375,7 +1399,7 @@ var CachedService = class extends import_bom_core12.JsonService {
     }
   }
   async findPaged(params = {}) {
-    const serializedParams = (0, import_bom_core12.qsSerialize)(params);
+    const serializedParams = (0, import_bom_core11.qsSerialize)(params);
     const key = `findPaged?${serializedParams}`;
     return await this.fromCache_(async () => {
       return await this.service_.findPaged(params);
@@ -1393,22 +1417,22 @@ var CachedService = class extends import_bom_core12.JsonService {
 };
 
 // src/remote/remote.service.ts
-var import_bom_core14 = require("@websolutespa/bom-core");
+var import_bom_core13 = require("@websolutespa/bom-core");
 
 // src/remote/remote.api.ts
-var import_bom_core13 = require("@websolutespa/bom-core");
+var import_bom_core12 = require("@websolutespa/bom-core");
 var API_URL3 = process.env.STORE_URL;
 var API_BASE4 = process.env.STORE_API || "/api";
 function getRemoteApiUrl(pathname) {
   let url = `${API_URL3}${API_BASE4}${pathname}`;
-  url = import_bom_core13.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  url = import_bom_core12.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
   return url;
 }
 async function remoteApiFetch(pathname, options = {}) {
   const url = getRemoteApiUrl(pathname);
-  const apiOptions = (0, import_bom_core13.merge)({ ...getRemoteApiRequestOptions() }, options);
+  const apiOptions = (0, import_bom_core12.merge)({ ...getRemoteApiRequestOptions() }, options);
   console.log("remoteApiFetch", apiOptions.method, url);
-  const apiResponse = await (0, import_bom_core13.httpFetch)(url, apiOptions);
+  const apiResponse = await (0, import_bom_core12.httpFetch)(url, apiOptions);
   return apiResponse;
 }
 async function remoteApiGet(url, options = {}) {
@@ -1445,7 +1469,7 @@ var RemoteService = class {
   async findOne(id, params = {}) {
     params.richText = String(params.richText) === "true" ? true : false;
     params.draft = RemoteServiceStrategy.draft;
-    const query = (0, import_bom_core14.qsSerialize)(params);
+    const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
     const item = await remoteApiGet(url);
@@ -1458,7 +1482,7 @@ var RemoteService = class {
     params.richText = String(params.richText) === "true" ? true : false;
     params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
-    const query = (0, import_bom_core14.qsSerialize)(params);
+    const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const response = await remoteApiGet(url);
@@ -1469,7 +1493,7 @@ var RemoteService = class {
     params.richText = String(params.richText) === "true" ? true : false;
     params.draft = RemoteServiceStrategy.draft;
     params.pagination = true;
-    const query = (0, import_bom_core14.qsSerialize)(params);
+    const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const response = await remoteApiGet(url);
@@ -1498,7 +1522,7 @@ var RemoteService = class {
         }
       }
     };
-    const query = (0, import_bom_core14.qsSerialize)(params);
+    const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const item = await remoteApiDelete(url);
@@ -1678,7 +1702,7 @@ function collectionGet(storePromise) {
       const collection = collections[0];
       const id = collections[1];
       const qs = Object.entries(query).map((kv) => kv.join("=")).join("&");
-      const params = (0, import_bom_core15.qsDeserialize)(qs);
+      const params = (0, import_bom_core14.qsDeserialize)(qs);
       if (!COLLECTIONS.includes(collection)) {
         console.error("storeHandler.collectionGet", "method not allowed", collection);
         return response.status(405).send("method not allowed");
@@ -1690,7 +1714,7 @@ function collectionGet(storePromise) {
         return response.status(405).send("method not allowed");
       }
       if (id) {
-        const item = await service.findOne((0, import_bom_core15.asEquatable)(id), params);
+        const item = await service.findOne((0, import_bom_core14.asEquatable)(id), params);
         if (item) {
           return response.status(200).json(item);
         } else {
@@ -1810,8 +1834,8 @@ function storeIndexHandler() {
   return apiHandler({
     get: async (request, response) => {
       try {
-        const market = import_bom_core15.defaultMarket;
-        const locale = import_bom_core15.defaultLocale;
+        const market = import_bom_core14.defaultMarket;
+        const locale = import_bom_core14.defaultLocale;
         if (!Array.isArray(COLLECTIONS) || COLLECTIONS?.length === 0) {
           console.error("apiHome.collectionGet", "collections not found", COLLECTIONS);
           return response.status(405).send("method not allowed");
@@ -2078,10 +2102,38 @@ async function storeApiDelete(url, options = {}) {
 }
 
 // src/vars/vars.handler.ts
-var import_bom_core17 = require("@websolutespa/bom-core");
+var import_bom_core16 = require("@websolutespa/bom-core");
+
+// ../models/src/label/label.service.ts
+async function getLabels(params = {}) {
+  const store = await getStore();
+  const items = await store.label.findMany(params);
+  return items;
+}
+
+// ../models/src/locale/locale.service.ts
+async function getLocales(params = {}) {
+  const store = await getStore();
+  const items = await store.locale.findMany(params);
+  return items;
+}
+
+// ../models/src/market/market.service.ts
+async function getMarkets(params = {}) {
+  const store = await getStore();
+  const items = await store.market.findMany(params);
+  return items;
+}
+
+// ../models/src/menu/menu.service.ts
+async function getMenus(params = {}) {
+  const store = await getStore();
+  const items = await store.menu.findMany(params);
+  return items;
+}
 
 // ../models/src/route/route.service.ts
-var import_bom_core16 = require("@websolutespa/bom-core");
+var import_bom_core15 = require("@websolutespa/bom-core");
 async function getRouteLinkTree(market, locale) {
   const store = await getStore();
   const routes = await store.route.findMany({
@@ -2095,7 +2147,7 @@ async function getRouteLinkTree(market, locale) {
     }
   });
   const categories = await store.category.findMany({ market, locale });
-  const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
+  const rootCategory = (0, import_bom_core15.getRootCategory)(categories);
   if (rootCategory) {
     const root = categoryToRouteLink(routes, categories, rootCategory, locale);
     return root;
@@ -2103,13 +2155,13 @@ async function getRouteLinkTree(market, locale) {
   return void 0;
 }
 function categoryToRouteLink(routes, categories, category, locale) {
-  const route = (0, import_bom_core16.findRouteOfCategory)(routes, category.id);
+  const route = (0, import_bom_core15.findRouteOfCategory)(routes, category.id);
   if (!route) {
     return void 0;
   }
-  const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
+  const rootCategory = (0, import_bom_core15.getRootCategory)(categories);
   const childCategories = categories.filter((x) => {
-    const parentId = (0, import_bom_core16.asCategoryId)(x.category);
+    const parentId = (0, import_bom_core15.asCategoryId)(x.category);
     return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
   });
   const routeLink = newRouteLink(category, route, locale);
@@ -2121,7 +2173,7 @@ function newRouteLink(category, route, locale) {
   const id = route?.page || category.id;
   const media = category.media || route?.media;
   const schema = route?.schema || category?.schema || "unknown";
-  const title = (0, import_bom_core16.localize)(category.title || route?.title || "untitled", locale);
+  const title = (0, import_bom_core15.localize)(category.title || route?.title || "untitled", locale);
   const routeLink = {
     category: category.id,
     href,
@@ -2134,34 +2186,6 @@ function newRouteLink(category, route, locale) {
   return routeLink;
 }
 
-// ../models/src/label/label.service.ts
-async function getLabels(params = {}) {
-  const store = await getStore();
-  const items = await store.label.findMany(params);
-  return items;
-}
-
-// ../models/src/locale/locale.service.ts
-async function getLocales(params = {}) {
-  const store = await getStore();
-  const items = await store.locale.findMany(params);
-  return items;
-}
-
-// ../models/src/market/market.service.ts
-async function getMarkets(params = {}) {
-  const store = await getStore();
-  const items = await store.market.findMany(params);
-  return items;
-}
-
-// ../models/src/menu/menu.service.ts
-async function getMenus(params = {}) {
-  const store = await getStore();
-  const items = await store.menu.findMany(params);
-  return items;
-}
-
 // ../models/src/layout/layout.service.ts
 async function getLayout(market, locale) {
   const markets = await getMarkets({ locale });
@@ -2171,11 +2195,13 @@ async function getLayout(market, locale) {
   const firstLevelRoutes = tree?.items || [];
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
   const topLevelRoutes = flatTopLevelRoutes.reduce((object, routeLink) => {
-    object[routeLink.schema] = routeLink;
+    if (!object[routeLink.schema] || routeLink.schema === routeLink.category) {
+      object[routeLink.schema] = routeLink;
+    }
     return object;
   }, {});
   const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
-    if (routeLink.href) {
+    if (routeLink.href && !object[routeLink.schema] || routeLink.schema === routeLink.category) {
       object[routeLink.schema] = routeLink.href;
     }
     return object;
@@ -2224,10 +2250,10 @@ function varsHandler() {
         const { locale = defaultLocale3, market = defaultMaket } = request.query || {};
         const layout = typeof locale === "string" && typeof market === "string" ? await getLayout(market, locale) : void 0;
         const info = {
-          production: import_bom_core17.isProduction,
-          development: import_bom_core17.isDevelopment,
-          origin: (0, import_bom_core17.getOrigin)(request.headers),
-          host: (0, import_bom_core17.getHost)(request.headers),
+          production: import_bom_core16.isProduction,
+          development: import_bom_core16.isDevelopment,
+          origin: (0, import_bom_core16.getOrigin)(request.headers),
+          host: (0, import_bom_core16.getHost)(request.headers),
           headers: { ...sortKeys(request.headers) },
           env: { ...getFilteredEnv(process.env) },
           layout: { ...sortKeys(layout) }

package/dist/index.mjs

@@ -372,7 +372,9 @@ function decorateMenuRoute_(item) {
   return decoratedItem;
 }
 async function decorateMenuPage_(item, routes, store, params = {}) {
-  const id = isEquatable(item.page.value) ? item.page.value : item.page.value.id;
+  const values = Array.isArray(item.page.value) ? item.page.value : [item.page.value];
+  const value = values[0];
+  const id = isEquatable(value) ? value : value.id;
   const route = routes.find(
     (x) => x.schema === item.page.relationTo && x.page === id
   );
@@ -458,17 +460,12 @@ function decorateNav__(item, routes) {
 }
 
 // src/decorators/optimize.ts
-import { isUnresolvedRelation } from "@websolutespa/bom-core";
 async function optimizeOne_(item) {
   const validEntries = Object.entries(item).filter(([key, value]) => {
     switch (key) {
       case "components":
       case "meta":
         return false;
-      default:
-        if (isUnresolvedRelation(value) || Array.isArray(value) && value.reduce((p, c) => p && isUnresolvedRelation(c), true)) {
-          return false;
-        }
     }
     return true;
   });
@@ -484,7 +481,7 @@ async function optimizeMany_(items) {
 }
 
 // src/decorators/relation.ts
-import { isArray as isArray2, isObject as isObject2, isUnresolvedRelation as isUnresolvedRelation2 } from "@websolutespa/bom-core";
+import { isArray as isArray2, isObject as isObject2, isUnresolvedRelation } from "@websolutespa/bom-core";
 var SERVICE_DEFAULT_DEPTH = 3;
 async function decorateRelation_(store, item, params = {}) {
   const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
@@ -501,7 +498,7 @@ async function decorateRelations_(store, items, params = {}) {
   return items;
 }
 async function collectRelations_(context, item, relations = []) {
-  if (isUnresolvedRelation2(item)) {
+  if (isUnresolvedRelation(item)) {
     const index = relations.findIndex(
       (x) => x.relationTo === item.relationTo && x.value === item.value
     );
@@ -691,6 +688,11 @@ var MockPageService = class extends MockService {
     decoratedItems = await decorateCategories_(store, decoratedItems, params);
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
+    decoratedItems = await decorateRelations_(store, decoratedItems, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     return decoratedItems;
   }
 };
@@ -801,6 +803,28 @@ var staticCollections = [{
       type: "text"
     }
   ]
+}, {
+  src: "https://actarian.github.io/cms-i18n-react/api/language.json",
+  slug: "i18n_country_zone",
+  fields: [
+    {
+      name: "id",
+      type: "text"
+    },
+    {
+      name: "name",
+      type: "text",
+      localized: true
+    },
+    {
+      name: "englishName",
+      type: "text"
+    },
+    {
+      name: "nativeName",
+      type: "text"
+    }
+  ]
 }, {
   src: "https://actarian.github.io/cms-i18n-react/api/municipality.json",
   slug: "i18n_municipality",
@@ -1976,6 +2000,34 @@ async function storeApiDelete(url, options = {}) {
 // src/vars/vars.handler.ts
 import { getHost, getOrigin, isDevelopment as isDevelopment2, isProduction } from "@websolutespa/bom-core";
 
+// ../models/src/label/label.service.ts
+async function getLabels(params = {}) {
+  const store = await getStore();
+  const items = await store.label.findMany(params);
+  return items;
+}
+
+// ../models/src/locale/locale.service.ts
+async function getLocales(params = {}) {
+  const store = await getStore();
+  const items = await store.locale.findMany(params);
+  return items;
+}
+
+// ../models/src/market/market.service.ts
+async function getMarkets(params = {}) {
+  const store = await getStore();
+  const items = await store.market.findMany(params);
+  return items;
+}
+
+// ../models/src/menu/menu.service.ts
+async function getMenus(params = {}) {
+  const store = await getStore();
+  const items = await store.menu.findMany(params);
+  return items;
+}
+
 // ../models/src/route/route.service.ts
 import { asCategoryId as asCategoryId2, defaultLocale as defaultLocale2, defaultMarket as defaultMarket2, findRouteOfCategory as findRouteOfCategory3, getRootCategory, localize } from "@websolutespa/bom-core";
 async function getRouteLinkTree(market, locale) {
@@ -2030,34 +2082,6 @@ function newRouteLink(category, route, locale) {
   return routeLink;
 }
 
-// ../models/src/label/label.service.ts
-async function getLabels(params = {}) {
-  const store = await getStore();
-  const items = await store.label.findMany(params);
-  return items;
-}
-
-// ../models/src/locale/locale.service.ts
-async function getLocales(params = {}) {
-  const store = await getStore();
-  const items = await store.locale.findMany(params);
-  return items;
-}
-
-// ../models/src/market/market.service.ts
-async function getMarkets(params = {}) {
-  const store = await getStore();
-  const items = await store.market.findMany(params);
-  return items;
-}
-
-// ../models/src/menu/menu.service.ts
-async function getMenus(params = {}) {
-  const store = await getStore();
-  const items = await store.menu.findMany(params);
-  return items;
-}
-
 // ../models/src/layout/layout.service.ts
 async function getLayout(market, locale) {
   const markets = await getMarkets({ locale });
@@ -2067,11 +2091,13 @@ async function getLayout(market, locale) {
   const firstLevelRoutes = tree?.items || [];
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
   const topLevelRoutes = flatTopLevelRoutes.reduce((object, routeLink) => {
-    object[routeLink.schema] = routeLink;
+    if (!object[routeLink.schema] || routeLink.schema === routeLink.category) {
+      object[routeLink.schema] = routeLink;
+    }
     return object;
   }, {});
   const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
-    if (routeLink.href) {
+    if (routeLink.href && !object[routeLink.schema] || routeLink.schema === routeLink.category) {
       object[routeLink.schema] = routeLink.href;
     }
     return object;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-store",
-  "version": "1.7.9",
+  "version": "1.8.0",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",

package/src/decorators/menu.ts

@@ -341,7 +341,9 @@ async function decorateMenuPage_(
   store: IStore,
   params: QueryParams = {}
 ): Promise<IMenuItem> {
-  const id = (isEquatable(item.page.value) ? item.page.value : item.page.value.id);
+  const values = Array.isArray(item.page.value) ? item.page.value : [item.page.value];
+  const value = values[0]; // !!!
+  const id = isEquatable(value) ? value : value.id;
   const route = routes.find(x =>
     x.schema === item.page.relationTo &&
     x.page === id

package/src/decorators/optimize.ts

@@ -1,4 +1,4 @@
-import { ICategorized, isUnresolvedRelation } from '@websolutespa/bom-core';
+import { ICategorized } from '@websolutespa/bom-core';
 
 export async function optimizeOne_<T extends ICategorized = ICategorized>(item: T): Promise<T> {
   const validEntries = Object.entries(item).filter(([key, value]) => {
@@ -6,6 +6,7 @@ export async function optimizeOne_<T extends ICategorized = ICategorized>(item:
       case 'components':
       case 'meta':
         return false;
+      /*
       default:
         if (
           isUnresolvedRelation(value) ||
@@ -16,6 +17,7 @@ export async function optimizeOne_<T extends ICategorized = ICategorized>(item:
         ) {
           return false;
         }
+      */
     }
     return true;
   });

package/src/mock/mock-page.service.ts

@@ -1,5 +1,5 @@
 import { ICategorized, QueryParams } from '@websolutespa/bom-core';
-import { decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateNav_, decorateRelation_, optimizeMany_ } from '../decorators';
+import { decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateNav_, decorateRelation_, decorateRelations_, optimizeMany_ } from '../decorators';
 import { MockService } from './mock.service';
 
 export class MockPageService<T extends ICategorized = ICategorized> extends MockService<T> {
@@ -26,14 +26,14 @@ export class MockPageService<T extends ICategorized = ICategorized> extends Mock
     decoratedItems = await decorateCategories_<B>(store, decoratedItems, params);
     decoratedItems = await decorateLocalizables_<B>(decoratedItems, params);
     decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);
-    /*
-    // !!! optimization for index listing
-    decoratedItems = await decorateNavs_<B>(store, decoratedItems, params);
     decoratedItems = await decorateRelations_<B>(store, decoratedItems, {
       market: params.market,
       locale: params.locale,
       depth: params.depth,
     });
+    /*
+    // !!! optimization for index listing
+    decoratedItems = await decorateNavs_<B>(store, decoratedItems, params);
     */
     return decoratedItems;
   }

package/src/static/static.ts

@@ -90,6 +90,28 @@ export const staticCollections: StaticServiceConfig[] = [{
       type: 'text',
     },
   ],
+}, {
+  src: 'https://actarian.github.io/cms-i18n-react/api/language.json',
+  slug: 'i18n_country_zone',
+  fields: [
+    {
+      name: 'id',
+      type: 'text',
+    },
+    {
+      name: 'name',
+      type: 'text',
+      localized: true,
+    },
+    {
+      name: 'englishName',
+      type: 'text',
+    },
+    {
+      name: 'nativeName',
+      type: 'text',
+    },
+  ],
 }, {
   src: 'https://actarian.github.io/cms-i18n-react/api/municipality.json',
   slug: 'i18n_municipality',