@quintype/seo 1.41.5-description-fallback.0 → 1.41.5-description-fallback.2

package/dist/index.cjs.js

@@ -6,8 +6,8 @@ var lodash = require('lodash');
 var React = require('react');
 var ReactDomServer = require('react-dom/server');
 var get = require('lodash/get');
-var url = require('url');
 var dateFnsTz = require('date-fns-tz');
+var url = require('url');
 var isUndefined = require('lodash/isUndefined');
 var omitBy = require('lodash/omitBy');
 var quintypeJs = require('quintype-js');
@@ -51,7 +51,7 @@ function isStoryPublic(story) {
 
 function getTextOfCards(story) {
   if (story && story.cards) {
-    story.cards.map(item => {
+    return story.cards.map(item => {
       return item['story-elements'].reduce((acc, currentItem) => {
         const elementType = currentItem.subtype || currentItem.type || '';
         if (elementType === 'text') {
@@ -968,11 +968,13 @@ function buildTagsFromStory(config, story, url = {}, data = {}, seoConfig = {})
 
   let descriptionWithExtraFallback = "";
   let ogDescriptionWithExtraFallback = "";
-  if (seoConfig.enableMetaDescriptionFallback) {
+  const enableMetaDescriptionFallback = lodash.get(seoConfig, ["enableMetaDescriptionFallback"], false);
+  if (enableMetaDescriptionFallback) {
+    const subHeadline = lodash.get(story, ["subheadline"]);
     const fetch160Characters = data => data ? data.substring(0, 160) : null;
     const fullStoryTextElementContent = getTextOfCards(story);
-    descriptionWithExtraFallback = fetch160Characters(story.subheadline) || fetch160Characters(fullStoryTextElementContent);
-    ogDescriptionWithExtraFallback = fetch160Characters(fullStoryTextElementContent) || fetch160Characters(story.subheadline) || seo["meta-description"];
+    descriptionWithExtraFallback = fetch160Characters(subHeadline) || fetch160Characters(fullStoryTextElementContent);
+    ogDescriptionWithExtraFallback = fetch160Characters(fullStoryTextElementContent) || fetch160Characters(subHeadline) || lodash.get(seo, ["meta-description"]);
   }
 
   const storyUrl = story.url || `${config["sketches-host"]}/${story.slug}`;
@@ -1227,7 +1229,7 @@ const SKIP_CANONICAL = "__SKIP__CANONICAL__";
  * @param {boolean} seoConfig.enableOgTags Add og tags for Facebook
  * @param {boolean} seoConfig.enableTwitterCards Add twitter tags
  * @param {boolean} seoConfig.enableNews Add tags for Google News, like news_keywords
- * @param {boolean} seoConfig.enableMetaDescriptionsFallback Add extra fallbacks for meta description, og:description and twitter:description
+ * @param {boolean} seoConfig.enableMetaDescriptionFallback Add extra fallbacks for meta description, og:description and twitter:description
  * @param {Object} seoConfig.customTags Add tags for a custom page type. Usually looks like `{"custom-page": {"title": "value", "canonicalUrl": "value"}}`
  * @param {...*} params See {@link Generator} for other Parameters
  */
@@ -1363,7 +1365,7 @@ class MetaTagList {
  *     enableNewsArticle: true
  *   },
  *   ampStoryPages: true,
- *   enableMetaDescriptionsFallback: true
+ *   enableMetaDescriptionFallback: true
  * });
  * ```
  */

package/index.js

@@ -94,7 +94,7 @@ export class MetaTagList {
  *     enableNewsArticle: true
  *   },
  *   ampStoryPages: true,
- *   enableMetaDescriptionsFallback: true
+ *   enableMetaDescriptionFallback: true
  * });
  * ```
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/seo",
-  "version": "1.41.5-description-fallback.0",
+  "version": "1.41.5-description-fallback.2",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",

package/src/text-tags.js

@@ -24,15 +24,16 @@ function buildTagsFromStory(config, story, url = {}, data = {}, seoConfig = {})
 
   let descriptionWithExtraFallback = "";
   let ogDescriptionWithExtraFallback = "";
-  if (seoConfig.enableMetaDescriptionFallback) {
+  const enableMetaDescriptionFallback = get(seoConfig, ["enableMetaDescriptionFallback"], false);
+  if (enableMetaDescriptionFallback) {
+    const subHeadline = get(story, ["subheadline"]);
     const fetch160Characters = (data) => (data ? data.substring(0, 160) : null);
     const fullStoryTextElementContent = getTextOfCards(story);
-    descriptionWithExtraFallback =
-      fetch160Characters(story.subheadline) || fetch160Characters(fullStoryTextElementContent);
+    descriptionWithExtraFallback = fetch160Characters(subHeadline) || fetch160Characters(fullStoryTextElementContent);
     ogDescriptionWithExtraFallback =
       fetch160Characters(fullStoryTextElementContent) ||
-      fetch160Characters(story.subheadline) ||
-      seo["meta-description"];
+      fetch160Characters(subHeadline) ||
+      get(seo, ["meta-description"]);
   }
 
   const storyUrl = story.url || `${config["sketches-host"]}/${story.slug}`;
@@ -314,7 +315,7 @@ const SKIP_CANONICAL = "__SKIP__CANONICAL__";
  * @param {boolean} seoConfig.enableOgTags Add og tags for Facebook
  * @param {boolean} seoConfig.enableTwitterCards Add twitter tags
  * @param {boolean} seoConfig.enableNews Add tags for Google News, like news_keywords
- * @param {boolean} seoConfig.enableMetaDescriptionsFallback Add extra fallbacks for meta description, og:description and twitter:description
+ * @param {boolean} seoConfig.enableMetaDescriptionFallback Add extra fallbacks for meta description, og:description and twitter:description
  * @param {Object} seoConfig.customTags Add tags for a custom page type. Usually looks like `{"custom-page": {"title": "value", "canonicalUrl": "value"}}`
  * @param {...*} params See {@link Generator} for other Parameters
  */

package/src/utils.js

@@ -1,6 +1,6 @@
-import {entries} from 'lodash';
-import { URL, URLSearchParams } from 'url';
 import { format, utcToZonedTime } from 'date-fns-tz';
+import { entries } from 'lodash';
+import { URL, URLSearchParams } from 'url';
 
 export function objectToTags(object) {
   return entries(object)
@@ -36,7 +36,7 @@ export function isStoryPublic(story) {
 
 export function getTextOfCards(story) {
   if (story && story.cards) {
-    story.cards
+   return story.cards
       .map((item) => {
         return item['story-elements'].reduce((acc, currentItem) => {
           const elementType = currentItem.subtype || currentItem.type || '';