From 2a619323706d821780630688b42ba88e23c35ead Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Mon, 28 Jun 2021 11:24:16 -0500
Subject: [PATCH 01/11] Add Ability to pas in custom data

Add ability to pass in customMetadata object to spread onto preset google structured data.
---
 .../page/metadata/google-structured-data/content.js           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/marko-web/components/page/metadata/google-structured-data/content.js b/packages/marko-web/components/page/metadata/google-structured-data/content.js
index 621c3e958..b960c44c3 100644
--- a/packages/marko-web/components/page/metadata/google-structured-data/content.js
+++ b/packages/marko-web/components/page/metadata/google-structured-data/content.js
@@ -17,7 +17,7 @@ const getImages = (node) => {
   return images.length ? images : undefined;
 };
 
-module.exports = (node) => {
+module.exports = (node, customMetadata = {}) => {
   const publishedISOString = node.published ? (new Date(node.published)).toISOString() : undefined;
   const updatedISOString = node.updated ? (new Date(node.updated)).toISOString() : undefined;
   if (node.type === 'video') {
@@ -31,6 +31,7 @@ module.exports = (node) => {
       contentUrl: get(node, 'siteContext.canonicalUrl'),
       author: getAuthor(node),
       embedUrl: get(node, 'embedSrc'),
+      ...customMetadata,
     });
     return structuredData;
   }
@@ -50,6 +51,7 @@ module.exports = (node) => {
       dateModified: updatedISOString,
       author: getAuthor(node),
       description: get(node, 'metadata.description'),
+      ...customMetadata,
     });
     return structuredData;
   }

From 456efc5a08611dc9b0aae9ae16e5691813c1128c Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Mon, 28 Jun 2021 11:26:48 -0500
Subject: [PATCH 02/11] add required fields to pass custom Metadata

Add need calls to pass customMetada from page layout to generation of metadata.
---
 packages/marko-web/components/page/layouts/content.marko  | 4 ++--
 packages/marko-web/components/page/layouts/marko.json     | 1 +
 packages/marko-web/components/page/metadata/content.marko | 4 ++--
 packages/marko-web/components/page/metadata/marko.json    | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/marko-web/components/page/layouts/content.marko b/packages/marko-web/components/page/layouts/content.marko
index 675ff2914..0f72cd71d 100644
--- a/packages/marko-web/components/page/layouts/content.marko
+++ b/packages/marko-web/components/page/layouts/content.marko
@@ -1,4 +1,4 @@
-$ const { id, type } = input;
+$ const { customMetadata, id, type } = input;
 $ const { document } = out.global;
 
 <${document}
@@ -7,7 +7,7 @@ $ const { document } = out.global;
   foot=input.foot
 >
   <@head>
-    <marko-web-content-page-metadata id=id />
+    <marko-web-content-page-metadata id=id custom-metadata=customMetadata/>
     <${input.head} />
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
diff --git a/packages/marko-web/components/page/layouts/marko.json b/packages/marko-web/components/page/layouts/marko.json
index 7101f5cc4..3c2d8c573 100644
--- a/packages/marko-web/components/page/layouts/marko.json
+++ b/packages/marko-web/components/page/layouts/marko.json
@@ -40,6 +40,7 @@
     "<page>": {},
     "<above-page>": {},
     "<below-page>": {},
+    "@custom-metadata": {},
     "@id": "number",
     "@type": "string",
     "@attrs": "object"
diff --git a/packages/marko-web/components/page/metadata/content.marko b/packages/marko-web/components/page/metadata/content.marko
index 2bc997fe6..00dc9f649 100644
--- a/packages/marko-web/components/page/metadata/content.marko
+++ b/packages/marko-web/components/page/metadata/content.marko
@@ -5,7 +5,7 @@ import buildStructuredData from "./google-structured-data/content";
 
 <!-- @todo This data should generated and saved to the content object as flat data, so no relationships are required. -->
 
