@websolutespa/bom-mixer-models 1.7.2 → 1.7.4

package/CHANGELOG.md

@@ -1,208 +1,224 @@
-# @websolutespa/bom-mixer-models
-
-## 1.7.2
-
-### Patch Changes
-
-- Updating: dependencies
-- Updated dependencies
-  - @websolutespa/bom-mixer-store@1.7.3
-  - @websolutespa/bom-core@1.7.3
-
-## 1.7.1
-
-### Patch Changes
-
-- Fixing: findRoute redirects
-
-## 1.7.0
-
-### Minor Changes
-
-- 28e86bd: Modified: IPage, Store services & decorators
-- Updated dependencies [28e86bd]
-  - @websolutespa/bom-mixer-store@1.7.0
-  - @websolutespa/bom-core@1.7.0
-
-## 1.6.0
-
-### Patch Changes
-
-- f664993: Added: useLivePreview
-- 6707ca2: Fixing LocaleService getLocaleFromProps
-- Updated dependencies [f664993]
-- Updated dependencies [6cbf4cb]
-  - @websolutespa/bom-mixer-store@1.4.7
-  - @websolutespa/bom-core@0.6.7
-
-## 1.5.10
-
-### Patch Changes
-
-- Added: captions handler
-
-## 1.5.9
-
-### Patch Changes
-
-- Added: lang attribute to sitemap
-
-## 1.5.8
-
-### Patch Changes
-
-- Modified: getBreadcrumbFromSegments, getSeoWeight
-- Updated dependencies
-  - @websolutespa/bom-core@0.6.6
-
-## 1.5.7
-
-### Patch Changes
-
-- Fixing: getDecoratedComponents
-
-## 1.5.6
-
-### Patch Changes
-
-- Added: SeoService
-- Modified: IFeatureType, PageService, RedirectService, RouteService
-- Updated dependencies
-  - @websolutespa/bom-mixer-store@1.4.3
-  - @websolutespa/bom-core@0.6.5
-
-## 1.5.5
-
-### Patch Changes
-
-- Modified: RouteInterceptor
-
-## 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
-
-- Added: StructuredData
-- Updated dependencies
-  - @websolutespa/bom-core@0.6.2
-
-## 1.5.1
-
-### Patch Changes
-
-- Added: defaultMarket, defaultLocale
-- Updated dependencies [dad63747]
-  - @websolutespa/bom-core@0.6.1
-
-## 1.5.0
-
-### Minor Changes
-
-- Added getDecoratedComponents, getPageProps
-
-## 1.4.0
-
-### Minor Changes
-
-- Modified: RouteService, LayoutService
-
-## 1.3.0
-
-### Minor Changes
-
-- Added: ILazyProps, ILazyableProps, ILazyedProps
-
-## 1.2.1
-
-### Patch Changes
-
-- Added: IAppProps, ILazyProps
-
-## 1.2.0
-
-### Minor Changes
-
-- Updating: next 13
-
-## 1.1.0
-
-### Minor Changes
-
-- Added: storeApi
-- Modified: SiteMapService
-
-## 1.0.1
-
-### Patch Changes
-
-- Added: env ROOT_CATEGORY
-
-## 0.5.0
-
-### Minor Changes
-
-- Modified routes, added redirects
-
-## 0.4.2
-
-### Patch Changes
-
-- Fixing: avoid categories circular reference
-
-## 0.4.1
-
-### Patch Changes
-
-- Added: source files
-
-## 0.4.0
-
-### Minor Changes
-
-- Added: splat routes
-
-## 0.3.0
-
-### Minor Changes
-
-- Added: @websolutespa/bom-core
-
-## 0.2.0
-
-### Minor Changes
-
-- Added: LazyComponent Types
-
-## 0.1.1
-
-### Patch Changes
-
-- Modified: page service
-
-## 0.1.0
-
-### Minor Changes
-
-- mock refactor
-
-## 0.0.2
-
-### Patch Changes
-
-- Added: first release
+# @websolutespa/bom-mixer-models
+
+## 1.7.4
+
+### Patch Changes
+
+- Modified: structuredData
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.5
+
+## 1.7.3
+
+### Patch Changes
+
+- Added: getOrigin, getHost
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.4
+
+## 1.7.2
+
+### Patch Changes
+
+- Updating: dependencies
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.7.3
+  - @websolutespa/bom-core@1.7.3
+
+## 1.7.1
+
+### Patch Changes
+
+- Fixing: findRoute redirects
+
+## 1.7.0
+
+### Minor Changes
+
+- 28e86bd: Modified: IPage, Store services & decorators
+- Updated dependencies [28e86bd]
+  - @websolutespa/bom-mixer-store@1.7.0
+  - @websolutespa/bom-core@1.7.0
+
+## 1.6.0
+
+### Patch Changes
+
+- f664993: Added: useLivePreview
+- 6707ca2: Fixing LocaleService getLocaleFromProps
+- Updated dependencies [f664993]
+- Updated dependencies [6cbf4cb]
+  - @websolutespa/bom-mixer-store@1.4.7
+  - @websolutespa/bom-core@0.6.7
+
+## 1.5.10
+
+### Patch Changes
+
+- Added: captions handler
+
+## 1.5.9
+
+### Patch Changes
+
+- Added: lang attribute to sitemap
+
+## 1.5.8
+
+### Patch Changes
+
+- Modified: getBreadcrumbFromSegments, getSeoWeight
+- Updated dependencies
+  - @websolutespa/bom-core@0.6.6
+
+## 1.5.7
+
+### Patch Changes
+
+- Fixing: getDecoratedComponents
+
+## 1.5.6
+
+### Patch Changes
+
+- Added: SeoService
+- Modified: IFeatureType, PageService, RedirectService, RouteService
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.4.3
+  - @websolutespa/bom-core@0.6.5
+
+## 1.5.5
+
+### Patch Changes
+
+- Modified: RouteInterceptor
+
+## 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
+
+- Added: StructuredData
+- Updated dependencies
+  - @websolutespa/bom-core@0.6.2
+
+## 1.5.1
+
+### Patch Changes
+
+- Added: defaultMarket, defaultLocale
+- Updated dependencies [dad63747]
+  - @websolutespa/bom-core@0.6.1
+
+## 1.5.0
+
+### Minor Changes
+
+- Added getDecoratedComponents, getPageProps
+
+## 1.4.0
+
+### Minor Changes
+
+- Modified: RouteService, LayoutService
+
+## 1.3.0
+
+### Minor Changes
+
+- Added: ILazyProps, ILazyableProps, ILazyedProps
+
+## 1.2.1
+
+### Patch Changes
+
+- Added: IAppProps, ILazyProps
+
+## 1.2.0
+
+### Minor Changes
+
+- Updating: next 13
+
+## 1.1.0
+
+### Minor Changes
+
+- Added: storeApi
+- Modified: SiteMapService
+
+## 1.0.1
+
+### Patch Changes
+
+- Added: env ROOT_CATEGORY
+
+## 0.5.0
+
+### Minor Changes
+
+- Modified routes, added redirects
+
+## 0.4.2
+
+### Patch Changes
+
+- Fixing: avoid categories circular reference
+
+## 0.4.1
+
+### Patch Changes
+
+- Added: source files
+
+## 0.4.0
+
+### Minor Changes
+
+- Added: splat routes
+
+## 0.3.0
+
+### Minor Changes
+
+- Added: @websolutespa/bom-core
+
+## 0.2.0
+
+### Minor Changes
+
+- Added: LazyComponent Types
+
+## 0.1.1
+
+### Patch Changes
+
+- Modified: page service
+
+## 0.1.0
+
+### Minor Changes
+
+- mock refactor
+
+## 0.0.2
+
+### Patch Changes
+
+- Added: first release

