@faststore/api 1.9.6 → 1.9.9

package/dist/index.d.ts

@@ -49,6 +49,7 @@ export declare const getResolvers: (options: Options) => {
     StoreSeo: Record<string, import("./platforms/vtex").Resolver<{
         title?: string | undefined;
         description?: string | undefined;
+        canonical?: string | undefined;
     }, unknown, any>>;
     StoreFacet: Record<string, import("./platforms/vtex").Resolver<import("./platforms/vtex/clients/search/types/FacetSearchResult").Facet, unknown, any>>;
     StoreFacetValue: Record<string, import("./platforms/vtex").Resolver<import("./platforms/vtex/clients/search/types/FacetSearchResult").FacetValue, unknown, any>>;
@@ -57,7 +58,7 @@ export declare const getResolvers: (options: Options) => {
     } & {
         attachmentsValues?: import("./platforms/vtex/clients/commerce/types/OrderForm").Attachment[] | undefined;
     }> | (import("./platforms/vtex/clients/commerce/types/OrderForm").OrderFormItem & {
-        product: Promise<import("./platforms/vtex/utils/enhanceSku").EnhancedSku>;
+        product: import("./platforms/vtex/utils/enhanceSku").EnhancedSku;
     }), unknown, any>>;
     StoreAggregateRating: Record<string, import("./platforms/vtex").Resolver<unknown, unknown, any>>;
     StoreReview: Record<string, import("./platforms/vtex").Resolver<unknown, unknown, any>>;
@@ -125,8 +126,8 @@ export declare const getResolvers: (options: Options) => {
         }, ctx: import("./platforms/vtex").Context) => Promise<{
             order: {
                 orderNumber: string;
-                acceptedOffer: {
-                    product: Promise<import("./platforms/vtex/utils/enhanceSku").EnhancedSku>;
+                acceptedOffer: Promise<{
+                    product: import("./platforms/vtex/utils/enhanceSku").EnhancedSku;
                     id: string;
                     name: string;
                     detailUrl: string;
@@ -170,7 +171,7 @@ export declare const getResolvers: (options: Options) => {
                         total: number;
                     };
                     attachments: import("./platforms/vtex/clients/commerce/types/OrderForm").Attachment[];
-                }[];
+                }>[];
             };
             messages: {
                 text: any;

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

@@ -5,7 +5,7 @@ export interface CollectionPageType {
     url: string;
     title: string;
     metaTagDescription: string;
-    pageType: 'Brand' | 'Category' | 'Department' | 'Subcategory';
+    pageType: 'Brand' | 'Category' | 'Department' | 'Subcategory' | 'Product';
 }
 export interface FallbackPageType {
     id: null;

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

@@ -77,6 +77,7 @@ export declare const getResolvers: (_: Options) => {
     StoreSeo: Record<string, Resolver<{
         title?: string | undefined;
         description?: string | undefined;
+        canonical?: string | undefined;
     }, unknown, any>>;
     StoreFacet: Record<string, Resolver<import("./clients/search/types/FacetSearchResult").Facet, unknown, any>>;
     StoreFacetValue: Record<string, Resolver<import("./clients/search/types/FacetSearchResult").FacetValue, unknown, any>>;
@@ -85,7 +86,7 @@ export declare const getResolvers: (_: Options) => {
     } & {
         attachmentsValues?: import("./clients/commerce/types/OrderForm").Attachment[] | undefined;
     }> | (import("./clients/commerce/types/OrderForm").OrderFormItem & {
-        product: Promise<import("./utils/enhanceSku").EnhancedSku>;
+        product: import("./utils/enhanceSku").EnhancedSku;
     }), unknown, any>>;
     StoreAggregateRating: Record<string, Resolver<unknown, unknown, any>>;
     StoreReview: Record<string, Resolver<unknown, unknown, any>>;
@@ -153,8 +154,8 @@ export declare const getResolvers: (_: Options) => {
         }, ctx: Context) => Promise<{
             order: {
                 orderNumber: string;
-                acceptedOffer: {
-                    product: Promise<import("./utils/enhanceSku").EnhancedSku>;
+                acceptedOffer: Promise<{
+                    product: import("./utils/enhanceSku").EnhancedSku;
                     id: string;
                     name: string;
                     detailUrl: string;
@@ -198,7 +199,7 @@ export declare const getResolvers: (_: Options) => {
                         total: number;
                     };
                     attachments: import("./clients/commerce/types/OrderForm").Attachment[];
-                }[];
+                }>[];
             };
             messages: {
                 text: any;

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

@@ -1,7 +1,7 @@
 import type { Context, Options } from '..';
 export declare type Loaders = ReturnType<typeof getLoaders>;
 export declare const getLoaders: (options: Options, { clients }: Context) => {
-    skuLoader: import("dataloader")<import("../utils/facets").SelectedFacet[], import("../utils/enhanceSku").EnhancedSku, import("../utils/facets").SelectedFacet[]>;
+    skuLoader: import("dataloader")<string, import("../utils/enhanceSku").EnhancedSku, string>;
     simulationLoader: import("dataloader")<import("../clients/commerce/types/Simulation").PayloadItem[], import("../clients/commerce/types/Simulation").Simulation, import("../clients/commerce/types/Simulation").PayloadItem[]>;
     collectionLoader: import("dataloader")<string, import("../clients/commerce/types/Portal").CollectionPageType, string>;
 };

package/dist/platforms/vtex/loaders/sku.d.ts

@@ -2,5 +2,4 @@ import DataLoader from 'dataloader';
 import type { EnhancedSku } from '../utils/enhanceSku';
 import type { Options } from '..';
 import type { Clients } from '../clients';
-import type { SelectedFacet } from '../utils/facets';
-export declare const getSkuLoader: (_: Options, clients: Clients) => DataLoader<SelectedFacet[], EnhancedSku, SelectedFacet[]>;
+export declare const getSkuLoader: (_: Options, clients: Clients) => DataLoader<string, EnhancedSku, string>;

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

@@ -4,8 +4,8 @@ export declare const Mutation: {
     }, ctx: import("..").Context) => Promise<{
         order: {
             orderNumber: string;
-            acceptedOffer: {
-                product: Promise<import("../utils/enhanceSku").EnhancedSku>;
+            acceptedOffer: Promise<{
+                product: import("../utils/enhanceSku").EnhancedSku;
                 id: string;
                 name: string;
                 detailUrl: string;
@@ -49,7 +49,7 @@ export declare const Mutation: {
                     total: number;
                 };
                 attachments: import("../clients/commerce/types/OrderForm").Attachment[];
-            }[];
+            }>[];
         };
         messages: {
             text: any;

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

@@ -4,7 +4,7 @@ import type { ArrayElementType } from '../../../typings';
 import type { EnhancedSku } from '../utils/enhanceSku';
 import type { OrderFormItem } from '../clients/commerce/types/OrderForm';
 declare type OrderFormProduct = OrderFormItem & {
-    product: Promise<EnhancedSku>;
+    product: EnhancedSku;
 };
 declare type SearchProduct = ArrayElementType<ReturnType<typeof StoreAggregateOffer.offers>>;
 declare type Root = SearchProduct | OrderFormProduct;

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

@@ -2,6 +2,7 @@ import type { Resolver } from '..';
 declare type Root = {
     title?: string;
     description?: string;
+    canonical?: string;
 };
 export declare const StoreSeo: Record<string, Resolver<Root>>;
 export {};

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

@@ -18,8 +18,8 @@ export declare const validateCart: (_: unknown, { cart: { order } }: {
 }, ctx: Context) => Promise<{
     order: {
         orderNumber: string;
-        acceptedOffer: {
-            product: Promise<import("../utils/enhanceSku").EnhancedSku>;
+        acceptedOffer: Promise<{
+            product: import("../utils/enhanceSku").EnhancedSku;
             id: string;
             name: string;
             detailUrl: string;
@@ -63,7 +63,7 @@ export declare const validateCart: (_: unknown, { cart: { order } }: {
                 total: number;
             };
             attachments: import("../clients/commerce/types/OrderForm").Attachment[];
-        }[];
+        }>[];
     };
     messages: {
         text: any;

package/dist/platforms/vtex/utils/canonical.d.ts

@@ -0,0 +1,2 @@
+import type { Product } from '../clients/search/types/ProductSearchResult';
+export declare const canonicalFromProduct: ({ linkText }: Product) => string;

package/dist/platforms/vtex/utils/facets.d.ts

@@ -13,5 +13,7 @@ export declare const transformSelectedFacet: ({ key, value }: SelectedFacet) =>
     key: string;
     value: string;
 };
+export declare const findSlug: (facets?: SelectedFacet[] | null | undefined) => string | null;
+export declare const findSkuId: (facets?: SelectedFacet[] | null | undefined) => string | null;
 export declare const findLocale: (facets?: SelectedFacet[] | null | undefined) => string | null;
 export declare const findChannel: (facets?: SelectedFacet[] | null | undefined) => string | null;

package/dist/platforms/vtex/utils/orderStatistics.d.ts

@@ -0,0 +1,4 @@
+/**
+ * More info at: https://en.wikipedia.org/wiki/Order_statistic
+ */
+export declare const min: <T>(array: T[], cmp: (a: T, b: T) => number) => T;

package/dist/platforms/vtex/utils/sku.d.ts

@@ -0,0 +1,8 @@
+import type { Item } from '../clients/search/types/ProductSearchResult';
+/**
+ * This function implements Portal heuristics for returning the best sku for a product.
+ *
+ * The best sku is the one with the best (cheapest available) offer
+ * */
+export declare const pickBestSku: (skus: Item[]) => Item;
+export declare const isValidSkuId: (skuId: string) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "1.9.6",
+  "version": "1.9.9",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -17,6 +17,7 @@
     "develop": "tsdx watch --entry ./local/server.ts --target node --onSuccess \"node ./dist\"",
     "develop:no-server": "concurrently \"yarn generate -w\" \"tsdx watch\"",
     "build": "graphql-codegen --config codegen.yml && tsdx build",
+    "lint": "eslint src/**/*.ts",
     "test": "tsdx test",
     "generate": "graphql-codegen --config codegen.yml"
   },
@@ -44,5 +45,5 @@
   "peerDependencies": {
     "graphql": "^15.6.0"
   },
-  "gitHead": "69e237e43d8fc3940fffdd2a9fa8d5ed43f40181"
+  "gitHead": "1f1d2c97e399fb44987cdbd7980157242f193abf"
 }

package/src/__generated__/schema.ts

@@ -19,9 +19,9 @@ export type IStoreCart = {
 };
 
 export type IStoreCurrency = {
-  /** Currency code, e.g: USD */
+  /** Currency code (e.g: USD). */
   code: Scalars['String'];
-  /** Currency symbol, e.g: $ */
+  /** Currency symbol (e.g: $). */
   symbol: Scalars['String'];
 };
 
@@ -47,7 +47,7 @@ export type IStoreOffer = {
   seller: IStoreOrganization;
 };
 
-/** Offer input. */
+/** Order input. */
 export type IStoreOrder = {
   /** Array with information on each accepted offer. */
   acceptedOffer: Array<IStoreOffer>;
@@ -96,9 +96,11 @@ export type IStorePropertyValue = {
   valueReference: Scalars['String'];
 };
 
-/** Selected facet input. */
+/** Selected search facet input. */
 export type IStoreSelectedFacet = {
+  /** Selected search facet key. */
   key: Scalars['String'];
+  /** Selected search facet value. */
   value: Scalars['String'];
 };
 
@@ -120,9 +122,9 @@ export type IStoreSession = {
 
 export type Mutation = {
   __typename?: 'Mutation';
-  /** Returns the order if anything has changed in it, or `null` if the order is valid. */
+  /** Checks for changes between the cart presented in the UI and the cart stored in the ecommerce platform. If changes are detected, it returns the cart stored on the platform. Otherwise, it returns `null`. */
   validateCart?: Maybe<StoreCart>;
-  /** Validate session information. */
+  /** Updates a web session with the specified values. */
   validateSession?: Maybe<StoreSession>;
 };
 
@@ -139,15 +141,15 @@ export type MutationValidateSessionArgs = {
 
 export type Query = {
   __typename?: 'Query';
-  /** All collections query. */
+  /** Returns information about all collections. */
   allCollections: StoreCollectionConnection;
-  /** All products query. */
+  /** Returns information about all products. */
   allProducts: StoreProductConnection;
-  /** Collection query. */
+  /** Returns the details of a collection based on the collection slug. */
   collection: StoreCollection;
-  /** Product query. */
+  /** Returns the details of a product based on the specified locator. */
   product: StoreProduct;
-  /** Search query. */
+  /** Returns the result of a product, facet, or suggestion search. */
   search: StoreSearchResult;
 };
 
@@ -241,7 +243,7 @@ export type StoreCart = {
 /** Shopping cart message. */
 export type StoreCartMessage = {
   __typename?: 'StoreCartMessage';
-  /** Shopping cart message status, which can be `INFO`, `WARNING` OR `ERROR`. */
+  /** Shopping cart message status, which can be `INFO`, `WARNING` or `ERROR`. */
   status: StoreStatus;
   /** Shopping cart message text. */
   text: Scalars['String'];
@@ -264,21 +266,21 @@ export type StoreCollection = {
   type: StoreCollectionType;
 };
 
-/** Collection connection pagination information. */
+/** Collection connections, including pagination information and collections returned by the query. */
 export type StoreCollectionConnection = {
   __typename?: 'StoreCollectionConnection';
-  /** Array with collection connection page edges. */
+  /** Array with collection connection page edges, each containing a collection and a corresponding cursor.. */
   edges: Array<StoreCollectionEdge>;
-  /** Collection connection page information. */
+  /** Collection pagination information. */
   pageInfo: StorePageInfo;
 };
 
-/** Collection pagination edge. */
+/** Each collection edge contains a `node`, with product collection information, and a `cursor`, that can be used as a reference for pagination. */
 export type StoreCollectionEdge = {
   __typename?: 'StoreCollectionEdge';
-  /** Collection pagination cursor. */
+  /** Collection cursor. Used as pagination reference. */
   cursor: Scalars['String'];
-  /** Collection pagination node. */
+  /** Each collection node contains the information of a product collection returned by the query. */
   node: StoreCollection;
 };
 
@@ -300,18 +302,22 @@ export type StoreCollectionMeta = {
 
 /** Product collection type. Possible values are `Department`, `Category`, `Brand` or `Cluster`. */
 export const enum StoreCollectionType {
+  /** Product brand. */
   Brand = 'Brand',
+  /** Second level of product categorization. */
   Category = 'Category',
+  /** Product cluster. */
   Cluster = 'Cluster',
+  /** First level of product categorization. */
   Department = 'Department'
 };
 
 /** Currency information. */
 export type StoreCurrency = {
   __typename?: 'StoreCurrency';
-  /** Currency code, e.g: USD */
+  /** Currency code (e.g: USD). */
   code: Scalars['String'];
-  /** Currency symbol, e.g: $ */
+  /** Currency symbol (e.g: $). */
   symbol: Scalars['String'];
 };
 
@@ -330,7 +336,9 @@ export type StoreFacet = {
 
 /** Search facet type. */
 export const enum StoreFacetType {
+  /** Indicates boolean search facet. */
   Boolean = 'BOOLEAN',
+  /** Indicates range type search facet. */
   Range = 'RANGE'
 };
 
@@ -408,16 +416,16 @@ export type StoreOrganization = {
   identifier: Scalars['String'];
 };
 
-/** Page information. */
+/** Whenever you make a query that allows for pagination, such as `allProducts` or `allCollections`, you can check `StorePageInfo` to learn more about the complete set of items and use it to paginate your queries. */
 export type StorePageInfo = {
   __typename?: 'StorePageInfo';
-  /** Page cursor end. */
+  /** Cursor corresponding to the last possible item. */
   endCursor: Scalars['String'];
-  /** Indicates whether next page exists. */
+  /** Indicates whether there is at least one more page with items after the ones returned in the current query. */
   hasNextPage: Scalars['Boolean'];
-  /** Indicates whether previous page exists. */
+  /** Indicates whether there is at least one more page with items before the ones returned in the current query. */
   hasPreviousPage: Scalars['Boolean'];
-  /** Page cursor start. */
+  /** Cursor corresponding to the first possible item. */
   startCursor: Scalars['String'];
   /** Total number of items (products or collections), not pages. */
   totalCount: Scalars['Int'];
@@ -471,21 +479,21 @@ export type StoreProduct = {
   slug: Scalars['String'];
 };
 
-/** Product connection pagination information. */
+/** Product connections, including pagination information and products returned by the query. */
 export type StoreProductConnection = {
   __typename?: 'StoreProductConnection';
-  /** Array with product connection page edges. */
+  /** Array with product connection edges, each containing a product and a corresponding cursor. */
   edges: Array<StoreProductEdge>;
-  /** Product connection page information. */
+  /** Product pagination information. */
   pageInfo: StorePageInfo;
 };
 
-/** Product pagination edge. */
+/** Each product edge contains a `node`, with product information, and a `cursor`, that can be used as a reference for pagination. */
 export type StoreProductEdge = {
   __typename?: 'StoreProductEdge';
-  /** Product pagination cursor. */
+  /** Product cursor. Used as pagination reference. */
   cursor: Scalars['String'];
-  /** Product pagination node. */
+  /** Each product node contains the information of a product returned by the query. */
   node: StoreProduct;
 };
 
@@ -574,19 +582,27 @@ export type StoreSession = {
   postalCode?: Maybe<Scalars['String']>;
 };
 
-/** Product sorting options used in search. */
+/** Product search results sorting options. */
 export const enum StoreSort {
+  /** Sort by discount value, from highest to lowest. */
   DiscountDesc = 'discount_desc',
+  /** Sort by name, in alphabetical order. */
   NameAsc = 'name_asc',
+  /** Sort by name, in reverse alphabetical order. */
   NameDesc = 'name_desc',
+  /** Sort by orders, from highest to lowest. */
   OrdersDesc = 'orders_desc',
+  /** Sort by price, from lowest to highest. */
   PriceAsc = 'price_asc',
+  /** Sort by price, from highest to lowest. */
   PriceDesc = 'price_desc',
+  /** Sort by release date, from  highest to lowest. */
   ReleaseDesc = 'release_desc',
+  /** Sort by product score, from highest to lowest. */
   ScoreDesc = 'score_desc'
 };
 
-/** Status used to indicate type of message. For instance, in shopping cart messages. */
+/** Status used to indicate a message type. For instance, a shopping cart informative or error message. */
 export const enum StoreStatus {
   Error = 'ERROR',
   Info = 'INFO',

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

@@ -1,5 +1,5 @@
-import type { Context, Options } from '../../index'
 import { fetchAPI } from '../fetch'
+import type { Context, Options } from '../../index'
 import type { Brand } from './types/Brand'
 import type { CategoryTree } from './types/CategoryTree'
 import type { OrderForm, OrderFormInputItem } from './types/OrderForm'

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

@@ -6,7 +6,7 @@ export interface CollectionPageType {
   url: string
   title: string
   metaTagDescription: string
-  pageType: 'Brand' | 'Category' | 'Department' | 'Subcategory'
+  pageType: 'Brand' | 'Category' | 'Department' | 'Subcategory' | 'Product'
 }
 
 export interface FallbackPageType {

package/src/platforms/vtex/index.ts

@@ -77,16 +77,18 @@ const Resolvers = {
   Mutation,
 }
 
-export const getContextFactory = (options: Options) => (ctx: any): Context => {
-  ctx.storage = {
-    channel: ChannelMarshal.parse(options.channel),
-    flags: options.flags ?? {},
-    locale: options.locale,
-  }
-  ctx.clients = getClients(options, ctx)
-  ctx.loaders = getLoaders(options, ctx)
+export const getContextFactory =
+  (options: Options) =>
+  (ctx: any): Context => {
+    ctx.storage = {
+      channel: ChannelMarshal.parse(options.channel),
+      flags: options.flags ?? {},
+      locale: options.locale,
+    }
+    ctx.clients = getClients(options, ctx)
+    ctx.loaders = getLoaders(options, ctx)
 
-  return ctx
-}
+    return ctx
+  }
 
 export const getResolvers = (_: Options) => Resolvers

package/src/platforms/vtex/loaders/sku.ts

@@ -1,26 +1,13 @@
 import DataLoader from 'dataloader'
 
 import { enhanceSku } from '../utils/enhanceSku'
-import { BadRequestError, NotFoundError } from '../../errors'
+import { NotFoundError } from '../../errors'
 import type { EnhancedSku } from '../utils/enhanceSku'
 import type { Options } from '..'
 import type { Clients } from '../clients'
-import type { SelectedFacet } from '../utils/facets'
 
 export const getSkuLoader = (_: Options, clients: Clients) => {
-  const loader = async (facetsList: readonly SelectedFacet[][]) => {
-    const skuIds = facetsList.map((facets) => {
-      const maybeFacet = facets.find(({ key }) => key === 'id')
-
-      if (!maybeFacet) {
-        throw new BadRequestError(
-          'Error while loading SKU. Needs to pass an id to selected facets'
-        )
-      }
-
-      return maybeFacet.value
-    })
-
+  const loader = async (skuIds: readonly string[]) => {
     const { products } = await clients.search.products({
       query: `sku:${skuIds.join(';')}`,
       page: 0,
@@ -47,7 +34,7 @@ export const getSkuLoader = (_: Options, clients: Clients) => {
     return skus
   }
 
-  return new DataLoader<SelectedFacet[], EnhancedSku>(loader, {
+  return new DataLoader<string, EnhancedSku>(loader, {
     maxBatchSize: 99, // Max allowed batch size of Search API
   })
 }

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

@@ -11,7 +11,7 @@ import type { ArrayElementType } from '../../../typings'
 import type { EnhancedSku } from '../utils/enhanceSku'
 import type { OrderFormItem } from '../clients/commerce/types/OrderForm'
 
-type OrderFormProduct = OrderFormItem & { product: Promise<EnhancedSku> }
+type OrderFormProduct = OrderFormItem & { product: EnhancedSku }
 type SearchProduct = ArrayElementType<
   ReturnType<typeof StoreAggregateOffer.offers>
 >
@@ -96,13 +96,16 @@ export const StoreOffer: Record<string, Resolver<Root>> = {
 
     return null
   },
-  itemOffered: async (root) => {
+  itemOffered: (root) => {
     if (isSearchItem(root)) {
       return root.product
     }
 
     if (isOrderFormItem(root)) {
-      return { ...(await root.product), attachmentsValues: root.attachments }
+      return {
+        ...root.product,
+        attachmentsValues: root.attachments,
+      }
     }
 
     return null

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

@@ -1,3 +1,4 @@
+import { canonicalFromProduct } from '../utils/canonical'
 import { enhanceCommercialOffer } from '../utils/enhanceCommercialOffer'
 import { bestOfferFirst } from '../utils/productStock'
 import { slugify } from '../utils/slugify'
@@ -41,9 +42,10 @@ export const StoreProduct: Record<string, Resolver<Root>> & {
   name: ({ isVariantOf, name }) => name ?? isVariantOf.productName,
   slug: ({ isVariantOf: { linkText }, itemId }) => getSlug(linkText, itemId),
   description: ({ isVariantOf: { description } }) => description,
-  seo: ({ isVariantOf: { description, productName } }) => ({
-    title: productName,
-    description,
+  seo: ({ isVariantOf }) => ({
+    title: isVariantOf.productName,
+    description: isVariantOf.description,
+    canonical: canonicalFromProduct(isVariantOf),
   }),
   brand: ({ isVariantOf: { brand } }) => ({ name: brand }),
   breadcrumbList: ({
@@ -85,7 +87,7 @@ export const StoreProduct: Record<string, Resolver<Root>> & {
   aggregateRating: () => ({}),
   offers: (root) =>
     root.sellers
-      .flatMap((seller) =>
+      .map((seller) =>
         enhanceCommercialOffer({
           offer: seller.commertialOffer,
           seller,

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

@@ -1,8 +1,11 @@
+import { NotFoundError, BadRequestError } from '../../errors'
 import { mutateChannelContext, mutateLocaleContext } from '../utils/contex'
 import { enhanceSku } from '../utils/enhanceSku'
 import {
   findChannel,
   findLocale,
+  findSkuId,
+  findSlug,
   transformSelectedFacet,
 } from '../utils/facets'
 import { SORT_MAP } from '../utils/sort'
@@ -16,12 +19,15 @@ import type {
 } from '../../../__generated__/schema'
 import type { CategoryTree } from '../clients/commerce/types/CategoryTree'
 import type { Context } from '../index'
+import { isValidSkuId, pickBestSku } from '../utils/sku'
 
 export const Query = {
   product: async (_: unknown, { locator }: QueryProductArgs, ctx: Context) => {
     // Insert channel in context for later usage
     const channel = findChannel(locator)
     const locale = findLocale(locator)
+    const id = findSkuId(locator)
+    const slug = findSlug(locator)
 
     if (channel) {
       mutateChannelContext(ctx, channel)
@@ -33,9 +39,46 @@ export const Query = {
 
     const {
       loaders: { skuLoader },
+      clients: { commerce, search },
     } = ctx
 
-    return skuLoader.load(locator)
+    try {
+      const skuId = id ?? slug?.split('-').pop() ?? ''
+
+      if (!isValidSkuId(skuId)) {
+        throw new Error('Invalid SkuId')
+      }
+
+      const sku = await skuLoader.load(skuId)
+
+      return sku
+    } catch (err) {
+      if (slug == null) {
+        throw new BadRequestError('Missing slug or id')
+      }
+
+      const route = await commerce.catalog.portal.pagetype(`${slug}/p`)
+
+      if (route.pageType !== 'Product' || !route.id) {
+        throw new NotFoundError(`No product found for slug ${slug}`)
+      }
+
+      const {
+        products: [product],
+      } = await search.products({
+        page: 0,
+        count: 1,
+        query: `product:${route.id}`,
+      })
+
+      if (!product) {
+        throw new NotFoundError(`No product found for id ${route.id}`)
+      }
+
+      const sku = pickBestSku(product.items)
+
+      return enhanceSku(sku, product)
+    }
   },
   collection: (_: unknown, { slug }: QueryCollectionArgs, ctx: Context) => {
     const {