@faststore/api 1.6.25 → 1.6.26

package/src/platforms/vtex/index.ts

@@ -15,6 +15,8 @@ import { StoreSearchResult } from './resolvers/searchResult'
 import { StoreSeo } from './resolvers/seo'
 import type { Loaders } from './loaders'
 import type { Clients } from './clients'
+import type { Channel } from './utils/channel'
+import ChannelMarshal from './utils/channel'
 
 export interface Options {
   platform: 'vtex'
@@ -35,7 +37,7 @@ export interface Context {
    * Use it with caution since dependecy injection leads to a more complex code
    * */
   storage: {
-    channel: string
+    channel: Required<Channel>
   }
   headers: Record<string, string>
 }
@@ -63,9 +65,9 @@ const Resolvers = {
   Mutation,
 }
 
-export const getContextFactory = (options: Options) => (ctx: any) => {
+export const getContextFactory = (options: Options) => (ctx: any): Context => {
   ctx.storage = {
-    channel: options.channel,
+    channel: ChannelMarshal.parse(options.channel),
   }
   ctx.clients = getClients(options, ctx)
   ctx.loaders = getLoaders(options, ctx)

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

@@ -62,13 +62,16 @@ export const StoreProduct: Record<string, Resolver<Root>> = {
     } = ctx
 
     const { id, policies } = product
-    const sellers = policies.find((policy) => policy.id === channel)?.sellers
 
-    if (sellers == null) {
+    const sellers = policies.find(
+      (policy) => policy.id === channel.salesChannel
+    )?.sellers
+
+    if (sellers === null || sellers === undefined) {
       // This error will likely happen when you forget to forward the channel somewhere in your code.
       // Make sure all queries that lead to a product are forwarding the channel in context corectly
       throw new Error(
-        `Product with id ${id} has no sellers for channel ${channel}.`
+        `Product with id ${id} has no sellers for sales channel ${channel.salesChannel}.`
       )
     }
 

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

@@ -11,22 +11,23 @@ import type {
 } from '../../../__generated__/schema'
 import type { CategoryTree } from '../clients/commerce/types/CategoryTree'
 import type { Context } from '../index'
+import { mutateChannelContext } from '../utils/channel'
 
 export const Query = {
   product: async (_: unknown, { locator }: QueryProductArgs, ctx: Context) => {
     // Insert channel in context for later usage
-    ctx.storage = {
-      ...ctx.storage,
-      channel:
-        locator.find((facet) => facet.key === 'channel')?.value ??
-        ctx.storage.channel,
+    const channelString = locator.find((facet) => facet.key === 'channel')
+      ?.value
+
+    if (channelString) {
+      mutateChannelContext(ctx, channelString)
     }
 
     const {
       loaders: { skuLoader },
     } = ctx
 
-    return skuLoader.load(locator.map(transformSelectedFacet))
+    return skuLoader.load(locator.flatMap(transformSelectedFacet))
   },
   collection: (_: unknown, { slug }: QueryCollectionArgs, ctx: Context) => {
     const {
@@ -41,11 +42,12 @@ export const Query = {
     ctx: Context
   ) => {
     // Insert channel in context for later usage
-    ctx.storage = {
-      ...ctx.storage,
-      channel:
-        selectedFacets?.find((facet) => facet.key === 'channel')?.value ??
-        ctx.storage.channel,
+    const channelString = selectedFacets?.find(
+      (facet) => facet.key === 'channel'
+    )?.value
+
+    if (channelString) {
+      mutateChannelContext(ctx, channelString)
     }
 
     const after = maybeAfter ? Number(maybeAfter) : 0
@@ -54,7 +56,7 @@ export const Query = {
       count: first,
       query: term,
       sort: SORT_MAP[sort ?? 'score_desc'],
-      selectedFacets: selectedFacets?.map(transformSelectedFacet) ?? [],
+      selectedFacets: selectedFacets?.flatMap(transformSelectedFacet) ?? [],
     }
 
     return searchArgs

package/src/platforms/vtex/utils/channel.ts

@@ -1,10 +1,12 @@
+import type { Context } from '..'
+
 export interface Channel {
   regionId?: string
   salesChannel?: string
 }
 
 export default class ChannelMarshal {
-  public static parse(channelString: string): Channel {
+  public static parse(channelString: string): Required<Channel> {
     try {
       const parsedChannel = JSON.parse(channelString) as Channel
 
@@ -23,3 +25,10 @@ export default class ChannelMarshal {
     return JSON.stringify(channel)
   }
 }
+
+export const mutateChannelContext = (ctx: Context, channelString: string) => {
+  ctx.storage = {
+    ...ctx.storage,
+    channel: ChannelMarshal.parse(channelString),
+  }
+}

package/src/platforms/vtex/utils/facets.ts

@@ -1,3 +1,5 @@
+import ChannelMarshal from './channel'
+
 export interface SelectedFacet {
   key: string
   value: string
@@ -5,12 +7,16 @@ export interface SelectedFacet {
 
 /**
  * Transform facets from the store to VTEX platform facets.
- * For instance, the channel in Store becomes trade-policy in VTEX's realm
+ * For instance, the channel in Store becomes trade-policy and regionId in VTEX's realm
  * */
 export const transformSelectedFacet = ({ key, value }: SelectedFacet) => {
   switch (key) {
-    case 'channel':
-      return { key: 'trade-policy', value }
+    case 'channel': {
+      const channel = ChannelMarshal.parse(value)
+
+      // This array should have all values from channel string
+      return [{ key: 'trade-policy', value: channel.salesChannel }]
+    }
 
     default:
       return { key, value }