@evenicanpm/storefront-core 1.3.0 → 1.4.0

package/__mocks__/get-product-by-id.ts

@@ -1,4 +1,3 @@
-import { fn } from "storybook/test";
 import { product } from "./product-dimensions";
 
 export default {

package/__mocks__/query-client.ts

@@ -1,3 +1,3 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient } from "@tanstack/react-query";
 
 export const queryClient = new QueryClient();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evenicanpm/storefront-core",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"description": "Core module for D365/e4 Headless Storefront",
 	"type": "module",
 	"scripts": {
@@ -16,7 +16,7 @@
 	"author": "Evenica",
 	"license": "ISC",
 	"dependencies": {
-		"@evenicanpm/ui": "^1.3.0"
+		"@evenicanpm/ui": "^1.4.0"
 	},
 	"devDependencies": {
 		"@storybook/addon-docs": "^9.1.6",
@@ -49,5 +49,5 @@
 			"esbuild": "0.19.11"
 		}
 	},
-	"gitHead": "074f33378006dfc21ceb49456806a18dbb6e91ad"
+	"gitHead": "0614726ec6b7ce9564706514a6b756b390a13e96"
 }

package/src/api-manager/datasources/d365/d365-address.datasource.ts

@@ -42,7 +42,7 @@ class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
 		const added = updatedCustomer.Addresses?.find((a) =>
 			prevAddresses.every((old) => old.RecordId !== a.RecordId),
 		);
-		if (!added || added.RecordId == null) {
+		if (added?.RecordId == null) {
 			throw new Error("Failed to create new address");
 		}
 
@@ -73,7 +73,7 @@ class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
 
 		const updatedCustomer = await updateAsync(context as any, customer);
 		const rec = updatedCustomer?.Addresses?.[idx];
-		if (!rec || rec.RecordId == null) {
+		if (rec?.RecordId == null) {
 			throw new Error(
 				`Failed to update address Id=${address.Id}. Updated address record with a matching id not found.`,
 			);

package/src/api-manager/datasources/d365/d365-cart.datasource.ts

@@ -105,8 +105,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		const context = this.context;
 		const { totalAmount, hideBillingAddress, origin } = input;
 		const paymentAcceptSettings: CardPaymentAcceptSettings = {
-			AdaptorPath:
-				(typeof window !== "undefined" && `${origin}/Connectors`) || undefined,
+			AdaptorPath: globalThis?.window ? `${origin}/Connectors` : undefined,
 			CardPaymentEnabled: true,
 			CardTokenizationEnabled: true,
 			HideBillingAddress: hideBillingAddress || false,
@@ -259,14 +258,14 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		const id = input?.cartId ?? (await getCartCookie());
 		let cart: DynCart;
 
-		if (!id) {
-			return this.createCart(context);
-		} else {
+		if (id) {
 			cart = (await readAsync(context as any, id)) as DynCart;
 			if (!cart) {
 				return this.createCart(context);
 			}
 			return await mergeCartWithProducts(cart, this.context);
+		} else {
+			return this.createCart(context);
 		}
 	}
 

package/src/api-manager/datasources/d365/d365-categories.datasource.ts

@@ -32,7 +32,7 @@ class D365CategoriesDatasource
 				"Error fetching categories:",
 				JSON.stringify(error, null, 2),
 			);
-			throw error;
+			return [];
 		}
 	}
 }

package/src/api-manager/datasources/d365/d365-product.datasource.ts

@@ -26,8 +26,10 @@ import {
 	type ProductSearchCriteria,
 	type ProductSearchResult,
 	type SimpleProduct,
+	executeAction,
 } from "@msdyn365-commerce/retail-proxy";
 import {
+	createSearchByCriteriaInput,
 	getActivePricesAsync,
 	getAttributeValuesAsync,
 	getByIdAsync,
@@ -147,6 +149,10 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 		}
 
 		const refinerSearchSettings = { ...searchCriteria };
+		const queryResultSettingsWithCount: IQueryResultSettings = {
+			...(queryResultSettings ?? {}),
+			count: true,
+		};
 
 		//Remove the price refiner from the refinement to stop the price adjustment
 		refinerSearchSettings.Refinement = refinerSearchSettings.Refinement?.filter(
@@ -154,17 +160,25 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 		);
 
 		const ctx = { ...context } as any;
