@grapesjs/studio-sdk-plugins 1.0.22 → 1.0.23

package/dist/dataSourceEjs/index.es.js

@@ -1,6 +1,6 @@
-const b = "app.grapesjs.com", I = "app-stage.grapesjs.com", S = [
-  b,
-  I,
+const C = "app.grapesjs.com", w = "app-stage.grapesjs.com", b = [
+  C,
+  w,
   "localhost",
   "127.0.0.1",
   ".local-credentialless.webcontainer.io",
@@ -9,83 +9,83 @@ const b = "app.grapesjs.com", I = "app-stage.grapesjs.com", S = [
   // For stackblitz.com demos
   "-sandpack.codesandbox.io"
   // For Sandpack demos
-], v = "license:check:start", w = "license:check:end", P = () => typeof window < "u", k = ({ isDev: i, isStage: t }) => `${i ? "" : `https://${t ? I : b}`}/api`, T = () => {
-  const i = P() && window.location.hostname;
-  return !!i && (S.includes(i) || S.some((t) => i.endsWith(t)));
+], P = "license:check:start", L = "license:check:end", v = () => typeof window < "u", O = ({ isDev: o, isStage: t }) => `${o ? "" : `https://${t ? w : C}`}/api`, k = () => {
+  const o = v() && window.location.hostname;
+  return !!o && (b.includes(o) || b.some((t) => o.endsWith(t)));
 };
