@wavemaker-ai/react-codegen 1.0.0-rc.647684 → 1.0.0-rc.647712

package/dist/transpiler/index.mjs

@@ -8133,14 +8133,14 @@ var require_lib = __commonJS({
           super.checkParams(node, false, true);
           this.scope.exit();
         }
-        forwardNoArrowParamsConversionAt(node, parse7) {
+        forwardNoArrowParamsConversionAt(node, parse8) {
           let result;
           if (this.state.noArrowParamsConversionAt.indexOf(node.start) !== -1) {
             this.state.noArrowParamsConversionAt.push(this.state.start);
-            result = parse7();
+            result = parse8();
             this.state.noArrowParamsConversionAt.pop();
           } else {
-            result = parse7();
+            result = parse8();
           }
           return result;
         }
@@ -16778,7 +16778,7 @@ var require_lib = __commonJS({
       }
       return pluginMap;
     }
-    function parse6(input, options) {
+    function parse7(input, options) {
       var _options;
       if (((_options = options) == null ? void 0 : _options.sourceType) === "unambiguous") {
         options = Object.assign({}, options);
@@ -16840,7 +16840,7 @@ var require_lib = __commonJS({
       }
       return cls;
     }
-    exports$1.parse = parse6;
+    exports$1.parse = parse7;
     exports$1.parseExpression = parseExpression2;
     exports$1.tokTypes = types;
   }
@@ -19892,7 +19892,7 @@ var require_parse = __commonJS({
     var whitespace = /* @__PURE__ */ new Set([9, 10, 12, 13, 32]);
     var ZERO = "0".charCodeAt(0);
     var NINE = "9".charCodeAt(0);
-    function parse6(formula) {
+    function parse7(formula) {
       formula = formula.trim().toLowerCase();
       if (formula === "even") {
         return [2, 0];
@@ -19944,7 +19944,7 @@ var require_parse = __commonJS({
         }
       }
     }
-    exports$1.parse = parse6;
+    exports$1.parse = parse7;
   }
 });
 
@@ -21413,7 +21413,7 @@ var require_html = __commonJS({
             }).join("");
           },
           set: function(content) {
-            var r = parse6(content);
+            var r = parse7(content);
             this.childNodes = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
           },
           enumerable: false,
@@ -21426,7 +21426,7 @@ var require_html = __commonJS({
           if (content instanceof node_1.default) {
             content = [content];
           } else if (typeof content == "string") {
-            var r = parse6(content, options);
+            var r = parse7(content, options);
             content = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
           }
           this.childNodes = content;
@@ -21441,7 +21441,7 @@ var require_html = __commonJS({
             if (node instanceof node_1.default) {
               return [node];
             } else if (typeof node == "string") {
-              var r = parse6(node);
+              var r = parse7(node);
               return r.childNodes.length ? r.childNodes : [new text_1.default(node, _this)];
             }
             return [];
@@ -21766,7 +21766,7 @@ var require_html = __commonJS({
           if (arguments.length < 2) {
             throw new Error("2 arguments required");
           }
-          var p = parse6(html);
+          var p = parse7(html);
           if (where === "afterend") {
             var idx = this.parentNode.childNodes.findIndex(function(child) {
               return child === _this;
@@ -22056,7 +22056,7 @@ var require_html = __commonJS({
       return stack;
     }
     exports$1.base_parse = base_parse;
-    function parse6(data, options) {
+    function parse7(data, options) {
       if (options === void 0) {
         options = { lowerCaseTagName: false, comment: false };
       }
@@ -22085,7 +22085,7 @@ var require_html = __commonJS({
       }
       return root;
     }
-    exports$1.parse = parse6;
+    exports$1.parse = parse7;
   }
 });
 
@@ -39285,6 +39285,35 @@ var transformAppLocale = (exp) => {
   const expression = exp.replace(appLocaleRegex, replacer);
   return expression;
 };
+var splitTopLevel = (expr, separator, limit = Infinity) => {
+  const parts = [];
+  let depth = 0;
+  let inString = false;
+  let stringChar = "";
+  let start = 0;
+  for (let i = 0; i < expr.length && parts.length < limit - 1; i++) {
+    const ch = expr[i];
+    if (inString) {
+      if (ch === stringChar && expr[i - 1] !== "\\") {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = true;
+      stringChar = ch;
+    } else if (ch === "(" || ch === "[" || ch === "{") {
+      depth++;
+    } else if (ch === ")" || ch === "]" || ch === "}") {
+      depth--;
+    } else if (ch === separator && depth === 0) {
+      parts.push(expr.slice(start, i));
+      start = i + 1;
+    }
+  }
+  parts.push(expr.slice(start));
+  return parts;
+};
 var convertHyphenatedPropsToBracketNotation = (expr) => {
   if (!expr || typeof expr !== "string") return expr;
   return expr.replace(/\.([a-zA-Z_$][a-zA-Z0-9_$]*-[a-zA-Z_$][a-zA-Z0-9_$\-]*)/g, (_, propName) => {
@@ -39714,7 +39743,7 @@ var transform = (expr, scopeName = "this", mode = "attr") => {
   expr = convertHyphenatedPropsToBracketNotation(expr);
   try {
     const parser = new Parser$1(new Lexer());
-    let expressions = expr.split(";"), transformedExpressions = [];
+    let expressions = splitTopLevel(expr, ";"), transformedExpressions = [];
     const $iExp = new RegExp("\\[" + scopeName + "\\.\\$i\\]", "g");
     expressions.forEach((currentExp) => {
       const ast = parser.parseBinding(currentExp, "", 0);
@@ -40583,9 +40612,12 @@ var transformRepeatChildData = (element, dataSetEx, prefix = "repeat_item", list
     if (isList) {
       return;
     }
-    let value = element.attributes[name];
-    value = removeOptionChaining(value);
-    element.setAttribute(name, replaceAll(value, dataSetEx, "$item"));
+    const value = element.attributes[name];
+    const stripped = removeOptionChaining(value);
+    const replaced = replaceAll(stripped, dataSetEx, "$item");
+    if (replaced !== stripped) {
+      element.setAttribute(name, replaced);
+    }
     if (list) {
       let genrateRandomString2 = function() {
         return Math.random().toString(36).substring(2, 5);
@@ -40602,12 +40634,15 @@ var transformRepeatChildData = (element, dataSetEx, prefix = "repeat_item", list
     }
   });
 };
-var transformRepeatChildAttr = (element, replace2, replaceWith) => {
+var transformRepeatChildAttr = (element, replace2, replaceWith, skipAttrNames) => {
   Object.keys(element.attributes).forEach((name) => {
     const isList = isListAndField(element);
     if (isList) {
       return;
     }
+    if (skipAttrNames == null ? void 0 : skipAttrNames.includes(name)) {
+      return;
+    }
     const value = element.attributes[name];
     const regex = new RegExp(
       replace2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "(?![a-zA-Z_$0-9])",
@@ -40621,7 +40656,7 @@ var transformRepeatChildAttr = (element, replace2, replaceWith) => {
   });
   element.childNodes.forEach((c) => {
     if (isHTMLElement(c)) {
-      transformRepeatChildAttr(c, replace2, replaceWith);
+      transformRepeatChildAttr(c, replace2, replaceWith, skipAttrNames);
     }
   });
 };
@@ -42245,6 +42280,73 @@ function getFormatCellExpression(element, context) {
   transformed = transformed.replace(/(\w+)\?\.\s*\(/g, "$1(");
   return transformed;
 }
+var VARIABLES_SCOPE_PREFIX = /^bind:fragment(?:\?\.|\.)((?:App(?:\?\.|\.)(?:activePage(?:\?\.|\.))?)?Variables)/;
+function findClosingBracket(value, start) {
+  let depth = 0;
+  let quote = null;
+  for (let i = start; i < value.length; i++) {
+    const ch = value[i];
+    if (quote) {
+      if (ch === "\\") i++;
+      else if (ch === quote) quote = null;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === "`") {
+      quote = ch;
+    } else if (ch === "[") {
+      depth++;
+    } else if (ch === "]") {
+      depth--;
+      if (depth === 0) return i;
+    }
+  }
+  return -1;
+}
+function parseVariableDataSetBinding(value) {
+  const prefix = VARIABLES_SCOPE_PREFIX.exec(value);
+  if (!prefix) {
+    return void 0;
+  }
+  const scopePath = prefix[1].replace(/\?\./g, ".");
+  let index = prefix[0].length;
+  let sawSeparator = false;
+  if (value.startsWith("?.", index)) {
+    index += 2;
+    sawSeparator = true;
+  } else if (value[index] === ".") {
+    index += 1;
+    sawSeparator = true;
+  }
+  let accessor;
+  let variableName;
+  if (value[index] === "[") {
+    const close = findClosingBracket(value, index);
+    if (close < 0) {
+      return void 0;
+    }
+    const key = value.slice(index + 1, close).trim();
+    accessor = `[${key}]`;
+    const quote = key[0];
+    const isQuotedLiteral = (quote === "'" || quote === '"') && key.length > 1 && key[key.length - 1] === quote;
+    variableName = isQuotedLiteral ? key.slice(1, -1) : void 0;
+    index = close + 1;
+  } else {
+    const identifier = /^[A-Za-z_$][A-Za-z0-9_$]*/.exec(value.slice(index));
+    if (!identifier || !sawSeparator) {
+      return void 0;
+    }
+    accessor = `.${identifier[0]}`;
+    variableName = identifier[0];
+    index += identifier[0].length;
+  }
+  if (!/^(?:\?\.|\.)dataSet(?![A-Za-z0-9_$])/.test(value.slice(index))) {
+    return void 0;
+  }
+  const datasourceExpr = addOptionalChainingToPropertyPath(
+    `fragment.${scopePath}${accessor}`.replace(/\?\./g, ".")
+  );
+  return { scopePath, datasourceExpr, variableName };
+}
 
 // src/transpile/class-expression.util.ts
 function transformClassWithMustacheExpressions(classes, options = {}) {
@@ -42327,7 +42429,14 @@ var EVENT_NAME_MAP = {
   "on-dragenter": "on-dragEnter",
   "on-dragleave": "on-dragLeave"
 };
-var processTextContentForJSX = (textContent) => {
+var convertMustacheTextToJsx = (textContent, isInsideTableColumn) => {
+  return textContent.replace(/\{\{([\s\S]*?)\}\}/g, (_match, rawExpr) => {
+    const expr = rawExpr.trim();
+    const transformed = isInsideTableColumn ? transformTableColumnClassExpression(expr) : modifyExpression(expr);
+    return `{${transformed}}`;
+  });
+};
+var processTextContentForJSX = (textContent, isInsideTableColumn = false) => {
   const trimmedContent = textContent.trim();
   if (!trimmedContent) {
     return "";
@@ -42335,6 +42444,9 @@ var processTextContentForJSX = (textContent) => {
   if (/^[<>&]+$/.test(trimmedContent)) {
     return trimmedContent.split("").map((char) => `{'${char}'}`).join("");
   }
+  if (trimmedContent.includes("{{") && trimmedContent.includes("}}")) {
+    return convertMustacheTextToJsx(textContent, isInsideTableColumn);
+  }
   return textContent;
 };
 var parse5 = typeof esm_default === "function" ? esm_default : esm_default.parse;
@@ -42400,7 +42512,7 @@ var _Transpiler = class _Transpiler {
     this.transformers = /* @__PURE__ */ new Map();
     this.componentNamesList = [];
     this.transpile = (e, isPartOfPrefab, splitCode = true, oldContext) => {
-      var _a, _b;
+      var _a, _b, _c;
       const tagName = e.tagName.toLowerCase();
       const isHtmlElement = htmlElements.includes(tagName);
       const isWebComponent = tagName.includes("-") && !tagName.startsWith("wm-");
@@ -42429,9 +42541,9 @@ var _Transpiler = class _Transpiler {
         this.componentNamesList = [];
       }
       if (isHtmlElement) {
-        result.markup = preTranspileHtmlElement(e);
+        result.markup = preTranspileHtmlElement(e, !!((_c = oldContext == null ? void 0 : oldContext.data) == null ? void 0 : _c.isInsideTableColumn));
         e.childNodes.forEach((c) => {
-          var _a2;
+          var _a2, _b2;
           if (c && c.nodeType == NodeType2.ELEMENT_NODE) {
             const cResult = this.transpile(c, isPartOfPrefab, splitCode);
             (0, import_lodash5.assignIn)(result.components, cResult.components);
@@ -42443,7 +42555,10 @@ var _Transpiler = class _Transpiler {
             result.components = { ...result.components, ...cResult.components };
             if (cResult.pageEvents) result.pageEvents = cResult.pageEvents;
           } else if (c && c.nodeType == NodeType2.TEXT_NODE) {
-            const processedContent = processTextContentForJSX(c.text);
+            const processedContent = processTextContentForJSX(
+              c.text,
+              !!((_b2 = oldContext == null ? void 0 : oldContext.data) == null ? void 0 : _b2.isInsideTableColumn)
+            );
             if (processedContent) {
               result.markup += processedContent;
             }
@@ -42463,7 +42578,7 @@ var _Transpiler = class _Transpiler {
         result.imports.push(...resolvedTransformer.imports(e, context));
         result.markup += resolvedTransformer.pre(e, context).replace(new RegExp(FORMAT_CONTEXT, "g"), "") + (e.childNodes.length > 0 ? "\n" : "");
         e.childNodes.forEach((c) => {
-          var _a2;
+          var _a2, _b2;
           if (c && c.nodeType == NodeType2.ELEMENT_NODE) {
             const cResult = this.transpile(c, isPartOfPrefab, splitCode, context);
             (0, import_lodash5.assignIn)(result.components, cResult.components);
@@ -42476,7 +42591,10 @@ var _Transpiler = class _Transpiler {
             result.components = { ...result.components, ...cResult.components };
             if (cResult.pageEvents) result.pageEvents = cResult.pageEvents;
           } else if (c && c.nodeType == NodeType2.TEXT_NODE) {
-            const processedContent = processTextContentForJSX(c.text);
+            const processedContent = processTextContentForJSX(
+              c.text,
+              !!((_b2 = context.data) == null ? void 0 : _b2.isInsideTableColumn)
+            );
             if (processedContent) {
               result.markup += processedContent;
             }
@@ -42616,6 +42734,7 @@ var _Transpiler = class _Transpiler {
       let value = e.attributes[name];
       if (value.startsWith("bind:")) {
         value = value.substring(5).trim();
+        value = decodeHTMLEntities(value);
         value = value.replace(/;+$/, "");
         const simpleSinglePattern = /^\$\[([^\]]+)\]$/;
         const match = value.match(simpleSinglePattern);
@@ -42762,9 +42881,9 @@ var _Transpiler = class _Transpiler {
       const transformCondition = (exp) => isInsideTableColumn ? transformTableColumnClassExpression(exp) : addOptionalChaining(exp);
       if (conditionalClasses.startsWith("{") && conditionalClasses.endsWith("}")) {
         conditionalClasses = conditionalClasses.slice(1, -1);
-        let expressions = conditionalClasses.split(",").map((expression) => {
-          const [className, condition] = expression.split(":");
-          if (!condition) {
+        let expressions = splitTopLevel(conditionalClasses, ",").map((expression) => {
+          const [className, condition] = splitTopLevel(expression, ":", 2);
+          if (condition === void 0) {
             return `'${className.trim()}'`;
           }
           return `(${transformCondition(condition.trim())} ? ${className.replace(/'$/, " '")} : '')`;
@@ -43024,21 +43143,25 @@ var _Transpiler = class _Transpiler {
     return attrName.endsWith("url") || attrName.endsWith("src");
   }
   transformAttr(tagName, name, value, context, tx) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (name === "styles" || name === "style" || name === "className") ; else if (name === "groupby" && value.includes("(")) {
       value = `${this.findArgs(value, context)} => ${value}`;
       value = `{${value}}`;
     } else if (name.startsWith("on-")) {
       name = "on" + name.charAt(3).toUpperCase() + name.substr(4);
-      value = value.replace(/item,/g, "$item,");
-      value = value.replace(/item\./g, "$item.");
-      value = value.replace(/item\)/g, "$item)");
-      if ((_a = context == null ? void 0 : context.get) == null ? void 0 : _a.call(context, "isInsideList")) {
+      const standaloneDollarItem = /(?<=[(,]\s*)\$item(?=\s*[,)])/;
+      const standaloneBareItem = /(?<=[(,]\s*)item(?=\s*[,)])/;
+      if (((_a = context == null ? void 0 : context.get) == null ? void 0 : _a.call(context, "isInsideList")) && standaloneDollarItem.test(value) && standaloneBareItem.test(value)) {
+        value = value.replace(new RegExp(standaloneDollarItem, "g"), "$eventItem");
+      }
+      value = value.replace(/(?<!\$)\bitem\b(?=[,)])/g, "$item");
+      value = value.replace(/(?<!\$)\bitem\b\./g, "$item.");
+      if ((_b = context == null ? void 0 : context.get) == null ? void 0 : _b.call(context, "isInsideList")) {
         value = value.replace(/;+\s*$/, "").trim();
         value = addFragmentOptionalChaining(value, false);
       }
       const args = this.findArgs(value, context);
-      if ((_b = context == null ? void 0 : context.get) == null ? void 0 : _b.call(context, "isInsideTableColumn")) {
+      if ((_c = context == null ? void 0 : context.get) == null ? void 0 : _c.call(context, "isInsideTableColumn")) {
         value = value.replace(/\brow\b/g, "rowData");
       }
       const arrowParams = this.parseArrowParamNames(args);
@@ -43061,7 +43184,7 @@ var _Transpiler = class _Transpiler {
       let exp = `${value.substring(5)}`;
       exp = exp.replace("fragment.Page", "fragment");
       const isProgressCircleDatavalue = tagName === "wm-progress-circle" && name === "datavalue";
-      exp = ((_c = context == null ? void 0 : context.get) == null ? void 0 : _c.call(context, "isInsideTableColumn")) ? transformTableColumnClassExpression(exp) : modifyExpression(exp);
+      exp = ((_d = context == null ? void 0 : context.get) == null ? void 0 : _d.call(context, "isInsideTableColumn")) ? transformTableColumnClassExpression(exp) : modifyExpression(exp);
       exp = resolveFormatContext(exp, context);
       exp = this.convertStringBooleanTernary(exp);
       if (!exp) {
@@ -43295,8 +43418,8 @@ var createExpression = (element, attrName) => {
   let displayexpression = element.attrs[attrName];
   if (displayexpression == null ? void 0 : displayexpression.startsWith("bind:")) {
     displayexpression = displayexpression.substring(5).trim();
-    displayexpression = displayexpression.replace(/;+$/, "");
     displayexpression = decodeHTMLEntities(displayexpression);
+    displayexpression = displayexpression.replace(/;+$/, "");
     displayexpression = transformDollarBracketSyntax(displayexpression);
     displayexpression = displayexpression.replace(/fragment\.\$item/g, "$item");
     displayexpression = displayexpression.replace(/fragment\.\$index/g, "$index");
@@ -43325,7 +43448,7 @@ var createExpression = (element, attrName) => {
     return `{($item) => (${transformedExp})}`;
   }
 };
-var preTranspileHtmlElement = (e) => {
+var preTranspileHtmlElement = (e, isInsideTableColumn = false) => {
   const styleObj = style_transformer_default(e, (propName) => {
     return true;
   }) || {};
@@ -43333,6 +43456,14 @@ var preTranspileHtmlElement = (e) => {
     const value = e.getAttribute(attr);
     if (!value) return `${attr}=""`;
     if (attr === "class") {
+      if (value.includes("{{") && value.includes("}}")) {
+        const mustacheClassName = transformClassWithMustacheExpressions(value, {
+          isInsideTableColumn
+        });
+        if (mustacheClassName) {
+          return `className=${mustacheClassName}`;
+        }
+      }
       return `className="${value}"`;
     } else if (attr === "style") {
       const styleObject = convertStyleStringToObject(value);
@@ -43402,6 +43533,12 @@ var label_transformer_default = {
 };
 
 // src/transpile/components/layout/layout-region-factory.ts
+var isOnlyWmParamChildren = (element) => {
+  const elementChildren = element.childNodes.filter(
+    (node) => node.nodeType === NodeType.ELEMENT_NODE
+  );
+  return elementChildren.length > 0 && elementChildren.every((node) => node.tagName === "WM-PARAM");
+};
 var partialContainerImport = [
   {
     name: "WmPartialContainer",
@@ -43417,9 +43554,7 @@ function createLayoutRegionTransformer(config) {
       const content = element.getAttribute("content") || defaultContent;
       const name = element.getAttribute("name") || defaultName;
       const isPreview = context.get("preview") === true;
-      const hasCustomContent = element.childNodes.some(
-        (node) => node.nodeType === NodeType.ELEMENT_NODE
-      );
+      const hasCustomContent = element.childNodes.some((node) => node.nodeType === NodeType.ELEMENT_NODE) && !isOnlyWmParamChildren(element);
       if (hasCustomContent) {
         return `<${tag} ${transformAttrs(element, context)}>
         `;
@@ -43435,9 +43570,7 @@ function createLayoutRegionTransformer(config) {
     },
     post: () => `</${tag}>`,
     imports: (element, context) => {
-      const hasCustomContent = element.childNodes.some(
-        (node) => node.nodeType === NodeType.ELEMENT_NODE
-      );
+      const hasCustomContent = element.childNodes.some((node) => node.nodeType === NodeType.ELEMENT_NODE) && !isOnlyWmParamChildren(element);
       if (hasCustomContent) {
         return [...componentImports];
       }
@@ -44031,10 +44164,10 @@ var createNavItemLabelExpression = (element) => {
   let expression;
   if (itemlabel.startsWith("bind:")) {
     expression = itemlabel.substring(5);
-    expression = expression.replace(/\[([^\]]+)\]/g, (match, content) => {
-      const transformedContent = content.replace(/fragment\./g, "item.");
-      return `[${transformedContent}]`;
-    });
+    expression = expression.replace(
+      /fragment\.([a-zA-Z_$][a-zA-Z0-9_$]*)/g,
+      (match, name) => FRAGMENT_SCOPED_NAMES.includes(name) ? match : `item.${name}`
+    );
   } else {
     expression = `item.${itemlabel}`;
   }
@@ -44335,7 +44468,7 @@ var list_transformer_default = {
         true,
         widgetName
       );
-      transformRepeatChildAttr(template, dataSet.substring(5), "$item");
+      transformRepeatChildAttr(template, dataSet.substring(5), "$item", ["dataset", "datasource"]);
       if ((_a = element.getAttribute("disableitem")) == null ? void 0 : _a.startsWith("bind:")) {
         const disabelItemExp = replaceAll(
           ((_b = element.getAttribute("disableitem")) == null ? void 0 : _b.substring(5)) || "",
@@ -44370,7 +44503,7 @@ var list_transformer_default = {
             `Variables.${variableName}.dataSet`
           ];
           dataPatterns.forEach((pattern) => {
-            transformRepeatChildAttr(template, pattern, "$item");
+            transformRepeatChildAttr(template, pattern, "$item", ["dataset", "datasource"]);
           });
         }
       }
@@ -44391,6 +44524,7 @@ var list_transformer_default = {
      renderItem={($item:Record<string, any>, $index:number, list:Record<string, any>[] ,getCurrentItemWidgets :any) => {
      const currentItemWidgetsRef = React.useRef({})   
      const currentItemWidgets = getCurrentItemWidgets($index);
+     const item = $item;
      currentItemWidgetsRef.current = currentItemWidgets;
        const $first = $index === 0;
        const $last = list && $index === list.length - 1;
@@ -45265,10 +45399,10 @@ var applyAttr = (e, replace2, replaceWith) => {
   });
   e.childNodes.forEach((c) => isHTMLElement(c) && applyAttr(c, replace2, replaceWith));
 };
+var isInsideDialog = (element) => !!getParentNode(element, "wm-dialog");
 var dialog_actions_transformer_default = {
   pre: (element, context) => {
-    const parent = element.parentNode;
-    if (!(parent == null ? void 0 : parent.rawTagName.includes("dialog"))) {
+    if (!isInsideDialog(element)) {
       Array.from(element.childNodes).forEach((child) => {
         element.removeChild(child);
       });
@@ -45285,15 +45419,13 @@ var dialog_actions_transformer_default = {
     return `<WmDialogActions   ${transformAttrs(element, context)}>`;
   },
   post: (element, context) => {
-    const parent = element.parentNode;
-    if (!(parent == null ? void 0 : parent.rawTagName.includes("dialog"))) {
+    if (!isInsideDialog(element)) {
       return ``;
     }
     return "</WmDialogActions>";
   },
   imports: (element, context) => {
-    const parent = element.parentNode;
-    if (!(parent == null ? void 0 : parent.rawTagName.includes("dialog"))) {
+    if (!isInsideDialog(element)) {
       return [];
     }
     return imports37;
@@ -45357,12 +45489,16 @@ var tabs_transformer_default = {
         transformRepeatChildData(
           repeatTemplate,
           dataSet.substring(5) + "[0]",
-          "list_item"
+          "list_item",
+          true,
+          widgetName
         );
         transformRepeatChildData(
           repeatTemplate,
           dataSet.substring(5) + "[$i]",
-          "list_item"
+          "list_item",
+          true,
+          widgetName
         );
         repeatTemplate.childNodes = element.childNodes;
         element.childNodes = [repeatTemplate];
@@ -45776,7 +45912,7 @@ var imports52 = [
 ];
 var accordion_transformer_default = {
   pre: (element, context) => {
-    element.attrs["name"];
+    const widgetName = element.attrs["name"];
     let dataSet = element.getAttribute("dataset");
     if (dataSet && dataSet.startsWith("bind:") && element.getAttribute("type") === "dynamic") {
       dataSet = dataSet.substring(5);
@@ -45786,10 +45922,34 @@ var accordion_transformer_default = {
         accordionPane.setAttribute("active", "bind:$item.active");
         accordionPane.setAttribute("toggle", "bind:$item.toggle");
       }
-      transformRepeatChildData(template, dataSet + "[0]", "repeat_item");
-      transformRepeatChildData(template, dataSet + "[$i]", "repeat_item");
-      transformRepeatChildData(template, dataSet + "[fragment.$i]", "repeat_item");
-      transformRepeatChildData(template, dataSet + "[fragment.$i]", "repeat_item");
+      transformRepeatChildData(
+        template,
+        dataSet + "[0]",
+        "repeat_item",
+        true,
+        widgetName
+      );
+      transformRepeatChildData(
+        template,
+        dataSet + "[$i]",
+        "repeat_item",
+        true,
+        widgetName
+      );
+      transformRepeatChildData(
+        template,
+        dataSet + "[fragment.$i]",
+        "repeat_item",
+        true,
+        widgetName
+      );
+      transformRepeatChildData(
+        template,
+        dataSet + "[fragment.$i]",
+        "repeat_item",
+        true,
+        widgetName
+      );
       context.set("old_props", context.props);
       context.props = ["$item", "$index"];
       return `<WmAccordion listener={fragment} ${transformAttrs(element, context)} render={(($item:Record<string,any>,$index:number,data:Record<string,any>[])=>(`;
@@ -46988,18 +47148,16 @@ var table_transformer_default = {
     const datasourceAttr = element.getAttribute("datasource");
     const binddatasetAttr = element.getAttribute("binddataset");
     if (datasetAttr && datasetAttr.includes(".dataSet")) {
-      const match = datasetAttr.match(
-        /^bind:fragment\.((?:App\.activePage\.|App\.)?Variables)\.([^.]+)\.dataSet(?=[^A-Za-z0-9_]|$)/
-      );
-      if (match) {
-        const scopePath = match[1];
-        const variableName = match[2];
-        context.set("tableDatasetVariableName", variableName);
+      const binding = parseVariableDataSetBinding(datasetAttr);
+      if (binding) {
+        const { scopePath, datasourceExpr, variableName } = binding;
+        if (variableName) {
+          context.set("tableDatasetVariableName", variableName);
+        }
         if (!datasourceAttr) {
-          const datasourceExpr = `fragment.${scopePath}.${variableName}`.split(".").join("?.");
           element.setAttribute("datasource", `{${datasourceExpr}}`);
         }
-        if (!binddatasetAttr) {
+        if (!binddatasetAttr && variableName) {
           element.setAttribute("binddataset", `${scopePath}.${variableName}.dataSet`);
         }
       }