@faststore/api 1.8.46 → 1.8.49

package/dist/index.d.ts

@@ -117,12 +117,6 @@ export declare const getResolvers: (options: Options) => {
                 cursor: string;
             }[];
         }>;
-        person: (_: unknown, __: unknown, ctx: import("./platforms/vtex").Context) => Promise<{
-            id: string;
-            email: string;
-            givenName: string;
-            familyName: string;
-        } | null>;
     };
     Mutation: {
         validateCart: (_: unknown, { cart: { order } }: {
@@ -182,7 +176,7 @@ export declare const getResolvers: (options: Options) => {
                 status: any;
             }[];
         } | null>;
-        updateSession: (_: any, { session }: import("./__generated__/schema").MutationUpdateSessionArgs, { clients }: import("./platforms/vtex").Context) => Promise<import("./__generated__/schema").StoreSession>;
+        validateSession: (_: any, { session: oldSession, search }: import("./__generated__/schema").MutationValidateSessionArgs, { clients }: import("./platforms/vtex").Context) => Promise<import("./__generated__/schema").StoreSession | null>;
     };
 };
 export declare const getContextFactory: (options: Options) => (ctx: any) => import("./platforms/vtex").Context;

package/dist/platforms/vtex/clients/commerce/index.d.ts

@@ -40,5 +40,5 @@ export declare const VtexCommerce: ({ account, environment }: Options, ctx: Cont
         }) => Promise<OrderForm>;
         region: ({ postalCode, country, salesChannel, }: RegionInput) => Promise<Region>;
     };
-    session: () => Promise<Session>;
+    session: (search: string) => Promise<Session>;
 };

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

@@ -4,10 +4,18 @@ export interface Session {
 }
 export interface Namespaces {
     profile?: Profile;
+    store?: Store;
 }
 export interface Value {
     value: string;
 }
+export interface Store {
+    channel: Value;
+    countryCode: Value;
+    cultureInfo: Value;
+    currencyCode: Value;
+    currencySymbol: Value;
+}
 export interface Profile {
     id?: Value;
     email?: Value;

package/dist/platforms/vtex/clients/index.d.ts

@@ -40,7 +40,7 @@ export declare const getClients: (options: Options, ctx: Context) => {
             }) => Promise<import("./commerce/types/OrderForm").OrderForm>;
             region: ({ postalCode, country, salesChannel, }: import("./commerce/types/Region").RegionInput) => Promise<import("./commerce/types/Region").Region>;
         };
-        session: () => Promise<import("./commerce/types/Session").Session>;
+        session: (search: string) => Promise<import("./commerce/types/Session").Session>;
     };
     sp: {
         sendEvent: (options: import("./sp").SearchEvent) => Promise<any>;

package/dist/platforms/vtex/index.d.ts

@@ -146,12 +146,6 @@ export declare const getResolvers: (_: Options) => {
                 cursor: string;
             }[];
         }>;
-        person: (_: unknown, __: unknown, ctx: Context) => Promise<{
-            id: string;
-            email: string;
-            givenName: string;
-            familyName: string;
-        } | null>;
     };
     Mutation: {
         validateCart: (_: unknown, { cart: { order } }: {
@@ -211,7 +205,7 @@ export declare const getResolvers: (_: Options) => {
                 status: any;
             }[];
         } | null>;
-        updateSession: (_: any, { session }: import("../..").MutationUpdateSessionArgs, { clients }: Context) => Promise<import("../..").StoreSession>;
+        validateSession: (_: any, { session: oldSession, search }: import("../..").MutationValidateSessionArgs, { clients }: Context) => Promise<import("../..").StoreSession | null>;
     };
 };
 export {};

package/dist/platforms/vtex/resolvers/mutation.d.ts

@@ -56,5 +56,5 @@ export declare const Mutation: {
             status: any;
         }[];
     } | null>;
-    updateSession: (_: any, { session }: import("../../..").MutationUpdateSessionArgs, { clients }: import("..").Context) => Promise<import("../../..").StoreSession>;
+    validateSession: (_: any, { session: oldSession, search }: import("../../..").MutationValidateSessionArgs, { clients }: import("..").Context) => Promise<import("../../..").StoreSession | null>;
 };

package/dist/platforms/vtex/resolvers/query.d.ts

@@ -50,10 +50,4 @@ export declare const Query: {
             cursor: string;
         }[];
     }>;
-    person: (_: unknown, __: unknown, ctx: Context) => Promise<{
-        id: string;
-        email: string;
-        givenName: string;
-        familyName: string;
-    } | null>;
 };

