@websolutespa/bom-mixer-models 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @websolutespa/bom-mixer-models
 
+## 1.4.0
+
+### Minor Changes
+
+- Modified: RouteService, LayoutService.
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -291,6 +291,7 @@ declare function getRoutesForTemplates(templates: string[], market?: string, loc
 declare function getStaticPathsForSchema(schema: string): Promise<StaticPath[]>;
 declare function getBreadcrumbFromSegments(segments: ICategory[], market?: string, locale?: string): Promise<IRouteLink[]>;
 declare function getRouteLinkTree(market?: string, locale?: string): Promise<IRouteLink | undefined>;
+declare function newRouteLink(category: ICategory, route?: IRoute, locale?: string): IRouteLink;
 declare function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale?: string): IRouteLink;
 declare function resolveRoute(route: IRoute & {
     splat?: string;
@@ -324,4 +325,4 @@ type IModelStore = {
     [key: string]: IQuerable<IEntity>;
 };
 
-export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, ICartAddItem, ICartItem, ICheckout, ICheckoutDelivery, ICheckoutDiscount, ICheckoutInfo, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutPaymentRedirect, ICheckoutStore, ICompanyAddress, IFeatureType, IKeyedList, ILazyComponent, ILazyComponentProps, ILazyModules, ILazyProps, ILazyableProps, ILazyedProps, ILink, IList, IModelStore, IOrder, IOrderDetail, IOrderStatus, IOrderStatusValue, ISiteMap, IUser, IUserAddress, IUserChangePassword, IUserForgot, IUserLogin, IUserRegister, StaticPath, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCategories, getCategory, getCountries, getCountry, getDeliveries, getErrorPageLayout, getFeatureType, getFeatureTypes, getInfo, getItems, getLabel, getLabels, getLayout, getListByKeys, getLists, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getOrder, getOrders, getPage, getPageCategory, getPageRoutes, getPayment, getPayments, getProvince, getProvinces, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStores, resolveLabel, resolveRoute, routeInterceptor, routeRevalidateHandler, setDiscountCode, updateCheckout };
+export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, ICartAddItem, ICartItem, ICheckout, ICheckoutDelivery, ICheckoutDiscount, ICheckoutInfo, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutPaymentRedirect, ICheckoutStore, ICompanyAddress, IFeatureType, IKeyedList, ILazyComponent, ILazyComponentProps, ILazyModules, ILazyProps, ILazyableProps, ILazyedProps, ILink, IList, IModelStore, IOrder, IOrderDetail, IOrderStatus, IOrderStatusValue, ISiteMap, IUser, IUserAddress, IUserChangePassword, IUserForgot, IUserLogin, IUserRegister, StaticPath, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCategories, getCategory, getCountries, getCountry, getDeliveries, getErrorPageLayout, getFeatureType, getFeatureTypes, getInfo, getItems, getLabel, getLabels, getLayout, getListByKeys, getLists, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getOrder, getOrders, getPage, getPageCategory, getPageRoutes, getPayment, getPayments, getProvince, getProvinces, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStores, newRouteLink, resolveLabel, resolveRoute, routeInterceptor, routeRevalidateHandler, setDiscountCode, updateCheckout };

package/dist/index.js

@@ -72,6 +72,7 @@ __export(src_exports, {
   getSiteMapXSLProps: () => getSiteMapXSLProps,
   getStaticPathsForSchema: () => getStaticPathsForSchema,
   getStores: () => getStores,
+  newRouteLink: () => newRouteLink,
   resolveLabel: () => resolveLabel,
   resolveRoute: () => resolveRoute,
   routeInterceptor: () => routeInterceptor,
@@ -225,18 +226,15 @@ async function getBreadcrumbFromSegments(segments, market = "ww", locale = "en")
     const route = routes.find(
       (r) => r.category === segment.id
     );
-    const href = route ? route.id.toString() : "/#";
-    return { segment, href };
-  }).map((x) => {
-    const segment = x.segment;
-    const href = x.href;
-    const title = (0, import_bom_core2.localize)(segment.title || "untitled", locale);
     return {
-      id: segment.id,
-      title,
-      href,
-      items: []
+      segment,
+      route
     };
+  }).map((x) => {
+    const category = x.segment;
+    const route = x.route;
+    const routeLink = newRouteLink(category, route, locale);
+    return routeLink;
   });
   return tree;
 }
@@ -262,24 +260,35 @@ async function getRouteLinkTree(market = "ww", locale = "en") {
   }
   return void 0;
 }
