@evenicanpm/storefront-core 1.8.4 → 2.0.1

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

@@ -102,7 +102,7 @@ const cart: CartApi = {
 		const e4Api = await getGraphqlClient();
 
 		const { cartLine } = input;
-		let cart;
+		let cart: E4Cart | undefined;
 
 		for (const cl of cartLine) {
 			const { data, errors } = await e4Api.e4UpdateCartLineMD({
@@ -118,12 +118,14 @@ const cart: CartApi = {
 				throw new Error("Error updating cart lines");
 			}
 
-			cart = data.updateCartLine;
+			cart = data?.updateCartLine?.cart as E4Cart | undefined;
 		}
 
-		const transformedData = cartTranslator.cartTransformValidate(
-			cart?.cart as E4Cart,
-		);
+		if (!cart) {
+			throw new Error("Failed to update cart lines - no cart returned");
+		}
+
+		const transformedData = cartTranslator.cartTransformValidate(cart);
 		return transformedData;
 	},
 

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

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

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

@@ -146,9 +146,9 @@ export const categoryTransformValidate = (
 		}
 	});
 
-	rootNodes.forEach((rootNode: TransformedCategoryNode) =>
-		calculateUrls(rootNode, "", urlPrefix),
-	);
+	for (const rootNode of rootNodes as TransformedCategoryNode[]) {
+		calculateUrls(rootNode, "", urlPrefix);
+	}
 	rootNodes.sort(
 		(a, b) =>
 			(a.DisplayOrder ?? 0) - (b.DisplayOrder ?? 0) ||

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

@@ -34,7 +34,7 @@ export const productMap = {
 		{
 			key: "RecordId",
 			transform: (id: string) => {
-				if (id !== null) return Number.parseInt(id);
+				if (id !== null) return Number.parseInt(id, 10);
 			},
 		},
 	],
@@ -54,13 +54,13 @@ export const productPricesMap = {
 		{
 			key: "ProductId",
 			transform: (id: string) => {
-				if (id !== null) return Number.parseInt(id);
+				if (id !== null) return Number.parseInt(id, 10);
 			},
 		},
 		{
 			key: "ListingId",
 			transform: (id: string) => {
-				if (id !== null) return Number.parseInt(id);
+				if (id !== null) return Number.parseInt(id, 10);
 			},
 		},
 	],

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

@@ -305,7 +305,9 @@ export const productPricesTransformValidate = (
 		(p) => merge(p, productPricesMap) as ProductPrice,
 	);
 	try {
-		translatedData.forEach((pp: ProductPrice) => productPriceSchema.parse(pp));
+		for (const pp of translatedData) {
+			productPriceSchema.parse(pp);
+		}
 	} catch (e) {
 		console.warn("ProductPrice data does not match retail-proxy schema", e);
 	}

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

@@ -123,23 +123,19 @@ const user: UserApi = {
 			throw new Error("Error creating wishlist");
 		}
 	},