package/dist/platforms/vtex/resolvers/validateSession.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from '..';
+import type { MutationValidateSessionArgs, StoreSession } from '../../../__generated__/schema';
+export declare const validateSession: (_: any, { session: oldSession, search }: MutationValidateSessionArgs, { clients }: Context) => Promise<StoreSession | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "1.8.46",
+  "version": "1.8.49",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "graphql": "^15.6.0"
   },
-  "gitHead": "a71780755aebd9d78b51167d7ba6c8ddbeb9c510"
+  "gitHead": "4b814f0be6b3088399e3c6312d9c941fe523cf0e"
 }

package/src/__generated__/schema.ts

@@ -18,6 +18,13 @@ export type IStoreCart = {
   order: IStoreOrder;
 };
 
+export type IStoreCurrency = {
+  /** Currency code, e.g: USD */
+  code: Scalars['String'];
+  /** Currency symbol, e.g: $ */
+  symbol: Scalars['String'];
+};
+
 /** Image input. */
 export type IStoreImage = {
   /** Alias for the input image. */
@@ -54,6 +61,18 @@ export type IStoreOrganization = {
   identifier: Scalars['String'];
 };
 
+/** Client profile data. */
+export type IStorePerson = {
+  /** Client email. */
+  email: Scalars['String'];
+  /** Client last name. */
+  familyName: Scalars['String'];
+  /** Client first name. */
+  givenName: Scalars['String'];
+  /** Client ID. */
+  id: Scalars['String'];
+};
+
 /** Product input. Products are variants within product groups, equivalent to VTEX [SKUs](https://help.vtex.com/en/tutorial/what-is-an-sku--1K75s4RXAQyOuGUYKMM68u#). For example, you may have a **Shirt** product group with associated products such as **Blue shirt size L**, **Green shirt size XL** and so on. */
 export type IStoreProduct = {
   /** Custom Product Additional Properties. */
@@ -88,27 +107,34 @@ export type IStoreSession = {
   /** Session input channel. */
   channel?: Maybe<Scalars['String']>;
   /** Session input country. */
-  country?: Maybe<Scalars['String']>;
+  country: Scalars['String'];
+  /** Session input currency. */
+  currency: IStoreCurrency;
+  /** Session input locale. */
+  locale: Scalars['String'];
+  /** Session input postal code. */
+  person?: Maybe<IStorePerson>;
   /** Session input postal code. */
   postalCode?: Maybe<Scalars['String']>;
 };
 
 export type Mutation = {
   __typename?: 'Mutation';
-  /** Update session information. */
-  updateSession: StoreSession;
   /** Returns the order if anything has changed in it, or `null` if the order is valid. */
   validateCart?: Maybe<StoreCart>;
+  /** Validate session information. */
+  validateSession?: Maybe<StoreSession>;
 };
 
 
-export type MutationUpdateSessionArgs = {
-  session: IStoreSession;
+export type MutationValidateCartArgs = {
+  cart: IStoreCart;
 };
 
 
-export type MutationValidateCartArgs = {
-  cart: IStoreCart;
+export type MutationValidateSessionArgs = {
+  search: Scalars['String'];
+  session: IStoreSession;
 };
 
 export type Query = {
@@ -119,8 +145,6 @@ export type Query = {
   allProducts: StoreProductConnection;
   /** Collection query. */
   collection: StoreCollection;
-  /** Person query. */
-  person?: Maybe<StorePerson>;
   /** Product query. */
   product: StoreProduct;
   /** Search query. */
@@ -282,6 +306,15 @@ export const enum StoreCollectionType {
   Department = 'Department'
 };
 
+/** Currency information. */
+export type StoreCurrency = {
+  __typename?: 'StoreCurrency';
+  /** Currency code, e.g: USD */
+  code: Scalars['String'];
+  /** Currency symbol, e.g: $ */
+  symbol: Scalars['String'];
+};
+
 /** Search facet information. */
 export type StoreFacet = {
   __typename?: 'StoreFacet';
@@ -530,7 +563,13 @@ export type StoreSession = {
   /** Session channel. */
   channel?: Maybe<Scalars['String']>;
   /** Session country. */
-  country?: Maybe<Scalars['String']>;
+  country: Scalars['String'];
+  /** Session currency. */
+  currency: StoreCurrency;
+  /** Session locale. */
+  locale: Scalars['String'];
+  /** Session postal code. */
+  person?: Maybe<StorePerson>;
   /** Session postal code. */
   postalCode?: Maybe<Scalars['String']>;
 };

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

@@ -135,17 +135,22 @@ export const VtexCommerce = (
         )
       },
     },
-    session: (): Promise<Session> =>
-      fetchAPI(
-        `${base}/api/sessions?items=profile.id,profile.email,profile.firstName,profile.lastName`,
-        {
-          method: 'POST',
-          headers: {
-            'content-type': 'application/json',
-            cookie: ctx.headers.cookie,
-          },
-          body: '{}',
-        }
-      ),
+    session: (search: string): Promise<Session> => {
+      const params = new URLSearchParams(search)
+
+      params.set(
+        'items',
+        'profile.id,profile.email,profile.firstName,profile.lastName,store.channel,store.countryCode,store.cultureInfo,store.currencyCode,store.currencySymbol'
+      )
+
+      return fetchAPI(`${base}/api/sessions?${params.toString()}`, {
+        method: 'POST',
+        headers: {
+          'content-type': 'application/json',
+          cookie: ctx.headers.cookie,
+        },
+        body: '{}',
+      })
+    },
   }
 }

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

@@ -5,12 +5,21 @@ export interface Session {
 
 export interface Namespaces {
   profile?: Profile
+  store?: Store
 }
 
 export interface Value {
   value: string
 }
 
+export interface Store {
+  channel: Value
+  countryCode: Value
+  cultureInfo: Value
+  currencyCode: Value
+  currencySymbol: Value
+}
+
 export interface Profile {
   id?: Value
   email?: Value

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

@@ -1,7 +1,7 @@
 import { validateCart } from './validateCart'
-import { updateSession } from './updateSession'
+import { validateSession } from './validateSession'
 
 export const Mutation = {
   validateCart,
-  updateSession,
+  validateSession,
 }

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

@@ -165,22 +165,4 @@ export const Query = {
         })),
     }
   },
-  person: async (_: unknown, __: unknown, ctx: Context) => {
-    const {
-      clients: { commerce },
-    } = ctx
-
-    const {
-      namespaces: { profile = null },
-    } = await commerce.session()
-
-    return (
-      profile && {
-        id: profile.id?.value ?? '',
-        email: profile.email?.value ?? '',
-        givenName: profile.firstName?.value ?? '',
-        familyName: profile.lastName?.value ?? '',
-      }
-    )
-  },
 }

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

