@mjhls/mjh-framework 1.0.844-beta.2 → 1.0.844-schema-fix-v1

package/dist/esm/getRelatedArticle.js

@@ -1,4 +1,4 @@
-import './_commonjsHelpers-0c4b6f40.js';
+import { c as createCommonjsModule, u as unwrapExports, a as commonjsGlobal } from './_commonjsHelpers-0c4b6f40.js';
 import './_to-object-a4107da3.js';
 import './es6.string.iterator-c990c18c.js';
 import './_library-528f1934.js';
@@ -6,18 +6,369 @@ import './_iter-detect-5d49a330.js';
 import './core.get-iterator-method-e1de7503.js';
 import './web.dom.iterable-4439f05a.js';
 import { a as _asyncToGenerator, r as regenerator } from './asyncToGenerator-fc1c2e29.js';
+import { c as cookie } from './index-db3bb315.js';
 import getQuery from './getQuery.js';
 
+var defaultParseOptions = {
+  decodeValues: true,
+  map: false,
+  silent: false,
+};
+
+function isNonEmptyString(str) {
+  return typeof str === "string" && !!str.trim();
+}
+
+function parseString(setCookieValue, options) {
+  var parts = setCookieValue.split(";").filter(isNonEmptyString);
+  var nameValue = parts.shift().split("=");
+  var name = nameValue.shift();
+  var value = nameValue.join("="); // everything after the first =, joined by a "=" if there was more than one part
+
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  var cookie = {
+    name: name, // grab everything before the first =
+    value: options.decodeValues ? decodeURIComponent(value) : value, // decode cookie value
+  };
+
+  parts.forEach(function (part) {
+    var sides = part.split("=");
+    var key = sides.shift().trimLeft().toLowerCase();
+    var value = sides.join("=");
+    if (key === "expires") {
+      cookie.expires = new Date(value);
+    } else if (key === "max-age") {
+      cookie.maxAge = parseInt(value, 10);
+    } else if (key === "secure") {
+      cookie.secure = true;
+    } else if (key === "httponly") {
+      cookie.httpOnly = true;
+    } else if (key === "samesite") {
+      cookie.sameSite = value;
+    } else {
+      cookie[key] = value;
+    }
+  });
+
+  return cookie;
+}
+
+function parse(input, options) {
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  if (!input) {
+    if (!options.map) {
+      return [];
+    } else {
+      return {};
+    }
+  }
+
+  if (input.headers && input.headers["set-cookie"]) {
+    // fast-path for node.js (which automatically normalizes header names to lower-case
+    input = input.headers["set-cookie"];
+  } else if (input.headers) {
+    // slow-path for other environments - see #25
+    var sch =
+      input.headers[
+        Object.keys(input.headers).find(function (key) {
+          return key.toLowerCase() === "set-cookie";
+        })
+      ];
+    // warn if called on a request-like object with a cookie header rather than a set-cookie header - see #34, 36
+    if (!sch && input.headers.cookie && !options.silent) {
+      console.warn(
+        "Warning: set-cookie-parser appears to have been called on a request object. It is designed to parse Set-Cookie headers from responses, not Cookie headers from requests. Set the option {silent: true} to suppress this warning."
+      );
+    }
+    input = sch;
+  }
+  if (!Array.isArray(input)) {
+    input = [input];
+  }
+
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  if (!options.map) {
+    return input.filter(isNonEmptyString).map(function (str) {
+      return parseString(str, options);
+    });
+  } else {
+    var cookies = {};
+    return input.filter(isNonEmptyString).reduce(function (cookies, str) {
+      var cookie = parseString(str, options);
+      cookies[cookie.name] = cookie;
+      return cookies;
+    }, cookies);
+  }
+}
+
+/*
+  Set-Cookie header field-values are sometimes comma joined in one string. This splits them without choking on commas
+  that are within a single set-cookie field-value, such as in the Expires portion.
+
+  This is uncommon, but explicitly allowed - see https://tools.ietf.org/html/rfc2616#section-4.2
+  Node.js does this for every header *except* set-cookie - see https://github.com/nodejs/node/blob/d5e363b77ebaf1caf67cd7528224b651c86815c1/lib/_http_incoming.js#L128
+  React Native's fetch does this for *every* header, including set-cookie.
+
+  Based on: https://github.com/google/j2objc/commit/16820fdbc8f76ca0c33472810ce0cb03d20efe25
+  Credits to: https://github.com/tomball for original and https://github.com/chrusart for JavaScript implementation
+*/
+function splitCookiesString(cookiesString) {
+  if (Array.isArray(cookiesString)) {
+    return cookiesString;
+  }
+  if (typeof cookiesString !== "string") {
+    return [];
+  }
+
+  var cookiesStrings = [];
+  var pos = 0;
+  var start;
+  var ch;
+  var lastComma;
+  var nextStart;
+  var cookiesSeparatorFound;
+
+  function skipWhitespace() {
+    while (pos < cookiesString.length && /\s/.test(cookiesString.charAt(pos))) {
+      pos += 1;
+    }
+    return pos < cookiesString.length;
+  }
+
+  function notSpecialChar() {
+    ch = cookiesString.charAt(pos);
+
+    return ch !== "=" && ch !== ";" && ch !== ",";
+  }
+
+  while (pos < cookiesString.length) {
+    start = pos;
+    cookiesSeparatorFound = false;
+
+    while (skipWhitespace()) {
+      ch = cookiesString.charAt(pos);
+      if (ch === ",") {
+        // ',' is a cookie separator if we have later first '=', not ';' or ','
+        lastComma = pos;
+        pos += 1;
+
+        skipWhitespace();
+        nextStart = pos;
+
+        while (pos < cookiesString.length && notSpecialChar()) {
+          pos += 1;
+        }
+
+        // currently special character
+        if (pos < cookiesString.length && cookiesString.charAt(pos) === "=") {
+          // we found cookies separator
+          cookiesSeparatorFound = true;
+          // pos is inside the next cookie, so back up and return it.
+          pos = nextStart;
+          cookiesStrings.push(cookiesString.substring(start, lastComma));
+          start = pos;
+        } else {
+          // in param ',' or param separator ';',
+          // we continue from that comma
+          pos = lastComma + 1;
+        }
+      } else {
+        pos += 1;
+      }
+    }
+
+    if (!cookiesSeparatorFound || pos >= cookiesString.length) {
+      cookiesStrings.push(cookiesString.substring(start, cookiesString.length));
+    }
+  }
+
+  return cookiesStrings;
+}
+
+var setCookie = parse;
+var parse_1 = parse;
+var parseString_1 = parseString;
+var splitCookiesString_1 = splitCookiesString;
+setCookie.parse = parse_1;
+setCookie.parseString = parseString_1;
+setCookie.splitCookiesString = splitCookiesString_1;
+
+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;
+
+
+var isBrowser = function () { return typeof window !== 'undefined'; };
+function hasSameProperties(a, b) {
+    var aProps = Object.getOwnPropertyNames(a);
+    var bProps = Object.getOwnPropertyNames(b);
+    if (aProps.length !== bProps.length) {
+        return false;
+    }
+    for (var i = 0; i < aProps.length; i++) {
+        var propName = aProps[i];
+        if (a[propName] !== b[propName]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * 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
+ * @param b second Cookie for comparison
+ */
+function areCookiesEqual(a, b) {
+    var sameSiteSame = a.sameSite === b.sameSite;
+    if (typeof a.sameSite === 'string' && typeof b.sameSite === 'string') {
+        sameSiteSame = a.sameSite.toLowerCase() === b.sameSite.toLowerCase();
+    }
+    return (hasSameProperties(__assign(__assign({}, a), { sameSite: undefined }), __assign(__assign({}, b), { sameSite: undefined })) && sameSiteSame);
+}
+/**
+ * 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
+ */
+function parseCookies(ctx, options) {
+    if (ctx && ctx.req && ctx.req.headers && ctx.req.headers.cookie) {
+        return cookie.parse(ctx.req.headers.cookie, options);
+    }
+    if (isBrowser()) {
+        return cookie.parse(document.cookie, options);
+    }
+    return {};
+}
+exports.parseCookies = parseCookies;
+/**
+ *
+ * Sets a cookie.
+ *
+ * @param ctx
+ * @param name
+ * @param value
+ * @param options
+ */
+function setCookie$1(ctx, name, value, options) {
+    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 = [];
+        var parsedCookies = setCookie.parse(cookies);
+        var cookiesToSet_1 = [];
+        parsedCookies.forEach(function (parsedCookie) {
+            if (!areCookiesEqual(parsedCookie, createCookie(name, value, options))) {
+                cookiesToSet_1.push(cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({ encode: function (val) { return val; } }, parsedCookie)));
+            }
+        });
+        cookiesToSet_1.push(cookie.serialize(name, value, options));
+        if (!ctx.res.finished) {
+            ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
+        }
+    }
+    if (isBrowser()) {
+        if (options && options.httpOnly) {
+            throw new Error('Can not set a httpOnly cookie in the browser.');
+        }
+        document.cookie = cookie.serialize(name, value, options);
+    }
+    return {};
+}
+exports.setCookie = setCookie$1;
+/**
+ *
+ * Destroys a cookie with a particular name.
+ *
+ * @param ctx
+ * @param name
+ * @param options
+ */
+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 {};
+}
+exports.destroyCookie = destroyCookie;
+exports.default = {
+    set: setCookie$1,
+    get: parseCookies,
+    destroy: destroyCookie,
+};
+
+});
+
+unwrapExports(dist);
+var dist_1 = dist.destroyCookie;
+var dist_2 = dist.setCookie;
+var dist_3 = dist.parseCookies;
+
 var _this = undefined;
 
 var getRelatedArticle = function () {
   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 _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, articles, filters, query;
+    var _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, articles, filters, cookies, prevSlugs, query;
 
     return regenerator.wrap(function _callee$(_context) {
       while (1) {
@@ -75,46 +426,48 @@ var getRelatedArticle = function () {
             articles = null;
 
             if (!(references && references.length > 0)) {
-              _context.next = 23;
+              _context.next = 24;
               break;
             }
 
             filters = '&& references("' + references.join('","') + '") ';
 
-            // if (ctx && url) {
-            //   const cookies = parseCookies(ctx)
-            //   let prevSlugs = cookies['prevSlugs']
-            //   if (!!prevSlugs) {
-            //     if (!prevSlugs.includes(url)) setCookie(ctx, 'prevSlugs', `${prevSlugs},"${url}"`, {})
-            //     filters = `${filters} && !(url.current in [${prevSlugs}])`
-            //   } else setCookie(ctx, 'prevSlugs', `"${url}"`, {})
-            // }
+
+            if (ctx && url) {
+              cookies = dist_3(ctx);
+              prevSlugs = cookies['prevSlugs'];
+
+              if (!!prevSlugs) {
+                if (!prevSlugs.includes(url)) dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
+                filters = filters + ' && !(url.current in [' + prevSlugs + '])';
+              } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
+            }
 
             query = getQuery('related', filters, '', articleCount).replace('&& taxonomyMapping[]._ref in $taxonomy', '');
-            _context.prev = 14;
-            _context.next = 17;
+            _context.prev = 15;
+            _context.next = 18;
             return client.fetch(query, params);
 
-          case 17:
+          case 18:
             articles = _context.sent;
-            _context.next = 23;
+            _context.next = 24;
             break;
 
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context['catch'](14);
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context['catch'](15);
 
             console.error(_context.t0);
 
-          case 23:
+          case 24:
             return _context.abrupt('return', articles);
 
-          case 24:
+          case 25:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this, [[14, 20]]);
+    }, _callee, _this, [[15, 21]]);
   }));
 
   return function getRelatedArticle() {

package/dist/esm/getSerializers.js

@@ -8,27 +8,27 @@ import './core.get-iterator-method-e1de7503.js';
 import './_object-pie-33c40e79.js';
 import './extends-6f2fcc99.js';
 import './_object-sap-964b6feb.js';
-import './inherits-cf8dde54.js';
+import './inherits-75d45541.js';
 import './define-property-8af5f002.js';
 import './web.dom.iterable-4439f05a.js';
-import './typeof-6435ba1c.js';
+import './typeof-af9c50d8.js';
 import './_is-array-58e95429.js';
 import 'react';
 import './events-6c3a7a63.js';
-import './index-41a678ea.js';
+import './index-f7fb1e25.js';
 import 'prop-types';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
-import './moment-e2f9b20c.js';
+import './moment-b6f49411.js';
 import 'next/router';
 import './isSymbol-1981418f.js';
 import './debounce-9207d8ee.js';
 import './toNumber-2f7a84cd.js';
 import 'react-dom';
-import './index-73819142.js';
+import './index-51a80699.js';
 import './urlFor.js';
-import './index-5f7e79e7.js';
-import './main-e4a934b2.js';
+import './index-6c12bdd5.js';
+import './main-747e7d25.js';
 import './entities-7cc3bf45.js';
 import './slicedToArray-641f241f.js';
 import './stringify-4330ccdc.js';
@@ -37,15 +37,16 @@ import './Segment.js';
 import './Beam.js';
 import './AdSlot.js';
 import 'react-bootstrap/Button';
-import './BlockContent-e9b4ddcf.js';
+import './BlockContent-d05b5b23.js';
 import './index-c7e2ac95.js';
 import './smoothscroll-0cd4c7a6.js';
 import './GroupDeck.js';
 import 'react-bootstrap';
 import './iconBase-602d52fe.js';
-import './index.esm-29e48d38.js';
-export { g as default } from './index-fb819516.js';
-import './brightcove-react-player-loader.es-83f53e4e.js';
+import './index.esm-3fdda599.js';
+export { g as default } from './index-e537f766.js';
+import './util-7700fc59.js';
+import './brightcove-react-player-loader.es-4abff0b1.js';
 import 'next/head';
 import 'react-share';
 import './SocialShare.js';

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();
     };

package/dist/esm/{index-5f7e79e7.js → index-6c12bdd5.js}

@@ -1,5 +1,5 @@
 import { c as createCommonjsModule, u as unwrapExports } from './_commonjsHelpers-0c4b6f40.js';
-import React__default from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 
@@ -179,7 +179,7 @@ var _createClass = function () { function defineProperties(target, props) { for
 
 
 
-var _react2 = _interopRequireDefault(React__default);
+var _react2 = _interopRequireDefault(React);
 
 
 
@@ -530,7 +530,7 @@ var LazyLoad = function (_Component) {
   }]);
 
   return LazyLoad;
-}(React__default.Component);
+}(React.Component);
 
 LazyLoad.propTypes = {
   once: _propTypes2.default.bool,
@@ -587,7 +587,7 @@ var decorator = function decorator() {
       }]);
 
       return LazyLoadDecorated;
-    }(React__default.Component);
+    }(React.Component);
   };
 };