@websolutespa/bom-mixer-models 1.5.2 → 1.5.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @websolutespa/bom-mixer-models
 
+## 1.5.3
+
+### Patch Changes
+
+- Modified: RouteService
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.4.1
+  - @websolutespa/bom-core@0.6.3
+
 ## 1.5.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -303,8 +303,8 @@ 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 categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink | undefined;
 declare function newRouteLink(category: ICategory, route: IRoute | undefined, locale: string): IRouteLink;
-declare function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink;
 declare function resolveRoute(route: IRoute & {
     splat?: string;
 }): string;

package/dist/index.js

@@ -265,6 +265,22 @@ 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
+  );
+  if (!route) {
+    return void 0;
+  }
+  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;
+  });
+  const routeLink = newRouteLink(category, route, locale);
+  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale)).filter((x) => x !== void 0);
+  return routeLink;
+}
 function newRouteLink(category, route, locale) {
   const href = route && route.id ? route.id.toString() : "/";
   const id = route?.page || category.id;
@@ -282,19 +298,6 @@ function newRouteLink(category, route, locale) {
   };
   return routeLink;
 }
-function categoryToRouteLink(routes, categories, category, locale) {
-  const route = routes.find(
-    (r) => r.category === category.id
-  );
-  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;
-  });
-  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;
   const resolvedPathname = `/${route.market}/${route.locale}/${routepath}/${route.page}${route.splat || ""}`;

package/dist/index.mjs

@@ -176,6 +176,22 @@ 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
+  );
+  if (!route) {
+    return void 0;
+  }
+  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;
+  });
+  const routeLink = newRouteLink(category, route, locale);
+  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale)).filter((x) => x !== void 0);
+  return routeLink;
+}
 function newRouteLink(category, route, locale) {
   const href = route && route.id ? route.id.toString() : "/";
   const id = route?.page || category.id;
@@ -193,19 +209,6 @@ function newRouteLink(category, route, locale) {
   };
   return routeLink;
 }
-function categoryToRouteLink(routes, categories, category, locale) {
-  const route = routes.find(
-    (r) => r.category === category.id
-  );
-  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;
-  });
-  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;
   const resolvedPathname = `/${route.market}/${route.locale}/${routepath}/${route.page}${route.splat || ""}`;

package/package.json

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

package/src/route/route.service.ts

@@ -109,7 +109,7 @@ export async function getBreadcrumbFromSegments(segments: ICategory[], market: s
 
 export async function getRouteLinkTree(market: string, locale: string): Promise<IRouteLink | undefined> {
   const store = await getStore<IModelStore>();
-  // console.log('getRouteLinkTree.store');
+  // console.log('getRouteLinkTree.store', store);
   const routes = await store.route.findMany({
     where: {
       market: {
@@ -120,11 +120,11 @@ export async function getRouteLinkTree(market: string, locale: string): Promise<
       },
     }, market, locale,
   });
-  // console.log('getRouteLinkTree.routes');
+  // console.log('getRouteLinkTree.routes', routes);
   const categories = await store.category.findMany();
-  // console.log('getRouteLinkTree.categories');
+  // console.log('getRouteLinkTree.categories', categories);
   const rootCategory = getRootCategory(categories);
-  // console.log('getRouteLinkTree.rootCategory');
+  // console.log('getRouteLinkTree.rootCategory', rootCategory);
   if (rootCategory) {
     const root = categoryToRouteLink(routes, categories, rootCategory, locale);
     // console.log('getRouteLinkTree', root);
@@ -133,6 +133,33 @@ export async function getRouteLinkTree(market: string, locale: string): Promise<
   return undefined;
 }
 
+// !!! todo refactor: only category with linked route.isDefault on tree.
+export function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink | undefined {
+  const route = routes.find(r =>
+    r.category === category.id &&
+    r.isDefault
+  );
+  if (!route) {
+    return undefined;
+  }
+  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;
+  });
+  // console.log('childCategories', category.id, childCategories);
+  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))
+    .filter(x => x !== undefined) as IRouteLink[];
+  return routeLink;
+}
+
 export function newRouteLink(category: ICategory, route: IRoute | undefined, locale: string): IRouteLink {
   const href = (route && route.id) ? route.id.toString() : '/';
   const id = route?.page || category.id;
@@ -151,26 +178,6 @@ export function newRouteLink(category: ICategory, route: IRoute | undefined, loc
   return routeLink;
 }
 
-export function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink {
-  const route = routes.find(r =>
-    r.category === category.id
-  );
-  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;
-  });
-  // console.log('childCategories', category.id, childCategories);
-  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 }) {
   // console.log('resolveRoute', route);
   const routepath: string = route.template ? route.template : route.schema;