@scayle/storefront-core 7.65.4 → 7.65.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @scayle/storefront-core
 
+## 7.65.6
+
+### Patch Changes
+
+- Resolved an issue where the `cache` value from parameters was being unintentionally overwritten by the default value for `getProductsByCategory` rpc.
+
+## 7.65.5
+
+### Patch Changes
+
+- Support passing an internal access header
+- Make `getProductsCount`, `getFilters` and `getProductsByCategory` RPC methods handle their parameters consistently
+  **Dependencies**
+
+- Updated dependency to @scayle/storefront-api@17.8.0
+
 ## 7.65.4
 
 ### Patch Changes

package/dist/api/customer.cjs

@@ -10,15 +10,20 @@ var _oauth = require("./oauth.cjs");
 class CustomerAPIClient {
   baseURL;
   context;
+  additionalHeaders;
   constructor(context) {
     this.baseURL = context.checkout.url;
     this.context = context;
+    this.additionalHeaders = context.internalAccessHeader ? {
+      "x-internal-access": context.internalAccessHeader
+    } : {};
   }
   get headers() {
     return {
       Authorization: `Bearer ${this.context.accessToken}`,
       Accept: "application/json",
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      ...this.additionalHeaders
     };
   }
   async sendRequest(request, retry = true) {

package/dist/api/customer.d.ts

@@ -37,6 +37,7 @@ interface PasswordUpdate {
 export declare class CustomerAPIClient {
     baseURL: string;
     context: RpcContext;
+    private additionalHeaders;
     constructor(context: RpcContext);
     get headers(): HeadersInit;
     sendRequest<BodyType>(request: () => Promise<Response>, retry?: boolean): Promise<BodyType>;

package/dist/api/customer.mjs

@@ -4,15 +4,18 @@ import { getOAuthClient } from "./oauth.mjs";
 export class CustomerAPIClient {
   baseURL;
   context;
+  additionalHeaders;
   constructor(context) {
     this.baseURL = context.checkout.url;
     this.context = context;
+    this.additionalHeaders = context.internalAccessHeader ? { "x-internal-access": context.internalAccessHeader } : {};
   }
   get headers() {
     return {
       Authorization: `Bearer ${this.context.accessToken}`,
       Accept: "application/json",
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      ...this.additionalHeaders
     };
   }
   async sendRequest(request, retry = true) {

package/dist/api/oauth.cjs

@@ -33,10 +33,14 @@ function getOAuthClient(context) {
   const clientId = context.oauth.clientId;
   const clientSecret = context.oauth.clientSecret;
   const apiHost = context.oauth.apiHost;
+  const accessHeader = context.internalAccessHeader;
   return new OAuthClient({
     clientId,
     clientSecret,
-    apiHost
+    apiHost,
+    additionalHeaders: accessHeader ? {
+      "x-internal-access": accessHeader
+    } : {}
   }, context.log);
 }
 class OAuthClient {
@@ -48,7 +52,8 @@ class OAuthClient {
     const {
       clientId,
       clientSecret,
-      apiHost
+      apiHost,
+      additionalHeaders
     } = options;
     if (!clientId || !clientSecret) {
       throw new MissingCredentialsError();
@@ -60,7 +65,8 @@ class OAuthClient {
     this.headers = {
       Authorization: `Basic ${basicAuthHash}`,
       Accept: "application/json",
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      ...additionalHeaders
     };
   }
   /**

package/dist/api/oauth.d.ts

@@ -5,6 +5,7 @@ export interface OAuthOptions {
     clientId: string;
     clientSecret: string;
     apiHost: string;
+    additionalHeaders?: HeadersInit;
 }
 export declare function getOAuthClient(context: RpcContext): OAuthClient;
 /**

package/dist/api/oauth.mjs

@@ -26,7 +26,13 @@ export function getOAuthClient(context) {
   const clientId = context.oauth.clientId;
   const clientSecret = context.oauth.clientSecret;
   const apiHost = context.oauth.apiHost;
-  return new OAuthClient({ clientId, clientSecret, apiHost }, context.log);
+  const accessHeader = context.internalAccessHeader;
+  return new OAuthClient({
+    clientId,
+    clientSecret,
+    apiHost,
+    additionalHeaders: accessHeader ? { "x-internal-access": accessHeader } : {}
+  }, context.log);
 }
 export class OAuthClient {
   headers;
@@ -34,7 +40,7 @@ export class OAuthClient {
   logger;
   clientId;
   constructor(options, logger) {
-    const { clientId, clientSecret, apiHost } = options;
+    const { clientId, clientSecret, apiHost, additionalHeaders } = options;
     if (!clientId || !clientSecret) {
       throw new MissingCredentialsError();
     }
@@ -45,7 +51,8 @@ export class OAuthClient {
     this.headers = {
       Authorization: `Basic ${basicAuthHash}`,
       Accept: "application/json",
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      ...additionalHeaders
     };
   }
   /**

package/dist/bapi/init.cjs

@@ -12,7 +12,8 @@ const init = config => {
     auth: {
       type: config.authentication,
       token: config.token
-    }
+    },
+    additionalHeaders: config.additionalHeaders
   });
 };
 exports.init = init;

package/dist/bapi/init.d.ts

@@ -4,6 +4,7 @@ interface StorefrontAPIConfig {
     shopId: number;
     authentication: 'token';
     token: string;
+    additionalHeaders: HeadersInit;
 }
 /**
  * Create a new Storefront API Client.

package/dist/bapi/init.mjs

@@ -6,6 +6,7 @@ export const init = (config) => {
     auth: {
       type: config.authentication,
       token: config.token
-    }
+    },
+    additionalHeaders: config.additionalHeaders
   });
 };

package/dist/helpers/filterHelper.cjs

@@ -109,7 +109,9 @@ exports.getActiveFilters = getActiveFilters;
 const groupFiltersByKey = filters => {
   const groupedFilters = filters.reduce((acc, item) => {
     const groupId = item.key;
-    if (!acc[groupId]) acc[groupId] = [];
+    if (!acc[groupId]) {
+      acc[groupId] = [];
+    }
     acc[groupId].push(item);
     return acc;
   }, {});

package/dist/helpers/filterHelper.mjs

@@ -97,7 +97,9 @@ export const getActiveFilters = (filters, activeFilters) => {
 export const groupFiltersByKey = (filters) => {
   const groupedFilters = filters.reduce((acc, item) => {
     const groupId = item.key;
-    if (!acc[groupId]) acc[groupId] = [];
+    if (!acc[groupId]) {
+      acc[groupId] = [];
+    }
     acc[groupId].push(item);
     return acc;
   }, {});

package/dist/rpc/methods/checkout/checkout.cjs

@@ -37,7 +37,7 @@ const getCheckoutToken = exports.getCheckoutToken = async function getCheckoutTo
     carrier,
     basketId: context.basketKey,
     campaignKey: context.campaignKey
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.65.4"}`).setProtectedHeader({
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.65.6"}`).setProtectedHeader({
     alg: "HS256",
     typ: "JWT"
   }).sign(secret);

package/dist/rpc/methods/checkout/checkout.mjs

@@ -35,7 +35,7 @@ export const getCheckoutToken = async function getCheckoutToken2(jwtPayload = {}
     carrier,
     basketId: context.basketKey,
     campaignKey: context.campaignKey
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.65.4"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.65.6"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

package/dist/rpc/methods/index.cjs

@@ -3,9 +3,61 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  getProductById: true,
+  getProductsByIds: true,
+  getProductsByReferenceKeys: true,
+  getProductsCount: true,
+  fetchAllFiltersForCategory: true,
+  getFilters: true,
+  getProductsByCategory: true
+};
+Object.defineProperty(exports, "fetchAllFiltersForCategory", {
+  enumerable: true,
+  get: function () {
+    return _products.fetchAllFiltersForCategory;
+  }
+});
+Object.defineProperty(exports, "getFilters", {
+  enumerable: true,
+  get: function () {
+    return _products.getFilters;
+  }
+});
+Object.defineProperty(exports, "getProductById", {
+  enumerable: true,
+  get: function () {
+    return _products.getProductById;
+  }
+});
+Object.defineProperty(exports, "getProductsByCategory", {
+  enumerable: true,
+  get: function () {
+    return _products.getProductsByCategory;
+  }
+});
+Object.defineProperty(exports, "getProductsByIds", {
+  enumerable: true,
+  get: function () {
+    return _products.getProductsByIds;
+  }
+});
+Object.defineProperty(exports, "getProductsByReferenceKeys", {
+  enumerable: true,
+  get: function () {
+    return _products.getProductsByReferenceKeys;
+  }
+});
+Object.defineProperty(exports, "getProductsCount", {
+  enumerable: true,
+  get: function () {
+    return _products.getProductsCount;
+  }
+});
 var _basket = require("./basket/basket.cjs");
 Object.keys(_basket).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _basket[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -17,6 +69,7 @@ Object.keys(_basket).forEach(function (key) {
 var _brands = require("./brands.cjs");
 Object.keys(_brands).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _brands[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -28,6 +81,7 @@ Object.keys(_brands).forEach(function (key) {
 var _categories = require("./categories.cjs");
 Object.keys(_categories).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _categories[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -39,6 +93,7 @@ Object.keys(_categories).forEach(function (key) {
 var _cbd = require("./cbd.cjs");
 Object.keys(_cbd).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _cbd[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -48,19 +103,10 @@ Object.keys(_cbd).forEach(function (key) {
   });
 });
 var _products = require("./products.cjs");
-Object.keys(_products).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _products[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _products[key];
-    }
-  });
-});
 var _search = require("./search.cjs");
 Object.keys(_search).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _search[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -72,6 +118,7 @@ Object.keys(_search).forEach(function (key) {
 var _shopConfiguration = require("./shopConfiguration.cjs");
 Object.keys(_shopConfiguration).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _shopConfiguration[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -83,6 +130,7 @@ Object.keys(_shopConfiguration).forEach(function (key) {
 var _user = require("./user.cjs");
 Object.keys(_user).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _user[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -94,6 +142,7 @@ Object.keys(_user).forEach(function (key) {
 var _wishlist = require("./wishlist.cjs");
 Object.keys(_wishlist).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _wishlist[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -105,6 +154,7 @@ Object.keys(_wishlist).forEach(function (key) {
 var _checkout = require("./checkout/index.cjs");
 Object.keys(_checkout).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _checkout[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -116,6 +166,7 @@ Object.keys(_checkout).forEach(function (key) {
 var _variants = require("./variants.cjs");
 Object.keys(_variants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _variants[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -127,6 +178,7 @@ Object.keys(_variants).forEach(function (key) {
 var _navigationTrees = require("./navigationTrees.cjs");
 Object.keys(_navigationTrees).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _navigationTrees[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -138,6 +190,7 @@ Object.keys(_navigationTrees).forEach(function (key) {
 var _session = require("./session.cjs");
 Object.keys(_session).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _session[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -149,6 +202,7 @@ Object.keys(_session).forEach(function (key) {
 var _promotion = require("./promotion.cjs");
 Object.keys(_promotion).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _promotion[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -160,6 +214,7 @@ Object.keys(_promotion).forEach(function (key) {
 var _idp = require("./oauth/idp.cjs");
 Object.keys(_idp).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _idp[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,

package/dist/rpc/methods/index.d.ts

@@ -2,7 +2,7 @@ export * from './basket/basket';
 export * from './brands';
 export * from './categories';
 export * from './cbd';
-export * from './products';
+export { getProductById, getProductsByIds, getProductsByReferenceKeys, getProductsCount, fetchAllFiltersForCategory, getFilters, getProductsByCategory, } from './products';
 export * from './search';
 export * from './shopConfiguration';
 export * from './user';

package/dist/rpc/methods/index.mjs

@@ -2,7 +2,15 @@ export * from "./basket/basket.mjs";
 export * from "./brands.mjs";
 export * from "./categories.mjs";
 export * from "./cbd.mjs";
-export * from "./products.mjs";
+export {
+  getProductById,
+  getProductsByIds,
+  getProductsByReferenceKeys,
+  getProductsCount,
+  fetchAllFiltersForCategory,
+  getFilters,
+  getProductsByCategory
+} from "./products.mjs";
 export * from "./search.mjs";
 export * from "./shopConfiguration.mjs";
 export * from "./user.mjs";

package/dist/rpc/methods/products.cjs

@@ -90,6 +90,7 @@ const getProductsByReferenceKeys = exports.getProductsByReferenceKeys = async fu
 };
 const getProductsCount = exports.getProductsCount = async function getProductsCount2(params, context) {
   const {
+    includedFilters,
     where = void 0,
     includeSoldOut = false,
     includeSellableForFree = false,
@@ -103,6 +104,11 @@ const getProductsCount = exports.getProductsCount = async function getProductsCo
   const {
     categoryId
   } = await resolveCategoryIdFromParams(context, params);
+  const response = await getSanitizedAttributes(context, categoryId, where?.attributes || [], includedFilters);
+  if (response instanceof _errors.ErrorResponse) {
+    return response;
+  }
+  const sanitizedAttributes = response;
   const productCount = await cached(bapiClient.products.query, {
     ttl: 15 * _cache.MINUTE,
     cacheKeyPrefix: "products-query"
@@ -111,15 +117,16 @@ const getProductsCount = exports.getProductsCount = async function getProductsCo
       categoryId,
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
-      attributes: where?.attributes,
-      term: where?.term
+      term: where?.term,
+      attributes: [...sanitizedAttributes, ...(where?.whitelistAttributes || [])],
+      disableFuzziness: where?.disableFuzziness
     },
-    includeSoldOut,
-    includeSellableForFree,
-    campaignKey,
     pagination: {
       perPage: 1
     },
+    campaignKey,
+    includeSellableForFree,
+    includeSoldOut,
     orFiltersOperator
   });
   return {
@@ -150,6 +157,23 @@ const fetchAllFiltersForCategory = exports.fetchAllFiltersForCategory = async fu
     cacheKey: `filters-for-category-${category.id}`
   })();
 };
+async function getSanitizedAttributes(context, categoryId, attributes, includedFilters) {
+  const response = await fetchAllFiltersForCategory({
+    category: {
+      id: categoryId
+    },
+    includedFilters
+  }, context);
+  if (response instanceof _errors.ErrorResponse) {
+    return response;
+  }
+  const allFiltersForCategory = await (0, _response.unwrap)(response);
+  return sanitizeAttributesForBAPI({
+    attributes: attributes || [],
+    filterKeys: allFiltersForCategory,
+    includedFilters
+  });
+}
 const getFilters = exports.getFilters = async function getFilters2(params, context) {
   const {
     includedFilters,
@@ -167,21 +191,11 @@ const getFilters = exports.getFilters = async function getFilters2(params, conte
     category,
     categoryId
   } = await resolveCategoryIdFromParams(context, params);
-  const response = await fetchAllFiltersForCategory({
-    category: {
-      id: categoryId
-    },
-    includedFilters
-  }, context);
+  const response = await getSanitizedAttributes(context, categoryId, where?.attributes || [], includedFilters);
   if (response instanceof _errors.ErrorResponse) {
     return response;
   }
-  const allFiltersForCategory = await (0, _response.unwrap)(response);
-  const sanitizedAttributes = sanitizeAttributesForBAPI({
-    attributes: where?.attributes || [],
-    filterKeys: allFiltersForCategory,
-    includedFilters
-  });
+  const sanitizedAttributes = response;
   const [filters, productCount] = await Promise.all([cached(bapiClient.filters.get, {
     cacheKeyPrefix: `get-filters-${categoryId}`
   })({
@@ -206,14 +220,15 @@ const getFilters = exports.getFilters = async function getFilters2(params, conte
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
       term: where?.term,
-      attributes: [...sanitizedAttributes, ...(where?.whitelistAttributes || [])]
+      attributes: [...sanitizedAttributes, ...(where?.whitelistAttributes || [])],
+      disableFuzziness: where?.disableFuzziness
     },
-    includeSoldOut,
-    includeSellableForFree,
-    campaignKey,
     pagination: {
       perPage: 1
     },
+    campaignKey,
+    includeSellableForFree,
+    includeSoldOut,
     orFiltersOperator
   })]);
   return {
@@ -223,6 +238,7 @@ const getFilters = exports.getFilters = async function getFilters2(params, conte
 };
 const getProductsByCategory = exports.getProductsByCategory = async function getProductsByCategory2(params, context) {
   const {
+    includedFilters,
     cache,
     with: _with,
     perPage = 20,
@@ -243,32 +259,24 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
     category,
     categoryId
   } = await resolveCategoryIdFromParams(context, params);
-  const response = await fetchAllFiltersForCategory({
-    category: {
-      id: categoryId
-    }
-  }, context);
+  const response = await getSanitizedAttributes(context, categoryId, where?.attributes || [], includedFilters);
   if (response instanceof _errors.ErrorResponse) {
     return response;
   }
-  const allFiltersForCategory = await (0, _response.unwrap)(response);
-  const sanitizedAttributes = sanitizeAttributesForBAPI({
-    attributes: where?.attributes || [],
-    filterKeys: allFiltersForCategory
-  });
+  const sanitizedAttributes = response;
   const {
     entities: products,
     pagination
   } = await cached(bapiClient.products.query, {
     ...cache,
-    ttl: 15 * _cache.MINUTE,
-    cacheKeyPrefix: `products-query-category-${category === "/" ? "root" : categoryId}`
+    ttl: cache?.ttl ?? 15 * _cache.MINUTE,
+    cacheKeyPrefix: cache?.cacheKeyPrefix || `products-query-category-${category === "/" ? "root" : categoryId}`
   })({
     where: {
-      term: where?.term,
       categoryId,
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
+      term: where?.term,
       attributes: [...sanitizedAttributes, ...(where?.whitelistAttributes || [])],
       disableFuzziness: where?.disableFuzziness
     },
@@ -277,12 +285,12 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
       page
     },
     campaignKey,
-    pricePromotionKey,
     includeSellableForFree,
     includeSoldOut,
+    orFiltersOperator,
+    pricePromotionKey,
     with: _with ?? context.withParams?.product ?? _constants.MIN_WITH_PARAMS_PRODUCT,
-    sort,
-    orFiltersOperator
+    sort
   });
   return {
     products,

package/dist/rpc/methods/products.d.ts

@@ -23,7 +23,7 @@ export declare function resolveCategoryIdFromParams(context: RpcContext, params:
 export declare const getProductById: (options: FetchProductParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product>;
 export declare const getProductsByIds: (options: FetchProductsByIdsParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product[]>;
 export declare const getProductsByReferenceKeys: (options: FetchProductsByReferenceKeysParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product[]>;
-export declare const getProductsCount: (params: FetchProductsCountParams, context: RpcContext) => Promise<{
+export declare const getProductsCount: (params: FetchProductsCountParams, context: RpcContext) => Promise<(string[] & ErrorResponse) | {
     count: number;
 }>;
 export declare const fetchAllFiltersForCategory: ({ includedFilters, category }: {

package/dist/rpc/methods/products.mjs

@@ -66,6 +66,7 @@ export const getProductsByReferenceKeys = async function getProductsByReferenceK
 };
 export const getProductsCount = async function getProductsCount2(params, context) {
   const {
+    includedFilters,
     where = void 0,
     includeSoldOut = false,
     includeSellableForFree = false,
@@ -73,6 +74,16 @@ export const getProductsCount = async function getProductsCount2(params, context
   } = params;
   const { cached, bapiClient, campaignKey } = context;
   const { categoryId } = await resolveCategoryIdFromParams(context, params);
+  const response = await getSanitizedAttributes(
+    context,
+    categoryId,
+    where?.attributes || [],
+    includedFilters
+  );
+  if (response instanceof ErrorResponse) {
+    return response;
+  }
+  const sanitizedAttributes = response;
   const productCount = await cached(bapiClient.products.query, {
     ttl: 15 * MINUTE,
     cacheKeyPrefix: "products-query"
@@ -81,15 +92,19 @@ export const getProductsCount = async function getProductsCount2(params, context
       categoryId,
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
-      attributes: where?.attributes,
-      term: where?.term
+      term: where?.term,
+      attributes: [
+        ...sanitizedAttributes,
+        ...where?.whitelistAttributes || []
+      ],
+      disableFuzziness: where?.disableFuzziness
     },
-    includeSoldOut,
-    includeSellableForFree,
-    campaignKey,
     pagination: {
       perPage: 1
     },
+    campaignKey,
+    includeSellableForFree,
+    includeSoldOut,
     orFiltersOperator
   });
   return {
@@ -111,6 +126,24 @@ export const fetchAllFiltersForCategory = async function fetchAllFiltersForCateg
     cacheKey: `filters-for-category-${category.id}`
   })();
 };
+async function getSanitizedAttributes(context, categoryId, attributes, includedFilters) {
+  const response = await fetchAllFiltersForCategory(
+    {
+      category: { id: categoryId },
+      includedFilters
+    },
+    context
+  );
+  if (response instanceof ErrorResponse) {
+    return response;
+  }
+  const allFiltersForCategory = await unwrap(response);
+  return sanitizeAttributesForBAPI({
+    attributes: attributes || [],
+    filterKeys: allFiltersForCategory,
+    includedFilters
+  });
+}
 export const getFilters = async function getFilters2(params, context) {
   const {
     includedFilters,
@@ -124,22 +157,16 @@ export const getFilters = async function getFilters2(params, context) {
     context,
     params
   );
-  const response = await fetchAllFiltersForCategory(
-    {
-      category: { id: categoryId },
-      includedFilters
-    },
-    context
+  const response = await getSanitizedAttributes(
+    context,
+    categoryId,
+    where?.attributes || [],
+    includedFilters
   );
   if (response instanceof ErrorResponse) {
     return response;
   }
-  const allFiltersForCategory = await unwrap(response);
-  const sanitizedAttributes = sanitizeAttributesForBAPI({
-    attributes: where?.attributes || [],
-    filterKeys: allFiltersForCategory,
-    includedFilters
-  });
+  const sanitizedAttributes = response;
   const [filters, productCount] = await Promise.all([
     cached(bapiClient.filters.get, {
       cacheKeyPrefix: `get-filters-${categoryId}`
@@ -172,14 +199,15 @@ export const getFilters = async function getFilters2(params, context) {
         attributes: [
           ...sanitizedAttributes,
           ...where?.whitelistAttributes || []
-        ]
+        ],
+        disableFuzziness: where?.disableFuzziness
       },
-      includeSoldOut,
-      includeSellableForFree,
-      campaignKey,
       pagination: {
         perPage: 1
       },
+      campaignKey,
+      includeSellableForFree,
+      includeSoldOut,
       orFiltersOperator
     })
   ]);
@@ -190,6 +218,7 @@ export const getFilters = async function getFilters2(params, context) {
 };
 export const getProductsByCategory = async function getProductsByCategory2(params, context) {
   const {
+    includedFilters,
     cache,
     with: _with,
     perPage = 20,
@@ -206,35 +235,29 @@ export const getProductsByCategory = async function getProductsByCategory2(param
     context,
     params
   );
-  const response = await fetchAllFiltersForCategory(
-    {
-      category: {
-        id: categoryId
-      }
-    },
-    context
+  const response = await getSanitizedAttributes(
+    context,
+    categoryId,
+    where?.attributes || [],
+    includedFilters
   );
   if (response instanceof ErrorResponse) {
     return response;
   }
-  const allFiltersForCategory = await unwrap(response);
-  const sanitizedAttributes = sanitizeAttributesForBAPI({
-    attributes: where?.attributes || [],
-    filterKeys: allFiltersForCategory
-  });
+  const sanitizedAttributes = response;
   const { entities: products, pagination } = await cached(
     bapiClient.products.query,
     {
       ...cache,
-      ttl: 15 * MINUTE,
-      cacheKeyPrefix: `products-query-category-${category === "/" ? "root" : categoryId}`
+      ttl: cache?.ttl ?? 15 * MINUTE,
+      cacheKeyPrefix: cache?.cacheKeyPrefix || `products-query-category-${category === "/" ? "root" : categoryId}`
     }
   )({
     where: {
-      term: where?.term,
       categoryId,
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
+      term: where?.term,
       attributes: [
         ...sanitizedAttributes,
         ...where?.whitelistAttributes || []
@@ -246,12 +269,12 @@ export const getProductsByCategory = async function getProductsByCategory2(param
       page
     },
     campaignKey,
-    pricePromotionKey,
     includeSellableForFree,
     includeSoldOut,
+    orFiltersOperator,
+    pricePromotionKey,
     with: _with ?? context.withParams?.product ?? MIN_WITH_PARAMS_PRODUCT,
-    sort,
-    orFiltersOperator
+    sort
   });
   return {
     products,

package/dist/types/api/context.d.ts

@@ -107,6 +107,7 @@ export type RpcContext = {
     runtimeConfiguration: RuntimeConfiguration;
     idp?: IDPConfig;
     headers: Headers;
+    internalAccessHeader?: string;
     callHook?: Hookable<StorefrontHooks>['callHook'];
     callHookParallel?: Hookable<StorefrontHooks>['callHookParallel'];
     callHookWith?: Hookable<StorefrontHooks>['callHookWith'];

package/dist/types/bapi/filter.d.ts

@@ -22,6 +22,7 @@ export type FetchFiltersParams = {
         minPrice?: ProductSearchQuery['minPrice'];
         maxPrice?: ProductSearchQuery['maxPrice'];
         attributes?: ProductSearchQuery['attributes'];
+        disableFuzziness?: ProductSearchQuery['disableFuzziness'];
         whitelistAttributes?: ProductSearchQuery['attributes'];
     };
     includeSoldOut?: boolean;

package/dist/types/bapi/product.d.ts

@@ -79,7 +79,10 @@ export type FetchProductsCountParams = {
         minPrice?: ProductSearchQuery['minPrice'];
         maxPrice?: ProductSearchQuery['maxPrice'];
         attributes?: ProductSearchQuery['attributes'];
+        disableFuzziness?: ProductSearchQuery['disableFuzziness'];
+        whitelistAttributes?: ProductSearchQuery['attributes'];
     };
+    includedFilters?: Array<string>;
     includeSoldOut?: boolean;
     includeSellableForFree?: boolean;
     orFiltersOperator?: ProductsSearchEndpointParameters['orFiltersOperator'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.65.4",
+  "version": "7.65.6",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -56,10 +56,10 @@
     "package:lint": "publint",
     "test:watch": "vitest --passWithNoTests",
     "test": "vitest --run --passWithNoTests",
-    "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit"
+    "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit --outputFile=./junit.xml"
   },
   "dependencies": {
-    "@scayle/storefront-api": "17.7.0",
+    "@scayle/storefront-api": "17.8.0",
     "crypto-js": "^4.2.0",
     "hookable": "^5.5.3",
     "jose": "^5.6.3",
@@ -69,21 +69,21 @@
     "utility-types": "^3.11.0"
   },
   "devDependencies": {
-    "@scayle/eslint-config-storefront": "4.3.0",
+    "@scayle/eslint-config-storefront": "4.3.2",
     "@types/crypto-js": "4.2.2",
-    "@types/node": "20.16.6",
+    "@types/node": "20.16.12",
     "@types/webpack-env": "1.18.5",
-    "@vitest/coverage-v8": "2.1.1",
+    "@vitest/coverage-v8": "2.1.3",
     "dprint": "0.47.2",
-    "eslint": "9.11.1",
+    "eslint": "9.12.0",
     "eslint-formatter-gitlab": "5.1.0",
     "publint": "0.2.11",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "unbuild": "2.0.0",
     "unstorage": "1.12.0",
-    "vitest": "2.1.1"
+    "vitest": "2.1.3"
   },
   "optionalDependencies": {
     "redis": "4"