-	// @ts-expect-error
-	async updateWishlist(input: WishlistLinesInput): Promise<Wishlist> {
+	async updateWishlist(_input: WishlistLinesInput): Promise<Wishlist> {
 		throw new Error("updateWishlist not implemented");
 	},
 
-	// @ts-expect-error
-	async addProductsToWishlist(input: WishlistLinesInput): Promise<Wishlist> {
+	async addProductsToWishlist(_input: WishlistLinesInput): Promise<Wishlist> {
 		throw new Error("addProductsToWishlist not implemented");
 	},
 
-	// @ts-expect-error
-	async removeProductsFromWishlist(input: WishlistLinesInput): Promise<void> {
+	async removeProductsFromWishlist(_input: WishlistLinesInput): Promise<void> {
 		throw new Error("removeProductsFromWishlist not implemented");
 	},
 
-	// @ts-expect-error
-	async copyCartToWishlist(input: CopyCartToWishlistInput): Promise<Wishlist> {
+	async copyCartToWishlist(_input: CopyCartToWishlistInput): Promise<Wishlist> {
 		throw new Error("copyCartToWishlist not implemented");
 	},
 };

package/src/api-manager/index.ts

@@ -1,141 +1,23 @@
-// @ts-expect-error - this will be picked up by webpack
-import rawConfig from "@api-manager-config";
 import { D365Datasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/index";
 import { getContextFromCookie } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/get-context-cookie";
 import E4Datasource from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/e4.datasource";
-import type {
-	Datasource,
-	DatasourceApis,
-} from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-import { z } from "zod";
-
-type EntityNames = keyof DatasourceApis;
-
-interface Config {
-	primary: string;
-	secondary: string[];
-	overrides?: Partial<Record<EntityNames, string>>;
-}
-
-const Config = z.object({
-	primary: z.string(),
-	secondary: z.array(z.string()),
-	overrides: z.record(z.string(), z.string()),
-});
-
-const OVERRIDES_FILE = "./overrides.datasource.ts";
-const CORE_DATASOURCES = [
-	"user",
-	"session",
-	"cart",
-	"product",
-	"categories",
-	"order",
-	"address",
-	"organization",
-];
+import type { Datasource } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 
 /**
- * Loads up all specified apis/datasources based on parsed config
- * and returns the ApiManager object. Also handles "project" overrides
- * by checking inside a specific folder for API's. Will grab default export
- * from specified folder, validate the API schema and then prioritize returning
- * that from api-manager.
+ * Returns the active commerce datasource based on the API_MANAGER_PRIMARY
+ * environment variable. Defaults to "e4" when the variable is not set.
  *
- * In this way, we have two levels of configuration of the api-manager.
- * 1. actual JSON config
- * 2. overrides from storefront
- *
- * @returns ApiManager object.
+ * Supported values: "e4" | "d365"
  */
-async function createApiManager() {
-	try {
-		Config.parse(rawConfig);
-	} catch (error) {
-		if (error instanceof z.ZodError) {
-			console.error("Config validation failed:", error.issues);
-		}
-	}
+async function createApiManager(): Promise<Datasource> {
+	const primary = process.env.API_MANAGER_PRIMARY ?? "e4";
 
-	const storefrontOverrides: { [key: string]: any } = {};
-
-	// @ts-expect-error
-	function importAll(r) {
-		r.keys().forEach(
-			(key: keyof typeof storefrontOverrides) =>
-				(storefrontOverrides[key] = r(key)),
-		);
+	if (primary === "d365") {
+		const context = await getContextFromCookie();
+		return new D365Datasource("d365", context);
 	}
 
-	// Arguments must be literals not variables.
-	importAll(
-		// @ts-expect-error
-		require.context(
-			"@storefront/extensions/api-manager-overrides",
-			true,
-			/overrides\.datasource\.ts/,
-		),
-	);
-
-	const context = await getContextFromCookie();
-	const datasourceMap: Record<string, Datasource> = {
-		d365: new D365Datasource("d365", context),
-		e4: E4Datasource,
-		// Add more datasources here as needed
-	};
-
-	const config = rawConfig as Config;
-	const primaryDatasource = datasourceMap[config.primary];
-	const secondaryDatasources = config.secondary.map(
-		(name) => datasourceMap[name],
-	);
-
-	const getDatasource = (entityName: EntityNames) => {
-		// Project-Level Overrides
-		let projectOverrides: { [key: string]: any } = {};
-		if (storefrontOverrides?.[OVERRIDES_FILE]?.["default"]?.[entityName]) {
-			projectOverrides =
-				storefrontOverrides[OVERRIDES_FILE]["default"][entityName];
-		}
-
-		// Config-Level Overrides
-		const override = config?.overrides?.[entityName];
-
-		// Build the base entity from api-manager config settings
-		let baseEntity: { [key: string]: any } = {};
-		if (override) {
-			baseEntity =
-				secondaryDatasources.find((ds) => ds.name === override) ??
-				primaryDatasource;
-		} else {
-			baseEntity = primaryDatasource;
-		}
-
-		// Attach Project Overrides to Entity
-		for (const key in projectOverrides) {
-			baseEntity[entityName][key] = projectOverrides[key];
-		}
-
-		return baseEntity;
-	};
-
-	const datasources: { [key: string]: any } = {};
-
-	CORE_DATASOURCES.forEach((entityName) => {
-		const datasource = getDatasource(entityName as EntityNames);
-		datasources[entityName] = datasource[entityName as keyof Datasource];
-	});
-
-	storefrontOverrides[OVERRIDES_FILE]?.default &&
-		Object.keys(storefrontOverrides[OVERRIDES_FILE]["default"]).forEach(
-			(key) => {
-				if (!CORE_DATASOURCES.includes(key)) {
-					datasources[key as keyof Datasource] =
-						storefrontOverrides[OVERRIDES_FILE]["default"][key];
-				}
-			},
-		);
-	return datasources;
+	return E4Datasource;
 }
 
 export default createApiManager;

package/src/api-manager/lib/category-helpers.ts

@@ -107,8 +107,8 @@ const normalizeCategoryName = (string_: string) =>
 	string_.toLowerCase().replaceAll(" ", "-");
 
 export {
-	mapCategoryToHierarchy,
 	generateUrl,
 	getFriendlyName,
+	mapCategoryToHierarchy,
 	normalizeCategoryName,
 };

package/src/api-manager/lib/get-graphql-client.ts

@@ -24,13 +24,13 @@ const getGraphQLClient = async (withAuth = false) => {
 	// This session cookie solution only works when all api calls are through server actions.
 	// If not we need to route all e4 client api calls through an custom api route.
 	if (sessionCookie) {
-		headers["Cookie"] = `storefront=${sessionCookie.value}`;
+		headers.Cookie = `storefront=${sessionCookie.value}`;
 	}
 
 	if (withAuth) {
 		const session = await getServerSession(authOptions());
 		if (session?.accessToken) {
-			headers["Authorization"] = `Bearer ${session.accessToken}`;
+			headers.Authorization = `Bearer ${session.accessToken}`;
 		}
 	}
 

package/src/api-manager/schemas/product.schema.ts

@@ -43,6 +43,7 @@ export const productSchema = z.object({
 	Name: z.string(),
 	Price: z.number().optional(),
 	BasePrice: z.number().optional(),
+	AdjustedPrice: z.number().optional(),
 	Description: z.string().optional(),
 	PrimaryImageUrl: z.string().or(z.null()).optional(), // adding a null for nextjs/image component
 	Variants: z.array(z.any()).optional(),
@@ -52,6 +53,14 @@ export const productSchema = z.object({
 	Reviews: z.array(reviewSchema).optional(),
 	categoryFilter: z.string().optional(),
 	ExtensionProperties: z.array(commercePropertySchema).optional(),
+	/** From merge(productData, productDetailsMap); must be kept through .parse() or Zod strips unknown keys. */
+	MasterProductId: z.union([z.number(), z.string()]).optional(),
+	Dimensions: z.array(z.any()).default([]),
+	DimensionValues: z
+		.array(z.array(z.custom<ProductDimensionValueInventoryAvailability>()))
+		.default([]),
+	Images: z.array(z.string()).optional(),
+	Attributes: z.array(z.custom<AttributeValue>()).default([]),
 });
 
 export const productWCategorySchema = productSchema.extend({

package/src/api-manager/services/create-extension-query.ts

@@ -15,7 +15,7 @@ import type { QueryFunction } from "@tanstack/react-query";
  * @param queryFn
  * @returns
  */
-const buildQueryData = <TQueryFnData = unknown, TQueryFnInput = unknown>(
+const buildQueryData = <TQueryFnData = unknown, _TQueryFnInput = unknown>(
 	queryKey: string,
 	queryFn: QueryFunction<TQueryFnData>,
 ) => {