@mjhls/mjh-framework 1.0.733-beta-0.2 → 1.0.733-beta.0

package/dist/cjs/getRelatedArticle.js

@@ -32,18 +32,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) {
@@ -214,7 +205,7 @@ setCookie.parse = parse_1;
 setCookie.parseString = parseString_1;
 setCookie.splitCookiesString = splitCookiesString_1;
 
-var utils = _commonjsHelpers.createCommonjsModule(function (module, exports) {
+var dist = _commonjsHelpers.createCommonjsModule(function (module, exports) {
 var __assign = (_commonjsHelpers.commonjsGlobal && _commonjsHelpers.commonjsGlobal.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -227,33 +218,10 @@ var __assign = (_commonjsHelpers.commonjsGlobal && _commonjsHelpers.commonjsGlob
     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);
@@ -268,9 +236,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
@@ -283,109 +250,71 @@ function areCookiesEqual(a, b) {
     }
     return (hasSameProperties(__assign(__assign({}, a), { sameSite: undefined }), __assign(__assign({}, b), { sameSite: undefined })) && sameSiteSame);
 }
-exports.areCookiesEqual = areCookiesEqual;
-/* Functions */
-
-});
-
-_commonjsHelpers.unwrapExports(utils);
-var utils_1 = utils.areCookiesEqual;
-var utils_2 = utils.hasSameProperties;
-var utils_3 = utils.createCookie;
-var utils_4 = utils.isBrowser;
-
-var dist = _commonjsHelpers.createCommonjsModule(function (module, exports) {
-var __assign = (_commonjsHelpers.commonjsGlobal && _commonjsHelpers.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 index$5.cookie.parse(ctx.req.headers.cookie, options);
     }
-    if (utils.isBrowser()) {
+    if (isBrowser()) {
         return index$5.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 = index$5.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(index$5.cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({}, parsedCookie)));
             }
         });
         cookiesToSet_1.push(index$5.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.');
         }
@@ -395,21 +324,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(index$5.cookie.serialize(name, '', opts));
+        ctx.res.setHeader('Set-Cookie', cookies);
+    }
+    if (isBrowser()) {
+        document.cookie = index$5.cookie.serialize(name, '', opts);
+    }
+    return {};
 }
 exports.destroyCookie = destroyCookie;
-/* Utility Exports */
 exports.default = {
     set: setCookie$1,
     get: parseCookies,
@@ -503,8 +441,8 @@ var getRelatedArticle = function () {
               prevSlugs = cookies['prevSlugs'];
 
               if (!!prevSlugs) {
-                dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                filters = '&& !(url.current in [' + prevSlugs + '])';
+                if (!prevSlugs.includes(url)) dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
+                filters = filters + ' && !(url.current in [' + prevSlugs + '])';
               } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
 

package/dist/cjs/getSerializers.js

@@ -10,7 +10,7 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-513d81cd.js');
+require('./inherits-c9f99d47.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');
@@ -25,7 +25,7 @@ require('next/router');
 require('./isSymbol-04666465.js');
 require('./debounce-eb287781.js');
 require('react-dom');
-require('./index-39beccb3.js');
+require('./index-be0c82be.js');
 require('./index-da796b8c.js');
 require('./main-02daeefe.js');
 require('./entities-310b46ee.js');
@@ -36,14 +36,14 @@ require('./_set-species-f92c67c5.js');
 require('./Segment.js');
 require('./Beam.js');
 require('./AdSlot.js');
-require('./BlockContent-80b15fac.js');
+require('./BlockContent-091a991f.js');
 require('./index-187c967e.js');
 require('./smoothscroll-5054361f.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('./iconBase-68959171.js');
 require('./index.esm-90433435.js');
-var getSerializers = require('./index-41222a33.js');
+var getSerializers = require('./index-44b6f046.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('./_object-to-array-5762f850.js');

package/dist/cjs/{getTargeting-0d9b6b99.js → getTargeting-9af0ef69.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var toConsumableArray = require('./toConsumableArray-9a3476fe.js');
-var _extends = require('./extends-60837c34.js');
+var _extends$1 = require('./extends-60837c34.js');
 
 var getContentPlacementUrl = function getContentPlacementUrl(cp) {
     var cp_url = '';
@@ -26,9 +26,11 @@ var getTargeting = function getTargeting(props) {
       _props$cpModification = props.cpModificationRequired,
       cpModificationRequired = _props$cpModification === undefined ? true : _props$cpModification;
 
+
   if (positionOverride) {
     position = positionOverride;
   }
+
   var _article$internalTag = article.internalTag,
       internalTag = _article$internalTag === undefined ? [] : _article$internalTag,
       _article$userDefinedT = article.userDefinedTag,
@@ -48,8 +50,7 @@ var getTargeting = function getTargeting(props) {
   } : _article$documentGrou;
   var document_group = _article$documentGrou.path,
       document_groups = article.document_groups,
-      content_placement = article.content_placement,
-      rootDocumentGroup = article.rootDocumentGroup;
+      content_placement = article.content_placement;
 
   var context = url;
   var localHistory = props.historyCookie ? JSON.parse(props.historyCookie) : [];
@@ -132,17 +133,12 @@ var getTargeting = function getTargeting(props) {
   }
 
   if (props.cache && props.cache.hyperTargeting) {
-    targeting = _extends._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
+    targeting = _extends$1._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
   }
 
   if (position && position.length) {
     targeting['pos'] = position;
   }
-
-  // returning AD Targeting Group
-  if (rootDocumentGroup && rootDocumentGroup.identifier) {
-    targeting['rootDocumentGroup'] = rootDocumentGroup.identifier.current;
-  }
   return targeting;
 };
 

package/dist/cjs/getTargeting.js

@@ -8,7 +8,7 @@ require('./toConsumableArray-9a3476fe.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
-var getTargeting = require('./getTargeting-0d9b6b99.js');
+var getTargeting = require('./getTargeting-9af0ef69.js');