@mjhls/mjh-framework 1.0.694-beta.3 → 1.0.695

package/dist/esm/getRelatedArticle.js

@@ -30,9 +30,18 @@ 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: options.decodeValues ? decodeURIComponent(value) : value, // decode cookie value
+    value: value,
   };
 
   parts.forEach(function (part) {
@@ -203,7 +212,7 @@ setCookie.parse = parse_1;
 setCookie.parseString = parseString_1;
 setCookie.splitCookiesString = splitCookiesString_1;
 
-var dist = createCommonjsModule(function (module, exports) {
+var utils = 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++) {
@@ -216,10 +225,33 @@ var __assign = (commonjsGlobal && commonjsGlobal.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroyCookie = exports.setCookie = exports.parseCookies = void 0;
-
-
-var isBrowser = function () { return typeof window !== 'undefined'; };
+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.
+ */
 function hasSameProperties(a, b) {
     var aProps = Object.getOwnPropertyNames(a);
     var bProps = Object.getOwnPropertyNames(b);
@@ -234,8 +266,9 @@ function hasSameProperties(a, b) {
     }
     return true;
 }
+exports.hasSameProperties = hasSameProperties;
 /**
- * Compare the cookie and return true if the cookies has equivalent
+ * Compare the cookie and return true if the cookies have equivalent
  * options and the cookies would be overwritten in the browser storage.
  *
  * @param a first Cookie for comparison
@@ -248,71 +281,109 @@ 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
- * @param options
+ * @param ctx NextJS page or API context, express context, null or undefined.
+ * @param options Options that we pass down to `cookie` library.
  */
 function parseCookies(ctx, options) {
-    if (ctx && ctx.req && ctx.req.headers && ctx.req.headers.cookie) {
+    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) {
         return cookie.parse(ctx.req.headers.cookie, options);
     }
-    if (isBrowser()) {
+    if (utils.isBrowser()) {
         return cookie.parse(document.cookie, options);
     }
     return {};
 }
 exports.parseCookies = parseCookies;
 /**
- *
  * Sets a cookie.
  *
- * @param ctx
- * @param name
- * @param value
- * @param options
+ * @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.
  */
 function setCookie$1(ctx, name, value, options) {
-    if (ctx && ctx.res && ctx.res.getHeader && ctx.res.setHeader) {
+    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.
+         */
         var cookies = ctx.res.getHeader('Set-Cookie') || [];
         if (typeof cookies === 'string')
             cookies = [cookies];
         if (typeof cookies === 'number')
             cookies = [];
-        var parsedCookies = setCookie.parse(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 cookiesToSet_1 = [];
         parsedCookies.forEach(function (parsedCookie) {
-            if (!areCookiesEqual(parsedCookie, createCookie(name, value, options))) {
-                cookiesToSet_1.push(cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({}, 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);
             }
         });
         cookiesToSet_1.push(cookie.serialize(name, value, options));
-        if (!ctx.res.finished) {
-            ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
-        }
+        // Update the header.
+        ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
     }
-    if (isBrowser()) {
+    // Browser
+    if (utils.isBrowser()) {
         if (options && options.httpOnly) {
             throw new Error('Can not set a httpOnly cookie in the browser.');
         }
@@ -322,30 +393,21 @@ function setCookie$1(ctx, name, value, options) {
 }
 exports.setCookie = setCookie$1;
 /**
- *
  * Destroys a cookie with a particular name.
  *
- * @param ctx
- * @param name
- * @param options
+ * @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.
  */
 function destroyCookie(ctx, name, options) {
-    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 {};
+    /**
+     * 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 }));
 }
 exports.destroyCookie = destroyCookie;
+/* Utility Exports */
 exports.default = {
     set: setCookie$1,
     get: parseCookies,
@@ -362,33 +424,28 @@ var dist_3 = dist.parseCookies;
 var _this = undefined;
 
 var getRelatedArticle = function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+  var _ref2 = _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 _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, articles, filters, cookies, prevSlugs, referenceFilter, query;
+    var taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
 
     return regenerator.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _article$url = article.url;
+            taxonomyMapping = article.taxonomyMapping, _article$url = article.url;
             _article$url = _article$url === undefined ? {
               current: null
             } : _article$url;
-            url = _article$url.current, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
-            content_placement = article.content_placement;
-            references = [];
-
+            url = _article$url.current, content_placement = article.content_placement;
+            taxonomy = [];
+            //404 articles were throwing server error
 
-            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) {
+            if (content_placement) {
               content_placement.forEach(function (_ref3) {
                 var path = _ref3.path,
                     _id = _ref3._id;
@@ -400,38 +457,27 @@ 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) references.push(_id);
+                if (prev_url_to_check.endsWith(path) && _id) taxonomy.push(_id);
               });
-              if (references.length === 0) {
-                content_placement.forEach(function (_ref4) {
-                  var _id = _ref4._id;
-
-                  if (_id) references.push(_id);
-                });
-              }
             }
 
-            if (documentGroupMapping && documentGroupMapping.length > 0) {
-              documentGroupMapping.forEach(function (_ref5) {
-                var _id = _ref5._id;
+            //404 articles were throwing server error
+            if (taxonomy.length === 0 && taxonomyMapping) {
+              taxonomyMapping.forEach(function (_ref4) {
+                var _ref = _ref4._ref;
 
-                if (_id) references.push(_id);
+                if (_ref) {
+                  taxonomy.push(_ref);
+                }
               });
             }
 
-            if (issueGroup && issueGroup._ref) {
-              references.push(issueGroup._ref);
-            }
-
-            params = { url: url, index: articleCount };
-            articles = null;
-
-            if (!(references && references.length > 0)) {
-              _context.next = 26;
-              break;
-            }
-
-            filters = '';
+            params = {
+              url: url,
+              taxonomy: taxonomy,
+              index: articleCount
+            };
+            conditions = '';
 
             if (ctx && url) {
               cookies = dist_3(ctx);
@@ -439,54 +485,27 @@ var getRelatedArticle = function () {
 
               if (!!prevSlugs) {
                 dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                filters = '&& !(url.current in [' + prevSlugs + '])';
+                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);
 
-            referenceFilter = references.reduce(function (acc, item, index, array) {
-              if (array.length === 1) {
-                acc = acc + ' references("' + item + '") ';
-              } else if (index === 0) {
-                acc = acc + ' (references("' + item + '") ||';
-              } else if (index + 1 === array.length) {
-                acc = acc + ' references("' + item + '")) ';
-              } else {
-                acc = acc + ' references("' + item + '") ||';
-              }
-              return acc;
-            }, '&&');
-
-
-            filters = filters + referenceFilter;
-            query = getQuery('related', filters, '', articleCount).replace('&& taxonomyMapping[]._ref in $taxonomy', '');
-            _context.prev = 17;
-            _context.next = 20;
-            return client.fetch(query, params);
-
-          case 20:
-            articles = _context.sent;
-            _context.next = 26;
-            break;
-
-          case 23:
-            _context.prev = 23;
-            _context.t0 = _context['catch'](17);
-
-            console.error(_context.t0);
-
-          case 26:
-            return _context.abrupt('return', articles);
-
-          case 27:
+          case 14:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this, [[17, 23]]);
+    }, _callee, _this);
   }));
 
   return function getRelatedArticle() {
-    return _ref.apply(this, arguments);
+    return _ref2.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-0e45a0b2.js';
+import './index-93ec3c59.js';
 import 'prop-types';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
-import './moment-e2f9b20c.js';
+import './moment-12415288.js';
 import 'next/router';
 import './isSymbol-807e927e.js';
 import './debounce-1a993acf.js';
 import 'react-dom';
-import './index-73819142.js';
+import './index-51a80699.js';
 import './index-5f9f807a.js';
-import './main-5d1e4bd3.js';
+import './main-0465b2a0.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-e9b4ddcf.js';
+import './BlockContent-a614acdf.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-c376cd8e.js';
+export { g as default } from './index-754010eb.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/{index-73819142.js → index-51a80699.js}

@@ -58,35 +58,35 @@ function parseSource(source) {
     if (typeof source === 'string' && isUrl(source)) {
         // Someone passed an existing image url?
         image = {
-            asset: { _ref: urlToId(source) }
+            asset: { _ref: urlToId(source) },
         };
     }
     else if (typeof source === 'string') {
         // Just an asset id
         image = {
-            asset: { _ref: source }
+            asset: { _ref: source },
         };
     }
     else if (isRef(source)) {
         // We just got passed an asset directly
         image = {
-            asset: source
+            asset: source,
         };
     }
     else if (isAsset(source)) {
         // If we were passed an image asset document
         image = {
             asset: {
-                _ref: source._id || ''
-            }
+                _ref: source._id || '',
+            },
         };
     }
     else if (isAssetStub(source)) {
         // If we were passed a partial asset (`url`, but no `_id`)
         image = {
             asset: {
-                _ref: urlToId(source.asset.url)
-            }
+                _ref: urlToId(source.asset.url),
+            },
         };
     }
     else if (typeof source.asset === 'object') {
@@ -127,7 +127,7 @@ function applyDefaults(image) {
             left: 0,
             top: 0,
             bottom: 0,
-            right: 0
+            right: 0,
         };
     }
     if (!result.hotspot) {
@@ -135,7 +135,7 @@ function applyDefaults(image) {
             x: 0.5,
             y: 0.5,
             height: 1.0,
-            width: 1.0
+            width: 1.0,
         };
     }
     return result;
@@ -182,7 +182,7 @@ exports.SPEC_NAME_TO_URL_NAME_MAPPINGS = [
     ['crop', 'crop'],
     ['saturation', 'sat'],
     ['auto', 'auto'],
-    ['dpr', 'dpr']
+    ['dpr', 'dpr'],
 ];
 function urlForImage(options) {
     var spec = __assign({}, (options || {}));
@@ -201,7 +201,7 @@ function urlForImage(options) {
         left: cropLeft,
         top: cropTop,
         width: Math.round(asset.width - image.crop.right * asset.width - cropLeft),
-        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop)
+        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop),
     };
     // Compute hot spot rect in terms of pixel coordinates
     var hotSpotVerticalRadius = (image.hotspot.height * asset.height) / 2;
@@ -212,7 +212,7 @@ function urlForImage(options) {
         left: hotSpotCenterX - hotSpotHorizontalRadius,
         top: hotSpotCenterY - hotSpotVerticalRadius,
         right: hotSpotCenterX + hotSpotHorizontalRadius,
-        bottom: hotSpotCenterY + hotSpotVerticalRadius
+        bottom: hotSpotCenterY + hotSpotVerticalRadius,
     };
     // If irrelevant, or if we are requested to: don't perform crop/fit based on
     // the crop/hotspot.
@@ -294,7 +294,7 @@ function fit(source, spec) {
             left: Math.round(left),
             top: Math.round(top_2),
             width: Math.round(width),
-            height: Math.round(height)
+            height: Math.round(height),
         };
     }
     else {
@@ -316,13 +316,13 @@ function fit(source, spec) {
             left: Math.max(0, Math.floor(left)),
             top: Math.max(0, Math.floor(top_3)),
             width: Math.round(width),
-            height: Math.round(height)
+            height: Math.round(height),
         };
     }
     return {
         width: imgWidth,
         height: imgHeight,
-        rect: cropRect
+        rect: cropRect,
     };
 }
 
@@ -375,11 +375,12 @@ function urlBuilder(options) {
     var client = options;
     if (isSanityClient(client)) {
         // Inherit config from client
-        var _a = client.clientConfig, apiHost = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
+        var _a = client.clientConfig, apiUrl = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
+        var apiHost = apiUrl || 'https://api.sanity.io';
         return new ImageUrlBuilder(null, {
             baseUrl: apiHost.replace(/^https:\/\/api\./, 'https://cdn.'),
             projectId: projectId,
-            dataset: dataset
+            dataset: dataset,
         });
     }
     // Or just accept the options as given
@@ -392,7 +393,7 @@ var ImageUrlBuilder = /** @class */ (function () {
             ? __assign(__assign({}, (parent.options || {})), (options || {})) : __assign({}, (options || {})); // Copy options
     }
     ImageUrlBuilder.prototype.withOptions = function (options) {
-        var baseUrl = options.baseUrl || '';
+        var baseUrl = options.baseUrl || this.options.baseUrl;
         var newOptions = { baseUrl: baseUrl };
         for (var key in options) {
             if (options.hasOwnProperty(key)) {
@@ -520,7 +521,7 @@ var ImageUrlBuilder = /** @class */ (function () {
     ImageUrlBuilder.prototype.url = function () {
         return urlForImage_1$1.default(this.options);
     };
-    // Synonym for url()
+    // Alias for url()
     ImageUrlBuilder.prototype.toString = function () {
         return this.url();
     };