@nuskin/cs-product-lib 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Library for pulling and parsing product content (and applying business logic) retrieved from Contentstack",
   "main": "src/index.js",
   "scripts": {

package/src/helpers.js

@@ -498,7 +498,7 @@ function mapPoints(parent) {
 }
 
 /* istanbul ignore next */
-function mapImage(image) {
+function mapImage(image, useWebp = false) {
     if (Array.isArray(image)) {
         image = image[0]
     }
@@ -520,10 +520,17 @@ function mapImage(image) {
         }
     }
     if ((image || {}).derivatives) {
+        const derivatives = image.derivatives || {}
         // isSvg will only work if a public link to the original derivative is authored on the bynder asset.
-        const isSvg = (image.derivatives || {}).original && (image.derivatives || {}).original.includes('.svg');
+        const isSvg = derivatives.original && derivatives.original.includes('.svg');
+        let imgURL = derivatives.webImage
+        if (isSvg) {
+            imgURL = derivatives.original
+        } else if (useWebp && derivatives.transformBaseUrl) {
+            imgURL = `${derivatives.transformBaseUrl}.webp`
+        }
         return {
-            url: isSvg ? (image.derivatives || {}).original : (image.derivatives || {}).webImage,
+            url: imgURL,
             alt:
                 (image.meta || {}).SEO_Tags ||
                 image.description ||
@@ -848,10 +855,12 @@ function mapIngredients(ings, legacyIngredients) {
         return ings.map((ingredients) => ({
             keyIngredients: ((ingredients || {}).key_ingredients || []).map(
                 (keyIngredient) => ({
-                    image: {
-                        url: (keyIngredient.icon || {}).url,
-                        alt: (keyIngredient.icon || {}).title
-                    },
+                    image: !isNullOrEmpty(keyIngredient.icon_bynder)
+                        ? mapImage(keyIngredient.icon_bynder, true)
+                        : {
+                            url: (keyIngredient.icon || {}).url,
+                            alt: (keyIngredient.icon || {}).title
+                        },
                     name: keyIngredient.header,
                     description: keyIngredient.description
                 })
@@ -885,7 +894,7 @@ function mapIngredients(ings, legacyIngredients) {
             {
                 keyIngredients: keyIngredients.map((keyIngredient) => ({
                     image: !isNullOrEmpty(keyIngredient.icon_bynder)
-                        ? mapImage(keyIngredient.icon_bynder)
+                        ? mapImage(keyIngredient.icon_bynder, true)
                         : {
                             url: (keyIngredient.icon || {}).url,
                             alt: (keyIngredient.icon || {}).title