@scayle/storefront-core 8.33.2 → 8.34.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @scayle/storefront-core
 
+## 8.34.0
+
+### Minor Changes
+
+- Added export of `Pagination` type.
+- **Breaking:** Improved type safety of the `mergeBaskets` RPC method. The method now returns the correct type `Promise<BasketResponse<Product, Variant> | AddManyItemsBasketResponse<Product, Variant> | undefined>` instead of `any`.
+
+### Patch Changes
+
+**Dependencies**
+
+- Updated dependency to @scayle/storefront-api@18.9.0
+- Updated dependency to @scayle/unstorage-scayle-kv-driver@1.0.2
+
 ## 8.33.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -68,4 +68,4 @@ export type RpcMethodParameters<N extends RpcMethodName> = Parameters<RpcMethod<
  */
 export type RpcMethodReturnType<N extends RpcMethodName> = ReturnType<RpcMethod<N>>;
 export type RpcMethodCall = <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Exclude<Awaited<RpcMethodReturnType<N>>, Response>>(...args: P extends RpcContext ? [N] : [N, P]) => Promise<TResult>;
-export { ExistingItemHandling, AddToBasketFailureKind, UpdateBasketItemFailureKind, AddToWishlistFailureKind, PromotionEffectType, FilterTypes, APISortOption, APISortOrder, type ProductSortConfig, type ShopCountryCustomData, } from '@scayle/storefront-api';
+export { ExistingItemHandling, AddToBasketFailureKind, UpdateBasketItemFailureKind, AddToWishlistFailureKind, PromotionEffectType, FilterTypes, APISortOption, APISortOrder, Pagination, type ProductSortConfig, type ShopCountryCustomData, } from '@scayle/storefront-api';

package/dist/index.mjs

@@ -14,5 +14,6 @@ export {
   PromotionEffectType,
   FilterTypes,
   APISortOption,
-  APISortOrder
+  APISortOrder,
+  Pagination
 } from "@scayle/storefront-api";

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

@@ -1,6 +1,7 @@
 import { ExistingItemHandling } from '@scayle/storefront-api';
 import type { AddOrUpdateItemError, UpdateBasketItemQuantity, GetApplicablePromotionsByCodeParameters } from '@scayle/storefront-api';
-import type { AddOrUpdateItemType, BasketResponseData, BasketWithOptions, Product, RpcHandler, ParamRpcHandler, Variant } from '../../../types';
+import type { AddOrUpdateItemType, BasketResponseData, BasketWithOptions, Product, RpcHandler, Variant } from '../../../types';
+import { mergeBaskets as mergeBasketFunction } from '../../../utils/user';
 /**
  * Adds an item to the basket.
  *
@@ -104,12 +105,12 @@ export declare const clearBasket: RpcHandler<boolean>;
  *
  * @returns The new merged basket as result of the merge operation.
  */
