@evenicanpm/storefront-core 1.0.2 → 1.0.3

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

@@ -1,45 +1,26 @@
-// Schemas
-import { extendedCartSchema, Cart } from "@/api-manager/schemas/cart.schema";
+import getGraphqlClient from "../../../lib/get-graphql-client";
 import {
   productSchema,
   ProductDetails,
   SearchByCriteriaInput,
   ProductPrice,
 } from "@/api-manager/schemas/product.schema";
-import { Address } from "@/api-manager/schemas/address.schema";
-import { User } from "@/api-manager/schemas/user.schema";
-import { Session } from "@/api-manager/schemas/session.schema";
-import { merge } from "object-mapper";
-import getGraphqlClient from "../../lib/get-graphql-client";
-// Interfaces
-import {
-  UserInput,
-  AddressInput,
-  Attribute,
-  Category as E4Category,
-  Country,
-  Shipping,
-  Cart as E4Cart,
-  Product,
-  Session as E4Session,
-} from "./graphqlRequestSdk";
+import { productPriceSchema } from "@/api-manager/schemas/d365.schema";
 import {
-  Category,
   ProductRefinerValue,
   ProductSearchResult,
 } from "@msdyn365-commerce/retail-proxy";
 import {
-  cartMap,
+  Attribute,
+  Category as E4Category,
+  Product,
+} from "../graphqlRequestSdk";
+import { merge } from "object-mapper";
+import {
   productDetailsMap,
   productMap,
   productPricesMap,
-  addressReverseMap,
-  countriesMap,
-  countryMap,
-  deliveryOptionsMap,
-} from "./e4.remaps";
-import { CategoryHierarchy } from "@/lib/category-helpers";
-import { productPriceSchema } from "@/api-manager/schemas/d365.schema";
+} from "./e4-product.remaps";
 
 interface TransformedRefinerValue {
   RefinerRecordId: number;
@@ -302,25 +283,6 @@ export const refinersTransformValidate = (
  * required fields, create a custom schema with only frontend required fields
  */
 
-/**
- * Transforms the E4 AddToCart response to a Cart retail-proxy object
- * Add parameters to transform model as needed
- *
- * @param data the E4 Cart object
- * @returns the transformed cart object
- */
-export const cartTransformValidate = (cart: E4Cart): Cart => {
-  if (!(cart && cart?.id)) throw new Error("Not a valid cart");
-  const transformedData = merge(cart, cartMap);
-  try {
-    extendedCartSchema.parse(transformedData);
-  } catch (e) {
-    console.warn("Cart data does not match retail-proxy schema", e);
-  }
-
-  return transformedData as Cart;
-};
-
 /**
  * Transforms the E4 Product response to a Product retail-proxy object
  * @param productData the E4 Product object
@@ -382,285 +344,3 @@ export const productWithCategoryTransformValidate = (
 
   return productTransform;
 };
-
-export const userTransformInput = (user: User): UserInput => {
-  let formattedUser = {};
-
-  if (user.FirstName && user.LastName) {
-    formattedUser = {
-      firstName: user?.FirstName,
-      lastName: user?.LastName,
-    };
-  }
-
-  if (user?.DefaultShippingAddressId) {
-    const shippingInfo = {
-      defaultShippingAddressId: user?.DefaultShippingAddressId,
-    };
-    formattedUser = { ...formattedUser, ...shippingInfo };
-  }
-
-  return formattedUser;
-};
-
-/**
- * Transforms the e4 API session data to Session schema.
- */
-export const sessionTransformValidate = (data: E4Session): Session => {
-  const formattedSession: Session = {
-    Id: data?.id,
-    User: {
-      AccountNumber: data?.user?.accountId ?? "",
-      FirstName: data?.user?.firstName ?? "",
-      LastName: data?.user?.lastName ?? "",
-      Email: data?.user?.email ?? "",
-      // Add other required fields with defaults if needed
-    },
-  };
-  return formattedSession;
-};
-
-/**
- * Transforms the Address schema to e4 API address
- */
-export const addressTransform = async (address: Address) => {
-  const countryId = await getCountryId(address?.ThreeLetterISORegionName ?? "");
-  const stateId = await getStateId(address?.State ?? "", countryId ?? "");
-
-  const formattedAddress: AddressInput = merge(address, addressReverseMap);
-  formattedAddress.firstName = "";
-  formattedAddress.lastName = "";
-  formattedAddress.address2 = "";
-  formattedAddress.stateId = stateId;
-  formattedAddress.countryId = countryId;
-  formattedAddress.addressTypeId = 1; // We only create and update shipping addresses.
-
-  return formattedAddress;
-};
-
-export const countriesTransformValidate = (countries: Country[]) => {
-  if (Array.isArray(countries) && countries.length) {
-    return countries.map((country) => merge(country, countriesMap));
-  }
-  return [];
-};
-
-export const countryTransformValidate = (country: Country) => {
-  if (country?.state && country?.state.length) {
-    return merge(country, countryMap);
-  }
-  return [];
-};
-
-const countriesCache = new Map<string, Country[]>();
-const countryCache = new Map<string, Country>();
-
-/**
- * For d365 country id and value are 'USA' but for e4 it is '80175021088166' and 'USA'.
- * So use countryId, to map the codes back to ids before API calls.
- */
-export const getCountryId = async (code: string) => {
-  const cacheKey = "countries";
-  let countries: Country[] = [];
-
-  if (countriesCache.has(cacheKey)) {
-    countries = countriesCache.get(cacheKey) ?? countries;
-  } else {
-    const e4Api = await getGraphqlClient();
-    const { data } = await e4Api.e4CountryList();
-    countriesCache.set(cacheKey, data?.countries as Country[]);
-    countries = data?.countries as Country[];
-  }
-  const country = countries.find(
-    (c: { isoAlpha3Code: string }) => c?.isoAlpha3Code === code,
-  );
-
-  return country?.id;
-};
-
-const getStateId = async (stateCode: string, countryId: string) => {
-  const cacheKey = `states-${countryId}`;
-  let country: Country = {
-    id: "",
-    isoAlpha2Code: "",
-    isoAlpha3Code: "",
-    name: "",
-  };
-
-  if (countryCache.has(cacheKey)) {
-    country = countryCache.get(cacheKey) ?? country;
-  } else {
-    const e4Api = await getGraphqlClient();
-    const { data } = await e4Api.e4Country({ id: countryId });
-    country = data?.country as Country;
-    countryCache.set(cacheKey, country);
-  }
-
-  const state = country?.state?.find((s) => s?.code === stateCode);
-
-  return state?.id;
-};
-
-export const deliveryOptionsTransformValidate = (options: Shipping[]) => {
-  if (Array.isArray(options) && options.length) {
-    return options.map((option) => merge(option, deliveryOptionsMap));
-  }
-  return [];
-};
-
-interface TransformedCategoryNode extends Category {
-  Slug: string;
-  Url: string;
-  NeutralizedName: string;
-  Children?: TransformedCategoryNode[];
-  ParentCategory?: number;
-}
-
-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");
-    } catch (e) {
-      console.warn(`Skipping category due to invalid id:`, rawCategory);
-      return null;
-    }
-
-    const categoryName = rawCategory.name || "Unnamed Category";
-    const slug = generateSlug(categoryName);
-    let parentIdNum: number | undefined = undefined;
-    if (rawCategory.parentId != null) {
-      const parsedParentId = parseInt(String(rawCategory.parentId), 10);
-      if (!isNaN(parsedParentId)) parentIdNum = parsedParentId;
-      else
-        console.warn(
-          `Invalid parentId format for id ${recordIdNum}:`,
-          rawCategory.parentId,
-        );
-    }
-
-    const node: TransformedCategoryNode = {
-      RecordId: recordIdNum,
-      Name: categoryName,
-      ParentCategory: parentIdNum,
-      DisplayOrder: 0,
-      LocalizedDescription: categoryName,
-      Images: [
-        {
-          Uri: `Categories/${categoryName}.png`,
-          IsDefault: false,
-          IsSelfHosted: false,
-          Priority: 0,
-          IsAdditionalMedia: false,
-          MediaTypeValue: 0,
-          DisplayOrder: 0,
-          IsApplicableForChildEntities: false,
-          ExtensionProperties: [],
-        },
-      ],
-      NameTranslations: [
-        { Language: "en-us", Text: categoryName, ExtensionProperties: [] },
-      ],
-      ExtensionProperties: [],
-      NeutralizedName: categoryName,
-      Slug: slug,
-      Url: "",
-      Children: [],
-    };
-    return node;
-  }
-
-  function calculateUrls(
-    categoryNode: TransformedCategoryNode,
-    basePath: string,
-    prefix: string,
-  ): void {
-    const currentPath = basePath
-      ? `${basePath}/${categoryNode.Slug}`
-      : `${prefix}/${categoryNode.Slug}`;
-    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),
-      );
-    }
-  }
-
-  function removeEmptyChildren(node: TransformedCategoryNode): void {
-    if (node.Children) {
-      if (node.Children.length === 0) {
-        delete node.Children;
-      } else {
-        node.Children.forEach(removeEmptyChildren);
-      }
-    }
-  }
-
-  if (!rawCategories || !Array.isArray(rawCategories)) {
-    console.error(
-      "Invalid input received by categoryTransformValidate: must be an array.",
-      rawCategories,
-    );
-    return [];
-  }
-
-  const categoryMap = new Map<number, TransformedCategoryNode>();
-  const rootNodes: TransformedCategoryNode[] = [];
-
-  rawCategories.forEach((rawCat: E4Category) => {
-    const transformedNode = createTransformedNode(rawCat);
-    if (transformedNode)
-      categoryMap.set(transformedNode.RecordId, transformedNode);
-  });
-
-  categoryMap.forEach((node: TransformedCategoryNode) => {
-    const parentId = node.ParentCategory;
-    if (parentId === rootParentId) rootNodes.push(node);
-    else if (parentId !== undefined && categoryMap.has(parentId)) {
-      const parentNode = categoryMap.get(parentId);
-      if (parentNode) {
-        if (!parentNode.Children) {
-          parentNode.Children = [];
-        }
-        parentNode.Children.push(node);
-        parentNode.Children.sort(
-          (a, b) =>
-            (a.DisplayOrder ?? 0) - (b.DisplayOrder ?? 0) ||
-            (a.Name ?? "").localeCompare(b.Name ?? ""),
-        );
-      }
-    }
-  });
-
-  rootNodes.forEach((rootNode: TransformedCategoryNode) =>
-    calculateUrls(rootNode, "", urlPrefix),
-  );
-  rootNodes.sort(
-    (a, b) =>
-      (a.DisplayOrder ?? 0) - (b.DisplayOrder ?? 0) ||
-      (a.Name ?? "").localeCompare(b.Name ?? ""),
-  );
-
-  rootNodes.forEach(removeEmptyChildren);
-
-  return rootNodes as CategoryHierarchy[];
-};

