@mframework/layer-commerce 0.0.3 → 0.0.4

package/app/normalizers/Cart.query.ts

@@ -49,6 +49,7 @@ import {
     SelectedShippingMethod,
     UserErrors,
 } from './Cart.type';
+import { normalizeCart } from './Cart.type';
 
 /** @namespace ../../normalizers/Cart/Query */
 export class CartQuery {
@@ -727,3 +728,10 @@ export class CartQuery {
 }
 
 export default new CartQuery();
+
+export function normalizeCartResponse(raw: any) {
+    if (!raw) return null;
+    if (raw.cartData) return normalizeCart(raw.cartData as any);
+    if (raw.cart) return normalizeCart(raw.cart as any);
+    return normalizeCart(raw as any);
+}

package/app/normalizers/Category.query.ts

@@ -17,6 +17,7 @@ import {
     CategoryQueryOptions,
     CategoryTree,
     CmsBlock,
+    normalizeCategory,
 } from './Category.type';
 
 /**
@@ -144,3 +145,9 @@ export class CategoryQuery {
 }
 
 export default new CategoryQuery();
+
+export function normalizeCategoryResponse(raw: any): Category | null {
+    if (!raw) return null;
+    if (raw.category) return normalizeCategory(raw.category as any);
+    return normalizeCategory(raw as any);
+}

package/app/normalizers/Category.type.ts

@@ -53,3 +53,31 @@ export interface CategoryQueryOptions {
     categoryIds: number;
     isSearchPage?: boolean;
 }
+
+// Lightweight normalizer for category objects. Adapters can provide
+// richer implementations; this helper maps common fields into a stable
+// Category shape used by the commerce layer.
+export function normalizeCategory(raw: any): Category {
+    if (!raw) return raw;
+    return {
+        id: raw?.id ?? raw?.category_id ?? raw?.uid ?? '',
+        url: raw?.url ?? raw?.url_key ?? raw?.url_path ?? '',
+        name: raw?.name ?? raw?.label ?? raw?.category_name ?? '',
+        image: raw?.image ?? raw?.thumbnail ?? '',
+        url_key: raw?.url_key ?? raw?.url ?? '',
+        url_path: raw?.url_path ?? raw?.url_key ?? '',
+        is_active: raw?.is_active ?? raw?.active ?? true,
+        meta_title: raw?.meta_title ?? raw?.title ?? '',
+        description: raw?.description ?? raw?.meta_description ?? '',
+        canonical_url: raw?.canonical_url ?? raw?.canonical ?? '',
+        product_count: raw?.product_count ?? raw?.products_count ?? 0,
+        meta_keywords: raw?.meta_keywords ?? raw?.keywords ?? '',
+        default_sort_by: raw?.default_sort_by ?? raw?.defaultSortBy ?? '',
+        meta_description: raw?.meta_description ?? raw?.description ?? '',
+        landing_page: raw?.landing_page ?? raw?.page ?? 0,
+        display_mode: raw?.display_mode ?? raw?.mode ?? '',
+        is_anchor: raw?.is_anchor ?? raw?.anchor ?? false,
+        cms_block: raw?.cms_block ?? raw?.cms ?? null,
+        breadcrumbs: Array.isArray(raw?.breadcrumbs) ? raw.breadcrumbs : (raw?.breadcrumb ? [raw.breadcrumb] : []),
+    } as Category;
+}

package/app/normalizers/Checkout.query.ts

@@ -27,6 +27,7 @@ import {
     TotalsItem,
     TotalsObject,
 } from './Checkout.type';
+import { normalizeOrder } from './Order.type';
 
 /** @namespace ../../normalizers/Checkout/Query */
 export class CheckoutQuery {
@@ -251,3 +252,24 @@ export class CheckoutQuery {
 }
 
 export default new CheckoutQuery();
+
+export function normalizePaymentMethodsResponse(raw: any): PaymentMethod[] {
+    if (!raw) return [];
+    const payload = raw.paymentMethods ?? raw.payment_methods ?? raw;
+    return Array.isArray(payload) ? payload : (Array.isArray(payload?.payment_methods) ? payload.payment_methods : []);
+}
+
+export function normalizeTotalsResponse(raw: any): TotalsObject | null {
+    if (!raw) return null;
+    const payload = raw.totals ?? raw.Totals ?? raw;
+    return payload || null;
+}
+
+export function normalizePlaceOrderResponse(raw: any) {
+    if (!raw) return null;
+    // placeOrder typically returns { order: { order_id } }
+    const payload = raw.placeOrder ?? raw.order ?? raw;
+    if (payload?.order) return normalizeOrder(payload.order as any);
+    if (payload?.order_id) return { id: String(payload.order_id), raw: payload };
+    return payload;
+}

package/app/normalizers/CmsPage.type.ts

@@ -24,3 +24,17 @@ export interface CmsPageQueryOptions {
     url_key: string;
     identifier: string;
 }
+
+export function normalizeCmsPage(raw: any): CmsPageFields | null {
+    if (!raw) return null;
+    const fields: CmsPageFields = {
+        title: raw?.title ?? raw?.page_title ?? '',
+        content: raw?.content ?? raw?.content_html ?? raw?.body ?? '',
+        page_width: raw?.page_width ?? raw?.width ?? 'full',
+        content_heading: raw?.content_heading ?? raw?.heading ?? '',
+        meta_title: raw?.meta_title ?? raw?.title ?? '',
+        meta_description: raw?.meta_description ?? raw?.description ?? '',
+        meta_keywords: raw?.meta_keywords ?? raw?.keywords ?? '',
+    };
+    return fields;
+}

package/app/normalizers/Menu.query.ts

@@ -13,7 +13,7 @@ import { Field, Query } from '@tilework/opus';
 
 import { CategoryDisplayMode } from '../routes/CategoryPage/CategoryPage.config';
 
-import { MenuItem } from './Menu.type';
+import { MenuItem, normalizeMenuItems } from './Menu.type';
 /**
  * Menu Query
  * @class MenuQuery
@@ -52,3 +52,11 @@ export class MenuQuery {
 }
 
 export default new MenuQuery();
+
+export function normalizeMenuResponse(raw: any): MenuItem[] {
+    if (!raw) return [];
+    if (raw.menu) return normalizeMenuItems(raw.menu);
+    if (Array.isArray(raw)) return normalizeMenuItems(raw);
+    if (Array.isArray(raw?.menuItems)) return normalizeMenuItems(raw.menuItems);
+    return normalizeMenuItems(raw);
+}

package/app/normalizers/Menu.type.ts

@@ -20,3 +20,21 @@ export interface MenuItem {
     category_id: number;
     display_mode: CategoryDisplayMode;
 }
+
+export function normalizeMenuItems(raw: any): MenuItem[] {
+    if (!raw) return [];
+    if (Array.isArray(raw)) {
+        return raw.map((it: any) => ({
+            url: it?.url ?? it?.link ?? '',
+            title: it?.title ?? it?.label ?? it?.name ?? '',
+            item_id: String(it?.item_id ?? it?.id ?? ''),
+            position: Number(it?.position ?? 0),
+            parent_id: Number(it?.parent_id ?? it?.parent ?? 0),
+            category_id: Number(it?.category_id ?? it?.cat_id ?? 0),
+            display_mode: it?.display_mode ?? it?.mode ?? 'PRODUCTS',
+        } as MenuItem));
+    }
+    // If the payload contains an items key, map that
+    if (Array.isArray(raw?.items)) return normalizeMenuItems(raw.items);
+    return [];
+}

package/app/normalizers/Order.query.ts

@@ -41,6 +41,7 @@ import {
     ShippingHandling,
     TaxItem,
 } from './Order.type';
+import { normalizeOrder } from './Order.type';
 
 /**
  * Order Query
@@ -739,3 +740,16 @@ export class OrderQuery {
 }
 
 export default new OrderQuery();
+
+export function normalizeOrderResponse(raw: any) {
+    if (!raw) return null;
+    if (raw.order) return normalizeOrder(raw.order as any);
+    if (raw.orderData) return normalizeOrder(raw.orderData as any);
+    return normalizeOrder(raw as any);
+}
+
+export function normalizeOrdersResponse(raw: any) {
+    if (!raw) return [];
+    const list = Array.isArray(raw.items) ? raw.items : (Array.isArray(raw) ? raw : (raw.orders ?? raw.items ?? []));
+    return Array.isArray(list) ? list.map((o: any) => normalizeOrder(o)) : [];
+}

package/app/normalizers/ProductList.query.ts

@@ -83,6 +83,8 @@ import {
     SwatchData,
     TierPrice,
     UrlRewrite,
+    NormalizedProductsQueryOutput,
+    normalizeProductsQueryOutput,
     VariantItem,
 } from './ProductList.type';
 
@@ -1618,3 +1620,10 @@ export class ProductListQuery {
 }
 
 export default new ProductListQuery();
+
+// Normalize a products GraphQL response into the canonical NormalizedProductsQueryOutput
+export function normalizeProductsResponse(raw: any): NormalizedProductsQueryOutput {
+    if (!raw) return normalizeProductsQueryOutput({ items: [], sort_fields: { options: [] }, filters: [], total_count: 0, page_info: { current_page: 1, total_pages: 1 } });
+    if (raw.products) return normalizeProductsQueryOutput(raw.products);
+    return normalizeProductsQueryOutput(raw);
+}

package/app/normalizers/Review.query.ts

@@ -18,6 +18,7 @@ import {
     ReviewRatingItem,
     ReviewRatingValue,
 } from './Review.type';
+import { normalizeReview } from './Review.type';
 
 /** @namespace ../../normalizers/Review/Query */
 export class ReviewQuery {
@@ -79,3 +80,9 @@ export class ReviewQuery {
 }
 
 export default new ReviewQuery();
+
+export function normalizeReviewResponse(raw: any) {
+    if (!raw) return null;
+    if (raw.review) return normalizeReview(raw.review as any);
+    return normalizeReview(raw as any);
+}

package/app/normalizers/UrlRewrites.query.ts

@@ -16,6 +16,7 @@ import { GQLUrlRewriteEntityTypeEnum } from '../types/Graphql.type';
 import {
     UrlRewritesOutput,
     UrlRewritesQueryOptions,
+    normalizeUrlRewriteResponse,
 } from './UrlRewrites.type';
 
 /**
@@ -53,3 +54,9 @@ export class UrlRewritesQuery {
 }
 
 export default new UrlRewritesQuery();
+
+export function normalizeUrlRewrite(raw: any): UrlRewritesOutput | null {
+    if (!raw) return null;
+    if (raw.urlResolver) return normalizeUrlRewriteResponse(raw.urlResolver as any);
+    return normalizeUrlRewriteResponse(raw as any);
+}

package/app/normalizers/UrlRewrites.type.ts

@@ -23,3 +23,18 @@ export interface UrlRewritesOutput {
 export interface UrlRewritesQueryOptions {
     urlParam: string;
 }
+
+export function normalizeUrlRewriteResponse(raw: any): UrlRewritesOutput | null {
+    if (!raw) return null;
+    // GraphQL urlResolver may return the object directly or wrap it under
+    // urlResolver property depending on response shape.
+    const payload = raw?.urlResolver ?? raw;
+    if (!payload) return null;
+    return {
+        sku: payload?.sku ?? payload?.product_sku ?? '',
+        type: payload?.type ?? payload?.entity_type ?? (payload?.is_category ? 'CATEGORY' : 'PRODUCT'),
+        id: Number(payload?.id ?? payload?.entity_id ?? 0),
+        display_mode: payload?.display_mode ?? payload?.mode ?? 'PRODUCTS',
+        sort_by: payload?.sort_by ?? payload?.sort ?? '',
+    } as UrlRewritesOutput;
+}

package/app/normalizers/Wishlist.query.ts

@@ -28,6 +28,7 @@ import {
     WishlistItem,
     WishListUserInputError,
 } from './Wishlist.type';
+import { normalizeProduct } from './ProductList.type';
 
 /** @namespace ../../normalizers/Wishlist/Query */
 export class WishlistQuery {
@@ -200,3 +201,28 @@ export class WishlistQuery {
 }
 
 export default new WishlistQuery();
+
+export function normalizeWishlistResponse(raw: any): Wishlist | null {
+    if (!raw) return null;
+    const payload = raw.wishlist ?? raw;
+    const items = Array.isArray(payload.items) ? payload.items.map((it: any) => ({
+        id: String(it?.id ?? it?.uid ?? ''),
+        sku: it?.sku ?? it?.product?.sku ?? '',
+        qty: Number(it?.qty ?? it?.quantity ?? 0),
+        description: it?.description ?? it?.product?.description ?? '',
+        price: it?.price ?? it?.product?.price ?? 0,
+        price_without_tax: it?.price_without_tax ?? 0,
+        buy_request: it?.buy_request ?? '',
+        options: it?.options ?? [],
+        product: it?.product ? normalizeProduct(it.product) : (it?.product as any),
+        raw: it,
+    } as WishlistItem)) : [];
+
+    return {
+        id: Number(payload.id ?? 0),
+        updated_at: payload.updated_at ?? payload.updatedAt ?? '',
+        items_count: Number(payload.items_count ?? items.length),
+        creators_name: payload.creators_name ?? '',
+        items,
+    } as Wishlist;
+}

package/app/stores/Product/Product.dispatcher.ts

@@ -1,4 +1,5 @@
 import { getCommerceClient } from '../../utils/client'
+import { useProductStore } from '../product'
 
 // Product dispatcher that uses the normalized commerce client when available.
 export async function fetchProductById(id: string): Promise<any | null> {
@@ -35,7 +36,18 @@ export async function handleData(dispatch: any, options: any) {
   try {
     if (typeof dispatch === 'function' && options && options.id) {
       const product = await fetchProductById(options.id)
-      dispatch({ type: 'PRODUCT_LOADED', payload: product })
+      // Update Pinia store when available
+      try {
+        const store = useProductStore()
+        if (store && typeof store.selectProduct === 'function') {
+          store.selectProduct(product)
+        } else if (store) {
+          ;(store as any).selectedProduct = product
+        }
+      } catch (e) {
+        // ignore Pinia errors
+      }
+
       return product
     }
   } catch (e) {

package/app/stores/ProductList/ProductList.dispatcher.ts

@@ -1,4 +1,5 @@
 import { getCommerceClient } from '../../utils/client'
+import { useProductListStore } from '../productList'
 
 // ProductList dispatcher that prefers the normalized commerce client when
 // available. Returns an array of normalized products or an empty array.
@@ -21,13 +22,19 @@ export async function fetchProductList(params: any = {}): Promise<any[]> {
 
 export async function handleData(dispatch: any, options: any) {
   const data = await fetchProductList(options)
-  if (typeof dispatch === 'function') {
-    try {
-      dispatch({ type: 'PRODUCT_LIST_LOADED', payload: data })
-    } catch (e) {
-      // best-effort: ignore dispatch errors
+  // Update Pinia store when available
+  try {
+    const store = useProductListStore()
+    if (store && typeof store.fetch === 'function') {
+      // let the store perform its fetch to populate items/state consistently
+      await store.fetch(options)
+    } else if (store) {
+      ;(store as any).items = Array.isArray(data) ? data : []
     }
+  } catch (e) {
+    // ignore Pinia errors
   }
+
   return data
 }
 

package/app/stores/orders.ts

@@ -125,7 +125,8 @@ export const useOrdersStore = defineStore('orders', () => {
   // Computed properties
   const ordersByStatus = computed(() => {
     return orders.value.reduce((acc: Record<string, number>, order: Order) => {
-      acc[order.status] = (acc[order.status] || 0) + 1
+      const status = order?.status ?? 'unknown'
+      acc[status] = (acc[status] || 0) + 1
       return acc
     }, {} as Record<string, number>)
   })
@@ -139,7 +140,7 @@ export const useOrdersStore = defineStore('orders', () => {
 
   const averageOrderValue = computed(() => {
     const validOrders = orders.value.filter((order: Order) => 
-      !['cancelled', 'refunded'].includes(order.status)
+      !['cancelled', 'refunded'].includes(order?.status ?? '')
     )
     return validOrders.length > 0 ? totalRevenue.value / validOrders.length : 0
   })

package/app/utils/DynamicReducer/index.tsx

@@ -23,8 +23,8 @@ export const withReducers = (reducers: Record<string, Reducer>) => (
     WrappedComponent: ElementType,
 ): WithReducersResult => {
     const injectAndExecute = (props: Props) => {
-        injectReducers(getStore(), reducers);
-
+        // Reducer injection is deprecated — we no longer inject Redux reducers.
+        // Keep this wrapper for API compatibility but avoid mutating the legacy store.
         // eslint-disable-next-line @mframework/mframework-guidelines/jsx-no-props-destruction
         return <WrappedComponent { ...props } />;
     };

package/app/utils/Preload/index.ts

@@ -10,8 +10,7 @@
  */
 
 import { UrlRewritePageType } from '../../routes/UrlRewrites/UrlRewrites.config';
-import ProductReducer from '../../stores/Product/Product.reducer';
-import ProductListReducer from '../../stores/ProductList/ProductList.reducer';
+// Reducers removed — migration to Pinia stores; keep Preload minimal
 import BrowserDatabase from '../../utils/BrowserDatabase';
 import { isMobile } from '../../utils/Mobile';
 import getStore, { injectReducers } from '../../utils/Store';
@@ -19,10 +18,8 @@ import getStore, { injectReducers } from '../../utils/Store';
 import CategoryPreload from './CategoryPreload';
 import ProductPreload from './ProductPreload';
 
-injectReducers(getStore(), {
-    ProductReducer,
-    ProductListReducer,
-});
+// Previously reducers were injected here for legacy Redux-style consumers.
+// Reducers have been migrated into Pinia stores; no injection needed.
 
 const { actionName: { type = '' } = {} } = window;
 

package/app/utils/client.ts

@@ -2,6 +2,14 @@ import * as CommercePkg from '~/types';
 import { sdk } from '@mframework/sdk';
 import imports from '../types';
 import { normalizeProductsQueryOutput, normalizeProduct } from '../normalizers/ProductList.type';
+import { normalizeProductsResponse } from '../normalizers/ProductList.query';
+import { normalizeMenuResponse } from '../normalizers/Menu.query';
+import { normalizeCategoryResponse } from '../normalizers/Category.query';
+import { normalizeCompareResponse } from '../normalizers/ProductCompare.query';
+import { normalizeStoresResponse } from '../normalizers/StoreInPickUp.query';
+import { normalizeCmsPage } from '../normalizers/CmsPage.type';
+import { normalizeUrlRewrite } from '../normalizers/UrlRewrites.query';
+import { normalizeWishlistResponse } from '../normalizers/Wishlist.query';
 import { normalizeCart } from '../normalizers/Cart.type';
 import { normalizeOrder } from '../normalizers/Order.type';
 import { normalizeReview } from '../normalizers/Review.type';
@@ -48,13 +56,99 @@ function createNormalizedClient(client: any) {
     wrapped.listProducts = async (...args: any[]) => {
       const res = await client.listProducts(...args);
       try {
-        return normalizeProductsQueryOutput(res);
+        // prefer the type-level normalizer but also accept query-level responses
+        return normalizeProductsQueryOutput(res) || normalizeProductsResponse(res);
       } catch (e) {
         return res;
       }
     };
   }
 
+  // Menu endpoints
+  const menuMethods = ['getMenu', 'getMenus', 'listMenus', 'listMenu', 'getMenuItems', 'listMenuItems'];
+  for (const m of menuMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try {
+          return normalizeMenuResponse(res);
+        } catch (e) {
+          return res;
+        }
+      };
+    }
+  }
+
+  // Category endpoints
+  const categoryMethods = ['getCategory', 'getCategoryBySlug', 'getCategories', 'listCategories', 'getCategoryTree'];
+  for (const m of categoryMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try {
+          return normalizeCategoryResponse(res);
+        } catch (e) {
+          return res;
+        }
+      };
+    }
+  }
+
+  // CMS / pages
+  const cmsMethods = ['getPage', 'getCmsPage', 'getPageBySlug', 'listPages', 'getPages'];
+  for (const m of cmsMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try { return normalizeCmsPage(res); } catch (e) { return res; }
+      };
+    }
+  }
+
+  // URL rewrites / resolver
+  const urlMethods = ['resolveUrl', 'getUrlRewrite', 'urlResolver', 'findUrl'];
+  for (const m of urlMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try { return normalizeUrlRewrite(res); } catch (e) { return res; }
+      };
+    }
+  }
+
+  // Wishlist
+  const wishlistMethods = ['getWishlist', 'listWishlist', 'getWishlistById', 'getWishlistItems'];
+  for (const m of wishlistMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try { return normalizeWishlistResponse(res); } catch (e) { return res; }
+      };
+    }
+  }
+
+  // Compare / product compare
+  const compareMethods = ['getCompare', 'listCompare', 'compareProducts', 'getCompareList'];
+  for (const m of compareMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try { return normalizeCompareResponse(res); } catch (e) { return res; }
+      };
+    }
+  }
+
+  // Stores / pickup
+  const storeMethods = ['listStores', 'getStores', 'getStore', 'listPickUpStores', 'getStoresInPickUp'];
+  for (const m of storeMethods) {
+    if (typeof client[m] === 'function') {
+      wrapped[m] = async (...args: any[]) => {
+        const res = await client[m](...args);
+        try { return normalizeStoresResponse(res); } catch (e) { return res; }
+      };
+    }
+  }
+
   if (typeof client.getProductById === 'function') {
     wrapped.getProductById = async (...args: any[]) => {
       const res = await client.getProductById(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mframework/layer-commerce",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Commerce Layer for the M Framework",
   "keywords": [
     "commerce",

package/app/stores/Product/Product.reducer.ts

@@ -1,12 +0,0 @@
-// Minimal Product reducer compatibility layer. Responds to `PRODUCT_LOADED`.
-export default function ProductReducer(state = { product: null }, action: any) {
-  if (!action) return state
-  try {
-    if (action.type === 'PRODUCT_LOADED') {
-      return { ...state, product: action.payload }
-    }
-  } catch (e) {
-    // ignore and return current state
-  }
-  return state
-}

package/app/stores/ProductList/ProductList.reducer.ts

@@ -1,13 +0,0 @@
-// Minimal ProductList reducer compatibility layer. Accepts an action with
-// `type: 'PRODUCT_LIST_LOADED'` and `payload` to populate `items`.
-export default function ProductListReducer(state = { items: [] }, action: any) {
-  if (!action) return state
-  try {
-    if (action.type === 'PRODUCT_LIST_LOADED') {
-      return { ...state, items: Array.isArray(action.payload) ? action.payload : state.items }
-    }
-  } catch (e) {
-    // ignore and return current state
-  }
-  return state
-}