@scayle/storefront-core 8.0.0 → 8.1.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @scayle/storefront-core
 
+## 8.1.0
+
+### Minor Changes
+
+- **RPC Methods:** Propogate SAPI response codes through RPC methods. This addresses an issue introduced in Storefront Core v8 where specific status codes were incorrectly reported as generic 500 errors. The following RPC methods are impacted:
+
+  - `getBrands`
+  - `getBrandById`
+  - `getCategoryByPath`
+  - `getCategoryById`
+  - `getProductById`
+  - `getProductsByIds`
+  - `getProductsByReferenceKeys`
+  - `getPromotions`
+  - `getCurrentPromotions`
+  - `getPromotionsByIds`
+  - `getSearchSuggestions`
+  - `getShopConfiguration`
+  - `getVariantById`
+  - `getWishlist`
+  - `removeItemFromWishlist`
+
 ## 8.0.0
 
 ### Major Changes

package/dist/rpc/methods/brands.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBrands = exports.getBrandById = void 0;
+var _sapi = require("../../utils/sapi.cjs");
 const MAX_PER_PAGE = 100;
 const getBrands = exports.getBrands = async function getBrands2({
   pagination
@@ -11,7 +12,7 @@ const getBrands = exports.getBrands = async function getBrands2({
   sapiClient,
   cached
 }) {
-  return await cached(sapiClient.brands.get, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.brands.get), {
     cacheKeyPrefix: "getBrands"
   })({
     pagination: {
@@ -26,7 +27,7 @@ const getBrandById = exports.getBrandById = async function getBrandById2({
   sapiClient,
   cached
 }) {
-  return await cached(sapiClient.brands.getById, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.brands.getById), {
     cacheKeyPrefix: `getBrandById-${brandId}`
   })(brandId);
 };

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

@@ -1,5 +1,5 @@
 import type { Brand, BrandsEndpointRequestParameters, BrandsEndpointResponseData } from '../../types';
-export declare const getBrands: ({ pagination }: BrandsEndpointRequestParameters, { sapiClient, cached }: import("../../types").RpcContext) => Promise<BrandsEndpointResponseData>;
+export declare const getBrands: ({ pagination }: BrandsEndpointRequestParameters, { sapiClient, cached }: import("../../types").RpcContext) => Promise<Response | BrandsEndpointResponseData>;
 export declare const getBrandById: ({ brandId }: {
     brandId: number;
-}, { sapiClient, cached }: import("../../types").RpcContext) => Promise<Brand>;
+}, { sapiClient, cached }: import("../../types").RpcContext) => Promise<Response | Brand>;

package/dist/rpc/methods/brands.mjs

@@ -1,6 +1,7 @@
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 const MAX_PER_PAGE = 100;
 export const getBrands = async function getBrands2({ pagination }, { sapiClient, cached }) {
-  return await cached(sapiClient.brands.get, {
+  return await cached(mapSAPIFetchErrorToResponse(sapiClient.brands.get), {
     cacheKeyPrefix: "getBrands"
   })({
     pagination: {
@@ -10,7 +11,7 @@ export const getBrands = async function getBrands2({ pagination }, { sapiClient,
   });
 };
 export const getBrandById = async function getBrandById2({ brandId }, { sapiClient, cached }) {
-  return await cached(sapiClient.brands.getById, {
+  return await cached(mapSAPIFetchErrorToResponse(sapiClient.brands.getById), {
     cacheKeyPrefix: `getBrandById-${brandId}`
   })(brandId);
 };

package/dist/rpc/methods/categories.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getRootCategories = exports.getCategoryByPath = exports.getCategoryById = exports.getCategoriesByPath = void 0;
 var _helpers = require("../../helpers/index.cjs");
+var _sapi = require("../../utils/sapi.cjs");
 const getRootCategories = exports.getRootCategories = async function getRootCategories2({
   children = 1,
   includeHidden,
@@ -38,7 +39,7 @@ const getCategoryByPath = exports.getCategoryByPath = async function getCategory
     sapiClient
   } = context;
   const sanitizedPath = (0, _helpers.splitAndRemoveEmpty)(path);
-  return await cached(sapiClient.categories.getByPath, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.categories.getByPath), {
     cacheKeyPrefix: `getByPath-category-${sanitizedPath}`
   })(sanitizedPath, {
     with: {
@@ -115,7 +116,7 @@ const getCategoryById = exports.getCategoryById = async function getCategoryById
     cached,
     sapiClient
   } = context;
-  return await cached(sapiClient.categories.getById, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.categories.getById), {
     cacheKeyPrefix: `getById-categories-${id}`
   })(id, {
     with: {

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

@@ -12,7 +12,7 @@ export declare const getCategoryByPath: ({ path, children, includeHidden, proper
     children?: number;
     includeHidden?: true;
     properties?: ProductCategoryPropertyWith;
-}, context: import("../../types").RpcContext) => Promise<Category>;
+}, context: import("../../types").RpcContext) => Promise<Response | Category>;
 export declare const getCategoriesByPath: ({ path, children, includeHidden, properties }: {
     path: string;
     children?: number;
@@ -30,4 +30,4 @@ export declare const getCategoryById: ({ id, children, includeHidden, properties
     children?: number;
     includeHidden?: true;
     properties?: ProductCategoryPropertyWith;
-}, context: import("../../types").RpcContext) => Promise<Category>;
+}, context: import("../../types").RpcContext) => Promise<Response | Category>;

package/dist/rpc/methods/categories.mjs

@@ -1,4 +1,5 @@
 import { splitAndRemoveEmpty } from "../../helpers/index.mjs";
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 export const getRootCategories = async function getRootCategories2({ children = 1, includeHidden, properties }, { cached, sapiClient }) {
   const result = await cached(sapiClient.categories.getRoots, {
     cacheKeyPrefix: "root-categories"
@@ -14,9 +15,12 @@ export const getRootCategories = async function getRootCategories2({ children =
 export const getCategoryByPath = async function getCategoryByPath2({ path, children = 1, includeHidden, properties }, context) {
   const { cached, sapiClient } = context;
   const sanitizedPath = splitAndRemoveEmpty(path);
-  return await cached(sapiClient.categories.getByPath, {
-    cacheKeyPrefix: `getByPath-category-${sanitizedPath}`
-  })(sanitizedPath, { with: { children, properties }, includeHidden });
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.categories.getByPath),
+    {
+      cacheKeyPrefix: `getByPath-category-${sanitizedPath}`
+    }
+  )(sanitizedPath, { with: { children, properties }, includeHidden });
 };
 export const getCategoriesByPath = async function getCategoriesByPath2({ path, children = 1, includeHidden, properties }, context) {
   const { cached, sapiClient } = context;
@@ -63,9 +67,12 @@ export const getCategoriesByPath = async function getCategoriesByPath2({ path, c
 };
 export const getCategoryById = async function getCategoryById2({ id, children = 1, includeHidden, properties }, context) {
   const { cached, sapiClient } = context;
-  return await cached(sapiClient.categories.getById, {
-    cacheKeyPrefix: `getById-categories-${id}`
-  })(id, {
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.categories.getById),
+    {
+      cacheKeyPrefix: `getById-categories-${id}`
+    }
+  )(id, {
     with: {
       children,
       parents: "all",

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

package/dist/rpc/methods/products.cjs

@@ -9,6 +9,7 @@ var _helpers = require("../../helpers/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _cache = require("../../cache/index.cjs");
 var _response = require("../../utils/response.cjs");
+var _sapi = require("../../utils/sapi.cjs");
 var _errors = require("../../errors/index.cjs");
 const MAX_PER_PAGE = 100;
 const sanitizeAttributesForSAPI = ({
@@ -48,7 +49,7 @@ const getProductById = exports.getProductById = async function getProductById2(o
   campaignKey,
   withParams
 }) {
-  return await cached(sapiClient.products.getById, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.products.getById), {
     cacheKeyPrefix: `getById-product-${options.id}`,
     ttl: 5 * _cache.MINUTE
   })(options.id, {
@@ -64,7 +65,7 @@ const getProductsByIds = exports.getProductsByIds = async function getProductsBy
   campaignKey,
   withParams
 }) {
-  return await cached(sapiClient.products.getByIds, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.products.getByIds), {
     cacheKeyPrefix: "getByIds-products",
     ttl: 5 * _cache.MINUTE
   })(options.ids, {
@@ -79,7 +80,7 @@ const getProductsByReferenceKeys = exports.getProductsByReferenceKeys = async fu
   campaignKey,
   withParams
 }) {
-  return await cached(sapiClient.products.getByReferenceKeys, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.products.getByReferenceKeys), {
     cacheKeyPrefix: "getByReferenceKeys-products",
     ttl: 5 * _cache.MINUTE
   })(options.referenceKeys, {

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

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

package/dist/rpc/methods/products.mjs

@@ -2,6 +2,7 @@ import { splitAndRemoveEmpty } from "../../helpers/index.mjs";
 import { MIN_WITH_PARAMS_PRODUCT } from "../../constants/index.mjs";
 import { MINUTE } from "../../cache/index.mjs";
 import { unwrap } from "../../utils/response.mjs";
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
 const MAX_PER_PAGE = 100;
 const sanitizeAttributesForSAPI = ({
@@ -34,10 +35,13 @@ export async function resolveCategoryIdFromParams(context, params) {
   return { category, categoryId };
 }
 export const getProductById = async function getProductById2(options, { sapiClient, cached, campaignKey, withParams }) {
-  return await cached(sapiClient.products.getById, {
-    cacheKeyPrefix: `getById-product-${options.id}`,
-    ttl: 5 * MINUTE
-  })(options.id, {
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.products.getById),
+    {
+      cacheKeyPrefix: `getById-product-${options.id}`,
+      ttl: 5 * MINUTE
+    }
+  )(options.id, {
     with: options.with ?? withParams?.product ?? MIN_WITH_PARAMS_PRODUCT,
     campaignKey,
     pricePromotionKey: options.pricePromotionKey,
@@ -45,20 +49,26 @@ export const getProductById = async function getProductById2(options, { sapiClie
   });
 };
 export const getProductsByIds = async function getProductsByIds2(options, { sapiClient, cached, campaignKey, withParams }) {
-  return await cached(sapiClient.products.getByIds, {
-    cacheKeyPrefix: "getByIds-products",
-    ttl: 5 * MINUTE
-  })(options.ids, {
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.products.getByIds),
+    {
+      cacheKeyPrefix: "getByIds-products",
+      ttl: 5 * MINUTE
+    }
+  )(options.ids, {
     with: options.with ?? withParams?.product ?? MIN_WITH_PARAMS_PRODUCT,
     campaignKey,
     pricePromotionKey: options.pricePromotionKey
   });
 };
 export const getProductsByReferenceKeys = async function getProductsByReferenceKeys2(options, { sapiClient, cached, campaignKey, withParams }) {
-  return await cached(sapiClient.products.getByReferenceKeys, {
-    cacheKeyPrefix: "getByReferenceKeys-products",
-    ttl: 5 * MINUTE
-  })(options.referenceKeys, {
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.products.getByReferenceKeys),
+    {
+      cacheKeyPrefix: "getByReferenceKeys-products",
+      ttl: 5 * MINUTE
+    }
+  )(options.referenceKeys, {
     with: options.with ?? withParams?.product ?? MIN_WITH_PARAMS_PRODUCT,
     campaignKey,
     pricePromotionKey: options.pricePromotionKey

package/dist/rpc/methods/promotion.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPromotionsByIds = exports.getPromotions = exports.getCurrentPromotions = void 0;
 var _constants = require("../../constants/index.cjs");
+var _sapi = require("../../utils/sapi.cjs");
 const setPaginationDefault = pagination => {
   return {
     page: pagination?.page || _constants.PROMOTION_PAGE_DEFAULT,
@@ -16,7 +17,7 @@ const getPromotions = exports.getPromotions = async function getPromotions2(para
     sapiClient,
     cached
   } = context;
-  return await cached(sapiClient.promotions.get, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.promotions.get), {
     cacheKeyPrefix: "getPromotions"
   })({
     ...params,
@@ -31,7 +32,7 @@ const getCurrentPromotions = exports.getCurrentPromotions = async function getCu
   const now = /* @__PURE__ */new Date();
   now.setSeconds(0, 0);
   const activeAt = now.toISOString();
-  return await cached(sapiClient.promotions.get, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.promotions.get), {
     cacheKeyPrefix: "getPromotions"
   })({
     ...params,
@@ -44,7 +45,7 @@ const getPromotionsByIds = exports.getPromotionsByIds = async function getPromot
     sapiClient,
     cached
   } = context;
-  return await cached(sapiClient.promotions.getByIds, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.promotions.getByIds), {
     cacheKeyPrefix: "getByIds-promotions"
   })(ids);
 };

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

@@ -1,4 +1,4 @@
 import type { PromotionsParams, PromotionsResponseData } from '../../types';
-export declare const getPromotions: (params: Omit<PromotionsParams, "ids"> | undefined, context: import("../../types").RpcContext) => Promise<PromotionsResponseData>;
-export declare const getCurrentPromotions: (params: Omit<PromotionsParams, "ids" | "activeAt"> | undefined, context: import("../../types").RpcContext) => Promise<PromotionsResponseData>;
-export declare const getPromotionsByIds: (ids: string[], context: import("../../types").RpcContext) => Promise<PromotionsResponseData>;
+export declare const getPromotions: (params: Omit<PromotionsParams, "ids"> | undefined, context: import("../../types").RpcContext) => Promise<Response | PromotionsResponseData>;
+export declare const getCurrentPromotions: (params: Omit<PromotionsParams, "ids" | "activeAt"> | undefined, context: import("../../types").RpcContext) => Promise<Response | PromotionsResponseData>;
+export declare const getPromotionsByIds: (ids: string[], context: import("../../types").RpcContext) => Promise<Response | PromotionsResponseData>;

package/dist/rpc/methods/promotion.mjs

@@ -2,6 +2,7 @@ import {
   PROMOTION_PAGE_DEFAULT,
   PROMOTION_PER_PAGE_DEFAULT
 } from "../../constants/index.mjs";
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 const setPaginationDefault = (pagination) => {
   return {
     page: pagination?.page || PROMOTION_PAGE_DEFAULT,
@@ -10,7 +11,7 @@ const setPaginationDefault = (pagination) => {
 };
 export const getPromotions = async function getPromotions2(params = {}, context) {
   const { sapiClient, cached } = context;
-  return await cached(sapiClient.promotions.get, {
+  return await cached(mapSAPIFetchErrorToResponse(sapiClient.promotions.get), {
     cacheKeyPrefix: "getPromotions"
   })({
     ...params,
@@ -22,7 +23,7 @@ export const getCurrentPromotions = async function getCurrentPromotions2(params
   const now = /* @__PURE__ */ new Date();
   now.setSeconds(0, 0);
   const activeAt = now.toISOString();
-  return await cached(sapiClient.promotions.get, {
+  return await cached(mapSAPIFetchErrorToResponse(sapiClient.promotions.get), {
     cacheKeyPrefix: "getPromotions"
   })({
     ...params,
@@ -32,7 +33,10 @@ export const getCurrentPromotions = async function getCurrentPromotions2(params
 };
 export const getPromotionsByIds = async function getPromotionsByIds2(ids, context) {
   const { sapiClient, cached } = context;
-  return await cached(sapiClient.promotions.getByIds, {
-    cacheKeyPrefix: "getByIds-promotions"
-  })(ids);
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.promotions.getByIds),
+    {
+      cacheKeyPrefix: "getByIds-promotions"
+    }
+  )(ids);
 };

package/dist/rpc/methods/search.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveSearch = exports.getSearchSuggestions = void 0;
+var _sapi = require("../../utils/sapi.cjs");
 const getSearchSuggestions = exports.getSearchSuggestions = async function getSearchSuggestions2({
   term,
   with: _with,
@@ -12,7 +13,7 @@ const getSearchSuggestions = exports.getSearchSuggestions = async function getSe
   sapiClient,
   withParams
 }) {
-  return await sapiClient.searchv2.suggestions(term, {
+  return await (0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.searchv2.suggestions)(term, {
     categoryId,
     with: _with ?? withParams?.searchV2
   });

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

@@ -1,3 +1,3 @@
 import type { SearchV2ResolveEndpointParameters, SearchV2SuggestionsEndpointParameters, SearchV2SuggestionsEndpointResponseData } from '../../types/sapi/search';
-export declare const getSearchSuggestions: ({ term, with: _with, categoryId }: SearchV2SuggestionsEndpointParameters, { sapiClient, withParams }: import("../../types").RpcContext) => Promise<SearchV2SuggestionsEndpointResponseData>;
+export declare const getSearchSuggestions: ({ term, with: _with, categoryId }: SearchV2SuggestionsEndpointParameters, { sapiClient, withParams }: import("../../types").RpcContext) => Promise<Response | SearchV2SuggestionsEndpointResponseData>;
 export declare const resolveSearch: ({ term, with: _with, categoryId }: SearchV2ResolveEndpointParameters, { cached, sapiClient, withParams }: import("../../types").RpcContext) => Promise<import("@scayle/storefront-api").SearchEntity | null>;

package/dist/rpc/methods/search.mjs

@@ -1,5 +1,6 @@
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 export const getSearchSuggestions = async function getSearchSuggestions2({ term, with: _with, categoryId }, { sapiClient, withParams }) {
-  return await sapiClient.searchv2.suggestions(
+  return await mapSAPIFetchErrorToResponse(sapiClient.searchv2.suggestions)(
     term,
     {
       categoryId,

package/dist/rpc/methods/shopConfiguration.cjs

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getShopConfiguration = void 0;
+var _sapi = require("../../utils/sapi.cjs");
 const getShopConfiguration = exports.getShopConfiguration = async function getShopConfiguration2({
   cached,
   sapiClient
 }) {
-  return await cached(sapiClient.shopConfiguration.get, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.shopConfiguration.get), {
     cacheKeyPrefix: "get-shopConfigurations"
   })();
 };

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

@@ -1,4 +1,4 @@
 import type { ShopConfiguration } from '@scayle/storefront-api';
 import type { RpcContext } from '../../types';
-declare const getShopConfiguration: ({ cached, sapiClient }: RpcContext) => Promise<ShopConfiguration>;
+declare const getShopConfiguration: ({ cached, sapiClient }: RpcContext) => Promise<Response | ShopConfiguration>;
 export { getShopConfiguration };

package/dist/rpc/methods/shopConfiguration.mjs

@@ -1,6 +1,10 @@
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 const getShopConfiguration = async function getShopConfiguration2({ cached, sapiClient }) {
-  return await cached(sapiClient.shopConfiguration.get, {
-    cacheKeyPrefix: "get-shopConfigurations"
-  })();
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.shopConfiguration.get),
+    {
+      cacheKeyPrefix: "get-shopConfigurations"
+    }
+  )();
 };
 export { getShopConfiguration };

package/dist/rpc/methods/variants.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getVariantById = void 0;
+var _sapi = require("../../utils/sapi.cjs");
 const defaultWith = {
   attributes: "all"
 };
@@ -18,7 +19,7 @@ const getVariantById = exports.getVariantById = async function getVariantById2({
   withParams
 }) {
   const resolvedWith = include ?? withParams?.variant ?? defaultWith;
-  return await cached(sapiClient.variants.getByIds, {
+  return await cached((0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.variants.getByIds), {
     cacheKeyPrefix: "getByIds-variants"
   })(ids, include ? {
     with: resolvedWith,

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

@@ -5,4 +5,4 @@ export interface FetchVariantsParams {
     include?: ProductWith;
     pricePromotionKey?: string;
 }
-export declare const getVariantById: ({ ids, include, pricePromotionKey }: FetchVariantsParams, { sapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<VariantDetail[]>;
+export declare const getVariantById: ({ ids, include, pricePromotionKey }: FetchVariantsParams, { sapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Response | VariantDetail[]>;

package/dist/rpc/methods/variants.mjs

@@ -1,11 +1,15 @@
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 const defaultWith = {
   attributes: "all"
 };
 export const getVariantById = async function getVariantById2({ ids, include = defaultWith, pricePromotionKey = "default" }, { sapiClient, cached, campaignKey, withParams }) {
   const resolvedWith = include ?? withParams?.variant ?? defaultWith;
-  return await cached(sapiClient.variants.getByIds, {
-    cacheKeyPrefix: "getByIds-variants"
-  })(
+  return await cached(
+    mapSAPIFetchErrorToResponse(sapiClient.variants.getByIds),
+    {
+      cacheKeyPrefix: "getByIds-variants"
+    }
+  )(
     ids,
     include ? { with: resolvedWith, campaignKey, pricePromotionKey } : void 0
   );

package/dist/rpc/methods/wishlist.cjs

@@ -8,6 +8,7 @@ var _types = require("../../types/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _response = require("../../utils/response.cjs");
 var _errors = require("../../errors/index.cjs");
+var _sapi = require("../../utils/sapi.cjs");
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? _constants.MIN_WITH_PARAMS_WISHLIST;
 }
@@ -23,7 +24,7 @@ const getWishlist = exports.getWishlist = async function getWishlist2(options, c
   const resolvedWith = getWithParams({
     with: options
   }, context);
-  return await sapiClient.wishlist.get(wishlistKey, {
+  return await (0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.wishlist.get)(wishlistKey, {
     with: resolvedWith,
     campaignKey,
     pricePromotionKey: resolvedWith?.pricePromotionKey ?? ""
@@ -83,7 +84,7 @@ const removeItemFromWishlist = exports.removeItemFromWishlist = async function r
     wishlistKey
   } = context;
   const resolvedWith = getWithParams(options, context);
-  return await sapiClient.wishlist.deleteItem(wishlistKey, options.itemKey, {
+  return await (0, _sapi.mapSAPIFetchErrorToResponse)(sapiClient.wishlist.deleteItem)(wishlistKey, options.itemKey, {
     with: resolvedWith,
     campaignKey
   });

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

@@ -1,7 +1,6 @@
 import type { Wishlist } from '@scayle/storefront-api';
 import type { RpcContext, WishlistWithOptions } from '../../types';
-import { ErrorResponse } from '../../errors';
-export declare const getWishlist: (options: WishlistWithOptions | undefined, context: RpcContext) => Promise<ErrorResponse | Wishlist>;
+export declare const getWishlist: (options: WishlistWithOptions | undefined, context: RpcContext) => Promise<Response | Wishlist>;
 export declare const addItemToWishlist: (options: {
     variantId?: number;
     productId?: number;
@@ -10,5 +9,5 @@ export declare const addItemToWishlist: (options: {
 export declare const removeItemFromWishlist: (options: {
     itemKey: string;
     with?: WishlistWithOptions;
-}, context: RpcContext) => Promise<ErrorResponse | Wishlist>;
-export declare const clearWishlist: (context: RpcContext) => Promise<ErrorResponse | Wishlist>;
+}, context: RpcContext) => Promise<Response | Wishlist>;
+export declare const clearWishlist: (context: RpcContext) => Promise<Response | Wishlist>;

package/dist/rpc/methods/wishlist.mjs

@@ -6,6 +6,7 @@ import {
 } from "../../constants/index.mjs";
 import { unwrap } from "../../utils/response.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
+import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? MIN_WITH_PARAMS_WISHLIST;
 }
@@ -19,11 +20,14 @@ export const getWishlist = async function getWishlist2(options, context) {
   }
   const { sapiClient, campaignKey, wishlistKey } = context;
   const resolvedWith = getWithParams({ with: options }, context);
-  return await sapiClient.wishlist.get(wishlistKey, {
-    with: resolvedWith,
-    campaignKey,
-    pricePromotionKey: resolvedWith?.pricePromotionKey ?? ""
-  });
+  return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.get)(
+    wishlistKey,
+    {
+      with: resolvedWith,
+      campaignKey,
+      pricePromotionKey: resolvedWith?.pricePromotionKey ?? ""
+    }
+  );
 };
 export const addItemToWishlist = async function addItemToWishlist2(options, context) {
   if (!hasSession(context)) {
@@ -71,10 +75,14 @@ export const removeItemFromWishlist = async function removeItemFromWishlist2(opt
   }
   const { sapiClient, campaignKey, wishlistKey } = context;
   const resolvedWith = getWithParams(options, context);
-  return await sapiClient.wishlist.deleteItem(wishlistKey, options.itemKey, {
-    with: resolvedWith,
-    campaignKey
-  });
+  return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.deleteItem)(
+    wishlistKey,
+    options.itemKey,
+    {
+      with: resolvedWith,
+      campaignKey
+    }
+  );
 };
 export const clearWishlist = async function clearWishlist2(context) {
   const wishlistResponse = await getWishlist({}, context);

package/dist/utils/sapi.cjs

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapSAPIFetchErrorToResponse = mapSAPIFetchErrorToResponse;
+var _storefrontApi = require("@scayle/storefront-api");
+function mapSAPIFetchErrorToResponse(func) {
+  return async (...args) => {
+    try {
+      return await func(...args);
+    } catch (e) {
+      if (e instanceof _storefrontApi.FetchError) {
+        return e.response;
+      }
+      throw e;
+    }
+  };
+}

package/dist/utils/sapi.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Wrap a SAPI API function, catching any SAPI FetchErrors thrown
+ * and translating them to a Response return
+ */
+export declare function mapSAPIFetchErrorToResponse<T extends (...args: any) => any>(func: T): (...args: Parameters<T>) => Promise<Awaited<ReturnType<T>> | Response>;

package/dist/utils/sapi.mjs

@@ -0,0 +1,13 @@
+import { FetchError } from "@scayle/storefront-api";
+export function mapSAPIFetchErrorToResponse(func) {
+  return async (...args) => {
+    try {
+      return await func(...args);
+    } catch (e) {
+      if (e instanceof FetchError) {
+        return e.response;
+      }
+      throw e;
+    }
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",