@@ -0,0 +1,59 @@
+import deepEquals from 'fast-deep-equal'
+
+import ChannelMarshal from '../utils/channel'
+import type { Context } from '..'
+import type {
+  MutationValidateSessionArgs,
+  StoreSession,
+} from '../../../__generated__/schema'
+
+export const validateSession = async (
+  _: any,
+  { session: oldSession, search }: MutationValidateSessionArgs,
+  { clients }: Context
+): Promise<StoreSession | null> => {
+  const channel = ChannelMarshal.parse(oldSession.channel ?? '')
+  const postalCode = String(oldSession.postalCode ?? '').replace(/\D/g, '')
+  const country = oldSession.country ?? ''
+
+  const params = new URLSearchParams(search)
+
+  params.set('sc', params.get('sc') ?? channel.salesChannel)
+
+  const [regionData, sessionData] = await Promise.all([
+    postalCode
+      ? clients.commerce.checkout.region({ postalCode, country })
+      : Promise.resolve(null),
+    clients.commerce.session(params.toString()).catch(() => null),
+  ])
+
+  const profile = sessionData?.namespaces.profile ?? null
+  const store = sessionData?.namespaces.store ?? null
+
+  const newSession = {
+    ...oldSession,
+    currency: {
+      code: store?.currencyCode.value ?? oldSession.currency.code,
+      symbol: store?.currencySymbol.value ?? oldSession.currency.symbol,
+    },
+    country: store?.countryCode.value ?? oldSession.country,
+    channel: ChannelMarshal.stringify({
+      salesChannel: store?.channel?.value ?? channel.salesChannel,
+      regionId: regionData?.[0]?.id ?? channel.regionId,
+    }),
+    person: profile?.id
+      ? {
+          id: profile.id?.value ?? '',
+          email: profile.email?.value ?? '',
+          givenName: profile.firstName?.value ?? '',
+          familyName: profile.lastName?.value ?? '',
+        }
+      : null,
+  }
+
+  if (deepEquals(oldSession, newSession)) {
+    return null
+  }
+
+  return newSession
+}

package/src/typeDefs/index.ts

@@ -23,6 +23,7 @@ import Status from './status.graphql'
 import PropertyValue from './propertyValue.graphql'
 import Person from './person.graphql'
 import ObjectOrString from './objectOrString.graphql'
