@faststore/api 2.1.9 → 2.1.24

package/dist/api.esm.js

@@ -18,7 +18,7 @@ import { trace, context, SpanKind } from '@opentelemetry/api';
 import { SeverityNumber } from '@opentelemetry/api-logs';
 
 var name = "@faststore/api";
-var version = "2.1.8";
+var version = "2.1.9";
 var license = "MIT";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
@@ -54,8 +54,8 @@ var dependencies = {
 };
 var devDependencies = {
 	"@envelop/core": "^2.6.0",
-	"@faststore/eslint-config": "^2.1.1",
-	"@faststore/shared": "^2.1.1",
+	"@faststore/eslint-config": "^2.1.9",
+	"@faststore/shared": "^2.1.9",
 	"@graphql-codegen/cli": "2.2.0",
 	"@graphql-codegen/typescript": "2.2.2",
 	"@types/express": "^4.17.16",
@@ -175,60 +175,37 @@ const VtexCommerce = ({
           }
         }) : Promise.resolve(undefined);
       },
-      getDeliveryWindows: ({
-        id,
-        index,
-        deliveryMode,
-        body
-      }, incrementedAddress) => {
-        var _body$selectedAddress;
-        const mappedBody = {
-          logisticsInfo: Array.from({
-            length: index
-          }, (_, itemIndex) => ({
-            itemIndex,
-            selectedDeliveryChannel: (deliveryMode == null ? void 0 : deliveryMode.deliveryChannel) || null,
-            selectedSla: (deliveryMode == null ? void 0 : deliveryMode.deliveryMethod) || null
-          })),
-          selectedAddresses: body == null ? void 0 : (_body$selectedAddress = body.selectedAddresses) == null ? void 0 : _body$selectedAddress.map(address => {
-            var _address$geoCoordinat, _address$geoCoordinat2;
-            const selectedAddress = {
-              addressType: address.addressType || null,
-              receiverName: address.receiverName || null,
-              postalCode: address.postalCode || (incrementedAddress == null ? void 0 : incrementedAddress.postalCode) || null,
-              city: (incrementedAddress == null ? void 0 : incrementedAddress.city) || null,
-              state: (incrementedAddress == null ? void 0 : incrementedAddress.state) || null,
-              country: address.country || (incrementedAddress == null ? void 0 : incrementedAddress.country) || null,
-              street: (incrementedAddress == null ? void 0 : incrementedAddress.street) || null,
-              number: (incrementedAddress == null ? void 0 : incrementedAddress.number) || null,
-              neighborhood: (incrementedAddress == null ? void 0 : incrementedAddress.neighborhood) || null,
-              complement: (incrementedAddress == null ? void 0 : incrementedAddress.complement) || null,
-              reference: (incrementedAddress == null ? void 0 : incrementedAddress.reference) || null,
-              geoCoordinates: []
-            };
-            const longitude = (address == null ? void 0 : address.geoCoordinates) instanceof Array ? null : (address == null ? void 0 : (_address$geoCoordinat = address.geoCoordinates) == null ? void 0 : _address$geoCoordinat.longitude) || null;
-            const latitude = (address == null ? void 0 : address.geoCoordinates) instanceof Array ? null : (address == null ? void 0 : (_address$geoCoordinat2 = address.geoCoordinates) == null ? void 0 : _address$geoCoordinat2.latitude) || null;
-            selectedAddress.geoCoordinates = longitude && latitude ? {
-              longitude,
-              latitude
-            } : (incrementedAddress == null ? void 0 : incrementedAddress.geoCoordinates) || [];
-            return selectedAddress;
-          })
-        };
-        return fetchAPI(`${base}/api/checkout/pub/orderForm/${id}/attachments/shippingData`, {
-          ...BASE_INIT,
-          body: JSON.stringify(mappedBody)
-        });
-      },
       shippingData: ({
         id,
         index,
         deliveryMode,
         body
-      }, incrementedAddress) => {
-        var _deliveryMode$deliver, _deliveryMode$deliver2, _body$selectedAddress2;
-        const hasDeliveryWindow = deliveryMode != null && deliveryMode.deliveryWindow ? true : false;
-        const deliveryWindow = hasDeliveryWindow ? {
+      }, incrementedAddress, setDeliveryWindow) => {
+        var _body$selectedAddress, _deliveryMode$deliver, _deliveryMode$deliver2;
+        const addressSession = body == null ? void 0 : (_body$selectedAddress = body.selectedAddresses) == null ? void 0 : _body$selectedAddress.map(address => {
+          const addressSession = {
+            addressType: address.addressType || null,
+            receiverName: address.receiverName || null,
+            postalCode: address.postalCode || (incrementedAddress == null ? void 0 : incrementedAddress.postalCode) || null,
+            city: (incrementedAddress == null ? void 0 : incrementedAddress.city) || null,
+            state: (incrementedAddress == null ? void 0 : incrementedAddress.state) || null,
+            country: address.country || (incrementedAddress == null ? void 0 : incrementedAddress.country) || null,
+            street: (incrementedAddress == null ? void 0 : incrementedAddress.street) || null,
+            number: (incrementedAddress == null ? void 0 : incrementedAddress.number) || null,
+            neighborhood: (incrementedAddress == null ? void 0 : incrementedAddress.neighborhood) || null,
+            complement: (incrementedAddress == null ? void 0 : incrementedAddress.complement) || null,
+            reference: (incrementedAddress == null ? void 0 : incrementedAddress.reference) || null,
+            geoCoordinates: []
+          };
+          const geoCoordinates = address == null ? void 0 : address.geoCoordinates;
+          if (geoCoordinates) {
+            const latitude = typeof geoCoordinates === 'object' && 'latitude' in geoCoordinates ? geoCoordinates.latitude : null;
+            const longitude = typeof geoCoordinates === 'object' && 'longitude' in geoCoordinates ? geoCoordinates.longitude : null;
+            addressSession.geoCoordinates = latitude !== null && longitude !== null ? [longitude, latitude] : (incrementedAddress == null ? void 0 : incrementedAddress.geoCoordinates) || [];
+          }
+          return addressSession;
+        });
+        const deliveryWindow = setDeliveryWindow ? {
           startDateUtc: deliveryMode == null ? void 0 : (_deliveryMode$deliver = deliveryMode.deliveryWindow) == null ? void 0 : _deliveryMode$deliver.startDate,
           endDateUtc: deliveryMode == null ? void 0 : (_deliveryMode$deliver2 = deliveryMode.deliveryWindow) == null ? void 0 : _deliveryMode$deliver2.endDate
         } : null;
@@ -241,27 +218,8 @@ const VtexCommerce = ({
             selectedSla: (deliveryMode == null ? void 0 : deliveryMode.deliveryMethod) || null,
             deliveryWindow: deliveryWindow
           })),
