@scayle/storefront-core 7.63.1 → 7.64.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @scayle/storefront-core
 
+## 7.64.0
+
+### Minor Changes
+
+- Resolve a issue that prevents filters from working as expected on the search page
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-api@17.4.4
+
 ## 7.63.1
 
 ### Patch Changes

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

@@ -33,7 +33,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.63.1"}`).setProtectedHeader({
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.64.0"}`).setProtectedHeader({
     alg: "HS256",
     typ: "JWT"
   }).sign(secret);

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

@@ -27,7 +27,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.63.1"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.64.0"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

package/dist/rpc/methods/products.cjs

@@ -143,7 +143,6 @@ const getFilters = exports.getFilters = async function getFilters2({
   orFiltersOperator
 }, context) {
   let result;
-  let allFiltersForCategory = [];
   const {
     cached,
     bapiClient,
@@ -153,18 +152,18 @@ const getFilters = exports.getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
-    const response = await fetchAllFiltersForCategory({
-      category: {
-        id: result.id,
-        slug: category
-      },
-      includedFilters
-    }, context);
-    if (response instanceof _errors.ErrorResponse) {
-      return response;
-    }
-    allFiltersForCategory = await (0, _response.unwrap)(response);
   }
+  const response = await fetchAllFiltersForCategory({
+    category: {
+      id: result?.id,
+      slug: category
+    },
+    includedFilters
+  }, context);
+  if (response instanceof _errors.ErrorResponse) {
+    return response;
+  }
+  const allFiltersForCategory = await (0, _response.unwrap)(response);
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],
     filterKeys: allFiltersForCategory,
@@ -232,18 +231,20 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
   }
-  const getFiltersResponse = getFilters({
-    category,
-    includeSoldOut,
-    where,
-    includeSellableForFree
+  const response = await fetchAllFiltersForCategory({
+    category: {
+      id: result?.id,
+      slug: category
+    }
   }, context);
-  if (getFiltersResponse instanceof _errors.ErrorResponse) {
-    return getFiltersResponse;
+  if (response instanceof _errors.ErrorResponse) {
+    return response;
   }
-  const {
-    filters
-  } = await (0, _response.unwrap)(getFiltersResponse);
+  const allFiltersForCategory = await (0, _response.unwrap)(response);
+  const sanitizedAttributes = sanitizeAttributesForBAPI({
+    attributes: where?.attributes || [],
+    filterKeys: allFiltersForCategory
+  });
   const {
     entities: products,
     pagination
@@ -257,10 +258,7 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
       categoryId: result?.id,
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
-      attributes: [...sanitizeAttributesForBAPI({
-        attributes: where?.attributes || [],
-        filterKeys: mapFiltersToSlugs(filters)
-      }), ...(where?.whitelistAttributes || [])],
+      attributes: [...sanitizedAttributes, ...(where?.whitelistAttributes || [])],
       disableFuzziness: where?.disableFuzziness
     },
     pagination: {

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

@@ -11,14 +11,14 @@ export declare const fetchAllFiltersForCategory: ({ includedFilters, category }:
     includedFilters?: string[];
     category: {
         slug: string;
-        id: number;
+        id?: number;
     };
 }, { cached, bapiClient, campaignKey }: RpcContext) => Promise<string[]>;
 export declare const getFilters: ({ category, includedFilters, where, includeSoldOut, includeSellableForFree, orFiltersOperator, }: FetchFiltersParams, context: RpcContext) => Promise<(string[] & ErrorResponse) | {
     filters: FiltersEndpointResponseData;
     unfilteredCount: number;
 }>;
-export declare const getProductsByCategory: ({ category, cache, with: _with, perPage, page, where, sort, pricePromotionKey, includeSellableForFree, includeSoldOut, orFiltersOperator, }: FetchProductsByCategoryParams, context: RpcContext) => Promise<ErrorResponse | {
+export declare const getProductsByCategory: ({ category, cache, with: _with, perPage, page, where, sort, pricePromotionKey, includeSellableForFree, includeSoldOut, orFiltersOperator, }: FetchProductsByCategoryParams, context: RpcContext) => Promise<(string[] & ErrorResponse) | {
     products: Product[];
     pagination: {
         current: number;

package/dist/rpc/methods/products.mjs

@@ -107,21 +107,20 @@ export const getFilters = async function getFilters2({
   orFiltersOperator
 }, context) {
   let result;
-  let allFiltersForCategory = [];
   const { cached, bapiClient, campaignKey } = context;
   if (category !== "/") {
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
-    const response = await fetchAllFiltersForCategory(
-      { category: { id: result.id, slug: category }, includedFilters },
-      context
-    );
-    if (response instanceof ErrorResponse) {
-      return response;
-    }
-    allFiltersForCategory = await unwrap(response);
   }
+  const response = await fetchAllFiltersForCategory(
+    { category: { id: result?.id, slug: category }, includedFilters },
+    context
+  );
+  if (response instanceof ErrorResponse) {
+    return response;
+  }
+  const allFiltersForCategory = await unwrap(response);
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],
     filterKeys: allFiltersForCategory,
@@ -194,14 +193,18 @@ export const getProductsByCategory = async function getProductsByCategory2({
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
   }
-  const getFiltersResponse = getFilters(
-    { category, includeSoldOut, where, includeSellableForFree },
+  const response = await fetchAllFiltersForCategory(
+    { category: { id: result?.id, slug: category } },
     context
   );
-  if (getFiltersResponse instanceof ErrorResponse) {
-    return getFiltersResponse;
+  if (response instanceof ErrorResponse) {
+    return response;
   }
-  const { filters } = await unwrap(getFiltersResponse);
+  const allFiltersForCategory = await unwrap(response);
+  const sanitizedAttributes = sanitizeAttributesForBAPI({
+    attributes: where?.attributes || [],
+    filterKeys: allFiltersForCategory
+  });
   const { entities: products, pagination } = await cached(
     bapiClient.products.query,
     {
@@ -216,10 +219,7 @@ export const getProductsByCategory = async function getProductsByCategory2({
       minPrice: where?.minPrice,
       maxPrice: where?.maxPrice,
       attributes: [
-        ...sanitizeAttributesForBAPI({
-          attributes: where?.attributes || [],
-          filterKeys: mapFiltersToSlugs(filters)
-        }),
+        ...sanitizedAttributes,
         ...where?.whitelistAttributes || []
       ],
       disableFuzziness: where?.disableFuzziness

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.63.1",
+  "version": "7.64.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -59,7 +59,7 @@
     "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit"
   },
   "dependencies": {
-    "@scayle/storefront-api": "17.4.3",
+    "@scayle/storefront-api": "17.4.4",
     "crypto-js": "^4.2.0",
     "hookable": "^5.5.3",
     "jose": "^5.6.3",