@websolutespa/bom-mixer-models 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @websolutespa/bom-mixer-models
 
+## 1.5.4
+
+### Patch Changes
+
+- Modified: PageService, RouteInterceptor, RouteService, StructuredData
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.4.3
+
+## 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
@@ -20,95 +37,95 @@
 
 ### Minor Changes
 
-- Added getDecoratedComponents, getPageProps.
+- Added getDecoratedComponents, getPageProps
 
 ## 1.4.0
 
 ### Minor Changes
 
-- Modified: RouteService, LayoutService.
+- Modified: RouteService, LayoutService
 
 ## 1.3.0
 
 ### Minor Changes
 
-- Added: ILazyProps, ILazyableProps, ILazyedProps.
+- Added: ILazyProps, ILazyableProps, ILazyedProps
 
 ## 1.2.1
 
 ### Patch Changes
 
-- Added: IAppProps, ILazyProps.
+- Added: IAppProps, ILazyProps
 
 ## 1.2.0
 
 ### Minor Changes
 
-- Updating: next 13.
+- Updating: next 13
 
 ## 1.1.0
 
 ### Minor Changes
 
-- Added: storeApi.
-- Modified: SiteMapService.
+- Added: storeApi
+- Modified: SiteMapService
 
 ## 1.0.1
 
 ### Patch Changes
 
-- Added: env ROOT_CATEGORY.
+- Added: env ROOT_CATEGORY
 
 ## 0.5.0
 
 ### Minor Changes
 
-- Modified routes, added redirects.
+- Modified routes, added redirects
 
 ## 0.4.2
 
 ### Patch Changes
 
-- Fixing: avoid categories circular reference.
+- Fixing: avoid categories circular reference
 
 ## 0.4.1
 
 ### Patch Changes
 
-- Added: source files.
+- Added: source files
 
 ## 0.4.0
 
 ### Minor Changes
 
-- Added: splat routes.
+- Added: splat routes
 
 ## 0.3.0
 
 ### Minor Changes
 
-- Added: @websolutespa/bom-core.
+- Added: @websolutespa/bom-core
 
 ## 0.2.0
 
 ### Minor Changes
 
-- Added: LazyComponent Types.
+- Added: LazyComponent Types
 
 ## 0.1.1
 
 ### Patch Changes
 
-- Modified: page service.
+- Modified: page service
 
 ## 0.1.0
 
 ### Minor Changes
 
-- mock refactor.
+- mock refactor
 
 ## 0.0.2
 
 ### Patch Changes
 
-- Added: first release.
+- Added: first release

package/dist/index.d.ts

@@ -276,6 +276,8 @@ declare function getErrorPageLayout(): Promise<{
 }>;
 type PartialPageProps<T extends ICategorized, B> = Omit<PageProps<T>, 'page'> & Partial<Pick<PageProps<T>, 'page'>> & B;
 declare function getPageProps<T extends ICategorized, B = any>(props: PartialPageProps<T, B>): Promise<PageProps<T> & B>;
+declare function getOrigin(): string;
+declare function resolveHref(href?: string): string;
 
 declare function getProvinces(locale?: string): Promise<INamedEntity[]>;
 declare function getProvince(id: IEquatable, params?: QueryParams): Promise<INamedEntity | undefined>;
@@ -303,8 +305,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;
@@ -403,4 +405,4 @@ type StructuredDataKeys = 'article';
 type StructuredDataCollections = Record<StructuredDataKeys, string[]>;
 declare function resolveStructuredData(page: IPage, types?: StructuredDataCollections): string | undefined;
 