-$ const { id } = input;
+$ const { customMetadata, id } = input;
 $ const queryFragment = gql`
 fragment ContentPageMetadataFragment on Content {
   id
@@ -87,7 +87,7 @@ fragment ContentPageMetadataFragment on Content {
       </if>
     </else>
 
-    $ const structuredData = buildStructuredData(node);
+    $ const structuredData = buildStructuredData(node, customMetadata);
     <if(structuredData)>
       <script type="application/ld+json">
         ${structuredData}
diff --git a/packages/marko-web/components/page/metadata/marko.json b/packages/marko-web/components/page/metadata/marko.json
index 8eb448184..37e9c4fa8 100644
--- a/packages/marko-web/components/page/metadata/marko.json
+++ b/packages/marko-web/components/page/metadata/marko.json
@@ -8,7 +8,8 @@
   },
   "<marko-web-content-page-metadata>": {
     "template": "./content.marko",
-    "@id": "number"
+    "@id": "number",
+    "@custom-metadata": {}
   },
   "<marko-web-website-section-page-metadata>": {
     "template": "./website-section.marko",

From 5acbc9bb9eff7e693e65acd3ec87af45f7f8130e Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Mon, 28 Jun 2021 11:47:13 -0500
Subject: [PATCH 03/11] missed the spreading it on the thrid match

---
 .../components/page/metadata/google-structured-data/content.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/marko-web/components/page/metadata/google-structured-data/content.js b/packages/marko-web/components/page/metadata/google-structured-data/content.js
index b960c44c3..0600f5337 100644
--- a/packages/marko-web/components/page/metadata/google-structured-data/content.js
+++ b/packages/marko-web/components/page/metadata/google-structured-data/content.js
@@ -71,6 +71,7 @@ module.exports = (node, customMetadata = {}) => {
       dateModified: updatedISOString,
       author: getAuthor(node),
       description: get(node, 'metadata.description'),
+      ...customMetadata,
     });
     return structuredData;
   }

From a3477bafc3d18d4b80b17a01bf40ae29c21243dc Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Tue, 29 Jun 2021 07:43:20 -0500
Subject: [PATCH 04/11] remove custon data object and pass builder and fragment

Update marko web to take a builder function and a fragment in order to generate the ld+json script dependent on site/org requiremnts.
---
 .../marko-web/components/page/layouts/content.marko   |  4 ++--
 packages/marko-web/components/page/layouts/marko.json |  3 ++-
 .../marko-web/components/page/metadata/content.marko  | 11 +++++++----
 .../page/metadata/google-structured-data/content.js   |  5 +----
 .../marko-web/components/page/metadata/marko.json     |  3 ++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/marko-web/components/page/layouts/content.marko b/packages/marko-web/components/page/layouts/content.marko
index 0f72cd71d..0d2a0d9d7 100644
--- a/packages/marko-web/components/page/layouts/content.marko
+++ b/packages/marko-web/components/page/layouts/content.marko
@@ -1,4 +1,4 @@
-$ const { customMetadata, id, type } = input;
+$ const { structuredDataQueryFragment, buildStructuredData, id, type } = input;
 $ const { document } = out.global;
 
 <${document}
@@ -7,7 +7,7 @@ $ const { document } = out.global;
   foot=input.foot
 >
   <@head>
-    <marko-web-content-page-metadata id=id custom-metadata=customMetadata/>
+    <marko-web-content-page-metadata id=id structured-data-query-fragment=structuredDataQueryFragment build-structured-data=buildStructuredData />
     <${input.head} />
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
diff --git a/packages/marko-web/components/page/layouts/marko.json b/packages/marko-web/components/page/layouts/marko.json
index 3c2d8c573..ff895cc96 100644
--- a/packages/marko-web/components/page/layouts/marko.json
+++ b/packages/marko-web/components/page/layouts/marko.json
@@ -40,7 +40,8 @@
     "<page>": {},
     "<above-page>": {},
     "<below-page>": {},
-    "@custom-metadata": {},
+    "@structured-data-query-fragment": "string",
+    "@build-structured-data": "string",
     "@id": "number",
     "@type": "string",
     "@attrs": "object"
diff --git a/packages/marko-web/components/page/metadata/content.marko b/packages/marko-web/components/page/metadata/content.marko
index 00dc9f649..2a10e1b9a 100644
--- a/packages/marko-web/components/page/metadata/content.marko
+++ b/packages/marko-web/components/page/metadata/content.marko
@@ -1,12 +1,12 @@
 import gql from "graphql-tag";
 import { get } from "@parameter1/base-cms-object-path";
 import { warn } from "@parameter1/base-cms-utils";
-import buildStructuredData from "./google-structured-data/content";
+import defaultBuildStructuredData from "./google-structured-data/content";
 
 <!-- @todo This data should generated and saved to the content object as flat data, so no relationships are required. -->
 
-$ const { customMetadata, id } = input;
-$ const queryFragment = gql`
+$ const { id } = input;
+$ const defaultQueryFragment = gql`
 fragment ContentPageMetadataFragment on Content {
   id
   type
@@ -52,6 +52,9 @@ fragment ContentPageMetadataFragment on Content {
 }
 `;
 
