@mindful-web/marko-web-theme-monorail 1.83.5 → 1.85.0

package/components/site-header.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-header.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-header.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -204,7 +204,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-header.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-header.marko",
     tags: [
       "./menu-toggle-button.marko",
       "./site-navbar/logo.marko",

package/components/site-menu/components/search.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/components/search.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/components/search.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
@@ -71,7 +71,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/components/search.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/components/search.marko",
     tags: [
       "@mindful-web/marko-web-icons/components/icon.marko",
       "@mindful-web/marko-web/components/element/img.marko",

package/components/site-menu/components/social-icons.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/components/social-icons.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/components/social-icons.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     theme_social_follow_template = require("../../social-follow.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -25,7 +25,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/components/social-icons.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/components/social-icons.marko",
     tags: [
       "../../social-follow.marko"
     ]

package/components/site-menu/header.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/header.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/header.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
     marko_web_element_template = require("@mindful-web/marko-web/components/element/index.marko"),
@@ -31,7 +31,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/header.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/header.marko",
     tags: [
       "@mindful-web/marko-web/components/element/index.marko"
     ]

package/components/site-menu/index.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/index.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
@@ -189,7 +189,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/index.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/index.marko",
     tags: [
       "./components/search.marko",
       "./section.marko",

package/components/site-menu/section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/section.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/section.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -58,7 +58,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-menu/section.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-menu/section.marko",
     tags: [
       "./header.marko",
       "../site-navbar/items.marko",

package/components/site-navbar/brand.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/brand.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/brand.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
     marko_web_link_template = require("@mindful-web/marko-web/components/element/link.marko"),
@@ -36,7 +36,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/brand.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/brand.marko",
     tags: [
       "@mindful-web/marko-web/components/element/link.marko"
     ]

package/components/site-navbar/index.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/index.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
     marko_web_element_template = require("@mindful-web/marko-web/components/element/index.marko"),
@@ -41,7 +41,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/index.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/index.marko",
     tags: [
       "@mindful-web/marko-web/components/element/index.marko",
       "@mindful-web/marko-web/components/element/block.marko"

package/components/site-navbar/item.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/item.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/item.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -175,7 +175,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/item.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/item.marko",
     tags: [
       "@mindful-web/marko-web-icons/components/icon.marko",
       "@mindful-web/marko-web/components/element/link.marko",

package/components/site-navbar/items.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/items.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/items.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -73,7 +73,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/items.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/items.marko",
     tags: [
       "./item.marko",
       "@mindful-web/marko-web/components/element/index.marko"

package/components/site-navbar/logo.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/logo.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/logo.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_classAttr = require("marko/dist/runtime/html/helpers/class-attr"),
     marko_attr = require("marko/dist/runtime/html/helpers/attr");
@@ -37,5 +37,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/logo.marko"
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/logo.marko"
   };

package/components/site-navbar/search.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/search.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/search.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
@@ -64,7 +64,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-navbar/search.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-navbar/search.marko",
     tags: [
       "@mindful-web/marko-web-icons/components/icon.marko",
       "@mindful-web/marko-web/components/element/img.marko",

package/components/site-newsletter-menu.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-newsletter-menu.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-newsletter-menu.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_buildProps = require("@mindful-web/marko-web-theme-monorail/utils/site-newsletter-menu-props"),
     buildProps = module_buildProps.default || module_buildProps,
@@ -30,7 +30,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/site-newsletter-menu.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/site-newsletter-menu.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko"
     ]

package/components/social/icon-link.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/social/icon-link.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/social/icon-link.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -55,7 +55,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/social/icon-link.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/social/icon-link.marko",
     tags: [
       "@mindful-web/marko-web-icons/components/icon.marko",
       "@mindful-web/marko-web/components/element/link.marko"

package/components/social/icons.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/social/icons.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/social/icons.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -54,7 +54,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/social/icons.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/social/icons.marko",
     tags: [
       "./icon-link.marko",
       "@mindful-web/marko-web/components/element/block.marko"

package/components/social-follow.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/social-follow.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/social-follow.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
@@ -86,7 +86,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/social-follow.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/social-follow.marko",
     tags: [
       "@mindful-web/marko-web/components/element/index.marko",
       "./social/icon-link.marko",

package/components/sponsored-label-logo.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/sponsored-label-logo.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/sponsored-label-logo.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -78,7 +78,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/sponsored-label-logo.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/sponsored-label-logo.marko",
     tags: [
       "@mindful-web/marko-web/components/element/index.marko",
       "@mindful-web/marko-web/components/element/img.marko",

package/components/sponsored-section-logo.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/sponsored-section-logo.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/sponsored-section-logo.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -73,7 +73,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/sponsored-section-logo.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/sponsored-section-logo.marko",
     tags: [
       "@mindful-web/marko-web/components/element/index.marko",
       "@mindful-web/marko-web/components/element/img.marko",

package/components/sponsored-section-name-logo.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/sponsored-section-name-logo.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/sponsored-section-name-logo.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/sponsored-section-name-logo.marko",
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/sponsored-section-name-logo.marko",
     tags: [
       "@mindful-web/marko-web/components/element/img.marko",
       "@mindful-web/marko-web/components/element/block.marko",

package/components/ssr-html-inject.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.83.5/components/ssr-html-inject.marko",
+    marko_componentType = "/@mindful-web/marko-web-theme-monorail$1.85.0/components/ssr-html-inject.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_cheerio = require("cheerio"),
     cheerio = module_cheerio.default || module_cheerio,
@@ -129,5 +129,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-theme-monorail$1.83.5/components/ssr-html-inject.marko"
+    id: "/@mindful-web/marko-web-theme-monorail$1.85.0/components/ssr-html-inject.marko"
   };

package/graphql/fragments/content-meter.js

@@ -1,5 +1,9 @@
 const gql = require('graphql-tag');
 
+// Shared by content metering AND progressive profiling (via `utils/load-gating-content.js`), so
+// both middlewares resolve one request-memoized query. `gating` exists for the progressive
+// middleware: it must stand down for an idx survey at decision time, before `withContent` has run
+// `contentAccessState` (which is what the layout consults for the same call).
 module.exports = gql`
 fragment ContentMeterFragment on Content {
   id
@@ -17,5 +21,9 @@ fragment ContentMeterFragment on Content {
     isCurrentlyRequired
     bypassGating
   }
+  gating {
+    surveyType
+    surveyId
+  }
 }
 `;

package/middleware/content-metering.js

@@ -3,10 +3,8 @@ const parser = require('ua-parser-js');
 const Joi = require('@parameter1/joi');
 const { validate } = require('@parameter1/joi/utils');
 const { asyncRoute, isFunction } = require('@mindful-web/utils');
-const { content: loader } = require('@mindful-web/web-common/page-loaders');
 const { get, getAsArray } = require('@mindful-web/object-path');
-const buildContentInput = require('@mindful-web/marko-web/utils/build-content-input');
-const queryFragment = require('../graphql/fragments/content-meter');
+const loadGatingContent = require('../utils/load-gating-content');
 const hasOmedaId = require('../utils/has-omeda-id');
 
 const configSchema = Joi.object({
@@ -37,11 +35,10 @@ const defaultRegFn = ({ content }) => get(content, 'userRegistration.isCurrently
 const defaultBypassGatingFn = ({ content }) => get(content, 'userRegistration.bypassGating', false);
 
 const shouldMeter = async (req, config) => {
-  const { apollo, params } = req;
-  const { id } = params;
-  const additionalInput = buildContentInput({ req });
+  // Request-memoized: when progressive profiling chains ahead of the meter, both decide off one
+  // GraphQL round trip.
   // @todo error handling!
-  const content = await loader(apollo, { id, additionalInput, queryFragment });
+  const content = await loadGatingContent(req);
   if (!content) return false;
 
   // Check for local contentGatingHandler and use it or use the defaultRegFn
@@ -73,8 +70,8 @@ const shouldMeter = async (req, config) => {
   if (getAsArray(config, 'excludePrimarySectionIds').includes(content.primarySection.id)) {
     return false;
   }
-  // excludePrimarySectionAliass: Excludes content metering on page that matches primarySection
-  if (getAsArray(config, 'excludePrimarySectionAliass').includes(content.primarySection.alias)) {
+  // excludePrimarySectionAlias: Excludes content metering on page that matches primarySection
+  if (getAsArray(config, 'excludePrimarySectionAlias').includes(content.primarySection.alias)) {
     return false;
   }
   // excludeLabels: Excludes content metering on page that matches labels
@@ -96,6 +93,11 @@ module.exports = (params = {}) => asyncRoute(async (req, res, next) => {
 
   if (!enabled) return next();
 
+  // The progressive-profile gate claimed this request: exactly one gate owns a page, so the
+  // meter stands down entirely — it must not burn a view, write its cookie, or render its
+  // overlay under content the progressive gate is already truncating.
+  if (get(res, 'locals.progressiveProfileState.displayGate')) return next();
+
   if (!identityX) {
     error('IdentityX middleware must be loaded before content metering middleware!');
     return next();