@laioutr/app-shopware 0.16.0 → 0.18.0

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@laioutr/app-shopware",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "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, ORDER_HANDOFF_ENDP
 import { registerLaioutrApp } from '@laioutr-core/kit';
 
 const name = "@laioutr/app-shopware";
-const version = "0.16.0";
+const version = "0.18.0";
 
 const module$1 = defineNuxtModule({
   meta: {

package/dist/runtime/server/orchestr/auth/login-oauth.action.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Send a visitor asking for their account to Shopware's own login page. Shopware authenticates
+ * with credentials rather than an OAuth handshake, so this answers the union's `account` arm and
+ * the storefront navigates there.
+ *
+ * `returnTo` is dropped: Shopware's login redirect takes one of its own route names, not a URL,
+ * so a laioutr path cannot travel through it.
+ */
+declare const _default: any;
+export default _default;

package/dist/runtime/server/orchestr/auth/login-oauth.action.js

@@ -0,0 +1,13 @@
+import { useRuntimeConfig } from "#imports";
+import { AuthLoginOauthAction } from "@laioutr-core/canonical-types/ecommerce";
+import { defineShopwareAction } from "../../middleware/defineShopware.js";
+export default defineShopwareAction(AuthLoginOauthAction, async () => {
+  const { storefrontUrl } = useRuntimeConfig()["@laioutr/app-shopware"];
+  if (!storefrontUrl) {
+    throw new Error("storefrontUrl is not configured, so there is no Shopware login page to send the customer to");
+  }
+  return {
+    type: "account",
+    link: { type: "url", href: new URL("/account/login", storefrontUrl).toString() }
+  };
+});

package/dist/runtime/server/orchestr/customer/get-current.action.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Read the customer behind the request's context token. Shopware answers `403` when the token
+ * belongs to a guest context, which is the signal callers use to tell a session from none.
+ *
+ * `addresses` stays empty: Shopware returns addresses only as an association, and each one needs
+ * its `countryId` resolved to the ISO code `MailingAddress` requires. Nothing reads them yet, so
+ * the lookup is not made — extend this handler before relying on the field.
+ */
+declare const _default: any;
+export default _default;

package/dist/runtime/server/orchestr/customer/get-current.action.js

@@ -0,0 +1,22 @@
+import { CustomerGetCurrentAction, UnauthenticatedError } from "@laioutr-core/canonical-types/ecommerce";
+import { defineShopwareAction } from "../../middleware/defineShopware.js";
+export default defineShopwareAction(CustomerGetCurrentAction, async ({ context }) => {
+  let customer;
+  try {
+    customer = await context.storefrontClient.invoke("readCustomer post /account/customer", {});
+  } catch {
+    throw new UnauthenticatedError();
+  }
+  const firstName = customer.firstName ?? "";
+  const lastName = customer.lastName ?? "";
+  const displayName = `${firstName} ${lastName}`.trim();
+  return {
+    customer: {
+      id: customer.id,
+      email: customer.email,
+      displayName: displayName || (customer.email ?? ""),
+      person: { firstName, lastName, salutation: customer.salutation?.salutationKey, title: customer.title ?? void 0 },
+      addresses: []
+    }
+  };
+});

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

@@ -2,7 +2,7 @@ import { MenuByAliasQuery } from "@laioutr-core/canonical-types/ecommerce";
 import { defineShopwareQueryTemplateProvider } from "../../middleware/defineShopware.js";
 export default defineShopwareQueryTemplateProvider({
   for: MenuByAliasQuery,
-  run: async ({ input, context }) => [
+  run: async () => [
     {
       input: {
         alias: "main-navigation"

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

@@ -6,6 +6,7 @@ import {
   ProductFlags,
   ProductInfo,
   ProductMedia,
+  ProductOptionGroups,
   ProductPrices,
   ProductRating,
   ProductSeo
@@ -16,6 +17,7 @@ import { defineShopwareComponentResolver } from "../../middleware/defineShopware
 import { fetchAllProducts } from "../../shopware-helper/fetchAllProductVariants.js";
 import { entitySlug } from "../../shopware-helper/mappers/slugMapper.js";
 import { mapMedia } from "../../shopware-helper/mediaMapper.js";
+import { mapProductOptionGroups } from "../../shopware-helper/optionGroupsMapper.js";
 import { swTranslated } from "../../shopware-helper/swTranslated.js";
 export default defineShopwareComponentResolver({
   label: "Shopware Product Connector",
@@ -29,6 +31,7 @@ export default defineShopwareComponentResolver({
     ProductSeo,
     ProductDescription,
     ProductDefaultVariant,
+    ProductOptionGroups,
     ProductRating
   ],
   resolve: async ({ entityIds, context, $entity, passthrough }) => {
@@ -65,8 +68,15 @@ export default defineShopwareComponentResolver({
           slug: entitySlug(rawProduct)
         },
         defaultVariant: {
-          id: rawVariant.id
+          id: rawVariant.id,
+          sku: rawVariant.productNumber ?? void 0,
+          // Typed locally because the resolver hands `rawVariant` back as `any`.
+          options: rawVariant.options?.map((option) => swTranslated(option, "name") ?? "").filter(Boolean),
+          status: rawVariant.available ? "inStock" : "outOfStock"
         },
+        // The configurator hangs off the parent, never the variant the rest of this
+        // projection reads from.
+        optionGroups: mapProductOptionGroups(rawProduct),
         info: {
           cover: mappedCover,
           shortDescription: swTranslated(rawProduct, "description") || swTranslated(rawVariant, "description"),
@@ -120,6 +130,11 @@ export default defineShopwareComponentResolver({
     components: {
       prices: {
         ttl: "15 minutes"
+      },
+      // Half of it is stock-derived, so it decays like prices rather than living for
+      // the resolver's full day. `optionGroups` needs no override: nothing in it is.
+      defaultVariant: {
+        ttl: "15 minutes"
       }
     }
   }

package/dist/runtime/server/orchestr/product/reviews.link.js

@@ -1,8 +1,17 @@
 import { ProductReviewsLink } from "@laioutr-core/canonical-types/ecommerce";
 import { currentProductIdsToken } from "../../const/passthroughTokens.js";
 import { defineShopwareLink } from "../../middleware/defineShopware.js";
-export default defineShopwareLink(ProductReviewsLink, async ({ entityIds, context, pagination, passthrough }) => {
+const REVIEW_SORTINGS = {
+  newest: { field: "createdAt", order: "DESC" },
+  oldest: { field: "createdAt", order: "ASC" },
+  "rating-high": { field: "points", order: "DESC" },
+  "rating-low": { field: "points", order: "ASC" }
+};
+export default defineShopwareLink(ProductReviewsLink, async ({ entityIds, context, pagination, sorting, filter, passthrough }) => {
   const { storefrontClient } = context;
+  const sort = sorting ? REVIEW_SORTINGS[sorting] : void 0;
+  const points = Number(filter?.points);
+  const criteriaFilter = Number.isFinite(points) ? [{ type: "equals", field: "points", value: points }] : void 0;
   const productToReviews = {};
   await Promise.all(
     entityIds.map(async (entityId) => {
@@ -11,6 +20,8 @@ export default defineShopwareLink(ProductReviewsLink, async ({ entityIds, contex
         body: {
           page: pagination.page,
           limit: pagination.limit,
+          ...sort ? { sort: [sort] } : {},
+          ...criteriaFilter ? { filter: criteriaFilter } : {},
           includes: {
             product_review: ["id"]
           }

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

@@ -15,6 +15,7 @@ import { resolveProductVariantFields } from "../../orchestr-helper/requestedFiel
 import { toRequestCriteria } from "../../shopware-helper/criteria.js";
 import { mapMedia } from "../../shopware-helper/mediaMapper.js";
 import { swTranslated } from "../../shopware-helper/swTranslated.js";
+import { guessWellKnownName } from "../../shopware-helper/wellKnownOptionName.js";
 export default defineShopwareComponentResolver({
   entityType: "ProductVariant",
   label: "Shopware Product Variant Connector",
@@ -119,10 +120,14 @@ export default defineShopwareComponentResolver({
             required: true
           }),
           options: () => ({
-            selected: entity.options?.map((option) => ({
-              name: swTranslated(option.group, "name") ?? swTranslated(option, "name") ?? "Unknown Property",
-              value: swTranslated(option, "name") ?? swTranslated(option, "option") ?? "Unknown Value"
-            })) ?? []
+            selected: entity.options?.map((option) => {
+              const name = swTranslated(option.group, "name") ?? swTranslated(option, "name") ?? "Unknown Property";
+              return {
+                name,
+                wellKnownName: guessWellKnownName(name),
+                value: swTranslated(option, "name") ?? swTranslated(option, "option") ?? "Unknown Value"
+              };
+            }) ?? []
           })
         })
       )

package/dist/runtime/server/orchestr-helper/requestedFields.js

@@ -49,7 +49,16 @@ export const resolveProductFields = async (resolveCriteria) => {
   return resolveCriteria("product", {
     associations: {
       cover: { associations: { media: {} } },
-      media: { associations: { media: {} } }
+      media: { associations: { media: {} } },
+      // Only the parent carries the configurator, which is what defines the option
+      // axes; `properties` on the same row are filterable facets and never do.
+      // `media` needs its own association: without it the option's swatch image is
+      // never returned, whatever the group's displayType claims.
+      configuratorSettings: { associations: { option: { associations: { group: {}, media: {} } } } },
+      // Only the variant projection's `includes` are merged below, never its
+      // associations, so the selected options need associating here too or the
+      // default variant reports none.
+      options: { associations: { group: {} } }
     },
     includes: mergeIncludes(
       {
@@ -74,10 +83,16 @@ export const resolveProductFields = async (resolveCriteria) => {
           "calculatedPrice",
           "calculatedPrices",
           "ratingAverage",
-          "productReviews"
+          "productReviews",
+          "configuratorSettings"
         ],
         product_media: ["id", "mediaId", "media"],
-        media: MediaIncludes
+        media: MediaIncludes,
+        product_configurator_setting: ["id", "optionId", "option", "position"],
+        // Merged with the variant projection's narrower list, which carries neither
+        // the swatch fields nor the ordering the configurator is authored in.
+        property_group_option: ["colorHexCode", "media", "position"],
+        property_group: ["displayType", "position"]
       },
       variantFields.includes
     )

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

@@ -0,0 +1,23 @@
+import type { ShopwareProduct } from '../types/shopware.js';
+import type { Swatch } from '@laioutr-core/core-types/common';
+/**
+ * The option axes a product offers, read from its configurator.
+ *
+ * The configurator is what defines a variant; `properties` on the same product are
+ * filterable facets and never do. Only the parent carries it, so this must be given
+ * the parent row rather than the variant the rest of the projection reads from.
+ *
+ * Per-value stock and a per-value variant id are deliberately absent: both would
+ * mean loading every child variant, which is the cost this component exists to
+ * avoid. A consumer that needs them falls back to the variants link.
+ */
+export declare const mapProductOptionGroups: (product: Pick<ShopwareProduct, "configuratorSettings">) => {
+    groups: {
+        name: string;
+        wellKnownName: import("@laioutr-core/canonical-types/entity/product-variant").WellKnownOptionName | undefined;
+        values: {
+            value: string;
+            swatch: Swatch | undefined;
+        }[];
+    }[];
+};

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

@@ -0,0 +1,37 @@
+import { mapMedia } from "./mediaMapper.js";
+import { swTranslated } from "./swTranslated.js";
+import { guessWellKnownName } from "./wellKnownOptionName.js";
+const byPosition = (a, b) => (a.position ?? 0) - (b.position ?? 0);
+const bySettingThenOption = (a, b) => (a.position ?? 0) - (b.position ?? 0) || (a.option.position ?? 0) - (b.option.position ?? 0);
+const mapSwatch = (option) => {
+  const hex = swTranslated(option, "colorHexCode") ?? option.colorHexCode;
+  if (hex) return ["color", hex];
+  const media = option.media ? mapMedia(option.media) : void 0;
+  return media?.type === "image" ? ["image", media] : void 0;
+};
+export const mapProductOptionGroups = (product) => {
+  const settings = (product.configuratorSettings ?? []).filter((setting) => !!setting.option);
+  const groups = /* @__PURE__ */ new Map();
+  for (const setting of settings) {
+    const group = setting.option.group;
+    const key = group?.id ?? swTranslated(group, "name") ?? "";
+    const existing = groups.get(key);
+    if (existing) {
+      existing.settings.push(setting);
+      continue;
+    }
+    groups.set(key, { name: swTranslated(group, "name") ?? "", position: group?.position ?? 0, settings: [setting] });
+  }
+  return {
+    groups: [...groups.values()].sort(byPosition).map((group) => ({
+      name: group.name,
+      wellKnownName: guessWellKnownName(group.name),
+      // The merchant's configurator order, which is what keeps a size run out of
+      // alphabetical order.
+      values: [...group.settings].sort(bySettingThenOption).map((setting) => ({
+        value: swTranslated(setting.option, "name") ?? "",
+        swatch: mapSwatch(setting.option)
+      }))
+    }))
+  };
+};

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

@@ -0,0 +1,2 @@
+import type { WellKnownOptionName } from '@laioutr-core/canonical-types/entity/product-variant';
+export declare const guessWellKnownName: (name: string) => WellKnownOptionName | undefined;

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

@@ -0,0 +1,278 @@
+const OPTION_NAME_ALIASES = {
+  color: [
+    "color",
+    // en (US), es
+    "colour",
+    // en (GB)
+    "farbe",
+    // de
+    "farbton",
+    // de — shade rather than colour, and a real axis name in the wild
+    "kleur",
+    // nl
+    "couleur",
+    // fr
+    "colore",
+    // it
+    "cor",
+    // pt
+    "kolor",
+    // pl
+    "barva",
+    // cs, sl
+    "farba",
+    // sk
+    "boja",
+    // hr
+    "sz\xEDn",
+    // hu
+    "culoare",
+    // ro
+    "\u0446\u0432\u044F\u0442",
+    // bg
+    "\u03C7\u03C1\u03CE\u03BC\u03B1",
+    // el
+    "f\xE4rg",
+    // sv
+    "farve",
+    // da
+    "farge",
+    // no
+    "v\xE4ri",
+    // fi
+    "litur",
+    // is
+    "v\xE4rv",
+    // et
+    "kr\u0101sa",
+    // lv
+    "spalva",
+    // lt
+    "renk",
+    // tr
+    "\u8272",
+    // ja
+    "\u30AB\u30E9\u30FC",
+    // ja
+    "\uC0C9\uC0C1",
+    // ko
+    "\uCEEC\uB7EC",
+    // ko
+    "\u989C\u8272",
+    // zh-Hans
+    "\u984F\u8272"
+    // zh-Hant
+  ],
+  size: [
+    "size",
+    // en
+    "gr\xF6\xDFe",
+    // de
+    "groesse",
+    // de, ASCII transliteration — "oe" survives diacritic folding
+    "maat",
+    // nl
+    "grootte",
+    // nl
+    "taille",
+    // fr
+    "pointure",
+    // fr, footwear
+    "taglia",
+    // it
+    "misura",
+    // it
+    "talla",
+    // es
+    "tama\xF1o",
+    // es
+    "tamanho",
+    // pt
+    "rozmiar",
+    // pl
+    "velikost",
+    // cs, sl
+    "ve\u013Ekos\u0165",
+    // sk
+    "veli\u010Dina",
+    // hr
+    "m\xE9ret",
+    // hu
+    "m\u0103rime",
+    // ro
+    "\u0440\u0430\u0437\u043C\u0435\u0440",
+    // bg
+    "\u03BC\u03AD\u03B3\u03B5\u03B8\u03BF\u03C2",
+    // el
+    "storlek",
+    // sv
+    "st\xF8rrelse",
+    // da, no
+    "koko",
+    // fi
+    "st\xE6r\xF0",
+    // is
+    "suurus",
+    // et
+    "izm\u0113rs",
+    // lv
+    "dydis",
+    // lt
+    "beden",
+    // tr
+    "\u30B5\u30A4\u30BA",
+    // ja
+    "\uC0AC\uC774\uC988",
+    // ko
+    "\uD06C\uAE30",
+    // ko
+    "\u5C3A\u5BF8",
+    // zh
+    "\u5C3A\u7801",
+    // zh-Hans
+    "\u5C3A\u78BC"
+    // zh-Hant
+  ],
+  material: [
+    "material",
+    // en, de, es, pt, ro, sv, sl, and cs/sk `materiál` once folded
+    "materiaal",
+    // nl
+    "mati\xE8re",
+    // fr
+    "mat\xE9riau",
+    // fr
+    "materiale",
+    // it, da, no
+    "materia\u0142",
+    // pl
+    "materijal",
+    // hr
+    "anyag",
+    // hu
+    "\u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B",
+    // bg
+    "\u03C5\u03BB\u03B9\u03BA\u03CC",
+    // el
+    "materiaali",
+    // fi
+    "efni",
+    // is
+    "materjal",
+    // et
+    "materi\u0101ls",
+    // lv
+    "med\u017Eiaga",
+    // lt
+    "malzeme",
+    // tr
+    "\u7D20\u6750",
+    // ja
+    "\u6750\u8CEA",
+    // ja, zh-Hant
+    "\uC18C\uC7AC",
+    // ko
+    "\uC7AC\uC9C8",
+    // ko
+    "\u6750\u6599",
+    // zh
+    "\u6750\u8D28"
+    // zh-Hans
+  ],
+  style: [
+    "style",
+    // en, fr
+    "stil",
+    // de, sv, da, no, hr, tr
+    "stijl",
+    // nl
+    "stile",
+    // it
+    "estilo",
+    // es, pt
+    "styl",
+    // pl, cs, and sk `štýl` once folded
+    "slog",
+    // sl
+    "st\xEDlus",
+    // hu
+    "\u0441\u0442\u0438\u043B",
+    // bg
+    "\u03C3\u03C4\u03C5\u03BB",
+    // el
+    "tyyli",
+    // fi
+    "st\xEDll",
+    // is
+    "stiil",
+    // et
+    "stils",
+    // lv
+    "stilius",
+    // lt
+    "\u30B9\u30BF\u30A4\u30EB",
+    // ja
+    "\uC2A4\uD0C0\uC77C",
+    // ko
+    "\u6B3E\u5F0F"
+    // zh
+  ],
+  type: [
+    "type",
+    // en, nl, fr, da, no
+    "typ",
+    // de, pl, cs, sk, sv
+    "tipo",
+    // it, es, pt
+    "tip",
+    // sl, hr, tr
+    "vrsta",
+    // sl, hr
+    "rodzaj",
+    // pl
+    "t\xEDpus",
+    // hu
+    "\u0442\u0438\u043F",
+    // bg
+    "\u03C4\u03CD\u03C0\u03BF\u03C2",
+    // el
+    "tyyppi",
+    // fi
+    "tegund",
+    // is
+    "t\xFC\xFCp",
+    // et
+    "veids",
+    // lv
+    "tipas",
+    // lt
+    "\u30BF\u30A4\u30D7",
+    // ja
+    "\u7A2E\u985E",
+    // ja
+    "\uC720\uD615",
+    // ko
+    "\uD0C0\uC785",
+    // ko
+    "\u7C7B\u578B",
+    // zh-Hans
+    "\u985E\u578B"
+    // zh-Hant
+  ]
+};
+const normalizeOptionName = (name) => name.trim().toLowerCase().replace(/ß/g, "ss").normalize("NFD").replace(/\p{M}/gu, "");
+const OPTION_NAME_LOOKUP = new Map(
+  Object.entries(OPTION_NAME_ALIASES).flatMap(
+    ([wellKnownName, aliases]) => aliases.map((alias) => [normalizeOptionName(alias), wellKnownName])
+  )
+);
+export const guessWellKnownName = (name) => {
+  const normalized = normalizeOptionName(name);
+  const exact = OPTION_NAME_LOOKUP.get(normalized);
+  if (exact) return exact;
+  for (const token of normalized.split(/[^\p{L}\p{N}]+/u)) {
+    const match = OPTION_NAME_LOOKUP.get(token);
+    if (match) return match;
+  }
+  return void 0;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laioutr/app-shopware",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "Laioutr integration with Shopware 6",
   "repository": "github:laioutr/app-shopware",
   "license": "MIT",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.31.0",
     "@laioutr-app/ui": "^2.10.6",
-    "@laioutr-core/canonical-types": "^0.27.4",
+    "@laioutr-core/canonical-types": "^0.31.0",
     "@laioutr-core/core-types": "^0.40.3",
     "@laioutr-core/devtools": "^0.40.3",
     "@laioutr-core/frontend-core": "^0.40.3",
@@ -69,7 +69,7 @@
     "vue-tsc": "2.2.10"
   },
   "peerDependencies": {
-    "@laioutr-core/canonical-types": ">=0.27.4",
+    "@laioutr-core/canonical-types": ">=0.31.0",
     "@laioutr-core/core-types": ">=0.40.3",
     "@laioutr-core/frontend-core": ">=0.40.3",
     "@laioutr-core/kit": ">=0.40.3",