@websolutespa/bom-mixer-models 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-models
 
+## 1.8.2
+
+### Patch Changes
+
+- Modified: SiteMapService, StructuredData
+
+## 1.8.1
+
+### Patch Changes
+
+- Modified: getErrorPageLayout
+
 ## 1.8.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -257,11 +257,14 @@ type StructuredDataAddress = {
     streetAddress: string;
 };
 type StructuredDataPlace = {
+    '@context'?: 'https://schema.org';
     '@type': 'Place';
     name: string;
     address: StructuredDataAddress;
+    url: string;
 };
 type StructuredDataOrganization = {
+    '@context'?: 'https://schema.org';
     '@type': 'Organization';
     address?: StructuredDataAddress;
     alumni?: StructuredDataPerson[];
@@ -270,16 +273,27 @@ type StructuredDataOrganization = {
     member?: StructuredDataOrganization[];
     name: string;
     telephone?: string;
+    brand?: StructuredDataBrand;
     url?: string;
 };
+type StructuredDataProduct = {
+    '@context'?: 'https://schema.org';
+    '@type': 'Product';
+    name: string;
+    description?: string;
+    image?: string;
+    brand: StructuredDataBrand;
+    url: string;
+};
 type StructuredDataArticle = {
-    '@context': 'https://schema.org';
+    '@context'?: 'https://schema.org';
     '@type': 'Article' | 'BlogPosting' | 'NewsArticle';
     author: (StructuredDataPerson | StructuredDataOrganization)[];
     dateModified: Date | string;
     datePublished: Date | string;
     headline: string;
     image: string[];
+    url: string;
 };
 type StructuredDataEvent = {
     '@context': 'https://schema.org';
@@ -293,11 +307,30 @@ type StructuredDataEvent = {
     offers?: StructuredDataOffer;
     performer?: StructuredDataPerformingGroup;
     organizer?: StructuredDataOrganization;
+    url: string;
+};
+type StructuredDataBrand = {
+    '@context'?: 'https://schema.org';
+    '@type': 'Brand';
+    name: string;
+    description?: string;
+    logo?: string;
+    url: string;
+};
+type IBrand = {
+    name: string;
+    description?: string;
+    logo?: string;
+    url?: string;
 };
-type StructuredDataKeys = 'article';
+type StructuredDataKeys = 'product' | 'article' | 'contact' | 'brand';
 type StructuredDataCollections = Record<StructuredDataKeys, string[]>;
 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;
+declare function resolveStructuredDataProduct(page: IPage, brand?: IBrand): StructuredDataProduct;
+declare function resolveStructuredDataArticle(page: IPage, brand?: IBrand): StructuredDataArticle;
+declare function resolveStructuredDataOrganization(page: IPage, brand?: IBrand): StructuredDataOrganization;
+declare function resolveStructuredDataBrand(page: IPage, brand?: IBrand): StructuredDataBrand;
+declare function resolveStructuredData(page: IPage, types?: Partial<StructuredDataCollections>, brand?: IBrand): string | undefined;
 
-export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, ICompanyAddress, IFeatureType, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILink, IModelStore, INullableLazyableProps, ISiteMap, LAZY_PROPS, NotFound, PartialPageProps, SeoWeight, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, categoryToRouteLink, findManyPages, findOnePage, getAddressOptions, getBreadcrumbFromSegments, getCaptionsVttProps, getCategories, getCategory, getCountries, getCountry, getDecoratedComponents, getErrorPageLayout, getFeatureType, getFeatureTypes, getLabel, getLabels, getLayout, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getPage, getPageCategory, getPageProps, getPageRoutes, getPreviewProps, getProvince, getProvinces, getPublicUrl, getRedirect, getRedirects, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, newRouteLink, redirectTo, resolveHref, resolveLabel, resolveMediaSrc, resolveRoute, resolveStructuredData, resolveTemplate, routeInterceptor, routeRevalidateHandler, routeToRouteLink, withLazyProps };
+export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, IBrand, ICompanyAddress, IFeatureType, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILink, IModelStore, INullableLazyableProps, ISiteMap, LAZY_PROPS, NotFound, PartialPageProps, SeoWeight, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataBrand, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, StructuredDataProduct, categoryToRouteLink, findManyPages, findOnePage, getAddressOptions, getBreadcrumbFromSegments, getCaptionsVttProps, getCategories, getCategory, getCountries, getCountry, getDecoratedComponents, getErrorPageLayout, getFeatureType, getFeatureTypes, getLabel, getLabels, getLayout, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getPage, getPageCategory, getPageProps, getPageRoutes, getPreviewProps, getProvince, getProvinces, getPublicUrl, getRedirect, getRedirects, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, newRouteLink, redirectTo, resolveHref, resolveLabel, resolveMediaSrc, resolveRoute, resolveStructuredData, resolveStructuredDataArticle, resolveStructuredDataBrand, resolveStructuredDataOrganization, resolveStructuredDataProduct, resolveTemplate, routeInterceptor, routeRevalidateHandler, routeToRouteLink, withLazyProps };