package/src/api-manager/datasources/e4/{e4-session.datasource.ts → session/e4-session.datasource.ts}

@@ -1,9 +1,9 @@
-import getGraphqlClient from "../../lib/get-graphql-client";
+import getGraphqlClient from "../../../lib/get-graphql-client";
 import {
   Session,
   SessionInitInput,
 } from "@/api-manager/schemas/session.schema";
-import * as translator from "./e4.translator";
+import * as sessionTranslator from "./e4-session.translator";
 
 const session = {
   async sessionInit(input: SessionInitInput): Promise<Session> {
@@ -19,7 +19,7 @@ const session = {
       throw new Error("Error adding user to e4 session");
     }
 
-    return translator.sessionTransformValidate(
+    return sessionTranslator.sessionTransformValidate(
       data?.customerInitSession ?? { id: "" },
     );
   },

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

@@ -0,0 +1,18 @@
+import { Session } from "@/api-manager/schemas/session.schema";
+import { Session as E4Session } from "../graphqlRequestSdk";
+/**
+ * Transforms the e4 API session data to Session schema.
+ */
+export const sessionTransformValidate = (data: E4Session): Session => {
+  const formattedSession: Session = {
+    Id: data?.id,
+    User: {
+      AccountNumber: data?.user?.accountId ?? "",
+      FirstName: data?.user?.firstName ?? "",
+      LastName: data?.user?.lastName ?? "",
+      Email: data?.user?.email ?? "",
+      // Add other required fields with defaults if needed
+    },
+  };
+  return formattedSession;
+};

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

@@ -7,9 +7,10 @@ import {
   WishlistCreateInput,
   WishlistDetailInput,
   WishlistLinesInput,
+  ExtendedWishlist,
 } from "@/api-manager/schemas/user.schema";
-import * as translator from "../e4.translator";
-import { userMap } from "../e4.remaps";
+import * as userTranslator from "./e4-user.translator";
+import { userMap } from "./e4-user.remaps";
 import { merge } from "object-mapper";
 import { UserApi } from "@/api-manager/types/Datasource";
 import { translateWishList } from "./e4-user.translator";
@@ -18,7 +19,7 @@ const user: UserApi = {
   async updateUser(user: User): Promise<User> {
     const e4Api = await getGraphqlClient(true);
 
-    const userInput = translator.userTransformInput(user);
+    const userInput = userTranslator.userTransformInput(user);
 
     const { data, errors } = await e4Api.e4UserUpdateMD({
       user: userInput,
@@ -66,7 +67,9 @@ const user: UserApi = {
     return translateWishList(data);
   },
 
-  async getWishlistDetails(input: WishlistDetailInput): Promise<Wishlist> {
+  async getWishlistDetails(
+    input: WishlistDetailInput,
+  ): Promise<ExtendedWishlist> {
     const e4Api = await getGraphqlClient(true);
 
     const { data, errors } = await e4Api.e4WishListReadMD({ id: input.Id });
@@ -109,29 +112,33 @@ const user: UserApi = {
       throw new Error("No wishlist found");
     }
 
-    return wishList as Wishlist;
+    return wishList as unknown as Wishlist;
   },
   async deleteWishlist(input: WishlistDetailInput): Promise<void> {
     const e4Api = await getGraphqlClient(true);
 
-    const { data, errors } = await e4Api.deleteWishList({ id: input.Id });
+    const { errors } = await e4Api.deleteWishList({ id: input.Id });
 
     if (errors) {
       throw new Error("Error creating wishlist");
     }
   },
+  // @ts-ignore
   async updateWishlist(input: WishlistLinesInput): Promise<Wishlist> {
     throw new Error("updateWishlist not implemented");
   },
 
+  // @ts-ignore
   async addProductsToWishlist(input: WishlistLinesInput): Promise<Wishlist> {
     throw new Error("addProductsToWishlist not implemented");
   },
 
+  // @ts-ignore
   async removeProductsFromWishlist(input: WishlistLinesInput): Promise<void> {
     throw new Error("removeProductsFromWishlist not implemented");
   },
 
+  // @ts-ignore
   async copyCartToWishlist(input: CopyCartToWishlistInput): Promise<Wishlist> {
     throw new Error("copyCartToWishlist not implemented");
   },

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

@@ -1,3 +1,52 @@
+/**
+ * Maps E4 API responses to the D365 data structure.
+ *
+ * This file uses the `object-mapper` library to transform
+ * API responses into a format compatible with D365.
+ *
+ * https://github.com/wankdanker/node-object-mapper
+ *
+ */
+
+import { Address } from "@msdyn365-commerce/retail-proxy";
+import { merge } from "object-mapper";
+import { Address as E4Address, Me } from "../graphqlRequestSdk";
+import { addressMap } from "../address/e4-address.remaps";
+
+export const userMap = {
+  id: {
+    key: "RecordId",
+    transform: (id: string) => {
+      return Number(id);
+    },
+  },
+  code: {
+    // we don't need AccountNumber in e4 storefront,
+    // if we need it bring account data and map accountId here.
+    key: "AccountNumber",
+    transform: () => {
+      return "";
+    },
+  },
+  firstName: "FirstName",
+  lastName: "LastName",
+  email: "Email",
+  defaultShippingAddressId: "DefaultShippingAddressId",
+  addresses: {
+    key: "Addresses",
+    transform: (addresses: E4Address[], source: Me) => {
+      if (!(addresses && addresses?.length)) return [];
+      const mapped = merge(addresses || [], addressMap) as Address[];
+      return mapped.map((address: Address) => ({
+        ...address,
+        IsPrimary:
+          address?.IsPrimary ||
+          address?.Id === source?.defaultShippingAddressId,
+      }));
+    },
+  },
+};
+
 export const wishListMap = {
   "[].id": "[].Id",
   "[].name": "[].Name",

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

@@ -1,10 +1,31 @@
-import { E4WishListListSmQuery } from "../graphqlRequestSdk";
+import { User } from "@/api-manager/schemas/user.schema";
+import { E4WishListListSmQuery, UserInput } from "../graphqlRequestSdk";
 import { merge } from "object-mapper";
 import { wishListMap } from "./e4-user.remaps";
 import { Wishlist } from "@/api-manager/schemas/user.schema";
 
+export const userTransformInput = (user: User): UserInput => {
+  let formattedUser = {};
+
+  if (user.FirstName && user.LastName) {
+    formattedUser = {
+      firstName: user?.FirstName,
+      lastName: user?.LastName,
+    };
+  }
+
+  if (user?.DefaultShippingAddressId) {
+    const shippingInfo = {
+      defaultShippingAddressId: user?.DefaultShippingAddressId,
+    };
+    formattedUser = { ...formattedUser, ...shippingInfo };
+  }
+
+  return formattedUser;
+};
+
 export const translateWishList = (data: E4WishListListSmQuery) => {
-  const e4WishList = data.wishlistList.nodes;
+  const e4WishList = data?.wishlistList?.nodes || [];
   const translatedData = merge(e4WishList, wishListMap) as Wishlist[];
   return translatedData;
 };

package/src/api-manager/datasources/e4/utils/unwrap-e4-variants.ts

@@ -1,6 +1,6 @@
 import { merge } from "object-mapper";
 import { Attributes, Maybe, Variants } from "../graphqlRequestSdk";
-import { dimensionMap } from "../e4.remaps";
+import { dimensionMap } from "../product/e4-product.remaps";
 
 type DimensionValue = {
   Value: string;

package/src/api-manager/index.ts

@@ -1,7 +1,8 @@
+// @ts-ignore - this will be picked up by webpack
+import rawConfig from "@api-manager-config";
 import { Datasource, DatasourceApis } from "./types/Datasource";
 import E4Datasource from "./datasources/e4/e4.datasource";
 import { D365Datasource } from "./datasources/d365/index";
-import rawConfig from "./api-manager.config.json";
 import { z } from "zod";
 import { getContextFromCookie } from "./datasources/d365/utils/get-context-cookie";
 
@@ -30,6 +31,7 @@ const CORE_DATASOURCES = [
   "address",
   "organization",
 ];
+
 /**
  * Loads up all specified apis/datasources based on parsed config
  * and returns the ApiManager object. Also handles "project" overrides
@@ -38,6 +40,9 @@ const CORE_DATASOURCES = [
  * that from api-manager.
  *
  * In this way, we have two levels of configuration of the api-manager.
+ * 1. actual JSON config
+ * 2. overrides from storefront
+ *
  * @returns ApiManager object.
  */
 async function createApiManager() {
@@ -84,7 +89,7 @@ async function createApiManager() {
 
   const getDatasource = (entityName: EntityNames) => {
     // Project-Level Overrides
-    let projectOverrides = {};
+    let projectOverrides: { [key: string]: any } = {};
     if (storefrontOverrides?.[OVERRIDES_FILE]?.["default"]?.[entityName]) {
       projectOverrides =
         storefrontOverrides[OVERRIDES_FILE]["default"][entityName];
@@ -94,7 +99,7 @@ async function createApiManager() {
     const override = config?.overrides?.[entityName];
 
     // Build the base entity from api-manager config settings
-    let baseEntity = {};
+    let baseEntity: { [key: string]: any } = {};
     if (override) {
       baseEntity =
         secondaryDatasources.find((ds) => ds.name === override) ??
@@ -111,18 +116,18 @@ async function createApiManager() {
     return baseEntity;
   };
 
-  const datasources = {};
+  const datasources: { [key: string]: any } = {};
 
   CORE_DATASOURCES.forEach((entityName) => {
     const datasource = getDatasource(entityName as EntityNames);
-    datasources[entityName] = datasource[entityName];
+    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] =
+          datasources[key as keyof Datasource] =
             storefrontOverrides[OVERRIDES_FILE]["default"][key];
         }
       },

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

@@ -26,7 +26,9 @@ export const extendedProductListLineSchema = productListLineSchema.extend({
 
 export const extendedWishlistSchema = productListSchema
   .omit({ ProductListLines: true })
-  .extend({ ProductListLines: extendedProductListLineSchema.array() });
+  .extend({
+    ProductListLines: extendedProductListLineSchema.array().optional(),
+  });
 
 const wishlistBaseInput = z.object({
   Id: z.string(),

package/src/api-manager/services/cart/mutations/add-to-cart.ts

@@ -1,5 +1,5 @@
 import { AddToCartInput, Cart } from "@/api-manager/schemas/cart.schema";
-import { useNotification } from "@/components/Notifications/use-notification";
+import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import { useTranslations } from "next-intl";
 import { useCreateMutation } from "../../create-mutation";
 import getCart from "../queries/get-cart";

package/src/api-manager/services/cart/mutations/checkout.ts

@@ -2,7 +2,6 @@ import { Cart, CheckoutInput } from "@/api-manager/schemas/cart.schema";
 import { createApiPath } from "../../create-query";
 import { useCreateMutation } from "../../create-mutation";
 import { deleteCartCookie } from "@/api-manager/lib/cart-cookie-handler";
-import getCart from "../queries/get-cart";
 import { useQueryClient } from "@tanstack/react-query";
 
 const apiPath = createApiPath("cart", "checkout");
@@ -10,7 +9,7 @@ const apiPath = createApiPath("cart", "checkout");
 const useCheckout = () => {
   const queryClient = useQueryClient();
   return useCreateMutation<CheckoutInput, Cart>(apiPath, {
-    onSuccess: async (_data, variables) => {
+    onSuccess: async (_data) => {
       // Delete old cart cookie
       await deleteCartCookie();
 

package/src/api-manager/services/product/server/product.server.ts

@@ -9,5 +9,8 @@ export const searchProductsServer = async (
   input: searchProductsInput,
 ): Promise<ProductSearchResult[]> => {
   const apiManager = await createApiManager();
-  return parseObject(apiManager.product.searchProducts(input));
+  let searchProducts = apiManager.product.searchProducts
+    ? apiManager.product.searchProducts(input)
+    : Promise.reject("product.searchProducts() is not defined");
+  return parseObject(searchProducts);
 };