@faststore/api 2.1.0 → 2.1.8

package/dist/platforms/vtex/clients/commerce/types/ShippingData.d.ts

@@ -15,7 +15,7 @@ export interface SelectedAddress {
     neighborhood?: string | null;
     complement?: string | null;
     reference?: string | null;
-    geoCoordinates?: GeoCoordinates | null | [];
+    geoCoordinates?: GeoCoordinates | GLfloat[] | null | [];
 }
 export interface GeoCoordinates {
     latitude: GLfloat;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "2.1.0",
+  "version": "2.1.8",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -36,8 +36,8 @@
   },
   "devDependencies": {
     "@envelop/core": "^2.6.0",
-    "@faststore/eslint-config": "^2.1.0",
-    "@faststore/shared": "^2.1.0",
+    "@faststore/eslint-config": "^2.1.1",
+    "@faststore/shared": "^2.1.1",
     "@graphql-codegen/cli": "2.2.0",
     "@graphql-codegen/typescript": "2.2.2",
     "@types/express": "^4.17.16",
@@ -56,5 +56,5 @@
     "@envelop/core": "^1 || ^2",
     "graphql": "^15.6.0"
   },
-  "gitHead": "74ae411fa1f628ae68c2cdcacfb63b1383a86490"
+  "gitHead": "13a1fc9bb15b846d705fbc5ab3bc19cb9b8c400c"
 }

package/src/platforms/vtex/clients/commerce/index.ts

@@ -19,7 +19,11 @@ import { getCookie } from '../../utils/getCookies'
 import type { SalesChannel } from './types/SalesChannel'
 import { MasterDataResponse } from './types/Newsletter'
 import type { Address, AddressInput } from './types/Address'
-import { DeliveryMode, ShippingDataBody } from './types/ShippingData'
+import {
+  DeliveryMode,
+  ShippingDataBody,
+  SelectedAddress,
+} from './types/ShippingData'
 import { IncrementedAddress } from './types/IncrementedAddress'
 
 type ValueOf<T> = T extends Record<string, infer K> ? K : never
