@websolutespa/bom-mixer-store 1.7.8 → 1.7.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @websolutespa/bom-mixer-store
 
+## 1.7.9
+
+### Patch Changes
+
+- Added: MenuCategory strategy
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.16
+
 ## 1.7.8
 
 ### Patch Changes

package/dist/index.js

@@ -370,26 +370,44 @@ function collectUndecoratedPages(items, undecoratedPages = []) {
   return undecoratedPages;
 }
 var MAX_INT = 1e12;
-function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
-  const decoratedItem = {
-    abstract: item.abstract,
-    category: "",
-    customClass: item.customClass,
+function makeCategoryMenuItem_(item, category) {
+  const id = item.id || (0, import_bom_core3.uuidv4)();
+  const title = item.title || category.title || "";
+  const abstract = item.abstract || void 0;
+  const customClass = item.customClass || void 0;
+  const media = item.media || category.media;
+  const items = [];
+  return category.isHidden ? {
+    type: "group",
+    id,
+    title,
+    abstract,
+    media,
+    customClass,
+    items
+  } : {
+    type: "category",
+    category: category.id,
+    id,
     href: "",
-    id: item.id || (0, import_bom_core3.uuidv4)(),
-    items: [],
-    title: "",
-    type: item.type
+    title,
+    abstract,
+    media,
+    customClass,
+    items
   };
-  const category = (0, import_bom_core3.findCategoryInCategories)(categories, item.category);
+}
+function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
+  const strategy = item.strategy || import_bom_core3.MenuCategoryStrategy.Default;
+  const categoryId = (0, import_bom_core3.asCategoryId)(item.category);
+  const category = categoryId ? categories.find((x) => x.id === categoryId) : void 0;
   if (category) {
-    decoratedItem.category = category.id;
-    decoratedItem.title = item.title || category.title || "";
-    decoratedItem.media = item.media || category.media;
-    const route = (0, import_bom_core3.findRouteOfCategory)(routes, category.id);
-    if (route) {
-      decoratedItem.href = route.id;
-    } else {
+    const decoratedItem = makeCategoryMenuItem_(item, category);
+    if (!category.isHidden) {
+      const route = routes.find((route2) => route2.isDefault && route2.resolvedCategory === category.id);
+      if (route) {
+        decoratedItem.href = route.id;
+      }
     }
     let maxDepth = item.maxDepth;
     if (typeof maxDepth === "number") {
@@ -398,33 +416,55 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
       }
       maxDepth--;
     }
-    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);
-      });
-      decoratedItem.items = childCategories.map((c) => decorateMenuCategory_({
-        id: c.id,
-        type: "category",
-        category: c.id,
-        maxDepth,
-        items: []
-      }, categories, routes, market, depth + 1));
-    }
-    const childRoutes = (0, import_bom_core3.findRoutesOfCategory)(routes, category.id, false);
+    const childCategories = (category.id ? categories.filter((x) => (0, import_bom_core3.asCategoryId)(x.category) === category.id) : []).filter((x) => {
+      switch (strategy) {
+        case import_bom_core3.MenuCategoryStrategy.ExcludeHidden:
+          return Boolean(x.isHidden) === false;
+        case import_bom_core3.MenuCategoryStrategy.Default:
+          return true;
+      }
+    });
+    childCategories.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    const subStrategy = strategy;
+    const childCategoryItems = childCategories.map((c) => decorateMenuCategory_({
+      id: c.id,
+      type: "category",
+      category: c.id,
+      maxDepth,
+      strategy: subStrategy,
+      // dispatch sub strategy
+      items: []
+    }, categories, routes, market, depth + 1));
+    const childRoutes = routes.filter((route) => {
+      switch (strategy) {
+        case import_bom_core3.MenuCategoryStrategy.ExcludeHidden:
+          return route.resolvedCategory === category.id && Boolean(route.isDefault) === false;
+        case import_bom_core3.MenuCategoryStrategy.Default:
+          return route.category === category.id && (category.isHidden || Boolean(route.isDefault) === false);
+      }
+    });
     childRoutes.sort((a, b) => {
       return (a.order || MAX_INT) - (b.order || MAX_INT);
     });