-		ctx.queryResultSettings = queryResultSettings;
-		const productSearchPromise = searchByCriteriaAsync(ctx, searchCriteria);
-		const refinersPRomise = getProductSearchRefinersAsync(
+		ctx.queryResultSettings = queryResultSettingsWithCount;
+		const searchRequest = createSearchByCriteriaInput(
+			queryResultSettingsWithCount,
+			searchCriteria,
+		);
+		const productSearchResult = executeAction<ProductSearchResult[]>(
+			searchRequest,
+			ctx,
+		);
+		const refinersPromise = getProductSearchRefinersAsync(
 			ctx,
 			refinerSearchSettings,
 		);
 		const [productResults, refinerResults] = await Promise.all([
-			productSearchPromise,
-			refinersPRomise,
+			productSearchResult,
+			refinersPromise,
 		]);
-		const count = productSearchPromise.metadata?.count || 500; //Set to high number for pagination
+
+		const count = (searchRequest as any)?._totalCount ?? productResults.length;
 		const promises = [];
 		for (const product of productResults) {
 			promises.push(
@@ -219,7 +233,7 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 			);
 		}
 		await Promise.all(promises);
-		const parsed = JSON.parse(JSON.stringify(results));
+		const parsed = globalThis.structuredClone(results);
 		return parsed;
 	}
 

package/src/api-manager/datasources/d365/d365-session.datasource.ts

@@ -1,24 +1,22 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-//import { getContextFromCookie } from "./utils/get-context-cookie";
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
-//import { Customer, ICallerContext } from "@msdyn365-commerce/retail-proxy";
-//import { readAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
 import type { Session } from "@evenicanpm/storefront-core/src/api-manager/schemas/session.schema";
 import type { SessionApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 
 class D365SessionDatasource extends D365DatasourceBase implements SessionApi {
 	async sessionInit(): Promise<Session> {
 		console.warn("sessionInit not implemented");
-		return Promise.resolve({} as Session);
+		return {} as Session;
 	}
+
 	async sessionLogout(): Promise<boolean> {
 		return true;
 	}
-	getSession(): Promise<Session> {
-		//throw new Error("Method not implemented");
+
+	async getSession(): Promise<Session> {
 		console.warn("getSession not implemented on d365");
-		return Promise.resolve({} as Session);
+		return {} as Session;
 	}
 }
 

package/src/api-manager/datasources/d365/d365-user.datasource.ts

@@ -124,7 +124,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 			);
 			return wishlistProductData;
 		} catch (error) {
-			throw new Error("Error getting wishlists: " + error);
+			throw new Error(`Error getting wishlists: ${error}`);
 		}
 	}
 
@@ -136,7 +136,9 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		try {
 			wishlist = await wishlistReadAsync(context as any, input.Id);
 		} catch (error) {
-			throw new Error("Error getting wishlist details" + JSON.stringify(error));
+			throw new Error(
+				`Error getting wishlist details: ${JSON.stringify(error)}`,
+			);
 		}
 
 		const extendedWishlist = { ...wishlist } as ExtendedWishlist;
@@ -154,7 +156,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 						id: uniq(productIds),
 					});
 				} catch (error) {
-					throw new Error("Error getting wishlist products: " + error);
+					throw new Error(`Error getting wishlist products: ${error}`);
 				}
 
 				if (products) {
@@ -181,11 +183,11 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		try {
 			const wishlist = await createProductListAsync(
 				context as any,
-				productList as ProductList,
+				productList,
 			);
 			return wishlist;
 		} catch (error) {
-			throw new Error("Error creating wishlist: " + JSON.stringify(error));
+			throw new Error(`Error creating wishlist: ${JSON.stringify(error)}`);
 		}
 	}
 
@@ -197,22 +199,10 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		try {
 			await deleteAsync(context as any, { Id: input.Id });
 		} catch (error) {
-			throw new Error("Error deleting wishlist: " + error);
+			throw new Error(`Error deleting wishlist: ${error}`);
 		}
 	}
 