@@ -126,27 +130,43 @@ export const VtexCommerce = (
         const mappedBody = {
           logisticsInfo: Array.from({ length: index }, (_, itemIndex) => ({
             itemIndex,
-            selectedDeliveryChannel: deliveryMode?.deliveryChannel,
-            selectedSla: deliveryMode?.deliveryMethod,
-          })),
-          selectedAddresses: body?.selectedAddresses?.map((address) => ({
-            addressType: address.addressType || null,
-            receiverName: address.receiverName || null,
-            postalCode:
-              address.postalCode || incrementedAddress?.postalCode || null,
-            city: incrementedAddress?.city || null,
-            state: incrementedAddress?.state || null,
-            country: address.country || incrementedAddress?.country || null,
-            street: incrementedAddress?.street || null,
-            number: incrementedAddress?.number || null,
-            neighborhood: incrementedAddress?.neighborhood || null,
-            complement: incrementedAddress?.complement || null,
-            reference: incrementedAddress?.reference || null,
-            geoCoordinates:
-              address.geoCoordinates ||
-              incrementedAddress?.geoCoordinates ||
-              [],
+            selectedDeliveryChannel: deliveryMode?.deliveryChannel || null,
+            selectedSla: deliveryMode?.deliveryMethod || null,
           })),
+          selectedAddresses: body?.selectedAddresses?.map((address) => {
+            const selectedAddress: SelectedAddress = {
+              addressType: address.addressType || null,
+              receiverName: address.receiverName || null,
+              postalCode:
+                address.postalCode || incrementedAddress?.postalCode || null,
+              city: incrementedAddress?.city || null,
+              state: incrementedAddress?.state || null,
+              country: address.country || incrementedAddress?.country || null,
+              street: incrementedAddress?.street || null,
+              number: incrementedAddress?.number || null,
+              neighborhood: incrementedAddress?.neighborhood || null,
+              complement: incrementedAddress?.complement || null,
+              reference: incrementedAddress?.reference || null,
+              geoCoordinates: [], // Initialize with default value
+            }
+
+            const longitude =
+              address?.geoCoordinates instanceof Array
+                ? null
+                : address?.geoCoordinates?.longitude || null
+
+            const latitude =
+              address?.geoCoordinates instanceof Array
+                ? null
+                : address?.geoCoordinates?.latitude || null
+
+            selectedAddress.geoCoordinates =
+              longitude && latitude
+                ? { longitude, latitude }
+                : incrementedAddress?.geoCoordinates || []
+
+            return selectedAddress
+          }),
         }
 
         return fetchAPI(
@@ -184,28 +204,44 @@ export const VtexCommerce = (
         const mappedBody = {
           logisticsInfo: Array.from({ length: index }, (_, itemIndex) => ({
             itemIndex,
-            selectedDeliveryChannel: deliveryMode?.deliveryChannel,
-            selectedSla: deliveryMode?.deliveryMethod,
+            selectedDeliveryChannel: deliveryMode?.deliveryChannel || null,
+            selectedSla: deliveryMode?.deliveryMethod || null,
             deliveryWindow: deliveryWindow,
           })),
-          selectedAddresses: body?.selectedAddresses?.map((address) => ({
-            addressType: address.addressType || null,
-            receiverName: address.receiverName || null,
-            postalCode:
-              address.postalCode || incrementedAddress?.postalCode || null,
-            city: incrementedAddress?.city || null,
-            state: incrementedAddress?.state || null,
-            country: address.country || incrementedAddress?.country || null,
-            street: incrementedAddress?.street || null,
-            number: incrementedAddress?.number || null,
-            neighborhood: incrementedAddress?.neighborhood || null,
-            complement: incrementedAddress?.complement || null,
-            reference: incrementedAddress?.reference || null,
-            geoCoordinates:
-              address.geoCoordinates ||
-              incrementedAddress?.geoCoordinates ||
-              [],
-          })),
+          selectedAddresses: body?.selectedAddresses?.map((address) => {
+            const selectedAddress: SelectedAddress = {
+              addressType: address.addressType || null,
+              receiverName: address.receiverName || null,
+              postalCode:
+                address.postalCode || incrementedAddress?.postalCode || null,
+              city: incrementedAddress?.city || null,
+              state: incrementedAddress?.state || null,
+              country: address.country || incrementedAddress?.country || null,
+              street: incrementedAddress?.street || null,
+              number: incrementedAddress?.number || null,
+              neighborhood: incrementedAddress?.neighborhood || null,
+              complement: incrementedAddress?.complement || null,
+              reference: incrementedAddress?.reference || null,
+              geoCoordinates: [], // Initialize with default value
+            }
+
+            const longitude =
+              address?.geoCoordinates instanceof Array
+                ? null
+                : address?.geoCoordinates?.longitude || null
+
+            const latitude =
+              address?.geoCoordinates instanceof Array
+                ? null
+                : address?.geoCoordinates?.latitude || null
+
+            selectedAddress.geoCoordinates =
+              longitude && latitude
+                ? [longitude, latitude]
+                : incrementedAddress?.geoCoordinates || []
+
+            return selectedAddress
+          }),
         }
 
         return fetchAPI(

package/src/platforms/vtex/clients/commerce/types/ShippingData.ts

@@ -1,42 +1,42 @@
 export interface ShippingDataBody {
-    clearAddressIfPostalCodeNotFound?: boolean;
-    selectedAddresses?: SelectedAddress[];
-    logisticsInfo?: LogisticsInfo[];
+  clearAddressIfPostalCodeNotFound?: boolean
+  selectedAddresses?: SelectedAddress[]
+  logisticsInfo?: LogisticsInfo[]
 }
 
 export interface SelectedAddress {
-    addressType?: string | null;
-    receiverName?: string | null;
-    postalCode?: string | null;
-    city?: string | null;
-    state?: string | null;
-    country?: string | null;
-    street?: string | null;
-    number?: string | null;
-    neighborhood?: string | null;
-    complement?: string | null;
-    reference?: string | null;
-    geoCoordinates?: GeoCoordinates | null | [];
+  addressType?: string | null
+  receiverName?: string | null
+  postalCode?: string | null
+  city?: string | null
+  state?: string | null
+  country?: string | null
+  street?: string | null
+  number?: string | null
+  neighborhood?: string | null
+  complement?: string | null
+  reference?: string | null
+  geoCoordinates?: GeoCoordinates | GLfloat[] | null | []
 }
 
 export interface GeoCoordinates {
-    latitude: GLfloat;
-    longitude: GLfloat;
+  latitude: GLfloat
+  longitude: GLfloat
 }
 
 export interface DeliveryWindow {
-    startDate: string;
-    endDate: string;
+  startDate: string
+  endDate: string
 }
 
 export interface LogisticsInfo {
-    itemIndex?: number;
-    selectedDeliveryChannel?: string;
-    selectedSla?: string;
+  itemIndex?: number
+  selectedDeliveryChannel?: string
+  selectedSla?: string
 }
 
 export interface DeliveryMode {
-    deliveryChannel?: string;
-    deliveryMethod?: string;
-    deliveryWindow?: DeliveryWindow | null ;
+  deliveryChannel?: string
+  deliveryMethod?: string
+  deliveryWindow?: DeliveryWindow | null
 }

package/src/platforms/vtex/resolvers/validateCart.ts

@@ -235,6 +235,7 @@ const getOrderForm = async (
   }
 
   const shouldUpdateShippingData =
+    orderForm.items.length > 0 &&
     (typeof session.postalCode === 'string' &&
       orderForm.shippingData?.address?.postalCode !== session.postalCode) ||
     (typeof session.geoCoordinates === 'object' &&
@@ -243,11 +244,11 @@ const getOrderForm = async (
       (orderForm.shippingData?.address?.geoCoordinates[0] !==
         session.geoCoordinates.longitude ||
         orderForm.shippingData?.address?.geoCoordinates[1] !==
-          session.geoCoordinates.latitude))
+          session.geoCoordinates.latitude)) 
 
   if (shouldUpdateShippingData) {
     let incrementedAddress: IncrementedAddress | undefined
-
+    
     if (session.postalCode) {
       incrementedAddress = await commerce.checkout.incrementAddress(
         session.country,
@@ -272,7 +273,7 @@ const getOrderForm = async (
         incrementedAddress
       )
     }
-
+    
     return commerce.checkout.shippingData(
       {
         id: orderForm.orderFormId,