@nuskin/cs-product-lib 1.0.4 → 1.0.6-cx12-6632.1

package/package.json

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

package/src/csProduct.js

@@ -53,11 +53,14 @@ const csProduct = (props) => {
     const REQUIRED = 'required_products.product.'
     const OPTIONAL = 'optional_products.product.'
     const BUNDLE_TYPE = 'bundle'
+    const PRODUCT_BUNDLE = 'product_bundle'
 
     // 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}`
+    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 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}`
 
     validateConfig(props)
     const { apiKey, environment, deliveryToken, homeUrl, awsBase, clientId } = props
@@ -183,6 +186,45 @@ const csProduct = (props) => {
         })
     }
 
+    const formatBundleKit = 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
+                    )
+                }
+                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
+                    )
+                }
+                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
+
+
+        }
+    }
+
     // includes is an array of all the referenced types in the contentType you are requesting that should be resolved
     // and returned (Example: ['common_strings'])
     const getEntriesByQuery = async ({
@@ -198,6 +240,8 @@ const csProduct = (props) => {
         let url = `content_types/${contentType}/entries?environment=${environment}&locale=${locale}&include_count=true&limit=${limit}&query=${query}`
         if (contentType === PRODUCT_TYPE) {
             url += productIncludes
+            url += bundleRequiredIncludes
+            url += bundlOptionalIncludes
         }
         if (contentType === BUNDLE_TYPE) {
             url += requiredIncludes
@@ -312,7 +356,7 @@ const csProduct = (props) => {
 
         let products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        // await parseSharedStrings(translations);
+        await formatBundleKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         for (const product of products) {
             product.skus = skus
@@ -331,7 +375,7 @@ const csProduct = (props) => {
 
         let products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        // await parseSharedStrings(translations);
+        await formatBundleKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         return formatProductWithSchema(products)
     }
@@ -346,7 +390,7 @@ const csProduct = (props) => {
 
         const products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        // await parseSharedStrings(translations);
+        await formatBundleKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         return formatProductWithSchema(products)
     }
@@ -358,7 +402,7 @@ const csProduct = (props) => {
         const query = `{"uid": {"$in": ${helpers?.arrayString(ids)}}}`
         let products = await queryProducts(query, locale)
         const translations = await getTranslations(locale)
-        // await parseSharedStrings(translations);
+        await formatBundleKit(products, locale, translations)
         await removeInvalidVariants(products, locale, translations)
         return formatProductWithSchema(products)
     }

package/src/formatProduct.js

@@ -23,6 +23,8 @@ const formatProduct = (parent, homeUrl) => ({
     },
     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),

package/src/helpers.js

@@ -21,7 +21,7 @@ function mapBrandStyle(feature, type) {
     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 textColor = isBrandStyle && feature.brand_style[0].background_color.length > 0 ? '#000000' : '#ffffff';
+    const textColor = isBrandStyle && feature.brand_style[0].background_color?.length > 0 ? '#000000' : '#ffffff';
   
     switch (type) {
         case TEXT_COLOR:
@@ -30,7 +30,7 @@ function mapBrandStyle(feature, type) {
             }
             return textColor;
         case BACKGROUND_COLOR:
-            if (!backgroundColor.includes('#')) {
+            if (!backgroundColor?.includes('#')) {
                 return `#${backgroundColor}`
             }
             return backgroundColor;
@@ -313,7 +313,7 @@ function mapVariants(parent) {
 }
 
 function mapSeoInformation(parent, homeUrl) {
-    const { ogImage } = parent.seo_information
+    const { ogImage } = parent?.seo_information || {}
     const seoData = {
         metaTitle: parent?.seo_information?.meta_title || parent.name,
         metaDescription:
@@ -500,7 +500,7 @@ function mapProductDetails(productOrVariant) {
     }
     let description = productDetails.long_description
     if (!Array.isArray(description)) {
-        if (description?.uid) {
+        if (description?.uid && !(description?.children && description?.type)) {
             description = null
         } else {
             description = createMarkdown(

package/src/transformBundle.js

@@ -5,6 +5,7 @@ const transformBundle = (parent, homeUrl) => ({
     id: parent.bundle_id,
     uid: parent.uid,
     title: parent.name,
+    type: parent.type,
     requiredProducts: parent.required_products?.map((r) => ({
         product: r?.product?.[0],
         quantity: r.quantity