@parameter1/base-cms-marko-web 4.14.0 → 4.16.0

package/components/page/image.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/image.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/image.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsImage_module = require("@parameter1/base-cms-image"),
     baseCmsImage_module = module_baseCmsImage_module.default || module_baseCmsImage_module,
@@ -111,7 +111,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/image.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/image.marko",
     tags: [
       "../element/image/display-name.marko",
       "../element/img.marko",

package/components/page/layouts/content.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/content.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_content_page_metadata_template = require("../metadata/content.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/content.marko",
     tags: [
       "../metadata/content.marko"
     ]

package/components/page/layouts/default.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/default.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_default_page_metadata_template = require("../metadata/default.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -54,7 +54,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/default.marko",
     tags: [
       "../metadata/default.marko"
     ]

package/components/page/layouts/dynamic-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/dynamic-page.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_dynamic_page_metadata_template = require("../metadata/dynamic-page.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/dynamic-page.marko",
     tags: [
       "../metadata/dynamic-page.marko"
     ]

package/components/page/layouts/magazine-issue.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/magazine-issue.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_magazine_issue_page_metadata_template = require("../metadata/magazine-issue.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/magazine-issue.marko",
     tags: [
       "../metadata/magazine-issue.marko"
     ]

package/components/page/layouts/magazine-publication.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/magazine-publication.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_magazine_publication_page_metadata_template = require("../metadata/magazine-publication.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/magazine-publication.marko",
     tags: [
       "../metadata/magazine-publication.marko"
     ]

package/components/page/layouts/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/website-section.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/layouts/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/layouts/website-section.marko",
     tags: [
       "../metadata/website-section.marko",
       "../../rss/website-section.marko"

package/components/page/metadata/components/common.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/components/common.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/components/common.marko",
     marko_component = require("./common.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_page_title_template = require("../../title.marko"),
@@ -107,7 +107,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/components/common.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/components/common.marko",
     component: "./common.marko",
     tags: [
       "../../title.marko",

package/components/page/metadata/content.marko

@@ -90,7 +90,7 @@ ${processedFragment}
 `;
 
 $ const buildStructuredData = isFunction(input.buildStructuredData) ? input.buildStructuredData : defaultBuildStructuredData;
-$ const defaultFn = (node) => get(node, 'userRegistration.isCurrentlyRequired', false);
+$ const defaultFn = ({ content }) => get(content, 'userRegistration.isCurrentlyRequired', false);
 $ const { contentGatingHandler: globalContentGatingHandler } = out.global;
 $ const contentGatingHandler = isFunction(globalContentGatingHandler) ? globalContentGatingHandler : defaultFn;
 

package/components/page/metadata/content.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/content.marko",
     marko_component = require("./content.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -119,7 +119,7 @@ ${processedFragment}
 
   const buildStructuredData = isFunction(input.buildStructuredData) ? input.buildStructuredData : defaultBuildStructuredData;
 
-  const defaultFn = (node) => get(node, 'userRegistration.isCurrentlyRequired', false);
+  const defaultFn = ({ content }) => get(content, 'userRegistration.isCurrentlyRequired', false);
 
   const { contentGatingHandler: globalContentGatingHandler } = out.global;
 
@@ -206,7 +206,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/content.marko",
     component: "./content.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/default.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/default.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -22,7 +22,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/default.marko",
     tags: [
       "./components/common.marko"
     ]

package/components/page/metadata/dynamic-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/dynamic-page.marko",
     marko_component = require("./dynamic-page.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -75,7 +75,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/dynamic-page.marko",
     component: "./dynamic-page.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/google-structured-data/content.js

@@ -30,7 +30,7 @@ module.exports = (node, contentGatingHandler) => {
   const siteUrl = get(node, 'siteContext.url');
   const canonicalUrl = get(node, 'siteContext.canonicalUrl');
 
-  const defaultStruturedData = {
+  const defaultStructuredData = {
     '@context': 'https://schema.org',
     '@type': 'Article',
     mainEntityOfPage: {
@@ -47,7 +47,7 @@ module.exports = (node, contentGatingHandler) => {
     url: canonicalUrl,
     ...(siteUrl !== canonicalUrl && { url: siteUrl, isBasedOn: canonicalUrl }),
     ...(getAuthor(node) && { author: getAuthor(node) }),
-    ...(contentGatingHandler(node) && {
+    ...(contentGatingHandler({ content: node }) && {
       isAccessibleForFree: false,
       hasPart: {
         '@type': 'WebPageElement',
@@ -59,7 +59,7 @@ module.exports = (node, contentGatingHandler) => {
 
   if (node.type === 'video') {
     return JSON.stringify({
-      ...defaultStruturedData,
+      ...defaultStructuredData,
       '@type': 'VideoObject',
       uploadDate: publishedISOString,
       contentUrl: get(node, 'siteContext.canonicalUrl'),
@@ -78,7 +78,7 @@ module.exports = (node, contentGatingHandler) => {
       }
       : undefined;
     return JSON.stringify({
-      ...defaultStruturedData,
+      ...defaultStructuredData,
       '@type': 'PodcastEpisode',
       headline: get(node, 'metadata.title'),
       ...(associatedMedia && { associatedMedia }),
@@ -107,19 +107,28 @@ module.exports = (node, contentGatingHandler) => {
     const telephone = get(node, 'tollfree') || get(node, 'phone');
 
     return JSON.stringify({
-      ...defaultStruturedData,
+      '@context': 'https://schema.org',
       '@type': 'Organization',
-      address,
+      mainEntityOfPage: {
+        '@type': 'WebPage',
+        '@id': get(node, 'siteContext.canonicalUrl'),
+      },
+      name: get(node, 'metadata.title'),
+      ...(get(node, 'metadata.description') && { description: get(node, 'metadata.description') }),
+      ...(getImages(node) && { image: getImages(node) }),
+      url: canonicalUrl,
+      ...(siteUrl !== canonicalUrl && { url: { url: siteUrl, isBasedOn: canonicalUrl } }),
+      ...(address && { address }),
       ...(telephone && { telephone }),
-      ...(get(node, 'metadata.image.src') && { logo: get(node, 'metadata.image.src') }),
       ...(get(node, 'email') && { email: get(node, 'email') }),
+      ...(get(node, 'metadata.image.src') && { logo: get(node, 'metadata.image.src') }),
       ...(get(node, 'fax') && { faxNumber: get(node, 'fax') }),
     });
   }
 
   if (['article', 'news'].includes(node.type)) {
     return JSON.stringify({
-      ...defaultStruturedData,
+      ...defaultStructuredData,
       '@type': 'NewsArticle',
       headline: get(node, 'metadata.title'),
     });

package/components/page/metadata/magazine-issue.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/magazine-issue.marko",
     marko_component = require("./magazine-issue.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -74,7 +74,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/magazine-issue.marko",
     component: "./magazine-issue.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/magazine-publication.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/magazine-publication.marko",
     marko_component = require("./magazine-publication.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/magazine-publication.marko",
     component: "./magazine-publication.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/website-section.marko",
     marko_component = require("./website-section.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -83,7 +83,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/metadata/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/metadata/website-section.marko",
     component: "./website-section.marko",
     tags: [
       "./components/common.marko",

package/components/page/rel-canonical.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/rel-canonical.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
@@ -38,5 +38,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/rel-canonical.marko"
   };

package/components/page/title.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/title.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/title.marko"
   };

package/components/page/wrapper.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/page/wrapper.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/page/wrapper.marko",
     tags: [
       "../element/index.marko"
     ]

package/components/resolve/page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/resolve/page.marko",
     marko_component = require("./page.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
@@ -41,7 +41,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/resolve/page.marko",
     component: "./page.marko",
     tags: [
       "@parameter1/base-cms-marko-core/components/resolve.marko"

package/components/rss/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.14.0/components/rss/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.16.0/components/rss/website-section.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_url_module = require("url"),
     url_module = module_url_module.default || module_url_module,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.14.0/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.16.0/components/rss/website-section.marko"
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.14.0",
+  "version": "4.16.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "29b3b166d9acbfa996e3aa0bc0cb100972efee56"
+  "gitHead": "9fa73b6ddd786b9a0a0810f639d79cf0b1015c7b"
 }