package/dist/index.d.ts

@@ -286,7 +286,7 @@ 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 getPublicUrl(): string;
 declare function resolveHref(href?: string): string;
 
 declare const getPreviewProps: GetServerSideProps;
@@ -428,6 +428,8 @@ type StructuredDataEvent = {
 };
 type StructuredDataKeys = 'article';
 type StructuredDataCollections = Record<StructuredDataKeys, string[]>;
-declare function resolveStructuredData(page: IPage, types?: StructuredDataCollections): string | undefined;
+declare function resolveTemplate(value: any): string | undefined;
+declare function resolveMediaSrc(media: IMedia): string | undefined;
+declare function resolveStructuredData(page: IPage, websiteName?: string, 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, NotFound, PartialPageProps, SeoWeight, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCaptionsVttProps, 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, getPreviewProps, getProvince, getProvinces, getRedirect, getRedirects, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStores, newRouteLink, redirectTo, resolveHref, resolveLabel, resolveRoute, resolveStructuredData, routeInterceptor, routeRevalidateHandler, routeToRouteLink, 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, NotFound, PartialPageProps, SeoWeight, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCaptionsVttProps, 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, getPreviewProps, getProvince, getProvinces, getPublicUrl, getRedirect, getRedirects, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, getStores, newRouteLink, redirectTo, resolveHref, resolveLabel, resolveMediaSrc, resolveRoute, resolveStructuredData, resolveTemplate, routeInterceptor, routeRevalidateHandler, routeToRouteLink, setDiscountCode, updateCheckout, withLazyProps };

