@websolutespa/bom-mixer-store 1.7.7 → 1.7.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @websolutespa/bom-mixer-store
 
+## 1.7.8
+
+### Patch Changes
+
+- Modified: RouteService, MenuService to handle isHidden Category segments
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.12
+
 ## 1.7.7
 
 ### Patch Changes

package/dist/index.js

@@ -184,6 +184,7 @@ async function fromCache(callback, key) {
 }
 
 // src/decorators/category.ts
+var import_bom_core = require("@websolutespa/bom-core");
 async function decorateCategory_(store, item, params = {}) {
   if (typeof item.category === "string") {
     const categories = await store.category.findMany({
@@ -196,9 +197,7 @@ async function decorateCategory_(store, item, params = {}) {
     if (categories.length > 0) {
       const category = categories[0];
       const routes = await store.route.findMany();
-      const route = routes.find(
-        (x) => x.market === params.market && x.locale === params.locale && x.isDefault && x.category === category.id
-      );
+      const route = (0, import_bom_core.findRouteOfCategory)(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
@@ -216,7 +215,7 @@ async function decorateCategories_(store, items, params = {}) {
     return items.map((item) => {
       const category = categories.find((x) => x.id === item.category);
       if (category) {
-        const route = routes.find((x) => x.isDefault && x.category === category.id);
+        const route = (0, import_bom_core.findRouteOfCategory)(routes, category.id);
         if (route) {
           category.href = route.id;
         }
@@ -278,25 +277,25 @@ async function decorateHrefs_(store, items, params = {}) {
 }
 
 // src/decorators/localizable.ts
-var import_bom_core = require("@websolutespa/bom-core");
+var import_bom_core2 = require("@websolutespa/bom-core");
 async function decorateLocalizable_(item, params = {}) {
   if (params.locale) {
-    return (0, import_bom_core.localizeItem)(item, params.locale);
+    return (0, import_bom_core2.localizeItem)(item, params.locale);
   } else {
-    return (0, import_bom_core.cloneItem)(item);
+    return (0, import_bom_core2.cloneItem)(item);
   }
 }
 async function decorateLocalizables_(items, params = {}) {
   const decoratedItems = [];
   for (const item of items) {
-    const decoratedItem = params.locale ? (0, import_bom_core.localizeItem)(item, params.locale) : (0, import_bom_core.cloneItem)(item);
+    const decoratedItem = params.locale ? (0, import_bom_core2.localizeItem)(item, params.locale) : (0, import_bom_core2.cloneItem)(item);
     decoratedItems.push(decoratedItem);
   }
   return decoratedItems;
 }
 
 // src/decorators/menu.ts
-var import_bom_core2 = require("@websolutespa/bom-core");
+var import_bom_core3 = require("@websolutespa/bom-core");
 async function decorateMenu_(store, item, params) {
   const { market, locale } = params;
   const items = itemsFilteredByMarket_(item.items || [], market);
@@ -350,7 +349,7 @@ function itemHasMarket_(item, market) {
 }
 function collectUndecoratedCategories(items, undecoratedCategories = []) {
   items.forEach((item) => {
-    if ((0, import_bom_core2.isUndecoratedMenuCategory)(item)) {
+    if ((0, import_bom_core3.isUndecoratedMenuCategory)(item)) {
       undecoratedCategories.push(item);
     }
     if (item.items) {
@@ -361,7 +360,7 @@ function collectUndecoratedCategories(items, undecoratedCategories = []) {
 }
 function collectUndecoratedPages(items, undecoratedPages = []) {
   items.forEach((item) => {
-    if ((0, import_bom_core2.isUndecoratedMenuPage)(item)) {
+    if ((0, import_bom_core3.isUndecoratedMenuPage)(item)) {
       undecoratedPages.push(item);
     }
     if (item.items) {
@@ -377,17 +376,17 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
     category: "",
     customClass: item.customClass,
     href: "",
-    id: item.id || "",
+    id: item.id || (0, import_bom_core3.uuidv4)(),
     items: [],
     title: "",
     type: item.type
   };
-  const category = typeof item.category === "string" ? categories.find((x) => x.id === item.category) : item.category;
+  const category = (0, import_bom_core3.findCategoryInCategories)(categories, item.category);
   if (category) {
     decoratedItem.category = category.id;
     decoratedItem.title = item.title || category.title || "";
-    decoratedItem.media = decoratedItem.media || category.media;
-    const route = routes.find((x) => x.isDefault && x.category === category.id);
+    decoratedItem.media = item.media || category.media;
+    const route = (0, import_bom_core3.findRouteOfCategory)(routes, category.id);
     if (route) {
       decoratedItem.href = route.id;
     } else {
@@ -399,7 +398,7 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
       }
       maxDepth--;
     }
-    const childCategories = categories.filter((x) => x.category && (typeof x.category === "object" ? x.category.id === category.id : x.category === category.id));
+    const childCategories = (0, import_bom_core3.findChildCategories)(categories, category.id).filter((x) => Boolean(x.isHidden) === false);
     if (childCategories.length) {
       childCategories.sort((a, b) => {
         return (a.order || MAX_INT) - (b.order || MAX_INT);
@@ -411,13 +410,15 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
         maxDepth,
         items: []
       }, categories, routes, market, depth + 1));
-    } else {
-      const childRoutes = routes.filter((x) => !x.isDefault && x.category === category.id);
-      childRoutes.sort((a, b) => {
-        return (a.order || MAX_INT) - (b.order || MAX_INT);
-      });
-      decoratedItem.items = childRoutes.map((x) => decorateMenuRoute_(x));
     }
+    const childRoutes = (0, import_bom_core3.findRoutesOfCategory)(routes, category.id, false);
+    childRoutes.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    decoratedItem.items = [
+      ...decoratedItem.items || [],
+      ...childRoutes.map((x) => decorateMenuRoute_(x))
+    ];
   }
   return decoratedItem;
 }
@@ -435,13 +436,13 @@ function decorateMenuRoute_(item) {
   return decoratedItem;
 }
 async function decorateMenuPage_(item, routes, store, params = {}) {
-  const id = (0, import_bom_core2.isEquatable)(item.page.value) ? item.page.value : item.page.value.id;
+  const id = (0, import_bom_core3.isEquatable)(item.page.value) ? item.page.value : item.page.value.id;
   const route = routes.find(
     (x) => x.schema === item.page.relationTo && x.page === id
   );
   const page = await store[item.page.relationTo].findOne(id, { ...params });
   const decoratedItem = {
-    id: item.id || "",
+    id: item.id || (0, import_bom_core3.uuidv4)(),
     type: item.type,
     title: item.title || page?.title || "",
     abstract: item.abstract || page?.abstract || "",
@@ -456,7 +457,7 @@ async function decorateMenuPage_(item, routes, store, params = {}) {
 }
 
 // src/decorators/nav.ts
-var import_bom_core3 = require("@websolutespa/bom-core");
+var import_bom_core4 = require("@websolutespa/bom-core");
 async function decorateNav_(store, item, params = {}, routes) {
   if (!routes) {
     routes = await store.route.findMany({
@@ -486,12 +487,12 @@ async function decorateNavs_(store, items, params = {}) {
   return items;
 }
 function collectNavs_(item, navs = []) {
-  if ((0, import_bom_core3.isUndecoratedNav)(item)) {
+  if ((0, import_bom_core4.isUndecoratedNav)(item)) {
     navs.push(item);
   }
-  if ((0, import_bom_core3.isArray)(item)) {
+  if ((0, import_bom_core4.isArray)(item)) {
     item.forEach((x) => collectNavs_(x, navs));
-  } else if ((0, import_bom_core3.isObject)(item)) {
+  } else if ((0, import_bom_core4.isObject)(item)) {
     Object.values(item).forEach((value) => {
       collectNavs_(value, navs);
     });
@@ -521,7 +522,7 @@ function decorateNav__(item, routes) {
 }
 
 // src/decorators/optimize.ts
-var import_bom_core4 = require("@websolutespa/bom-core");
+var import_bom_core5 = require("@websolutespa/bom-core");
 async function optimizeOne_(item) {
   const validEntries = Object.entries(item).filter(([key, value]) => {
     switch (key) {
@@ -529,7 +530,7 @@ async function optimizeOne_(item) {
       case "meta":
         return false;
       default:
-        if ((0, import_bom_core4.isUnresolvedRelation)(value) || Array.isArray(value) && value.reduce((p, c) => p && (0, import_bom_core4.isUnresolvedRelation)(c), true)) {
+        if ((0, import_bom_core5.isUnresolvedRelation)(value) || Array.isArray(value) && value.reduce((p, c) => p && (0, import_bom_core5.isUnresolvedRelation)(c), true)) {
           return false;
         }
     }
@@ -547,7 +548,7 @@ async function optimizeMany_(items) {
 }
 
 // src/decorators/relation.ts
-var import_bom_core5 = require("@websolutespa/bom-core");
+var import_bom_core6 = 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;
@@ -564,7 +565,7 @@ async function decorateRelations_(store, items, params = {}) {
   return items;
 }
 async function collectRelations_(context, item, relations = []) {
-  if ((0, import_bom_core5.isUnresolvedRelation)(item)) {
+  if ((0, import_bom_core6.isUnresolvedRelation)(item)) {
     const index = relations.findIndex(
       (x) => x.relationTo === item.relationTo && x.value === item.value
     );
@@ -593,13 +594,13 @@ async function collectRelations_(context, item, relations = []) {
     } else {
       return relations[index].resolvedValue;
     }
-  } else if ((0, import_bom_core5.isArray)(item)) {
+  } else if ((0, import_bom_core6.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_core5.isObject)(item)) {
+  } else if ((0, import_bom_core6.isObject)(item)) {
     for (const [key, value] of Object.entries(item)) {
       item[key] = await collectRelations_(context, value, relations);
     }
@@ -618,12 +619,12 @@ async function decorateSchemas_(store, items, schema) {
 }
 
 // src/local/local.api.ts
-var import_bom_core6 = require("@websolutespa/bom-core");
+var import_bom_core7 = 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_core6.isBrowser ? window.location.origin : API_URL}${API_BASE}${pathname}`;
-  url = import_bom_core6.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  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");
   return url;
 }
 async function localApiFetch(pathname, options = {}, serviceOptions) {
@@ -632,9 +633,9 @@ async function localApiFetch(pathname, options = {}, serviceOptions) {
     url.searchParams.append("locale", serviceOptions.locale);
     url.searchParams.append("market", serviceOptions.market);
   }
-  const apiOptions = (0, import_bom_core6.merge)({ ...getLocalApiRequestOptions() }, options);
+  const apiOptions = (0, import_bom_core7.merge)({ ...getLocalApiRequestOptions() }, options);
   console.log("localApiFetch", apiOptions.method, url.href);
-  const apiResponse = await (0, import_bom_core6.httpFetch)(url.href, apiOptions);
+  const apiResponse = await (0, import_bom_core7.httpFetch)(url.href, apiOptions);
   return apiResponse;
 }
 async function localApiGet(url, options = {}, serviceOptions) {
@@ -673,8 +674,8 @@ function isApiRequest(request) {
 }
 
 // src/mock/mock.service.ts
-var import_bom_core7 = require("@websolutespa/bom-core");
-var MockService = class extends import_bom_core7.JsonService {
+var import_bom_core8 = require("@websolutespa/bom-core");
+var MockService = class extends import_bom_core8.JsonService {
   constructor(items, store) {
     super(items);
     this.store = store;
@@ -759,19 +760,19 @@ var MockPageService = class extends MockService {
 };
 
 // src/mock/mock.api.ts
-var import_bom_core8 = require("@websolutespa/bom-core");
+var import_bom_core9 = 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_core8.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  url = import_bom_core9.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_core8.merge)({ ...getLocalApiRequestOptions() }, options);
+  const apiOptions = (0, import_bom_core9.merge)({ ...getLocalApiRequestOptions() }, options);
   console.log("mockApiFetch", apiOptions.method, url);
-  const apiResponse = await (0, import_bom_core8.httpFetch)(url, apiOptions);
+  const apiResponse = await (0, import_bom_core9.httpFetch)(url, apiOptions);
   return apiResponse;
 }
 async function mockApiGet(url, options = {}) {
@@ -791,7 +792,7 @@ async function mockApiDelete(url, options = {}) {
 }
 
 // src/store/store.handler.ts
-var import_bom_core14 = require("@websolutespa/bom-core");
+var import_bom_core15 = require("@websolutespa/bom-core");
 
 // src/static/static.ts
 var staticCollections = [{
@@ -1066,7 +1067,7 @@ var KNOWN_COLLECTIONS = [
 var COLLECTIONS = [...ENV_COLLECTIONS, ...KNOWN_COLLECTIONS];
 
 // src/mock/mock.store.ts
-var import_bom_core10 = require("@websolutespa/bom-core");
+var import_bom_core11 = require("@websolutespa/bom-core");
 
 // src/fs/fs.service.ts
 var fs = __toESM(require("fs"));
@@ -1094,8 +1095,8 @@ async function fsReadJson(pathname) {
 }
 
 // src/static/static.service.ts
-var import_bom_core9 = require("@websolutespa/bom-core");
-var StaticService = class extends import_bom_core9.JsonService {
+var import_bom_core10 = require("@websolutespa/bom-core");
+var StaticService = class extends import_bom_core10.JsonService {
   constructor(config, store) {
     super([]);
     this.loaded = false;
@@ -1123,7 +1124,7 @@ var StaticService = class extends import_bom_core9.JsonService {
       const config = this.config;
       const src = config.src;
       if (typeof src === "string") {
-        const response = await (0, import_bom_core9.httpGet)(src, {});
+        const response = await (0, import_bom_core10.httpGet)(src, {});
         items = response.items;
       } else if (typeof src === "function") {
         if (src instanceof Promise) {
@@ -1239,7 +1240,7 @@ function getMockStoreFromData_(data) {
   return store;
 }
 async function getStoreData_() {
-  if (import_bom_core10.isDevelopment) {
+  if (import_bom_core11.isDevelopment) {
     const path = require("path");
     const pathname = path.join(process.cwd(), ".mixer", "store.json");
     return await fsReadJson(pathname) || {};
@@ -1255,17 +1256,17 @@ async function getMockStore_() {
 }
 async function getMockStore() {
   return fromCache(async () => {
-    if (!import_bom_core10.isDevelopment) {
+    if (!import_bom_core11.isDevelopment) {
       console.warn("getMockStore");
     }
     const store = await getMockStore_();
     return store;
-  }, import_bom_core10.isDevelopment ? void 0 : "STORE_MOCK_");
+  }, import_bom_core11.isDevelopment ? void 0 : "STORE_MOCK_");
 }
 
 // src/cached/cached.service.ts
-var import_bom_core11 = require("@websolutespa/bom-core");
-var CachedService = class extends import_bom_core11.JsonService {
+var import_bom_core12 = require("@websolutespa/bom-core");
+var CachedService = class extends import_bom_core12.JsonService {
   constructor(service, options = {}) {
     super([]);
     this.cache_ = /* @__PURE__ */ new Map();
@@ -1304,7 +1305,7 @@ var CachedService = class extends import_bom_core11.JsonService {
     });
   }
   async findOne(id, params = {}) {
-    const serializedParams = (0, import_bom_core11.qsSerialize)(params);
+    const serializedParams = (0, import_bom_core12.qsSerialize)(params);
     const key = `findOne[${id}]?${serializedParams}`;
     return await this.fromCache_(async () => {
       return await this.service_.findOne(id, params);
@@ -1313,7 +1314,7 @@ var CachedService = class extends import_bom_core11.JsonService {
   async findMany(params = {}) {
     if (storeStrategy === "decoratedApi" /* DecoratedApi */) {
       const { market, locale, ...otherParams } = params;
-      const serializedParams = (0, import_bom_core11.qsSerialize)({ market, locale });
+      const serializedParams = (0, import_bom_core12.qsSerialize)({ market, locale });
       const key = `findMany?${serializedParams}`;
       let items = await this.fromCache_(async () => {
         return await this.service_.findMany({ market, locale });
@@ -1326,7 +1327,7 @@ var CachedService = class extends import_bom_core11.JsonService {
       }
       return items;
     } else {
-      const serializedParams = (0, import_bom_core11.qsSerialize)(params);
+      const serializedParams = (0, import_bom_core12.qsSerialize)(params);
       const key = `findMany?${serializedParams}`;
       return await this.fromCache_(async () => {
         return await this.service_.findMany(params);
@@ -1334,7 +1335,7 @@ var CachedService = class extends import_bom_core11.JsonService {
     }
   }
   async findPaged(params = {}) {
-    const serializedParams = (0, import_bom_core11.qsSerialize)(params);
+    const serializedParams = (0, import_bom_core12.qsSerialize)(params);
     const key = `findPaged?${serializedParams}`;
     return await this.fromCache_(async () => {
       return await this.service_.findPaged(params);
@@ -1352,22 +1353,22 @@ var CachedService = class extends import_bom_core11.JsonService {
 };
 
 // src/remote/remote.service.ts
-var import_bom_core13 = require("@websolutespa/bom-core");
+var import_bom_core14 = require("@websolutespa/bom-core");
 
 // src/remote/remote.api.ts
-var import_bom_core12 = require("@websolutespa/bom-core");
+var import_bom_core13 = 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_core12.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  url = import_bom_core13.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_core12.merge)({ ...getRemoteApiRequestOptions() }, options);
+  const apiOptions = (0, import_bom_core13.merge)({ ...getRemoteApiRequestOptions() }, options);
   console.log("remoteApiFetch", apiOptions.method, url);
-  const apiResponse = await (0, import_bom_core12.httpFetch)(url, apiOptions);
+  const apiResponse = await (0, import_bom_core13.httpFetch)(url, apiOptions);
   return apiResponse;
 }
 async function remoteApiGet(url, options = {}) {
@@ -1404,7 +1405,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_core13.qsSerialize)(params);
+    const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
     const item = await remoteApiGet(url);
@@ -1417,7 +1418,7 @@ var RemoteService = class {
     params.richText = String(params.richText) === "true" ? true : false;
     params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
-    const query = (0, import_bom_core13.qsSerialize)(params);
+    const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const response = await remoteApiGet(url);
@@ -1428,7 +1429,7 @@ var RemoteService = class {
     params.richText = String(params.richText) === "true" ? true : false;
     params.draft = RemoteServiceStrategy.draft;
     params.pagination = true;
-    const query = (0, import_bom_core13.qsSerialize)(params);
+    const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const response = await remoteApiGet(url);
@@ -1457,7 +1458,7 @@ var RemoteService = class {
         }
       }
     };
-    const query = (0, import_bom_core13.qsSerialize)(params);
+    const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const item = await remoteApiDelete(url);
@@ -1637,7 +1638,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_core14.qsDeserialize)(qs);
+      const params = (0, import_bom_core15.qsDeserialize)(qs);
       if (!COLLECTIONS.includes(collection)) {
         console.error("storeHandler.collectionGet", "method not allowed", collection);
         return response.status(405).send("method not allowed");
@@ -1649,7 +1650,7 @@ function collectionGet(storePromise) {
         return response.status(405).send("method not allowed");
       }
       if (id) {
-        const item = await service.findOne((0, import_bom_core14.asEquatable)(id), params);
+        const item = await service.findOne((0, import_bom_core15.asEquatable)(id), params);
         if (item) {
           return response.status(200).json(item);
         } else {
@@ -1769,8 +1770,8 @@ function storeIndexHandler() {
   return apiHandler({
     get: async (request, response) => {
       try {
-        const market = import_bom_core14.defaultMarket;
-        const locale = import_bom_core14.defaultLocale;
+        const market = import_bom_core15.defaultMarket;
+        const locale = import_bom_core15.defaultLocale;
         if (!Array.isArray(COLLECTIONS) || COLLECTIONS?.length === 0) {
           console.error("apiHome.collectionGet", "collections not found", COLLECTIONS);
           return response.status(405).send("method not allowed");
@@ -2037,10 +2038,10 @@ async function storeApiDelete(url, options = {}) {
 }
 
 // src/vars/vars.handler.ts
-var import_bom_core16 = require("@websolutespa/bom-core");
+var import_bom_core17 = require("@websolutespa/bom-core");
 
 // ../models/src/route/route.service.ts
-var import_bom_core15 = require("@websolutespa/bom-core");
+var import_bom_core16 = require("@websolutespa/bom-core");
 async function getRouteLinkTree(market, locale) {
   const store = await getStore();
   const routes = await store.route.findMany({
@@ -2054,7 +2055,7 @@ async function getRouteLinkTree(market, locale) {
     }
   });
   const categories = await store.category.findMany();
-  const rootCategory = (0, import_bom_core15.getRootCategory)(categories);
+  const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
   if (rootCategory) {
     const root = categoryToRouteLink(routes, categories, rootCategory, locale);
     return root;
@@ -2062,15 +2063,13 @@ async function getRouteLinkTree(market, locale) {
   return void 0;
 }
 function categoryToRouteLink(routes, categories, category, locale) {
-  const route = routes.find(
-    (r) => r.category === category.id && r.isDefault
-  );
+  const route = (0, import_bom_core16.findRouteOfCategory)(routes, category.id);
   if (!route) {
     return void 0;
   }
-  const rootCategory = (0, import_bom_core15.getRootCategory)(categories);
+  const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
   const childCategories = categories.filter((x) => {
-    const parentId = x.category ? (0, import_bom_core15.asCategoryId)(x.category) : null;
+    const parentId = (0, import_bom_core16.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);
@@ -2082,7 +2081,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_core15.localize)(category.title || route?.title || "untitled", locale);
+  const title = (0, import_bom_core16.localize)(category.title || route?.title || "untitled", locale);
   const routeLink = {
     category: category.id,
     href,
@@ -2185,10 +2184,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_core16.isProduction,
-          development: import_bom_core16.isDevelopment,
-          origin: (0, import_bom_core16.getOrigin)(request.headers),
-          host: (0, import_bom_core16.getHost)(request.headers),
+          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),
           headers: { ...sortKeys(request.headers) },
           env: { ...getFilteredEnv(process.env) },
           layout: { ...sortKeys(layout) }

package/dist/index.mjs

@@ -70,6 +70,7 @@ async function fromCache(callback, key) {
 }
 
 // src/decorators/category.ts
+import { findRouteOfCategory } from "@websolutespa/bom-core";
 async function decorateCategory_(store, item, params = {}) {
   if (typeof item.category === "string") {
     const categories = await store.category.findMany({
@@ -82,9 +83,7 @@ async function decorateCategory_(store, item, params = {}) {
     if (categories.length > 0) {
       const category = categories[0];
       const routes = await store.route.findMany();
-      const route = routes.find(
-        (x) => x.market === params.market && x.locale === params.locale && x.isDefault && x.category === category.id
-      );
+      const route = findRouteOfCategory(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
@@ -102,7 +101,7 @@ async function decorateCategories_(store, items, params = {}) {
     return items.map((item) => {
       const category = categories.find((x) => x.id === item.category);
       if (category) {
-        const route = routes.find((x) => x.isDefault && x.category === category.id);
+        const route = findRouteOfCategory(routes, category.id);
         if (route) {
           category.href = route.id;
         }
@@ -183,9 +182,14 @@ async function decorateLocalizables_(items, params = {}) {
 
 // src/decorators/menu.ts
 import {
+  findCategoryInCategories,
+  findChildCategories,
+  findRouteOfCategory as findRouteOfCategory2,
+  findRoutesOfCategory,
   isEquatable,
   isUndecoratedMenuCategory,
-  isUndecoratedMenuPage
+  isUndecoratedMenuPage,
+  uuidv4
 } from "@websolutespa/bom-core";
 async function decorateMenu_(store, item, params) {
   const { market, locale } = params;
@@ -267,17 +271,17 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
     category: "",
     customClass: item.customClass,
     href: "",
-    id: item.id || "",
+    id: item.id || uuidv4(),
     items: [],
     title: "",
     type: item.type
   };
-  const category = typeof item.category === "string" ? categories.find((x) => x.id === item.category) : item.category;
+  const category = findCategoryInCategories(categories, item.category);
   if (category) {
     decoratedItem.category = category.id;
     decoratedItem.title = item.title || category.title || "";
-    decoratedItem.media = decoratedItem.media || category.media;
-    const route = routes.find((x) => x.isDefault && x.category === category.id);
+    decoratedItem.media = item.media || category.media;
+    const route = findRouteOfCategory2(routes, category.id);
     if (route) {
       decoratedItem.href = route.id;
     } else {
@@ -289,7 +293,7 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
       }
       maxDepth--;
     }
-    const childCategories = categories.filter((x) => x.category && (typeof x.category === "object" ? x.category.id === category.id : x.category === category.id));
+    const childCategories = findChildCategories(categories, category.id).filter((x) => Boolean(x.isHidden) === false);
     if (childCategories.length) {
       childCategories.sort((a, b) => {
         return (a.order || MAX_INT) - (b.order || MAX_INT);
@@ -301,13 +305,15 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
         maxDepth,
         items: []
       }, categories, routes, market, depth + 1));
-    } else {
-      const childRoutes = routes.filter((x) => !x.isDefault && x.category === category.id);
-      childRoutes.sort((a, b) => {
-        return (a.order || MAX_INT) - (b.order || MAX_INT);
-      });
-      decoratedItem.items = childRoutes.map((x) => decorateMenuRoute_(x));
     }
+    const childRoutes = findRoutesOfCategory(routes, category.id, false);
+    childRoutes.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    decoratedItem.items = [
+      ...decoratedItem.items || [],
+      ...childRoutes.map((x) => decorateMenuRoute_(x))
+    ];
   }
   return decoratedItem;
 }
@@ -331,7 +337,7 @@ async function decorateMenuPage_(item, routes, store, params = {}) {
   );
   const page = await store[item.page.relationTo].findOne(id, { ...params });
   const decoratedItem = {
-    id: item.id || "",
+    id: item.id || uuidv4(),
     type: item.type,
     title: item.title || page?.title || "",
     abstract: item.abstract || page?.abstract || "",
@@ -1930,7 +1936,7 @@ async function storeApiDelete(url, options = {}) {
 import { getHost, getOrigin, isDevelopment as isDevelopment2, isProduction } from "@websolutespa/bom-core";
 
 // ../models/src/route/route.service.ts
-import { asCategoryId, defaultLocale as defaultLocale2, defaultMarket as defaultMarket2, getRootCategory, localize } from "@websolutespa/bom-core";
+import { asCategoryId, defaultLocale as defaultLocale2, defaultMarket as defaultMarket2, findRouteOfCategory as findRouteOfCategory3, getRootCategory, localize } from "@websolutespa/bom-core";
 async function getRouteLinkTree(market, locale) {
   const store = await getStore();
   const routes = await store.route.findMany({
@@ -1952,15 +1958,13 @@ async function getRouteLinkTree(market, locale) {
   return void 0;
 }
 function categoryToRouteLink(routes, categories, category, locale) {
-  const route = routes.find(
-    (r) => r.category === category.id && r.isDefault
-  );
+  const route = findRouteOfCategory3(routes, category.id);
   if (!route) {
     return void 0;
   }
   const rootCategory = getRootCategory(categories);
   const childCategories = categories.filter((x) => {
-    const parentId = x.category ? asCategoryId(x.category) : null;
+    const parentId = 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-store",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",
@@ -15,7 +15,7 @@
   "scripts": {
     "lint": "eslint *.ts*",
     "test": "jest",
-    "test-watch": "npm test -- --watch",
+    "test-watch": "npm test -- --watch --silent=false",
     "coverage:integration": "npm run test -- --coverage",
     "coverage": "run-s -c --silent coverage:*",
     "compile": "tsup ./src/index.ts --format esm,cjs --dts",

package/src/decorators/category.ts

@@ -1,4 +1,4 @@
-import { ICategorized, ICategory, IRoute, IStore, QueryParams } from '@websolutespa/bom-core';
+import { ICategorized, ICategory, IRoute, IStore, QueryParams, findRouteOfCategory } from '@websolutespa/bom-core';
 
 export async function decorateCategory_<T extends ICategorized = ICategorized>(store: IStore, item: T, params: QueryParams = {}): Promise<T | (T & { category: ICategory })> {
   if (typeof item.category === 'string') {
@@ -12,12 +12,7 @@ export async function decorateCategory_<T extends ICategorized = ICategorized>(s
     if (categories.length > 0) {
       const category = categories[0];
       const routes = await store.route.findMany<IRoute>();
-      const route = routes.find(x =>
-        x.market === params.market &&
-        x.locale === params.locale &&
-        x.isDefault &&
-        x.category === category.id
-      );
+      const route = findRouteOfCategory(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
@@ -36,7 +31,7 @@ export async function decorateCategories_<T extends ICategorized = ICategorized>
     return items.map(item => {
       const category = categories.find(x => x.id === item.category);
       if (category) {
-        const route = routes.find(x => x.isDefault && x.category === category.id);
+        const route = findRouteOfCategory(routes, category.id);
         if (route) {
           category.href = route.id;
         }

package/src/decorators/menu.ts

@@ -1,7 +1,10 @@
 import {
-  ICategorized, ICategory, IMenu, IMenuCategory, IMenuItem, IMenuPage, IMenuRoute, IRoute,
-  IStore, IUndecoratedMenu, IUndecoratedMenuCategory, IUndecoratedMenuItem, IUndecoratedMenuPage,
-  QueryParams, isEquatable, isUndecoratedMenuCategory, isUndecoratedMenuPage
+  ICategorized, ICategory, IMenu, IMenuCategory, IMenuItem, IMenuPage, IMenuRoute, IRoute, IStore,
+  IUndecoratedMenu, IUndecoratedMenuCategory, IUndecoratedMenuItem, IUndecoratedMenuPage, QueryParams,
+  findCategoryInCategories,
+  findChildCategories,
+  findRouteOfCategory, findRoutesOfCategory, isEquatable, isUndecoratedMenuCategory, isUndecoratedMenuPage,
+  uuidv4
 } from '@websolutespa/bom-core';
 
 export async function decorateMenu_(store: IStore, item: IUndecoratedMenu, params: { market: string, locale: string }): Promise<IMenu> {
@@ -100,21 +103,21 @@ function decorateMenuCategory_(
     category: '',
     customClass: item.customClass,
     href: '',
-    id: item.id || '',
+    id: item.id || uuidv4(),
     items: [],
     title: '',
     type: item.type,
   };
-  const category = (typeof item.category === 'string' ? categories.find(x => x.id === item.category) : item.category) as ICategory;
+  const category = findCategoryInCategories(categories, item.category);
   if (category) {
     // assigning category id
     decoratedItem.category = category.id;
     // assigning category title
     decoratedItem.title = item.title || category.title || '';
     // assigning current or category media
-    decoratedItem.media = decoratedItem.media || category.media;
+    decoratedItem.media = item.media || category.media;
     // find category's index page route
-    const route = routes.find(x => x.isDefault && x.category === category.id);
+    const route = findRouteOfCategory(routes, category.id);
     if (route) {
       // hasLink
       decoratedItem.href = route.id;
@@ -130,11 +133,7 @@ function decorateMenuCategory_(
       maxDepth--;
     }
     // search child categories
-    const childCategories = categories.filter(x => (
-      x.category && (typeof x.category === 'object' ?
-        x.category.id === category.id :
-        x.category === category.id)
-    ));
+    const childCategories = findChildCategories(categories, category.id).filter(x => Boolean(x.isHidden) === false);
     if (childCategories.length) {
       // sort child categories
       childCategories.sort((a, b) => {
@@ -147,15 +146,18 @@ function decorateMenuCategory_(
         maxDepth,
         items: [],
       } as IUndecoratedMenuCategory, categories, routes, market, depth + 1));
-    } else {
-      // find child routes
-      const childRoutes = routes.filter(x => !x.isDefault && x.category === category.id);
-      // sort child routes
-      childRoutes.sort((a, b) => {
-        return (a.order || MAX_INT) - (b.order || MAX_INT);
-      });
-      decoratedItem.items = childRoutes.map(x => decorateMenuRoute_(x));
     }
+    // find child routes
+    const childRoutes = findRoutesOfCategory(routes, category.id, false);
+    // console.log('childRoutes', childRoutes, category.id);
+    // sort child routes
+    childRoutes.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    decoratedItem.items = [
+      ...(decoratedItem.items || []),
+      ...childRoutes.map(x => decorateMenuRoute_(x)),
+    ];
   }
   return decoratedItem;
 }
@@ -189,7 +191,7 @@ async function decorateMenuPage_(
   );
   const page = await store[item.page.relationTo].findOne<ICategorized>(id, { ...params });
   const decoratedItem: IMenuPage = {
-    id: item.id || '',
+    id: item.id || uuidv4(),
     type: item.type,
     title: item.title || page?.title || '',
     abstract: item.abstract || page?.abstract || '',