+import Session from './session.graphql'
 
 export const typeDefs = [
   Query,
@@ -48,6 +49,7 @@ export const typeDefs = [
   PropertyValue,
   Person,
   ObjectOrString,
+  Session,
 ]
   .map(print)
   .join('\n')

package/src/typeDefs/mutation.graphql

@@ -1,46 +1,10 @@
-"""
-Session information.
-"""
-type StoreSession {
-  """
-  Session channel.
-  """
-  channel: String
-  """
-  Session country.
-  """
-  country: String
-  """
-  Session postal code.
-  """
-  postalCode: String
-}
-
-"""
-Session input.
-"""
-input IStoreSession {
-  """
-  Session input channel.
-  """
-  channel: String
-  """
-  Session input country.
-  """
-  country: String
-  """
-  Session input postal code.
-  """
-  postalCode: String
-}
-
 type Mutation {
   """
   Returns the order if anything has changed in it, or `null` if the order is valid.
   """
   validateCart(cart: IStoreCart!): StoreCart
   """
-  Update session information.
+  Validate session information.
   """
-  updateSession(session: IStoreSession!): StoreSession!
+  validateSession(session: IStoreSession!, search: String!): StoreSession
 }

package/src/typeDefs/person.graphql

@@ -19,3 +19,25 @@ type StorePerson {
   """
   familyName: String!
 }
+
+"""
+Client profile data.
+"""
+input IStorePerson {
+  """
+  Client ID.
+  """
+  id: String!
+  """
+  Client email.
+  """
+  email: String!
+  """
+  Client first name.
+  """
+  givenName: String!
+  """
+  Client last name.
+  """
+  familyName: String!
+}

package/src/typeDefs/query.graphql

@@ -204,9 +204,4 @@ type Query {
     """
     after: String
   ): StoreCollectionConnection!
-
-  """
-  Person query.
-  """
-  person: StorePerson
 }

package/src/typeDefs/session.graphql

@@ -0,0 +1,84 @@
+"""
+Currency information.
+"""
+type StoreCurrency {
+  """
+  Currency code, e.g: USD
+  """
+  code: String!
+  """
+  Currency symbol, e.g: $
+  """
+  symbol: String!
+}
+
+input IStoreCurrency {
+  """
+  Currency code, e.g: USD
+  """
+  code: String!
+  """
+  Currency symbol, e.g: $
+  """
+  symbol: String!
+}
+
+"""
+Session information.
+"""
+type StoreSession {
+  """
+  Session locale.
+  """
+  locale: String!
+  """
+  Session currency.
+  """
+  currency: StoreCurrency!
+  """
+  Session country.
+  """
+  country: String!
+  """
+  Session channel.
+  """
+  channel: String
+  """
+  Session postal code.
+  """
+  postalCode: String
+  """
+  Session postal code.
+  """
+  person: StorePerson
+}
+
+"""
+Session input.
+"""
+input IStoreSession {
+  """
+  Session input locale.
+  """
+  locale: String!
+  """
+  Session input currency.
+  """
+  currency: IStoreCurrency!
+  """
+  Session input country.
+  """
+  country: String!
+  """
+  Session input channel.
+  """
+  channel: String
+  """
+  Session input postal code.
+  """
+  postalCode: String
+  """
+  Session input postal code.
+  """
+  person: IStorePerson
+}

package/dist/platforms/vtex/resolvers/updateSession.d.ts

@@ -1,3 +0,0 @@
-import type { Context } from '..';
-import type { MutationUpdateSessionArgs, StoreSession } from '../../../__generated__/schema';
-export declare const updateSession: (_: any, { session }: MutationUpdateSessionArgs, { clients }: Context) => Promise<StoreSession>;

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

@@ -1,26 +0,0 @@
-import type { Context } from '..'
-import type {
-  MutationUpdateSessionArgs,
-  StoreSession,
-} from '../../../__generated__/schema'
-import ChannelMarshal from '../utils/channel'
-
-export const updateSession = async (
-  _: any,
-  { session }: MutationUpdateSessionArgs,
-  { clients }: Context
-): Promise<StoreSession> => {
-  const channel = ChannelMarshal.parse(session.channel ?? '')
-  const regionData = await clients.commerce.checkout.region({
-    postalCode: String(session.postalCode ?? '').replace(/\D/g, ''),
-    country: session.country ?? '',
-  })
-
-  return {
-    ...session,
-    channel: ChannelMarshal.stringify({
-      ...channel,
-      regionId: regionData?.[0]?.id,
-    }),
-  }
-}