@mjhls/mjh-framework 1.0.645 → 1.0.647

package/dist/esm/{get-58d2f7cc.js → get-5ee14cda.js}

@@ -1,5 +1,31 @@
-import { c as isSymbol_1, a as _root, d as isObject_1, e as _Symbol } from './isSymbol-47f5ff3b.js';
-import { a as isArray_1, i as isFunction_1, _ as _arrayMap } from './_arrayMap-818441dd.js';
+import { i as isSymbol_1, a as isObject_1, b as _baseGetTag, _ as _root, c as _Symbol } from './isSymbol-807e927e.js';
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(document.body.children);
+ * // => false
+ *
+ * _.isArray('abc');
+ * // => false
+ *
+ * _.isArray(_.noop);
+ * // => false
+ */
+var isArray = Array.isArray;
+
+var isArray_1 = isArray;
 
 /** Used to match property names within property paths. */
 var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
@@ -28,6 +54,41 @@ function isKey(value, object) {
 
 var _isKey = isKey;
 
+/** `Object#toString` result references. */
+var asyncTag = '[object AsyncFunction]',
+    funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    proxyTag = '[object Proxy]';
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  if (!isObject_1(value)) {
+    return false;
+  }
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in Safari 9 which returns 'object' for typed arrays and other constructors.
+  var tag = _baseGetTag(value);
+  return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
+}
+
+var isFunction_1 = isFunction;
+
 /** Used to detect overreaching core-js shims. */
 var coreJsData = _root['__core-js_shared__'];
 
