@websolutespa/bom-mixer-models 1.9.2 → 1.9.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @websolutespa/bom-mixer-models
 
+## 1.9.3
+
+### Patch Changes
+
+- Modified: getRouteLinkTree hidden categories and route linking logic
+
 ## 1.9.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -430,7 +430,7 @@ declare function getStaticPathsForSchemaAndFallback(schema: string, fallback?: '
 }>;
 declare function getBreadcrumbFromSegments(segments: ICategory[], route: IRoute): Promise<IRouteLink[]>;
 declare function getRouteLinkTree(market: string, locale: string): Promise<IRouteLink | undefined>;
-declare function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink | undefined;
+declare function getRouteLinkCategory(locale: string, routes: IRoute[], categories: ICategory[], rootCategory: ICategory, category: ICategory): IRouteLink | IRouteLink[] | undefined;
 declare function newRouteLink(category: ICategory, route: IRoute | undefined, locale: string): IRouteLink;
 declare function routeToRouteLink(route: IRoute): IRouteLink;
 declare function resolveRoute(route: IRoute & {
@@ -488,4 +488,4 @@ type IModelStore = {
 
 declare function getUtmz(request: NextApiRequest): string;
 
-export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, IBrand, ICompanyAddress, IConsentPreference, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILegalNotice, IMeta, IMetaData, IModelStore, INullableLazyableProps, ISiteMap, LAZY_PROPS, NotFound, OpenGraphArticle, OpenGraphAudio, OpenGraphBase, OpenGraphBook, OpenGraphBusiness, OpenGraphImage, OpenGraphMusic, OpenGraphPlace, OpenGraphProduct, OpenGraphProductGroup, OpenGraphProfile, OpenGraphRestaurant, OpenGraphType, OpenGraphVideo, OpenGraphWebsite, PartialPageProps, SeoWeight, SessionWithToken, StaticPath, StructuredDataType, TwitterCardApp, TwitterCardBase, TwitterCardPlayer, TwitterCardSummary, TwitterCardSummaryLargeImage, TwitterCardType, categoryToRouteLink, escapeHtml, findManyPages, findOnePage, getAddressOptions, getBreadcrumbFromSegments, getCaptionsVttProps, getCategories, getCategory, getConsentPreference, getConsentPreferences, getConsentPreferencesPagination, getCountries, getCountriesPagination, getCountry, getDecoratedComponents, getErrorPageLayout, getLabel, getLabels, getLayout, getLink, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getPage, getPageCategory, getPageProps, getPageRoutes, getPreviewProps, getProvince, getProvinces, getProvincesPagination, getPublicUrl, getRedirect, getRedirects, getRedirectsPagination, getRegion, getRegions, getRegionsPagination, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSession, getSessionToken, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStaticPathsForSchemaAndFallback, getUtmz, newRouteLink, pushDataLayer, redirectTo, resolveHref, resolveLabel, resolveRoute, routeInterceptor, routeRevalidateHandler, routeToRouteLink, withLazyProps };
+export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, IBrand, ICompanyAddress, IConsentPreference, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILegalNotice, IMeta, IMetaData, IModelStore, INullableLazyableProps, ISiteMap, LAZY_PROPS, NotFound, OpenGraphArticle, OpenGraphAudio, OpenGraphBase, OpenGraphBook, OpenGraphBusiness, OpenGraphImage, OpenGraphMusic, OpenGraphPlace, OpenGraphProduct, OpenGraphProductGroup, OpenGraphProfile, OpenGraphRestaurant, OpenGraphType, OpenGraphVideo, OpenGraphWebsite, PartialPageProps, SeoWeight, SessionWithToken, StaticPath, StructuredDataType, TwitterCardApp, TwitterCardBase, TwitterCardPlayer, TwitterCardSummary, TwitterCardSummaryLargeImage, TwitterCardType, escapeHtml, findManyPages, findOnePage, getAddressOptions, getBreadcrumbFromSegments, getCaptionsVttProps, getCategories, getCategory, getConsentPreference, getConsentPreferences, getConsentPreferencesPagination, getCountries, getCountriesPagination, getCountry, getDecoratedComponents, getErrorPageLayout, getLabel, getLabels, getLayout, getLink, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getPage, getPageCategory, getPageProps, getPageRoutes, getPreviewProps, getProvince, getProvinces, getProvincesPagination, getPublicUrl, getRedirect, getRedirects, getRedirectsPagination, getRegion, getRegions, getRegionsPagination, getRoute, getRouteLinkCategory, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSession, getSessionToken, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStaticPathsForSchemaAndFallback, getUtmz, newRouteLink, pushDataLayer, redirectTo, resolveHref, resolveLabel, resolveRoute, routeInterceptor, routeRevalidateHandler, routeToRouteLink, withLazyProps };

package/dist/index.js

@@ -22,7 +22,6 @@ var src_exports = {};
 __export(src_exports, {
   LAZY_PROPS: () => LAZY_PROPS,
   NotFound: () => NotFound,
-  categoryToRouteLink: () => categoryToRouteLink,
   escapeHtml: () => escapeHtml,
   findManyPages: () => findManyPages,
   findOnePage: () => findOnePage,
@@ -66,6 +65,7 @@ __export(src_exports, {
   getRegions: () => getRegions,
   getRegionsPagination: () => getRegionsPagination,
   getRoute: () => getRoute,
+  getRouteLinkCategory: () => getRouteLinkCategory,
   getRouteLinkTree: () => getRouteLinkTree,
   getRoutes: () => getRoutes,
   getRoutesForSchemas: () => getRoutesForSchemas,
@@ -430,23 +430,29 @@ async function getRouteLinkTree(market, locale) {
   const categories = await store.category.findMany({ market, locale });
   const rootCategory = (0, import_bom_core3.getRootCategory)(categories);
   if (rootCategory) {
-    const root = categoryToRouteLink(routes, categories, rootCategory, locale);
+    const root = getRouteLinkCategory(locale, routes, categories, rootCategory, rootCategory);
     return root;
   }
   return void 0;
 }
-function categoryToRouteLink(routes, categories, category, locale) {
+function getRouteLinkCategory(locale, routes, categories, rootCategory, category) {
   const route = (0, import_bom_core3.findRouteOfCategory)(routes, category.id);
-  if (!route) {
-    return void 0;
-  }
-  const rootCategory = (0, import_bom_core3.getRootCategory)(categories);
-  const childCategories = categories.filter((x) => {
-    const parentId = (0, import_bom_core3.asCategoryId)(x.category);
-    return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
-  });
+  const otherCategories = categories.filter((x) => x.id !== category.id);
+  const childCategories = otherCategories.filter((x) => (0, import_bom_core3.asCategoryId)(x.category) === category.id);
   const routeLink = newRouteLink(category, route, locale);
-  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale)).filter((x) => x !== void 0);
+  const items = [];
+  for (const childCategory of childCategories) {
+    const itemOrItems = getRouteLinkCategory(locale, routes, otherCategories, rootCategory, childCategory);
+    if (Array.isArray(itemOrItems)) {
+      items.push(...itemOrItems);
+    } else if (itemOrItems) {
+      items.push(itemOrItems);
+    }
+  }
+  if (category.isHidden || !route) {
+    return items;
+  }
+  routeLink.items = items;
   return routeLink;
 }
 function newRouteLink(category, route, locale) {
@@ -1281,7 +1287,6 @@ function getUtmz(request) {
 0 && (module.exports = {
   LAZY_PROPS,
   NotFound,
-  categoryToRouteLink,
   escapeHtml,
   findManyPages,
   findOnePage,
@@ -1325,6 +1330,7 @@ function getUtmz(request) {
   getRegions,
   getRegionsPagination,
   getRoute,
+  getRouteLinkCategory,
   getRouteLinkTree,
   getRoutes,
   getRoutesForSchemas,

package/dist/index.mjs

@@ -332,23 +332,29 @@ async function getRouteLinkTree(market, locale) {
   const categories = await store.category.findMany({ market, locale });
   const rootCategory = getRootCategory(categories);
   if (rootCategory) {
-    const root = categoryToRouteLink(routes, categories, rootCategory, locale);
+    const root = getRouteLinkCategory(locale, routes, categories, rootCategory, rootCategory);
     return root;
   }
   return void 0;
 }
-function categoryToRouteLink(routes, categories, category, locale) {
+function getRouteLinkCategory(locale, routes, categories, rootCategory, category) {
   const route = findRouteOfCategory(routes, category.id);
-  if (!route) {
-    return void 0;
-  }
-  const rootCategory = getRootCategory(categories);
-  const childCategories = categories.filter((x) => {
-    const parentId = asCategoryId(x.category);
-    return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
-  });
+  const otherCategories = categories.filter((x) => x.id !== category.id);
+  const childCategories = otherCategories.filter((x) => asCategoryId(x.category) === category.id);
   const routeLink = newRouteLink(category, route, locale);
-  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale)).filter((x) => x !== void 0);
+  const items = [];
+  for (const childCategory of childCategories) {
+    const itemOrItems = getRouteLinkCategory(locale, routes, otherCategories, rootCategory, childCategory);
+    if (Array.isArray(itemOrItems)) {
+      items.push(...itemOrItems);
+    } else if (itemOrItems) {
+      items.push(itemOrItems);
+    }
+  }
+  if (category.isHidden || !route) {
+    return items;
+  }
+  routeLink.items = items;
   return routeLink;
 }
 function newRouteLink(category, route, locale) {
@@ -1182,7 +1188,6 @@ function getUtmz(request) {
 export {
   LAZY_PROPS,
   NotFound,
-  categoryToRouteLink,
   escapeHtml,
   findManyPages,
   findOnePage,
@@ -1226,6 +1231,7 @@ export {
   getRegions,
   getRegionsPagination,
   getRoute,
+  getRouteLinkCategory,
   getRouteLinkTree,
   getRoutes,
   getRoutesForSchemas,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",

package/src/route/route.service.ts

@@ -167,31 +167,39 @@ export async function getRouteLinkTree(market: string, locale: string): Promise<
   const rootCategory = getRootCategory(categories);
   // console.log('getRouteLinkTree.rootCategory', rootCategory?.id);
   if (rootCategory) {
-    const root = categoryToRouteLink(routes, categories, rootCategory, locale);
+    const root = getRouteLinkCategory(locale, routes, categories, rootCategory, rootCategory);
     // console.log('getRouteLinkTree', root);
-    return root;
+    return root as IRouteLink;
   }
   return undefined;
 }
 
-export function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink | undefined {
+export function getRouteLinkCategory(
+  locale: string,
+  routes: IRoute[],
+  categories: ICategory[],
+  rootCategory: ICategory,
+  category: ICategory
+): IRouteLink | IRouteLink[] | undefined {
   const route = findRouteOfCategory(routes, category.id);
-  if (!route) {
-    return undefined;
-  }
-  const rootCategory = getRootCategory(categories);
-  const childCategories = categories.filter(x => {
-    const parentId = asCategoryId(x.category);
-    return rootCategory && rootCategory.id === category.id ?
-      (x.id !== rootCategory.id && (parentId === category.id || !parentId)) :
-      parentId === category.id;
-  });
-  // console.log('childCategories', category.id, childCategories);
+  const otherCategories = categories.filter(x => x.id !== category.id);
+  const childCategories = otherCategories.filter(x => asCategoryId(x.category) === category.id);
+  // console.log('childCategories', category.id, childCategories.map(x => x.id));
   const routeLink = newRouteLink(category, route, locale);
-  // console.log('categoryToRouteLink', href, category.id, route);
-  routeLink.items = childCategories
-    .map(x => categoryToRouteLink(routes, categories, x, locale))
-    .filter(x => x !== undefined) as IRouteLink[];
+  // console.log('getRouteLinkCategory', href, category.id, route);
+  const items: IRouteLink[] = [];
+  for (const childCategory of childCategories) {
+    const itemOrItems = getRouteLinkCategory(locale, routes, otherCategories, rootCategory, childCategory);
+    if (Array.isArray(itemOrItems)) {
+      items.push(...itemOrItems);
+    } else if (itemOrItems) {
+      items.push(itemOrItems);
+    }
+  }
+  if (category.isHidden || !route) {
+    return items;
+  }
+  routeLink.items = items;
   return routeLink;
 }