-export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, ICartAddItem, ICartItem, ICheckout, ICheckoutDelivery, ICheckoutDiscount, ICheckoutInfo, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutPaymentRedirect, ICheckoutStore, ICompanyAddress, IFeatureType, IKeyedList, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILink, IList, IModelStore, IOrder, IOrderDetail, IOrderStatus, IOrderStatusValue, ISiteMap, IUser, IUserAddress, IUserChangePassword, IUserForgot, IUserLogin, IUserRegister, LAZY_PROPS, PartialPageProps, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCategories, getCategory, getCountries, getCountry, getDecoratedComponents, getDeliveries, getErrorPageLayout, getFeatureType, getFeatureTypes, getInfo, getItems, getLabel, getLabels, getLayout, getListByKeys, getLists, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getOrder, getOrders, getPage, getPageCategory, getPageProps, getPageRoutes, getPayment, getPayments, getProvince, getProvinces, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStores, newRouteLink, resolveLabel, resolveRoute, resolveStructuredData, routeInterceptor, routeRevalidateHandler, setDiscountCode, updateCheckout, withLazyProps };
+export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, ICartAddItem, ICartItem, ICheckout, ICheckoutDelivery, ICheckoutDiscount, ICheckoutInfo, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutPaymentRedirect, ICheckoutStore, ICompanyAddress, IFeatureType, IKeyedList, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILink, IList, IModelStore, IOrder, IOrderDetail, IOrderStatus, IOrderStatusValue, ISiteMap, IUser, IUserAddress, IUserChangePassword, IUserForgot, IUserLogin, IUserRegister, LAZY_PROPS, PartialPageProps, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCategories, getCategory, getCountries, getCountry, getDecoratedComponents, getDeliveries, getErrorPageLayout, getFeatureType, getFeatureTypes, getInfo, getItems, getLabel, getLabels, getLayout, getListByKeys, getLists, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getOrder, getOrders, getOrigin, getPage, getPageCategory, getPageProps, getPageRoutes, getPayment, getPayments, getProvince, getProvinces, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStores, newRouteLink, resolveHref, resolveLabel, resolveRoute, resolveStructuredData, routeInterceptor, routeRevalidateHandler, setDiscountCode, updateCheckout, withLazyProps };

package/dist/index.js

@@ -51,6 +51,7 @@ __export(src_exports, {
   getMenus: () => getMenus,
   getOrder: () => getOrder,
   getOrders: () => getOrders,
+  getOrigin: () => getOrigin,
   getPage: () => getPage,
   getPageCategory: () => getPageCategory,
   getPageProps: () => getPageProps,
@@ -76,6 +77,7 @@ __export(src_exports, {
   getStaticPathsForSchema: () => getStaticPathsForSchema,
   getStores: () => getStores,
   newRouteLink: () => newRouteLink,
+  resolveHref: () => resolveHref,
   resolveLabel: () => resolveLabel,
   resolveRoute: () => resolveRoute,
   resolveStructuredData: () => resolveStructuredData,
@@ -170,9 +172,7 @@ async function getRoutesForSchemas(schemas, market, locale) {
       locale: {
         equals: locale
       }
-    },
-    market,
-    locale
+    }
   });
   const items = {};
   routes.forEach((route) => {
@@ -193,9 +193,7 @@ async function getRoutesForTemplates(templates, market, locale) {
       locale: {
         equals: locale
       }
-    },
-    market,
-    locale
+    }
   });
   const items = {};
   routes.forEach((route) => {
@@ -253,9 +251,7 @@ async function getRouteLinkTree(market, locale) {
       locale: {
         equals: locale
       }
-    },
-    market,
-    locale
+    }
   });
   const categories = await store.category.findMany();
   const rootCategory = (0, import_bom_core2.getRootCategory)(categories);
