@porulle/adapter-woocommerce 0.74.2 → 0.74.4

package/dist/webhooks.d.ts

@@ -7,8 +7,9 @@ export declare const WOO_WEBHOOK_TOPICS: readonly ["product.created", "product.u
  * (form body `webhook_id=N`, unsigned) is `Ok(null)`. Everything else must carry a valid signature.
  *
  * The id is ours: `X-WC-Webhook-Delivery-ID` hashes the subscription id and the current SECOND, so two
- * deliveries in one second collide. The change itself — topic, resource, status, modification time —
- * identifies a delivery and its replays.
+ * deliveries in one second collide. So does `date_modified_gmt`, which is also to the second: two stock
+ * changes inside one second differ only in the stock. The topic and the whole signed body identify a
+ * delivery: a replay is the same bytes, and any other state is a change to apply.
  */
 export declare function verifyDelivery(store: ChannelStore, request: Request): Promise<Result<ChannelWebhookEvent | null, ChannelConnectorError>>;
 /**

package/dist/webhooks.js

@@ -7,12 +7,6 @@ import { ORDER_META_KEY, wooOrderSchema } from "./orders.js";
 /** What every store is subscribed to: catalogue and stock changes, and every change to an order. */
 export const WOO_WEBHOOK_TOPICS = ["product.created", "product.updated", "product.deleted", "order.updated"];
 const id = z.union([z.number(), z.string()]).transform(String);
-/** Fields of a delivery body that identify the change it reports. */
-const deliveryBody = z.object({
-    id: id.optional(),
-    status: z.string().nullish(),
-    date_modified_gmt: z.string().nullish(),
-});
 function validSignature(secret, body, signature) {
     if (!signature || !secret)
         return false;
@@ -25,8 +19,9 @@ function validSignature(secret, body, signature) {
  * (form body `webhook_id=N`, unsigned) is `Ok(null)`. Everything else must carry a valid signature.
  *
  * The id is ours: `X-WC-Webhook-Delivery-ID` hashes the subscription id and the current SECOND, so two
- * deliveries in one second collide. The change itself — topic, resource, status, modification time —
- * identifies a delivery and its replays.
+ * deliveries in one second collide. So does `date_modified_gmt`, which is also to the second: two stock
+ * changes inside one second differ only in the stock. The topic and the whole signed body identify a
+ * delivery: a replay is the same bytes, and any other state is a change to apply.
  */
 export async function verifyDelivery(store, request) {
     const body = await request.text();
@@ -45,9 +40,7 @@ export async function verifyDelivery(store, request) {
     catch {
         return Err({ code: "INVALID_WEBHOOK", message: "A WooCommerce delivery body was not JSON.", retriable: false });
     }
-    const fields = deliveryBody.safeParse(data);
-    const change = fields.success ? [topic, fields.data.id ?? "", fields.data.status ?? "", fields.data.date_modified_gmt ?? ""] : [topic, body];
-    return Ok({ id: createHash("sha256").update(change.join("|")).digest("hex"), type: topic, data });
+    return Ok({ id: createHash("sha256").update(`${topic}|${body}`).digest("hex"), type: topic, data });
 }
 const variationNudge = z.object({ id, type: z.string().optional(), parent_id: id.nullish() });
 /** A product delivery is a nudge: the product (and its stock) is read fresh. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@porulle/adapter-woocommerce",
-  "version": "0.74.2",
+  "version": "0.74.4",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "zod": "^4.1.11",
-    "@porulle/core": "0.74.2"
+    "@porulle/core": "0.74.4"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",

package/src/catalog.ts

@@ -66,8 +66,51 @@ function status(value: string | null | undefined): ChannelCatalogItem["status"]
   return undefined;
 }
 
-function variant(row: WooVariation, currency: string | undefined): ChannelCatalogVariant {
-  const optionValues = Object.fromEntries(row.attributes.flatMap((attribute) => (attribute.option ? [[attribute.name, attribute.option] as const] : [])));
+/** "pa_color", "Color" and "color" are one attribute; "Blue" and the term slug "blue" one value. */
+function attributeKey(value: string): string {
+  return value.trim().toLowerCase().replace(/^pa_/, "").replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+}
+
+interface OptionAxis {
+  name: string;
+  values: string[];
+}
+
+/**
+ * The option axes a variable product sells along. WooCommerce lets a variation use a global
+ * attribute (`pa_color`) by its term SLUG ("blue") while the product lists the term NAME ("Blue") —
+ * or does not list that attribute at all (measured on WooCommerce's own sample catalogue). The axes
+ * are the product's declared variation attributes plus any its variations use, and each value is
+ * spelled as the product spells it where it declares one, so every variant's values are among them.
+ */
+function optionAxes(product: WooProduct, variations: WooVariation[]): { axes: OptionAxis[]; resolve: (name: string, option: string) => { name: string; value: string } } {
+  const axes = new Map<string, OptionAxis>();
+  for (const attribute of product.attributes.filter((candidate) => candidate.variation === true)) {
+    axes.set(attributeKey(attribute.name), { name: attribute.name, values: [...attribute.options] });
+  }
+  const resolve = (name: string, option: string): { name: string; value: string } => {
+    const key = attributeKey(name);
+    let axis = axes.get(key);
+    if (!axis) {
+      axis = { name: name.replace(/^pa_/, "").replace(/^./, (first) => first.toUpperCase()), values: [] };
+      axes.set(key, axis);
+    }
+    const declared = axis.values.find((value) => attributeKey(value) === attributeKey(option));
+    if (declared) return { name: axis.name, value: declared };
+    const shown = option.replace(/^./, (first) => first.toUpperCase());
+    axis.values.push(shown);
+    return { name: axis.name, value: shown };
+  };
+  for (const row of variations) for (const attribute of row.attributes) if (attribute.option) resolve(attribute.name, attribute.option);
+  return { axes: [...axes.values()], resolve };
+}
+
+function variant(row: WooVariation, currency: string | undefined, resolve: (name: string, option: string) => { name: string; value: string }): ChannelCatalogVariant {
+  const optionValues = Object.fromEntries(row.attributes.flatMap((attribute) => {
+    if (!attribute.option) return [];
+    const resolved = resolve(attribute.name, attribute.option);
+    return [[resolved.name, resolved.value] as const];
+  }));
   const rowPrices = prices(row, currency);
   return {
     externalId: row.id,
@@ -100,15 +143,17 @@ export function catalogItem(product: WooProduct, variations: WooVariation[], cur
       images.push({ externalId: row.image.id, url: row.image.src, ...(row.image.alt ? { alt: row.image.alt } : {}), role: "gallery", sortOrder: images.length, variantExternalIds: [row.id] });
     }
   }
-  const options = product.attributes.filter((attribute) => attribute.variation === true).map((attribute, index) => ({
-    name: attribute.name,
-    displayName: attribute.name,
-    sortOrder: attribute.position ?? index,
-    values: attribute.options.map((value, valueIndex) => ({ value, displayValue: value, sortOrder: valueIndex })),
-  }));
+  const sellable = product.type === "simple" ? [] : variations.filter((row) => row.status !== "private");
+  const { axes, resolve } = optionAxes(product, sellable);
   const variants = product.type === "simple"
-    ? [variant({ id: product.id, sku: product.sku, price: product.price, regular_price: product.regular_price, sale_price: product.sale_price, attributes: [] }, currency)]
-    : variations.filter((row) => row.status !== "private").map((row) => variant(row, currency));
+    ? [variant({ id: product.id, sku: product.sku, price: product.price, regular_price: product.regular_price, sale_price: product.sale_price, attributes: [] }, currency, resolve)]
+    : sellable.map((row) => variant(row, currency, resolve));
+  const options = product.type === "simple" ? [] : axes.map((axis, index) => ({
+    name: axis.name,
+    displayName: axis.name,
+    sortOrder: index,
+    values: axis.values.map((value, valueIndex) => ({ value, displayValue: value, sortOrder: valueIndex })),
+  }));
   const itemStatus = status(product.status);
   return {
     externalId: product.id,

package/src/webhooks.ts

@@ -13,13 +13,6 @@ export const WOO_WEBHOOK_TOPICS = ["product.created", "product.updated", "produc
 
 const id = z.union([z.number(), z.string()]).transform(String);
 
-/** Fields of a delivery body that identify the change it reports. */
-const deliveryBody = z.object({
-  id: id.optional(),
-  status: z.string().nullish(),
-  date_modified_gmt: z.string().nullish(),
-});
-
 function validSignature(secret: string, body: string, signature: string | null): boolean {
   if (!signature || !secret) return false;
   const expected = createHmac("sha256", secret).update(body, "utf8").digest();
@@ -32,8 +25,9 @@ function validSignature(secret: string, body: string, signature: string | null):
  * (form body `webhook_id=N`, unsigned) is `Ok(null)`. Everything else must carry a valid signature.
  *
  * The id is ours: `X-WC-Webhook-Delivery-ID` hashes the subscription id and the current SECOND, so two
- * deliveries in one second collide. The change itself — topic, resource, status, modification time —
- * identifies a delivery and its replays.
+ * deliveries in one second collide. So does `date_modified_gmt`, which is also to the second: two stock
+ * changes inside one second differ only in the stock. The topic and the whole signed body identify a
+ * delivery: a replay is the same bytes, and any other state is a change to apply.
  */
 export async function verifyDelivery(store: ChannelStore, request: Request): Promise<Result<ChannelWebhookEvent | null, ChannelConnectorError>> {
   const body = await request.text();
@@ -49,9 +43,7 @@ export async function verifyDelivery(store: ChannelStore, request: Request): Pro
   } catch {
     return Err({ code: "INVALID_WEBHOOK", message: "A WooCommerce delivery body was not JSON.", retriable: false });
   }
-  const fields = deliveryBody.safeParse(data);
-  const change = fields.success ? [topic, fields.data.id ?? "", fields.data.status ?? "", fields.data.date_modified_gmt ?? ""] : [topic, body];
-  return Ok({ id: createHash("sha256").update(change.join("|")).digest("hex"), type: topic, data });
+  return Ok({ id: createHash("sha256").update(`${topic}|${body}`).digest("hex"), type: topic, data });
 }
 
 const variationNudge = z.object({ id, type: z.string().optional(), parent_id: id.nullish() });