@websolutespa/bom-mixer-models 1.7.3 → 1.7.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @websolutespa/bom-mixer-models
 
+## 1.7.4
+
+### Patch Changes
+
+- Modified: structuredData
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.5
+
 ## 1.7.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -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, 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, 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

@@ -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,
@@ -1735,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()
       }]
     };
   }
@@ -1831,8 +1842,10 @@ function resolveStructuredData(page, types = DefaultStructuredDataCollections) {
   redirectTo,
   resolveHref,
   resolveLabel,
+  resolveMediaSrc,
   resolveRoute,
   resolveStructuredData,
+  resolveTemplate,
   routeInterceptor,
   routeRevalidateHandler,
   routeToRouteLink,

package/dist/index.mjs

@@ -1636,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()
       }]
     };
   }
@@ -1731,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.3",
+  "version": "1.7.4",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",

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;
   }