@@ -265,6 +261,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 +294,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 || ""}`;
@@ -1140,9 +1139,7 @@ async function getPageRoutes(schema, id, market, locale) {
         schema: {
           equals: schema
         }
-      },
-      market,
-      locale
+      }
     });
   } catch (error) {
     console.error("No routes found for page " + schema + ":" + id);
@@ -1220,6 +1217,13 @@ async function getPageProps(props) {
   }
   return (0, import_bom_core3.asServerProps)(props);
 }
+function getOrigin() {
+  const origin = process.env && process.env.NEXT_PUBLIC_URL ? process.env.NEXT_PUBLIC_URL : "";
+  return origin;
+}
+function resolveHref(href = "") {
+  return href.startsWith("http") ? href : `${getOrigin()}${href}`;
+}
 
 // src/route/route-revalidate.handler.ts
 var import_bom_mixer_store13 = require("@websolutespa/bom-mixer-store");
@@ -1254,7 +1258,11 @@ async function routeInterceptor(request, next) {
   let url = request.nextUrl;
   let route;
   try {
-    route = await (0, import_bom_mixer_store14.storeApiPost)("/route", { pathname: url.pathname, href: url.href });
+    if (import_bom_mixer_store14.storeStrategy === import_bom_mixer_store14.StoreStrategy.DecoratedApi) {
+      route = await (0, import_bom_mixer_store14.localApiPost)("/route", { pathname: url.pathname, href: url.href });
+    } else {
+      route = await (0, import_bom_mixer_store14.storeApiPost)("/route", { pathname: url.pathname, href: url.href });
+    }
     if (!route) {
       console.log("routeInterceptor.route.notfound", url.pathname);
       return;
@@ -1538,7 +1546,7 @@ async function getSiteMapXSL() {
 
 // src/sitemap/sitemap.handler.ts
 var ORIGIN = process.env.NEXT_PUBLIC_URL || "";
-function getOrigin(host) {
+function getOrigin2(host) {
   if (host) {
     return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
   } else {
@@ -1547,7 +1555,7 @@ function getOrigin(host) {
 }
 var getSiteMapIndexProps = async (context) => {
   const { req, res } = context;
-  const sitemap = await getSiteMapIndex(getOrigin(req.headers.host));
+  const sitemap = await getSiteMapIndex(getOrigin2(req.headers.host));
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1562,7 +1570,7 @@ var getSiteMapXMLProps = async (context) => {
   const params = context.params;
   const market = params?.market;
   const locale = params?.locale;
-  const sitemap = await getSiteMapXML(getOrigin(req.headers.host), market, locale);
+  const sitemap = await getSiteMapXML(getOrigin2(req.headers.host), market, locale);
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1598,7 +1606,7 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
       "@context": "https://schema.org",
       "@type": "NewsArticle",
       headline: page.title,
-      image: page.media ? [page.media.src] : [],
+      image: page.media ? [resolveHref(page.media.src)] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{
@@ -1647,6 +1655,7 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
   getMenus,
   getOrder,
   getOrders,
+  getOrigin,
   getPage,
   getPageCategory,
   getPageProps,
@@ -1672,6 +1681,7 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
   getStaticPathsForSchema,
   getStores,
   newRouteLink,
+  resolveHref,
   resolveLabel,
   resolveRoute,
   resolveStructuredData,

package/dist/index.mjs

@@ -81,9 +81,7 @@ async function getRoutesForSchemas(schemas, market, locale) {
       locale: {
         equals: locale
       }
-    },
-    market,
-    locale
+    }
   });
   const items = {};
   routes.forEach((route) => {
@@ -104,9 +102,7 @@ async function getRoutesForTemplates(templates, market, locale) {
       locale: {
         equals: locale
       }
-    },
-    market,
-    locale
+    }
   });
   const items = {};
   routes.forEach((route) => {
@@ -164,9 +160,7 @@ async function getRouteLinkTree(market, locale) {
       locale: {
         equals: locale
       }
-    },
-    market,
-    locale
+    }
   });
   const categories = await store.category.findMany();
   const rootCategory = getRootCategory(categories);
@@ -176,6 +170,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 +203,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 || ""}`;
@@ -1051,9 +1048,7 @@ async function getPageRoutes(schema, id, market, locale) {
         schema: {
           equals: schema
         }
-      },
-      market,
-      locale
+      }
     });
   } catch (error) {
     console.error("No routes found for page " + schema + ":" + id);
@@ -1131,6 +1126,13 @@ async function getPageProps(props) {
   }
   return asServerProps(props);
 }
+function getOrigin() {
+  const origin = process.env && process.env.NEXT_PUBLIC_URL ? process.env.NEXT_PUBLIC_URL : "";
+  return origin;
+}
+function resolveHref(href = "") {
+  return href.startsWith("http") ? href : `${getOrigin()}${href}`;
+}
 
 // src/route/route-revalidate.handler.ts
 import { apiHandler } from "@websolutespa/bom-mixer-store";
@@ -1159,13 +1161,17 @@ function routeRevalidateHandler() {
 }
 
 // src/route/route.interceptor.ts