+    const childRouteItems = childRoutes.map((x) => decorateMenuRoute_(x));
     decoratedItem.items = [
-      ...decoratedItem.items || [],
-      ...childRoutes.map((x) => decorateMenuRoute_(x))
-    ];
+      ...childCategoryItems,
+      ...childRouteItems
+    ].filter((x) => Boolean(x));
+    return decoratedItem;
   }
-  return decoratedItem;
+  return {
+    id: item.id || (0, import_bom_core3.uuidv4)(),
+    type: "group",
+    title: item.title || "",
+    items: []
+  };
 }
 function decorateMenuRoute_(item) {
   const decoratedItem = {
-    id: item.page,
+    id: (0, import_bom_core3.uuidv4)(),
     type: "route",
     title: item.title,
     href: item.id,
@@ -2054,7 +2094,7 @@ async function getRouteLinkTree(market, locale) {
       }
     }
   });
-  const categories = await store.category.findMany();
+  const categories = await store.category.findMany({ market, locale });
   const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
   if (rootCategory) {
     const root = categoryToRouteLink(routes, categories, rootCategory, locale);

package/dist/index.mjs

@@ -182,10 +182,11 @@ async function decorateLocalizables_(items, params = {}) {
 
 // src/decorators/menu.ts
 import {
+  MenuCategoryStrategy,
+  asCategoryId,
   findCategoryInCategories,
   findChildCategories,
   findRouteOfCategory as findRouteOfCategory2,
-  findRoutesOfCategory,
   isEquatable,
   isUndecoratedMenuCategory,
   isUndecoratedMenuPage,
@@ -265,26 +266,44 @@ function collectUndecoratedPages(items, undecoratedPages = []) {
   return undecoratedPages;
 }
 var MAX_INT = 1e12;
-function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
-  const decoratedItem = {
-    abstract: item.abstract,
-    category: "",
-    customClass: item.customClass,
+function makeCategoryMenuItem_(item, category) {
+  const id = item.id || uuidv4();
+  const title = item.title || category.title || "";
+  const abstract = item.abstract || void 0;
+  const customClass = item.customClass || void 0;
+  const media = item.media || category.media;
+  const items = [];
+  return category.isHidden ? {
+    type: "group",
+    id,
+    title,
+    abstract,
+    media,
+    customClass,
+    items
+  } : {
+    type: "category",
+    category: category.id,
+    id,
     href: "",
-    id: item.id || uuidv4(),
-    items: [],
-    title: "",
-    type: item.type
+    title,
+    abstract,
+    media,
+    customClass,
+    items
   };
-  const category = findCategoryInCategories(categories, item.category);
+}
+function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
+  const strategy = item.strategy || MenuCategoryStrategy.Default;
+  const categoryId = asCategoryId(item.category);
+  const category = categoryId ? categories.find((x) => x.id === categoryId) : void 0;
   if (category) {
-    decoratedItem.category = category.id;
-    decoratedItem.title = item.title || category.title || "";
-    decoratedItem.media = item.media || category.media;
-    const route = findRouteOfCategory2(routes, category.id);
-    if (route) {
-      decoratedItem.href = route.id;
-    } else {
+    const decoratedItem = makeCategoryMenuItem_(item, category);
+    if (!category.isHidden) {
+      const route = routes.find((route2) => route2.isDefault && route2.resolvedCategory === category.id);
+      if (route) {
+        decoratedItem.href = route.id;
+      }
     }
     let maxDepth = item.maxDepth;
     if (typeof maxDepth === "number") {
@@ -293,33 +312,55 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
       }
       maxDepth--;
     }
-    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);
-      });
-      decoratedItem.items = childCategories.map((c) => decorateMenuCategory_({
-        id: c.id,
-        type: "category",
-        category: c.id,
-        maxDepth,
-        items: []
-      }, categories, routes, market, depth + 1));
-    }
-    const childRoutes = findRoutesOfCategory(routes, category.id, false);
+    const childCategories = (category.id ? categories.filter((x) => asCategoryId(x.category) === category.id) : []).filter((x) => {
+      switch (strategy) {
+        case MenuCategoryStrategy.ExcludeHidden:
+          return Boolean(x.isHidden) === false;
+        case MenuCategoryStrategy.Default:
+          return true;
+      }
+    });
+    childCategories.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    const subStrategy = strategy;
+    const childCategoryItems = childCategories.map((c) => decorateMenuCategory_({
+      id: c.id,
+      type: "category",
+      category: c.id,
+      maxDepth,
+      strategy: subStrategy,
+      // dispatch sub strategy
+      items: []
+    }, categories, routes, market, depth + 1));
+    const childRoutes = routes.filter((route) => {
+      switch (strategy) {
+        case MenuCategoryStrategy.ExcludeHidden:
+          return route.resolvedCategory === category.id && Boolean(route.isDefault) === false;
+        case MenuCategoryStrategy.Default:
+          return route.category === category.id && (category.isHidden || Boolean(route.isDefault) === false);
+      }
+    });
     childRoutes.sort((a, b) => {
       return (a.order || MAX_INT) - (b.order || MAX_INT);
     });
+    const childRouteItems = childRoutes.map((x) => decorateMenuRoute_(x));
     decoratedItem.items = [
-      ...decoratedItem.items || [],
-      ...childRoutes.map((x) => decorateMenuRoute_(x))
-    ];
+      ...childCategoryItems,
+      ...childRouteItems
+    ].filter((x) => Boolean(x));
+    return decoratedItem;
   }
