@useinsider/guido 3.4.2-beta.6886b92 → 3.5.0-beta.6fa034d

package/dist/extensions/Blocks/Recommendation/block.js

@@ -1,15 +1,15 @@
 var k = Object.defineProperty;
-var B = (r, n, t) => n in r ? k(r, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[n] = t;
-var g = (r, n, t) => B(r, typeof n != "symbol" ? n + "" : n, t);
-import { BlockId as _ } from "../../../enums/block.js";
-import { getMigrationBannerHtml as b } from "../../../utils/migrationBannerHtml.js";
-import { Block as R, BlockCompositionType as y, ModificationDescription as C } from "../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
-import { regenerateMobileProductRows as A } from "./controls/main/utils.js";
-import { ensureMobileCssRulesExist as d, setMobileLayoutOptOut as p, hasMobileLayoutOptOut as D } from "./controls/mobileLayout/cssRules.js";
-import { RecommendationConfigService as s } from "./services/configService.js";
-import { useRecommendationExtensionStore as f } from "./store/recommendation.js";
+var y = (a, r, t) => r in a ? k(a, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[r] = t;
+var d = (a, r, t) => y(a, typeof r != "symbol" ? r + "" : r, t);
+import { BlockId as B } from "../../../enums/block.js";
+import { getMigrationBannerHtml as D } from "../../../utils/migrationBannerHtml.js";
+import { Block as R, BlockCompositionType as C, ModificationDescription as h } from "../../../node_modules/@stripoinc/ui-editor-extensions/dist/esm/index.js";
+import { regenerateMobileProductRows as b } from "./controls/main/utils.js";
+import { ensureMobileCssRulesExist as p, setMobileLayoutOptOut as f, hasMobileLayoutOptOut as A } from "./controls/mobileLayout/cssRules.js";
+import { RecommendationConfigService as c } from "./services/configService.js";
+import { useRecommendationExtensionStore as g } from "./store/recommendation.js";
 import { getDefaultTemplate as E } from "./templates/grid/template.js";
-const h = _.Recommendation, l = "recommendation-block-v2", m = "recommendation-id";
+const _ = B.Recommendation, m = "recommendation-block-v2", u = "recommendation-id";
 let I = !1;
 class q extends R {
   constructor() {
@@ -18,16 +18,16 @@ class q extends R {
      * Stores the ID generated in getTemplate() so onCreated() can reuse it.
      * This avoids generating a new (different) ID in onCreated().
      */
-    g(this, "_pendingBlockId", null);
+    d(this, "_pendingBlockId", null);
   }
   getId() {
-    return h;
+    return _;
   }
   getIcon() {
     return "recommendation-icon";
   }
   getBlockCompositionType() {
-    return y.CONTAINER;
+    return C.CONTAINER;
   }
   getName() {
     return this.api.translate("Recommendation Block");
@@ -38,8 +38,8 @@ class q extends R {
     );
   }
   getSettingsPanelTitleHtml() {
-    return b(
-      h,
+    return D(
+      _,
       this.api.translate("Recommendation Block"),
       this.api.translate("This block is switched from the Old Version to the New Version. We recommend you check the Recommendation block and test your message to ensure it works properly.")
     );
@@ -70,24 +70,32 @@ class q extends R {
    */
   onCreated(t) {
     const e = this._getRecommendationId(t);
-    if (e !== null && e > 0)
+    if (e !== null && e > 0) {
+      if (this._detectDuplicate(e)) {
+        this._handleDuplicate(t, e);
+        return;
+      }
+      this._pendingBlockId === null && setTimeout(() => {
+        this._getBlockElement(t) && this._detectDuplicate(e) && this._handleDuplicate(t, e);
+      }, 0);
       return;
+    }
     const i = this._pendingBlockId ?? this._generateNextId();
     this._pendingBlockId = null, this._assignRecommendationId(t, i);
-    const { config: o, wasFreshDrop: c } = s.initializeConfig(
+    const { config: n, wasFreshDrop: o } = c.initializeConfig(
       this.api,
       t,
       { recommendationId: i }
-    ), a = f();
-    if (a.setCurrentBlock(i), c) {
-      d(this.api);
-      const u = this._getBlockElement(t);
-      u && (p(this.api, u, !0), A({
+    ), s = g();
+    if (s.setCurrentBlock(i), o) {
+      p(this.api);
+      const l = this._getBlockElement(t);
+      l && (f(this.api, l, !0), b({
         currentNode: t,
         documentModifier: this.api.getDocumentModifier()
       }));
     }
-    a.patchCurrentBlockConfig({ language: o.language }, { triggerRefetch: !1 });
+    s.patchCurrentBlockConfig({ language: n.language }, { triggerRefetch: !1 });
   }
   /**
    * Called when the document changes or template is loaded
@@ -100,20 +108,20 @@ class q extends R {
     if (!(!t || !("getNodeConfig" in t))) {
       if (!this._getRecommendationId(t)) {
         const e = this._generateNextId();
-        this._assignRecommendationId(t, e), s.hasConfig(t) && s.updateConfig(
+        this._assignRecommendationId(t, e), c.hasConfig(t) && c.updateConfig(
           this.api,
           t,
           { recommendationId: e },
           "Assign recommendation ID to legacy block"
         );
       }
-      s.needsMigration(t) && this._migrateFromLegacy(t);
+      this._healLingeringDuplicate(t), c.needsMigration(t) && this._migrateFromLegacy(t);
       try {
-        I || (d(this.api), I = !0);
-        const e = s.getConfig(t), i = this._getBlockElement(t);
+        I || (p(this.api), I = !0);
+        const e = c.getConfig(t), i = this._getBlockElement(t);
         if (i) {
-          const o = !e.mobileLayoutEnabled;
-          D(i) !== o && p(this.api, i, o);
+          const n = !e.mobileLayoutEnabled;
+          A(i) !== n && f(this.api, i, n);
         }
       } catch {
       }
@@ -127,7 +135,7 @@ class q extends R {
    */
   onDelete(t) {
     const e = this._getRecommendationId(t);
-    e && f().removeBlockState(e);
+    e && g().removeBlockState(e);
   }
   /**
    * Generates the next unique recommendation ID by scanning all existing blocks
@@ -137,16 +145,107 @@ class q extends R {
     let t = 0;
     try {
       const e = this.api.getDocumentRoot();
-      e && "querySelectorAll" in e && e.querySelectorAll(`.${l}`).forEach((o) => {
-        if ("getAttribute" in o) {
-          const c = o.getAttribute(m), a = c ? parseInt(c) : 0;
-          a > t && (t = a);
+      e && "querySelectorAll" in e && e.querySelectorAll(`.${m}`).forEach((n) => {
+        if ("getAttribute" in n) {
+          const o = n.getAttribute(u), s = o ? parseInt(o) : 0;
+          s > t && (t = s);
         }
       });
     } catch {
     }
     return t + 1;
   }
+  /**
+   * Heals a duplicate that slipped past the create-time `_detectDuplicate`
+   * scan (or that was persisted by an older template before SD-142352).
+   * When two blocks share a `recommendation-id`, the first occurrence in DOM
+   * order is treated as the source and any later sibling is reassigned a
+   * fresh id. The store entry and active-block focus are intentionally not
+   * touched here: each block's persisted `esd-ext-config` carries its own
+   * truth and the regular save-time hydration (`hydrateRecommendationStore`)
+   * will seed the new id from that. Skipping `setCurrentBlock` avoids
+   * yanking the user's current selection mid-edit when the heal fires from
+   * `onDocumentChanged`.
+   */
+  _healLingeringDuplicate(t) {
+    const e = this._getRecommendationId(t);
+    if (!(e === null || e <= 0))
+      try {
+        const i = this.api.getDocumentRoot();
+        if (!i || !("querySelectorAll" in i))
+          return;
+        const n = i.querySelectorAll(
+          `.${m}[${u}="${e}"]`
+        );
+        if (n.length <= 1)
+          return;
+        const o = this._getBlockElement(t);
+        if (!o)
+          return;
+        let s = -1;
+        for (let l = 0; l < n.length; l++)
+          if (n[l] === o) {
+            s = l;
+            break;
+          }
+        if (s <= 0)
+          return;
+        this._reassignDuplicateId(t, e);
+      } catch {
+      }
+  }
+  /** True when another block already holds the same id — Stripo's duplication signal. */
+  _detectDuplicate(t) {
+    try {
+      const e = this.api.getDocumentRoot();
+      if (e && "querySelectorAll" in e)
+        return e.querySelectorAll(
+          `.${m}[${u}="${t}"]`
+        ).length > 1;
+    } catch {
+    }
+    return !1;
+  }
+  /** Assigns a fresh id to a duplicated block and syncs DOM, node config and store. */
+  _handleDuplicate(t, e) {
+    const i = this._reassignDuplicateId(t, e), n = g();
+    n.cloneBlockState(e, i), n.setCurrentBlock(i);
+  }
+  /**
+   * Core id-reassignment for a duplicated block: rewrites the DOM
+   * `recommendation-id`, the instance class and the persisted node config to
+   * a fresh id. Returns the new id.
+   *
+   * Used by `_handleDuplicate` at create-time (which additionally clones the
+   * store entry and focuses the new block) and by `_healLingeringDuplicate`
+   * at document-change time (which intentionally skips store/focus side
+   * effects so older bug-affected templates can self-repair without
+   * disturbing the user's current selection).
+   */
+  _reassignDuplicateId(t, e) {
+    const i = this._generateNextId(), n = this._getBlockElement(t);
+    return this._assignRecommendationId(t, i), n && this._reassignInstanceClass(n, e, i), c.hasConfig(t) && c.updateConfig(
+      this.api,
+      t,
+      { recommendationId: i },
+      `Reassign recommendation ID on duplicate (was ${e})`
+    ), i;
+  }
+  /**
+   * Rewrites `ins-recommendation-v3-block-{id}` on the clone — the instance
+   * class scopes per-block CSS rules in the editor and is also the key the
+   * mail render service reads to look up per-id campaign config, so leaving
+   * the source's class would both leak stylistic edits across blocks and
+   * cause the mail render to apply the source block's config to the clone.
+   */
+  _reassignInstanceClass(t, e, i) {
+    if (!("getAttribute" in t))
+      return;
+    const n = `ins-recommendation-v3-block-${e}`, o = `ins-recommendation-v3-block-${i}`, s = this.api.getDocumentModifier();
+    s.modifyHtml(t).removeClass(n).setClass(o), s.apply(new h(
+      `Reassign recommendation instance class ${n} -> ${o}`
+    ));
+  }
   /**
    * Assigns a recommendation-id attribute to the block element.
    * The instance class (ins-recommendation-v3-block-{id}) is embedded in the template
@@ -157,8 +256,8 @@ class q extends R {
     const i = this._getBlockElement(t);
     if (!i)
       return;
-    const o = this.api.getDocumentModifier();
-    o.modifyHtml(i).setAttribute(m, e.toString()), o.apply(new C(`Assign recommendation ID ${e}`));
+    const n = this.api.getDocumentModifier();
+    n.modifyHtml(i).setAttribute(u, e.toString()), n.apply(new h(`Assign recommendation ID ${e}`));
   }
   /**
    * Gets the recommendation-id from a block node
@@ -167,11 +266,11 @@ class q extends R {
     const e = this._getBlockElement(t);
     if (!e || !("getAttribute" in e))
       return null;
-    const i = e.getAttribute(m);
+    const i = e.getAttribute(u);
     if (!i)
       return null;
-    const o = parseInt(i);
-    return Number.isNaN(o) ? null : o;
+    const n = parseInt(i);
+    return Number.isNaN(n) ? null : n;
   }
   /**
    * Gets the block element (the element with BLOCK_CLASS)
@@ -179,19 +278,19 @@ class q extends R {
   _getBlockElement(t) {
     if ("getAttribute" in t) {
       const e = t.getAttribute("class");
-      if (e && e.includes(l))
+      if (e && e.includes(m))
         return t;
     }
-    return "querySelector" in t ? t.querySelector(`.${l}`) ?? null : null;
+    return "querySelector" in t ? t.querySelector(`.${m}`) ?? null : null;
   }
   /**
    * Migrate configuration from legacy format
    */
   _migrateFromLegacy(t) {
-    s.migrateFromDataAttributes(this.api, t);
+    c.migrateFromDataAttributes(this.api, t);
   }
 }
 export {
-  h as BLOCK_ID,
+  _ as BLOCK_ID,
   q as RecommendationBlock
 };

package/dist/extensions/Blocks/Recommendation/store/recommendation.js

@@ -1,16 +1,16 @@
-import { getRecommendationFeedSourceMaps as g, getOperatorOptions as R, PriceAttributes as y } from "../../../../enums/extensions/recommendationBlock.js";
-import { useRecommendationApi as C } from "../../../../services/recommendationApi.js";
+import { getRecommendationFeedSourceMaps as g, getOperatorOptions as R, PriceAttributes as C } from "../../../../enums/extensions/recommendationBlock.js";
+import { useRecommendationApi as y } from "../../../../services/recommendationApi.js";
 import { useConfigStore as G } from "../../../../stores/config.js";
 import { defineStore as P } from "pinia";
 import { DEFAULT_CARDS_IN_ROW as F } from "../constants/layout.js";
 import { EXCLUDED_ALGORITHM_IDS as D } from "../constants/defaultConfig.js";
 import { getDefaultProducts as S } from "../templates/utils.js";
 import { generateCompleteFilterQuery as b } from "../utils/filterUtil.js";
-import { isFilterValid as w } from "../validation/filterSchema.js";
-import { isConfigValid as v } from "../validation/requiredFields.js";
-const h = C();
+import { isFilterValid as v } from "../validation/filterSchema.js";
+import { isConfigValid as w } from "../validation/requiredFields.js";
+const h = y();
 let m = null, u = null, d = null;
-function k() {
+function I() {
   return {
     cardsInRow: F,
     currencySettings: {
@@ -38,9 +38,9 @@ function k() {
     customAttributes: []
   };
 }
-function I() {
+function k() {
   return {
-    recommendationConfigs: k(),
+    recommendationConfigs: I(),
     recommendationProducts: [],
     filterStatus: !1,
     filterSelectionDrawerStatus: !1,
@@ -69,7 +69,7 @@ const N = () => ({
      * This allows all existing code that reads `store.recommendationConfigs` to work unchanged.
      */
     recommendationConfigs(t) {
-      return t.currentRecommendationId !== null && t.blockStates[t.currentRecommendationId] ? t.blockStates[t.currentRecommendationId].recommendationConfigs : k();
+      return t.currentRecommendationId !== null && t.blockStates[t.currentRecommendationId] ? t.blockStates[t.currentRecommendationId].recommendationConfigs : I();
     },
     /**
      * Proxy getter: delegates to blockStates[currentRecommendationId].recommendationProducts
@@ -133,7 +133,7 @@ const N = () => ({
     getFilterList() {
       return Object.values(this.filterList).map((t) => {
         let e;
-        return t.type === "productAttribute" ? e = `product_attributes.${t.attributeName}` : y.includes(t.attributeName) ? e = `${t.attributeName}.${this.recommendationConfigs.currencySettings.value}` : e = t.attributeName, {
+        return t.type === "productAttribute" ? e = `product_attributes.${t.attributeName}` : C.includes(t.attributeName) ? e = `${t.attributeName}.${this.recommendationConfigs.currencySettings.value}` : e = t.attributeName, {
           text: t.displayName,
           value: e,
           type: t.attributeType
@@ -155,7 +155,7 @@ const N = () => ({
     setCurrentBlock(t) {
       this.blockStates[t] || (this.blockStates = {
         ...this.blockStates,
-        [t]: I()
+        [t]: k()
       }), this.currentRecommendationId = t;
     },
     /**
@@ -174,6 +174,25 @@ const N = () => ({
         this.currentRecommendationId = n.length > 0 ? n[0] : null;
       }
     },
+    /**
+     * Deep-clones a block's state and mirrors its campaign URL under a new id.
+     * Invoked from `onCreated` when a duplicate is detected (SD-142352).
+     */
+    cloneBlockState(t, e) {
+      const r = this.blockStates[t];
+      if (r) {
+        const o = structuredClone(r);
+        o.recommendationConfigs.id = e, this.blockStates = {
+          ...this.blockStates,
+          [e]: o
+        };
+      }
+      const n = t.toString(), c = e.toString(), i = this.recommendationCampaignUrls[n];
+      i && (this.recommendationCampaignUrls = {
+        ...this.recommendationCampaignUrls,
+        [c]: i
+      });
+    },
     /**
      * Marks a block as initialized (initial API data has been fetched).
      * Automatically cleaned up when removeBlockState deletes the block entry.
@@ -204,7 +223,7 @@ const N = () => ({
         decimalCount: String(e.currencyDecimalCount),
         decimalSeparator: r(e.currencyDecimalSeparator, ","),
         thousandSeparator: r(e.currencyThousandSeparator, ".")
-      }, c = !this.blockStates[t], i = c ? I() : this.blockStates[t];
+      }, c = !this.blockStates[t], i = c ? k() : this.blockStates[t];
       i.recommendationConfigs = {
         ...i.recommendationConfigs,
         strategy: e.strategy,
@@ -359,7 +378,7 @@ const N = () => ({
         const n = [...e.recommendationConfigs.filters];
         n[r] = {
           ...t,
-          isValid: w(t)
+          isValid: v(t)
         }, e.recommendationConfigs.filters = n;
       }
     },
@@ -405,7 +424,7 @@ const N = () => ({
      * every block's recommendationConfigs across user edits.
      */
     hasInvalidBlock() {
-      return Object.values(this.blockStates).some((t) => !v(t.recommendationConfigs, this));
+      return Object.values(this.blockStates).some((t) => !w(t.recommendationConfigs, this));
     },
     // ====================================================================
     // Per-Block Product Fetching

package/dist/extensions/Blocks/Recommendation/utils/filterUtil.js

@@ -9,36 +9,44 @@ function m(t) {
 function f(t) {
   return t.split(",").filter(Boolean).map(m);
 }
-function y(t) {
+function G(t) {
+  return t.map(encodeURIComponent).join(",");
+}
+function Q(t) {
+  return t.trim().length > 0;
+}
+function d(t) {
   if (t.length === 0)
     return "";
   const o = t.sort((r, e) => r.filterNumber - e.filterNumber), u = o.map((r) => {
-    const e = r.operator === l, a = e ? "=" : r.operator, c = e ? f(r.value).join(l) : r.value;
-    return `[${r.attribute}][${encodeURIComponent(a)}][${c}]`;
-  }), [i, ...p] = u;
-  let n = i;
-  for (let r = 0; r < p.length; r++) {
+    const e = r.operator === l, a = e ? "=" : r.operator, s = e ? f(r.value).join(l) : r.value;
+    return `[${r.attribute}][${encodeURIComponent(a)}][${s}]`;
+  }), [p, ...i] = u;
+  let n = p;
+  for (let r = 0; r < i.length; r++) {
     const e = o[r].innerGroupOperator;
-    n += `${e}${p[r]}`;
+    n += `${e}${i[r]}`;
   }
   return `(${n})`;
 }
-function g(t) {
+function F(t) {
   if (!t || t.length === 0)
     return "";
-  const o = t.reduce((r, e) => (r[e.filterGroup] || (r[e.filterGroup] = []), r[e.filterGroup].push(e), r), {}), u = Object.keys(o).map(Number).sort((r, e) => r - e), i = u.map((r) => {
+  const o = t.reduce((r, e) => (r[e.filterGroup] || (r[e.filterGroup] = []), r[e.filterGroup].push(e), r), {}), u = Object.keys(o).map(Number).sort((r, e) => r - e), p = u.map((r) => {
     const e = o[r];
-    return y(e);
-  }), [p, ...n] = i;
-  let s = p;
+    return d(e);
+  }), [i, ...n] = p;
+  let c = i;
   for (let r = 0; r < n.length; r++) {
-    const e = u[r + 1], c = o[e][0].outerGroupOperator;
-    s += `${c}${n[r]}`;
+    const e = u[r + 1], s = o[e][0].outerGroupOperator;
+    c += `${s}${n[r]}`;
   }
-  return s.trim();
+  return c.trim();
 }
 export {
-  g as generateCompleteFilterQuery,
+  G as encodeTagList,
+  F as generateCompleteFilterQuery,
+  Q as isValidFilterTag,
   f as parseTagList,
   m as safeDecodeURIComponent
 };