@evenicanpm/storefront-core 2.4.1 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @evenicanpm/storefront-core
 
+## 2.5.0
+
+### Patch Changes
+
+- @evenicanpm/cms@2.5.0
+- @evenicanpm/ui@2.5.0
+
+## 2.4.2
+
+### Patch Changes
+
+- fix: bumping all versions and then re-publishing to properly strip out the workspace: deps.
+- Updated dependencies
+  - @evenicanpm/cms@2.4.2
+  - @evenicanpm/ui@2.4.2
+
 ## 2.4.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evenicanpm/storefront-core",
-	"version": "2.4.1",
+	"version": "2.5.0",
 	"description": "Core module for D365/e4 Headless Storefront",
 	"type": "module",
 	"scripts": {

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

@@ -21,15 +21,16 @@ function serializeError(error: unknown): string {
 			for (const key of allKeys) {
 				if (key !== "constructor") {
 					try {
-						// biome-ignore lint: api datasources should not be typed
-						result[key] = (value as any)[key];
+						result[key] = value[key];
 					} catch {}
 				}
 			}
 			return Object.keys(result).length ? result : value;
 		});
 	} catch {
-		return String(error);
+		if (error instanceof Error) return error.message;
+		if (typeof error === "string") return error;
+		return "Unable to serialize error";
 	}
 }
 

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