package/dist/index.js

@@ -79,6 +79,10 @@ __export(src_exports, {
   resolveMediaSrc: () => resolveMediaSrc,
   resolveRoute: () => resolveRoute,
   resolveStructuredData: () => resolveStructuredData,
+  resolveStructuredDataArticle: () => resolveStructuredDataArticle,
+  resolveStructuredDataBrand: () => resolveStructuredDataBrand,
+  resolveStructuredDataOrganization: () => resolveStructuredDataOrganization,
+  resolveStructuredDataProduct: () => resolveStructuredDataProduct,
   resolveTemplate: () => resolveTemplate,
   routeInterceptor: () => routeInterceptor,
   routeRevalidateHandler: () => routeRevalidateHandler,
@@ -621,16 +625,22 @@ async function getErrorPageLayout() {
   const layout = await getLayout(import_bom_core3.defaultMarket, import_bom_core3.defaultLocale);
   const title = resolveLabel(layout.labels, "notfound.title");
   const abstract = resolveLabel(layout.labels, "notfound.abstract");
+  const category = layout.tree ? {
+    id: layout.tree.category,
+    title: layout.tree.title,
+    href: layout.tree.href,
+    slug: ""
+  } : {
+    id: "homepage",
+    title: "Homepage",
+    slug: "",
+    href: "/"
+  };
   const page = {
     abstract,
     alternates: [],
     breadcrumb: [],
-    category: {
-      id: "homepage",
-      title: "homepage",
-      slug: "",
-      href: ""
-    },
+    category,
     slug: "",
     href: "",
     id: "notfound",
@@ -825,7 +835,7 @@ function getSiteMapXMLLastMod(canonical) {
 function getSiteMapXMLImage(canonical) {
   return canonical.media ? `
     <image:image>
-      <image:loc>${canonical.media.src}</image:loc>
+      <image:loc>${canonical.media.src || canonical.media.url}</image:loc>
     </image:image>` : "";
 }
 function getSiteMapXMLAlternates(origin, canonical) {
@@ -1091,7 +1101,10 @@ var getSiteMapXSLProps = async (context) => {
 // src/structured_data/structured_data.ts
 var import_bom_core7 = require("@websolutespa/bom-core");
 var DefaultStructuredDataCollections = {
-  article: ["news_detail"]
+  product: ["product_detail"],
+  article: ["news_detail"],
+  contact: ["contact"],
+  brand: ["homepage"]
 };
 function resolveTemplate(value) {
   return (0, import_bom_core7.asEquatableString)(value);
@@ -1099,28 +1112,87 @@ function resolveTemplate(value) {
 function resolveMediaSrc(media) {
   return resolveHref(media.src || media.url);
 }
-function resolveStructuredData(page, websiteName = "WebsiteName", types = DefaultStructuredDataCollections) {
-  let schema = null;
+function resolveStructuredDataProduct(page, brand) {
+  const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Product",
+    name: page.title,
+    image: mediaSrc || "",
+    brand: resolveStructuredDataBrand(page, brand),
+    url: resolveHref(page.href)
+  };
+  return schema;
+}
+function resolveStructuredDataArticle(page, brand) {
+  const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Article",
+    headline: page.title,
+    image: mediaSrc ? [mediaSrc] : [],
+    datePublished: page.createdAt,
+    dateModified: page.updatedAt,
+    author: [
+      resolveStructuredDataOrganization(page, brand)
+    ],
+    url: resolveHref(page.href)
+  };
+  return schema;
+}
+function resolveStructuredDataOrganization(page, brand = {
+  name: "WebsiteName"
+}) {
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Organization",
+    name: brand.name,
+    brand: resolveStructuredDataBrand(page, brand),
+    url: resolveHref(page.href)
+  };
+  return schema;
+}
+function resolveStructuredDataBrand(page, brand = {
+  name: "WebsiteName"
+}) {
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Brand",
+    name: brand.name,
+    url: brand.url || getPublicUrl()
+  };
+  if (brand.description) {
+    schema.description = brand.description;
+  }
+  if (brand.logo) {
+    schema.logo = resolveHref(brand.logo);
+  }
+  return schema;
+}
+function resolveStructuredData(page, types, brand) {
+  const structuredDataCollections = {
+    ...DefaultStructuredDataCollections,
+    ...types
+  };
   let pageType = page.schema || "";
   if (page.template) {
     pageType = (0, import_bom_core7.asEquatableString)(page.template);
   }
-  if (types.article.includes(pageType)) {
-    const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
-    schema = {
-      "@context": "https://schema.org",
-      "@type": "NewsArticle",
-      headline: page.title,
-      image: mediaSrc ? [mediaSrc] : [],
-      datePublished: page.createdAt,
-      dateModified: page.updatedAt,
-      author: [{
-        "@type": "Person",
-        name: websiteName,
-        url: getPublicUrl()
-      }]
-    };
-  }
+  const schema = Object.entries(structuredDataCollections).reduce((p, kv) => {
+    if (p) {
+      return p;
+    }
+    switch (kv[0]) {
+      case "product":
+        return kv[1].includes(pageType) ? resolveStructuredDataProduct(page, brand) : null;
+      case "article":
+        return kv[1].includes(pageType) ? resolveStructuredDataArticle(page, brand) : null;
+      case "contact":
+        return kv[1].includes(pageType) ? resolveStructuredDataOrganization(page, brand) : null;
+      default:
+        return resolveStructuredDataBrand(page, brand);
+    }
+  }, null);
   if (schema) {
     return JSON.stringify(schema);
   }
@@ -1187,6 +1259,10 @@ function resolveStructuredData(page, websiteName = "WebsiteName", types = Defaul
   resolveMediaSrc,
   resolveRoute,
   resolveStructuredData,
+  resolveStructuredDataArticle,
+  resolveStructuredDataBrand,
+  resolveStructuredDataOrganization,
+  resolveStructuredDataProduct,
   resolveTemplate,
   routeInterceptor,
   routeRevalidateHandler,

package/dist/index.mjs

@@ -532,16 +532,22 @@ async function getErrorPageLayout() {
   const layout = await getLayout(defaultMarket2, defaultLocale2);
   const title = resolveLabel(layout.labels, "notfound.title");
   const abstract = resolveLabel(layout.labels, "notfound.abstract");
+  const category = layout.tree ? {
+    id: layout.tree.category,
+    title: layout.tree.title,
+    href: layout.tree.href,
+    slug: ""
+  } : {
+    id: "homepage",
+    title: "Homepage",
+    slug: "",
+    href: "/"
+  };
   const page = {
     abstract,
     alternates: [],
     breadcrumb: [],
-    category: {
-      id: "homepage",
-      title: "homepage",
-      slug: "",
-      href: ""
-    },
+    category,
     slug: "",
     href: "",
     id: "notfound",
@@ -736,7 +742,7 @@ function getSiteMapXMLLastMod(canonical) {
 function getSiteMapXMLImage(canonical) {
   return canonical.media ? `
     <image:image>
-      <image:loc>${canonical.media.src}</image:loc>
+      <image:loc>${canonical.media.src || canonical.media.url}</image:loc>
     </image:image>` : "";
 }
 function getSiteMapXMLAlternates(origin, canonical) {
@@ -1002,7 +1008,10 @@ var getSiteMapXSLProps = async (context) => {
 // src/structured_data/structured_data.ts
 import { asEquatableString } from "@websolutespa/bom-core";
 var DefaultStructuredDataCollections = {
-  article: ["news_detail"]
+  product: ["product_detail"],
+  article: ["news_detail"],
+  contact: ["contact"],
+  brand: ["homepage"]
 };
 function resolveTemplate(value) {
   return asEquatableString(value);
@@ -1010,28 +1019,87 @@ function resolveTemplate(value) {
 function resolveMediaSrc(media) {
   return resolveHref(media.src || media.url);
 }
-function resolveStructuredData(page, websiteName = "WebsiteName", types = DefaultStructuredDataCollections) {
-  let schema = null;
+function resolveStructuredDataProduct(page, brand) {
+  const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Product",
+    name: page.title,
+    image: mediaSrc || "",
+    brand: resolveStructuredDataBrand(page, brand),
+    url: resolveHref(page.href)
+  };
+  return schema;
+}
+function resolveStructuredDataArticle(page, brand) {
+  const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Article",
+    headline: page.title,
+    image: mediaSrc ? [mediaSrc] : [],
+    datePublished: page.createdAt,
+    dateModified: page.updatedAt,
+    author: [
+      resolveStructuredDataOrganization(page, brand)
+    ],
+    url: resolveHref(page.href)
+  };
+  return schema;
+}
+function resolveStructuredDataOrganization(page, brand = {
+  name: "WebsiteName"
+}) {
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Organization",
+    name: brand.name,
+    brand: resolveStructuredDataBrand(page, brand),
+    url: resolveHref(page.href)
+  };
+  return schema;
+}
+function resolveStructuredDataBrand(page, brand = {
+  name: "WebsiteName"
+}) {
+  const schema = {
+    "@context": "https://schema.org",
+    "@type": "Brand",
+    name: brand.name,
+    url: brand.url || getPublicUrl()
+  };
+  if (brand.description) {
+    schema.description = brand.description;
+  }
+  if (brand.logo) {
+    schema.logo = resolveHref(brand.logo);
+  }
+  return schema;
+}
+function resolveStructuredData(page, types, brand) {
+  const structuredDataCollections = {
+    ...DefaultStructuredDataCollections,
+    ...types
+  };
   let pageType = page.schema || "";
   if (page.template) {
     pageType = asEquatableString(page.template);
   }
-  if (types.article.includes(pageType)) {
-    const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
-    schema = {
-      "@context": "https://schema.org",
-      "@type": "NewsArticle",
-      headline: page.title,
-      image: mediaSrc ? [mediaSrc] : [],
-      datePublished: page.createdAt,
-      dateModified: page.updatedAt,
-      author: [{
-        "@type": "Person",
-        name: websiteName,
-        url: getPublicUrl()
-      }]
-    };
-  }
+  const schema = Object.entries(structuredDataCollections).reduce((p, kv) => {
+    if (p) {
+      return p;
+    }
+    switch (kv[0]) {
+      case "product":
+        return kv[1].includes(pageType) ? resolveStructuredDataProduct(page, brand) : null;
+      case "article":
+        return kv[1].includes(pageType) ? resolveStructuredDataArticle(page, brand) : null;
+      case "contact":
+        return kv[1].includes(pageType) ? resolveStructuredDataOrganization(page, brand) : null;
+      default:
+        return resolveStructuredDataBrand(page, brand);
+    }
+  }, null);
   if (schema) {
     return JSON.stringify(schema);
   }
@@ -1097,6 +1165,10 @@ export {
   resolveMediaSrc,
   resolveRoute,
   resolveStructuredData,
+  resolveStructuredDataArticle,
+  resolveStructuredDataBrand,
+  resolveStructuredDataOrganization,
+  resolveStructuredDataProduct,
   resolveTemplate,
   routeInterceptor,
   routeRevalidateHandler,

package/package.json

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

package/src/page/page.service.ts

@@ -157,21 +157,28 @@ export async function getPageCategory<T extends ICategorized>(schema: string, pa
 
 export async function getErrorPageLayout(): Promise<{ layout: ILayout, page: IPage }> {
   const layout = await getLayout(defaultMarket, defaultLocale);
-  // console.log('getErrorPageLayout', layout);
+  // console.log('getErrorPageLayout', 'layout', layout);
   const title = resolveLabel(layout.labels, 'notfound.title');
-  // console.log('title', title);
+  // console.log('getErrorPageLayout', 'title', title);
   const abstract = resolveLabel(layout.labels, 'notfound.abstract');
-  // console.log('abstract', abstract);
+  // console.log('getErrorPageLayout', 'abstract', abstract);
+  const category = layout.tree ? {
+    id: layout.tree.category,
+    title: layout.tree.title,
+    href: layout.tree.href,
+    slug: '',
+  } : {
+    id: 'homepage',
+    title: 'Homepage',
+    slug: '',
+    href: '/',
+  };
+  // console.log('getErrorPageLayout', 'category', category);
   const page: IPage = {
     abstract,
     alternates: [],
     breadcrumb: [],
-    category: {
-      id: 'homepage',
-      title: 'homepage',
-      slug: '',
-      href: '',
-    },
+    category,
     slug: '',
     href: '',
     id: 'notfound',
@@ -187,7 +194,7 @@ export async function getErrorPageLayout(): Promise<{ layout: ILayout, page: IPa
     schema: 'notfound' as SchemaType,
     title,
   };
-  // console.log('page', page);
+  // console.log('getErrorPageLayout', 'page', page);
   return { layout, page };
 }
 

package/src/sitemap/sitemap.service.ts

@@ -46,7 +46,7 @@ function getSiteMapXMLLastMod(canonical: IRouteCanonical): string {
 function getSiteMapXMLImage(canonical: IRouteCanonical): string {
   return canonical.media ? `
     <image:image>
-      <image:loc>${canonical.media.src}</image:loc>
+      <image:loc>${canonical.media.src || canonical.media.url}</image:loc>
     </image:image>` : '';
 }
 

package/src/structured_data/structured_data.ts

@@ -31,12 +31,15 @@ export type StructuredDataAddress = {
 };
 
 export type StructuredDataPlace = {
+  '@context'?: 'https://schema.org';
   '@type': 'Place';
   name: string;
   address: StructuredDataAddress;
+  url: string;
 };
 
 export type StructuredDataOrganization = {
+  '@context'?: 'https://schema.org';
   '@type': 'Organization';
   address?: StructuredDataAddress;
   alumni?: StructuredDataPerson[];
@@ -45,17 +48,29 @@ export type StructuredDataOrganization = {
   member?: StructuredDataOrganization[];
   name: string;
   telephone?: string;
+  brand?: StructuredDataBrand;
   url?: string;
 };
 
+export type StructuredDataProduct = {
+  '@context'?: 'https://schema.org';
+  '@type': 'Product';
+  name: string;
+  description?: string;
+  image?: string;
+  brand: StructuredDataBrand;
+  url: string;
+};
+
 export type StructuredDataArticle = {
-  '@context': 'https://schema.org';
+  '@context'?: 'https://schema.org';
   '@type': 'Article' | 'BlogPosting' | 'NewsArticle';
   author: (StructuredDataPerson | StructuredDataOrganization)[];
   dateModified: Date | string;
   datePublished: Date | string;
   headline: string;
   image: string[];
+  url: string;
 };
 
 export type StructuredDataEvent = {
@@ -74,13 +89,33 @@ export type StructuredDataEvent = {
   offers?: StructuredDataOffer,
   performer?: StructuredDataPerformingGroup,
   organizer?: StructuredDataOrganization;
+  url: string;
 };
 
-export type StructuredDataKeys = 'article';
+export type StructuredDataBrand = {
+  '@context'?: 'https://schema.org';
+  '@type': 'Brand';
+  name: string;
+  description?: string;
+  logo?: string;
+  url: string;
+};
+
+export type IBrand = {
+  name: string;
+  description?: string;
+  logo?: string;
+  url?: string;
+};
+
+export type StructuredDataKeys = 'product' | 'article' | 'contact' | 'brand';
 export type StructuredDataCollections = Record<StructuredDataKeys, string[]>;
 
 const DefaultStructuredDataCollections: StructuredDataCollections = {
+  product: ['product_detail'],
   article: ['news_detail'],
+  contact: ['contact'],
+  brand: ['homepage'],
 };
 
 export function resolveTemplate(value: any): string | undefined {
@@ -91,32 +126,107 @@ export function resolveMediaSrc(media: IMedia): string | undefined {
   return resolveHref(media.src || media.url);
 }
 
+export function resolveStructuredDataProduct(
+  page: IPage,
+  brand?: IBrand
+): StructuredDataProduct {
+  const mediaSrc = page.media ? resolveMediaSrc(page.media) : undefined;
+  const schema: StructuredDataProduct = {
+    '@context': 'https://schema.org',
+    '@type': 'Product',
+    name: page.title,
+    image: mediaSrc || '',
+    brand: resolveStructuredDataBrand(page, brand),
+    url: resolveHref(page.href),
+  };
+  return schema;
+}
+
+export function resolveStructuredDataArticle(
+  page: IPage,
+  brand?: IBrand
+): StructuredDataArticle {
+  const mediaSrc = page.media ? resolveMediaSrc(page.media) : undefined;
+  const schema: StructuredDataArticle = {
+    '@context': 'https://schema.org',
+    '@type': 'Article',
+    headline: page.title,
+    image: mediaSrc ? [mediaSrc] : [],
+    datePublished: page.createdAt,
+    dateModified: page.updatedAt,
+    author: [
+      resolveStructuredDataOrganization(page, brand),
+    ],
+    url: resolveHref(page.href),
+  } as StructuredDataArticle;
+  return schema;
+}
+
+export function resolveStructuredDataOrganization(
+  page: IPage,
+  brand: IBrand = {
+    name: 'WebsiteName',
+  }
+): StructuredDataOrganization {
+  const schema: StructuredDataOrganization = {
+    '@context': 'https://schema.org',
+    '@type': 'Organization',
+    name: brand.name,
+    brand: resolveStructuredDataBrand(page, brand),
+    url: resolveHref(page.href),
+  };
+  return schema;
+}
+
+export function resolveStructuredDataBrand(
+  page: IPage,
+  brand: IBrand = {
+    name: 'WebsiteName',
+  }
+): StructuredDataBrand {
+  const schema: StructuredDataBrand = {
+    '@context': 'https://schema.org',
+    '@type': 'Brand',
+    name: brand.name,
+    url: brand.url || getPublicUrl(),
+  };
+  if (brand.description) {
+    schema.description = brand.description;
+  }
+  if (brand.logo) {
+    schema.logo = resolveHref(brand.logo);
+  }
+  return schema;
+}
+
 export function resolveStructuredData(
   page: IPage,
-  websiteName = 'WebsiteName',
-  types: StructuredDataCollections = DefaultStructuredDataCollections
+  types?: Partial<StructuredDataCollections>,
+  brand?: IBrand
 ): string | undefined {
-  let schema: {} | null = null;
+  const structuredDataCollections: StructuredDataCollections = {
+    ...DefaultStructuredDataCollections,
+    ...types,
+  };
   let pageType = page.schema || '';
   if (page.template) {
     pageType = asEquatableString(page.template);
   }
-  if (types.article.includes(pageType)) {
-    const mediaSrc = page.media ? resolveMediaSrc(page.media) : undefined;
-    schema = {
-      '@context': 'https://schema.org',
-      '@type': 'NewsArticle',
-      headline: page.title,
-      image: mediaSrc ? [mediaSrc] : [],
-      datePublished: page.createdAt,
-      dateModified: page.updatedAt,
-      author: [{
-        '@type': 'Person',
-        name: websiteName,
-        url: getPublicUrl(),
-      }],
-    } as StructuredDataArticle;
-  }
+  const schema = Object.entries(structuredDataCollections).reduce<null | {}>((p, kv) => {
+    if (p) {
+      return p;
+    }
+    switch (kv[0]) {
+      case 'product':
+        return kv[1].includes(pageType) ? resolveStructuredDataProduct(page, brand) : null;
+      case 'article':
+        return kv[1].includes(pageType) ? resolveStructuredDataArticle(page, brand) : null;
+      case 'contact':
+        return kv[1].includes(pageType) ? resolveStructuredDataOrganization(page, brand) : null;
+      default:
+        return resolveStructuredDataBrand(page, brand);
+    }
+  }, null);
   if (schema) {
     return JSON.stringify(schema);
   }