@@ -753,6 +814,28 @@ var stringToPath = _memoizeCapped(function(string) {
 
 var _stringToPath = stringToPath;
 
+/**
+ * A specialized version of `_.map` for arrays without support for iteratee
+ * shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the new mapped array.
+ */
+function arrayMap(array, iteratee) {
+  var index = -1,
+      length = array == null ? 0 : array.length,
+      result = Array(length);
+
+  while (++index < length) {
+    result[index] = iteratee(array[index], index, array);
+  }
+  return result;
+}
+
+var _arrayMap = arrayMap;
+
 /** Used as references for various `Number` constants. */
 var INFINITY = 1 / 0;
 

package/dist/esm/getQuery.js

@@ -8,9 +8,9 @@ var getQuery = function getQuery(type) {
 
   switch (type) {
     case 'related':
-      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && published <= now()\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                    documentGroup-> {\n                      name,\n                      thumbnail,\n                      parent->{...,parent->},\n                    \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
+      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && published <= now()\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
     case 'article':
-      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                            documentGroup-> {\n                              name,\n                              thumbnail,\n                              parent->{...,parent->},\n                            \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
+      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':

package/dist/esm/getSerializers.js

@@ -20,8 +20,8 @@ import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import './moment-12415288.js';
 import 'next/router';
-import './isSymbol-47f5ff3b.js';
-import './debounce-a0d9abca.js';
+import './isSymbol-807e927e.js';
+import './debounce-1a993acf.js';
 import 'react-dom';
 import './index-51a80699.js';
 import './index-5f9f807a.js';
@@ -38,7 +38,7 @@ import './smoothscroll-4b699764.js';
 import './GroupDeck.js';
 import 'react-bootstrap';
 import 'react-bootstrap/Button';
-export { g as default } from './index-fe4d6d6e.js';
+export { g as default } from './index-4b48a31f.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';

package/dist/esm/{getTargeting-3cc3f97d.js → getTargeting-11d623e4.js}

@@ -47,6 +47,7 @@ var getTargeting = function getTargeting(props) {
     path: ''
   } : _article$documentGrou;
   var document_group = _article$documentGrou.path,
+      document_groups = article.document_groups,
       content_placement = article.content_placement;
 
   var context = url;
@@ -84,10 +85,40 @@ var getTargeting = function getTargeting(props) {
   } else {
     content_placement_urls = ['/'];
   }
+
+  var document_group_urls = [];
+  if (document_groups && prevUrl && prevUrl.length) {
+    document_groups.forEach(function (item) {
+      var path = item.path;
+      if (cpModificationRequired) {
+        path = getContentPlacementUrl(item);
+      }
+
+      var previous_url_to_check = prevUrl;
+      if (prevUrl.includes('?')) {
+        previous_url_to_check = prevUrl.split('?')[0];
+      }
+
+      if (previous_url_to_check.endsWith(path)) {
+        document_group_urls.push(path);
+      }
+    });
+  }
+
+  if (document_groups) {
+    if (document_group_urls.length === 0) {
+      document_group_urls = document_groups.map(function (item) {
+        return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
+      });
+    }
+  } else {
+    document_group_urls = [document_group];
+  }
+
   var articleKeywords = [].concat(_toConsumableArray(internalTag), _toConsumableArray(userDefinedTag), _toConsumableArray(SponsorshipTag), _toConsumableArray(seoTag));
   var targeting = {
     tags: articleKeywords,
-    document_group: [document_group],
+    document_group: document_group_urls,
     document_url: [url],
     content_placement: content_placement_urls
   };

package/dist/esm/getTargeting.js

@@ -6,4 +6,4 @@ import './toConsumableArray-e7f3f5a6.js';
 import './core.get-iterator-method-e41daf74.js';
 import './_object-pie-33c40e79.js';
 import './extends-229166d5.js';
-export { g as default } from './getTargeting-3cc3f97d.js';
+export { g as default } from './getTargeting-11d623e4.js';

package/dist/esm/index.js

@@ -22,8 +22,8 @@ import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
 import './moment-12415288.js';
 import 'next/router';
-import './isSymbol-47f5ff3b.js';
-import './debounce-a0d9abca.js';
+import './isSymbol-807e927e.js';
+import './debounce-1a993acf.js';
 import './index.es-938a3a58.js';
 import 'react-dom';
 import './visibility-sensor-0baa4eea.js';
@@ -37,12 +37,11 @@ import './asyncToGenerator-271a52f3.js';
 import './_set-species-41cbf140.js';
 export { B as Beam, S as Segment } from './beam-c4d8f8f6.js';
 export { default as AdSlot } from './AdSlot.js';
-import './ADInfeed-fd7a62b1.js';
+import './ADInfeed-3c4773f8.js';
 export { default as DeckContent } from './DeckContent.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-79c771d6.js';
-import './_arrayMap-818441dd.js';
-import './get-58d2f7cc.js';
+import './ADlgInfeed-5a52301f.js';
+import './get-5ee14cda.js';
 export { default as AD } from './AD.js';
 import './AuthorComponent-1ea27faa.js';
 export { default as GridContent } from './GridContent.js';
@@ -73,7 +72,7 @@ import './index-d2f90501.js';
 import './js.cookie-6874175c.js';
 export { default as EventsDeck } from './EventsDeck.js';
 export { default as CMEDeck } from './CMEDeck.js';
-export { g as getSerializers } from './index-fe4d6d6e.js';
+export { g as getSerializers } from './index-4b48a31f.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';
@@ -141,8 +140,6 @@ export { default as PublicationLanding } from './PublicationLanding.js';
 export { default as IssueLanding } from './IssueLanding.js';
 import 'react-bootstrap/Modal';
 export { default as PopUpModal } from './PopUpModal.js';
-export { default as ArticleQueue } from './ArticleQueue.js';
-export { default as getKeywords } from './getKeywords.js';
 export { default as RelatedContent } from './RelatedContent.js';
 export { default as ForbesHero } from './ForbesHero.js';
 export { default as HorizontalHero } from './HorizontalHero.js';
@@ -162,8 +159,9 @@ export { default as Auth } from './Auth.js';
 import 'swr';
 import 'passport-local';
 import 'mysql';
-export { g as getTargeting } from './getTargeting-3cc3f97d.js';
+export { g as getTargeting } from './getTargeting-11d623e4.js';
 export { default as View } from './View.js';
+export { default as getKeywords } from './getKeywords.js';
 export { default as urlFor } from './urlFor.js';
 import './style-inject.es-1f59c1d0.js';
 import 'react-twitter-embed';

package/dist/esm/{isSymbol-47f5ff3b.js → isSymbol-807e927e.js}

@@ -200,4 +200,4 @@ function isSymbol(value) {
 
 var isSymbol_1 = isSymbol;
 
-export { _baseGetTag as _, _root as a, _freeGlobal as b, isSymbol_1 as c, isObject_1 as d, _Symbol as e, isObjectLike_1 as i };
+export { _root as _, isObject_1 as a, _baseGetTag as b, _Symbol as c, isSymbol_1 as i };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.645",
+  "version": "1.0.647",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",