-import { storeApiPost } from "@websolutespa/bom-mixer-store";
+import { StoreStrategy, localApiPost, storeApiPost, storeStrategy } from "@websolutespa/bom-mixer-store";
 import { NextResponse } from "next/server";
 async function routeInterceptor(request, next) {
   let url = request.nextUrl;
   let route;
   try {
-    route = await storeApiPost("/route", { pathname: url.pathname, href: url.href });
+    if (storeStrategy === StoreStrategy.DecoratedApi) {
+      route = await localApiPost("/route", { pathname: url.pathname, href: url.href });
+    } else {
+      route = await storeApiPost("/route", { pathname: url.pathname, href: url.href });
+    }
     if (!route) {
       console.log("routeInterceptor.route.notfound", url.pathname);
       return;
@@ -1449,7 +1455,7 @@ async function getSiteMapXSL() {
 
 // src/sitemap/sitemap.handler.ts
 var ORIGIN = process.env.NEXT_PUBLIC_URL || "";
-function getOrigin(host) {
+function getOrigin2(host) {
   if (host) {
     return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
   } else {
@@ -1458,7 +1464,7 @@ function getOrigin(host) {
 }
 var getSiteMapIndexProps = async (context) => {
   const { req, res } = context;
-  const sitemap = await getSiteMapIndex(getOrigin(req.headers.host));
+  const sitemap = await getSiteMapIndex(getOrigin2(req.headers.host));
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1473,7 +1479,7 @@ var getSiteMapXMLProps = async (context) => {
   const params = context.params;
   const market = params?.market;
   const locale = params?.locale;
-  const sitemap = await getSiteMapXML(getOrigin(req.headers.host), market, locale);
+  const sitemap = await getSiteMapXML(getOrigin2(req.headers.host), market, locale);
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1509,7 +1515,7 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
       "@context": "https://schema.org",
       "@type": "NewsArticle",
       headline: page.title,
-      image: page.media ? [page.media.src] : [],
+      image: page.media ? [resolveHref(page.media.src)] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{
@@ -1557,6 +1563,7 @@ export {
   getMenus,
   getOrder,
   getOrders,
+  getOrigin,
   getPage,
   getPageCategory,
   getPageProps,
@@ -1582,6 +1589,7 @@ export {
   getStaticPathsForSchema,
   getStores,
   newRouteLink,
+  resolveHref,
   resolveLabel,
   resolveRoute,
   resolveStructuredData,

package/package.json

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

package/src/page/page.service.ts

@@ -70,7 +70,7 @@ export async function getPageRoutes(schema: string, id: IEquatable, market?: str
         schema: {
           equals: schema,
         },
-      }, market, locale,
+      },
     });
   } catch (error: any) {
     console.error('No routes found for page ' + schema + ':' + id);
@@ -156,3 +156,12 @@ export async function getPageProps<T extends ICategorized, B = any>(props: Parti
   }
   return asServerProps(props) as PageProps<T> & B;
 }
+
+export function getOrigin() {
+  const origin = process.env && process.env.NEXT_PUBLIC_URL ? process.env.NEXT_PUBLIC_URL : '';
+  return origin;
+}
+
+export function resolveHref(href: string = '') {
+  return href.startsWith('http') ? href : `${getOrigin()}${href}`;
+}

package/src/route/route.interceptor.ts

@@ -1,5 +1,5 @@
 import { IRoute } from '@websolutespa/bom-core';
-import { storeApiPost } from '@websolutespa/bom-mixer-store';
+import { StoreStrategy, localApiPost, storeApiPost, storeStrategy } from '@websolutespa/bom-mixer-store';
 import { NextFetchEvent, NextRequest, NextResponse } from 'next/server';
 import { resolveRoute } from './route.service';
 
@@ -8,7 +8,11 @@ export async function routeInterceptor(request: NextRequest, next: NextFetchEven
   let route: IRoute | undefined;
   try {
     // console.log('routeInterceptor', url.pathname);
-    route = await storeApiPost('/route', { pathname: url.pathname, href: url.href });
+    if (storeStrategy === StoreStrategy.DecoratedApi) {
+      route = await localApiPost('/route', { pathname: url.pathname, href: url.href });
+    } else {
+      route = await storeApiPost('/route', { pathname: url.pathname, href: url.href });
+    }
     // console.log('route', route);
     if (!route) {
       console.log('routeInterceptor.route.notfound', url.pathname);

package/src/route/route.service.ts

@@ -30,7 +30,7 @@ export async function getRoutesForSchemas(schemas: string[], market?: string, lo
       locale: {
         equals: locale,
       },
-    }, market, locale,
+    },
   });
   const items: {
     [key: string]: string;
@@ -54,7 +54,7 @@ export async function getRoutesForTemplates(templates: string[], market?: string
       locale: {
         equals: locale,
       },
-    }, market, locale,
+    },
   });
   const items: {
     [key: string]: string;
@@ -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: {
@@ -118,13 +118,13 @@ export async function getRouteLinkTree(market: string, locale: string): Promise<
       locale: {
         equals: locale,
       },
-    }, 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;

package/src/structured_data/structured_data.ts

@@ -1,4 +1,5 @@
 import { IPage } from '@websolutespa/bom-core';
+import { resolveHref } from '../page/page.service';
 
 export type StructuredDataPerson = {
   '@type': 'Person';
@@ -91,7 +92,7 @@ export function resolveStructuredData(page: IPage, types: StructuredDataCollecti
       '@context': 'https://schema.org',
       '@type': 'NewsArticle',
       headline: page.title,
-      image: page.media ? [page.media.src] : [],
+      image: page.media ? [resolveHref(page.media.src)] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{