@@ -67,10 +67,10 @@ function extractEmailFromClaims(token: IdTokenClaims): string | undefined {
 
 function decodeIdTokenClaims(token: string): IdTokenClaims {
 	const decoded = jwt.decode(token);
-	if (!decoded || typeof decoded !== "object") {
-		return {} as IdTokenClaims;
+	if (decoded && typeof decoded === "object") {
+		return decoded;
 	}
-	return decoded as IdTokenClaims;
+	return {};
 }
 
 const tracer = trace.getTracer("d365-user-datasource");

package/src/api-manager/datasources/d365/utils/get-context-cookie.ts

@@ -74,6 +74,7 @@ export async function getContextFromCookie(): Promise<ICallerContext> {
 			token: accessToken,
 		};
 		context.requestContext.locale = locale;
+		context.requestContext.apiSettings.catalogId = 0;
 		return context;
 	}
 	throw new Error("D365Context cookie not found");

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

@@ -1,6 +1,5 @@
 import { addressMap } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/address/e4-address.remaps";
 import * as addressTranslator from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/address/e4-address.translator";
-import type { Shipping } 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 {
 	Address,
@@ -57,7 +56,9 @@ const address = {
 		}
 
 		return addressTranslator.deliveryOptionsTransformValidate(
-			(data?.shippingbyCarrier as Shipping[]) ?? [],
+			(data?.shippingbyCarrier ?? []).filter(
+				(s): s is NonNullable<typeof s> => s !== null,
+			),
 		) as DeliveryOption[];
 	},
 	async createAddress(address: Address): Promise<Address> {
@@ -70,12 +71,7 @@ const address = {
 			throw new Error("Error creating address");
 		}
 
-		return (
-			merge(
-				[data?.createAddress],
-				addressMap as unknown as Address[],
-			) as Address[]
-		)[0];
+		return (merge([data?.createAddress], addressMap) as Address[])[0];
 	},
 	async updateAddress(address: Address): Promise<Address> {
 		const e4Api = await getGraphqlClient(true);
@@ -87,12 +83,7 @@ const address = {
 			throw new Error("Error updating address");
 		}
 
-		return (
-			merge(
-				[data?.updateAddress],
-				addressMap as unknown as Address[],
-			) as Address[]
-		)[0];
+		return (merge([data?.updateAddress], addressMap) as Address[])[0];
 	},
 	async deleteAddress(addressId: string): Promise<string> {
 		const e4Api = await getGraphqlClient(true);

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

@@ -47,8 +47,9 @@ export const getCountryId = async (code: string) => {
 	} else {
 		const e4Api = await getGraphqlClient();
 		const { data } = await e4Api.e4CountryList();
-		countriesCache.set(cacheKey, data?.countries as Country[]);
-		countries = data?.countries as Country[];
+		const fetchedCountries = data?.countries ?? [];
+		countriesCache.set(cacheKey, fetchedCountries);
+		countries = fetchedCountries;
 	}
 	const country = countries.find(
 		(c: { isoAlpha3Code: string }) => c?.isoAlpha3Code === code,
@@ -71,7 +72,7 @@ const getStateId = async (stateCode: string, countryId: string) => {
 	} else {
 		const e4Api = await getGraphqlClient();
 		const { data } = await e4Api.e4Country({ id: countryId });
-		country = data?.country as Country;
+		country = data?.country ?? country;
 		countryCache.set(cacheKey, country);
 	}
 

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

@@ -146,7 +146,7 @@ export const categoryTransformValidate = (
 		}
 	});
 
-	for (const rootNode of rootNodes as TransformedCategoryNode[]) {
+	for (const rootNode of rootNodes) {
 		calculateUrls(rootNode, "", urlPrefix);
 	}
 	rootNodes.sort(

package/src/api-manager/datasources/e4/graphqlRequestSdk.ts

@@ -5430,7 +5430,9 @@ export type Process = {
 };
 
 export type ProcessConfigMerge = {
-  config?: InputMaybe<Array<InputMaybe<ConfigMerge>>>;
+  sourceConfig?: InputMaybe<ConfigMerge>;
+  targetConfig?: InputMaybe<ConfigMerge>;
+  targetSourcesConfig?: InputMaybe<ConfigMerge>;
 };
 
 export type ProcessConnection = {
@@ -5811,6 +5813,7 @@ export type ProcessTask = {
   __typename?: 'ProcessTask';
   code?: Maybe<Scalars['String']['output']>;
   created: Scalars['DateTime']['output'];
+  directionTypeId?: Maybe<Scalars['Int']['output']>;
   endpoint?: Maybe<Endpoint>;
   executionProcedure?: Maybe<Scalars['String']['output']>;
   extendedFields?: Maybe<Scalars['JSON']['output']>;
@@ -5825,6 +5828,7 @@ export type ProcessTask = {
   preExecutionProcedure?: Maybe<Scalars['String']['output']>;
   process: Process;
   processTaskType?: Maybe<ProcessTaskType>;
+  processTemplateId?: Maybe<Scalars['ID']['output']>;
   properties?: Maybe<Scalars['JSON']['output']>;
   sort?: Maybe<Scalars['Int']['output']>;
 };
@@ -5889,6 +5893,7 @@ export type ProcessTaskExecution = {
 
 export type ProcessTaskExport = {
   __typename?: 'ProcessTaskExport';
+  DirectionTypeId?: Maybe<Scalars['Int']['output']>;
   Endpoint?: Maybe<Scalars['String']['output']>;
   Name?: Maybe<Scalars['String']['output']>;
   OrchestrationType?: Maybe<Scalars['String']['output']>;
@@ -5899,10 +5904,12 @@ export type ProcessTaskExport = {
   ProcessTask?: Maybe<Scalars['String']['output']>;
   ProcessTaskId?: Maybe<Scalars['ID']['output']>;
   ProcessTaskType?: Maybe<Scalars['String']['output']>;
+  ProcessTemplateId?: Maybe<Scalars['Int']['output']>;
   Sort?: Maybe<Scalars['Int']['output']>;
 };
 
 export type ProcessTaskImport = {
+  DirectionTypeId?: InputMaybe<Scalars['Int']['input']>;
   Endpoint?: InputMaybe<Scalars['String']['input']>;
   Name?: InputMaybe<Scalars['String']['input']>;
   OrchestrationType?: InputMaybe<Scalars['String']['input']>;
@@ -5913,6 +5920,7 @@ export type ProcessTaskImport = {
   ProcessTask?: InputMaybe<Scalars['String']['input']>;
   ProcessTaskId?: InputMaybe<Scalars['ID']['input']>;
   ProcessTaskType?: InputMaybe<Scalars['String']['input']>;
+  ProcessTemplateId?: InputMaybe<Scalars['ID']['input']>;
   Properties?: InputMaybe<Scalars['JSON']['input']>;
   Sort?: InputMaybe<Scalars['Int']['input']>;
 };
@@ -6009,8 +6017,10 @@ export type ProcessTaskUpdate = {
 export type ProcessTemplate = {
   __typename?: 'ProcessTemplate';
   created: Scalars['DateTime']['output'];
+  directionTypeId?: Maybe<Scalars['Int']['output']>;
   id: Scalars['ID']['output'];
   isActive?: Maybe<Scalars['Boolean']['output']>;
+  mappings?: Maybe<Array<Maybe<ProcessTemplateInputMapping>>>;
   modified: Scalars['DateTime']['output'];
   name?: Maybe<Scalars['String']['output']>;
   pages?: Maybe<Array<Maybe<ProcessTemplatePage>>>;
@@ -6024,8 +6034,8 @@ export type ProcessTemplateConnection = {
 };
 
 export type ProcessTemplateFilter = {
-  processTemplateGroupId?: InputMaybe<Scalars['ID']['input']>;
-  processTemplateId?: InputMaybe<Scalars['ID']['input']>;
+  sourceTemplateId?: InputMaybe<Scalars['ID']['input']>;
+  targetTemplateId?: InputMaybe<Scalars['ID']['input']>;
 };
 
 export type ProcessTemplateGroup = {
@@ -6063,6 +6073,15 @@ export type ProcessTemplateInput = {
   validationRegex?: Maybe<Scalars['String']['output']>;
 };
 
+export type ProcessTemplateInputMapping = {
+  __typename?: 'ProcessTemplateInputMapping';
+  fieldName?: Maybe<Scalars['String']['output']>;
+  format?: Maybe<Scalars['String']['output']>;
+  inputTypeCode?: Maybe<Scalars['String']['output']>;
+  jsonPath?: Maybe<Scalars['String']['output']>;
+  jsonValuePath?: Maybe<Scalars['String']['output']>;
+};
+
 export type ProcessTemplateInputSchema = {
   __typename?: 'ProcessTemplateInputSchema';
   defaultValue?: Maybe<Scalars['String']['output']>;
@@ -6629,6 +6648,7 @@ export type Query = {
   processTasksByProcess?: Maybe<ProcessTaskConnection>;
   processTemplate?: Maybe<Array<Maybe<ProcessTemplate>>>;
   processTemplateGroups?: Maybe<ProcessTemplateGroupConnection>;
+  processTemplateInputMappings?: Maybe<Array<Maybe<ProcessTemplateInputMapping>>>;
   processTemplateRecords?: Maybe<ProcessTemplateRecordConnection>;
   processTemplates?: Maybe<ProcessTemplateConnection>;
   processes?: Maybe<ProcessConnection>;
@@ -7529,12 +7549,18 @@ export type QueryProcessTemplateGroupsArgs = {
 };
 
 
+export type QueryProcessTemplateInputMappingsArgs = {
+  processTemplateId?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
 export type QueryProcessTemplateRecordsArgs = {
   input?: InputMaybe<FilterQueryInput>;
 };
 
 
 export type QueryProcessTemplatesArgs = {
+  directionTypeId?: InputMaybe<Scalars['ID']['input']>;
   input?: InputMaybe<FilterQueryInput>;
 };
 

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

@@ -146,7 +146,7 @@ export const productListInputTransform = async (
 			acc[key].push(ref?.LeftValueBoundString ?? "");
 			return acc;
 		},
-		{} as Record<string, string[]>,
+		{},
 	);
 
 	const filters = Object.entries(grouped).map(([key, values]) => ({

package/src/api-manager/index.ts

@@ -60,7 +60,7 @@ async function createApiManager(): Promise<Datasource> {
 
 			if (datasource[entityName]) {
 				// Merge override methods into the existing entity
-				Object.assign(datasource[entityName] as object, entityOverrides);
+				Object.assign(datasource[entityName], entityOverrides);
 			} else {
 				// Non-core entity added entirely from overrides
 				// biome-ignore lint: api datasources should not be typed

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

@@ -36,7 +36,7 @@ const getGraphQLClient = async (withAuth = false) => {
 	};
 
 	const cookieStore = await cookies();
-	const sessionCookie = cookieStore.get("storefront"); // cookie is set in middleware - setE4SessionCookies
+	const sessionCookie = cookieStore.get("storefront"); // cookie is set in proxy - setE4SessionCookies
 	// 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) {

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

@@ -5,27 +5,16 @@ import type {
 import getCart from "@evenicanpm/storefront-core/src/api-manager/services/cart/queries/get-cart";
 import { useCreateMutation } from "@evenicanpm/storefront-core/src/api-manager/services/create-mutation";
 import { createApiPath } from "@evenicanpm/storefront-core/src/api-manager/services/create-query";
-import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import { useQueryClient } from "@tanstack/react-query";
-import { useTranslations } from "next-intl";
 
 const apiPath = createApiPath("cart", "addDiscountCode");
 
 const useAddDiscountCode = () => {
 	const queryClient = useQueryClient();
-	const { setNotification } = useNotification();
-	const t = useTranslations("Cart.Messages");
 	return useCreateMutation<ManageDiscountCodeInput, Cart>(apiPath, {
 		onSuccess: (result) => {
 			getCart.setQueryData(queryClient, result);
 		},
-		onError: () => {
-			setNotification({
-				message: t("couponError"),
-				severity: "error",
-				type: "cart",
-			});
-		},
 	});
 };
 

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

@@ -1,6 +1,10 @@
 import createApiManager from "@evenicanpm/storefront-core/src/api-manager/index";
 import type { DatasourceApis } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-import { isServer, type QueryClient } from "@tanstack/query-core";
+import {
+	type DefaultError,
+	isServer,
+	type QueryClient,
+} from "@tanstack/query-core";
 import {
 	type UseQueryResult,
 	type UseSuspenseQueryResult,
@@ -104,12 +108,14 @@ export const createQuery = <TInput, TOutput>(
 	return {
 		useData: (
 			input?: TInput,
-			options?: { enabled: boolean },
-		): UseQueryResult<TOutput> =>
-			useQuery({
-				...getQueryOptions(input),
-				...(options?.enabled !== undefined && { enabled: options.enabled }),
-			}),
+			queryOptions?: { enabled?: boolean },
+		): UseQueryResult<NoInfer<TOutput>, DefaultError> => {
+			const baseOptions = getQueryOptions(input);
+			return useQuery({
+				...baseOptions,
+				enabled: baseOptions.enabled && (queryOptions?.enabled ?? true),
+			});
+		},
 		useSuspenseData: (input?: TInput): UseSuspenseQueryResult<TOutput> =>
 			useSuspenseQuery(getQueryOptions(input)),
 		fetchData: (queryClient: QueryClient, input?: TInput) =>

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

@@ -24,7 +24,7 @@ const useAddToWishlist = () => {
 			// Based on Tanstack Optimistic Update Pattern
 			// https://tanstack.com/query/latest/docs/reference/QueryClient
 			await queryClient.cancelQueries({ queryKey: [getWishlistsQueryKey] });
-			const previousWishlists = await getWishlists.getData(queryClient);
+			const previousWishlists = getWishlists.getData(queryClient);
 			const optimisticData = previousWishlists?.map((list) => {
 				if (list.Id === input.Id) {
 					// Add the input product line to list

package/src/api-manager/services/user/mutations/remove-from-wishlist.ts

@@ -25,7 +25,7 @@ const useRemoveFromWishlist = () => {
 			// Based on Tanstack Optimistic Update Pattern
 			// https://tanstack.com/query/latest/docs/reference/QueryClient
 			await queryClient.cancelQueries({ queryKey: [getWishlistsQueryKey] });
-			const previousWishlists = await getWishlists.getData(queryClient);
+			const previousWishlists = getWishlists.getData(queryClient);
 			const optimisticData = previousWishlists?.map((list) => {
 				if (list.Id === input.Id) {
 					// Remove the product line of our input id