@nuskin/cs-product-lib 1.0.8 → 1.0.9-cx12-6632.2

package/package.json

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

package/src/csProduct.js

@@ -35,6 +35,7 @@ const validateConfig = (props) => {
 const csProduct = (props) => {
     const DEV_ENVIRONMENT = 'public-dev'
     const VARIANTS = 'variants'
+    const VARIANT = 'variant'
     const KEY_INGREDIENTS = 'ingredients.key_ingredients'
     const PRODUCT_HIGHLIGHTS = 'product_details.highlights'
     const VARIANT_HIGHLIGHTS = 'variants.product_details.highlights'
@@ -54,13 +55,16 @@ const csProduct = (props) => {
     const OPTIONAL = 'optional_products.product.'
     const BUNDLE_TYPE = 'bundle'
     const PRODUCT_BUNDLE = 'product_bundle'
+    const PRODUCT_SKU_KIT = 'sku_kit'
 
     // eslint-disable-next-line max-len
-    const productIncludes = `&include[]=${VARIANTS}&include[]=${PRODUCT_FAQS}&include[]=${KEY_INGREDIENTS}&include[]=${PRODUCT_HIGHLIGHTS}&include[]=${PRODUCT_RESOURCES}&include[]=${VARIANT_KEY_INGREDIENTS}&include[]=${VARIANT_HIGHLIGHTS}&include[]=${VARIANT_FAQS}&include[]=${VARIANT_RESOURCES}&include[]=${PRODUCT_CATEGORY}&include[]=${PRODUCT_SUBCATEGORIES}&include[]=${PRODUCT_BRAND_STYLE}&include[]=${PRODUCT_BUNDLE}`
+    const productIncludes = `&include[]=${VARIANTS}&include[]=${PRODUCT_FAQS}&include[]=${KEY_INGREDIENTS}&include[]=${PRODUCT_HIGHLIGHTS}&include[]=${PRODUCT_RESOURCES}&include[]=${VARIANT_KEY_INGREDIENTS}&include[]=${VARIANT_HIGHLIGHTS}&include[]=${VARIANT_FAQS}&include[]=${VARIANT_RESOURCES}&include[]=${PRODUCT_CATEGORY}&include[]=${PRODUCT_SUBCATEGORIES}&include[]=${PRODUCT_BRAND_STYLE}&include[]=${PRODUCT_BUNDLE}&include[]=${PRODUCT_SKU_KIT}`
     const requiredIncludes = `&include[]=${REQUIRED}${VARIANTS}&include[]=${REQUIRED}${PRODUCT_FAQS}&include[]=${REQUIRED}${KEY_INGREDIENTS}&include[]=${REQUIRED}${PRODUCT_HIGHLIGHTS}&include[]=${REQUIRED}${PRODUCT_RESOURCES}&include[]=${REQUIRED}${VARIANT_KEY_INGREDIENTS}&include[]=${REQUIRED}${VARIANT_HIGHLIGHTS}&include[]=${REQUIRED}${VARIANT_FAQS}&include[]=${REQUIRED}${VARIANT_RESOURCES}&include[]=${REQUIRED}${PRODUCT_CATEGORY}&include[]=${REQUIRED}${PRODUCT_SUBCATEGORIES}`
     const optionalIncludes = `&include[]=${OPTIONAL}${VARIANTS}&include[]=${OPTIONAL}${PRODUCT_FAQS}&include[]=${OPTIONAL}${KEY_INGREDIENTS}&include[]=${OPTIONAL}${PRODUCT_HIGHLIGHTS}&include[]=${OPTIONAL}${PRODUCT_RESOURCES}&include[]=${OPTIONAL}${VARIANT_KEY_INGREDIENTS}&include[]=${OPTIONAL}${VARIANT_HIGHLIGHTS}&include[]=${OPTIONAL}${VARIANT_FAQS}&include[]=${OPTIONAL}${VARIANT_RESOURCES}&include[]=${OPTIONAL}${PRODUCT_CATEGORY}&include[]=${OPTIONAL}${PRODUCT_SUBCATEGORIES}`
     const bundleRequiredIncludes = `&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${VARIANTS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${PRODUCT_FAQS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${KEY_INGREDIENTS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${PRODUCT_HIGHLIGHTS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${PRODUCT_RESOURCES}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${VARIANT_KEY_INGREDIENTS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${VARIANT_HIGHLIGHTS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${VARIANT_FAQS}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${VARIANT_RESOURCES}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${PRODUCT_CATEGORY}&include[]=${PRODUCT_BUNDLE}.${REQUIRED}${PRODUCT_SUBCATEGORIES}`
     const bundlOptionalIncludes = `&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${VARIANTS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${PRODUCT_FAQS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${KEY_INGREDIENTS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${PRODUCT_HIGHLIGHTS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${PRODUCT_RESOURCES}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${VARIANT_KEY_INGREDIENTS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${VARIANT_HIGHLIGHTS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${VARIANT_FAQS}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${VARIANT_RESOURCES}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${PRODUCT_CATEGORY}&include[]=${PRODUCT_BUNDLE}.${OPTIONAL}${PRODUCT_SUBCATEGORIES}`
+    const kit = `&include[]=${PRODUCT_SKU_KIT}.${VARIANTS}&include[]=${PRODUCT_SKU_KIT}.${VARIANTS}.${VARIANT}`
+    
 
     validateConfig(props)
     const { apiKey, environment, deliveryToken, homeUrl, awsBase, clientId } = props
@@ -164,13 +168,16 @@ const csProduct = (props) => {
         })
     }
 
-    const formatBundleWithSchema = (bundles = []) => {
+    const formatKitWithSchema = (bundles = [], noFormat) => {
         return bundles?.map((bundle) => {
             const formattedBundle = transformBundle(bundle, homeUrl)
 
             formattedBundle.requiredProducts = formattedBundle?.requiredProducts?.map(
                 ({product, quantity}) => {
                     if (product) {
+                        if (noFormat) {
+                            return {product : product, quantity}
+                        }
                         const [formattedProduct] = formatProductWithSchema([product])
                         return {product : formattedProduct, quantity}
                     } else {
@@ -181,8 +188,15 @@ const csProduct = (props) => {
 
             formattedBundle.optionalProducts = formattedBundle?.optionalProducts?.map(
                 ({product, quantity}) => {
-                    const [formattedProduct] = formatProductWithSchema([product])
-                    return {product : formattedProduct, quantity}
+                    if (product) {
+                        if (noFormat) {
+                            return {product : product, quantity}
+                        }
+                        const [formattedProduct] = formatProductWithSchema([product])
+                        return {product : formattedProduct, quantity}
+                    } else {
+                        return {}
+                    }
                 }
             )
 
@@ -190,42 +204,91 @@ const csProduct = (props) => {
         })
     }
 
-    const formatBundleKit = async (products, locale, translations) => {
+    const convertKitToRequiredProducts = async (skuKit, locale) => {
+        let productBundle = {}
+        const variantSkus = []
+        for (const kitItem of skuKit[0].variants) {
+            const skuData = helpers.getBestSkuData((kitItem.variant || [])[0])
+            variantSkus.push((skuData || {}).sku)
+        }
+        const products = await getProductsBySku(variantSkus, locale)
+        const requiredProducts = []
+        for (let i = 0; i < products.length; i++) {
+            for (let v = 0; v < products[i].variants.length; v++) {
+                if (products[i].variants[v].sku !== variantSkus[i]) {
+                    products[i].variants.splice(v, 1)
+                    v--
+                }
+            }
+            requiredProducts.push({
+                product: [products[i]],
+                quantity: skuKit[0].variants[i].quantity
+            })
+        }
+        productBundle.required_products = requiredProducts
+        productBundle.charge_shipping = skuKit[0].charge_shipping
+        productBundle.cvdis = skuKit[0].cvdis
+        productBundle.foreign_limit = skuKit[0].foreign_limit
+        productBundle.grpdis = skuKit[0].grpdis
+        productBundle.is_exclusive = skuKit[0].is_exclusive
+        productBundle.bundle_id = skuKit[0].kit_id
+        productBundle.locale = skuKit[0].locale
+        productBundle.point_discount = skuKit[0].point_discount
+        productBundle.point_earn = skuKit[0].point_earn
+        productBundle.point_redeem = skuKit[0].point_redeem
+        productBundle.product_status = skuKit[0].product_status
+        productBundle.pvdis = skuKit[0].pvdis
+        productBundle.rtlpricedis = skuKit[0].rtlpricedis
+        productBundle.sbdis = skuKit[0].sbdis
+        productBundle.scan_qualified_count = skuKit[0].scan_qualified_count
+        productBundle.tax_class = skuKit[0].tax_class
+        productBundle.title = skuKit[0].title
+        productBundle.uid = skuKit[0].uid
+        productBundle.whlpricedis = skuKit[0].whlpricedis
+        return [productBundle]
+    }
+
+    const formatKit = async (products, locale, translations) => {
         for (let p = 0; p < products.length; p++) {
-            for (let b = 0; b < products[p]?.product_bundle?.length || 0; b++) {
-                
-                for (
-                    let i = 0;
-                    i < (products[p].product_bundle[b].required_products || []).length;
-                    i++
-                ) {
-                    await removeInvalidVariants(
-                        products[p].product_bundle[b].required_products[i].product,
-                        locale,
-                        translations
-                    )
+            let noFormat = false
+            if (products[p]?.sku_kit?.length > 0) {
+                products[p].type = "kit"
+                products[p].product_bundle = await convertKitToRequiredProducts(products[p].sku_kit, locale)
+                noFormat = true
+            } 
+            if (products[p]?.product_bundle?.length > 0) {
+                for (let b = 0; b < products[p]?.product_bundle?.length || 0; b++) {  
+                    for (
+                        let i = 0;
+                        i < (products[p].product_bundle[b].required_products || []).length;
+                        i++
+                    ) {
+                        await removeInvalidVariants(
+                            products[p].product_bundle[b].required_products[i].product,
+                            locale,
+                            translations
+                        )
+                    }
+                    for (
+                        let i = 0;
+                        i < (products[p].product_bundle[b].optional_products || []).length;
+                        i++
+                    ) {
+                        await removeInvalidVariants(
+                            products[p].product_bundle[b].optional_products[i].product,
+                            locale,
+                            translations
+                        )
+                    }
                 }
-                for (
-                    let i = 0;
-                    i < (products[p].product_bundle[b].optional_products || []).length;
-                    i++
-                ) {
-                    await removeInvalidVariants(
-                        products[p].product_bundle[b].optional_products[i].product,
-                        locale,
-                        translations
-                    )
+                if(products[p].product_bundle?.length > 0){
+                    products[p].bundle = formatKitWithSchema(products[p].product_bundle, noFormat)
+                    products[p].variants = [] 
+                    products[p].type = products[p].type || "bundle"
+                    products[p].bundle[0].type = products[p].type
+                    delete products[p].product_bundle
                 }
-                products[p].product_bundle[b].type = "bundle"
-            }
-            products[p].bundle = formatBundleWithSchema(products[p].product_bundle)
-            if(products[p].product_bundle?.length > 0){
-                products[p].variants = [] 
             }
-            products[p].type =  (products[p].product_bundle?.length || 0) > 0 ? "bundle" : null
-            delete products[p].product_bundle
-
-
         }
     }
 
@@ -246,6 +309,7 @@ const csProduct = (props) => {
             url += productIncludes
             url += bundleRequiredIncludes
             url += bundlOptionalIncludes
+            url += kit
         }
         if (contentType === BUNDLE_TYPE) {
             url += requiredIncludes
@@ -312,8 +376,9 @@ const csProduct = (props) => {
                 )
             }
         }
-        return formatBundleWithSchema(bundles)?.[0]
+        return formatKitWithSchema(bundles)?.[0]
     }
+    
     const getBundles = async (ids, locale) => {
         const query = `{ "$or": [{ "bundle_id": { "$in": ${helpers?.arrayString(ids)} }}, { "uid": { "$in": ${helpers?.arrayString(ids)} }}] }`
         const bundles = await getEntriesByQuery({
@@ -347,7 +412,7 @@ const csProduct = (props) => {
                 )
             }
         }
-        return formatBundleWithSchema(bundles)
+        return formatKitWithSchema(bundles)
     }
 
     const getProductsBySku = async (skus, locale) => {
@@ -360,7 +425,7 @@ const csProduct = (props) => {
 
         let products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        await formatBundleKit(products, locale, translations)
+        await formatKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         for (const product of products) {
             product.skus = skus
@@ -379,7 +444,7 @@ const csProduct = (props) => {
 
         let products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        await formatBundleKit(products, locale, translations)
+        await formatKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         return formatProductWithSchema(products)
     }
@@ -394,7 +459,7 @@ const csProduct = (props) => {
 
         const products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        await formatBundleKit(products, locale, translations)
+        await formatKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         return formatProductWithSchema(products)
     }
@@ -406,7 +471,7 @@ const csProduct = (props) => {
         const query = `{"uid": {"$in": ${helpers?.arrayString(ids)}}}`
         let products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        await formatBundleKit(products, locale, translations)
+        await formatKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         return formatProductWithSchema(products)
     }

package/src/formatKit.js

@@ -17,9 +17,9 @@ const parseStatus = (variant) => {
     } else if(properties.productStatus) {
         let isBackordered = false
         let backorderedAvailableDate = null
-        if (variant.skuKit) {
+        if (variant.kit) {
             try {
-                const latestBODate = Math.min(...variant.skuKit.flatMap(a=>a.sku.map(s=>s.inventoryProperties.expectedBackOrderAvailabilityDate))) || 0
+                const latestBODate = Math.min(...variant.kit.flatMap(a=>a.sku.map(s=>s.inventoryProperties.expectedBackOrderAvailabilityDate))) || 0
                 if (latestBODate) {
                     isBackordered = true
                     backorderedAvailableDate = moment(Date(latestBODate)).format(dateFormat)
@@ -54,24 +54,64 @@ const parseStatus = (variant) => {
     }
 };
 
-const parsePrice = (variant) => {
-    const price = {}
-    const points = {}
-    price.currencyCode = (variant.prices || [])?.[0]?.currencyCode || (variant?.prices || [])?.[0]?.currencySymbol
-    const priceFacets = variant?.priceFacets || {}
-    price.retail = priceFacets['Regular Price'] || ((variant?.prices || [])[0] || {}).price
-    price.wholesale = priceFacets['Wholesale Price'] || ((variant?.prices || [])[0] || {}).price
-    price.retailSubscription = priceFacets['Regular Price'] || ((variant?.prices || [])[0] || {}).price
-    price.wholesaleSubscription = priceFacets['Wholesale Price'] || ((variant?.prices || [])[0] || {}).price
-    points.wholesale = {cv: priceFacets.CV, pv: priceFacets.PV, sb: priceFacets.SB}
-    // Where do we pull subscription price/points from?
-    points.subscription = {cv: priceFacets.CV, pv: priceFacets.PV, sb: priceFacets.SB}
-    return {price, points}
+const parsePrice = (product = []) => {
+    const requiredProducts = product.map(p => p.requiredProducts) .flat()
+
+    const variants = requiredProducts?.map(p => {
+        const [firstVariant] = p?.product?.variants || []
+        return firstVariant
+    })
+
+    const defaultValues =  {
+        price : {
+            retail: 0,
+            retailSubscription : 0,
+            wholesale : 0, 
+            wholesaleSubscription : 0
+        },
+        points : {
+            subscription : {
+                cv: 0,
+                pv: 0,
+                sb: 0
+            },
+            wholesale: {
+                cv: 0,
+                pv: 0,
+                sb: 0
+            }
+        }
+    }
+
+    // sum of price and points from 1st variant of product bundle 
+    const sunOfPriceAndPoints = variants.reduce((acc, curr) => {
+        const price = {}
+        const points = {
+            subscription : {},
+            wholesale : {}
+        }
+
+        price.retail = Number(acc?.price?.retail || 0) + Number(curr?.price?.retail || 0)
+        price.retailSubscription = Number(acc?.price?.retailSubscription || 0) + Number(curr?.price?.retailSubscription || 0)
+        price.wholesale = Number(acc?.price?.wholesale || 0) + Number(curr?.price?.wholesale || 0)
+        price.wholesaleSubscription = Number(acc?.price?.wholesaleSubscription || 0) + Number(curr?.price?.wholesaleSubscription || 0)
+        price.currencyCode = curr?.price.currencyCode
+
+        points.subscription.cv = Number(acc?.points?.subscription?.cv || 0) + Number(curr?.points?.subscription?.cv || 0)
+        points.subscription.pv = Number(acc?.points?.subscription?.pv || 0) + Number(curr?.points?.subscription?.pv || 0)
+        points.subscription.sb = Number(acc?.points?.subscription?.sb || 0) + Number(curr?.points?.subscription?.sb || 0)
+        points.wholesale.cv = Number(acc?.points?.wholesale?.cv || 0) + Number(curr?.points?.wholesale?.cv || 0)
+        points.wholesale.pv = Number(acc?.points?.wholesale?.pv || 0) + Number(curr?.points?.wholesale?.pv || 0)
+        points.wholesale.sb = Number(acc?.points?.wholesale?.sb || 0) + Number(curr?.points?.wholesale?.sb || 0)
+
+        return { price, points}
+    }, defaultValues)
+    return sunOfPriceAndPoints
 }
 
-const parseKitAvailableQuantity = (skuKit) => {
+const parseKitAvailableQuantity = (kit) => {
     try {
-        return Math.min(...skuKit.flatMap(a=>a.sku.map(s=>s.inventoryProperties.atpQty))) || 0
+        return Math.min(...kit.flatMap(a=>a.sku.map(s=>s.inventoryProperties.atpQty))) || 0
     } catch {
         return 0
     }
@@ -122,16 +162,16 @@ const parseKit = (product, market) => {
     kits.status = parseStatus(product)
     if ((kits.status || {}).status === 'active') kits.status.status = 'sellable'
     const kitProducts = []
-    if (properties.type === 'kit') {
-        kits.type = 'skuKit'
-        kits.availableQuantity = parseKitAvailableQuantity(product.skuKit)
-        for (const kit of product.skuKit) {
+    if (properties.type === 'kit' && product.kit) {
+        kits.type = 'kit'
+        kits.availableQuantity = parseKitAvailableQuantity(product.kit)
+        for (const kit of product.kit || []) {
             const kitProduct = formatKit(kit, market)
             kitProduct.id = kit.identifier
             kitProducts.push({product: kitProduct, quantity: (kit.properties || {}).quantity || 0, isMandatory:true})
         }
-    } else if (properties.type === 'bundle') {
-        kits.type = 'bundle'
+    } else if (properties.type === 'bundle' || (properties.type === 'kit' && properties.requiredProducts)) {
+        kits.type = properties.type
         kits.availableQuantity = parseBundleAvailableQuantity(properties)
         for (const kit of properties?.requiredProducts || []) {
             if (kit.product) {

package/src/formatProduct.js

@@ -7,32 +7,32 @@ const formatProduct = (parent, homeUrl) => {
     const formattedProduct = {
         // Each value is a function with a parameter 'parent' that is the current instance of a Product
         // ContentStack references need to be queried separately (ie: variants)
-        id: parent.uid,
-        slug: parent?.seo_information?.slug,
-        variantSelectLabel: parent.variant_select_label,
-        secondaryTitle: parent.secondary_title,
-        title: parent.name,
-        productImages: helpers?.getProductImages(parent),
-        salesLabel: parent.sales_label,
-        salesText: parent.sales_text,
-        description: entities.decodeHTML(parent.short_description || ''),
-        salesDisclaimer: helpers?.mapSalesDisclaimer(parent.sales_disclaimer),
-        features: helpers?.mapFeatures(parent),
-        productDetails: helpers?.mapProductDetails(parent),
+        id: parent?.uid || parent?.id,
+        slug: parent?.seo_information?.slug || parent?.slug,
+        variantSelectLabel: parent?.variant_select_label || parent?.variantSelectLabel,
+        secondaryTitle: parent?.secondary_title || parent?.secondaryTitle,
+        title: parent?.name || parent?.title,
+        productImages: parent?.productImages || helpers?.getProductImages(parent),
+        salesLabel: parent?.sales_label || parent?.salesLabel,
+        salesText: parent?.sales_text || parent?.salesText,
+        description: parent?.description || entities.decodeHTML(parent?.short_description || ''),
+        salesDisclaimer: parent?.salesDisclaimer || helpers?.mapSalesDisclaimer(parent?.sales_disclaimer),
+        features: helpers?.mapFeatures(parent) || parent?.features,
+        productDetails: parent?.productDetails || helpers?.mapProductDetails(parent),
         benefitsMedia: {
-            image: helpers?.mapImage(parent.benefits_media?.image),
-            youTubeVideoId: parent.benefits_media?.youtube_video_id
+            image: parent?.benefitsMedia?.image || helpers?.mapImage(parent?.benefits_media?.image),
+            youTubeVideoId: parent?.benefitsMedia?.youTubeVideoId || parent?.benefits_media?.youtube_video_id
         },
-        benefits: helpers?.mapBenefits(parent),
-        benefitsAndFeatures: helpers?.mapBenefitsAndFeatures(parent),
-        bundle: parent?.bundle,
-        type: parent?.type,
-        results: helpers?.mapResults(parent),
-        sustainability: helpers?.mapSustainability(parent),
-        usage: helpers?.mapUsage(parent, parent.legacy_usage),
-        resources: helpers?.mapResources(parent),
-        faqs: helpers?.mapFaqs(parent),
-        categories: parent.categories?.map((category) => ({
+        benefits: helpers?.mapBenefits(parent) || parent?.benefits,
+        benefitsAndFeatures: parent?.benefitsAndFeatures || helpers?.mapBenefitsAndFeatures(parent),
+        bundle: parent?.bundle || parent?.kit,
+        type: parent?.type || "product",
+        results: helpers?.mapResults(parent) || parent?.results,
+        sustainability: helpers?.mapSustainability(parent) || parent?.sustainability,
+        usage: helpers?.mapUsage(parent, parent?.legacy_usage) || parent?.usage,
+        resources: helpers?.mapResources(parent) || parent?.resources,
+        faqs: helpers?.mapFaqs(parent) || parent?.faqs,
+        categories: parent?.categories?.map((category) => ({
             displayName: category.display_name,
             id: category.category_id,
             subcategories: category.subcategories?.map((subcategory) => ({
@@ -41,42 +41,46 @@ const formatProduct = (parent, homeUrl) => {
             }))
         })),
         ingredients: helpers?.mapIngredients(
-            parent.ingredients,
-            parent.legacy_ingredients
+            parent?.ingredients,
+            parent?.legacy_ingredients || parent?.legacyIngredients
         ),
-        legacyBenefits: parent.legacy_benefits,
-        legacyLongDescription: parent.legacy_long_description,
-        legacyResources: parent.legacy_resources,
-        legacyUsage: parent.legacy_usage,
-        legacyIngredients: parent.legacy_ingredients,
-        legacyImages: parent.legacy_images || [],
-        legacyYouTube: parent.legacy_youtube_video,
-        disclaimers: parent.disclaimers || [],
-        disclaimerWarnings: helpers?.mapDisclaimerWarnings(
-            parent.disclaimer_warnings
+        legacyBenefits: parent?.legacy_benefits || parent?.legacyBenefits,
+        legacyLongDescription: parent?.legacy_long_description || parent?.legacyLongDescription,
+        legacyResources: parent?.legacy_resources || parent?.legacyResources,
+        legacyUsage: parent?.legacy_usage || parent?.legacyUsage,
+        legacyIngredients: parent?.legacy_ingredients || parent?.legacyIngredients,
+        legacyImages: parent?.legacy_images || parent?.legacyImages || [],
+        legacyYouTube: parent?.legacy_youtube_video || parent?.legacyYouTube,
+        disclaimers: parent?.disclaimers || [],
+        disclaimerWarnings: parent?.disclaimerWarnings || helpers?.mapDisclaimerWarnings(
+            parent?.disclaimer_warnings 
         ),
-        seoInformation: helpers?.mapSeoInformation(parent, homeUrl),
-        variants: helpers?.mapVariants(parent),
-        refund: helpers?.mapRefund(parent),
-        shipping: helpers?.mapShipping(parent),
-        generalDisclaimer: parent.translations?.general_disclaimer_text,
-        thirdPartyScripts: parent.third_party_scripts
+        seoInformation: parent?.seoInformation || helpers?.mapSeoInformation(parent, homeUrl),
+        variants: helpers?.mapVariants(parent) || parent?.variants,
+        refund: helpers?.mapRefund(parent) || parent?.refund,
+        shipping: helpers?.mapShipping(parent) || parent?.shipping,
+        generalDisclaimer: parent?.generalDisclaimer || parent?.translations?.general_disclaimer_text,
+        thirdPartyScripts: parent?.thirdPartyScripts || parent?.third_party_scripts
             ?.filter((tps) => tps.enabled && !!tps.script)
             ?.map((tps) => tps.script),
-        csAtts: {
-            version: parent._version || 0,
-            updatedAt: parent.updated_at || '',
-            updatedBy: parent.updated_by || '',
-            createdAt: parent.created_at || '',
-            createdBy: parent.created_by || '',
-            locale: parent.locale || ''
+        csAtts: parent.csAtts || {
+            version: parent?._version || 0,
+            updatedAt: parent?.updated_at || '',
+            updatedBy: parent?.updated_by || '',
+            createdAt: parent?.created_at || '',
+            createdBy: parent?.created_by || '',
+            locale: parent?.locale || ''
         },
-        relevancyRank: parent.relevancy_rank || null,
-        warranty: helpers?.mapWarranty(parent),
-        upSellProductIds: helpers?.mapUpSellProductIds(parent),
-        crossProductIds: helpers?.mapCrossProductIds(parent)
+        relevancyRank: parent?.relevancy_rank || parent?.relevancyRank || null,
+        warranty: helpers?.mapWarranty(parent) || parent?.warranty,
+        upSellProductIds: parent?.upSellProductIds || helpers?.mapUpSellProductIds(parent),
+        crossProductIds: parent?.crossProductIds || helpers?.mapCrossProductIds(parent)
+    }
+    if (parent.bundle || parent.sku_kit || parent.product_bundle) {
+        return formatKit(formattedProduct)
+    } else {
+        return formattedProduct
     }
-    return formatKit(formattedProduct)
 }
 
 module.exports = {

package/src/formatVariant.js

@@ -5,29 +5,29 @@ const entities = require('entities')
 const formatVariant = (parent) => ({
     // Each value is a function with a parameter 'parent' that is the current instance of a Variant
     // ContentStack references need to be queried separately
-    id: parent?.uid,
-    globalId: parent?.sap_data?.global_id,
-    sku: helpers?.getBestSkuData(parent)?.sku,
+    id: parent?.uid || parent?.id,
+    globalId: parent?.sap_data?.global_id || parent?.globalId,
+    sku: parent?.sku || helpers?.getBestSkuData(parent)?.sku,
     slug: parent?.slug,
     size: parent?.size,
-    variantLabel: parent?.select_label,
-    variantColor: parent?.select_color,
-    title: parent?.name || parent?.defaults?.name,
-    salesLabel: parent?.sales_label,
-    salesText: parent?.sales_text,
+    variantLabel: parent?.select_label || parent?.variantLabel,
+    variantColor: parent?.select_color || parent?.variantColor,
+    title: parent?.name || parent?.defaults?.name || parent?.title,
+    salesLabel: parent?.sales_label || parent?.salesLabel,
+    salesText: parent?.sales_text || parent?.salesText,
     description: entities.decodeHTML(
         parent?.short_description_override || parent?.defaults.description || ''
-    ),
-    salesDisclaimer: helpers?.mapSalesDisclaimer(parent?.sales_disclaimer),
-    nettoWeight: parent?.netto_weight,
-    productImages: helpers?.mapProductImages(parent),
-    isExclusive: parent?.is_exclusive,
-    pricingJson: JSON.stringify(parent?.defaults?.status?.pricing) || null,
-    price: helpers?.mapPrice(parent),
-    points: helpers?.mapPoints(parent),
-    availableQuantity: _.get(parent, 'defaults.status.availableQuantity', 0),
-    maxQuantity: _.get(parent, 'defaults.status.maxQuantity', 0),
-    status: {
+    ) || parent?.description,
+    salesDisclaimer: helpers?.mapSalesDisclaimer(parent?.sales_disclaimer) || parent?.salesDisclaimer,
+    nettoWeight: parent?.netto_weight || parent?.nettoWeight,
+    productImages: parent?.productImages || helpers?.mapProductImages(parent),
+    isExclusive: parent?.is_exclusive || parent?.isExclusive,
+    pricingJson: parent?.pricingJson || JSON.stringify(parent?.defaults?.status?.pricing) || null,
+    price: helpers?.mapPrice(parent) || parent?.price,
+    points: helpers?.mapPoints(parent) || parent?.points,
+    availableQuantity: parent?.availableQuantity || _.get(parent, 'defaults.status.availableQuantity', 0),
+    maxQuantity: parent?.maxQuantity || _.get(parent, 'defaults.status.maxQuantity', 0),
+    status: parent?.status || {
         status: _.get(parent, 'defaults.status.status.retail', null),
         retail: _.get(parent, 'defaults.status.status.retail', null),
         wholesale: _.get(parent, 'defaults.status.status.wholesale', null),
@@ -38,33 +38,33 @@ const formatVariant = (parent) => ({
             ''
         )
     },
-    csStatus: helpers?.mapCsStatus(parent),
-    purchaseTypes: helpers?.mapPurchaseTypes(parent),
-    features: helpers?.mapFeatures(parent),
-    productDetails: helpers?.mapProductDetails(parent),
-    ingredients: helpers?.mapIngredients(
+    csStatus: parent?.csStatus || helpers?.mapCsStatus(parent),
+    purchaseTypes: parent?.purchaseTypes || helpers?.mapPurchaseTypes(parent),
+    features: helpers?.mapFeatures(parent) || parent?.features,
+    productDetails: parent?.productDetails || helpers?.mapProductDetails(parent),
+    ingredients: parent?.ingredients || helpers?.mapIngredients(
         parent.ingredients_override,
         parent.legacy_ingredients
     ),
-    benefitsAndFeatures: helpers?.mapBenefitsAndFeatures(parent),
-    results: helpers?.mapResults(parent),
-    usage: helpers?.mapUsage(parent, parent.legacy_usage),
-    resources: helpers?.mapResources(parent),
-    faqs: helpers?.mapFaqs(parent),
-    disclaimers: parent.disclaimers || [],
-    disclaimerWarnings: helpers?.mapDisclaimerWarnings(
+    benefitsAndFeatures: parent?.benefitsAndFeatures || helpers?.mapBenefitsAndFeatures(parent),
+    results: helpers?.mapResults(parent) || parent?.results,
+    usage: helpers?.mapUsage(parent, parent.legacy_usage) || parent?.usage,
+    resources: helpers?.mapResources(parent) || parent?.resources,
+    faqs: helpers?.mapFaqs(parent) || parent?.faqs,
+    disclaimers: parent?.disclaimers || [],
+    disclaimerWarnings: parent?.disclaimerWarnings || helpers?.mapDisclaimerWarnings(
         parent.disclaimer_warnings
     ),
-    matchingVariant:
+    matchingVariant: parent?.matchingVariant ||
         parent.sap_data?.sku_data?.findIndex((s) =>
             parent.searchedSkus.includes(s.sku)
         ) > -1,
-    shadeable: parent.shadeable || false,
-    restrictedMarkets: parent.restricted_markets || [],
-    productType: parent?.sap_data?.product_type,
-    primaryBrand: parent.sap_data?.primary_brand,
-    brandFamily: parent?.sap_data?.brand_family,
-    marketAttributes: {
+    shadeable: parent?.shadeable || false,
+    restrictedMarkets: parent?.restricted_markets || parent?.restrictedMarkets || [],
+    productType: parent?.sap_data?.product_type || parent?.productType,
+    primaryBrand: parent.sap_data?.primary_brand || parent?.primaryBrand,
+    brandFamily: parent?.sap_data?.brand_family || parent?.brandFamily,
+    marketAttributes: parent?.marketAttributes || {
         discount: _.get(
             parent,
             'defaults.status.marketAttributes.discount',
@@ -73,14 +73,14 @@ const formatVariant = (parent) => ({
         redeem: _.get(parent, 'defaults.status.marketAttributes.redeem', null),
         earn: _.get(parent, 'defaults.status.marketAttributes.earn', null)
     },
-    legacyBenefits: parent.legacy_benefits,
-    legacyLongDescription: parent.legacy_long_description,
-    legacyResources: parent.legacy_resources,
-    legacyUsage: parent.legacy_usage,
-    legacyIngredients: parent.legacy_ingredients,
-    legacyImages: parent.legacy_images || [],
-    legacyYouTube: parent.legacy_youtube_video,
-    csAtts: {
+    legacyBenefits: parent.legacy_benefits || parent?.legacyBenefits,
+    legacyLongDescription: parent.legacy_long_description || parent?.legacyLongDescription,
+    legacyResources: parent.legacy_resources || parent?.legacyResources,
+    legacyUsage: parent.legacy_usage || parent?.legacyResources,
+    legacyIngredients: parent.legacy_ingredients || parent?.legacyIngredients,
+    legacyImages: parent.legacy_images || parent?.legacyImages || [],
+    legacyYouTube: parent.legacy_youtube_video || parent?.legacyYouTube,
+    csAtts: parent?.csAtts || {
         version: parent._version || 0,
         updatedAt: parent.updated_at || '',
         updatedBy: parent.updated_by || '',
@@ -88,24 +88,24 @@ const formatVariant = (parent) => ({
         createdBy: parent.created_by || '',
         locale: parent.locale || ''
     },
-    searchKeywords: parent.search_keywords,
-    excludeFromSearch: parent.exclude_from_search || helpers?.mapCsStatus(parent).status === 'discontinued' || _.get(parent, 'defaults.status.status.retail', null) === 'DISCONTINUED',
-    customerTypes: helpers?.getBestSkuData(parent)?.status_selections
+    searchKeywords: parent?.search_keywords || parent?.searchKeywords,
+    excludeFromSearch: parent?.exclude_from_search || parent?.excludeFromSearch || helpers?.mapCsStatus(parent).status === 'discontinued' || _.get(parent, 'defaults.status.status.retail', null) === 'DISCONTINUED',
+    customerTypes: parent?.customerTypes || helpers?.getBestSkuData(parent)?.status_selections
         ?.customer_types,
-    availableChannels: helpers?.getBestSkuData(parent)?.status_selections
+    availableChannels: parent?.availableChannels || helpers?.getBestSkuData(parent)?.status_selections
         ?.display_channels,
-    displayChannels: helpers?.getBestSkuData(parent)?.status_selections
+    displayChannels: parent?.displayChannels || helpers?.getBestSkuData(parent)?.status_selections
         ?.display_channels,
-    scanQualifiedCount: helpers?.getBestSkuData(parent)?.status_selections
+    scanQualifiedCount: parent?.scanQualifiedCount || helpers?.getBestSkuData(parent)?.status_selections
         ?.scan_qualify_count,
-    scanQualifyCount: helpers?.getBestSkuData(parent)?.status_selections
+    scanQualifyCount: parent?.scanQualifyCount || helpers?.getBestSkuData(parent)?.status_selections
         ?.scan_qualify_count,
-    chargeShipping: helpers?.getBestSkuData(parent)?.charge_shipping,
-    dangerousGoods: helpers?.getBestSkuData(parent)?.dangerous_goods,
-    channels: helpers?.getBestSkuData(parent)?.channels,
-    foreignLimit: helpers?.getBestSkuData(parent)?.foreign_limit,
-    foreignOrderLimit: helpers?.getBestSkuData(parent)?.foreign_limit,
-    orderType: parent.sap_data?.order_type
+    chargeShipping: parent?.chargeShipping || helpers?.getBestSkuData(parent)?.charge_shipping,
+    dangerousGoods: parent?.dangerousGoods || helpers?.getBestSkuData(parent)?.dangerous_goods,
+    channels: parent?.channels || helpers?.getBestSkuData(parent)?.channels,
+    foreignLimit: parent?.foreignLimit || helpers?.getBestSkuData(parent)?.foreign_limit,
+    foreignOrderLimit: parent?.foreignOrderLimit || helpers?.getBestSkuData(parent)?.foreign_limit,
+    orderType: parent?.orderType || parent.sap_data?.order_type
 })
 
 module.exports = {

package/src/helpers.js

@@ -20,7 +20,7 @@ function mapBrandStyle(feature, type) {
     // otherwise make text white, and use feature.background_color if it exists or default the background color to be #4f4d4d if not
     const isBrandStyle = feature.brand_style && Array.isArray(feature.brand_style) && feature.brand_style.length > 0;
     // eslint-disable-next-line no-nested-ternary
-    const backgroundColor = isBrandStyle ? feature.brand_style[0].background_color : feature.background_color.length > 1 ? feature.background_color : '#4f4d4d';
+    const backgroundColor = isBrandStyle ? feature.brand_style[0].background_color : feature.background_color?.length > 1 ? feature.background_color : '#4f4d4d';
     const textColor = isBrandStyle && feature.brand_style[0].background_color?.length > 0 ? '#000000' : '#ffffff';
   
     switch (type) {
@@ -120,21 +120,21 @@ function mapSubscriptions(subscriptions) {
 
 /* istanbul ignore next */
 function mapProductImages(parent) {
-    if ((parent.product_images_bynder || []).length) {
-        return parent.product_images_bynder.map((img) => mapImage(img))
+    if ((parent?.product_images_bynder || []).length) {
+        return parent?.product_images_bynder.map((img) => mapImage(img))
     }
-    if ((parent.product_images || []).length) {
-        return parent.product_images.map((img) => mapImage(img))
-    } else if ((parent.baseImages || []).length) {
-        return parent.baseImages
+    if ((parent?.product_images || []).length) {
+        return parent?.product_images.map((img) => mapImage(img))
+    } else if ((parent?.baseImages || []).length) {
+        return parent?.baseImages
     }
-    return (parent.legacy_images || []).length
-        ? parent.legacy_images.map((img) => ({
+    return (parent?.legacy_images || []).length
+        ? parent?.legacy_images.map((img) => ({
             url: img,
             alt: '',
             thumbnail: img
         }))
-        : parent.legacyImages || []
+        : parent?.legacyImages || []
 }
 
 /* istanbul ignore next */
@@ -251,32 +251,32 @@ const getProductImages = (parent = {}) => {
 
 function mapRefund(parent) {
     return {
-        message: parent.translations
-            ? (parent.translations.common_strings_overrides.refund || {}).message ||
-              (parent.translations.common_strings.product || {}).refundMessage: '',
-        linkText: parent.translations
-            ? (parent.translations.common_strings_overrides.refund || {})
+        message: parent?.translations
+            ? (parent?.translations.common_strings_overrides.refund || {}).message ||
+              (parent?.translations.common_strings.product || {}).refundMessage: '',
+        linkText: parent?.translations
+            ? (parent?.translations.common_strings_overrides.refund || {})
                 .link_text ||
-              (parent.translations.common_strings.product || {}).refundLinkText: '',
-        linkUrl: parent.translations
-            ? (parent.translations.common_strings_overrides.refund || {})
+              (parent?.translations.common_strings.product || {}).refundLinkText: '',
+        linkUrl: parent?.translations
+            ? (parent?.translations.common_strings_overrides.refund || {})
                 .link_url ||
-              (parent.translations.common_strings.product || {}).refundLinkUrl
+              (parent?.translations.common_strings.product || {}).refundLinkUrl
             : ''
     }
 }
 
 function mapShipping(parent) {
     return {
-        message: parent.translations
-            ? (parent.translations.common_strings_overrides.shipping || {})
+        message: parent?.translations
+            ? (parent?.translations.common_strings_overrides.shipping || {})
                 .message ||
-              (parent.translations.common_strings.product || {}).shippingMessage
+              (parent?.translations.common_strings.product || {}).shippingMessage
             : '',
-        boldText: parent.translations
-            ? (parent.translations.common_strings_overrides.shipping || {})
+        boldText: parent?.translations
+            ? (parent?.translations.common_strings_overrides.shipping || {})
                 .bold_text ||
-              (parent.translations.common_strings.product || {})
+              (parent?.translations.common_strings.product || {})
                   .shippingBoldText
             : ''
     }
@@ -284,27 +284,27 @@ function mapShipping(parent) {
 
 /* istanbul ignore next */
 function mapVariants(parent) {
-    const _variants = (parent.variants || []).map((variant) => ({
+    const _variants = (parent?.variants || []).map((variant) => ({
         ...variant,
-        country: parent.country,
-        locale: parent.locale,
-        searchedSkus: Array.isArray(parent.skus) ? parent.skus : [parent.skus],
+        country: parent?.country,
+        locale: parent?.locale,
+        searchedSkus: Array.isArray(parent?.skus) ? parent?.skus : [parent?.skus],
         baseImages: getProductImages(parent),
-        legacyImages: (parent.legacy_images || []).map((img) => ({
+        legacyImages: (parent?.legacy_images || []).map((img) => ({
             url: img,
             alt: '',
             thumbnail: img
         })),
         defaults: {
-            name: `${parent.name} ${
+            name: `${parent?.name} ${
                 variant.select_label ? variant.select_label : ''
             }`,
-            description: parent.short_description,
+            description: parent?.short_description,
             productDetailsDescription: Array.isArray(
-                (parent.product_details || {}).long_description
+                (parent?.product_details || {}).long_description
             )
-                ? (parent.product_details || {}).long_description
-                : [(parent.product_details || {}).long_description],
+                ? (parent?.product_details || {}).long_description
+                : [(parent?.product_details || {}).long_description],
             status: variant.status || {},
             marketData: variant.marketData
         }
@@ -315,14 +315,14 @@ function mapVariants(parent) {
 function mapSeoInformation(parent, homeUrl) {
     const { ogImage } = parent?.seo_information || {}
     const seoData = {
-        metaTitle: parent?.seo_information?.meta_title || parent.name,
+        metaTitle: parent?.seo_information?.meta_title || parent?.name,
         metaDescription:
-            parent.seo_information?.meta_description ||
+            parent?.seo_information?.meta_description ||
             parent?.short_description,
         canonicalURL: `${homeUrl}/catalog/${
-            parent.localeData?.country
-        }/${parent.localeData?.language}/product/${
-            parent?.seo_information?.slug || parent.sku
+            parent?.localeData?.country
+        }/${parent?.localeData?.language}/product/${
+            parent?.seo_information?.slug || parent?.sku
         }`,
         ogImage: { url: '', alt: '' }
     }
@@ -352,6 +352,7 @@ function mapPoints(parent) {
     return {
         wholesale: {
             cv:
+                _.get(parent, 'points.wholesale.cv', null) ||
                 _.get(
                     parent,
                     'defaults.status.pricing.wholesale.webOrder.cv',
@@ -363,6 +364,7 @@ function mapPoints(parent) {
                     null
                 ),
             pv:
+                _.get(parent, 'points.wholesale.pv', null) ||
                 _.get(
                     parent,
                     'defaults.status.pricing.wholesale.webOrder.pv',
@@ -376,6 +378,7 @@ function mapPoints(parent) {
         },
         subscription: {
             cv:
+                _.get(parent, 'points.subscription.cv', null) ||
                 _.get(
                     parent,
                     'defaults.status.pricing.wholesale.WADW.cv',
@@ -387,6 +390,7 @@ function mapPoints(parent) {
                     null
                 ),
             pv:
+                _.get(parent, 'points.subscription.pv', null) ||
                 _.get(
                     parent,
                     'defaults.status.pricing.wholesale.WADW.pv',
@@ -400,18 +404,22 @@ function mapPoints(parent) {
 function mapPrice(parent) {
     return {
         retail:
+            _.get(parent, 'price.retail', null) ||
             _.get(
                 parent,
                 'defaults.status.pricing.retail.webOrder.price',
                 null
             ) ||
             _.get(parent, 'defaults.status.pricing.retail.order.price', null),
-        retailSubscription: _.get(
-            parent,
-            'defaults.status.pricing.retail.webAdr.price',
-            null
-        ),
+        retailSubscription: 
+            _.get(parent, 'price.retailSubscription', null) ||
+            _.get(
+                parent,
+                'defaults.status.pricing.retail.webAdr.price',
+                null
+            ),
         wholesale:
+            _.get(parent, 'price.wholesale', null) ||
             _.get(
                 parent,
                 'defaults.status.pricing.wholesale.webOrder.price',
@@ -423,6 +431,7 @@ function mapPrice(parent) {
                 null
             ),
         wholesaleSubscription:
+            _.get(parent, 'price.wholesaleSubscription', null) ||
             _.get(
                 parent,
                 'defaults.status.pricing.wholesale.ADR5.price',
@@ -491,12 +500,12 @@ function mapLink(link) {
 
 function mapProductDetails(productOrVariant) {
     const productDetails = (productOrVariant || {}).product_details || {}
-    if ((productOrVariant.long_description_override || []).length > 0) {
+    if ((productOrVariant?.long_description_override || []).length > 0) {
         productDetails.long_description =
-            productOrVariant.long_description_override
+            productOrVariant?.long_description_override
     }
-    if ((productOrVariant.included_items_override || []).length > 0) {
-        productDetails.included_items = productOrVariant.included_items_override
+    if ((productOrVariant?.included_items_override || []).length > 0) {
+        productDetails.included_items = productOrVariant?.included_items_override
     }
     let description = productDetails.long_description
     if (!Array.isArray(description)) {
@@ -585,7 +594,7 @@ function benefitsToMarkdown(legacyBenefits, jsonBenefits) {
 
 function mapBenefits(parent) {
     if (parent?.benefits?.length > 0) {
-        return parent.benefits.map((benefit) => ({
+        return parent?.benefits.map((benefit) => ({
             title: benefit.header,
             benefits: benefit.benefits || []
         }))
@@ -597,48 +606,48 @@ function mapBenefits(parent) {
 function mapBenefitsAndFeatures(productOrVariant) {
     let benefitsMedia = (productOrVariant || {}).benefits_media || {}
     const legacyBenefits = Array.isArray((productOrVariant || {}).benefits)
-        ? productOrVariant.benefits
+        ? productOrVariant?.benefits
         : []
     if (
         (productOrVariant || {}).benefits &&
-        (productOrVariant.benefits.image ||
-            productOrVariant.benefits.youtube_video_id)
+        (productOrVariant?.benefits.image ||
+            productOrVariant?.benefits.youtube_video_id)
     ) {
         benefitsMedia = {
-            image: Array.isArray(productOrVariant.benefits.image)
-                ? productOrVariant.benefits.image[0]
-                : productOrVariant.benefits.image,
-            youTubeVideoId: productOrVariant.benefits.youtube_video_id
+            image: Array.isArray(productOrVariant?.benefits.image)
+                ? productOrVariant?.benefits.image[0]
+                : productOrVariant?.benefits.image,
+            youTubeVideoId: productOrVariant?.benefits.youtube_video_id
         }
     }
     // Account for new section in Product
     if (
         (productOrVariant || {}).benefits_and_key_features &&
         rteHasContent((productOrVariant || {}).benefits_and_key_features) &&
-        (productOrVariant.benefits_and_key_features.image ||
-            productOrVariant.benefits_and_key_features.youtube_video_id)
+        (productOrVariant?.benefits_and_key_features.image ||
+            productOrVariant?.benefits_and_key_features.youtube_video_id)
     ) {
         benefitsMedia = {
             image: Array.isArray(
-                productOrVariant.benefits_and_key_features.image
+                productOrVariant?.benefits_and_key_features.image
             )
-                ? productOrVariant.benefits_and_key_features.image[0]
-                : productOrVariant.benefits_and_key_features.image,
+                ? productOrVariant?.benefits_and_key_features.image[0]
+                : productOrVariant?.benefits_and_key_features.image,
             youTubeVideoId:
-                productOrVariant.benefits_and_key_features.youtube_video_id
+                productOrVariant?.benefits_and_key_features.youtube_video_id
         }
     }
     let jsonBenefits =
         (productOrVariant || {}).benefits &&
-        productOrVariant.benefits.benefits &&
-        productOrVariant.benefits.benefits.type
-            ? productOrVariant.benefits.benefits
+        productOrVariant?.benefits.benefits &&
+        productOrVariant?.benefits.benefits.type
+            ? productOrVariant?.benefits.benefits
             : null
     // Account for new section in Product
     jsonBenefits =
         (productOrVariant || {}).benefits_and_key_features &&
-        productOrVariant.benefits_and_key_features.benefits
-            ? productOrVariant.benefits_and_key_features.benefits
+        productOrVariant?.benefits_and_key_features.benefits
+            ? productOrVariant?.benefits_and_key_features.benefits
             : jsonBenefits
 
     return {
@@ -750,17 +759,17 @@ function mapResource(resource) {
 /* istanbul ignore next */
 function mapResources(productOrVariant) {
     if (
-        productOrVariant.resources &&
-        Array.isArray(productOrVariant.resources) &&
-        productOrVariant.resources.length > 0
+        productOrVariant?.resources &&
+        Array.isArray(productOrVariant?.resources) &&
+        productOrVariant?.resources.length > 0
     ) {
-        return productOrVariant.resources.map((resource) =>
+        return productOrVariant?.resources.map((resource) =>
             mapResource(resource)
         )
     }
     try {
         const legacyResources = JSON.parse(
-            productOrVariant.legacy_resources || '[]'
+            productOrVariant?.legacy_resources || '[]'
         )
         return (legacyResources || []).map((resource) => ({
             title: resource.title,

package/src/transformBundle.js

@@ -2,37 +2,37 @@ const helpers = require('./helpers')
 
 /* istanbul ignore next */
 const transformBundle = (parent, homeUrl) => ({
-    id: parent.bundle_id,
-    uid: parent.uid,
-    title: parent.title,
-    type: parent.type,
-    requiredProducts: parent.required_products?.map((r) => ({
+    id: parent?.bundle_id || parent?.kit_id,
+    uid: parent?.uid,
+    title: parent?.name,
+    type: parent?.type,
+    requiredProducts: parent?.required_products?.map((r) => ({
         product: r?.product?.[0],
         quantity: r.quantity
     })),
-    optionalProducts: parent.optional_products?.map((o) => ({
+    optionalProducts: parent?.optional_products?.map((o) => ({
         product: o?.product?.[0],
         quantity: o.quantity
     })),
-    retailDiscount: parent.rtlpricedis || 0,
-    wholesaleDiscount: parent.whlpricedis || 0,
-    pvDiscount: parent.pvdis || 0,
-    cvDiscount: parent.cvdis || 0,
-    sbDiscount: parent.sbdis || 0,
-    grpDiscount: parent.grpdis || 0,
-    shortDescription: parent.short_description,
-    description: helpers?.createMarkdown(parent.description),
-    salesLabel: parent.sales_label,
-    salesText: parent.sales_text,
+    retailDiscount: parent?.rtlpricedis || 0,
+    wholesaleDiscount: parent?.whlpricedis || 0,
+    pvDiscount: parent?.pvdis || 0,
+    cvDiscount: parent?.cvdis || 0,
+    sbDiscount: parent?.sbdis || 0,
+    grpDiscount: parent?.grpdis || 0,
+    shortDescription: parent?.short_description,
+    description: helpers?.createMarkdown(parent?.description),
+    salesLabel: parent?.sales_label,
+    salesText: parent?.sales_text,
     features: {
         image: helpers?.mapImage(parent?.features?.image),
         subtitle: parent?.features?.header,
         features: parent?.features?.features,
         backgroundColor: parent?.features?.background_color
     },
-    disclaimers: parent.disclaimers || [],
+    disclaimers: parent?.disclaimers || [],
     disclaimerWarnings: helpers?.mapDisclaimerWarnings(
-        parent.disclaimer_warnings
+        parent?.disclaimer_warnings
     ),
     seoInformation: helpers?.mapSeoInformation(parent, homeUrl),
     resources: helpers?.mapResources(parent),
@@ -44,22 +44,22 @@ const transformBundle = (parent, homeUrl) => ({
             id: subcategory.category_id
         }))
     })),
-    availableChannels: parent.product_status.display_channels,
-    customerTypes: parent.product_status.customer_types,
+    availableChannels: parent?.product_status.display_channels,
+    customerTypes: parent?.product_status.customer_types,
     status: {
-        status: parent.product_status.status,
-        wholesale: parent.product_status.status,
-        retail: parent.product_status.status
+        status: parent?.product_status.status,
+        wholesale: parent?.product_status.status,
+        retail: parent?.product_status.status
     },
-    taxClass: parent.tax_class,
-    foreignOrderLimit: parent.foreign_limit,
-    scanQualifiedCount: parent.scan_qualified_count,
-    chargeShipping: parent.charge_shipping,
-    dangerousGoods: parent.dangerous_goods,
+    taxClass: parent?.tax_class,
+    foreignOrderLimit: parent?.foreign_limit,
+    scanQualifiedCount: parent?.scan_qualified_count,
+    chargeShipping: parent?.charge_shipping,
+    dangerousGoods: parent?.dangerous_goods,
     marketAttributes: {
-        discount: parent.point_discount,
-        redeem: parent.point_redeem,
-        earn: parent.point_earn
+        discount: parent?.point_discount,
+        redeem: parent?.point_redeem,
+        earn: parent?.point_earn
     }
 })