@laioutr/app-shopware 0.15.2 → 0.15.4

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@laioutr/app-shopware",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "configKey": "@laioutr/app-shopware",
   "builder": {
     "@nuxt/module-builder": "1.0.1",

package/dist/module.mjs

@@ -4,7 +4,7 @@ import { CHECKOUT_ENDPOINT_PATH, ADOPT_SESSION_ENDPOINT_PATH } from '../dist/run
 import { registerLaioutrApp } from '@laioutr-core/kit';
 
 const name = "@laioutr/app-shopware";
-const version = "0.15.2";
+const version = "0.15.4";
 
 const module$1 = defineNuxtModule({
   meta: {

package/dist/runtime/server/orchestr/menu/byAlias.query.js

@@ -7,7 +7,7 @@ export default defineShopwareQuery({
   implements: MenuByAliasQuery,
   run: async ({ input, context, passthrough }) => {
     const { alias } = input;
-    const criteria = await context.resolveCriteria("menu", { includes: {}, associations: { seoUrls: {} } });
+    const criteria = await context.resolveCriteria("menu", { includes: {}, associations: {} });
     const response = await context.storefrontClient.invoke("readNavigation post /navigation/{activeId}/{rootId}", {
       pathParams: {
         activeId: alias,

package/dist/runtime/server/orchestr/product/base.resolver.js

@@ -35,28 +35,30 @@ export default defineShopwareComponentResolver({
     const parentIdToDefaultVariantId = passthrough.get(parentIdToDefaultVariantIdToken);
     const variantIds = entityIds.map((id) => parentIdToDefaultVariantId?.[id] ?? id);
     const loadedVariants = passthrough.get(productVariantsToken) ?? [];
-    const missingVariantIds = variantIds.filter((id) => !loadedVariants.some((variant) => variant.id === id));
-    if (missingVariantIds.length > 0) {
+    const missingIds = [.../* @__PURE__ */ new Set([...variantIds, ...entityIds])].filter((id) => !loadedVariants.some((variant) => variant.id === id));
+    if (missingIds.length > 0) {
       const response = await fetchAllProducts(context.storefrontClient, {
-        productIds: missingVariantIds,
+        productIds: missingIds,
         loadVariants: false,
         resolveCriteria: context.resolveCriteria
       });
       loadedVariants.push(...response);
     }
-    const shopwareProducts = variantIds.map((id) => {
-      const rawVariant = loadedVariants.find((variant) => variant.id === id);
+    const shopwareProducts = entityIds.map((entityId) => {
+      const rawVariant = loadedVariants.find((variant) => variant.id === (parentIdToDefaultVariantId?.[entityId] ?? entityId));
       if (!rawVariant) return void 0;
       return {
+        entityId,
         rawVariant,
-        rawProduct: loadedVariants.find((variant) => variant.id === variant.parentId) ?? rawVariant
+        rawProduct: loadedVariants.find((variant) => variant.id === entityId) ?? rawVariant
       };
     }).filter((product) => !!product);
-    const entities = shopwareProducts.map(({ rawProduct, rawVariant }) => {
+    const entities = shopwareProducts.map(({ entityId, rawProduct, rawVariant }) => {
       const mappedCover = rawProduct.cover?.media ? mapMedia(rawVariant.cover?.media ?? rawProduct.cover.media) : FALLBACK_IMAGE;
       return $entity({
-        // The parent-id is the actual product-id, even if the product has variants.
-        id: rawProduct.id,
+        // Answer under the id that was asked for: the queries hand over parent-ids, while the data
+        // below is read off the variant they selected.
+        id: entityId,
         base: {
           name: swTranslated(rawProduct, "name"),
           slug: entitySlug(rawProduct)

package/dist/runtime/server/orchestr/product/byCategoryId.query.js

@@ -29,7 +29,7 @@ export default defineShopwareQuery(
         "shipping-free": swBuiltInFilters?.["shipping-free"]
       }
     });
-    const availableFilters = mapShopwareAggregationToAvailableFilters(response.data.aggregations);
+    const availableFilters = mapShopwareAggregationToAvailableFilters(response.data.aggregations, context.swCurrency);
     const availableSortings = mapShopwareSortingToOrchestr(response.data.availableSortings);
     const parentIdToDefaultVariantId = Object.fromEntries(
       response.data.elements.map((product) => [product.parentId ?? product.id, product.id])

package/dist/runtime/server/orchestr/product/byCategorySlug.query.js

@@ -36,7 +36,7 @@ export default defineShopwareQuery(
         "shipping-free": swBuiltInFilters?.["shipping-free"]
       }
     });
-    const availableFilters = mapShopwareAggregationToAvailableFilters(response.data.aggregations);
+    const availableFilters = mapShopwareAggregationToAvailableFilters(response.data.aggregations, context.swCurrency);
     const availableSortings = mapShopwareSortingToOrchestr(response.data.availableSortings);
     const parentIdToDefaultVariantId = Object.fromEntries(
       response.data.elements.map((product) => [product.parentId ?? product.id, product.id])

package/dist/runtime/server/orchestr/product/search.query.js

@@ -26,7 +26,7 @@ export default defineShopwareQuery(ProductSearchQuery, async ({ context, input,
       "shipping-free": swBuiltInFilters?.["shipping-free"]
     }
   });
-  const availableFilters = mapShopwareAggregationToAvailableFilters(response.data.aggregations);
+  const availableFilters = mapShopwareAggregationToAvailableFilters(response.data.aggregations, context.swCurrency);
   const availableSortings = mapShopwareSortingToOrchestr(response.data.availableSortings ?? []);
   const parentIdToDefaultVariantId = Object.fromEntries(
     response.data.elements.map((product) => [product.parentId ?? product.id, product.id])

package/dist/runtime/server/shopware-helper/cartMapper.js

@@ -40,6 +40,7 @@ export const mapCartItem = (lineItem, currency) => {
   const listPrice = price?.listPrice?.price;
   const parentId = payload.parentId ?? lineItem.referencedId ?? lineItem.id;
   const slug = getEntitySeoSlug(payload) ?? createFallbackSlug(lineItem.label ?? "", lineItem.referencedId ?? lineItem.id);
+  const cover = lineItem.cover;
   const availableStock = payload.availableStock;
   const inStock = availableStock === void 0 ? payload.available !== false : availableStock > 0;
   return {
@@ -48,8 +49,10 @@ export const mapCartItem = (lineItem, currency) => {
       quantity: lineItem.quantity,
       title: lineItem.label ?? "",
       code: payload.productNumber,
+      // The generated schema types `cover` as ProductMedia, but the store-api serializes
+      // the media entity directly (core sets `LineItem::$cover` to the ProductMedia's media).
       // Cart covers are product images (never video), so the narrowing cast is safe.
-      cover: lineItem.cover?.media ? mapMedia(lineItem.cover.media) : void 0,
+      cover: cover ? mapMedia(cover) : void 0,
       link: {
         type: "reference",
         reference: { type: "Product", id: parentId, slug }

package/dist/runtime/server/shopware-helper/facetMapper.d.ts

@@ -2,15 +2,16 @@ import { AvailableFilter, QueryWireRequestFilter } from '#orchestr/types';
 export type ShopwareAggregationKey = 'price' | 'shipping-free' | 'manufacturer';
 export interface ShopwareAggregation {
     name: string;
-    min?: number;
-    max?: number;
+    /** A decimal, serialized as a string on some instances and as a number on others. */
+    min?: number | string;
+    max?: number | string;
     entities?: Array<{
         id: string;
         name: string;
     }>;
 }
 export type ShopwareAggregations = Record<ShopwareAggregationKey, ShopwareAggregation>;
-export declare const mapShopwareAggregationToAvailableFilters: (facets: ShopwareAggregations) => AvailableFilter[];
+export declare const mapShopwareAggregationToAvailableFilters: (facets: ShopwareAggregations, currency: string) => AvailableFilter[];
 export declare const mapSelectedFiltersToShopwareFilters: (filters: QueryWireRequestFilter, currency: string) => {
     swFilters: ({
         field: string;

package/dist/runtime/server/shopware-helper/facetMapper.js

@@ -1,6 +1,7 @@
 import { isRangeFilter } from "#orchestr/types";
 import { Money } from "@screeny05/ts-money";
-export const mapShopwareAggregationToAvailableFilters = (facets) => {
+const toMoney = (decimal, currency) => Money.fromDecimal(Number(decimal ?? 0), currency, Math.round);
+export const mapShopwareAggregationToAvailableFilters = (facets, currency) => {
   const filters = [];
   const listFacets = ["manufacturer"];
   const rangeFacets = ["price"];
@@ -21,8 +22,8 @@ export const mapShopwareAggregationToAvailableFilters = (facets) => {
         id: facetObj.name,
         label: facetObj.name,
         type: "range",
-        min: 0,
-        max: facetObj.max ?? 0
+        min: toMoney(facetObj.min, currency),
+        max: toMoney(facetObj.max, currency)
       });
     } else if (booleanFacets.includes(facetKey)) {
       filters.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laioutr/app-shopware",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "Laioutr integration with Shopware 6",
   "repository": "github:laioutr/app-shopware",
   "license": "MIT",