package/dist/index.js

@@ -53,7 +53,6 @@ __export(src_exports, {
   getMenus: () => getMenus,
   getOrder: () => getOrder,
   getOrders: () => getOrders,
-  getOrigin: () => getOrigin,
   getPage: () => getPage,
   getPageCategory: () => getPageCategory,
   getPageProps: () => getPageProps,
@@ -63,6 +62,7 @@ __export(src_exports, {
   getPreviewProps: () => getPreviewProps,
   getProvince: () => getProvince,
   getProvinces: () => getProvinces,
+  getPublicUrl: () => getPublicUrl,
   getRedirect: () => getRedirect,
   getRedirects: () => getRedirects,
   getRegion: () => getRegion,
@@ -86,8 +86,10 @@ __export(src_exports, {
   redirectTo: () => redirectTo,
   resolveHref: () => resolveHref,
   resolveLabel: () => resolveLabel,
+  resolveMediaSrc: () => resolveMediaSrc,
   resolveRoute: () => resolveRoute,
   resolveStructuredData: () => resolveStructuredData,
+  resolveTemplate: () => resolveTemplate,
   routeInterceptor: () => routeInterceptor,
   routeRevalidateHandler: () => routeRevalidateHandler,
   routeToRouteLink: () => routeToRouteLink,
@@ -1300,12 +1302,12 @@ 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 getPublicUrl() {
+  const publicUrl = process.env && process.env.NEXT_PUBLIC_URL ? process.env.NEXT_PUBLIC_URL : "";
+  return publicUrl;
 }
 function resolveHref(href = "") {
-  return href.startsWith("http") ? href : `${getOrigin()}${href}`;
+  return href.startsWith("http") ? href : `${getPublicUrl()}${href}`;
 }
 
 // src/preview/preview.handler.ts
@@ -1370,6 +1372,7 @@ function routeRevalidateHandler() {
 }
 
 // src/route/route.interceptor.ts
+var import_bom_core4 = require("@websolutespa/bom-core");
 var import_bom_mixer_store16 = require("@websolutespa/bom-mixer-store");
 var import_server = require("next/server");
 async function routeInterceptor(request, next) {
@@ -1412,8 +1415,8 @@ async function routeInterceptor(request, next) {
 function getHrefBeforeRedirect(request) {
   let hrefBeforeRedirect = null;
   const urlBeforeRedirect = request.nextUrl.clone();
-  const host = request.headers.get("host");
-  if (typeof host === "string") {
+  const host = (0, import_bom_core4.getHost)(request.headers);
+  if (host) {
     urlBeforeRedirect.host = host;
     urlBeforeRedirect.port = host.split(":")[1] || "";
     hrefBeforeRedirect = urlBeforeRedirect.href;
@@ -1430,8 +1433,11 @@ var getSeoWeight = (index = 0, seoWeight) => {
   return getter;
 };
 
+// src/sitemap/sitemap.handler.ts
+var import_bom_core6 = require("@websolutespa/bom-core");
+
 // src/sitemap/sitemap.service.ts
-var import_bom_core4 = require("@websolutespa/bom-core");
+var import_bom_core5 = require("@websolutespa/bom-core");
 async function getSiteMapIndex(origin) {
   let markets = await getMarkets();
   let locales = await getLocales();
@@ -1442,7 +1448,7 @@ async function getSiteMapIndex(origin) {
   const getTime = (date) => {
     return typeof date !== "undefined" ? (typeof date === "string" ? new Date(date) : date).getTime() : 0;
   };
-  (0, import_bom_core4.eachMarketLocale)(markets, locales, (market, locale, markets2, locales2) => {
+  (0, import_bom_core5.eachMarketLocale)(markets, locales, (market, locale, markets2, locales2) => {
     const sitemapRoutes = routes.filter((x) => x.market === market.id && x.locale === locale.id);
     sitemapRoutes.sort((a, b) => getTime(a.updatedAt) - getTime(b.updatedAt));
     sitemaps.push({
@@ -1687,17 +1693,9 @@ async function getSiteMapXSL(localeId) {
 }
 
 // src/sitemap/sitemap.handler.ts
-var ORIGIN = process.env.NEXT_PUBLIC_URL || "";
-function getOrigin2(host) {
-  if (host) {
-    return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
-  } else {
-    return ORIGIN;
-  }
-}
 var getSiteMapIndexProps = async (context) => {
   const { req, res } = context;
-  const sitemap = await getSiteMapIndex(getOrigin2(req.headers.host));
+  const sitemap = await getSiteMapIndex((0, import_bom_core6.getOrigin)(req.headers));
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1712,7 +1710,7 @@ var getSiteMapXMLProps = async (context) => {
   const params = context.params;
   const market = params?.market;
   const locale = params?.locale;
-  const sitemap = await getSiteMapXML(getOrigin2(req.headers.host), market, locale);
+  const sitemap = await getSiteMapXML((0, import_bom_core6.getOrigin)(req.headers), market, locale);
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1739,26 +1737,35 @@ var getSiteMapXSLProps = async (context) => {
 };
 
 // src/structured_data/structured_data.ts
+var import_bom_core7 = require("@websolutespa/bom-core");
 var DefaultStructuredDataCollections = {
   article: ["news_detail"]
 };
-function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
+function resolveTemplate(value) {
+  return (0, import_bom_core7.asCategoryId)(value);
+}
+function resolveMediaSrc(media) {
+  return resolveHref(media.src || media.url);
+}
+function resolveStructuredData(page, websiteName = "WebsiteName", types = DefaultStructuredDataCollections) {
   let schema = null;
   const json = null;
-  const pageType = page.template || page.schema || "";
+  let pageType = page.schema || "";
+  if (page.template) {
+    pageType = (0, import_bom_core7.asCategoryId)(page.template);
+  }
   if (types.article.includes(pageType)) {
     schema = {
       "@context": "https://schema.org",
       "@type": "NewsArticle",
       headline: page.title,
-      image: page.media ? [resolveHref(page.media.src)] : [],
+      image: page.media ? [resolveMediaSrc(page.media)] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{
-        "@type": "Organization",
-        name: "WebsiteName"
-        // 'Autorità del bacino distrettuale dell\'Appennino Centrale',
-        // url: 'https://twitter.com/autoritadac',
+        "@type": "Person",
+        name: websiteName,
+        url: getPublicUrl()
       }]
     };
   }
@@ -1802,7 +1809,6 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
   getMenus,
   getOrder,
   getOrders,
-  getOrigin,
   getPage,
   getPageCategory,
   getPageProps,
@@ -1812,6 +1818,7 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
   getPreviewProps,
   getProvince,
   getProvinces,
+  getPublicUrl,
   getRedirect,
   getRedirects,
   getRegion,
@@ -1835,8 +1842,10 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
   redirectTo,
   resolveHref,
   resolveLabel,
+  resolveMediaSrc,
   resolveRoute,
   resolveStructuredData,
+  resolveTemplate,
   routeInterceptor,
   routeRevalidateHandler,
   routeToRouteLink,

package/dist/index.mjs

@@ -1201,12 +1201,12 @@ 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 getPublicUrl() {
+  const publicUrl = process.env && process.env.NEXT_PUBLIC_URL ? process.env.NEXT_PUBLIC_URL : "";
+  return publicUrl;
 }
 function resolveHref(href = "") {
-  return href.startsWith("http") ? href : `${getOrigin()}${href}`;
+  return href.startsWith("http") ? href : `${getPublicUrl()}${href}`;
 }
 
 // src/preview/preview.handler.ts
@@ -1271,6 +1271,7 @@ function routeRevalidateHandler() {
 }
 
 // src/route/route.interceptor.ts
+import { getHost } from "@websolutespa/bom-core";
 import { StoreStrategy, localApiPost, storeApiPost, storeStrategy } from "@websolutespa/bom-mixer-store";
 import { NextResponse } from "next/server";
 async function routeInterceptor(request, next) {
@@ -1313,8 +1314,8 @@ async function routeInterceptor(request, next) {
 function getHrefBeforeRedirect(request) {
   let hrefBeforeRedirect = null;
   const urlBeforeRedirect = request.nextUrl.clone();
-  const host = request.headers.get("host");
-  if (typeof host === "string") {
+  const host = getHost(request.headers);
+  if (host) {
     urlBeforeRedirect.host = host;
     urlBeforeRedirect.port = host.split(":")[1] || "";
     hrefBeforeRedirect = urlBeforeRedirect.href;
@@ -1331,6 +1332,9 @@ var getSeoWeight = (index = 0, seoWeight) => {
   return getter;
 };
 
+// src/sitemap/sitemap.handler.ts
+import { getOrigin } from "@websolutespa/bom-core";
+
 // src/sitemap/sitemap.service.ts
 import { eachMarketLocale } from "@websolutespa/bom-core";
 async function getSiteMapIndex(origin) {
@@ -1588,17 +1592,9 @@ async function getSiteMapXSL(localeId) {
 }
 
 // src/sitemap/sitemap.handler.ts
-var ORIGIN = process.env.NEXT_PUBLIC_URL || "";
-function getOrigin2(host) {
-  if (host) {
-    return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
-  } else {
-    return ORIGIN;
-  }
-}
 var getSiteMapIndexProps = async (context) => {
   const { req, res } = context;
-  const sitemap = await getSiteMapIndex(getOrigin2(req.headers.host));
+  const sitemap = await getSiteMapIndex(getOrigin(req.headers));
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1613,7 +1609,7 @@ var getSiteMapXMLProps = async (context) => {
   const params = context.params;
   const market = params?.market;
   const locale = params?.locale;
-  const sitemap = await getSiteMapXML(getOrigin2(req.headers.host), market, locale);
+  const sitemap = await getSiteMapXML(getOrigin(req.headers), market, locale);
   res.setHeader("Content-Type", "application/xml; charset=UTF-8");
   res.setHeader("X-Frame-Options", "SAMEORIGIN");
   res.setHeader("X-Robots-Tag", "noindex, follow");
@@ -1640,26 +1636,35 @@ var getSiteMapXSLProps = async (context) => {
 };
 
 // src/structured_data/structured_data.ts
+import { asCategoryId as asCategoryId2 } from "@websolutespa/bom-core";
 var DefaultStructuredDataCollections = {
   article: ["news_detail"]
 };
-function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
+function resolveTemplate(value) {
+  return asCategoryId2(value);
+}
+function resolveMediaSrc(media) {
+  return resolveHref(media.src || media.url);
+}
+function resolveStructuredData(page, websiteName = "WebsiteName", types = DefaultStructuredDataCollections) {
   let schema = null;
   const json = null;
-  const pageType = page.template || page.schema || "";
+  let pageType = page.schema || "";
+  if (page.template) {
+    pageType = asCategoryId2(page.template);
+  }
   if (types.article.includes(pageType)) {
     schema = {
       "@context": "https://schema.org",
       "@type": "NewsArticle",
       headline: page.title,
-      image: page.media ? [resolveHref(page.media.src)] : [],
+      image: page.media ? [resolveMediaSrc(page.media)] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{
-        "@type": "Organization",
-        name: "WebsiteName"
-        // 'Autorità del bacino distrettuale dell\'Appennino Centrale',
-        // url: 'https://twitter.com/autoritadac',
+        "@type": "Person",
+        name: websiteName,
+        url: getPublicUrl()
       }]
     };
   }
@@ -1702,7 +1707,6 @@ export {
   getMenus,
   getOrder,
   getOrders,
-  getOrigin,
   getPage,
   getPageCategory,
   getPageProps,
@@ -1712,6 +1716,7 @@ export {
   getPreviewProps,
   getProvince,
   getProvinces,
+  getPublicUrl,
   getRedirect,
   getRedirects,
   getRegion,
@@ -1735,8 +1740,10 @@ export {
   redirectTo,
   resolveHref,
   resolveLabel,
+  resolveMediaSrc,
   resolveRoute,
   resolveStructuredData,
+  resolveTemplate,
   routeInterceptor,
   routeRevalidateHandler,
   routeToRouteLink,

package/package.json

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

package/src/page/page.service.ts

@@ -198,11 +198,11 @@ 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 getPublicUrl() {
+  const publicUrl = process.env && process.env.NEXT_PUBLIC_URL ? process.env.NEXT_PUBLIC_URL : '';
+  return publicUrl;
 }
 
 export function resolveHref(href: string = '') {
-  return href.startsWith('http') ? href : `${getOrigin()}${href}`;
+  return href.startsWith('http') ? href : `${getPublicUrl()}${href}`;
 }

package/src/route/route.interceptor.ts

@@ -1,4 +1,4 @@
-import { IRoute } from '@websolutespa/bom-core';
+import { IRoute, getHost } from '@websolutespa/bom-core';
 import { StoreStrategy, localApiPost, storeApiPost, storeStrategy } from '@websolutespa/bom-mixer-store';
 import { NextFetchEvent, NextRequest, NextResponse } from 'next/server';
 import { resolveRoute } from './route.service';
@@ -51,17 +51,11 @@ export async function routeInterceptor(request: NextRequest, next: NextFetchEven
 function getHrefBeforeRedirect(request: NextRequest): string | null {
   let hrefBeforeRedirect: string | null = null;
   const urlBeforeRedirect = request.nextUrl.clone();
-  const host = request.headers.get('host');
-  if (typeof host === 'string') {
+  const host = getHost(request.headers);
+  if (host) {
     urlBeforeRedirect.host = host;
     urlBeforeRedirect.port = host.split(':')[1] || '';
     hrefBeforeRedirect = urlBeforeRedirect.href;
   }
-  /*
-  console.log('urlBeforeRedirect', urlBeforeRedirect.href);
-  console.log('url', request.url);
-  console.log('nextUrl', request.nextUrl.href, 'origin', request.nextUrl.origin);
-  console.log('host', request.headers.get('host'), 'referer', request.headers.get('referer'));
-  */
   return hrefBeforeRedirect;
 }

package/src/sitemap/sitemap.handler.ts

@@ -1,21 +1,11 @@
-import { IContextParams } from '@websolutespa/bom-core';
+import { IContextParams, getOrigin } from '@websolutespa/bom-core';
 import { GetServerSideProps } from 'next';
 import { getSiteMapIndex, getSiteMapXML, getSiteMapXSL } from './sitemap.service';
 
-const ORIGIN = process.env.NEXT_PUBLIC_URL || '';
-
-function getOrigin(host?: string): string {
-  if (host) {
-    return host.indexOf('localhost') !== -1 ? 'http://' + host : 'https://' + host;
-  } else {
-    return ORIGIN;
-  }
-}
-
 export const getSiteMapIndexProps: GetServerSideProps = async (context) => {
   const { req, res } = context;
   // console.log('getSiteMapIndexProps', req.headers.location, req.headers.host, req.headers.origin, req.headers.protocol);
-  const sitemap = await getSiteMapIndex(getOrigin(req.headers.host));
+  const sitemap = await getSiteMapIndex(getOrigin(req.headers));
   res.setHeader('Content-Type', 'application/xml; charset=UTF-8');
   res.setHeader('X-Frame-Options', 'SAMEORIGIN');
   res.setHeader('X-Robots-Tag', 'noindex, follow');
@@ -32,7 +22,7 @@ export const getSiteMapXMLProps: GetServerSideProps = async (context) => {
   const params = context.params as IContextParams;
   const market = params?.market;
   const locale = params?.locale;
-  const sitemap = await getSiteMapXML(getOrigin(req.headers.host), market, locale);
+  const sitemap = await getSiteMapXML(getOrigin(req.headers), market, locale);
   res.setHeader('Content-Type', 'application/xml; charset=UTF-8');
   res.setHeader('X-Frame-Options', 'SAMEORIGIN');
   res.setHeader('X-Robots-Tag', 'noindex, follow');

package/src/structured_data/structured_data.ts

@@ -1,5 +1,5 @@
-import { IPage } from '@websolutespa/bom-core';
-import { resolveHref } from '../page/page.service';
+import { IMedia, IPage, asCategoryId } from '@websolutespa/bom-core';
+import { getPublicUrl, resolveHref } from '../page/page.service';
 
 export type StructuredDataPerson = {
   '@type': 'Person';
@@ -83,22 +83,37 @@ const DefaultStructuredDataCollections: StructuredDataCollections = {
   article: ['news_detail'],
 };
 
-export function resolveStructuredData(page: IPage, types: StructuredDataCollections = DefaultStructuredDataCollections): string | undefined {
+export function resolveTemplate(value: any): string | undefined {
+  return asCategoryId(value);
+}
+
+export function resolveMediaSrc(media: IMedia): string | undefined {
+  return resolveHref(media.src || media.url);
+}
+
+export function resolveStructuredData(
+  page: IPage,
+  websiteName = 'WebsiteName',
+  types: StructuredDataCollections = DefaultStructuredDataCollections
+): string | undefined {
   let schema = null;
   const json: {} | null = null;
-  const pageType = page.template || page.schema || '';
+  let pageType = page.schema || '';
+  if (page.template) {
+    pageType = asCategoryId(page.template);
+  }
   if (types.article.includes(pageType)) {
     schema = {
       '@context': 'https://schema.org',
       '@type': 'NewsArticle',
       headline: page.title,
-      image: page.media ? [resolveHref(page.media.src)] : [],
+      image: page.media ? [resolveMediaSrc(page.media)] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{
-        '@type': 'Organization',
-        name: 'WebsiteName', // 'Autorità del bacino distrettuale dell\'Appennino Centrale',
-        // url: 'https://twitter.com/autoritadac',
+        '@type': 'Person',
+        name: websiteName,
+        url: getPublicUrl(),
       }],
     } as StructuredDataArticle;
   }