@scayle/storefront-core 8.36.0 → 8.38.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @scayle/storefront-core
 
+## 8.38.0
+
+### Minor Changes
+
+- Refined the `ContextWithoutSession` type to accurately represent actual data: `wishlistKey`, `basketKey`, and `sessionId` are now typed as `string` instead of `undefined`, since even logged-out users have these values set.
+- Made `getCheckoutToken` callable by logged-in and not logged-in users. When called by a not logged-in user, the RPC returns only the `checkoutJWT`. For logged-in users, it continues to return both the `checkoutJWT` and a refreshed `accessToken` as before.
+
+## 8.37.0
+
+### Minor Changes
+
+- The `where` parameter for the `getProductsByCategory` and `getProductsCount` RPCs was extended to include the previously missing options `sellableAt`, `hasCampaignReduction`, and `containsSearch`.
+
+### Patch Changes
+
+- Added missing export of the RPC `getCampaign`
+
 ## 8.36.0
 
 ### Minor Changes

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

@@ -49,7 +49,7 @@ interface CheckoutJwtPayload {
  * It will return an `ErrorResponse` if no session is found, no access token is present.
  */
 export declare const getCheckoutToken: RpcHandler<CheckoutJwtPayload | undefined, {
-    accessToken: string;
+    accessToken: string | undefined;
     checkoutJwt: string;
 }>;
 export {};

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

@@ -12,19 +12,15 @@ export const getCheckoutToken = defineRpcHandler(async (jwtPayload = {}, context
       "No Session found"
     );
   }
-  if (!context.accessToken) {
-    return new ErrorResponse(
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusMessage.UNAUTHORIZED,
-      "No access token present"
+  let refreshedAccessToken;
+  if (context.accessToken) {
+    refreshedAccessToken = await getAccessToken(
+      { forceTokenRefresh: true },
+      context
     );
-  }
-  const refreshedAccessToken = await getAccessToken(
-    { forceTokenRefresh: true },
-    context
-  );
-  if (refreshedAccessToken instanceof Response) {
-    return refreshedAccessToken;
+    if (refreshedAccessToken instanceof Response) {
+      return refreshedAccessToken;
+    }
   }
   const secret = new TextEncoder().encode(context.checkout.secret);
   const now = /* @__PURE__ */ new Date();
@@ -37,7 +33,7 @@ export const getCheckoutToken = defineRpcHandler(async (jwtPayload = {}, context
     carrier,
     basketId: context.basketKey,
     campaignKey
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.36.0"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.38.0"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

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

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

package/dist/rpc/methods/index.mjs

@@ -1,7 +1,7 @@
 export * from "./basket/basket.mjs";
 export * from "./brands.mjs";
 export * from "./categories.mjs";
-export { getCampaignKey } from "./campaign.mjs";
+export * from "./campaign.mjs";
 export * from "./cbd.mjs";
 export {
   getProductById,

package/dist/rpc/methods/products.mjs

@@ -89,10 +89,11 @@ export const getProductsCount = async function getProductsCount2(params, context
   const { cached, sapiClient } = context;
   const campaignKey = await context.callRpc?.("getCampaignKey");
   const { categoryId } = await resolveCategoryIdFromParams(context, params);
+  const { attributes, whitelistAttributes, ...filter } = where || {};
   const response = await getSanitizedAttributes(
     context,
     categoryId,
-    where?.attributes || [],
+    attributes || [],
     includedFilters
   );
   if (response instanceof ErrorResponse) {
@@ -104,17 +105,12 @@ export const getProductsCount = async function getProductsCount2(params, context
     cacheKeyPrefix: "products-query"
   })({
     where: {
+      ...filter,
       categoryId,
-      minPrice: where?.minPrice,
-      maxPrice: where?.maxPrice,
-      minReduction: where?.minReduction,
-      maxReduction: where?.maxReduction,
-      term: where?.term,
       attributes: [
         ...sanitizedAttributes,
-        ...where?.whitelistAttributes || []
-      ],
-      disableFuzziness: where?.disableFuzziness
+        ...whitelistAttributes || []
+      ]
     },
     pagination: {
       perPage: 1
@@ -177,10 +173,11 @@ export const getFilters = async function getFilters2(params, context) {
     context,
     params
   );
+  const { attributes, whitelistAttributes, ...filter } = where || {};
   const response = await getSanitizedAttributes(
     context,
     categoryId,
-    where?.attributes || [],
+    attributes || [],
     includedFilters
   );
   if (response instanceof ErrorResponse) {
@@ -192,15 +189,11 @@ export const getFilters = async function getFilters2(params, context) {
       cacheKeyPrefix: `get-filters-${categoryId}`
     })({
       where: {
+        ...filter,
         categoryId,
-        minPrice: where?.minPrice,
-        maxPrice: where?.maxPrice,
-        minReduction: where?.minReduction,
-        maxReduction: where?.maxReduction,
-        term: where?.term,
         attributes: [
           ...sanitizedAttributes,
-          ...where?.whitelistAttributes || []
+          ...whitelistAttributes || []
         ]
       },
       includeSoldOut,
@@ -214,17 +207,12 @@ export const getFilters = async function getFilters2(params, context) {
       cacheKeyPrefix: `products-query-category-${category === "/" ? "root" : categoryId}`
     })({
       where: {
+        ...filter,
         categoryId,
-        minPrice: where?.minPrice,
-        maxPrice: where?.maxPrice,
-        minReduction: where?.minReduction,
-        maxReduction: where?.maxReduction,
-        term: where?.term,
         attributes: [
           ...sanitizedAttributes,
-          ...where?.whitelistAttributes || []
-        ],
-        disableFuzziness: where?.disableFuzziness
+          ...whitelistAttributes || []
+        ]
       },
       pagination: {
         perPage: 1
@@ -261,10 +249,11 @@ export const getProductsByCategory = async function getProductsByCategory2(param
     context,
     params
   );
+  const { attributes, whitelistAttributes, ...filter } = where || {};
   const response = await getSanitizedAttributes(
     context,
     categoryId,
-    where?.attributes || [],
+    attributes || [],
     includedFilters
   );
   if (response instanceof ErrorResponse) {
@@ -280,17 +269,12 @@ export const getProductsByCategory = async function getProductsByCategory2(param
     }
   )({
     where: {
+      ...filter,
       categoryId,
-      minPrice: where?.minPrice,
-      maxPrice: where?.maxPrice,
-      minReduction: where?.minReduction,
-      maxReduction: where?.maxReduction,
-      term: where?.term,
       attributes: [
         ...sanitizedAttributes,
-        ...where?.whitelistAttributes || []
-      ],
-      disableFuzziness: where?.disableFuzziness
+        ...whitelistAttributes || []
+      ]
     },
     pagination: {
       perPage: Math.min(perPage, MAX_PER_PAGE),

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

@@ -61,9 +61,9 @@ export interface ContextWithSession {
  * Context interface without session information.
  */
 export interface ContextWithoutSession {
-    wishlistKey: undefined;
-    basketKey: undefined;
-    sessionId: undefined;
+    wishlistKey: string;
+    basketKey: string;
+    sessionId: string;
     user: undefined;
     accessToken: undefined;
     refreshToken: undefined;

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

@@ -90,6 +90,9 @@ export interface FetchProductsByReferenceKeysParams {
     with?: ProductWith;
     pricePromotionKey?: string;
 }
+export type ProductWhere = Partial<Omit<ProductSearchQuery, 'categoryId'> & {
+    whitelistAttributes?: ProductSearchQuery['attributes'];
+}>;
 /**
  * Parameters for fetching products by category.
  */
@@ -101,16 +104,7 @@ export type FetchProductsByCategoryParams = {
     perPage?: number;
     page?: number;
     /** Search query parameters. */
-    where?: {
-        term?: ProductSearchQuery['term'];
-        minPrice?: ProductSearchQuery['minPrice'];
-        maxPrice?: ProductSearchQuery['maxPrice'];
-        minReduction?: ProductSearchQuery['minReduction'];
-        maxReduction?: ProductSearchQuery['maxReduction'];
-        attributes?: ProductSearchQuery['attributes'];
-        disableFuzziness?: ProductSearchQuery['disableFuzziness'];
-        whitelistAttributes?: ProductSearchQuery['attributes'];
-    };
+    where?: ProductWhere;
     /** Sort parameters. */
     sort?: FilterParams['sort'];
     pricePromotionKey?: string;
@@ -145,16 +139,7 @@ export interface FetchProductsByCategoryResponse {
  */
 export type FetchProductsCountParams = {
     /** Search query parameters. */
-    where?: {
-        term?: ProductSearchQuery['term'];
-        minPrice?: ProductSearchQuery['minPrice'];
-        maxPrice?: ProductSearchQuery['maxPrice'];
-        minReduction?: ProductSearchQuery['minReduction'];
-        maxReduction?: ProductSearchQuery['maxReduction'];
-        attributes?: ProductSearchQuery['attributes'];
-        disableFuzziness?: ProductSearchQuery['disableFuzziness'];
-        whitelistAttributes?: ProductSearchQuery['attributes'];
-    };
+    where?: ProductWhere;
     includedFilters?: Array<string>;
     includeSoldOut?: boolean;
     includeSellableForFree?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "8.36.0",
+  "version": "8.38.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "unbuild": "3.5.0",
     "unstorage": "1.16.0",
     "vitest": "3.2.4",
-    "@scayle/eslint-config-storefront": "4.6.1"
+    "@scayle/eslint-config-storefront": "4.7.0"
   },
   "volta": {
     "node": "22.17.1"