@mjhls/mjh-framework 1.0.665-beta.2 → 1.0.665-beta.3

package/dist/cjs/View.js

@@ -59,7 +59,7 @@ var keys = require('./keys-a586b7a0.js');
 require('react-bootstrap/Dropdown');
 var getSeriesDetail = require('./getSeriesDetail.js');
 require('./index-bd6c9f56.js');
-var getRelatedArticle = require('./getRelatedArticle-c944847e.js');
+var getRelatedArticle = require('./getRelatedArticle.js');
 var getQuery = require('./getQuery.js');
 var getTargeting = require('./getTargeting-9af0ef69.js');
 var getKeywords = require('./getKeywords.js');
@@ -1020,13 +1020,12 @@ var _this = undefined;
 
 var getRelatedContents = function () {
   var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.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, content_placement, documentGroupMapping, issueGroup, params, conditions, taxonomy, documentGroup, cookies, prevSlugs, relatedContents, relatedContentQuery;
+    var _article$url, url, content_placement, documentGroupMapping, issueGroup, params, conditions, taxonomy, documentGroup, relatedContents, relatedContentQuery;
 
     return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
       while (1) {
@@ -1038,8 +1037,7 @@ var getRelatedContents = function () {
             } : _article$url;
             url = _article$url.current, content_placement = article.content_placement, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
             params = {
-              url: url,
-              index: articleCount
+              url: url
             };
             conditions = '';
 
@@ -1061,15 +1059,20 @@ var getRelatedContents = function () {
                 }
                 if (prev_url_to_check.endsWith(path) && _id) taxonomy.push(_id);
               });
-              if (taxonomy.length === 0) content_placement.filter(function (_ref3) {
-                var identifier = _ref3.identifier;
-                return identifier !== 'news';
-              }).forEach(function (_ref4) {
-                var _id = _ref4._id;
-
-                if (_id) taxonomy.push(_id);
-              });
-              params = _extends$1._extends({}, params, { taxonomy: taxonomy });
+              if (taxonomy.length === 0) {
+                content_placement.filter(function (_ref3) {
+                  var identifier = _ref3.identifier;
+                  return identifier !== 'news';
+                }).forEach(function (_ref4) {
+                  var _id = _ref4._id;
+
+                  if (_id) taxonomy.push(_id);
+                });
+              }
+              if (taxonomy.length > 0) {
+                params = _extends$1._extends({}, params, { taxonomy: taxonomy });
+                conditions = '&& taxonomyMapping[]._ref in $taxonomy';
+              }
             }
 
             if (documentGroupMapping && documentGroupMapping.length > 0) {
@@ -1080,48 +1083,56 @@ var getRelatedContents = function () {
 
                 if (_id) documentGroup.push(_id);
               });
-              params = _extends$1._extends({}, params, { documentGroup: documentGroup });
-              conditions = conditions.concat('&& documentGroupMapping[]._ref in $documentGroup ');
-            }
-
-            if (issueGroup) {
-              params = _extends$1._extends({}, params, { issueAssociation: issueGroup._ref });
-              conditions = conditions.concat('&& issueGroup._ref == $issueAssociation ');
+              if (params.taxonomy && documentGroup.length > 0) {
+                params = _extends$1._extends({}, params, { documentGroup: documentGroup });
+                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || documentGroupMapping[]._ref in $documentGroup)';
+              }
             }
 
-            if (ctx && url) {
-              cookies = getRelatedArticle.dist_3(ctx);
-              prevSlugs = cookies['prevSlugs'];
-
-              if (!!prevSlugs) {
-                getRelatedArticle.dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                conditions = '&& !(url.current in [' + prevSlugs + '])';
-              } else getRelatedArticle.dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
+            if (issueGroup && issueGroup._ref) {
+              if (params.taxonomy && params.documentGroup) {
+                params = _extends$1._extends({}, params, { issueAssociation: issueGroup._ref });
+                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || documentGroupMapping[]._ref in $documentGroup || issueGroup._ref == $issueAssociation )';
+              } else if (params.taxonomy) {
+                params = _extends$1._extends({}, params, { issueAssociation: issueGroup._ref });
+                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || issueGroup._ref == $issueAssociation )';
+              }
             }
 
             relatedContents = [];
 
             if (!(params.taxonomy && params.taxonomy.length > 0)) {
-              _context.next = 15;
+              _context.next = 21;
               break;
             }
 
-            relatedContentQuery = getQuery('related', conditions, '', articleCount);
+            relatedContentQuery = '*[\n      _type == "article"\n      && defined(title)\n      && defined(url)\n      && !(_id in path("drafts.**"))\n      && taxonomyMapping[].disableAds != \'true\'\n      && contentCategory.name != \'Poll\'\n      && contentCategory.name != \'Slideshows\'\n    \t&& contentCategory.disableAds != \'true\'\n      && ExcludeFromInfiniteScroll !=true\n      && url.current != $url\n      && !defined(body[].videos)\n      && published <= \'' + new Date().toISOString() + '\'\n      ' + conditions + '\n\n      // && is_visible == true\n      // && passwordLock!=true\n\n\n    ]| order(published desc)[' + articleCount + ']\n    {\n      title,\n      url,\n      thumbnail\n    }';
+            _context.prev = 11;
             _context.next = 14;
             return client.fetch(relatedContentQuery, params);
 
           case 14:
             relatedContents = _context.sent;
 
