@evenicanpm/storefront-core 1.8.4 → 2.0.1

package/.storybook/main.ts

@@ -1,12 +1,11 @@
+import { dirname, join, resolve } from "node:path";
 import type { StorybookConfig } from "@storybook/react-webpack5";
 
-import { dirname, join, resolve } from "path";
-
 /**
  * This function is used to resolve the absolute path of a package.
  * It is needed in projects that use Yarn PnP or are set up within a monorepo.
  */
-function getAbsolutePath(value: string): any {
+function getAbsolutePath(value: string): string {
 	return dirname(require.resolve(join(value, "package.json")));
 }
 const config: StorybookConfig = {

package/.storybook/preview.tsx

@@ -1,8 +1,6 @@
 import type { Preview } from "@storybook/react-webpack5";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { NextIntlClientProvider } from "next-intl";
-import React from "react";
-import { sb } from "storybook/test";
 import messages from "../../../../../storefront/messages/en-US.json";
 import { queryClient } from "../__mocks__/query-client.ts";
 import { NotificationProvider } from "../src/providers/notifications/notification-context.tsx";

package/__mocks__/create-mutation.ts

@@ -1,23 +1,31 @@
 import { queryClient } from "./query-client";
 
+type MutationInput = {
+	cartLine?: Array<{ Quantity?: number }>;
+} & Record<string, unknown>;
+
+type CartMockData = {
+	CartLines: Array<Record<string, unknown>>;
+} & Record<string, unknown>;
+
 /**
  *
  * Mocking up at the react-query level because our components
  * rely on react-query for triggering re-renders and state subscriptions.
  *
  */
-export const useCreateMutation = (apiManagerPath: any) => {
+export const useCreateMutation = (apiManagerPath: readonly unknown[]) => {
 	switch (apiManagerPath[1]) {
 		case "updateCartLines":
 			return {
-				mutate: (input: any) => {
+				mutate: (input: MutationInput) => {
 					console.log(input);
-					queryClient.setQueryData(["cart"], (oldData: any) => ({
+					queryClient.setQueryData(["cart"], (oldData: CartMockData) => ({
 						...oldData,
 						CartLines: [
 							{
 								...oldData.CartLines[0],
-								Quantity: input?.cartLine[0]?.Quantity,
+								Quantity: input.cartLine?.[0]?.Quantity,
 							},
 						],
 					}));
@@ -25,9 +33,9 @@ export const useCreateMutation = (apiManagerPath: any) => {
 			};
 		case "deleteCartLine":
 			return {
-				mutate: (input: any) => {
+				mutate: (input: MutationInput) => {
 					console.log(input);
-					queryClient.setQueryData(["cart"], (oldData: any) => ({
+					queryClient.setQueryData(["cart"], (oldData: CartMockData) => ({
 						...oldData,
 						CartLines: [],
 					}));
@@ -35,9 +43,9 @@ export const useCreateMutation = (apiManagerPath: any) => {
 			};
 		case "addToCart":
 			return {
-				mutate: (input: any) => {
+				mutate: (input: MutationInput) => {
 					console.log(input);
-					queryClient.setQueryData(["cart"], (oldData: any) => ({
+					queryClient.setQueryData(["cart"], (oldData: CartMockData) => ({
 						...oldData,
 						CartLines: [
 							{

package/__mocks__/next-image.tsx

@@ -1,9 +1,18 @@
 // __mocks__/next/image.js
-const Image = (props) => {
+type ImageProps = {
+	alt?: string;
+} & Record<string, unknown>;
+
+const Image = (props: ImageProps) => {
 	const { alt = "", ...rest } = props;
 
-	// eslint-disable-next-line @next/next/no-img-element
-	return <img alt={alt} {...rest} />;
+	return {
+		$$typeof: Symbol.for("react.element"),
+		type: "img",
+		key: null,
+		ref: null,
+		props: { alt, ...rest },
+	};
 };
 
 export default Image;

package/docs.tsconfig.json

@@ -26,10 +26,10 @@
 		}
 	},
 	"include": [
-		"src/components-v2/product-dimensions",
-		"src/components-v2/product-quantity-buttons",
-		"src/components-v2/products-view",
-		"src/components-v2/search-bar",
-		"src/components-v2/section"
+		"src/components/product-dimensions",
+		"src/components/product-quantity-buttons",
+		"src/components/products-view",
+		"src/components/search-bar",
+		"src/components/section"
 	]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evenicanpm/storefront-core",
-	"version": "1.8.4",
+	"version": "2.0.1",
 	"description": "Core module for D365/e4 Headless Storefront",
 	"type": "module",
 	"scripts": {
@@ -16,7 +16,7 @@
 	"author": "Evenica",
 	"license": "ISC",
 	"dependencies": {
-		"@evenicanpm/ui": "^1.8.1"
+		"@evenicanpm/ui": "^2.0.0"
 	},
 	"devDependencies": {
 		"@storybook/addon-docs": "^9.1.6",
@@ -49,5 +49,5 @@
 			"esbuild": "0.19.11"
 		}
 	},
-	"gitHead": "1d78147b4f2d66540a4c410afb2227fbe2ae0d0f"
+	"gitHead": "bbaff05f6f592114ad7a25caeee531e4fa1b14cf"
 }

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

@@ -382,7 +382,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			}
 		});
 
-		let shippingData;
+		let shippingData: ProductWarehouseInventoryInformation | undefined;
 		if (shippingItems.length) {
 			try {
 				const searchCriteria: InventoryAvailabilitySearchCriteria = {
@@ -392,24 +392,29 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 					SearchArea: input.searchCriteria.searchArea,
 					FilterByChannelFulfillmentGroup: true,
 				};
-				shippingData = await getEstimatedAvailabilityAsync(
+				const shippingAsyncResult = await getEstimatedAvailabilityAsync(
 					context as any,
 					searchCriteria,
 				);
+				shippingData =
+					shippingAsyncResult as ProductWarehouseInventoryInformation;
 			} catch (error) {
 				console.error("Error getting shipping inventory:", error);
 				throw error;
 			}
 		}
 
-		let warehouseData;
+		let warehouseData: ProductWarehouseInventoryInformation | undefined;
 		if (bopisItems.length) {
 			try {
-				warehouseData = await getEstimatedProductWarehouseAvailabilityAsync(
-					context as any,
-					bopisItems,
-					2,
-				);
+				const warehouseAsyncResult =
+					await getEstimatedProductWarehouseAvailabilityAsync(
+						context as any,
+						bopisItems,
+						2,
+					);
+				warehouseData =
+					warehouseAsyncResult as ProductWarehouseInventoryInformation;
 			} catch (error) {
 				console.error("Error getting pick up inventory:", error);
 				throw error;

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

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 import type { CategoryApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
@@ -7,6 +5,7 @@ import {
 	mapCategoryToHierarchy,
 } from "@evenicanpm/storefront-core/src/lib/category-helpers";
 import { getCategoriesAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CategoriesDataActions.g";
+import type { IContext } from "@msdyn365-commerce/retail-proxy/dist/Interfaces/ICallerContext";
 
 class D365CategoriesDatasource
 	extends D365DatasourceBase
@@ -16,7 +15,7 @@ class D365CategoriesDatasource
 		const context = this.context;
 		try {
 			const categories = await getCategoriesAsync(
-				context as any,
+				context as unknown as IContext,
 				context.requestContext.apiSettings.channelId,
 				0,
 			);

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

@@ -1,10 +1,9 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
 import type {
 	GetSalesOrderDetailsInput,
 	SalesOrder,
+	SalesOrderInput,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/order.schema";
 import type { OrderApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
@@ -12,11 +11,12 @@ import {
 	type ICallerContext,
 	SearchLocation,
 } from "@msdyn365-commerce/retail-proxy";
+import type { IContext } from "@msdyn365-commerce/retail-proxy/dist/Interfaces/ICallerContext";
 import { getSalesOrderDetailsByTransactionIdAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/SalesOrdersDataActions.g";
 import uniq from "lodash/uniq";
 
 class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
-	getSalesOrders(): Promise<any> {
+	getSalesOrders(_input: SalesOrderInput): Promise<SalesOrder[]> {
 		throw new Error("Method not implemented.");
 	}
 	async getSalesOrderDetails(
@@ -26,7 +26,7 @@ class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
 		const { transactionId } = input;
 		try {
 			const data = await getSalesOrderDetailsByTransactionIdAsync(
-				context as any,
+				context as unknown as IContext,
 				transactionId,
 				SearchLocation.All,
 			);

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

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 import type {
 	ChannelConfiguration,
@@ -11,6 +9,7 @@ import type { OrganizationApi } from "@evenicanpm/storefront-core/src/api-manage
 import type {
 	ChannelDeliveryOption,
 	ICallerContext,
+	IContext,
 } from "@msdyn365-commerce/retail-proxy";
 import {
 	getChannelDeliveryOptionsAsync,
@@ -23,15 +22,23 @@ class D365OrganizationDatasource
 	extends D365DatasourceBase
 	implements OrganizationApi
 {
+	private getRetailContext(context: ICallerContext): IContext {
+		return { callerContext: context };
+	}
+
 	async getStoresList(
 		input: GetOrgUnitLocationsByAreaInput,
 	): Promise<OrgUnitLocationReturnType[]> {
 		const context = this.context;
 		const { queryResultSettings, searchArea, deliveryModeTypeFilter } = input;
-		const ctx = { ...context } as any;
-		ctx.queryResultSettings = queryResultSettings;
+		const ctx: IContext & {
+			queryResultSettings?: GetOrgUnitLocationsByAreaInput["queryResultSettings"];
+		} = {
+			...this.getRetailContext(context),
+			queryResultSettings,
+		};
 		const locations = await getOrgUnitLocationsByAreaAsync(
-			ctx as any,
+			ctx,
 			searchArea,
 			deliveryModeTypeFilter,
 		);
@@ -56,7 +63,7 @@ class D365OrganizationDatasource
 
 	async getChannelConfiguration(): Promise<ChannelConfiguration> {
 		const context = this.context;
-		return getOrgUnitConfigurationAsync(context as any);
+		return getOrgUnitConfigurationAsync(this.getRetailContext(context));
 	}
 
 	async getStoreHours(
@@ -65,7 +72,7 @@ class D365OrganizationDatasource
 		context: ICallerContext,
 	): Promise<OrgUnitLocationReturnType> {
 		const storeHours = await getStoreHoursAsync(
-			context as any,
+			this.getRetailContext(context),
 			store.OrgUnitNumber,
 		);
 		return {
@@ -81,7 +88,7 @@ class D365OrganizationDatasource
 	): Promise<ChannelDeliveryOption[] | undefined> {
 		const DELIVERY_OPTION_TYPE = 4; //This is to get all pickup modes, not sure where the number comes from.
 		const channelDeliveryOptions = await getChannelDeliveryOptionsAsync(
-			context as any,
+			this.getRetailContext(context),
 			channelList,
 			DELIVERY_OPTION_TYPE,
 		);

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

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 import D365CategoriesDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-categories.datasource";
 import { createDimSearchCriteria } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/create-search-criteria";
@@ -17,8 +15,12 @@ import type {
 	SearchByCriteriaResponse,
 	searchProductsInput,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
+import type { CategoriesQuery } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/graphqlRequestSdk";
 import type { ProductApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
+	executeAction,
+	type ICallerContext,
+	type IContext,
 	type InventoryAvailabilitySearchCriteria,
 	type IQueryResultSettings,
 	type ProductPrice,
@@ -26,7 +28,6 @@ import {
 	type ProductSearchCriteria,
 	type ProductSearchResult,
 	type SimpleProduct,
-	executeAction,
 } from "@msdyn365-commerce/retail-proxy";
 import {
 	createSearchByCriteriaInput,
@@ -56,6 +57,10 @@ const setFullProductImgUrl = async (
 };
 
 class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
+	private getRetailContext(context: ICallerContext): IContext {
+		return { callerContext: context };
+	}
+
 	/**
 	 * Gets product by id, sets full image url and dimension values
 	 * @params input GetProductByIdInput
@@ -66,7 +71,7 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 		const channelId = context.requestContext.apiSettings.channelId;
 
 		const product = await getByIdAsync(
-			context as any,
+			this.getRetailContext(context),
 			Number(input.id),
 			channelId,
 		);
@@ -79,14 +84,14 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 		const dimensionPromises =
 			product?.Dimensions?.map(async ({ DimensionTypeValue }) => {
 				return getDimensionValuesWithEstimatedAvailabilitiesAsync(
-					context as any,
+					this.getRetailContext(context),
 					product?.RecordId,
 					createDimSearchCriteria(DimensionTypeValue),
 				);
 			}) || [];
 
 		const attributesPromise = getAttributeValuesAsync(
-			context as any,
+			this.getRetailContext(context),
 			product?.RecordId,
 			channelId,
 			0,
@@ -107,7 +112,7 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 	async getProductByIds(input: GetProductByIdsInput) {
 		const context = this.context;
 		const products = await getByIdsAsync(
-			context as any,
+			this.getRetailContext(context),
 			context.requestContext.apiSettings.channelId,
 			input?.id.map(Number),
 		);
@@ -159,8 +164,10 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 			(r) => r.RefinerSourceValue !== ProductRefinerSource.Price,
 		);
 
-		const ctx = { ...context } as any;
-		ctx.queryResultSettings = queryResultSettingsWithCount;
+		const ctx: IContext & { queryResultSettings?: IQueryResultSettings } = {
+			...this.getRetailContext(context),
+			queryResultSettings: queryResultSettingsWithCount,
+		};
 		const searchRequest = createSearchByCriteriaInput(
 			queryResultSettingsWithCount,
 			searchCriteria,
@@ -178,7 +185,9 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 			refinersPromise,
 		]);
 
-		const count = (searchRequest as any)?._totalCount ?? productResults.length;
+		const count =
+			(searchRequest as { _totalCount?: number })._totalCount ??
+			productResults.length;
 		const promises = [];
 		for (const product of productResults) {
 			promises.push(
@@ -198,7 +207,9 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 
 	async searchProducts(input: searchProductsInput) {
 		const context = this.context;
-		const ctx = { ...context } as any;
+		const ctx: IContext & { queryResultSettings?: IQueryResultSettings } = {
+			...this.getRetailContext(context),
+		};
 		const queryResultSettings: IQueryResultSettings = {
 			Paging: {
 				Skip: 0,
@@ -222,7 +233,10 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 				ItemId: id,
 			}));
 		}
-		const results = await searchByCriteriaAsync(ctx as any, searchCriteria);
+		const observableResults = await searchByCriteriaAsync(ctx, searchCriteria);
+		const results: ProductSearchResult[] = Array.from(
+			observableResults as Iterable<ProductSearchResult>,
+		);
 		const promises = [];
 		for (const product of results) {
 			promises.push(
@@ -233,22 +247,23 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 			);
 		}
 		await Promise.all(promises);
-		const parsed = globalThis.structuredClone(results);
-		return parsed;
+		return results;
 	}
 
-	async getCategoryList(): Promise<any> {
+	async getCategoryList(): Promise<CategoriesQuery> {
 		// TODO ? Why is the get category list here and calling the category data source. Can we decide if we want to have a separate one for categories or remove this?
 		// agree with above statement - sam
 		const categoriesDatasource = new D365CategoriesDatasource(this.context);
 		const categories = await categoriesDatasource.getCategories();
-		return { categories: { category: categories } };
+		return {
+			categories: { category: categories },
+		} as unknown as CategoriesQuery;
 	}
 
 	async getRelatedProducts(input: GetRelatedProductsInput) {
 		const context = this.context;
 		return getRelatedProductsAsync(
-			context as any,
+			this.getRetailContext(context),
 			context.requestContext.apiSettings.channelId,
 			input.id,
 			0,
@@ -267,7 +282,7 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 				FilterByChannelFulfillmentGroup: true,
 			};
 			const data = await getEstimatedAvailabilityAsync(
-				context as any,
+				this.getRetailContext(context),
 				searchCriteria,
 			);
 			return data;
@@ -287,7 +302,7 @@ class D365ProductDatasource extends D365DatasourceBase implements ProductApi {
 
 		try {
 			const data = await getActivePricesAsync(
-				context as any,
+				this.getRetailContext(context),
 				projectionDomain,
 				input.productIds,
 				new Date(),

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

@@ -1,11 +1,11 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
 import type { UserApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
 	type CommerceProperty,
 	type Customer,
+	type ICallerContext,
+	type IContext,
 	type ProductList,
 	type ProductListSearchCriteria,
 	ProductListType,
@@ -39,10 +39,29 @@ import type {
 	WishlistLinesInput,
 } from "@/schemas/user.schema";
 
+type IdTokenClaims = jwt.JwtPayload & {
+	emails?: string[];
+	email?: string;
+	given_name?: string;
+	family_name?: string;
+};
+
+function decodeIdTokenClaims(token: string): IdTokenClaims {
+	const decoded = jwt.decode(token);
+	return decoded as IdTokenClaims;
+}
+
 class D365UserDatasource extends D365DatasourceBase implements UserApi {
+	private getRetailContext(context: ICallerContext): IContext {
+		return { callerContext: context };
+	}
+
 	async updateUser(user: User): Promise<User> {
 		const context = this.context;
-		const existing: Customer = await readAsync(context as any, "");
+		const existing: Customer = await readAsync(
+			this.getRetailContext(context),
+			"",
+		);
 		existing.Addresses ??= [];
 		existing.Addresses = existing.Addresses.map((addr) => ({
 			...addr,
@@ -55,11 +74,13 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		);
 		existing.ExtensionProperties.push({
 			Key: propKey,
-			Value: { StringValue: user.DefaultShippingAddressId } as any,
+			Value: { StringValue: user.DefaultShippingAddressId } as NonNullable<
+				CommerceProperty["Value"]
+			>,
 		});
 		const updated: Customer = await updateAsync(
-			context as any,
-			existing as any,
+			this.getRetailContext(context),
+			existing,
 		);
 		const mappedAddresses = (updated.Addresses ?? []).map((a) => ({
 			...a,
@@ -76,10 +97,10 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		if (!context.requestContext.user.isAuthenticated) return null;
 		let customer: Customer;
 		try {
-			customer = await readAsync(context as any, "");
+			customer = await readAsync(this.getRetailContext(context), "");
 		} catch {
-			const token = jwt.decode(context.requestContext.user.token) as any;
-			customer = await createCustomerAsync(context as any, {
+			const token = decodeIdTokenClaims(context.requestContext.user.token);
+			customer = await createCustomerAsync(this.getRetailContext(context), {
 				AccountNumber: "",
 				Email: Array.isArray(token.emails) ? token.emails[0] : token.email,
 				FirstName: token.given_name,
@@ -113,11 +134,11 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 
 		try {
 			const wishlists = await searchAsync(
-				context as any,
+				this.getRetailContext(context),
 				productListSearchCriteria,
 			);
 			const wishlistProductDataPromises = wishlists.map((wishlist) => {
-				return wishlistReadAsync(context as any, wishlist.Id);
+				return wishlistReadAsync(this.getRetailContext(context), wishlist.Id);
 			});
 			const wishlistProductData = await Promise.all(
 				wishlistProductDataPromises,
@@ -134,7 +155,10 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		const context = this.context;
 		let wishlist: Wishlist;
 		try {
-			wishlist = await wishlistReadAsync(context as any, input.Id);
+			wishlist = await wishlistReadAsync(
+				this.getRetailContext(context),
+				input.Id,
+			);
 		} catch (error) {
 			throw new Error(
 				`Error getting wishlist details: ${JSON.stringify(error)}`,
@@ -182,7 +206,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		};
 		try {
 			const wishlist = await createProductListAsync(
-				context as any,
+				this.getRetailContext(context),
 				productList,
 			);
 			return wishlist;
@@ -197,7 +221,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 			throw new Error("Wishlist ID is required for deletion.");
 		}
 		try {
-			await deleteAsync(context as any, { Id: input.Id });
+			await deleteAsync(this.getRetailContext(context), { Id: input.Id });
 		} catch (error) {
 			throw new Error(`Error deleting wishlist: ${error}`);
 		}
@@ -210,7 +234,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 
 		try {
 			const updatedProductListLines = await updateProductListLinesAsync(
-				context as any,
+				this.getRetailContext(context),
 				id,
 				productListLines,
 			);
@@ -228,7 +252,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 
 		try {
 			const updatedProductListLines = await addProductListLinesAsync(
-				context as any,
+				this.getRetailContext(context),
 				id,
 				productListLines,
 			);
@@ -245,7 +269,11 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		const id = input.Id;
 		const productListLines = input.ProductListLines;
 		try {
-			await removeProductListLinesAsync(context as any, id, productListLines);
+			await removeProductListLinesAsync(
+				this.getRetailContext(context),
+				id,
+				productListLines,
+			);
 		} catch (error) {
 			throw new Error(`Error removing from wishlist: ${error}`);
 		}
@@ -259,8 +287,8 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 		const isQuantityAggregate = true;
 
 		try {
-			const wishlist = copyCartToProductListAsync(
-				context as any,
+			const wishlist = await copyCartToProductListAsync(
+				this.getRetailContext(context),
 				productListId,
 				cartId,
 				isRewrite,

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