-	// async updateWishlist(input: WishlistLinesInput): Promise<Wishlist> {
-	//   const context = await getContextFromCookie();
-
-	//   try {
-	//     const wishlist = await updateAsync(context as any, input);
-	//     return wishlist;
-	//   } catch (error) {
-	//     console.log('input', input);
-	//     throw new Error("Error updating wishlist: " + error);
-	//   }
-	// }
-
 	async updateWishlist(input: WishlistLinesInput): Promise<Wishlist> {
 		const context = this.context;
 		const id = input.Id;
@@ -227,7 +217,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 			const wishlist = { Id: id, productListLines: updatedProductListLines };
 			return wishlist;
 		} catch (error) {
-			throw new Error("Error updating wishlist: " + error);
+			throw new Error(`Error updating wishlist: ${error}`);
 		}
 	}
 
@@ -246,11 +236,10 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 			const wishlist = { Id: id, productListLines: updatedProductListLines };
 			return wishlist;
 		} catch (error) {
-			throw new Error("Error adding to wishlist: " + error);
+			throw new Error(`Error adding to wishlist: ${error}`);
 		}
 	}
 
-	// TODO: void return
 	async removeProductsFromWishlist(input: WishlistLinesInput): Promise<void> {
 		const context = this.context;
 		const id = input.Id;
@@ -258,7 +247,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		try {
 			await removeProductListLinesAsync(context as any, id, productListLines);
 		} catch (error) {
-			throw new Error("Error removing from wishlist: " + error);
+			throw new Error(`Error removing from wishlist: ${error}`);
 		}
 	}
 
@@ -279,7 +268,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 			);
 			return wishlist;
 		} catch (error) {
-			throw new Error("Error copying cart to wishlist: " + error);
+			throw new Error(`Error copying cart to wishlist: ${error}`);
 		}
 	}
 }

package/src/api-manager/datasources/d365/d365.datasource.ts

@@ -41,5 +41,3 @@ export class D365Datasource extends Datasource implements PrimaryDatasource {
 	}
 	// Datasources
 }
-
-// export default d365Datasource;

package/src/api-manager/datasources/d365/index.ts