-export declare const mergeBaskets: ParamRpcHandler<{
+export declare const mergeBaskets: RpcHandler<{
     fromBasketKey: string;
     toBasketKey: string;
     with?: BasketWithOptions;
     orderCustomData?: Record<string, unknown>;
-}, any>;
+}, Awaited<ReturnType<typeof mergeBasketFunction>>>;
 /**
  * Type defining an object containing properties of a basket item than should be
  * applied to the basket item during the update.

package/dist/rpc/methods/basket/basket.mjs

@@ -8,13 +8,13 @@ import {
 } from "../../../constants/index.mjs";
 import { mergeBaskets as mergeBasketFunction } from "../../../utils/user.mjs";
 import { unwrap } from "../../../utils/response.mjs";
-import { wasAddedWithReducedQuantity } from "../../../utils/index.mjs";
+import { defineRpcHandler, wasAddedWithReducedQuantity } from "../../../utils/index.mjs";
 import { mapSAPIFetchErrorToResponse } from "../../../utils/sapi.mjs";
 const SAPI_ERROR_NAME = "SAPI ERROR";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.basket ?? MIN_WITH_PARAMS_BASKET;
 }
-export const addItemToBasket = async function addItemToBasket2({
+export const addItemToBasket = defineRpcHandler(async ({
   variantId,
   promotionId,
   quantity,
@@ -24,7 +24,7 @@ export const addItemToBasket = async function addItemToBasket2({
   itemGroup,
   with: _with,
   orderCustomData
-}, context) {
+}, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -84,8 +84,8 @@ export const addItemToBasket = async function addItemToBasket2({
       }
     );
   }
-};
-export const addItemsToBasket = async function addItemsToBasket2(params, context) {
+});
+export const addItemsToBasket = defineRpcHandler(async (params, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -145,8 +145,8 @@ export const addItemsToBasket = async function addItemsToBasket2(params, context
       }
     );
   }
-};
-export const getBasket = async function getBasket2(options, context) {
+});
+export const getBasket = defineRpcHandler(async (options, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -178,8 +178,8 @@ export const getBasket = async function getBasket2(options, context) {
     );
   }
   return { basket: response.basket };
-};
-export const removeItemFromBasket = async function removeItemFromBasket2(options, context) {
+});
+export const removeItemFromBasket = defineRpcHandler(async (options, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -201,22 +201,24 @@ export const removeItemFromBasket = async function removeItemFromBasket2(options
     }
   );
   return { basket };
-};
-export const clearBasket = async function clearBasket2(context) {
-  const getBasketResponse = await getBasket({}, context);
-  if (getBasketResponse instanceof ErrorResponse) {
-    return getBasketResponse;
+});
+export const clearBasket = defineRpcHandler(
+  async (context) => {
+    const getBasketResponse = await getBasket({}, context);
+    if (getBasketResponse instanceof ErrorResponse) {
+      return getBasketResponse;
+    }
+    const { basket } = await unwrap(getBasketResponse);
+    await Promise.all(
+      basket.items.map(async (item) => {
+        await removeItemFromBasket({ itemKey: item.key }, context);
+      })
+    );
+    context.log.debug("The basket has been cleared");
+    return true;
   }
-  const { basket } = await unwrap(getBasketResponse);
-  await Promise.all(
-    basket.items.map(async (item) => {
-      await removeItemFromBasket({ itemKey: item.key }, context);
-    })
-  );
-  context.log.debug("The basket has been cleared");
-  return true;
-};
-export const mergeBaskets = async function mergeBaskets2({ fromBasketKey, toBasketKey, with: _with, orderCustomData }, context) {
+);
+export const mergeBaskets = defineRpcHandler(async ({ fromBasketKey, toBasketKey, with: _with, orderCustomData }, context) => {
   const resolvedWith = getWithParams(
     { with: _with },
     context
@@ -227,8 +229,8 @@ export const mergeBaskets = async function mergeBaskets2({ fromBasketKey, toBask
     { ...resolvedWith, orderCustomData },
     context
   );
-};
-export const updateBasketItem = async function updateBasketItem2({ basketItemKey, update, with: _with }, context) {
+});
+export const updateBasketItem = defineRpcHandler(async ({ basketItemKey, update, with: _with }, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -267,8 +269,8 @@ export const updateBasketItem = async function updateBasketItem2({ basketItemKey
       }
     );
   }
-};
-export const getApplicablePromotionsByCode = async function getApplicablePromotionsByCode2({ promotionCode, with: _with }, context) {
+});
+export const getApplicablePromotionsByCode = defineRpcHandler(async ({ promotionCode, with: _with }, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -302,7 +304,7 @@ export const getApplicablePromotionsByCode = async function getApplicablePromoti
   } else {
     return { basket: result.basket };
   }
-};
+});
 function parseBasketError(response) {
   const parsedError = {
     message: "",

package/dist/rpc/methods/brands.mjs

@@ -1,6 +1,7 @@
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
+import { defineRpcHandler } from "../../utils/index.mjs";
 const MAX_PER_PAGE = 100;
-export const getBrands = async function getBrands2({ pagination }, context) {
+export const getBrands = defineRpcHandler(async ({ pagination }, context) => {
   const { sapiClient, cached } = context;
   return await cached(mapSAPIFetchErrorToResponse(sapiClient.brands.get), {
     cacheKeyPrefix: "getBrands"
@@ -10,8 +11,8 @@ export const getBrands = async function getBrands2({ pagination }, context) {
       perPage: pagination?.perPage ? Math.min(pagination.perPage, MAX_PER_PAGE) : void 0
     }
   });
-};
-export const getBrandById = async function getBrandById2({ brandId }, context) {
+});
+export const getBrandById = defineRpcHandler(async ({ brandId }, context) => {
   const { sapiClient, cached } = context;
   return await cached(
     mapSAPIFetchErrorToResponse(sapiClient.brands.getById),
@@ -19,4 +20,4 @@ export const getBrandById = async function getBrandById2({ brandId }, context) {
       cacheKeyPrefix: `getBrandById-${brandId}`
     }
   )(brandId);
-};
+});

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

@@ -1,4 +1,4 @@
-import type { RpcContext } from '../../types';
+import type { RpcHandler } from '../../types';
 /**
  * Retrieves the active campaign key.
  *
@@ -14,4 +14,4 @@ import type { RpcContext } from '../../types';
  * @param context The RPC Context
  * @returns The current active campaign key.
  */