-  return decoratedItem;
+  return {
+    id: item.id || uuidv4(),
+    type: "group",
+    title: item.title || "",
+    items: []
+  };
 }
 function decorateMenuRoute_(item) {
   const decoratedItem = {
-    id: item.page,
+    id: uuidv4(),
     type: "route",
     title: item.title,
     href: item.id,
@@ -1936,7 +1977,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, findRouteOfCategory as findRouteOfCategory3, getRootCategory, localize } from "@websolutespa/bom-core";
+import { asCategoryId as asCategoryId2, 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({
@@ -1949,7 +1990,7 @@ async function getRouteLinkTree(market, locale) {
       }
     }
   });
-  const categories = await store.category.findMany();
+  const categories = await store.category.findMany({ market, locale });
   const rootCategory = getRootCategory(categories);
   if (rootCategory) {
     const root = categoryToRouteLink(routes, categories, rootCategory, locale);
@@ -1964,7 +2005,7 @@ function categoryToRouteLink(routes, categories, category, locale) {
   }
   const rootCategory = getRootCategory(categories);
   const childCategories = categories.filter((x) => {
-    const parentId = asCategoryId(x.category);
+    const parentId = asCategoryId2(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.8",
+  "version": "1.7.9",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",

package/src/decorators/menu.ts

@@ -1,9 +1,11 @@
 import {
-  ICategorized, ICategory, IMenu, IMenuCategory, IMenuItem, IMenuPage, IMenuRoute, IRoute, IStore,
-  IUndecoratedMenu, IUndecoratedMenuCategory, IUndecoratedMenuItem, IUndecoratedMenuPage, QueryParams,
+  ICategorized, ICategory, IMenu, IMenuCategory, IMenuGroup, IMenuItem, IMenuPage, IMenuRoute, IRoute, IStore,
+  IUndecoratedMenu, IUndecoratedMenuCategory, IUndecoratedMenuItem, IUndecoratedMenuPage, MenuCategoryStrategy, QueryParams,
+  asCategoryId,
   findCategoryInCategories,
   findChildCategories,
-  findRouteOfCategory, findRoutesOfCategory, isEquatable, isUndecoratedMenuCategory, isUndecoratedMenuPage,
+  findRouteOfCategory,
+  isEquatable, isUndecoratedMenuCategory, isUndecoratedMenuPage,
   uuidv4
 } from '@websolutespa/bom-core';
 
@@ -91,12 +93,125 @@ function collectUndecoratedPages(items: IUndecoratedMenuItem[], undecoratedPages
 
 export const MAX_INT = 1000000000000; // 9007199254740991
 
+function makeCategoryMenuItem_(item: IUndecoratedMenuCategory, category: ICategory): IMenuCategory | IMenuGroup {
+  const id = item.id || uuidv4();
+  const title = item.title || category.title || '';
+  const abstract = item.abstract || undefined;
+  const customClass = item.customClass || undefined;
+  const media = item.media || category.media;
+  const items: IMenuItem[] = [];
+  return category.isHidden ?
+    {
+      type: 'group',
+      id,
+      title,
+      abstract,
+      media,
+      customClass,
+      items,
+    } : {
+      type: 'category',
+      category: category.id,
+      id,
+      href: '',
+      title,
+      abstract,
+      media,
+      customClass,
+      items,
+    };
+}
+
 function decorateMenuCategory_(
   item: IUndecoratedMenuCategory,
   categories: ICategory[],
   routes: IRoute[],
   market: string,
   depth: number = 0
+): IMenuItem | undefined {
+  const strategy = item.strategy || MenuCategoryStrategy.Default;
+  const categoryId = asCategoryId(item.category);
+  // find category
+  const category = categoryId ? categories.find(x => x.id === categoryId) : undefined;
+  if (category) {
+    const decoratedItem = makeCategoryMenuItem_(item, category);
+    if (!category.isHidden) {
+      const route = routes.find((route: IRoute) => route.isDefault && route.resolvedCategory === category.id);
+      if (route) {
+        (decoratedItem as IMenuCategory).href = route.id;
+      }
+    }
+    // checking for max depth recursion
+    let maxDepth = item.maxDepth;
+    if (typeof maxDepth === 'number') {
+      if (depth > maxDepth) {
+        return decoratedItem;
+      }
+      maxDepth--;
+    }
+    // search child categories
+    const childCategories = (category.id ?
+      categories.filter(x => asCategoryId(x.category) === category.id) : []
+    ).filter(x => {
+      switch (strategy) {
+        case MenuCategoryStrategy.ExcludeHidden:
+          return Boolean(x.isHidden) === false;
+        case MenuCategoryStrategy.Default:
+          return true;
+      }
+    });
+    // sort child categories
+    childCategories.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    // define sub strategy (!!! todo)
+    const subStrategy = strategy;
+    // decorate child categories
+    const childCategoryItems = childCategories.map(c => decorateMenuCategory_({
+      id: c.id,
+      type: 'category',
+      category: c.id,
+      maxDepth,
+      strategy: subStrategy, // dispatch sub strategy
+      items: [],
+    } as IUndecoratedMenuCategory, categories, routes, market, depth + 1));
+    // find child routes
+    const childRoutes = routes.filter((route: IRoute) => {
+      switch (strategy) {
+        case MenuCategoryStrategy.ExcludeHidden:
+          return route.resolvedCategory === category.id && Boolean(route.isDefault) === false;
+        case MenuCategoryStrategy.Default:
+          return route.category === category.id && (category.isHidden || Boolean(route.isDefault) === false);
+      }
+    });
+    // sort child routes
+    childRoutes.sort((a, b) => {
+      return (a.order || MAX_INT) - (b.order || MAX_INT);
+    });
+    // decorate child routes
+    const childRouteItems: IMenuItem[] = childRoutes.map(x => decorateMenuRoute_(x));
+    // filter items
+    decoratedItem.items = [
+      ...childCategoryItems,
+      ...childRouteItems,
+    ].filter(x => Boolean(x)) as IMenuItem[];
+    return decoratedItem;
+  }
+  // return unresolved category as group
+  return {
+    id: item.id || uuidv4(),
+    type: 'group',
+    title: item.title || '',
+    items: [],
+  };
+}
+
+function decorateMenuCategoryWithHiddenSubCategories_(
+  item: IUndecoratedMenuCategory,
+  categories: ICategory[],
+  routes: IRoute[],
+  market: string,
+  depth: number = 0
 ): IMenuItem {
   const decoratedItem: IMenuCategory = {
     abstract: item.abstract,
@@ -108,6 +223,10 @@ function decorateMenuCategory_(
     title: '',
     type: item.type,
   };
+  /*
+  const categoryId = asCategoryId(item.category);
+  const category = categoryId ? categories.find(x => x.id === categoryId) : undefined;
+  */
   const category = findCategoryInCategories(categories, item.category);
   if (category) {
     // assigning category id
@@ -133,22 +252,59 @@ function decorateMenuCategory_(
       maxDepth--;
     }
     // search child categories
-    const childCategories = findChildCategories(categories, category.id).filter(x => Boolean(x.isHidden) === false);
+    const childCategories = findChildCategories(categories, category.id);
     if (childCategories.length) {
       // sort child categories
       childCategories.sort((a, b) => {
         return (a.order || MAX_INT) - (b.order || MAX_INT);
       });
-      decoratedItem.items = childCategories.map(c => decorateMenuCategory_({
-        id: c.id,
-        type: 'category',
-        category: c.id,
-        maxDepth,
-        items: [],
-      } as IUndecoratedMenuCategory, categories, routes, market, depth + 1));
+      decoratedItem.items = childCategories.map(c => {
+        const menuCategory = decorateMenuCategoryWithHiddenSubCategories_({
+          id: c.id,
+          type: 'category',
+          category: c.id,
+          maxDepth,
+          items: [],
+        } as IUndecoratedMenuCategory, categories, routes, market, depth + 1);
+        if (c.isHidden) {
+          const group: IMenuGroup = {
+            id: c.id,
+            type: 'group',
+            title: c.title,
+            items: [
+              ...(menuCategory.items || []),
+            ],
+          };
+          // find child routes
+          // const childRoutes = findRoutesOfCategory(routes, c.id, false);
+          const childRoutes = routes.filter((route: IRoute) =>
+            route.category === c.id &&
+            Boolean(route.isDefault) === false
+          );
+          // sort child routes
+          childRoutes.sort((a, b) => {
+            return (a.order || MAX_INT) - (b.order || MAX_INT);
+          });
+          const routeLinks = childRoutes.map(x => decorateMenuRoute_(x));
+          group.items?.push(...routeLinks);
+          return group;
+        } else {
+          return decorateMenuCategoryWithHiddenSubCategories_({
+            id: c.id,
+            type: 'category',
+            category: c.id,
+            maxDepth,
+            items: [],
+          } as IUndecoratedMenuCategory, categories, routes, market, depth + 1);
+        }
+      });
     }
     // find child routes
-    const childRoutes = findRoutesOfCategory(routes, category.id, false);
+    // const childRoutes = findRoutesOfCategory(routes, category.id, false);
+    const childRoutes = routes.filter((route: IRoute) =>
+      route.category === category.id &&
+      Boolean(route.isDefault) === false
+    );
     // console.log('childRoutes', childRoutes, category.id);
     // sort child routes
     childRoutes.sort((a, b) => {
@@ -158,6 +314,7 @@ function decorateMenuCategory_(
       ...(decoratedItem.items || []),
       ...childRoutes.map(x => decorateMenuRoute_(x)),
     ];
+
   }
   return decoratedItem;
 }
@@ -166,7 +323,7 @@ function decorateMenuRoute_(
   item: IRoute
 ): IMenuItem {
   const decoratedItem: IMenuRoute = {
-    id: item.page,
+    id: uuidv4(),
     type: 'route',
     title: item.title,
     href: item.id,