@mjhls/mjh-framework 1.0.692 → 1.0.694-beta.0

package/dist/esm/getRelatedArticle.js

@@ -30,18 +30,9 @@ function parseString(setCookieValue, options) {
     ? Object.assign({}, defaultParseOptions, options)
     : defaultParseOptions;
 
-  try {
-    value = options.decodeValues ? decodeURIComponent(value) : value; // decode cookie value
-  } catch (e) {
-    console.error(
-      `set-cookie-parser encountered an error while decoding a cookie with value '${value}'. Set options.decodeValues to false to disable this feature.`,
-      e
-    );
-  }
-
   var cookie = {
     name: name, // grab everything before the first =
-    value: value,
+    value: options.decodeValues ? decodeURIComponent(value) : value, // decode cookie value
   };
 
   parts.forEach(function (part) {
@@ -212,7 +203,7 @@ setCookie.parse = parse_1;
 setCookie.parseString = parseString_1;
 setCookie.splitCookiesString = splitCookiesString_1;
 
-var utils = createCommonjsModule(function (module, exports) {
+var dist = createCommonjsModule(function (module, exports) {
 var __assign = (commonjsGlobal && commonjsGlobal.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -225,33 +216,10 @@ var __assign = (commonjsGlobal && commonjsGlobal.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.areCookiesEqual = exports.hasSameProperties = exports.createCookie = exports.isBrowser = void 0;
-/**
- * Tells whether we are in a browser or server.
- */
-function isBrowser() {
-    return typeof window !== 'undefined';
-}
-exports.isBrowser = isBrowser;
-/**
- * Create an instance of the Cookie interface
- */
-function createCookie(name, value, options) {
-    var sameSite = options.sameSite;
-    if (sameSite === true) {
-        sameSite = 'strict';
-    }
-    if (sameSite === undefined || sameSite === false) {
-        sameSite = 'lax';
-    }
-    var cookieToSet = __assign(__assign({}, options), { sameSite: sameSite });
-    delete cookieToSet.encode;
-    return __assign({ name: name, value: value }, cookieToSet);
-}
-exports.createCookie = createCookie;
-/**
- * Tells whether given objects have the same properties.
- */
+exports.destroyCookie = exports.setCookie = exports.parseCookies = void 0;
+
+
+var isBrowser = function () { return typeof window !== 'undefined'; };
 function hasSameProperties(a, b) {
     var aProps = Object.getOwnPropertyNames(a);
     var bProps = Object.getOwnPropertyNames(b);
@@ -266,9 +234,8 @@ function hasSameProperties(a, b) {
     }
     return true;
 }
-exports.hasSameProperties = hasSameProperties;
 /**
- * Compare the cookie and return true if the cookies have equivalent
+ * Compare the cookie and return true if the cookies has equivalent
  * options and the cookies would be overwritten in the browser storage.
  *
  * @param a first Cookie for comparison
@@ -281,109 +248,71 @@ function areCookiesEqual(a, b) {
     }
     return (hasSameProperties(__assign(__assign({}, a), { sameSite: undefined }), __assign(__assign({}, b), { sameSite: undefined })) && sameSiteSame);
 }
-exports.areCookiesEqual = areCookiesEqual;
-/* Functions */
-
-});
-
-unwrapExports(utils);
-var utils_1 = utils.areCookiesEqual;
-var utils_2 = utils.hasSameProperties;
-var utils_3 = utils.createCookie;
-var utils_4 = utils.isBrowser;
-
-var dist = createCommonjsModule(function (module, exports) {
-var __assign = (commonjsGlobal && commonjsGlobal.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroyCookie = exports.setCookie = exports.parseCookies = void 0;
-
-
-
 /**
+ * Create an instance of the Cookie interface
+ *
+ * @param name name of the Cookie
+ * @param value value of the Cookie
+ * @param options Cookie options
+ */
+function createCookie(name, value, options) {
+    var sameSite = options.sameSite;
+    if (sameSite === true) {
+        sameSite = 'strict';
+    }
+    if (sameSite === undefined || sameSite === false) {
+        sameSite = 'lax';
+    }
+    var cookieToSet = __assign(__assign({}, options), { sameSite: sameSite });
+    delete cookieToSet.encode;
+    return __assign({ name: name, value: value }, cookieToSet);
+}
+/**
+ *
  * Parses cookies.
  *
- * @param ctx NextJS page or API context, express context, null or undefined.
- * @param options Options that we pass down to `cookie` library.
+ * @param ctx
+ * @param options
  */
 function parseCookies(ctx, options) {
-    var _a, _b;
-    if ((_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.req) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.cookie) {
+    if (ctx && ctx.req && ctx.req.headers && ctx.req.headers.cookie) {
         return cookie.parse(ctx.req.headers.cookie, options);
     }
-    if (utils.isBrowser()) {
+    if (isBrowser()) {
         return cookie.parse(document.cookie, options);
     }
     return {};
 }
 exports.parseCookies = parseCookies;
 /**
+ *
  * Sets a cookie.
  *
- * @param ctx NextJS page or API context, express context, null or undefined.
- * @param name The name of your cookie.
- * @param value The value of your cookie.
- * @param options Options that we pass down to `cookie` library.
+ * @param ctx
+ * @param name
+ * @param value
+ * @param options
  */
 function setCookie$1(ctx, name, value, options) {
-    var _a, _b;
-    if (options === void 0) { options = {}; }
-    // SSR
-    if (((_a = ctx === null || ctx === void 0 ? void 0 : ctx.res) === null || _a === void 0 ? void 0 : _a.getHeader) && ctx.res.setHeader) {
-        // Check if response has finished and warn about it.
-        if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.res) === null || _b === void 0 ? void 0 : _b.finished) {
-            console.warn("Not setting \"" + name + "\" cookie. Response has finished.");
-            console.warn("You should set cookie before res.send()");
-            return {};
-        }
-        /**
-         * Load existing cookies from the header and parse them.
-         */
+    if (ctx && ctx.res && ctx.res.getHeader && ctx.res.setHeader) {
         var cookies = ctx.res.getHeader('Set-Cookie') || [];
         if (typeof cookies === 'string')
             cookies = [cookies];
         if (typeof cookies === 'number')
             cookies = [];
-        /**
-         * Parse cookies but ignore values - we've already encoded
-         * them in the previous call.
-         */
-        var parsedCookies = setCookie.parse(cookies, {
-            decodeValues: false,
-        });
-        /**
-         * We create the new cookie and make sure that none of
-         * the existing cookies match it.
-         */
-        var newCookie_1 = utils.createCookie(name, value, options);
+        var parsedCookies = setCookie.parse(cookies);
         var cookiesToSet_1 = [];
         parsedCookies.forEach(function (parsedCookie) {
-            if (!utils.areCookiesEqual(parsedCookie, newCookie_1)) {
-                /**
-                 * We serialize the cookie back to the original format
-                 * if it isn't the same as the new one.
-                 */
-                var serializedCookie = cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({ 
-                    // we prevent reencoding by default, but you might override it
-                    encode: function (val) { return val; } }, parsedCookie));
-                cookiesToSet_1.push(serializedCookie);
+            if (!areCookiesEqual(parsedCookie, createCookie(name, value, options))) {
+                cookiesToSet_1.push(cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({}, parsedCookie)));
             }
         });
         cookiesToSet_1.push(cookie.serialize(name, value, options));
-        // Update the header.
-        ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
+        if (!ctx.res.finished) {
+            ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
+        }
     }
-    // Browser
-    if (utils.isBrowser()) {
+    if (isBrowser()) {
         if (options && options.httpOnly) {
             throw new Error('Can not set a httpOnly cookie in the browser.');
         }
@@ -393,21 +322,30 @@ function setCookie$1(ctx, name, value, options) {
 }
 exports.setCookie = setCookie$1;
 /**
+ *
  * Destroys a cookie with a particular name.
  *
- * @param ctx NextJS page or API context, express context, null or undefined.
- * @param name Cookie name.
- * @param options Options that we pass down to `cookie` library.
+ * @param ctx
+ * @param name
+ * @param options
  */
 function destroyCookie(ctx, name, options) {
-    /**
-     * We forward the request destroy to setCookie function
-     * as it is the same function with modified maxAge value.
-     */
-    return setCookie$1(ctx, name, '', __assign(__assign({}, (options || {})), { maxAge: -1 }));
+    var opts = __assign(__assign({}, (options || {})), { maxAge: -1 });
+    if (ctx && ctx.res && ctx.res.setHeader && ctx.res.getHeader) {
+        var cookies = ctx.res.getHeader('Set-Cookie') || [];
+        if (typeof cookies === 'string')
+            cookies = [cookies];
+        if (typeof cookies === 'number')
+            cookies = [];
+        cookies.push(cookie.serialize(name, '', opts));
+        ctx.res.setHeader('Set-Cookie', cookies);
+    }
+    if (isBrowser()) {
+        document.cookie = cookie.serialize(name, '', opts);
+    }
+    return {};
 }
 exports.destroyCookie = destroyCookie;
-/* Utility Exports */
 exports.default = {
     set: setCookie$1,
     get: parseCookies,
@@ -424,28 +362,33 @@ var dist_3 = dist.parseCookies;
 var _this = undefined;
 
 var getRelatedArticle = function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
     var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var client = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var article = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var prevUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '/';
     var articleCount = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
 
-    var taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+    var _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, conditions, cookies, prevSlugs, articles, query;
 
     return regenerator.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            taxonomyMapping = article.taxonomyMapping, _article$url = article.url;
+            _article$url = article.url;
             _article$url = _article$url === undefined ? {
               current: null
             } : _article$url;
-            url = _article$url.current, content_placement = article.content_placement;
-            taxonomy = [];
-            //404 articles were throwing server error
+            url = _article$url.current, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
+            content_placement = article.content_placement;
+            references = [];
+
 
-            if (content_placement) {
+            content_placement = content_placement && content_placement.length > 0 && content_placement.filter(function (_ref2) {
+              var identifier = _ref2.identifier;
+              return identifier !== 'news';
+            });
+            if (content_placement && content_placement.length > 0) {
               content_placement.forEach(function (_ref3) {
                 var path = _ref3.path,
                     _id = _ref3._id;
@@ -457,26 +400,30 @@ var getRelatedArticle = function () {
                 if (prev_url_to_check.includes('?')) {
                   prev_url_to_check = prev_url_to_check.split('?')[0];
                 }
-                if (prev_url_to_check.endsWith(path) && _id) taxonomy.push(_id);
+                if (prev_url_to_check.endsWith(path) && _id) references.push(_id);
               });
+              if (references.length === 0) {
+                content_placement.forEach(function (_ref4) {
+                  var _id = _ref4._id;
+
+                  if (_id) references.push(_id);
+                });
+              }
             }
 
-            //404 articles were throwing server error
-            if (taxonomy.length === 0 && taxonomyMapping) {
-              taxonomyMapping.forEach(function (_ref4) {
-                var _ref = _ref4._ref;
+            if (documentGroupMapping && documentGroupMapping.length > 0) {
+              documentGroupMapping.forEach(function (_ref5) {
+                var _id = _ref5._id;
 
-                if (_ref) {
-                  taxonomy.push(_ref);
-                }
+                if (_id) references.push(_id);
               });
             }
 
-            params = {
-              url: url,
-              taxonomy: taxonomy,
-              index: articleCount
-            };
+            if (issueGroup && issueGroup._ref) {
+              references.push(issueGroup._ref);
+            }
+
+            params = { url: url, references: references, index: articleCount };
             conditions = '';
 
             if (ctx && url) {
@@ -488,24 +435,43 @@ var getRelatedArticle = function () {
                 conditions = '&& !(url.current in [' + prevSlugs + '])';
               } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
-            relatedArticleQuery = getQuery('related', conditions, '', articleCount);
-            _context.next = 12;
-            return client.fetch(relatedArticleQuery, params);
 
-          case 12:
-            relatedArticle = _context.sent;
-            return _context.abrupt('return', relatedArticle);
+            articles = null;
+
+            if (!(params.references && params.references.length > 0)) {
+              _context.next = 24;
+              break;
+            }
+
+            query = getQuery('related', conditions, '', articleCount).replace('&& taxonomyMapping[]._ref in $taxonomy', '&& references($references)');
+            _context.prev = 15;
+            _context.next = 18;
+            return client.fetch(query, params);
+
+          case 18:
+            articles = _context.sent;
+            _context.next = 24;
+            break;
+
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context['catch'](15);
+
+            console.error(_context.t0);
+
+          case 24:
+            return _context.abrupt('return', articles);
 
-          case 14:
+          case 25:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this);
+    }, _callee, _this, [[15, 21]]);
   }));
 
   return function getRelatedArticle() {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }();
 

package/dist/esm/getSerializers.js

@@ -14,18 +14,18 @@ import './web.dom.iterable-8956f9a5.js';
 import './typeof-08f2c380.js';
 import './_is-array-49698029.js';
 import 'react';
-import './index-93ec3c59.js';
+import './index-0e45a0b2.js';
 import 'prop-types';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
-import './moment-12415288.js';
+import './moment-e2f9b20c.js';
 import 'next/router';
 import './isSymbol-807e927e.js';
 import './debounce-1a993acf.js';
 import 'react-dom';
-import './index-51a80699.js';
+import './index-73819142.js';
 import './index-5f9f807a.js';
-import './main-0465b2a0.js';
+import './main-5d1e4bd3.js';
 import './entities-7cc3bf45.js';
 import './stringify-008c8802.js';
 import './slicedToArray-7021e5df.js';
@@ -34,14 +34,14 @@ import './_set-species-cede29f8.js';
 import './Segment.js';
 import './Beam.js';
 import './AdSlot.js';
-import './BlockContent-a614acdf.js';
+import './BlockContent-e9b4ddcf.js';
 import './smoothscroll-4b699764.js';
 import './GroupDeck.js';
 import 'react-bootstrap';
 import './iconBase-602d52fe.js';
 import './index.esm-29e48d38.js';
 import 'react-bootstrap/Button';
-export { g as default } from './index-a2e78632.js';
+export { g as default } from './index-c376cd8e.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/{index-93ec3c59.js → index-0e45a0b2.js}

@@ -722,8 +722,6 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
 
     return new Promise(function (resolve) {
       _this3.getGoogletag().then(function (googletag) {
-        _this3.configureInitialOptions(googletag);
-
         slotsToInitialize.forEach(function (currentSlotId) {
           registeredSlots[currentSlotId].loading = false;
           googletag.cmd.push(function () {
@@ -787,25 +785,14 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
       });
     });
   },
-  // configure those gpt parameters that need to be set before pubsads service
-  // initialization.
-  configureInitialOptions: function configureInitialOptions(googletag) {
-    var _this4 = this;
-
-    googletag.cmd.push(function () {
-      if (_this4.disableInitialLoadIsEnabled()) {
-        googletag.pubads().disableInitialLoad();
-      }
-    });
-  },
   configureOptions: function configureOptions(googletag) {
-    var _this5 = this;
+    var _this4 = this;
 
     googletag.cmd.push(function () {
       var pubadsService = googletag.pubads();
-      pubadsService.setRequestNonPersonalizedAds(_this5.personalizedAdsEnabled() ? 0 : 1);
+      pubadsService.setRequestNonPersonalizedAds(_this4.personalizedAdsEnabled() ? 0 : 1);
 
-      var targetingArguments = _this5.getTargetingArguments(); // set global targetting arguments
+      var targetingArguments = _this4.getTargetingArguments(); // set global targetting arguments
 
 
       Object.keys(targetingArguments).forEach(function (varName) {
@@ -814,28 +801,34 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         }
       }); // set global adSense attributes
 
-      var adSenseAttributes = _this5.getAdSenseAttributes();
+      var adSenseAttributes = _this4.getAdSenseAttributes();
 
       Object.keys(adSenseAttributes).forEach(function (key) {
         pubadsService.set(key, adSenseAttributes[key]);
       });
 
-      if (_this5.lazyLoadIsEnabled()) {
-        var config = _this5.getLazyLoadConfig();
+      if (_this4.lazyLoadIsEnabled()) {
+        var args = [];
 
-        if (config) {
-          pubadsService.enableLazyLoad(config);
-        } else {
-          pubadsService.enableLazyLoad();
+        var config = _this4.getLazyLoadConfig();
+
+        if (config !== null) {
+          args.push(config);
         }
+
+        pubadsService.enableLazyLoad.call(args);
       }
 
-      if (_this5.singleRequestIsEnabled()) {
+      if (_this4.singleRequestIsEnabled()) {
         pubadsService.enableSingleRequest();
       }
 
-      if (_this5.collapseEmptyDivs === true || _this5.collapseEmptyDivs === false) {
-        pubadsService.collapseEmptyDivs(_this5.collapseEmptyDivs);
+      if (_this4.disableInitialLoadIsEnabled()) {
+        pubadsService.disableInitialLoad();
+      }
+
+      if (_this4.collapseEmptyDivs === true || _this4.collapseEmptyDivs === false) {
+        pubadsService.collapseEmptyDivs(_this4.collapseEmptyDivs);
       }
     });
   },
@@ -877,10 +870,10 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     }
   },
   gptRefreshAds: function gptRefreshAds(slots) {
-    var _this6 = this;
+    var _this5 = this;
 
     return this.getGoogletag().then(function (googletag) {
-      _this6.configureOptions(googletag);
+      _this5.configureOptions(googletag);
 
       googletag.cmd.push(function () {
         var pubadsService = googletag.pubads();
@@ -891,14 +884,14 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   reload: function reload() {
-    var _this7 = this;
+    var _this6 = this;
 
     return this.destroyGPTSlots.apply(this, arguments).then(function () {
-      return _this7.load();
+      return _this6.load();
     });
   },
   destroyGPTSlots: function destroyGPTSlots() {
-    var _this8 = this;
+    var _this7 = this;
 
     for (var _len4 = arguments.length, slotsToDestroy = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
       slotsToDestroy[_key4] = arguments[_key4];
@@ -918,7 +911,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         slots.push(slot);
       }
 
-      _this8.getGoogletag().then(function (googletag) {
+      _this7.getGoogletag().then(function (googletag) {
         googletag.cmd.push(function () {
           if (managerAlreadyInitialized === true) {
             if (slotsToDestroy.length > 0) {
@@ -941,7 +934,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   registerSlot: function registerSlot(_ref) {
-    var _this9 = this;
+    var _this8 = this;
 
     var slotId = _ref.slotId,
         dfpNetworkId = _ref.dfpNetworkId,
@@ -980,7 +973,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
                 gptSlot = slot.gptSlot;
 
             if (loading === false && !gptSlot) {
-              _this9.load(slotId);
+              _this8.load(slotId);
             }
           }
         });