+$ const queryFragment = input.structuredDataQueryFragment || defaultQueryFragment;
+$ const buildStructuredData = input.buildStructuredData || defaultBuildStructuredData;
+
 <if(id)>
   <marko-web-query|{ node }| name="content" params={ id, queryFragment }>
     $ const metadata = {
@@ -87,7 +90,7 @@ fragment ContentPageMetadataFragment on Content {
       </if>
     </else>
 
-    $ const structuredData = buildStructuredData(node, customMetadata);
+    $ const structuredData = buildStructuredData(node);
     <if(structuredData)>
       <script type="application/ld+json">
         ${structuredData}
diff --git a/packages/marko-web/components/page/metadata/google-structured-data/content.js b/packages/marko-web/components/page/metadata/google-structured-data/content.js
index 0600f5337..621c3e958 100644
--- a/packages/marko-web/components/page/metadata/google-structured-data/content.js
+++ b/packages/marko-web/components/page/metadata/google-structured-data/content.js
@@ -17,7 +17,7 @@ const getImages = (node) => {
   return images.length ? images : undefined;
 };
 
-module.exports = (node, customMetadata = {}) => {
+module.exports = (node) => {
   const publishedISOString = node.published ? (new Date(node.published)).toISOString() : undefined;
   const updatedISOString = node.updated ? (new Date(node.updated)).toISOString() : undefined;
   if (node.type === 'video') {
@@ -31,7 +31,6 @@ module.exports = (node, customMetadata = {}) => {
       contentUrl: get(node, 'siteContext.canonicalUrl'),
       author: getAuthor(node),
       embedUrl: get(node, 'embedSrc'),
-      ...customMetadata,
     });
     return structuredData;
   }
@@ -51,7 +50,6 @@ module.exports = (node, customMetadata = {}) => {
       dateModified: updatedISOString,
       author: getAuthor(node),
       description: get(node, 'metadata.description'),
-      ...customMetadata,
     });
     return structuredData;
   }
@@ -71,7 +69,6 @@ module.exports = (node, customMetadata = {}) => {
       dateModified: updatedISOString,
       author: getAuthor(node),
       description: get(node, 'metadata.description'),
-      ...customMetadata,
     });
     return structuredData;
   }