@@ -1,4 +1,2 @@
-import { D365Datasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365.datasource";
-import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
-
-export { D365ProductDatasource, D365Datasource };
+export { D365Datasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365.datasource";
+export { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";

package/src/api-manager/datasources/d365/utils/decode-jwt.ts

@@ -1,9 +1,8 @@
 "use server";
-import { getSecret } from "@evenicanpm/common-core/src/lib/keyvault";
 import { decode } from "next-auth/jwt";
 
 export async function decodeToken(token: string) {
-	const secret = getSecret("NEXTAUTH_SECRET");
+	const secret = process.env.NEXTAUTH_SECRET; //this shouldn't be from key vault.
 	if (!secret) {
 		throw new Error("Environment variable NEXTAUTH_SECRET is not set.");
 	}

package/src/api-manager/datasources/d365/utils/parse-object.ts

@@ -1,6 +1,6 @@
 const parseObject = async <TClass>(data: TClass): Promise<TClass> => {
 	try {
-		return JSON.parse(JSON.stringify(await data)) as TClass;
+		return globalThis.structuredClone(await data) as TClass;
 	} catch {
 		return {} as TClass;
 	}

package/src/api-manager/datasources/e4/address/e4-address.remaps.ts

@@ -16,7 +16,7 @@ export const addressMap = {
 		{
 			key: "[].RecordId",
 			transform: (id: string) => {
-				if (id !== null) return parseInt(id);
+				if (id !== null) return Number.parseInt(id);
 			},
 		},
 	],
@@ -25,7 +25,7 @@ export const addressMap = {
 	"[].addressType.id": {
 		key: "[].AddressTypeValue",
 		transform: (id: string) => {
-			if (id !== null) return parseInt(id);
+			if (id !== null) return Number.parseInt(id);
 		},
 	},
 	"[].address1": "[].Street",

package/src/api-manager/datasources/e4/address/e4-address.translator.ts

@@ -88,7 +88,7 @@ export const countriesTransformValidate = (countries: Country[]) => {
 };
 
 export const countryTransformValidate = (country: Country) => {
-	if (country?.state && country?.state.length) {
+	if (country?.state?.length) {
 		return merge(country, countryMap);
 	}
 	return [];

package/src/api-manager/datasources/e4/cart/e4-cart.datasource.ts

@@ -3,7 +3,6 @@ import * as cartTranslator from "@evenicanpm/storefront-core/src/api-manager/dat
 import type { Cart as E4Cart } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/graphqlRequestSdk";
 import getGraphqlClient from "@evenicanpm/storefront-core/src/api-manager/lib/get-graphql-client";
 import type * as cartSchema from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
 import type { SalesOrder } from "@evenicanpm/storefront-core/src/api-manager/schemas/order.schema";
 import type { CartApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import type {
@@ -15,7 +14,7 @@ import type {
 
 const cart: CartApi = {
 	//For this data source, initCart does the same thing as getCart
-	async initCart(): Promise<Cart> {
+	async initCart(): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { data, errors } = await e4Api.e4CartReadMD();
@@ -30,7 +29,7 @@ const cart: CartApi = {
 		return transformedData;
 	},
 
-	async addToCart(input: cartSchema.AddToCartInput): Promise<Cart> {
+	async addToCart(input: cartSchema.AddToCartInput): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { cartLine } = input;
@@ -53,7 +52,9 @@ const cart: CartApi = {
 		return transformedData;
 	},
 
-	async updateCart(input: cartSchema.UpdateCartInput): Promise<Cart> {
+	async updateCart(
+		input: cartSchema.UpdateCartInput,
+	): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { cart } = input;
@@ -95,7 +96,9 @@ const cart: CartApi = {
 		return transformedData;
 	},
 
-	async updateCartLines(input: cartSchema.UpdateCartLineInput): Promise<Cart> {
+	async updateCartLines(
+		input: cartSchema.UpdateCartLineInput,
+	): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { cartLine } = input;
@@ -124,7 +127,9 @@ const cart: CartApi = {
 		return transformedData;
 	},
 
-	async deleteCartLine(input: cartSchema.DeleteCartLineInput): Promise<Cart> {
+	async deleteCartLine(
+		input: cartSchema.DeleteCartLineInput,
+	): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { cartLine } = input;
@@ -148,7 +153,7 @@ const cart: CartApi = {
 		return transformedData;
 	},
 
-	async getCart(): Promise<Cart> {
+	async getCart(): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { data, errors } = await e4Api.e4CartReadMD();
@@ -163,21 +168,17 @@ const cart: CartApi = {
 		return transformedData;
 	},
 
-	async addDiscountCode(): Promise<Cart> {
-		if (true) {
-			throw new Error("Error adding discount code");
-		}
+	async addDiscountCode(): Promise<cartSchema.Cart> {
+		throw new Error("Error adding discount code");
 	},
 
-	async removeDiscountcode(): Promise<Cart> {
-		if (true) {
-			throw new Error("Error removing discount code");
-		}
+	async removeDiscountcode(): Promise<cartSchema.Cart> {
+		throw new Error("Error removing discount code");
 	},
 
 	async updateLineDeliveryMode(
 		input: cartSchema.UpdateCartLineDeliveryModeInput,
-	): Promise<Cart> {
+	): Promise<cartSchema.Cart> {
 		const e4Api = await getGraphqlClient();
 
 		const { data, errors } = await e4Api.e4ShippingMethodUpdateMD({
@@ -197,22 +198,16 @@ const cart: CartApi = {
 		);
 	},
 
-	async removeLineDeliveryMode(): Promise<Cart> {
-		if (true) {
-			throw new Error("Error updating cart line delivery mode");
-		}
+	async removeLineDeliveryMode(): Promise<cartSchema.Cart> {
+		throw new Error("Error updating cart line delivery mode");
 	},
 
 	async getCardAcceptPoint(): Promise<CardPaymentAcceptPoint> {
-		if (true) {
-			throw new Error("Error getCardAcceptPoint");
-		}
+		throw new Error("Error getCardAcceptPoint");
 	},
 
 	async retrieveCardPaymentAcceptResult(): Promise<CardPaymentAcceptResult> {
-		if (true) {
-			throw new Error("Error retrieveCardPaymentAcceptResult");
-		}
+		throw new Error("Error retrieveCardPaymentAcceptResult");
 	},
 
 	async checkout(): Promise<SalesOrder> {
@@ -223,9 +218,14 @@ const cart: CartApi = {
 			const chars =
 				"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 			let token = "";
+
+			const randomValues = new Uint32Array(length);
+			crypto.getRandomValues(randomValues);
+
 			for (let i = 0; i < length; i++) {
-				token += chars[Math.floor(Math.random() * chars.length)];
+				token += chars[randomValues[i] % chars.length];
 			}
+
 			return token;
 		};
 
@@ -244,6 +244,7 @@ const cart: CartApi = {
 			SalesLines: [],
 		};
 	},
+
 	getCartLinesInventory: (
 		_input: cartSchema.InventorySearchCartLinesCriteriaInput,
 	): Promise<ProductWarehouseInventoryInformation> => {

package/src/api-manager/datasources/e4/cart/e4-cart.remaps.ts

@@ -42,7 +42,7 @@ export const cartLineMap = {
 	"[].product.id": {
 		key: "[].ProductId",
 		transform: (id: string) => {
-			if (id !== null) return parseInt(id);
+			if (id !== null) return Number.parseInt(id);
 		},
 	},
 	"[].product.code": "[].ItemId",

package/src/api-manager/datasources/e4/cart/e4-cart.translator.ts

@@ -14,7 +14,7 @@ import { merge } from "object-mapper";
  * @returns the transformed cart object
  */
 export const cartTransformValidate = (cart: E4Cart): Cart => {
-	if (!(cart && cart?.id)) throw new Error("Not a valid cart");
+	if (!cart?.id) throw new Error("Not a valid cart");
 	const transformedData = merge(cart, cartMap);
 	try {
 		extendedCartSchema.parse(transformedData);

package/src/api-manager/datasources/e4/categories/e4-categories.translator.ts

@@ -11,31 +11,31 @@ interface TransformedCategoryNode extends Category {
 	ParentCategory?: number;
 }
 
+function generateSlug(name: string): string {
+	if (!name) return "";
+	return name
+		.toLowerCase()
+		.replaceAll(/\s+/g, "-")
+		.replaceAll(/[^\w-]+/g, "")
+		.replaceAll(/--+/g, "-")
+		.replace(/^-+/, "")
+		.replace(/-+$/, "");
+}
+
 export const categoryTransformValidate = (
 	rawCategories: E4Category[],
 	rootParentId = 1,
 	urlPrefix = "e4",
 ): CategoryHierarchy[] => {
-	function generateSlug(name: string): string {
-		if (!name) return "";
-		return name
-			.toLowerCase()
-			.replace(/\s+/g, "-")
-			.replace(/[^\w-]+/g, "")
-			.replace(/--+/g, "-")
-			.replace(/^-+/, "")
-			.replace(/-+$/, "");
-	}
-
 	function createTransformedNode(
 		rawCategory: E4Category,
 	): TransformedCategoryNode | null {
 		let recordIdNum: number;
 		try {
-			recordIdNum = parseInt(String(rawCategory.id), 10);
-			if (isNaN(recordIdNum)) throw new Error("Invalid RecordId");
+			recordIdNum = Number.parseInt(String(rawCategory.id), 10);
+			if (Number.isNaN(recordIdNum)) throw new Error("Invalid RecordId");
 		} catch (e) {
-			console.warn(`Skipping category due to invalid id:`, rawCategory);
+			console.warn(`Skipping category due to invalid id:`, rawCategory, e);
 			return null;
 		}
 
@@ -43,13 +43,13 @@ export const categoryTransformValidate = (
 		const slug = generateSlug(categoryName);
 		let parentIdNum: number | undefined;
 		if (rawCategory.parentId != null) {
-			const parsedParentId = parseInt(String(rawCategory.parentId), 10);
-			if (!isNaN(parsedParentId)) parentIdNum = parsedParentId;
-			else
+			const parsedParentId = Number.parseInt(String(rawCategory.parentId), 10);
+			if (Number.isNaN(parsedParentId))
 				console.warn(
 					`Invalid parentId format for id ${recordIdNum}:`,
 					rawCategory.parentId,
 				);
+			else parentIdNum = parsedParentId;
 		}
 
 		const node: TransformedCategoryNode = {
@@ -94,9 +94,9 @@ export const categoryTransformValidate = (
 		categoryNode.Url = `${currentPath}/${categoryNode.RecordId}`;
 		// Check if Children exists before iterating
 		if (categoryNode?.Children && categoryNode?.Children?.length > 0) {
-			categoryNode.Children.forEach((child: TransformedCategoryNode) =>
-				calculateUrls(child, currentPath, prefix),
-			);
+			categoryNode.Children.forEach((child: TransformedCategoryNode) => {
+				calculateUrls(child, currentPath, prefix);
+			});
 		}
 	}