@nextblock-cms/ecom 0.19.0 → 0.19.2

package/lib/variation-utils.es.js

@@ -1,72 +1,72 @@
-import { normalizeSalePriceMap as S, normalizePriceMap as g, isSaleWindowActive as E } from "./currency.es.js";
+import { normalizeSalePriceMap as S, normalizePriceMap as g, isSaleWindowActive as B } from "./currency.es.js";
 function p(e) {
-  return !e || typeof e != "object" || Array.isArray(e) ? null : Object.entries(e).reduce((r, [i, t]) => (typeof t == "string" && t.trim() && (r[i] = t.trim()), r), {});
+  return !e || typeof e != "object" || Array.isArray(e) ? null : Object.entries(e).reduce((n, [i, t]) => (typeof t == "string" && t.trim() && (n[i] = t.trim()), n), {});
 }
-function f(e, r, i) {
-  return !i || !r ? e : r[i]?.trim() || e;
+function f(e, n, i) {
+  return !i || !n ? e : n[i]?.trim() || e;
 }
-function j(e, r) {
-  return f(e.name, e.name_translations, r);
+function j(e, n) {
+  return f(e.name, e.name_translations, n);
 }
-function L(e, r) {
-  return f(e.value, e.value_translations, r);
+function L(e, n) {
+  return f(e.value, e.value_translations, n);
 }
-function B(e) {
+function I(e) {
   return e ? e.startsWith("http") ? e : process.env.NEXT_PUBLIC_R2_BASE_URL ? `${process.env.NEXT_PUBLIC_R2_BASE_URL}/${e}` : process.env.NEXT_PUBLIC_SUPABASE_URL ? `${process.env.NEXT_PUBLIC_SUPABASE_URL}/storage/v1/object/public/media/${e}` : e : null;
 }
-function I(e) {
+function M(e) {
   return e.toLowerCase().trim().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
 function y(e) {
   return [...e].sort().join("__");
 }
 function T(e) {
-  return e.map((r) => r.term_value).join(" / ");
+  return e.map((n) => n.term_value).join(" / ");
 }
-function M(e) {
+function U(e) {
   return e.length === 0 ? [] : e.reduce(
-    (r, i) => r.flatMap((t) => i.map((s) => [...t, s])),
+    (n, i) => n.flatMap((t) => i.map((s) => [...t, s])),
     [[]]
   );
 }
 function P(e) {
   const {
-    baseSku: r,
+    baseSku: n,
     basePrice: i,
     basePrices: t = {},
     baseSalePrice: s = null,
-    baseSalePrices: n = {},
-    selectedAttributes: u,
+    baseSalePrices: r = {},
+    selectedAttributes: a,
     previousVariants: c = []
   } = e;
-  if (u.length === 0 || u.some((l) => l.terms.length === 0))
+  if (a.length === 0 || a.some((o) => o.terms.length === 0))
     return [];
-  const o = new Map(
-    c.map((l) => [l.combination_key, l])
-  ), a = u.map(
-    (l) => l.terms.map((d) => ({
-      attribute_id: l.attribute_id,
-      attribute_name: l.attribute_name,
+  const u = new Map(
+    c.map((o) => [o.combination_key, o])
+  ), l = a.map(
+    (o) => o.terms.map((d) => ({
+      attribute_id: o.attribute_id,
+      attribute_name: o.attribute_name,
       term: d
     }))
   );
-  return M(a).map((l) => {
-    const d = l.map(({ attribute_id: m, attribute_name: k, term: b }) => ({
+  return U(l).map((o) => {
+    const d = o.map(({ attribute_id: m, attribute_name: E, term: b }) => ({
       attribute_id: m,
-      attribute_name: k,
+      attribute_name: E,
       term_id: b.id,
       term_value: b.value,
       term_slug: b.slug
-    })), A = d.map((m) => m.term_id), h = y(A), _ = o.get(h), v = d.map((m) => (m.term_slug ? m.term_slug : I(m.term_value)).toUpperCase()).filter(Boolean).join("-");
+    })), h = d.map((m) => m.term_id), A = y(h), _ = u.get(A), v = d.map((m) => (m.term_slug ? m.term_slug : M(m.term_value)).toUpperCase()).filter(Boolean).join("-");
     return {
       id: _?.id,
-      combination_key: h,
-      sku: _?.sku || [r.trim(), v].filter(Boolean).join("-"),
+      combination_key: A,
+      sku: _?.sku || [n.trim(), v].filter(Boolean).join("-"),
       upc: _?.upc ?? null,
       price: _?.price ?? i,
       prices: _?.prices ?? g(t),
       sale_price: _?.sale_price ?? s,
-      sale_prices: _?.sale_prices ?? S(n),
+      sale_prices: _?.sale_prices ?? S(r),
       // IMPORTANT (future agents): every per-variant field a user can edit MUST
       // be carried over from `previous` here. This function re-runs whenever the
       // variations editor mounts or attributes/base prices change, replacing the
@@ -78,151 +78,166 @@ function P(e) {
       stock_quantity: _?.stock_quantity ?? 0,
       main_media_id: _?.main_media_id ?? null,
       main_image_url: _?.main_image_url ?? null,
-      attribute_term_ids: A,
+      attribute_term_ids: h,
       selected_options: d,
       label: T(d)
     };
   });
 }
-function N(e) {
-  const r = {};
+function V(e) {
+  const n = {};
   for (const i of e)
     for (const t of i.selected_options ?? []) {
-      const s = new Set(r[t.attribute_id] ?? []);
-      s.add(t.term_id), r[t.attribute_id] = [...s];
+      const s = new Set(n[t.attribute_id] ?? []);
+      s.add(t.term_id), n[t.attribute_id] = [...s];
     }
-  return r;
+  return n;
 }
-function O(e, r) {
-  const i = Object.values(r).filter(Boolean);
+function N(e, n) {
+  const i = Object.values(n).filter(Boolean);
   return i.length === 0 ? null : e.find(
     (t) => t.attribute_term_ids.length === i.length && i.every((s) => t.attribute_term_ids.includes(s))
   ) ?? null;
 }
-function U(e, r, i) {
+function k(e, n, i) {
   const t = /* @__PURE__ */ new Set();
   for (const s of e) {
-    if (!Object.entries(i).every(([c, o]) => !o || c === r ? !0 : s.attribute_term_ids.includes(o)))
+    if (!Object.entries(i).every(([c, u]) => !u || c === n ? !0 : s.attribute_term_ids.includes(u)))
       continue;
-    const u = s.selected_options.find((c) => c.attribute_id === r);
-    u && t.add(u.term_id);
+    const a = s.selected_options.find((c) => c.attribute_id === n);
+    a && t.add(a.term_id);
   }
   return t;
 }
-function V(e, r) {
-  const i = r.find((t) => t.stock_quantity > 0) ?? r[0] ?? null;
+function O(e, n) {
+  const i = n.find((t) => t.stock_quantity > 0) ?? n[0] ?? null;
   return i ? i.selected_options.reduce((t, s) => (t[s.attribute_id] = s.term_id, t), {}) : e.reduce((t, s) => {
-    const n = s.terms[0];
-    return n && (t[s.id] = n.id), t;
+    const r = s.terms[0];
+    return r && (t[s.id] = r.id), t;
   }, {});
 }
-function w(e, r, i) {
+function w(e, n, i, t, s) {
+  const r = { [t]: s };
+  for (const a of e) {
+    if (a.id === t)
+      continue;
+    const c = k(n, a.id, r), u = i[a.id];
+    if (u && c.has(u)) {
+      r[a.id] = u;
+      continue;
+    }
+    const l = a.terms.find((o) => c.has(o.id));
+    l && (r[a.id] = l.id);
+  }
+  return r;
+}
+function x(e, n, i) {
   const t = { ...i };
   for (const s of e) {
-    const n = U(r, s.id, t);
-    if (n.size === 0) {
+    const r = k(n, s.id, t);
+    if (r.size === 0) {
       delete t[s.id];
       continue;
     }
-    const u = t[s.id];
-    if (u && n.has(u))
+    const a = t[s.id];
+    if (a && r.has(a))
       continue;
-    const c = s.terms.find((o) => n.has(o.id));
+    const c = s.terms.find((u) => r.has(u.id));
     c && (t[s.id] = c.id);
   }
   return t;
 }
-function x(e = [], r) {
-  const i = /* @__PURE__ */ new Map(), t = e.map((n) => {
-    const u = (n.variant_attribute_mapping || []).map((o) => {
-      const a = o.product_attribute_terms, l = a?.product_attributes;
-      if (!a || !l)
+function z(e = [], n) {
+  const i = /* @__PURE__ */ new Map(), t = e.map((r) => {
+    const a = (r.variant_attribute_mapping || []).map((u) => {
+      const l = u.product_attribute_terms, o = l?.product_attributes;
+      if (!l || !o)
         return null;
-      const d = i.get(l.id) || {
-        id: l.id,
+      const d = i.get(o.id) || {
+        id: o.id,
         name: f(
-          l.name,
-          p(l.name_translations),
-          r
+          o.name,
+          p(o.name_translations),
+          n
         ),
-        slug: l.slug,
-        name_translations: p(l.name_translations),
+        slug: o.slug,
+        name_translations: p(o.name_translations),
         terms: [],
         _termIds: /* @__PURE__ */ new Set()
       };
-      return d._termIds.has(a.id) || (d.terms.push({
-        id: a.id,
-        attribute_id: a.attribute_id,
+      return d._termIds.has(l.id) || (d.terms.push({
+        id: l.id,
+        attribute_id: l.attribute_id,
         value: f(
-          a.value,
-          p(a.value_translations),
-          r
+          l.value,
+          p(l.value_translations),
+          n
         ),
-        slug: a.slug,
-        sort_order: a.sort_order ?? null,
-        value_translations: p(a.value_translations)
-      }), d._termIds.add(a.id)), i.set(l.id, d), {
-        attribute_id: l.id,
+        slug: l.slug,
+        sort_order: l.sort_order ?? null,
+        value_translations: p(l.value_translations)
+      }), d._termIds.add(l.id)), i.set(o.id, d), {
+        attribute_id: o.id,
         attribute_name: f(
-          l.name,
-          p(l.name_translations),
-          r
+          o.name,
+          p(o.name_translations),
+          n
         ),
-        term_id: a.id,
+        term_id: l.id,
         term_value: f(
-          a.value,
-          p(a.value_translations),
-          r
+          l.value,
+          p(l.value_translations),
+          n
         ),
-        term_slug: a.slug
+        term_slug: l.slug
       };
     }).filter(
-      (o) => o !== null
+      (u) => u !== null
     ).sort(
-      (o, a) => o.attribute_name.localeCompare(a.attribute_name)
-    ), c = u.map((o) => o.term_id);
+      (u, l) => u.attribute_name.localeCompare(l.attribute_name)
+    ), c = a.map((u) => u.term_id);
     return {
-      id: n.id,
+      id: r.id,
       combination_key: y(c),
-      sku: n.sku,
-      upc: n.upc ?? null,
-      price: n.price ?? 0,
-      prices: g(n.prices),
-      sale_price: n.sale_price ?? null,
-      sale_prices: S(n.sale_prices),
-      sale_start_at: n.sale_start_at ?? null,
-      sale_end_at: n.sale_end_at ?? null,
-      scheduled_price: n.scheduled_price ?? null,
-      scheduled_prices: g(n.scheduled_prices),
-      scheduled_price_at: n.scheduled_price_at ?? null,
-      stock_quantity: n.stock_quantity ?? 0,
-      main_media_id: n.main_media_id ?? null,
-      image_url: B(
-        n.media?.file_path ?? n.media?.object_key ?? null
+      sku: r.sku,
+      upc: r.upc ?? null,
+      price: r.price ?? 0,
+      prices: g(r.prices),
+      sale_price: r.sale_price ?? null,
+      sale_prices: S(r.sale_prices),
+      sale_start_at: r.sale_start_at ?? null,
+      sale_end_at: r.sale_end_at ?? null,
+      scheduled_price: r.scheduled_price ?? null,
+      scheduled_prices: g(r.scheduled_prices),
+      scheduled_price_at: r.scheduled_price_at ?? null,
+      stock_quantity: r.stock_quantity ?? 0,
+      main_media_id: r.main_media_id ?? null,
+      image_url: I(
+        r.media?.file_path ?? r.media?.object_key ?? null
       ),
       attribute_term_ids: c,
-      selected_options: u,
-      label: T(u)
+      selected_options: a,
+      label: T(a)
     };
   });
-  return { attributes: [...i.values()].map((n) => ({
-    id: n.id,
-    name: n.name,
-    slug: n.slug,
-    name_translations: n.name_translations,
-    terms: [...n.terms].sort((u, c) => {
-      const o = u.sort_order ?? Number.MAX_SAFE_INTEGER, a = c.sort_order ?? Number.MAX_SAFE_INTEGER;
-      return o !== a ? o - a : u.value.localeCompare(c.value);
+  return { attributes: [...i.values()].map((r) => ({
+    id: r.id,
+    name: r.name,
+    slug: r.slug,
+    name_translations: r.name_translations,
+    terms: [...r.terms].sort((a, c) => {
+      const u = a.sort_order ?? Number.MAX_SAFE_INTEGER, l = c.sort_order ?? Number.MAX_SAFE_INTEGER;
+      return u !== l ? u - l : a.value.localeCompare(c.value);
     })
-  })).sort((n, u) => n.name.localeCompare(u.name)), variants: t };
+  })).sort((r, a) => r.name.localeCompare(a.name)), variants: t };
 }
-function z(e, r) {
+function C(e, n) {
   if (!e.length)
     return null;
-  const i = e.map((t) => E({
+  const i = e.map((t) => B({
     saleStartAt: t.sale_start_at,
     saleEndAt: t.sale_end_at,
-    now: r
+    now: n
   }) && typeof t.sale_price == "number" ? t.sale_price : t.price);
   return {
     min: Math.min(...i),
@@ -230,16 +245,17 @@ function z(e, r) {
   };
 }
 export {
+  w as applyVariantSelection,
   y as buildCombinationKey,
   T as buildVariantLabel,
-  V as chooseInitialVariantSelections,
-  N as extractSelectedTermsByAttribute,
-  O as findMatchingVariant,
+  O as chooseInitialVariantSelections,
+  V as extractSelectedTermsByAttribute,
+  N as findMatchingVariant,
   P as generateVariantDrafts,
-  U as getAvailableTermIdsForAttribute,
-  z as getVariantEffectivePriceRange,
-  x as mapRawVariantRelations,
-  w as normalizeSelectionsToAvailableVariants,
+  k as getAvailableTermIdsForAttribute,
+  C as getVariantEffectivePriceRange,
+  z as mapRawVariantRelations,
+  x as normalizeSelectionsToAvailableVariants,
   j as resolveAttributeName,
   L as resolveTermValue,
   f as resolveTranslatedText

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/ecom",
-  "version": "0.19.0",
+  "version": "0.19.2",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -11,9 +11,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@nextblock-cms/db": "^0.19.0",
-    "@nextblock-cms/ui": "^0.19.0",
-    "@nextblock-cms/utils": "^0.19.0",
+    "@nextblock-cms/db": "^0.19.2",
+    "@nextblock-cms/ui": "^0.19.2",
+    "@nextblock-cms/utils": "^0.19.2",
     "@freemius/checkout": "^1.4.1",
     "@freemius/sdk": "^0.3.0",
     "@hookform/resolvers": "^5.2.2",