+function newRouteLink(category, route, locale = "en") {
+  const href = route && route.id ? route.id.toString() : "/";
+  const id = route?.page || category.id;
+  const media = category.media || route?.media;
+  const schema = route?.schema || category?.schema || "unknown";
+  const title = (0, import_bom_core2.localize)(category.title || route?.title || "untitled", locale);
+  const routeLink = {
+    category: category.id,
+    href,
+    id,
+    items: [],
+    media,
+    schema,
+    title
+  };
+  return routeLink;
+}
 function categoryToRouteLink(routes, categories, category, locale = "en") {
   const route = routes.find(
     (r) => r.category === category.id
   );
-  const href = route && route.id ? route.id.toString() : "/";
-  const title = (0, import_bom_core2.localize)(category.title || "untitled", locale);
   const rootCategory = (0, import_bom_core2.getRootCategory)(categories);
   const childCategories = categories.filter((x) => {
     const parentId = x.category && typeof x.category === "object" ? x.category["id"] : x.category;
     return rootCategory && category.id === rootCategory.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
   });
-  return {
-    id: category.id,
-    title,
-    href,
-    media: category.media,
-    items: childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale))
-  };
+  const routeLink = newRouteLink(category, route, locale);
+  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale));
+  return routeLink;
 }
 function resolveRoute(route) {
   const routepath = route.template ? route.template : route.schema;
@@ -677,13 +686,13 @@ async function getLayout(market, locale) {
   const tree = await getRouteLinkTree(market, locale);
   const firstLevelRoutes = tree?.items || [];
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
-  const topLevelRoutes = flatTopLevelRoutes.reduce((object, route) => {
-    object[route.id] = route;
+  const topLevelRoutes = flatTopLevelRoutes.reduce((object, routeLink) => {
+    object[routeLink.schema] = routeLink;
     return object;
   }, {});
-  const topLevelHrefs = flatTopLevelRoutes.reduce((object, route) => {
-    if (route.href) {
-      object[route.id] = route.href;
+  const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
+    if (routeLink.href) {
+      object[routeLink.schema] = routeLink.href;
     }
     return object;
   }, {});
@@ -1597,6 +1606,7 @@ var getSiteMapXSLProps = async (context) => {
   getSiteMapXSLProps,
   getStaticPathsForSchema,
   getStores,
+  newRouteLink,
   resolveLabel,
   resolveRoute,
   routeInterceptor,

package/dist/index.mjs

@@ -142,18 +142,15 @@ async function getBreadcrumbFromSegments(segments, market = "ww", locale = "en")
     const route = routes.find(
       (r) => r.category === segment.id
     );
-    const href = route ? route.id.toString() : "/#";
-    return { segment, href };
-  }).map((x) => {
-    const segment = x.segment;
-    const href = x.href;
-    const title = localize(segment.title || "untitled", locale);
     return {
-      id: segment.id,
-      title,
-      href,
-      items: []
+      segment,
+      route
     };
+  }).map((x) => {
+    const category = x.segment;
+    const route = x.route;
+    const routeLink = newRouteLink(category, route, locale);
+    return routeLink;
   });
   return tree;
 }
@@ -179,24 +176,35 @@ async function getRouteLinkTree(market = "ww", locale = "en") {
   }
   return void 0;
 }
+function newRouteLink(category, route, locale = "en") {
+  const href = route && route.id ? route.id.toString() : "/";
+  const id = route?.page || category.id;
+  const media = category.media || route?.media;
+  const schema = route?.schema || category?.schema || "unknown";
+  const title = localize(category.title || route?.title || "untitled", locale);
+  const routeLink = {
+    category: category.id,
+    href,
+    id,
+    items: [],
+    media,
+    schema,
+    title
+  };
+  return routeLink;
+}
 function categoryToRouteLink(routes, categories, category, locale = "en") {
   const route = routes.find(
     (r) => r.category === category.id
   );
-  const href = route && route.id ? route.id.toString() : "/";
-  const title = localize(category.title || "untitled", locale);
   const rootCategory = getRootCategory(categories);
   const childCategories = categories.filter((x) => {
     const parentId = x.category && typeof x.category === "object" ? x.category["id"] : x.category;
     return rootCategory && category.id === rootCategory.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
   });
-  return {
-    id: category.id,
-    title,
-    href,
-    media: category.media,
-    items: childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale))
-  };
+  const routeLink = newRouteLink(category, route, locale);
+  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale));
+  return routeLink;
 }
 function resolveRoute(route) {
   const routepath = route.template ? route.template : route.schema;
@@ -594,13 +602,13 @@ async function getLayout(market, locale) {
   const tree = await getRouteLinkTree(market, locale);
   const firstLevelRoutes = tree?.items || [];
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
-  const topLevelRoutes = flatTopLevelRoutes.reduce((object, route) => {
-    object[route.id] = route;
+  const topLevelRoutes = flatTopLevelRoutes.reduce((object, routeLink) => {
+    object[routeLink.schema] = routeLink;
     return object;
   }, {});
-  const topLevelHrefs = flatTopLevelRoutes.reduce((object, route) => {
-    if (route.href) {
-      object[route.id] = route.href;
+  const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
+    if (routeLink.href) {
+      object[routeLink.schema] = routeLink.href;
     }
     return object;
   }, {});
@@ -1513,6 +1521,7 @@ export {
   getSiteMapXSLProps,
   getStaticPathsForSchema,
   getStores,
+  newRouteLink,
   resolveLabel,
   resolveRoute,
   routeInterceptor,

package/package.json

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

package/src/layout/layout.service.ts

@@ -18,17 +18,17 @@ export async function getLayout(market: string, locale: string): Promise<ILayout
   // console.log('firstLevelRoutes', firstLevelRoutes);
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
   // console.log('flatTopLevelRoutes', flatTopLevelRoutes);
-  const topLevelRoutes = flatTopLevelRoutes.reduce((object, route: IRouteLink) => {
-    object[route.id] = route;
+  const topLevelRoutes = flatTopLevelRoutes.reduce((object, routeLink: IRouteLink) => {
+    object[routeLink.schema] = routeLink;
     return object;
-  }, {} as { [key: string]: IRouteLink });
+  }, {} as Record<string, IRouteLink>);
   // console.log('topLevelRoutes', topLevelRoutes);
-  const topLevelHrefs = flatTopLevelRoutes.reduce((object, route: IRouteLink) => {
-    if (route.href) {
-      object[route.id] = route.href;
+  const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink: IRouteLink) => {
+    if (routeLink.href) {
+      object[routeLink.schema] = routeLink.href;
     }
     return object;
-  }, {} as { [key: string]: string });
+  }, {} as Record<string, string>);
   // console.log('topLevelHrefs', topLevelHrefs);
   const menu: Record<string, IMenu> = {};
   // console.log('menu', menu);

package/src/route/route.service.ts

@@ -94,18 +94,15 @@ export async function getBreadcrumbFromSegments(segments: ICategory[], market: s
     const route = routes.find(r =>
       r.category === segment.id
     );
-    const href = route ? route.id.toString() : '/#';
-    return { segment, href };
-  }).map(x => {
-    const segment: ICategory = x.segment;
-    const href: string = x.href;
-    const title = localize(segment.title || 'untitled', locale);
     return {
-      id: segment.id,
-      title: title,
-      href,
-      items: [],
+      segment,
+      route,
     };
+  }).map(x => {
+    const category = x.segment;
+    const route = x.route;
+    const routeLink = newRouteLink(category, route, locale);
+    return routeLink;
   });
   return tree;
 }
@@ -136,13 +133,28 @@ export async function getRouteLinkTree(market: string = 'ww', locale: string = '
   return undefined;
 }
 
+export function newRouteLink(category: ICategory, route?: IRoute, locale: string = 'en'): IRouteLink {
+  const href = (route && route.id) ? route.id.toString() : '/';
+  const id = route?.page || category.id;
+  const media = category.media || route?.media;
+  const schema = route?.schema || category?.schema || 'unknown';
+  const title = localize(category.title || route?.title || 'untitled', locale);
+  const routeLink = {
+    category: category.id,
+    href,
+    id,
+    items: [],
+    media,
+    schema,
+    title,
+  };
+  return routeLink;
+}
+
 export function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string = 'en'): IRouteLink {
   const route = routes.find(r =>
     r.category === category.id
   );
-  const href = (route && route.id) ? route.id.toString() : '/';
-  // console.log('categoryToRouteLink', href, category.id, route);
-  const title = localize(category.title || 'untitled', locale);
   const rootCategory = getRootCategory(categories);
   const childCategories = categories.filter(x => {
     const parentId = x.category && typeof x.category === 'object' ? x.category['id'] : x.category;
@@ -151,13 +163,12 @@ export function categoryToRouteLink(routes: IRoute[], categories: ICategory[], c
       parentId === category.id;
   });
   // console.log('childCategories', category.id, childCategories);
-  return {
-    id: category.id,
-    title,
-    href,
-    media: category.media,
-    items: childCategories.map(x => categoryToRouteLink(routes, categories, x, locale)),
-  };
+  const routeLink = newRouteLink(category, route, locale);
+  // const title = localize(category.title || 'untitled', locale);
+  // const href = (route && route.id) ? route.id.toString() : '/';
+  // console.log('categoryToRouteLink', href, category.id, route);
+  routeLink.items = childCategories.map(x => categoryToRouteLink(routes, categories, x, locale));
+  return routeLink;
 }
 
 export function resolveRoute(route: IRoute & { splat?: string }) {