diff --git a/packages/marko-web/components/page/metadata/marko.json b/packages/marko-web/components/page/metadata/marko.json
index 37e9c4fa8..3690d9b21 100644
--- a/packages/marko-web/components/page/metadata/marko.json
+++ b/packages/marko-web/components/page/metadata/marko.json
@@ -9,7 +9,8 @@
   "<marko-web-content-page-metadata>": {
     "template": "./content.marko",
     "@id": "number",
-    "@custom-metadata": {}
+    "@structured-data-query-fragment": "string",
+    "@build-structured-data": "string"
   },
   "<marko-web-website-section-page-metadata>": {
     "template": "./website-section.marko",

From 09a417b28fe8377edbd4662f882c8f1fec313c98 Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Tue, 29 Jun 2021 11:12:20 -0500
Subject: [PATCH 05/11] update structured date for all content types

@todo:

determin the proper use of
```
mainEntityOfPage: {
        '@type': 'WebPage',
        '@id': get(node, 'siteContext.canonicalUrl'),
      },
```
vs
```
url: canonicalUrl,
    ...(siteUrl !== canonicalUrl && { url: siteUrl, isBasedOn: canonicalUrl }),
```
---
 .../components/page/metadata/content.marko    |  25 ++++
 .../google-structured-data/content.js         | 107 +++++++++++-------
 2 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/packages/marko-web/components/page/metadata/content.marko b/packages/marko-web/components/page/metadata/content.marko
index 2a10e1b9a..86514d66a 100644
--- a/packages/marko-web/components/page/metadata/content.marko
+++ b/packages/marko-web/components/page/metadata/content.marko
@@ -11,6 +11,7 @@ fragment ContentPageMetadataFragment on Content {
   id
   type
   siteContext {
+    url
     path
     canonicalUrl
     noIndex
@@ -31,6 +32,10 @@ fragment ContentPageMetadataFragment on Content {
   ... on ContentVideo {
     embedSrc
   }
+  ... on ContentPodcast {
+    fileSrc
+    fileName
+  }
   ... on Authorable {
     authors {
       edges {
@@ -41,6 +46,26 @@ fragment ContentPageMetadataFragment on Content {
       }
     }
   }
+  ... on Addressable {
+    address1
+    address2
+    city
+    state
+    zip
+    country
+  }
+  ... on Contactable {
+    phone
+    tollfree
+    fax
+    website
+    title
+    mobile
+    publicEmail
+  }
+  ... on ContentCompany {
+    email
+  }
   images(input:{ pagination: { limit: 0 }, sort: { order: values } }) {
     edges {
       node {
diff --git a/packages/marko-web/components/page/metadata/google-structured-data/content.js b/packages/marko-web/components/page/metadata/google-structured-data/content.js
index 621c3e958..188b1ea5a 100644
--- a/packages/marko-web/components/page/metadata/google-structured-data/content.js
+++ b/packages/marko-web/components/page/metadata/google-structured-data/content.js
@@ -20,58 +20,89 @@ const getImages = (node) => {
 module.exports = (node) => {
   const publishedISOString = node.published ? (new Date(node.published)).toISOString() : undefined;
   const updatedISOString = node.updated ? (new Date(node.updated)).toISOString() : undefined;
+  const siteUrl = get(node, 'siteContext.url');
+  const canonicalUrl = get(node, 'siteContext.canonicalUrl');
+
+  const defaultStruturedData = {
+    '@context': 'https://schema.org',
+    '@type': 'Article',
+    headline: get(node, 'metadata.title'),
+    name: get(node, 'metadata.title'),
+    ...(get(node, 'metadata.description') && { description: get(node, 'metadata.description') }),
+    ...(get(node, 'metadata.image.src') && { thumbnailUrl: get(node, 'metadata.image.src') }),
+    ...(getImages(node) && { image: getImages(node) }),
+    datePublished: publishedISOString,
+    dateModified: updatedISOString,
+    url: canonicalUrl,
+    ...(siteUrl !== canonicalUrl && { url: siteUrl, isBasedOn: canonicalUrl }),
+    ...(getAuthor(node) && { author: getAuthor(node) }),
+  };
+
   if (node.type === 'video') {
-    const structuredData = JSON.stringify({
-      '@context': 'https://schema.org',
+    return JSON.stringify({
+      ...defaultStruturedData,
       '@type': 'VideoObject',
-      name: get(node, 'metadata.title'),
-      description: get(node, 'metadata.description'),
-      thumbnailUrl: get(node, 'metadata.image.src'),
       uploadDate: publishedISOString,
       contentUrl: get(node, 'siteContext.canonicalUrl'),
-      author: getAuthor(node),
       embedUrl: get(node, 'embedSrc'),
     });
-    return structuredData;
   }
 
-  const newsArticleTypes = ['article', 'news'];
-  if (newsArticleTypes.includes(node.type)) {
-    const structuredData = JSON.stringify({
-      '@context': 'https://schema.org',
-      '@type': 'NewsArticle',
-      mainEntityOfPage: {
-        '@type': 'WebPage',
-        '@id': get(node, 'siteContext.canonicalUrl'),
-      },
+  if (node.type === 'podcast') {
+    // Set associatedMedia if audio file is present
+    const associatedMedia = (get(node, 'fileName') && get(node, 'fileSrc'))
+      ? {
+        '@type': 'AudioObject',
+        contentUrl: get(node, 'fileSrc'),
+        name: get(node, 'fileName'),
+      }
+      : undefined;
+    return JSON.stringify({
+      ...defaultStruturedData,
+      '@type': 'PodcastEpisode',
       headline: get(node, 'metadata.title'),
-      image: getImages(node),
-      datePublished: publishedISOString,
-      dateModified: updatedISOString,
-      author: getAuthor(node),
-      description: get(node, 'metadata.description'),
+      ...(associatedMedia && { associatedMedia }),
+    });
+  }
+
+  if (node.type === 'company') {
+    // Concat address1 && address2 if present
+    const streetAddresses = [];
+    if (get(node, 'address1')) streetAddresses.push(get(node, 'address1'));
+    if (get(node, 'address2')) streetAddresses.push(get(node, 'address2'));
+    const streetAddress = streetAddresses.join(' ');
+    // Display and set address info if present
+    const showAddress = (streetAddress || get(node, 'city') || get(node, 'state') || get(node, 'zip'));
+    const address = (showAddress)
+      ? {
+        '@type': 'PostalAddress',
+        ...(get(node, 'city') && { addressLocality: get(node, 'city') }),
+        ...(get(node, 'state') && { addressLocality: get(node, 'state') }),
+        ...(get(node, 'zip') && { postalCode: get(node, 'zip') }),
+        ...(streetAddress && { streetAddress }),
+      }
+      : undefined;
+    // Set tollfree || phone if present
+    const telephone = get(node, 'tollfree') || get(node, 'phone');
+
+    return JSON.stringify({
+      ...defaultStruturedData,
+      '@type': 'Organization',
+      address,
+      ...(telephone && { telephone }),
+      ...(get(node, 'metadata.image.src') && { logo: get(node, 'metadata.image.src') }),
+      ...(get(node, 'email') && { email: get(node, 'email') }),
+      ...(get(node, 'fax') && { faxNumber: get(node, 'fax') }),
     });
-    return structuredData;
   }
 
-  const standardArticleTypes = ['product', 'blog'];
-  if (standardArticleTypes.includes(node.type)) {
-    const structuredData = JSON.stringify({
-      '@context': 'https://schema.org',
-      '@type': 'Article',
-      mainEntityOfPage: {
-        '@type': 'WebPage',
-        '@id': get(node, 'siteContext.canonicalUrl'),
-      },
+  if (['article', 'news'].includes(node.type)) {
+    return JSON.stringify({
+      ...defaultStruturedData,
+      '@type': 'NewsArticle',
       headline: get(node, 'metadata.title'),
-      image: getImages(node),
-      datePublished: publishedISOString,
-      dateModified: updatedISOString,
-      author: getAuthor(node),
-      description: get(node, 'metadata.description'),
     });
-    return structuredData;
   }
 
-  return undefined;
+  return JSON.stringify(defaultStruturedData);
 };

From e6ed35aee088672bc000a60d8c06d6b29cb93617 Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Tue, 29 Jun 2021 12:11:32 -0500
Subject: [PATCH 06/11] Spread cutom fragment on to queryFragment for cutom
 data

when custom field fragment is passed spread it onto the default queryFragment instead of overriding it.  Prevent removal of required fields.
---
 .../marko-web/components/page/metadata/content.marko     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/marko-web/components/page/metadata/content.marko b/packages/marko-web/components/page/metadata/content.marko
index 86514d66a..14e835ef0 100644
--- a/packages/marko-web/components/page/metadata/content.marko
+++ b/packages/marko-web/components/page/metadata/content.marko
@@ -1,12 +1,14 @@
 import gql from "graphql-tag";
 import { get } from "@parameter1/base-cms-object-path";
 import { warn } from "@parameter1/base-cms-utils";
+import { extractFragmentData } from "@parameter1/base-cms-web-common/src/utils";
 import defaultBuildStructuredData from "./google-structured-data/content";
 
 <!-- @todo This data should generated and saved to the content object as flat data, so no relationships are required. -->
 
-$ const { id } = input;
-$ const defaultQueryFragment = gql`
+$ const { id, structuredDataQueryFragment } = input;
+$ const { spreadFragmentName, processedFragment } = extractFragmentData(structuredDataQueryFragment);
+$ const queryFragment = gql`
 fragment ContentPageMetadataFragment on Content {
   id
   type
@@ -74,10 +76,11 @@ fragment ContentPageMetadataFragment on Content {
       }
     }
   }
+  ${spreadFragmentName}
 }
+${processedFragment}
 `;
 
-$ const queryFragment = input.structuredDataQueryFragment || defaultQueryFragment;
 $ const buildStructuredData = input.buildStructuredData || defaultBuildStructuredData;
 
 <if(id)>

From add3aba386bf615f5d7413bcb516ae5a3003ddda Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Tue, 29 Jun 2021 12:36:44 -0500
Subject: [PATCH 07/11] Add check to ensure buildStructureData isFunction

---
 packages/marko-web/components/page/metadata/content.marko | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/marko-web/components/page/metadata/content.marko b/packages/marko-web/components/page/metadata/content.marko
index 14e835ef0..d4a97b307 100644
--- a/packages/marko-web/components/page/metadata/content.marko
+++ b/packages/marko-web/components/page/metadata/content.marko
@@ -81,7 +81,7 @@ fragment ContentPageMetadataFragment on Content {
 ${processedFragment}
 `;
 
-$ const buildStructuredData = input.buildStructuredData || defaultBuildStructuredData;
+$ const buildStructuredData = isFunction(input.buildStructuredData) ? input.buildStructuredData : defaultBuildStructuredData;
 
 <if(id)>
   <marko-web-query|{ node }| name="content" params={ id, queryFragment }>

From d07b35f705dbe644e0e38f91eb6ca4bd29791788 Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Fri, 2 Jul 2021 09:37:16 -0500
Subject: [PATCH 08/11] fixing input type and readability

---
 packages/marko-web/components/page/layouts/content.marko | 6 +++++-
 packages/marko-web/components/page/layouts/marko.json    | 2 +-
 packages/marko-web/components/page/metadata/marko.json   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/marko-web/components/page/layouts/content.marko b/packages/marko-web/components/page/layouts/content.marko
index 0d2a0d9d7..b35242ba7 100644
--- a/packages/marko-web/components/page/layouts/content.marko
+++ b/packages/marko-web/components/page/layouts/content.marko
@@ -7,7 +7,11 @@ $ const { document } = out.global;
   foot=input.foot
 >
   <@head>
-    <marko-web-content-page-metadata id=id structured-data-query-fragment=structuredDataQueryFragment build-structured-data=buildStructuredData />
+    <marko-web-content-page-metadata
+      id=id
+      structured-data-query-fragment=structuredDataQueryFragment
+      build-structured-data=buildStructuredData
+    />
     <${input.head} />
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
diff --git a/packages/marko-web/components/page/layouts/marko.json b/packages/marko-web/components/page/layouts/marko.json
index ff895cc96..560888030 100644
--- a/packages/marko-web/components/page/layouts/marko.json
+++ b/packages/marko-web/components/page/layouts/marko.json
@@ -41,7 +41,7 @@
     "<above-page>": {},
     "<below-page>": {},
     "@structured-data-query-fragment": "string",
-    "@build-structured-data": "string",
+    "@build-structured-data": "function",
     "@id": "number",
     "@type": "string",
     "@attrs": "object"
diff --git a/packages/marko-web/components/page/metadata/marko.json b/packages/marko-web/components/page/metadata/marko.json
index 3690d9b21..49c313475 100644
--- a/packages/marko-web/components/page/metadata/marko.json
+++ b/packages/marko-web/components/page/metadata/marko.json
@@ -10,7 +10,7 @@
     "template": "./content.marko",
     "@id": "number",
     "@structured-data-query-fragment": "string",
-    "@build-structured-data": "string"
+    "@build-structured-data": "function"
   },
   "<marko-web-website-section-page-metadata>": {
     "template": "./website-section.marko",

From 4a308c05d861c246066cbd53662242d35f493075 Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Fri, 1 Oct 2021 10:09:06 -0500
Subject: [PATCH 09/11] add missing util import for isFunction

---
 packages/marko-web/components/page/metadata/content.marko | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/marko-web/components/page/metadata/content.marko b/packages/marko-web/components/page/metadata/content.marko
index d4a97b307..647a2a109 100644
--- a/packages/marko-web/components/page/metadata/content.marko
+++ b/packages/marko-web/components/page/metadata/content.marko
@@ -1,6 +1,6 @@
 import gql from "graphql-tag";
 import { get } from "@parameter1/base-cms-object-path";
-import { warn } from "@parameter1/base-cms-utils";
+import { warn, isFunction } from "@parameter1/base-cms-utils";
 import { extractFragmentData } from "@parameter1/base-cms-web-common/src/utils";
 import defaultBuildStructuredData from "./google-structured-data/content";
 

From d0b395ebc783aad73e195bd9242698c430f23182 Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Fri, 29 Oct 2021 09:32:46 -0500
Subject: [PATCH 10/11] add mainEntityOfPage to defaultStructuredData

---
 .../page/metadata/google-structured-data/content.js           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/marko-web/components/page/metadata/google-structured-data/content.js b/packages/marko-web/components/page/metadata/google-structured-data/content.js
index 188b1ea5a..eafd4d96f 100644
--- a/packages/marko-web/components/page/metadata/google-structured-data/content.js
+++ b/packages/marko-web/components/page/metadata/google-structured-data/content.js
@@ -26,6 +26,10 @@ module.exports = (node) => {
   const defaultStruturedData = {
     '@context': 'https://schema.org',
     '@type': 'Article',
+    mainEntityOfPage: {
+      '@type': 'WebPage',
+      '@id': get(node, 'siteContext.canonicalUrl'),
+    },
     headline: get(node, 'metadata.title'),
     name: get(node, 'metadata.title'),
     ...(get(node, 'metadata.description') && { description: get(node, 'metadata.description') }),

From e4a958df9a7e876fd46958687fd3997f006a60eb Mon Sep 17 00:00:00 2001
From: Brian Miller <brian@parameter1.com>
Date: Mon, 1 Nov 2021 12:30:59 -0500
Subject: [PATCH 11/11] Return undefined instead of defaultStructureData

---
 .../components/page/metadata/google-structured-data/content.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/marko-web/components/page/metadata/google-structured-data/content.js b/packages/marko-web/components/page/metadata/google-structured-data/content.js
index eafd4d96f..ec638de42 100644
--- a/packages/marko-web/components/page/metadata/google-structured-data/content.js
+++ b/packages/marko-web/components/page/metadata/google-structured-data/content.js
@@ -108,5 +108,5 @@ module.exports = (node) => {
     });
   }
 
-  return JSON.stringify(defaultStruturedData);
+  return undefined;
 };