-export declare const getCampaignKey: (context: RpcContext) => Promise<string | undefined>;
+export declare const getCampaignKey: RpcHandler<string | undefined>;

package/dist/rpc/methods/campaign.mjs

@@ -3,7 +3,8 @@ import {
   sortCampaignsByDateAscending,
   isCampaignActive
 } from "../../utils/campaign.mjs";
-export const getCampaignKey = async function getCampaignKey2(context) {
+import { defineRpcHandler } from "../../utils/index.mjs";
+export const getCampaignKey = defineRpcHandler(async (context) => {
   if (context.campaignKey) {
     return context.campaignKey;
   }
@@ -20,4 +21,4 @@ export const getCampaignKey = async function getCampaignKey2(context) {
     ttl: 5 * 60
   })();
   return campaigns.find(isCampaignActive)?.key;
-};
+});

package/dist/rpc/methods/categories.mjs

@@ -1,6 +1,7 @@
 import { splitAndRemoveEmpty } from "../../helpers/index.mjs";
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
-export const getRootCategories = async function getRootCategories2({ children = 1, includeHidden, properties, includeProductSorting }, context) {
+import { defineRpcHandler } from "../../utils/index.mjs";
+export const getRootCategories = defineRpcHandler(async ({ children = 1, includeHidden, properties, includeProductSorting }, context) => {
   const { cached, sapiClient } = context;
   const result = await cached(sapiClient.categories.getRoots, {
     cacheKeyPrefix: "root-categories"
@@ -12,8 +13,8 @@ export const getRootCategories = async function getRootCategories2({ children =
     categories: result,
     activeNode: void 0
   };
-};
-export const getCategoryByPath = async function getCategoryByPath2({ path, children = 1, includeHidden, properties, includeProductSorting }, context) {
+});
+export const getCategoryByPath = defineRpcHandler(async ({ path, children = 1, includeHidden, properties, includeProductSorting }, context) => {
   const { cached, sapiClient } = context;
   const sanitizedPath = splitAndRemoveEmpty(path);
   return await cached(
@@ -25,8 +26,8 @@ export const getCategoryByPath = async function getCategoryByPath2({ path, child
     with: { children, properties, includeProductSorting },
     includeHidden
   });
-};
-export const getCategoriesByPath = async function getCategoriesByPath2({ path, children = 1, includeHidden, properties, includeProductSorting }, context) {
+});
+export const getCategoriesByPath = defineRpcHandler(async ({ path, children = 1, includeHidden, properties, includeProductSorting }, context) => {
   const { cached, sapiClient } = context;
   if (path === "/") {
     return getRootCategories(
@@ -78,8 +79,8 @@ export const getCategoriesByPath = async function getCategoriesByPath2({ path, c
     lastNode = rootPath[i];
   }
   return { categories: tree, activeNode: result };
-};
-export const getCategoryById = async function getCategoryById2({ id, children = 1, includeHidden, properties, includeProductSorting }, context) {
+});
+export const getCategoryById = defineRpcHandler(async ({ id, children = 1, includeHidden, properties, includeProductSorting }, context) => {
   const { cached, sapiClient } = context;
   return await cached(
     mapSAPIFetchErrorToResponse(sapiClient.categories.getById),
@@ -95,14 +96,14 @@ export const getCategoryById = async function getCategoryById2({ id, children =
     },
     includeHidden
   });
-};
-export const getCategoryTree = async function getCategoryTree2({
+});
+export const getCategoryTree = defineRpcHandler(async ({
   children,
   includeHidden,
   properties,
   hideEmptyCategories,
   includeProductSorting
-}, context) {
+}, context) => {
   const { cached, sapiClient, callRpc } = context;
   const categoryTree = await cached(sapiClient.categories.getRoots, {
     cacheKeyPrefix: "root-categories"
@@ -142,4 +143,4 @@ export const getCategoryTree = async function getCategoryTree2({
   return categoryTree.filter(
     (category) => categoryProductCountTable[category.id] > 0
   );
-};
+});

package/dist/rpc/methods/cbd.mjs

@@ -1,7 +1,8 @@
 import { HttpStatusCode, HttpStatusMessage } from "../../constants/index.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
+import { defineRpcHandler } from "../../utils/index.mjs";
 import { encodeBase64, verifyOrderSuccessToken } from "../../utils/hash.mjs";
-export const getOrderDataByCbd = async function getOrderDataByCbd2({ cbdToken }, context) {
+export const getOrderDataByCbd = defineRpcHandler(async ({ cbdToken }, context) => {
   const payload = await verifyOrderSuccessToken(
     cbdToken,
     context.checkout.secret
@@ -52,4 +53,4 @@ export const getOrderDataByCbd = async function getOrderDataByCbd2({ cbdToken },
       detail: `Fetching order failed with status code ${response.status}`
     }
   );
-};
+});

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

@@ -3,7 +3,8 @@ import { hasSession } from "../../../types/index.mjs";
 import { ErrorResponse } from "../../../errors/index.mjs";
 import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs";
 import { getAccessToken } from "../user.mjs";
-export const getCheckoutToken = async function getCheckoutToken2(jwtPayload = {}, context) {
+import { defineRpcHandler } from "../../../utils/rpc.mjs";
+export const getCheckoutToken = defineRpcHandler(async (jwtPayload = {}, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -36,9 +37,9 @@ export const getCheckoutToken = async function getCheckoutToken2(jwtPayload = {}
     carrier,
     basketId: context.basketKey,
     campaignKey
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.33.2"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.34.0"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt
   };
-};
+});

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

@@ -5,7 +5,8 @@ import {
   HttpStatusCode,
   HttpStatusMessage
 } from "../../../constants/httpStatus.mjs";
-export const getOrderById = async function getOrderById2({ orderId }, context) {
+import { defineRpcHandler } from "../../../utils/index.mjs";
+export const getOrderById = defineRpcHandler(async ({ orderId }, context) => {
   const accessToken = context.accessToken;
   if (!orderId || isNaN(orderId)) {
     return new ErrorResponse(
@@ -49,4 +50,4 @@ export const getOrderById = async function getOrderById2({ orderId }, context) {
       "Unknown error"
     );
   }
-};
+});

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

@@ -6,7 +6,8 @@ import {
   HttpStatusCode,
   HttpStatusMessage
 } from "../../../constants/httpStatus.mjs";
-export const updateShopUser = async function updateShopUser2(payload, context) {
+import { defineRpcHandler } from "../../../utils/index.mjs";
+export const updateShopUser = defineRpcHandler(async (payload, context) => {
   const shopId = context.shopId;
   const updatedUser = {
     email: payload.email,
@@ -55,8 +56,8 @@ export const updateShopUser = async function updateShopUser2(payload, context) {
       "Error while updating user information"
     );
   }
-};
-export const updatePassword = async function updatePassword2({ oldPassword, newPassword }, context) {
+});
+export const updatePassword = defineRpcHandler(async ({ oldPassword, newPassword }, context) => {
   const shopUser = context.user;
   const oauthEnabled = context.oauth?.apiHost && context.oauth?.clientId && context.oauth?.clientSecret;
   try {
@@ -120,4 +121,4 @@ export const updatePassword = async function updatePassword2({ oldPassword, newP
     }
   }
   return { user: shopUser };
-};
+});

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

@@ -1,7 +1,10 @@
 import { CustomerAPIClient } from "../../../api/customer.mjs";
-const getShopUserAddresses = async function getShopUserAddresses2(context) {
-  const shopId = context.shopId;
-  const client = new CustomerAPIClient(context);
-  return (await client.getAddresses(shopId)).entities;
-};
+import { defineRpcHandler } from "../../../utils/index.mjs";
+const getShopUserAddresses = defineRpcHandler(
+  async (context) => {
+    const shopId = context.shopId;
+    const client = new CustomerAPIClient(context);
+    return (await client.getAddresses(shopId)).entities;
+  }
+);
 export { getShopUserAddresses };

package/dist/rpc/methods/navigationTrees.mjs

@@ -1,18 +1,19 @@
 import { ErrorResponse } from "../../errors/index.mjs";
 import { HttpStatusCode, HttpStatusMessage } from "../../constants/index.mjs";
-export const fetchAllNavigationTrees = async function fetchAllNavigationTrees2({ params }, context) {
+import { defineRpcHandler } from "../../utils/index.mjs";
+export const fetchAllNavigationTrees = defineRpcHandler(async ({ params }, context) => {
   const { sapiClient: { navigation }, cached } = context;
   return await cached(navigation.getAll, {
     cacheKeyPrefix: "getAll-navigation-trees"
   })(params);
-};
-export const fetchNavigationTreeById = async function fetchNavigationTreeById2({ treeId, params }, context) {
+});
+export const fetchNavigationTreeById = defineRpcHandler(async ({ treeId, params }, context) => {
   const { sapiClient: { navigation }, cached } = context;
   return await cached(navigation.getById, {
     cacheKeyPrefix: `getById-navigation-trees-${treeId}`
   })(treeId, params);
-};
-export const fetchNavigationTreeByName = async function fetchNavigationTreeByName2({ treeName, params }, context) {
+});
+export const fetchNavigationTreeByName = defineRpcHandler(async ({ treeName, params }, context) => {
   const { sapiClient: { navigation }, cached } = context;
   return await cached(
     async (name, params2) => {
@@ -33,4 +34,4 @@ export const fetchNavigationTreeByName = async function fetchNavigationTreeByNam
       cacheKeyPrefix: `getByName-navigation-trees-${treeName}`
     }
   )(treeName, params);
-};
+});

package/dist/rpc/methods/oauth/idp.mjs

@@ -4,7 +4,8 @@ import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs"
 import { hasSession } from "../../../types/index.mjs";
 import { getOAuthClient } from "../../../api/oauth.mjs";
 import { postLogin } from "../session.mjs";
-export const getExternalIdpRedirect = async function getExternalIdpRedirect2({ queryParams, authUrlParameters }, context) {
+import { defineRpcHandler } from "../../../utils/index.mjs";
+export const getExternalIdpRedirect = defineRpcHandler(async ({ queryParams, authUrlParameters }, context) => {
   if (!context.idp?.enabled) {
     return {};
   }
@@ -45,8 +46,8 @@ export const getExternalIdpRedirect = async function getExternalIdpRedirect2({ q
     })
   );
   return Object.fromEntries(results);
-};
-export const handleIDPLoginCallback = async function handleIDPLoginCallback2(payload, context) {
+});
+export const handleIDPLoginCallback = defineRpcHandler(async (payload, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -60,4 +61,4 @@ export const handleIDPLoginCallback = async function handleIDPLoginCallback2(pay
   return {
     message: "success"
   };
-};
+});

package/dist/rpc/methods/promotion.mjs

@@ -3,13 +3,14 @@ import {
   PROMOTION_PER_PAGE_DEFAULT
 } from "../../constants/index.mjs";
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
+import { defineRpcHandler } from "../../utils/index.mjs";
 const setPaginationDefault = (pagination) => {
   return {
     page: pagination?.page || PROMOTION_PAGE_DEFAULT,
     perPage: pagination?.perPage || PROMOTION_PER_PAGE_DEFAULT
   };
 };
-export const getPromotions = async function getPromotions2(params = {}, context) {
+export const getPromotions = defineRpcHandler(async (params = {}, context) => {
   const { sapiClient, cached } = context;
   return await cached(mapSAPIFetchErrorToResponse(sapiClient.promotions.get), {
     cacheKeyPrefix: "getPromotions"
@@ -17,8 +18,8 @@ export const getPromotions = async function getPromotions2(params = {}, context)
     ...params,
     pagination: setPaginationDefault(params.pagination)
   });
-};
-export const getCurrentPromotions = async function getCurrentPromotions2(params = {}, context) {
+});
+export const getCurrentPromotions = defineRpcHandler(async (params = {}, context) => {
   const { sapiClient, cached } = context;
   const now = /* @__PURE__ */ new Date();
   now.setSeconds(0, 0);
@@ -30,8 +31,8 @@ export const getCurrentPromotions = async function getCurrentPromotions2(params
     activeAt,
     pagination: setPaginationDefault(params.pagination)
   });
-};
-export const getPromotionsByIds = async function getPromotionsByIds2(ids, context) {
+});
+export const getPromotionsByIds = defineRpcHandler(async (ids, context) => {
   const { sapiClient, cached } = context;
   return await cached(
     mapSAPIFetchErrorToResponse(sapiClient.promotions.getByIds),
@@ -39,4 +40,4 @@ export const getPromotionsByIds = async function getPromotionsByIds2(ids, contex
       cacheKeyPrefix: "getByIds-promotions"
     }
   )(ids);
-};
+});

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

@@ -27,4 +27,4 @@ export declare const getSearchSuggestions: RpcHandler<SearchV2SuggestionsEndpoin
  *
  * @returns A promise that resolves to the resolved entity or null if no entity is found.
  */
-export declare const resolveSearch: RpcHandler<SearchV2ResolveEndpointParameters, Promise<SearchV2ResolveEndpointResponseData | null>>;
+export declare const resolveSearch: RpcHandler<SearchV2ResolveEndpointParameters, SearchV2ResolveEndpointResponseData | 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 }, context) {
+import { defineRpcHandler } from "../../utils/index.mjs";
+export const getSearchSuggestions = defineRpcHandler(async ({ term, with: _with, categoryId }, context) => {
   const { sapiClient, withParams } = context;
   return await mapSAPIFetchErrorToResponse(sapiClient.searchv2.suggestions)(
     term,
@@ -8,8 +9,8 @@ export const getSearchSuggestions = async function getSearchSuggestions2({ term,
       with: _with ?? withParams?.searchV2
     }
   );
-};
-export const resolveSearch = async function resolveSearch2({ term, with: _with, categoryId }, context) {
+});
+export const resolveSearch = defineRpcHandler(async ({ term, with: _with, categoryId }, context) => {
   const { cached, sapiClient, withParams } = context;
   const resolvedEntity = await cached(sapiClient.searchv2.resolve, {
     cacheKeyPrefix: `resolve-${term}`
@@ -21,4 +22,4 @@ export const resolveSearch = async function resolveSearch2({ term, with: _with,
     return null;
   }
   return resolvedEntity;
-};
+});

package/dist/rpc/methods/session.mjs

@@ -11,6 +11,7 @@ import { fetchUser } from "../../rpc/methods/user.mjs";
 import { unwrap } from "../../utils/response.mjs";
 import { getOAuthClient } from "../../api/oauth.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
+import { defineRpcHandler } from "../../utils/index.mjs";
 const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof FetchError && httpStatuses.includes(error.response.status)) {
     return new ErrorResponse(
@@ -57,7 +58,7 @@ export async function postLogin(context, tokens) {
     accessToken: tokens.access_token
   }, context);
 }
-export const oauthLogin = async (login, context) => {
+export const oauthLogin = defineRpcHandler(async (login, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -92,8 +93,8 @@ export const oauthLogin = async (login, context) => {
       "Login failed"
     );
   }
-};
-export const oauthRegister = async (register, context) => {
+});
+export const oauthRegister = defineRpcHandler(async (register, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -125,8 +126,8 @@ export const oauthRegister = async (register, context) => {
       "Register failed"
     );
   }
-};
-export const oauthGuestLogin = async (guest, context) => {
+});
+export const oauthGuestLogin = defineRpcHandler(async (guest, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -157,8 +158,8 @@ export const oauthGuestLogin = async (guest, context) => {
       "Guest login failed"
     );
   }
-};
-export const refreshAccessToken = async (context) => {
+});
+export const refreshAccessToken = defineRpcHandler(async (context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -205,8 +206,8 @@ export const refreshAccessToken = async (context) => {
     }
     return { success: false };
   }
-};
-export const oauthRevokeToken = async (context) => {
+});
+export const oauthRevokeToken = defineRpcHandler(async (context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -244,8 +245,8 @@ export const oauthRevokeToken = async (context) => {
     }
     return { result: false };
   }
-};
-export const oauthForgetPassword = async ({ email }, context) => {
+});
+export const oauthForgetPassword = defineRpcHandler(async ({ email }, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -287,8 +288,8 @@ export const oauthForgetPassword = async ({ email }, context) => {
     }
     return { success: false };
   }
-};
-export const updatePasswordByHash = async (passwordHash, context) => {
+});
+export const updatePasswordByHash = defineRpcHandler(async (passwordHash, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -324,4 +325,4 @@ export const updatePasswordByHash = async (passwordHash, context) => {
     );
   }
   return new Response(null, { status: HttpStatusCode.NO_CONTENT });
-};
+});

package/dist/rpc/methods/shopConfiguration.mjs

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

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

@@ -1,4 +1,4 @@
-import type { RpcContext, RpcHandler, ShopUser } from '../../types';
+import type { RpcHandler, ShopUser } from '../../types';
 /**
  * Retrieves the user from the context.
  *
@@ -19,9 +19,9 @@ declare const getUser: RpcHandler<{
  * @returns The fetched user data. It will return an `ErrorResponse` alternatively
  * if an error occurs during the API call.
  */
-declare const fetchUser: ({ accessToken }: {
+declare const fetchUser: RpcHandler<{
     accessToken?: string;
-}, context: RpcContext) => Promise<ShopUser>;
+}, ShopUser>;
 /**
  * Refreshes the user session and data.
  * If the user is no longer logged in, the session is destroyed.

package/dist/rpc/methods/user.mjs

@@ -4,18 +4,21 @@ import { getOAuthClient } from "../../api/oauth.mjs";
 import { HttpStatusCode, HttpStatusMessage } from "../../constants/index.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
 import { FetchError } from "../../utils/fetch.mjs";
-const getUser = function getUser2(context) {
-  const { user } = context;
-  if (user) {
-    user.authentication = user.authentication ?? {
-      type: "idp"
+import { defineRpcHandler } from "../../utils/rpc.mjs";
+const getUser = defineRpcHandler(
+  (context) => {
+    const { user } = context;
+    if (user) {
+      user.authentication = user.authentication ?? {
+        type: "idp"
+      };
+    }
+    return {
+      user
     };
   }
-  return {
-    user
-  };
-};
-const fetchUser = async function fetchUser2({ accessToken }, context) {
+);
+const fetchUser = defineRpcHandler(async ({ accessToken }, context) => {
   const { shopId } = context;
   const client = new CustomerAPIClient(context);
   const user = await client.getMe(shopId, accessToken);
@@ -28,8 +31,8 @@ const fetchUser = async function fetchUser2({ accessToken }, context) {
     ({ shopId: shopId2 }) => shopId2 === context.shopId
   );
   return user;
-};
-const refreshUser = async function refreshUser2(context) {
+});
+const refreshUser = defineRpcHandler(async (context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -52,8 +55,8 @@ const refreshUser = async function refreshUser2(context) {
     await context.destroySession();
     return { user: void 0 };
   }
-};
-const getAccessToken = async function getAccessToken2({ forceTokenRefresh = false } = { forceTokenRefresh: false }, context) {
+});
+const getAccessToken = defineRpcHandler(async ({ forceTokenRefresh = false } = { forceTokenRefresh: false }, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -100,5 +103,5 @@ const getAccessToken = async function getAccessToken2({ forceTokenRefresh = fals
     }
   }
   return context.accessToken;
-};
+});
 export { getUser, fetchUser, refreshUser, getAccessToken };

package/dist/rpc/methods/variants.mjs

@@ -1,8 +1,9 @@
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
+import { defineRpcHandler } from "../../utils/rpc.mjs";
 const defaultWith = {
   attributes: "all"
 };
-export const getVariantById = async function getVariantById2({ ids, include = defaultWith, pricePromotionKey = "default" }, context) {
+export const getVariantById = defineRpcHandler(async ({ ids, include = defaultWith, pricePromotionKey = "default" }, context) => {
   const { sapiClient, cached, withParams } = context;
   const campaignKey = await context.callRpc?.("getCampaignKey");
   const resolvedWith = include ?? withParams?.variant ?? defaultWith;
@@ -15,4 +16,4 @@ export const getVariantById = async function getVariantById2({ ids, include = de
     ids,
     include ? { with: resolvedWith, campaignKey, pricePromotionKey } : void 0
   );
-};
+});

package/dist/rpc/methods/wishlist.mjs

@@ -7,32 +7,35 @@ import {
 import { unwrap } from "../../utils/response.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
+import { defineRpcHandler } from "../../utils/index.mjs";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? MIN_WITH_PARAMS_WISHLIST;
 }
-export const getWishlist = async function getWishlist2(options, context) {
-  if (!hasSession(context)) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No Session found"
+export const getWishlist = defineRpcHandler(
+  async (options, context) => {
+    if (!hasSession(context)) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No Session found"
+      );
+    }
+    const { sapiClient, wishlistKey } = context;
+    const campaignKey = await context.callRpc?.("getCampaignKey");
+    const { pricePromotionKey, ...resolvedWith } = getWithParams({
+      with: options
+    }, context);
+    return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.get)(
+      wishlistKey,
+      {
+        with: resolvedWith,
+        campaignKey,
+        pricePromotionKey: pricePromotionKey ?? ""
+      }
     );
   }
-  const { sapiClient, wishlistKey } = context;
-  const campaignKey = await context.callRpc?.("getCampaignKey");
-  const { pricePromotionKey, ...resolvedWith } = getWithParams({
-    with: options
-  }, context);
-  return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.get)(
-    wishlistKey,
-    {
-      with: resolvedWith,
-      campaignKey,
-      pricePromotionKey: pricePromotionKey ?? ""
-    }
-  );
-};
-export const addItemToWishlist = async function addItemToWishlist2(options, context) {
+);
+export const addItemToWishlist = defineRpcHandler(async (options, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -67,8 +70,8 @@ export const addItemToWishlist = async function addItemToWishlist2(options, cont
     context.log.error("Adding to wishlist failed", result.wishlist);
     return new Response(JSON.stringify({ kind, type }), { status: code });
   }
-};
-export const removeItemFromWishlist = async function removeItemFromWishlist2(options, context) {
+});
+export const removeItemFromWishlist = defineRpcHandler(async (options, context) => {
   if (!hasSession(context)) {
     return new ErrorResponse(
       HttpStatusCode.BAD_REQUEST,
@@ -88,17 +91,19 @@ export const removeItemFromWishlist = async function removeItemFromWishlist2(opt
       pricePromotionKey: pricePromotionKey ?? ""
     }
   );
-};
-export const clearWishlist = async function clearWishlist2(context) {
-  const wishlistResponse = await getWishlist({}, context);
-  if (wishlistResponse instanceof ErrorResponse) {
-    return wishlistResponse;
+});
+export const clearWishlist = defineRpcHandler(
+  async (context) => {
+    const wishlistResponse = await getWishlist({}, context);
+    if (wishlistResponse instanceof ErrorResponse) {
+      return wishlistResponse;
+    }
+    const wishlist = await unwrap(wishlistResponse);
+    await Promise.all(
+      wishlist.items.map(async (item) => {
+        await removeItemFromWishlist({ itemKey: item.key }, context);
+      })
+    );
+    return await getWishlist({}, context);
   }
-  const wishlist = await unwrap(wishlistResponse);
-  await Promise.all(
-    wishlist.items.map(async (item) => {
-      await removeItemFromWishlist({ itemKey: item.key }, context);
-    })
-  );
-  return await getWishlist({}, context);
-};
+);

package/dist/utils/rpc.d.ts

@@ -7,14 +7,14 @@ type RpcType = 'NoParam' | 'WithParam';
  * @param handler - The RPC handler function.
  * @returns The handler itself, with correct types enforced and internal properties set.
  */
-export declare function defineRpcHandler<Params extends Record<string, unknown>, Result = unknown>(handler: (params: Params, context: RpcContext) => Result | Promise<Result>): RpcHandler<Params, Result>;
+export declare function defineRpcHandler<Params extends Record<string, any> | undefined, Result>(handler: (params: Params, context: RpcContext) => Result | Response | Promise<Result | Response>): RpcHandler<Params, Result>;
 /**
  * Defines an RPC method handler.
  *
  * @param handler - The RPC handler function.
  * @returns The handler itself, with correct types enforced and internal properties set.
  */
-export declare function defineRpcHandler<Result = unknown>(handler: (context: RpcContext) => Result | Promise<Result>): RpcHandler<Result>;
+export declare function defineRpcHandler<Result>(handler: (context: RpcContext) => Result | Response | Promise<Result | Response>): RpcHandler<Result>;
 /**
  * Defines an RPC method handler.
  *

package/dist/utils/user.mjs

@@ -1,8 +1,7 @@
 import { ExistingItemHandling } from "@scayle/storefront-api";
-import { getCampaignKey } from "../rpc/methods/index.mjs";
 export const mergeBaskets = async (fromBasketKey, toBasketKey, withOptions, context) => {
   const { sapiClient } = context;
-  const campaignKey = await getCampaignKey(context);
+  const campaignKey = await context.callRpc?.("getCampaignKey");
   const fromOriginBasket = await sapiClient.basket.get(fromBasketKey, {
     with: withOptions,
     campaignKey,
@@ -46,7 +45,7 @@ export const mergeBaskets = async (fromBasketKey, toBasketKey, withOptions, cont
 };
 export const mergeWishlists = async (fromWishlistKey, toWishlistKey, withOptions, context) => {
   const { sapiClient } = context;
-  const campaignKey = await getCampaignKey(context);
+  const campaignKey = await context.callRpc?.("getCampaignKey");
   const oldWishlist = await sapiClient.wishlist.get(fromWishlistKey, {
     with: withOptions,
     campaignKey

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "8.33.2",
+  "version": "8.34.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@types/crypto-js": "4.2.2",
-    "@types/node": "22.16.1",
+    "@types/node": "22.16.3",
     "@types/webpack-env": "1.18.8",
     "@vitest/coverage-v8": "3.2.4",
     "dprint": "0.50.1",
@@ -74,7 +74,7 @@
     "unbuild": "3.5.0",
     "unstorage": "1.16.0",
     "vitest": "3.2.4",
-    "@scayle/eslint-config-storefront": "4.5.12"
+    "@scayle/eslint-config-storefront": "4.5.13"
   },
   "volta": {
     "node": "22.17.0"