-          case 15:
+            debugger;
+            _context.next = 21;
+            break;
+
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context['catch'](11);
+
+            console.error(_context.t0);
+
+          case 21:
             return _context.abrupt('return', relatedContents);
 
-          case 16:
+          case 22:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this);
+    }, _callee, _this, [[11, 18]]);
   }));
 
   return function getRelatedContents() {
@@ -1264,7 +1275,7 @@ var ArticleQueue = function ArticleQueue(props) {
                   startingIndex = queueData.length + 1;
                   endingIndex = startingIndex + 2;
                   _context.next = 5;
-                  return getRelatedArticle.getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
+                  return getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
 
                 case 5:
                   article.relatedArticle = _context.sent;
@@ -1649,7 +1660,7 @@ View.returnGetInitialProps = function () {
             }
 
             _context.next = 17;
-            return getRelatedArticle.getRelatedArticle(context, client, article, prevUrl, '0..2');
+            return getRelatedArticle(context, client, article, prevUrl, '0..2');
 
           case 17:
             article.relatedArticle = _context.sent;

package/dist/cjs/getRelatedArticle.js

@@ -1,18 +1,452 @@
 'use strict';
 
-require('./_commonjsHelpers-06173234.js');
+var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./es6.string.iterator-cc0bbaa4.js');
 require('./_library-dd23b178.js');
 require('./_iter-detect-60b2f026.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./web.dom.iterable-a0e279c1.js');
-require('./asyncToGenerator-533d476a.js');
+var asyncToGenerator = require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
-require('./index-bd6c9f56.js');
-var getRelatedArticle = require('./getRelatedArticle-c944847e.js');
-require('./getQuery.js');
+var index$4 = require('./index-bd6c9f56.js');
+var getQuery = require('./getQuery.js');
 
+var defaultParseOptions = {
+  decodeValues: true,
+  map: false,
+  silent: false,
+};
 
+function isNonEmptyString(str) {
+  return typeof str === "string" && !!str.trim();
+}
 
-module.exports = getRelatedArticle.getRelatedArticle;
+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 = _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;
+
+
+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 index$4.cookie.parse(ctx.req.headers.cookie, options);
+    }
+    if (isBrowser()) {
+        return index$4.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(index$4.cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({}, parsedCookie)));
+            }
+        });
+        cookiesToSet_1.push(index$4.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 = index$4.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(index$4.cookie.serialize(name, '', opts));
+        ctx.res.setHeader('Set-Cookie', cookies);
+    }
+    if (isBrowser()) {
+        document.cookie = index$4.cookie.serialize(name, '', opts);
+    }
+    return {};
+}
+exports.destroyCookie = destroyCookie;
+exports.default = {
+    set: setCookie$1,
+    get: parseCookies,
+    destroy: destroyCookie,
+};
+
+});
+
+_commonjsHelpers.unwrapExports(dist);
+var dist_1 = dist.destroyCookie;
+var dist_2 = dist.setCookie;
+var dist_3 = dist.parseCookies;
+
+var _this = undefined;
+
+var getRelatedArticle = function () {
+  var _ref2 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.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;
+
+    return asyncToGenerator.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 === undefined ? {
+              current: null
+            } : _article$url;
+            url = _article$url.current, content_placement = article.content_placement;
+            taxonomy = [];
+            //404 articles were throwing server error
+
+            if (content_placement) {
+              content_placement.forEach(function (_ref3) {
+                var path = _ref3.path,
+                    _id = _ref3._id;
+
+                if (!_id || typeof _id == 'undefined') {
+                  return null;
+                }
+                var prev_url_to_check = prevUrl;
+                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);
+              });
+            }
+
+            //404 articles were throwing server error
+            if (taxonomy.length === 0 && taxonomyMapping) {
+              taxonomyMapping.forEach(function (_ref4) {
+                var _ref = _ref4._ref;
+
+                if (_ref) {
+                  taxonomy.push(_ref);
+                }
+              });
+            }
+
+            params = {
+              url: url,
+              taxonomy: taxonomy,
+              index: articleCount
+            };
+            conditions = '';
+
+            if (ctx && url) {
+              cookies = dist_3(ctx);
+              prevSlugs = cookies['prevSlugs'];
+
+              if (!!prevSlugs) {
+                dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
+                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);
+
+          case 14:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, _this);
+  }));
+
+  return function getRelatedArticle() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+module.exports = getRelatedArticle;

package/dist/cjs/index.js

@@ -158,7 +158,7 @@ var KMTracker = require('./KMTracker.js');
 var getSeriesDetail = require('./getSeriesDetail.js');
 var SetCookie = require('./SetCookie.js');
 require('./index-bd6c9f56.js');
-var getRelatedArticle = require('./getRelatedArticle-c944847e.js');
+var getRelatedArticle = require('./getRelatedArticle.js');
 var getQuery = require('./getQuery.js');
 var Auth = require('./Auth.js');
 require('swr');
@@ -248,7 +248,7 @@ exports.ConferenceArticleCard = ConferenceArticleCard;
 exports.KMTracker = KMTracker;
 exports.getSeriesDetail = getSeriesDetail;
 exports.SetCookie = SetCookie;
-exports.getRelatedArticle = getRelatedArticle.getRelatedArticle;
+exports.getRelatedArticle = getRelatedArticle;
 exports.getQuery = getQuery;
 exports.Auth = Auth.default;
 exports.getTargeting = getTargeting.getTargeting;