-async function M({
-  path: i,
+async function T({
+  path: o,
   baseApiUrl: t,
   method: e = "GET",
-  headers: r = {},
+  headers: n = {},
   params: s,
-  body: n
+  body: r
 }) {
-  const o = `${t || k({ isDev: !1, isStage: !1 })}${i}`, l = {
+  const a = `${t || O({ isDev: !1, isStage: !1 })}${o}`, c = {
     method: e,
     headers: {
       "Content-Type": "application/json",
-      ...r
+      ...n
     }
   };
-  n && (l.body = JSON.stringify(n));
-  const p = s ? new URLSearchParams(s).toString() : "", c = p ? `?${p}` : "", h = await fetch(`${o}${c}`, l);
+  r && (c.body = JSON.stringify(r));
+  const p = s ? new URLSearchParams(s).toString() : "", l = p ? `?${p}` : "", h = await fetch(`${a}${l}`, c);
   if (!h.ok)
     throw new Error(`HTTP error! status: ${h.status}`);
   return h.json();
 }
-var d = /* @__PURE__ */ ((i) => (i.free = "free", i.startup = "startup", i.business = "business", i.enterprise = "enterprise", i))(d || {});
-const $ = {
-  [d.free]: 0,
-  [d.startup]: 10,
-  [d.business]: 20,
-  [d.enterprise]: 30
+var g = /* @__PURE__ */ ((o) => (o.free = "free", o.startup = "startup", o.business = "business", o.enterprise = "enterprise", o))(g || {});
+const I = {
+  [g.free]: 0,
+  [g.startup]: 10,
+  [g.business]: 20,
+  [g.enterprise]: 30
 };
-function N(i) {
-  const t = i;
-  return t.init = (e) => (r) => i(r, e), t;
+function N(o) {
+  const t = o;
+  return t.init = (e) => (n) => o(n, e), t;
 }
-const O = (i) => /* @__PURE__ */ N(i);
-async function _({
-  editor: i,
+const M = (o) => /* @__PURE__ */ N(o);
+async function B({
+  editor: o,
   plan: t,
   pluginName: e,
-  licenseKey: r,
+  licenseKey: n,
   cleanup: s
 }) {
-  let n = "", a = !1;
-  const o = T(), l = (c) => {
-    console.warn("Cleanup plugin:", e, "Reason:", c), s();
-  }, p = (c = {}) => {
-    var E;
-    const { error: h, sdkLicense: f } = c, u = (E = c.plan) == null ? void 0 : E.category;
-    if (!(f || c.license) || h)
-      l(h || "Invalid license");
-    else if (u) {
-      const C = $[t], L = $[u];
-      C > L && l({ pluginRequiredPlan: t, licensePlan: u });
+  let r = "", i = !1;
+  const a = k(), c = (l) => {
+    console.warn("Cleanup plugin:", e, "Reason:", l), s();
+  }, p = (l = {}) => {
+    var u;
+    const { error: h, sdkLicense: d } = l, f = (u = l.plan) == null ? void 0 : u.category;
+    if (!(d || l.license) || h)
+      c(h || "Invalid license");
+    else if (f) {
+      const m = I[t], S = I[f];
+      m > S && c({ pluginRequiredPlan: t, licensePlan: f });
     }
   };
-  i.on(v, (c) => {
-    n = c == null ? void 0 : c.baseApiUrl, a = !0;
-  }), i.on(w, (c) => {
-    p(c);
+  o.on(P, (l) => {
+    r = l == null ? void 0 : l.baseApiUrl, i = !0;
+  }), o.on(L, (l) => {
+    p(l);
   }), setTimeout(async () => {
-    if (!a) {
-      if (o) return;
-      if (r) {
-        const c = await B({ licenseKey: r, pluginName: e, baseApiUrl: n });
-        c && p(c);
+    if (!i) {
+      if (a) return;
+      if (n) {
+        const l = await _({ licenseKey: n, pluginName: e, baseApiUrl: r });
+        l && p(l);
       } else
-        l("The `licenseKey` option not provided");
+        c("The `licenseKey` option not provided");
     }
   }, 2e3);
 }
-async function B(i) {
-  const { licenseKey: t, pluginName: e, baseApiUrl: r } = i;
+async function _(o) {
+  const { licenseKey: t, pluginName: e, baseApiUrl: n } = o;
   try {
-    return (await M({
-      baseApiUrl: r,
+    return (await T({
+      baseApiUrl: n,
       path: `/sdk/${t || "na"}`,
       method: "POST",
       params: {
@@ -97,7 +97,7 @@ async function B(i) {
     return console.error("Error during SDK license check:", s), !1;
   }
 }
-var g = /* @__PURE__ */ ((i) => (i.variable = "data-variable", i.condition = "data-condition", i.conditionTrue = "data-condition-true-content", i.conditionFalse = "data-condition-false-content", i.collection = "data-collection", i.collectionItem = "data-collection-item", i))(g || {});
+var y = /* @__PURE__ */ ((o) => (o.variable = "data-variable", o.condition = "data-condition", o.conditionTrue = "data-condition-true-content", o.conditionFalse = "data-condition-false-content", o.collection = "data-collection", o.collectionItem = "data-collection-item", o))(y || {});
 class W {
   constructor(t) {
     this.strategy = t, this.requiredHelpers = /* @__PURE__ */ new Set(), this.helperLibrary = {};
@@ -127,131 +127,132 @@ class W {
     this.requiredHelpers.clear();
   }
 }
-function j(i) {
-  return typeof i == "object" && i.type === g.variable;
+function j(o) {
+  return typeof o == "object" && o.type === y.variable;
 }
-function m({
-  component: i,
+function x({
+  component: o,
   value: t,
   getCustomPath: e
 }) {
   if (j(t) && !t.collectionId && e) {
-    const r = t.path ?? "", s = r.split(".");
+    const n = t.path ?? "", s = n.split(".");
     return {
       ...t,
-      path: e({ component: i, path: r, paths: s })
+      path: e({ component: o, path: n, paths: s })
     };
   }
   return t;
 }
-const A = (i) => {
-  y(i, g.variable, {
+const A = (o) => {
+  $(o, y.variable, {
     toHTML(t) {
-      var a;
-      const e = this.tagName, r = this.__attrToString(t), s = (a = this.getDataResolver) == null ? void 0 : a.call(this), n = m({
+      var i;
+      const e = this.tagName, n = this.__attrToString(t), s = (i = this.getDataResolver) == null ? void 0 : i.call(this), r = x({
         component: this,
         value: s,
         getCustomPath: t == null ? void 0 : t.getCustomPath
       });
-      return `<${e}${r ? ` ${r}` : ""}>${t.exporter.generateVariable(n)}</${e}>`;
+      return `<${e}${n ? ` ${n}` : ""}>${t.exporter.generateVariable(r)}</${e}>`;
     }
-  }), y(i, g.condition, {
+  }), $(o, y.condition, {
     toHTML(t) {
-      var p, c;
-      const e = t.exporter, r = t == null ? void 0 : t.getCustomPath, s = this.components(), [n, a] = (s == null ? void 0 : s.models) ?? [], o = (p = this.getDataResolver) == null ? void 0 : p.call(this), l = ((c = this.resolveCondition) == null ? void 0 : c.call(this, o == null ? void 0 : o.condition, r)) ?? {};
-      return `
-${e.generateConditionalStart(l)}
-          ${(n == null ? void 0 : n.toHTML(t)) ?? ""}
-          ${e.generateConditionElse()}
-          ${(a == null ? void 0 : a.toHTML(t)) ?? ""}
-        ${e.generateConditionalEnd()}
+      var l, h;
+      const e = t.exporter, n = t == null ? void 0 : t.getCustomPath, s = this.components(), [r, i] = (s == null ? void 0 : s.models) ?? [], a = (l = this.getDataResolver) == null ? void 0 : l.call(this), c = ((h = this.resolveCondition) == null ? void 0 : h.call(this, a == null ? void 0 : a.condition, n)) ?? {};
+      let p = "";
+      return i && (p = `
+${e.generateConditionElse()}
+  ${i.toHTML(t) ?? ""}`), `
+${e.generateConditionalStart(c)}
+  ${(r == null ? void 0 : r.toHTML(t)) ?? ""}${p}
+${e.generateConditionalEnd()}
 `;
     },
     resolveCondition(t, e) {
-      var s, n;
+      var s, r;
       if (!t) return {};
       if (t.operator === "and" || t.operator === "or")
         return {
           operator: t.operator,
-          statements: ((n = (s = t.statements) == null ? void 0 : s.map) == null ? void 0 : n.call(s, (a) => {
-            var o;
-            return ((o = this.resolveCondition) == null ? void 0 : o.call(this, a, e)) ?? {};
+          statements: ((r = (s = t.statements) == null ? void 0 : s.map) == null ? void 0 : r.call(s, (i) => {
+            var a;
+            return ((a = this.resolveCondition) == null ? void 0 : a.call(this, i, e)) ?? {};
           })) ?? []
         };
-      const r = { component: this, getCustomPath: e };
+      const n = { component: this, getCustomPath: e };
       return {
         ...t,
-        left: m({ ...r, value: t.left }),
-        right: m({ ...r, value: t.right })
+        left: x({ ...n, value: t.left }),
+        right: x({ ...n, value: t.right })
       };
     }
-  }), y(i, g.collection, {
+  }), $(o, y.collection, {
     toHTML(t) {
-      const e = t.exporter, r = this.tagName, s = this.__attrToString(t), n = this.getDataResolver(), a = {
-        ...n,
-        dataSource: m({
+      const e = t.exporter, n = this.tagName, s = this.__attrToString(t), r = this.getDataResolver(), i = {
+        ...r,
+        dataSource: x({
           component: this,
-          value: n == null ? void 0 : n.dataSource,
+          value: r == null ? void 0 : r.dataSource,
           getCustomPath: t == null ? void 0 : t.getCustomPath
         })
-      }, o = this.components().at(0);
+      }, a = this.components().at(0);
       return `
-<${r}${s ? ` ${s}` : ""}>${e.generateCollectionStart(a)}
-  ${(o == null ? void 0 : o.toHTML(t)) ?? ""}
-  ${e.generateCollectionEnd()}</${r}>
+<${n}${s ? ` ${s}` : ""}>${e.generateCollectionStart(i)}
+  ${(a == null ? void 0 : a.toHTML(t)) ?? ""}
+${e.generateCollectionEnd()}</${n}>
 `;
     }
   });
-}, y = (i, t, e) => {
-  const r = i.Components.getType(t);
-  if (!r) {
+}, $ = (o, t, e) => {
+  const n = o.Components.getType(t);
+  if (!n) {
     console.warn(`Component type ${t} not found`);
     return;
   }
-  const { model: s } = r;
-  i.Components.addType(t, {
+  const { model: s } = n;
+  o.Components.addType(t, {
     model: {
       ...e,
-      toHTML(n = {}) {
-        var o;
-        const { exporter: a } = n;
-        return a ? a.export ? a.export({ component: this }) : ((o = e.toHTML) == null ? void 0 : o.call(this, n)) ?? "" : s.prototype.toHTML.call(this, n) ?? "";
+      toHTML(r = {}) {
+        var a;
+        const { exporter: i } = r;
+        return i ? i.export ? i.export({ component: this }) : ((a = e.toHTML) == null ? void 0 : a.call(this, r)) ?? "" : s.prototype.toHTML.call(this, r) ?? "";
       }
     }
   });
-}, J = (i) => {
-  const t = i;
+}, J = (o) => {
+  const t = o;
   return t.logicalOperator === "and" || t.logicalOperator === "or";
-}, H = (i, t) => (i.config.optsHtml = {
-  ...i.config.optsHtml,
+}, F = (o, t) => (o.config.optsHtml = {
+  ...o.config.optsHtml,
   exporter: new W(t)
-}, A(i), () => {
-  i.config.optsHtml.exporter = void 0;
-}), U = (i, t) => {
+}, A(o), () => {
+  o.config.optsHtml.exporter = void 0;
+}), H = (o, t) => {
   const e = (s) => {
-    const { input: n } = s, { contains: a } = t;
-    (!a || n.includes(a)) && (s.input = t.importer.import(n));
-  }, r = i.Parser.events.htmlBefore;
-  return i.on(r, e), () => {
-    i.off(r, e);
+    const { input: r } = s, { contains: i } = t;
+    (!i || r.includes(i)) && (s.input = t.importer.import(r));
+  }, n = o.Parser.events.htmlBefore;
+  return o.on(n, e), () => {
+    o.off(n, e);
   };
 };
-class D {
+class U {
   getVariableSyntax(t) {
-    const { defaultValue: e } = t, r = this.getFullPath(t), s = e ? ` || \`${e}\`` : "";
-    return `<%= ${r}${s} %>`;
+    const { defaultValue: e } = t, n = this.getFullPath(t), s = e ? ` || \`${e}\`` : "";
+    return `<%= ${n}${s} %>`;
   }
   getCollectionStartSyntax(t) {
-    const { collectionId: e, dataSource: r, startIndex: s, endIndex: n } = t, a = (r == null ? void 0 : r.path) || e || "", o = this._sanitizeVariableName(e);
-    let l = "";
-    if (s !== void 0 || n !== void 0) {
-      const p = s ?? 0, c = n !== void 0 ? n : "";
-      l = `.slice(${p}${c !== "" ? `, ${c}` : ""})`;
+    const { collectionId: e, dataSource: n, startIndex: s, endIndex: r } = t, i = (n == null ? void 0 : n.path) || e || "", a = this._sanitizeVariableName(e);
+    let c = "";
+    if (s !== void 0 || r !== void 0) {
+      const p = s ?? 0, l = r !== void 0 ? r : "";
+      c = `.slice(${p}${l !== "" ? `, ${l}` : ""})`;
     }
-    return `<% ${a}${l}.forEach(function(currentItem, index, arr) {
+    return `<% ${i}${c}.forEach(function(currentItem, index, arr) {
 const startIndex = parseInt(${s ?? 0}, 10);
 const endIndex = startIndex + arr.length;
-const ${o}={ currentItem, currentIndex: startIndex + index, remainingItems: endIndex - (startIndex + index)} %>`;
+const ${a}={ currentItem, currentIndex: startIndex + index, remainingItems: endIndex - (startIndex + index)} %>`;
   }
   _sanitizeVariableName(t) {
     return t.replace(/[^a-zA-Z0-9_$]/g, "_");
@@ -268,36 +269,37 @@ const ${o}={ currentItem, currentIndex: startIndex + index, remainingItems: endI
   getConditionalEndSyntax() {
     return "<% } %>";
   }
-  getFullPath({ collectionId: t, path: e, variableType: r }) {
-    return (t ? [this._sanitizeVariableName(t), r, e].filter(Boolean).join(".") : e) || "";
+  getFullPath({ collectionId: t, path: e, variableType: n }) {
+    return (t ? [this._sanitizeVariableName(t), n, e].filter(Boolean).join(".") : e) || "";
   }
   _parseCondition(t) {
     if (!t) return "";
     if (J(t)) {
-      const e = t.statements.map((r) => this._parseCondition(r));
-      return e.length > 1 ? `(${e.join(`) ${t.logicalOperator} (`)})` : e[0];
+      const e = t.statements.map((r) => this._parseCondition(r)), n = D[t.logicalOperator];
+      let s = e.length > 1 ? `(${e.join(`)${n}(`)})` : e[0];
+      return t.logicalOperator === "xor" && (s = `!!(${s})`), s;
     } else {
-      const e = this._parseValue(t.left), r = this._parseValue(t.right);
+      const e = this._parseValue(t.left), n = this._parseValue(t.right);
       switch (t.operator) {
         case "equals":
-          return `${e} === ${r}`;
+          return `${e} === ${n}`;
         case ">":
         case "<":
         case ">=":
         case "<=":
         case "=":
         case "!=":
-          return `${e} ${t.operator} ${r}`;
+          return `${e} ${t.operator} ${n}`;
         case "contains":
-          return `${e}?.includes(${r})`;
+          return `${e}?.includes(${n})`;
         case "startsWith":
-          return `${e}?.startsWith(${r})`;
+          return `${e}?.startsWith(${n})`;
         case "endsWith":
-          return `${e}?.endsWith(${r})`;
+          return `${e}?.endsWith(${n})`;
         case "equalsIgnoreCase":
-          return `${e}?.toLowerCase() === ${r}?.toLowerCase()`;
+          return `${e}?.toLowerCase() === ${n}?.toLowerCase()`;
         case "trimEquals":
-          return `${e}?.trim() === ${r}?.trim()`;
+          return `${e}?.trim() === ${n}?.trim()`;
         case "isTruthy":
           return `!!${e}`;
         case "isFalsy":
@@ -319,7 +321,7 @@ const ${o}={ currentItem, currentIndex: startIndex + index, remainingItems: endI
         case "isBoolean":
           return `typeof ${e} === 'boolean'`;
         default:
-          return `${e} ${t.operator} ${r}`;
+          return `${e} ${t.operator} ${n}`;
       }
     }
   }
@@ -327,7 +329,11 @@ const ${o}={ currentItem, currentIndex: startIndex + index, remainingItems: endI
     return typeof t == "object" ? this.getFullPath(t) : typeof t == "string" ? `'${t.replace(/'/g, "\\'")}'` : String(t);
   }
 }
-const V = ["===", "==", "!==", "!=", "<=", ">=", "<", ">", "&&", "||"], q = {
+const D = {
+  and: "&&",
+  or: "||",
+  xor: "^"
+}, V = ["===", "==", "!==", "!=", "<=", ">=", "<", ">", "&&", "||"], q = {
   "===": "=",
   "==": "=",
   "!==": "!=",
@@ -339,7 +345,7 @@ const V = ["===", "==", "!==", "!=", "<=", ">=", "<", ">", "&&", "||"], q = {
   "&&": "&&",
   "||": "||"
 };
-class F {
+class G {
   constructor() {
     this.messages = [], this.collectionStack = [];
   }
@@ -354,34 +360,37 @@ class F {
   }
   parseEjsTemplate(t) {
     const e = [];
-    let r = 0;
-    for (; r < t.length; ) {
-      const s = t.indexOf("<%", r);
+    let n = 0;
+    for (; n < t.length; ) {
+      const s = t.indexOf("<%", n);
       if (s === -1) {
-        r < t.length && e.push(this.createAppendLiteral(t.slice(r)));
+        n < t.length && e.push(this.createAppendLiteral(t.slice(n)));
         break;
       }
-      s > r && e.push(this.createAppendLiteral(t.slice(r, s)));
-      const n = t.indexOf("%>", s);
-      if (n === -1)
+      s > n && e.push(this.createAppendLiteral(t.slice(n, s)));
+      const r = t.indexOf("%>", s);
+      if (r === -1)
         throw new Error("Unclosed EJS tag");
-      const a = t.slice(s + 2, n).trim();
-      if (r = n + 2, a.startsWith("=") || a.startsWith("-")) {
-        const o = a.slice(1).trim();
-        e.push(this.createAppendExpression(o));
+      const i = t.slice(s + 2, r).trim();
+      if (n = r + 2, i.startsWith("=") || i.startsWith("-")) {
+        const a = i.slice(1).trim();
+        e.push(this.createAppendExpression(a));
       } else {
-        if (a.startsWith("#"))
+        if (i.startsWith("#"))
           continue;
-        if (a.startsWith("if")) {
-          const o = this.parseIfStatement(a, t, r);
-          e.push(o), r = o.endPos || r;
-        } else if (a.startsWith("for")) {
-          const o = this.parseForStatement(a, t, r);
-          e.push(o), r = o.endPos || r;
+        if (i.startsWith("if")) {
+          const a = this.parseIfStatement(i, t, n);
+          e.push(a), n = a.endPos || n;
+        } else if (i.startsWith("for")) {
+          const a = this.parseForStatement(i, t, n);
+          e.push(a), n = a.endPos || n;
         } else {
-          if (a.startsWith("}") || a.startsWith("} else"))
-            break;
-          this.addMessage("info", `Unsupported scriptlet content: ${a}`);
+          const a = i.match(/([\w][\w.-]*[\w])\s*\.\s*forEach\s*\(\s*(\w+)\s*=>\s*\{?/);
+          if (a) {
+            const c = a[1], p = a[2], l = this.parseForEachStatement(c, p, t, n);
+            e.push(l), n = l.endPos || n;
+          } else
+            this.addMessage("info", `Unsupported scriptlet content: ${i}`);
         }
       }
     }
@@ -410,60 +419,57 @@ class F {
       }
     };
   }
-  findNextElse(t, e) {
-    const r = /<%\s*\}\s*else(?:\s+if\s*\([^)]*\))?\s*\{\s*%>/g;
-    r.lastIndex = e;
-    const s = r.exec(t);
-    return s ? {
-      start: s.index,
-      end: t.indexOf("%>", s.index) + 2
-      // End of <% } else { %>
-    } : null;
-  }
-  parseIfStatement(t, e, r) {
+  parseIfStatement(t, e, n) {
     const s = t.match(/if\s*\((.*)\)\s*\{?/);
     if (!s)
       throw new Error("Invalid if statement syntax");
-    const n = this.parseJsExpression(s[1]), { body: a, endPos: o } = this.parseTemplateBlock(e, r);
-    let l = null, p = o;
-    const c = this.findNextElse(e, o);
-    if (c) {
-      const h = e.slice(c.start, c.end);
-      if (/else\s+if/.test(h)) {
-        const f = c.end, u = this.parseIfStatement(h, e, f);
-        l = {
-          type: "IfStatement",
-          test: u.test,
-          consequent: u.consequent,
-          alternate: u.alternate
-        }, p = u.endPos;
-      } else {
-        const f = c.end, { body: u, endPos: x } = this.parseTemplateBlock(e, f);
-        l = {
-          type: "BlockStatement",
-          body: u
-        }, p = x;
+    const r = this.parseJsExpression(s[1]), { body: i, endPos: a } = this.parseTemplateBlock(e, n);
+    let c = null, p = a;
+    const l = e.indexOf("<%", p);
+    if (l === p) {
+      const h = e.indexOf("%>", l);
+      if (h !== -1) {
+        const d = e.slice(l + 2, h).trim(), f = h + 2 - l;
+        if (d.startsWith("} else if")) {
+          p = l + f;
+          const E = d.substring(d.indexOf("if")).trim(), u = this.parseIfStatement(E, e, p);
+          c = {
+            type: "IfStatement",
+            test: u.test,
+            consequent: u.consequent,
+            alternate: u.alternate
+          }, p = u.endPos;
+        } else if (d.startsWith("} else")) {
+          p = l + f;
+          const { body: E, endPos: u } = this.parseTemplateBlock(e, p);
+          c = {
+            type: "BlockStatement",
+            body: E
+          }, p = u;
+          const m = e.indexOf("<%", p), S = e.indexOf("%>", m);
+          m === p && e.slice(m + 2, S).trim() === "}" && (p = S + 2);
+        } else d === "}" && (p = l + f);
       }
     }
     return {
       type: "IfStatement",
-      test: n,
+      test: r,
       consequent: {
         type: "BlockStatement",
-        body: a
+        body: i
       },
-      alternate: l,
+      alternate: c,
       endPos: p
     };
   }
-  parseForStatement(t, e, r) {
+  parseForStatement(t, e, n) {
     const s = t.match(/for\s*\((.*)\)\s*\{?/);
     if (!s)
       throw new Error("Invalid for statement syntax");
-    const n = s[1].split("of");
-    if (n.length !== 2)
+    const r = s[1].split("of");
+    if (r.length !== 2)
       throw new Error("Only for...of loops are supported");
-    const a = n[0].trim().replace(/^let\s+|^const\s+|^var\s+/, ""), o = n[1].trim(), { body: l, endPos: p } = this.parseTemplateBlock(e, r);
+    const i = r[0].trim().replace(/^let\s+|^const\s+|^var\s+/, ""), a = r[1].trim(), { body: c, endPos: p } = this.parseTemplateBlock(e, n);
     return {
       type: "ForStatement",
       init: {
@@ -472,8 +478,8 @@ class F {
         declarations: [
           {
             type: "VariableDeclarator",
-            id: { type: "Identifier", name: a },
-            init: this.parseJsExpression(o)
+            id: { type: "Identifier", name: i },
+            init: this.parseJsExpression(a)
           }
         ]
       },
@@ -481,42 +487,72 @@ class F {
       update: null,
       body: {
         type: "BlockStatement",
-        body: l
+        body: c
       },
-      endPos: p
+      // Consume the closing '}' tag for the for loop
+      endPos: (() => {
+        const l = e.indexOf("<%", p), h = e.indexOf("%>", l);
+        return l === p && e.slice(l + 2, h).trim() === "}" ? h + 2 : p;
+      })()
+    };
+  }
+  parseForEachStatement(t, e, n, s) {
+    const { body: r, endPos: i } = this.parseTemplateBlock(n, s);
+    return {
+      type: "ForEachStatement",
+      collection: this.parseJsExpression(t),
+      itemIdentifier: { type: "Identifier", name: e },
+      body: {
+        type: "BlockStatement",
+        body: r
+      },
+      endPos: (() => {
+        const a = n.indexOf("<%", i), c = n.indexOf("%>", a);
+        return a === i && n.slice(a + 2, c).trim() === "}" ? c + 2 : i;
+      })()
     };
   }
   parseTemplateBlock(t, e) {
-    const r = [];
-    let s = e, n = 1;
-    for (; s < t.length && n > 0; ) {
-      const a = t.indexOf("<%", s);
-      if (a === -1) {
-        s < t.length && r.push(this.createAppendLiteral(t.slice(s)));
+    const n = [];
+    let s = e;
+    for (; s < t.length; ) {
+      const r = t.indexOf("<%", s);
+      if (r === -1) {
+        s < t.length && n.push(this.createAppendLiteral(t.slice(s))), s = t.length;
         break;
       }
-      a > s && r.push(this.createAppendLiteral(t.slice(s, a)));
-      const o = t.indexOf("%>", a);
-      if (o === -1)
-        throw new Error("Unclosed EJS tag");
-      const l = t.slice(a + 2, o).trim();
-      if (s = o + 2, l === "}") {
-        if (n--, n === 0)
-          break;
-      } else (l.startsWith("if") || l.startsWith("for")) && n++;
-      if (l.startsWith("=") || l.startsWith("-")) {
-        const p = l.slice(1).trim();
-        r.push(this.createAppendExpression(p));
+      r > s && n.push(this.createAppendLiteral(t.slice(s, r)));
+      const i = t.indexOf("%>", r);
+      if (i === -1)
+        throw new Error("Unclosed EJS tag within block");
+      const a = t.slice(r + 2, i).trim();
+      if (a === "}" || a.startsWith("} else")) {
+        s = r;
+        break;
+      }
+      if (s = i + 2, a.startsWith("=") || a.startsWith("-")) {
+        const c = a.slice(1).trim();
+        n.push(this.createAppendExpression(c));
       } else {
-        if (l.startsWith("#"))
+        if (a.startsWith("#"))
           continue;
-        if (l.startsWith("} else")) {
-          s = a;
-          break;
+        if (a.startsWith("if")) {
+          const c = this.parseIfStatement(a, t, s);
+          n.push(c), s = c.endPos || s;
+        } else if (a.startsWith("for")) {
+          const c = this.parseForStatement(a, t, s);
+          n.push(c), s = c.endPos || s;
+        } else {
+          const c = a.match(/([\w][\w.-]*[\w])\s*\.\s*forEach\s*\(\s*(\w+)\s*=>\s*\{?/);
+          if (c) {
+            const p = c[1], l = c[2], h = this.parseForEachStatement(p, l, t, s);
+            n.push(h), s = h.endPos || s;
+          } else
+            this.addMessage("info", `Unsupported scriptlet content within block: ${a}`);
         }
       }
     }
-    return { body: r, endPos: s };
+    return { body: n, endPos: s };
   }
   parseJsExpression(t) {
     if (/^(['"]).*\1$/.test(t))
@@ -540,33 +576,34 @@ class F {
         value: t === "true"
       };
     for (const s of V) {
-      const n = t.indexOf(s);
-      if (n > 0)
+      const r = t.lastIndexOf(s);
+      if (r > 0 && t[r - 1] !== "!" && t[r - 1] !== "=" && t[r - 1] !== "<" && t[r - 1] !== ">")
         return {
           type: s === "&&" || s === "||" ? "LogicalExpression" : "BinaryExpression",
           operator: q[s],
-          left: this.parseJsExpression(t.slice(0, n).trim()),
-          right: this.parseJsExpression(t.slice(n + s.length).trim())
+          left: this.parseJsExpression(t.slice(0, r).trim()),
+          right: this.parseJsExpression(t.slice(r + s.length).trim())
         };
     }
-    const e = t.indexOf("."), r = t.indexOf("[");
-    if (e > 0 || r > 0) {
-      const s = e > 0 && (r === -1 || e < r) ? e : r;
-      let n, a, o = !1;
+    const e = t.indexOf("."), n = t.indexOf("[");
+    if (e > 0 && (n === -1 || e < n) || n > 0 && (e === -1 || n < e)) {
+      const s = e > 0 && (n === -1 || e < n) ? e : n;
+      let r, i, a = !1;
       if (s === e)
-        n = t.slice(0, e), a = this.parseJsExpression(t.slice(e + 1));
+        r = t.slice(0, e), i = { type: "Identifier", name: t.slice(e + 1) }, a = !1;
       else {
-        n = t.slice(0, r);
-        const l = t.indexOf("]", r);
-        if (l === -1)
+        r = t.slice(0, n);
+        const c = t.indexOf("]", n);
+        if (c === -1)
           throw new Error("Unclosed bracket in expression");
-        a = this.parseJsExpression(t.slice(r + 1, l)), o = !0;
+        const p = t.slice(n + 1, c);
+        i = /^(['"]).*\1$/.test(p) || /^-?\d+(\.\d+)?$/.test(p) ? this.parseJsExpression(p) : { type: "Identifier", name: p }, a = !0;
       }
       return {
         type: "MemberExpression",
-        object: this.parseJsExpression(n),
-        property: a,
-        computed: o
+        object: this.parseJsExpression(r),
+        property: i,
+        computed: a
       };
     }
     return {
@@ -586,6 +623,8 @@ class F {
         return this.handleIfStatement(t);
       case "ForStatement":
         return this.handleForStatement(t);
+      case "ForEachStatement":
+        return this.handleForEachStatement(t);
       case "BlockStatement":
         return this.handleBlockStatement(t);
       case "Literal":
@@ -606,8 +645,8 @@ class F {
   }
   handleProgram(t) {
     let e = "";
-    for (const r of t.body)
-      e += this.astToGrapesJS(r);
+    for (const n of t.body)
+      e += this.astToGrapesJS(n);
     return e;
   }
   handleVariableDeclaration(t) {
@@ -617,11 +656,11 @@ class F {
     return t.expression.type === "CallExpression" && t.expression.callee.type === "Identifier" && t.expression.callee.name === "__append" && t.expression.arguments.length > 0 ? this.astToGrapesJS(t.expression.arguments[0]) : "";
   }
   handleIfStatement(t) {
-    const e = this.getConditionExpression(t.test), r = this.astToGrapesJS(t.consequent);
+    const e = this.getConditionExpression(t.test), n = this.astToGrapesJS(t.consequent);
     let s = "";
     return t.alternate && (s = this.astToGrapesJS(t.alternate)), `
       <data-condition data-gjs-data-resolver='${JSON.stringify({ condition: e })}'>
-        <data-condition-true-content>${r}</data-condition-true-content>
+        <data-condition-true-content>${n}</data-condition-true-content>
         <data-condition-false-content>${s}</data-condition-false-content>
       </data-condition>
     `;
@@ -633,30 +672,44 @@ class F {
     const e = t.init.declarations[0];
     if (e.id.type !== "Identifier")
       return this.addMessage("warning", "Unsupported for loop variable declaration id"), "";
-    let r = "";
+    let n = "";
     if (e.init)
-      r = this.getExpressionString(e.init);
+      n = this.getExpressionString(e.init);
     else
       return this.addMessage("warning", "For loop collection is undefined"), "";
-    r.startsWith("data.") || (r = `data.${r}`);
-    const s = `collection-${Math.random().toString(36).substring(2, 10)}`;
+    const s = e.id.name, r = s;
     this.collectionStack.push(s);
-    const n = this.astToGrapesJS(t.body);
+    const i = this.astToGrapesJS(t.body);
+    return this.collectionStack.pop(), `
+      <data-collection data-gjs-data-resolver='${JSON.stringify({
+      dataSource: { type: "data-variable", path: n },
+      collectionId: r
+    })}'>
+        <data-collection-item>
+          ${i}
+        </data-collection-item>
+      </data-collection>
+    `;
+  }
+  handleForEachStatement(t) {
+    const e = this.getExpressionString(t.collection), n = t.itemIdentifier.name, s = n;
+    this.collectionStack.push(n);
+    const r = this.astToGrapesJS(t.body);
     return this.collectionStack.pop(), `
       <data-collection data-gjs-data-resolver='${JSON.stringify({
-      dataSource: { type: "data-variable", path: r },
+      dataSource: { type: "data-variable", path: e },
       collectionId: s
     })}'>
         <data-collection-item>
-          ${n}
+          ${r}
         </data-collection-item>
       </data-collection>
     `;
   }
   handleBlockStatement(t) {
     let e = "";
-    for (const r of t.body)
-      e += this.astToGrapesJS(r);
+    for (const n of t.body)
+      e += this.astToGrapesJS(n);
     return e;
   }
   handleLiteral(t) {
@@ -664,34 +717,30 @@ class F {
   }
   handleIdentifier(t) {
     let e = { path: t.name };
-    if (this.collectionStack.length > 0 && t.name === "item") {
-      const r = this.collectionStack[this.collectionStack.length - 1];
-      e = {
-        path: t.name,
-        collectionId: r,
+    if (this.collectionStack.length > 0) {
+      const n = this.collectionStack[this.collectionStack.length - 1];
+      t.name === n && (e = {
+        collectionId: n,
         variableType: "currentItem"
-      };
+      });
     }
     return `<data-variable data-gjs-data-resolver='${JSON.stringify(e)}'></data-variable>`;
   }
   handleMemberExpression(t, e = {}) {
     let s = { path: this.getExpressionString(t), ...e };
     if (this.collectionStack.length > 0) {
-      let n = t;
+      const r = this.collectionStack[this.collectionStack.length - 1];
+      let i = t;
       const a = [];
-      let o = !1;
-      for (; n.type === "MemberExpression"; )
-        if (n.property.type === "Identifier" ? a.unshift(n.property.name) : n.property.type === "Literal" && n.computed && a.unshift(`[${n.property.value}]`), n = n.object, n.type === "Identifier" && n.name === "item") {
-          o = !0;
-          break;
-        }
-      if (o && n.type === "Identifier" && n.name === "item") {
-        const l = this.collectionStack[this.collectionStack.length - 1], p = a.join(".").replace(/\.\[/g, "[");
+      for (; i.type === "MemberExpression"; )
+        i.property.type === "Identifier" && !i.computed ? a.unshift(i.property.name) : i.property.type === "Literal" && i.computed ? a.unshift(String(i.property.value)) : a.unshift(this.getExpressionString(i.property)), i = i.object;
+      if (i.type === "Identifier" && i.name === r) {
+        const c = a.join(".");
         s = {
-          ...s,
-          collectionId: l,
+          ...e,
+          collectionId: r,
           variableType: "currentItem",
-          path: p
+          path: c
         };
       }
     }
@@ -708,8 +757,8 @@ class F {
   handleCallExpression(t) {
     var e;
     if (t.callee.type === "Identifier" && t.callee.name === "include") {
-      const r = ((e = t.arguments[0]) == null ? void 0 : e.type) === "Literal" ? String(t.arguments[0].value) : "";
-      return this.addMessage("info", `Partial includes are not fully supported: ${r}`), "";
+      const n = ((e = t.arguments[0]) == null ? void 0 : e.type) === "Literal" ? String(t.arguments[0].value) : "";
+      return this.addMessage("info", `Partial includes are not fully supported: ${n}`), "";
     }
     return "";
   }
@@ -725,20 +774,20 @@ class F {
         ]
       };
     if (t.type === "MemberExpression") {
-      let e = this.getExpressionString(t), r = "isTruthy";
-      return e.startsWith("!!") ? (r = "isTruthy", e = e.slice(2)) : e.startsWith("!") && (r = "isFalsy", e = e.slice(1)), {
+      let e = this.getExpressionString(t), n = "isTruthy";
+      return e.startsWith("!!") ? (n = "isTruthy", e = e.slice(2)) : e.startsWith("!") && (n = "isFalsy", e = e.slice(1)), {
         logicalOperator: "and",
         statements: [
           {
             left: { type: "data-variable", path: e },
-            operator: r
+            operator: n
           }
         ]
       };
     }
     if (t.type === "BinaryExpression" || t.type === "LogicalExpression") {
-      const e = this.getConditionExpression(t.left), r = this.getConditionExpression(t.right);
-      return `${e} ${t.operator} ${r}`;
+      const e = this.getConditionExpression(t.left), n = this.getConditionExpression(t.right);
+      return `${e} ${t.operator} ${n}`;
     }
     return t.type === "Literal" ? typeof t.value == "string" ? `'${t.value}'` : String(t.value ?? "") : this.getExpressionString(t);
   }
@@ -749,16 +798,16 @@ class F {
       case "Literal":
         return String(t.value ?? "");
       case "MemberExpression": {
-        const e = this.getExpressionString(t.object), r = this.getExpressionString(t.property);
-        return t.computed ? `${e}[${r}]` : `${e}.${r}`;
+        const e = this.getExpressionString(t.object), n = this.getExpressionString(t.property);
+        return t.computed ? `${e}[${n}]` : `${e}.${n}`;
       }
       case "BinaryExpression": {
-        const e = this.getExpressionString(t.left), r = this.getExpressionString(t.right);
-        return `${e} ${t.operator} ${r}`;
+        const e = this.getExpressionString(t.left), n = this.getExpressionString(t.right);
+        return `${e} ${t.operator} ${n}`;
       }
       case "LogicalExpression": {
-        const e = this.getExpressionString(t.left), r = this.getExpressionString(t.right);
-        return `${e} ${t.operator} ${r}`;
+        const e = this.getExpressionString(t.left), n = this.getExpressionString(t.right);
+        return `${e} ${t.operator} ${n}`;
       }
       default:
         return this.addMessage("warning", `Unsupported expression type for getExpressionString: ${t.type}`), "";
@@ -771,21 +820,21 @@ class F {
     });
   }
 }
-const G = "dataSourceEjs", R = d.startup, K = function(i, t = {}) {
-  const e = H(i, new D()), r = U(i, {
+const R = "dataSourceEjs", K = g.startup, z = function(o, t = {}) {
+  const e = F(o, new U()), n = H(o, {
     contains: "<%",
-    importer: new F()
+    importer: new G()
   });
-  _({
-    editor: i,
+  B({
+    editor: o,
     licenseKey: t.licenseKey,
-    plan: R,
-    pluginName: G,
+    plan: K,
+    pluginName: R,
     cleanup: () => {
-      e(), r();
+      e(), n();
     }
   });
-}, z = O(K);
+}, Z = M(z);
 export {
-  z as default
+  Z as default
 };