-          selectedAddresses: body == null ? void 0 : (_body$selectedAddress2 = body.selectedAddresses) == null ? void 0 : _body$selectedAddress2.map(address => {
-            var _address$geoCoordinat3, _address$geoCoordinat4;
-            const selectedAddress = {
-              addressType: address.addressType || null,
-              receiverName: address.receiverName || null,
-              postalCode: address.postalCode || (incrementedAddress == null ? void 0 : incrementedAddress.postalCode) || null,
-              city: (incrementedAddress == null ? void 0 : incrementedAddress.city) || null,
-              state: (incrementedAddress == null ? void 0 : incrementedAddress.state) || null,
-              country: address.country || (incrementedAddress == null ? void 0 : incrementedAddress.country) || null,
-              street: (incrementedAddress == null ? void 0 : incrementedAddress.street) || null,
-              number: (incrementedAddress == null ? void 0 : incrementedAddress.number) || null,
-              neighborhood: (incrementedAddress == null ? void 0 : incrementedAddress.neighborhood) || null,
-              complement: (incrementedAddress == null ? void 0 : incrementedAddress.complement) || null,
-              reference: (incrementedAddress == null ? void 0 : incrementedAddress.reference) || null,
-              geoCoordinates: []
-            };
-            const longitude = (address == null ? void 0 : address.geoCoordinates) instanceof Array ? null : (address == null ? void 0 : (_address$geoCoordinat3 = address.geoCoordinates) == null ? void 0 : _address$geoCoordinat3.longitude) || null;
-            const latitude = (address == null ? void 0 : address.geoCoordinates) instanceof Array ? null : (address == null ? void 0 : (_address$geoCoordinat4 = address.geoCoordinates) == null ? void 0 : _address$geoCoordinat4.latitude) || null;
-            selectedAddress.geoCoordinates = longitude && latitude ? [longitude, latitude] : (incrementedAddress == null ? void 0 : incrementedAddress.geoCoordinates) || [];
-            return selectedAddress;
-          })
+          selectedAddresses: addressSession,
+          address: addressSession
         };
         return fetchAPI(`${base}/api/checkout/pub/orderForm/${id}/attachments/shippingData`, {
           ...BASE_INIT,
@@ -1097,6 +1055,119 @@ function getPropertyId(item) {
   return md5(`${item.name}:${JSON.stringify(item.value)}:${item.valueReference}`);
 }
 
+const shouldUpdateShippingData = (orderForm, session) => {
+  var _orderForm$shippingDa;
+  if (!hasSessionPostalCodeOrGeoCoordinates(session)) {
+    return false;
+  }
+  const {
+    address
+  } = (_orderForm$shippingDa = orderForm.shippingData) != null ? _orderForm$shippingDa : {
+    address: null
+  };
+  if (checkPostalCode(address, session.postalCode)) {
+    return true;
+  }
+  if (checkGeoCoordinates(address, session.geoCoordinates)) {
+    return true;
+  }
+  if (!hasItems(orderForm)) {
+    return false;
+  }
+  // The logisticsInfo will always exist if there´s at least one item inside the cart
+  const {
+    logisticsInfo
+  } = orderForm.shippingData;
+  if (shouldUpdateDeliveryChannel(logisticsInfo, session)) {
+    return true;
+  }
+  if (shouldUpdateDeliveryMethod(logisticsInfo, session)) {
+    return true;
+  }
+  if (shouldUpdateDeliveryWindow(logisticsInfo, session)) {
+    return true;
+  }
+  return false;
+};
+// Validate if theres any postal Code or GeoCoordinates set at the session
+const hasSessionPostalCodeOrGeoCoordinates = session => {
+  return !!session.postalCode || session.geoCoordinates && session.geoCoordinates.latitude && session.geoCoordinates.longitude;
+};
+// Validate if theres a difference between the session postal code and orderForm postal code
+const checkPostalCode = (address, postalCode) => {
+  return typeof postalCode === 'string' && (address == null ? void 0 : address.postalCode) !== postalCode;
+};
+// Validate if theres a difference between the session geoCoords and orderForm geoCoords
+const checkGeoCoordinates = (address, geoCoordinates) => {
+  return typeof (geoCoordinates == null ? void 0 : geoCoordinates.latitude) === 'number' && typeof (geoCoordinates == null ? void 0 : geoCoordinates.longitude) === 'number' && ((address == null ? void 0 : address.geoCoordinates[0]) !== (geoCoordinates == null ? void 0 : geoCoordinates.longitude) || (address == null ? void 0 : address.geoCoordinates[1]) !== (geoCoordinates == null ? void 0 : geoCoordinates.latitude));
+};
+// Validate if theres any item inside the orderForm
+const hasItems = orderForm => {
+  return orderForm.items.length !== 0;
+};
+// Validate if the deliveryChannel from the session is different from the selected delivery channel
+// and if so needs to validate if the deliveryChannel for the session is available inside the slas for the item
+const shouldUpdateDeliveryChannel = (logisticsInfo, session) => {
+  var _session$deliveryMode;
+  if (!(session != null && (_session$deliveryMode = session.deliveryMode) != null && _session$deliveryMode.deliveryChannel)) {
+    return false;
+  }
+  const {
+    deliveryChannel
+  } = session.deliveryMode;
+  for (const item of logisticsInfo) {
+    if (item.selectedDeliveryChannel !== deliveryChannel) {
+      const matchingSla = item.slas.find(sla => sla.deliveryChannel === deliveryChannel);
+      if (matchingSla) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+// Validate if the deliveryMethod from the session is different from the selectedSLA
+// and if so needs to validate if the deliveryMethod for the session is available inside the slas for the item
+const shouldUpdateDeliveryMethod = (logisticsInfo, session) => {
+  var _session$deliveryMode2;
+  if (!(session != null && (_session$deliveryMode2 = session.deliveryMode) != null && _session$deliveryMode2.deliveryMethod)) {
+    return false;
+  }
+  const {
+    deliveryMethod
+  } = session.deliveryMode;
+  for (const item of logisticsInfo) {
+    if (item.selectedSla !== deliveryMethod) {
+      const matchingSla = item.slas.find(sla => sla.id === deliveryMethod);
+      if (matchingSla) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+// Validate if the deliveryWindow from the session is different from the deliveryWindow of the SLA
+// and if so needs to validate if the deliveryWindow for the session is available inside the availableDeliveryWindows for the item
+const shouldUpdateDeliveryWindow = (logisticsInfo, session) => {
+  var _session$deliveryMode3, _session$deliveryMode4, _session$deliveryMode5, _session$deliveryMode6;
+  if (!(session != null && (_session$deliveryMode3 = session.deliveryMode) != null && (_session$deliveryMode4 = _session$deliveryMode3.deliveryWindow) != null && _session$deliveryMode4.startDate) || !(session != null && (_session$deliveryMode5 = session.deliveryMode) != null && (_session$deliveryMode6 = _session$deliveryMode5.deliveryWindow) != null && _session$deliveryMode6.endDate)) {
+    return false;
+  }
+  const {
+    startDate,
+    endDate
+  } = session.deliveryMode.deliveryWindow;
+  for (const item of logisticsInfo) {
+    for (const sla of item.slas) {
+      var _sla$availableDeliver;
+      const matchingWindow = (_sla$availableDeliver = sla.availableDeliveryWindows) == null ? void 0 : _sla$availableDeliver.some(window => window.startDateUtc === startDate && window.endDateUtc === endDate);
+      if (matchingWindow) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+
 const isAttachment = value => value.valueReference === VALUE_REFERENCES.attachment;
 const getId = item => {
   var _item$itemOffered$add;
@@ -1243,7 +1314,6 @@ const getOrderForm = async (id, session, {
     commerce
   }
 }) => {
-  var _orderForm$shippingDa, _orderForm$shippingDa2, _session$geoCoordinat, _orderForm$shippingDa3, _orderForm$shippingDa4, _orderForm$shippingDa5, _orderForm$shippingDa6;
   const orderForm = await commerce.checkout.orderForm({
     id
   });
@@ -1255,8 +1325,8 @@ const getOrderForm = async (id, session, {
   if (!session) {
     return orderForm;
   }
-  const shouldUpdateShippingData = orderForm.items.length > 0 && typeof session.postalCode === 'string' && ((_orderForm$shippingDa = orderForm.shippingData) == null ? void 0 : (_orderForm$shippingDa2 = _orderForm$shippingDa.address) == null ? void 0 : _orderForm$shippingDa2.postalCode) !== session.postalCode || typeof session.geoCoordinates === 'object' && typeof ((_session$geoCoordinat = session.geoCoordinates) == null ? void 0 : _session$geoCoordinat.latitude) === 'number' && typeof session.geoCoordinates.longitude === 'number' && (((_orderForm$shippingDa3 = orderForm.shippingData) == null ? void 0 : (_orderForm$shippingDa4 = _orderForm$shippingDa3.address) == null ? void 0 : _orderForm$shippingDa4.geoCoordinates[0]) !== session.geoCoordinates.longitude || ((_orderForm$shippingDa5 = orderForm.shippingData) == null ? void 0 : (_orderForm$shippingDa6 = _orderForm$shippingDa5.address) == null ? void 0 : _orderForm$shippingDa6.geoCoordinates[1]) !== session.geoCoordinates.latitude);
-  if (shouldUpdateShippingData) {
+  const updateShipping = shouldUpdateShippingData(orderForm, session);
+  if (updateShipping) {
     var _session$deliveryMode;
     let incrementedAddress;
     if (session.postalCode) {
@@ -1265,14 +1335,14 @@ const getOrderForm = async (id, session, {
     const hasDeliveryWindow = (_session$deliveryMode = session.deliveryMode) != null && _session$deliveryMode.deliveryWindow ? true : false;
     if (hasDeliveryWindow) {
       // if you have a Delivery Window you have to first get the delivery window to set the desired after
-      await commerce.checkout.getDeliveryWindows({
+      await commerce.checkout.shippingData({
         id: orderForm.orderFormId,
         index: orderForm.items.length,
         deliveryMode: session.deliveryMode,
         body: {
           selectedAddresses: [session]
         }
-      }, incrementedAddress);
+      }, incrementedAddress, false);
     }
     return commerce.checkout.shippingData({
       id: orderForm.orderFormId,
@@ -1281,7 +1351,7 @@ const getOrderForm = async (id, session, {
       body: {
         selectedAddresses: [session]
       }
-    }, incrementedAddress);
+    }, incrementedAddress, true);
   }
   return orderForm;
 };
@@ -1331,7 +1401,15 @@ const validateCart = async (_, {
   const orderNumber = (_ref = orderNumberFromSession != null ? orderNumberFromSession : orderNumberFromCart) != null ? _ref : '';
   // Step1: Get OrderForm from VTEX Commerce
   const orderForm = await getOrderForm(orderNumber, session, ctx);
-  // Step1.5: Check if another system changed the orderForm with this orderNumber
+  // Step1.1: Checks if the orderForm id has changed. There are three cases for this:
+  // Social Selling: the vtex_session cookie contains a new orderForm id with Social Selling data
+  // My Orders: the customer clicks on reordering through generating a new cart and when returning to the faststore, this information needs to be returned by vtex_session cookie.
+  // New session: a new user enters the website and has no orderForm attributed to it (has no relation to the vtex_session cookie).
+  // In all cases, the origin orderForm should replace the copy that's in the browser
+  if (orderForm.orderFormId != orderNumberFromCart) {
+    return orderFormToCart(orderForm, skuLoader);
+  }
+  // Step1.2: Check if another system changed the orderForm with this orderNumber
   // If so, this means the user interacted with this cart elsewhere and expects
   // to see this new cart state instead of what's stored on the user's browser.
   const isStale = isOrderFormStale(orderForm);