@nuskin/cs-product-lib 1.8.0-bundleonly-members.1 → 1.8.0-bundleonly-members.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.8.0-bundleonly-members.1",
+  "version": "1.8.0-bundleonly-members.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

@@ -42,9 +42,34 @@ const validateConfig = (props) => {
 /* istanbul ignore next */
 const csProduct = (props) => {
     const DEV_ENVIRONMENT = 'public-dev'
-    // CS-native sellable gate for the bypassProductStatus path -- mirrors
-    // content-validator ValidationSteps (csStatus === 'sellable' || 'bundleOnly').
+    // CS-native sellable gate for the bypassProductStatus path -- mirrors
+    // content-validator ValidationSteps (csStatus === 'sellable' || 'bundleOnly').
     const CS_SELLABLE_STATUSES = ['sellable', 'bundleOnly']
+
+    // Kit-member dedup tiebreak (order-independent). A kit member SKU can match
+    // more than one product entry (e.g. a market-localized product AND an older
+    // en-only promo product that still carries the same variant). Prefer the
+    // entry whose own locale matches the requested market locale; if that does
+    // not disambiguate, prefer the newer publish, then a stable uid -- so the
+    // kept entry never depends on query/array order.
+    const kitMemberLocaleRank = (member, requestedLocale) => {
+        const memberLocale = member?.csAtts?.locale
+        return memberLocale && requestedLocale &&
+            memberLocale.toLowerCase() === requestedLocale.toLowerCase()
+            ? 1
+            : 0
+    }
+    const isPreferredKitMember = (candidate, current, requestedLocale) => {
+        if (!current) return true
+        const candRank = kitMemberLocaleRank(candidate, requestedLocale)
+        const currRank = kitMemberLocaleRank(current, requestedLocale)
+        if (candRank !== currRank) return candRank > currRank
+        const candTime = Date.parse(candidate?.csAtts?.updatedAt) || 0
+        const currTime = Date.parse(current?.csAtts?.updatedAt) || 0
+        if (candTime !== currTime) return candTime > currTime
+        return `${candidate?.id}` < `${current?.id}`
+    }
+
     const VARIANTS = 'variants'
     const VARIANT = 'variant'
     const KEY_INGREDIENTS = 'ingredients.key_ingredients'
@@ -286,52 +311,63 @@ const csProduct = (props) => {
         })
     }
 
-    const convertKitToRequiredProducts = async (skuKit, locale, bypassProductStatus = false) => {
-        let productBundle = {}
-        const variantSkus = []
-        for (let kitItem of skuKit[0].variants) {
-            const skuData = helpers.getBestSkuData((kitItem.variant || [])[0])
+    // Clone a product and keep only the variant matching the given sku.
+    const selectVariantProduct = (product, variantSku) => {
+        const productSelect = JSON.parse(JSON.stringify(product))
+        productSelect.variants = (productSelect?.variants || []).filter(
+            (variant) => variant.sku === variantSku
+        )
+        return productSelect
+    }
+
+    // Build the kit's required-product list, deduped by sku+quantity. A member
+    // sku can match more than one product entry; keep the preferred one
+    // (locale-native over fallback) via isPreferredKitMember, order-independent.
+    const dedupeKitMembers = (products, variantSkus, kitVariants, requestedLocale) => {
+        const bestBySkuQuantity = new Map()
+        for (const product of products || []) {
+            for (const variantSku of variantSkus) {
+                const productSelect = selectVariantProduct(product, variantSku)
+                if (isNullOrEmpty(productSelect?.variants)) continue
+                const quantity = kitVariants.find((v) => v.sku === variantSku)?.quantity
+                const dedupKey = `${variantSku}:${quantity}`
+                const current = bestBySkuQuantity.get(dedupKey)
+                if (isPreferredKitMember(productSelect, current?.product?.[0], requestedLocale)) {
+                    bestBySkuQuantity.set(dedupKey, { product: [productSelect], quantity })
+                }
+            }
+        }
+        return [...bestBySkuQuantity.values()]
+    }
+
+    const convertKitToRequiredProducts = async (skuKit, locale, bypassProductStatus = false) => {
+        let productBundle = {}
+        const variantSkus = []
+        for (let kitItem of skuKit[0].variants) {
+            const skuData = helpers.getBestSkuData((kitItem.variant || [])[0])
             variantSkus.push((skuData || {}).sku)
             kitItem.sku = (skuData || {}).sku
         }
         const products = await getProductsBySku(variantSkus, locale, true, bypassProductStatus)
-        const requiredProducts = []
-        const seenSkuQuantities = new Set()
-        for (let i = 0; i < products?.length; i++) {
-            for (const variantSku of variantSkus) {
-                const productSelect = JSON.parse(JSON.stringify(products[i]))
-                for (let v = 0; v < productSelect?.variants?.length; v++) {
-                    if (productSelect.variants[v].sku !== variantSku) {
-                        productSelect.variants.splice(v, 1)
-                        v--
-                    }
-                }
-                if (!isNullOrEmpty(productSelect?.variants)) {
-                    const quantity = skuKit[0].variants.find(v=>v.sku === variantSku).quantity
-                    const dedupKey = `${variantSku}:${quantity}`
-                    if (!seenSkuQuantities.has(dedupKey)) {
-                        seenSkuQuantities.add(dedupKey)
-                        requiredProducts.push({
-                            product: [productSelect],
-                            quantity
-                        })
-                    }
-                }
-            }
-        }
-        const discounts = skuKit[0].discounts || {}
-        const dangerousGoods = requiredProducts.some(({ product }) => {
-            const [requiredProduct] = product || []
-            const [variant] = requiredProduct?.variants || []
-            return variant?.dangerousGoods === true
-        })
-        productBundle.required_products = requiredProducts
-        productBundle.charge_shipping = skuKit[0].charge_shipping
-        productBundle.cvdis = discounts.cvDiscount || skuKit[0].cvdis
-        productBundle.dangerous_goods = dangerousGoods
-        productBundle.foreign_limit = skuKit[0].foreign_limit
-        productBundle.grpdis = discounts.grpDiscount || skuKit[0].grpdis
-        productBundle.is_exclusive = skuKit[0].is_exclusive
+        const requiredProducts = dedupeKitMembers(
+            products,
+            variantSkus,
+            skuKit[0].variants,
+            badLocaleMap(locale)
+        )
+        const discounts = skuKit[0].discounts || {}
+        const dangerousGoods = requiredProducts.some(({ product }) => {
+            const [requiredProduct] = product || []
+            const [variant] = requiredProduct?.variants || []
+            return variant?.dangerousGoods === true
+        })
+        productBundle.required_products = requiredProducts
+        productBundle.charge_shipping = skuKit[0].charge_shipping
+        productBundle.cvdis = discounts.cvDiscount || skuKit[0].cvdis
+        productBundle.dangerous_goods = dangerousGoods
+        productBundle.foreign_limit = skuKit[0].foreign_limit
+        productBundle.grpdis = discounts.grpDiscount || skuKit[0].grpdis
+        productBundle.is_exclusive = skuKit[0].is_exclusive
         productBundle.bundle_id = skuKit[0].legacy_sku || skuKit[0].kit_id
         productBundle.locale = skuKit[0].locale
         productBundle.point_discount = skuKit[0].point_discount