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

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) => {
@@ -39346,14 +39375,17 @@ var removeLeadingCssBlockComments = (rule) => {
   }
   return { prefix, rest: rule.slice(idx) };
 };
+var CUSTOM_TAG_SELECTOR_PATTERN = /(^|[\s>+~,(])([a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]*)/g;
+var convertCustomTagSelectorsToClasses = (sel) => sel.replace(CUSTOM_TAG_SELECTOR_PATTERN, (_match, boundary, tag) => `${boundary}.${tag}`);
 var scopeSingleSelector = (selector, scopeClass) => {
-  const sel = selector.trim();
-  if (!sel) {
-    return sel;
+  const trimmed = selector.trim();
+  if (!trimmed) {
+    return trimmed;
   }
-  if (sel.startsWith(":")) {
-    return sel;
+  if (trimmed.startsWith(":")) {
+    return trimmed;
   }
+  const sel = convertCustomTagSelectorsToClasses(trimmed);
   const wmAppIndex = sel.search(/\.wm-app\b/);
   if (wmAppIndex !== -1) {
     if (sel.includes(`.${scopeClass}`)) {
@@ -39714,7 +39746,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);
@@ -39742,6 +39774,54 @@ function resolveFormatContext(expression, context) {
   return expression.replace(/,\s*\{formatContext:''\}/g, "").replace(FORMAT_CONTEXT_REGEX, "");
 }
 
+// src/services/schema-to-ts.ts
+function toPascalCase(name) {
+  const words = String(name || "").split(/[^a-zA-Z0-9]+/).filter(Boolean);
+  if (!words.length) return "Model";
+  let result = words.map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+  if (/^[0-9]/.test(result)) result = "_" + result;
+  return result;
+}
+function buildServiceClassName(serviceId, tag) {
+  const servicePascal = toPascalCase(serviceId || "");
+  const serviceCore = servicePascal.endsWith("Service") ? servicePascal.slice(0, -"Service".length) : servicePascal;
+  const core = tag === servicePascal || tag === serviceCore ? serviceCore : tag;
+  return `${core}Service`;
+}
+
+// src/services/doc-normalizer.ts
+function toCamelCaseIdentifier(name) {
+  if (typeof name !== "string" || !/[^a-zA-Z0-9]/.test(name)) return name;
+  const words = name.split(/[^a-zA-Z0-9]+/).filter(Boolean);
+  if (!words.length) return name;
+  let result = words.map((w, i) => i === 0 ? w : w.charAt(0).toUpperCase() + w.slice(1)).join("");
+  if (/^[0-9]/.test(result)) result = "_" + result;
+  return result;
+}
+function deriveMethodName(rawOperationId, prefixCandidates) {
+  if (!rawOperationId) return "";
+  for (const prefix of prefixCandidates) {
+    if (!prefix) continue;
+    const doubled = `${prefix}_${prefix}_`;
+    if (rawOperationId.startsWith(doubled)) {
+      return toCamelCaseIdentifier(rawOperationId.slice(prefix.length + 1));
+    }
+  }
+  let operationId = rawOperationId;
+  let strippedSomething = true;
+  while (strippedSomething) {
+    strippedSomething = false;
+    for (const prefix of prefixCandidates) {
+      if (prefix && operationId.startsWith(`${prefix}_`)) {
+        operationId = operationId.slice(prefix.length + 1);
+        strippedSomething = true;
+        break;
+      }
+    }
+  }
+  return toCamelCaseIdentifier(operationId);
+}
+
 // src/variables/variable.transformer.ts
 var import_lodash2 = __toESM(require_lodash());
 function bindingValueIsStatic(value) {
@@ -39774,6 +39854,28 @@ function isStaticParamsVariable(variable2) {
   }
   return filterExpressionsAreStatic(variable2.filterExpressions);
 }
+function simpleSingularize(plural) {
+  const lower = plural.toLowerCase();
+  if (lower.endsWith("ies")) return plural.substring(0, plural.length - 3) + "y";
+  if (lower.endsWith("es")) return plural.substring(0, plural.length - 2);
+  if (lower.endsWith("s")) return plural.substring(0, plural.length - 1);
+  return plural;
+}
+function simplePluralize(singular) {
+  if (!singular) return singular;
+  const last = singular[singular.length - 1].toLowerCase();
+  const prev = singular.length > 1 ? singular[singular.length - 2].toLowerCase() : null;
+  const vowels = "aeiouy";
+  if (last === "x" || last === "s") {
+    return singular + "es";
+  } else if (last === "y") {
+    return prev !== null && vowels.includes(prev) ? singular + "s" : singular.slice(0, -1) + "ies";
+  } else if (last === "h") {
+    return prev !== null && (prev === "c" || prev === "s") ? singular + "es" : singular + "s";
+  } else {
+    return singular + "s";
+  }
+}
 function parseStaticJsonValue(value) {
   const trimmedValue = value.trim();
   if (!trimmedValue.startsWith("{") && !trimmedValue.startsWith("[")) {
@@ -40183,9 +40285,166 @@ function transformModelVariable(variable2, scope) {
   tv.isList = !!variable2.isList;
   return tv;
 }
-function transformServiceVariable(variable2, scope) {
+var capitalizeFirstLetter = (str) => {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+};
+var getServiceInstanceName = (className) => className.charAt(0).toLowerCase() + className.slice(1);
+function getServiceLocalName(serviceId, className) {
+  const instanceName = getServiceInstanceName(className);
+  if (!serviceId) {
+    return instanceName;
+  }
+  const prefix = toPascalCase(serviceId);
+  const core = prefix.endsWith("Service") ? prefix.slice(0, -"Service".length) : prefix;
+  if (className.startsWith(core)) {
+    return instanceName;
+  }
+  return getServiceInstanceName(`${core}${className}`);
+}
+function getServiceClassName(prefix) {
+  if (!prefix || typeof prefix !== "string") return "Service";
+  const base = prefix.replace(/[\s/\\\-_]+/g, "").trim();
+  if (!base) return "Service";
+  let basePascal = capitalizeFirstLetter(base);
+  if (basePascal.endsWith("Controller")) {
+    basePascal = basePascal.slice(0, -"Controller".length);
+  }
+  if (!basePascal) return "Service";
+  return basePascal.endsWith("Service") ? basePascal : basePascal + "Service";
+}
+function toCamelCaseIdentifier2(name) {
+  if (typeof name !== "string" || !/[^a-zA-Z0-9]/.test(name)) return name;
+  const words = name.split(/[^a-zA-Z0-9]+/).filter(Boolean);
+  if (!words.length) return name;
+  let result = words.map((word, i) => i === 0 ? word : word.charAt(0).toUpperCase() + word.slice(1)).join("");
+  if (/^[0-9]/.test(result)) result = "_" + result;
+  return result;
+}
+function resolveServiceTag(serviceId, controller, serviceType) {
+  const isLumpedOpenApiService = serviceType === "OpenAPIService" && (!controller || controller.toLowerCase() === "default");
+  const base = isLumpedOpenApiService ? serviceId.endsWith("Service") ? serviceId.slice(0, -"Service".length) : serviceId : controller || serviceId;
+  return base ? toPascalCase(base) : base;
+}
+function formatServiceDetails(variable2) {
+  if (variable2.operationId) {
+    const serviceName = variable2.service;
+    let prefix;
+    let invokeFnName;
+    if (serviceName) {
+      prefix = serviceName;
+      const controllerRaw = variable2.controller ? `${variable2.controller}Controller` : void 0;
+      const prefixCandidates = [serviceName, variable2.controller, controllerRaw].filter(
+        Boolean
+      );
+      invokeFnName = deriveMethodName(variable2.operationId, prefixCandidates);
+    } else {
+      const sepIdx = variable2.operationId.indexOf("_");
+      prefix = sepIdx >= 0 ? variable2.operationId.substring(0, sepIdx) : variable2.operationId;
+      invokeFnName = sepIdx >= 0 ? variable2.operationId.substring(sepIdx + 1) : variable2.operationId;
+    }
+    invokeFnName = toCamelCaseIdentifier2(invokeFnName);
+    const formattedServiceName = variable2.service ? buildServiceClassName(
+      variable2.service,
+      resolveServiceTag(variable2.service, variable2.controller, variable2.serviceType)
+    ) : getServiceClassName(prefix);
+    return {
+      formattedServiceName,
+      invokeFnName
+    };
+  }
+  if (variable2.type && variable2.operation) {
+    const entity = variable2.type;
+    const singular = simpleSingularize(entity);
+    const plural = simplePluralize(singular);
+    const operationMap = {
+      read: `filter${plural}`,
+      insert: `create${singular}`,
+      update: `edit${singular}`,
+      delete: `delete${singular}`
+    };
+    const invokeFnName = operationMap[variable2.operation];
+    if (!invokeFnName) return null;
+    const formattedServiceName = variable2.liveSource ? buildServiceClassName(variable2.liveSource, capitalizeFirstLetter(entity)) : capitalizeFirstLetter(entity + "Service");
+    return {
+      formattedServiceName,
+      invokeFnName
+    };
+  }
+  return null;
+}
+function isServiceAvailable(className, validServiceClassNames) {
+  return !validServiceClassNames || !className || validServiceClassNames.has(className);
+}
+function callArgExpression(arg, isLiveVariable, isBodyTypeQueryOrProcedure = false) {
+  if (isBodyTypeQueryOrProcedure && arg.source.kind === "body") {
+    return "params";
+  }
+  if (arg.source.kind === "pageable") {
+    const props = arg.source.paramNames.map((wireName) => {
+      const prop = wireName === "sort" ? "sort" : wireName === "size" ? "pageSize" : "pageNumber";
+      return `${prop}: params?.[${JSON.stringify(wireName)}]`;
+    }).join(", ");
+    return `{ ${props} }`;
+  }
+  return `params?.[${JSON.stringify(liveVariableParamKey(arg, isLiveVariable))}]`;
+}
+function applyServiceCallShape(tv, lookupKey, methodArgsByOperation, servicePathByOperation, isLiveVariable = false, isBodyTypeQueryOrProcedure = false) {
+  var _a;
+  const importPath = servicePathByOperation == null ? void 0 : servicePathByOperation.get(lookupKey);
+  if (importPath) {
+    tv.serviceImportPath = importPath;
+    const resolvedClassName = importPath.split("/").pop();
+    if (resolvedClassName && resolvedClassName !== tv.serviceFileClass) {
+      tv.serviceFile = resolvedClassName;
+      tv.serviceFileClass = resolvedClassName;
+      tv.serviceExportName = getServiceInstanceName(resolvedClassName);
+      tv.serviceInstanceName = getServiceLocalName((_a = tv.service) != null ? _a : tv.liveSource, resolvedClassName);
+    }
+  }
+  const args = methodArgsByOperation == null ? void 0 : methodArgsByOperation.get(lookupKey);
+  if (!args) {
+    return;
+  }
+  tv.hasResolvedCallArgs = true;
+  tv.callArgs = args.map((arg) => callArgExpression(arg, isLiveVariable, isBodyTypeQueryOrProcedure));
+}
+function liveVariableParamKey(arg, isLiveVariable) {
+  const swaggerName = arg.source.paramName;
+  if (!isLiveVariable) {
+    return swaggerName;
+  }
+  switch (arg.source.kind) {
+    case "query":
+      return swaggerName === "q" ? "data" : swaggerName;
+    case "body":
+    case "formData":
+      return "data";
+    case "path":
+      return "id";
+    default:
+      return swaggerName;
+  }
+}
+function transformServiceVariable(variable2, scope, validServiceClassNames, methodArgsByOperation, methodNameByOperation, servicePathByOperation) {
+  var _a;
+  const serviceDetails = formatServiceDetails(variable2);
+  let skipInvokeHttp = false;
+  if (!isServiceAvailable(serviceDetails == null ? void 0 : serviceDetails.formattedServiceName, validServiceClassNames)) {
+    console.warn(
+      `ServiceVariable "${variable2.name}" references service "${variable2.service}" (${serviceDetails == null ? void 0 : serviceDetails.formattedServiceName}), which was not generated. Emitting the variable without an invokeHttp \u2014 the runtime falls back to its own transport.`
+    );
+    skipInvokeHttp = true;
+  }
+  const operationKey = `${variable2.service}::${variable2.operationId}`;
+  if (servicePathByOperation && !servicePathByOperation.has(operationKey)) {
+    console.warn(
+      `ServiceVariable "${variable2.name}" references operation "${variable2.operationId}" on service "${variable2.service}", which has no such operation. Emitting the variable without an invokeHttp \u2014 the runtime falls back to its own transport.`
+    );
+    skipInvokeHttp = true;
+  }
   const tv = transformVariable(variable2, scope);
   tv.classname = "ServiceVariable";
+  tv.hasInvokeHttp = !skipInvokeHttp;
   tv.operationId = variable2.operationId;
   tv.isList = !!variable2.isList;
   tv.inFlightBehavior = variable2.inFlightBehavior;
@@ -40199,6 +40458,21 @@ function transformServiceVariable(variable2, scope) {
   tv.autoUpdate = variable2.autoUpdate;
   tv.orderBy = variable2.orderBy;
   tv.isStaticParams = isStaticParamsVariable(variable2);
+  tv.serviceFile = serviceDetails == null ? void 0 : serviceDetails.formattedServiceName;
+  tv.serviceFileClass = serviceDetails == null ? void 0 : serviceDetails.formattedServiceName;
+  tv.serviceExportName = serviceDetails && getServiceInstanceName(serviceDetails.formattedServiceName);
+  tv.serviceInstanceName = serviceDetails && getServiceLocalName(variable2.service, serviceDetails.formattedServiceName);
+  const lookupKey = `${variable2.service}::${variable2.operationId}`;
+  tv.invokeFnName = (_a = methodNameByOperation == null ? void 0 : methodNameByOperation.get(lookupKey)) != null ? _a : serviceDetails == null ? void 0 : serviceDetails.invokeFnName;
+  const isBodyTypeQueryOrProcedure = ["QueryExecution", "ProcedureExecution"].includes(variable2.controller) && ["put", "post"].includes(variable2.operationType);
+  applyServiceCallShape(
+    tv,
+    lookupKey,
+    methodArgsByOperation,
+    servicePathByOperation,
+    false,
+    isBodyTypeQueryOrProcedure
+  );
   return tv;
 }
 function transformNavigationAction(variable2, scope) {
@@ -40228,9 +40502,11 @@ function transformNotificationAction(variable2, scope, imports102) {
   tv.classname = "NotificationAction";
   tv.group = "action";
   tv.operation = variable2.operation;
-  const partialContent = Array.isArray(variable2.dataBinding) ? variable2.dataBinding.filter((binding) => {
-    return binding.target === "page";
-  })[0] : null;
+  const bindings = Array.isArray(variable2.dataBinding) ? variable2.dataBinding : [];
+  const getBinding = (target) => bindings.find((b) => b.target === target);
+  const contentBinding = getBinding("content");
+  const rendersPartial = contentBinding ? contentBinding.value === "page" : variable2.operation !== "toast";
+  const partialContent = rendersPartial ? getBinding("page") : null;
   if (variable2.onOk || variable2.onClick) {
     tv.onOk = appendIfNotEmpty(bind_ex_transformer_default(variable2.onOk || variable2.onClick, scope, "event"));
   }
@@ -40286,9 +40562,61 @@ function transformLogoutVariable(variable2, scope) {
   tv.redirectTo = variable2.redirectTo;
   return tv;
 }
-function transformLiveVariable(variable2, scope) {
+function findOperationKeyByMethodName(serviceName, methodName, methodNameByOperation) {
+  if (!serviceName || !methodName || !methodNameByOperation) {
+    return void 0;
+  }
+  const prefix = `${serviceName}::`;
+  for (const [key, name] of methodNameByOperation) {
+    if (name === methodName && key.startsWith(prefix)) {
+      return key;
+    }
+  }
+  return void 0;
+}
+function findLiveOperationKeyByVerb(liveSource, entity, verbTokens, methodNameByOperation) {
+  if (!liveSource || !entity || !methodNameByOperation) {
+    return void 0;
+  }
+  const tagPrefix = `${liveSource}::${entity}Controller_`;
+  let best;
+  for (const key of methodNameByOperation.keys()) {
+    if (!key.startsWith(tagPrefix)) continue;
+    const verbAndName = key.slice(tagPrefix.length);
+    if (!verbTokens.some((verb) => verbAndName.startsWith(verb))) continue;
+    if (!best || key.length < best.length) {
+      best = key;
+    }
+  }
+  return best;
+}
+var LIVE_OPERATION_VERBS = {
+  readTableData: ["find"],
+  searchTableDataWithQuery: ["filter"],
+  searchTableData: ["search"],
+  insertTableData: ["create"],
+  updateTableData: ["edit"],
+  deleteTableData: ["delete"]
+};
+var LIVE_DEFAULT_ACTION_BY_OPERATION = {
+  read: "searchTableDataWithQuery",
+  insert: "insertTableData",
+  update: "updateTableData",
+  delete: "deleteTableData"
+};
+function transformLiveVariable(variable2, scope, validServiceClassNames, methodArgsByOperation, methodNameByOperation, servicePathByOperation) {
+  var _a, _b;
+  const serviceDetails = formatServiceDetails(variable2);
+  let skipInvokeHttp = false;
+  if (serviceDetails && !isServiceAvailable(serviceDetails.formattedServiceName, validServiceClassNames)) {
+    console.warn(
+      `LiveVariable "${variable2.name}" targets entity "${variable2.type}" (${serviceDetails.formattedServiceName}), which was not generated. Emitting the variable without an invokeHttp \u2014 the runtime falls back to its own transport.`
+    );
+    skipInvokeHttp = true;
+  }
   const tv = transformVariable(variable2, scope);
   tv.classname = "LiveVariable";
+  tv.hasInvokeHttp = !skipInvokeHttp;
   tv.isList = !!variable2.isList;
   tv.inFlightBehavior = variable2.inFlightBehavior;
   tv.maxResults = variable2.maxResults;
@@ -40305,9 +40633,117 @@ function transformLiveVariable(variable2, scope) {
   tv.filterExpressions = variable2.filterExpressions;
   tv._id = variable2._id;
   tv.isStaticParams = isStaticParamsVariable(variable2);
+  if (serviceDetails) {
+    tv.serviceFile = serviceDetails.formattedServiceName;
+    tv.serviceFileClass = serviceDetails.formattedServiceName;
+    tv.serviceExportName = getServiceInstanceName(serviceDetails.formattedServiceName);
+    tv.serviceInstanceName = getServiceLocalName(
+      variable2.liveSource,
+      serviceDetails.formattedServiceName
+    );
+    tv.invokeFnName = serviceDetails.invokeFnName;
+    let lookupKey = findOperationKeyByMethodName(
+      variable2.liveSource,
+      serviceDetails.invokeFnName,
+      methodNameByOperation
+    );
+    if (!lookupKey) {
+      lookupKey = findLiveOperationKeyByVerb(
+        variable2.liveSource,
+        variable2.type,
+        (_a = LIVE_OPERATION_VERBS[LIVE_DEFAULT_ACTION_BY_OPERATION[variable2.operation]]) != null ? _a : [],
+        methodNameByOperation
+      );
+    }
+    if (lookupKey) {
+      tv.invokeFnName = (_b = methodNameByOperation == null ? void 0 : methodNameByOperation.get(lookupKey)) != null ? _b : tv.invokeFnName;
+      applyServiceCallShape(
+        tv,
+        lookupKey,
+        methodArgsByOperation,
+        servicePathByOperation,
+        true
+        // LiveVariable — its params object is keyed by the runtime's own DB-operation names
+      );
+    }
+    tv.liveTargets = buildLiveTargets(
+      variable2,
+      methodArgsByOperation,
+      methodNameByOperation,
+      servicePathByOperation
+    );
+  }
   return tv;
 }
-function transformCrudVariable(variable2, scope) {
+function buildLiveTargets(variable2, methodArgsByOperation, methodNameByOperation, servicePathByOperation) {
+  var _a, _b, _c;
+  const entity = variable2.type;
+  if (!entity) {
+    return void 0;
+  }
+  const singular = simpleSingularize(entity);
+  const plural = simplePluralize(singular);
+  const byAction = [
+    // readTableData's template is `GET /<entity>?page=&size=&:sort` — the collection GET, which
+    // the generator names find<Plural>. filter<Plural> is the POST /filter twin and belongs only
+    // to the query-bearing actions.
+    ["readTableData", `find${plural}`],
+    ["searchTableDataWithQuery", `filter${plural}`],
+    ["searchTableData", `search${plural}ByQueryFilters`],
+    ["insertTableData", `create${singular}`],
+    ["updateTableData", `edit${singular}`],
+    ["deleteTableData", `delete${singular}`]
+  ];
+  const targets = [];
+  for (const [action, guessedMethodName] of byAction) {
+    let lookupKey = findOperationKeyByMethodName(
+      variable2.liveSource,
+      guessedMethodName,
+      methodNameByOperation
+    );
+    if (!lookupKey) {
+      lookupKey = findLiveOperationKeyByVerb(
+        variable2.liveSource,
+        entity,
+        (_a = LIVE_OPERATION_VERBS[action]) != null ? _a : [],
+        methodNameByOperation
+      );
+    }
+    if (!lookupKey || servicePathByOperation && !servicePathByOperation.has(lookupKey)) {
+      continue;
+    }
+    const methodName = (_b = methodNameByOperation == null ? void 0 : methodNameByOperation.get(lookupKey)) != null ? _b : guessedMethodName;
+    const shape = {};
+    applyServiceCallShape(shape, lookupKey, methodArgsByOperation, servicePathByOperation, true);
+    targets.push({
+      action,
+      invokeFnName: methodName,
+      callArgs: (_c = shape.callArgs) != null ? _c : [],
+      hasResolvedCallArgs: !!shape.hasResolvedCallArgs
+    });
+  }
+  return targets.length ? targets : void 0;
+}
+function buildCrudTargets(variable2, crudOperationsById) {
+  const group = crudOperationsById == null ? void 0 : crudOperationsById.get(variable2.crudOperationId);
+  if (!group) {
+    return void 0;
+  }
+  const targets = Object.entries(group).map(([operationType, target]) => {
+    const className = target.importPath.split("/").pop();
+    return {
+      operationType,
+      importPath: target.importPath,
+      serviceExportName: getServiceInstanceName(className),
+      serviceInstanceName: getServiceLocalName(variable2.service, className),
+      invokeFnName: target.methodName,
+      // A CrudVariable is never a LiveVariable, so params are keyed by the swagger names.
+      callArgs: target.args.map((arg) => callArgExpression(arg, false))
+    };
+  });
+  return targets.length ? targets : void 0;
+}
+function transformCrudVariable(variable2, scope, crudOperationsById) {
   const tv = transformVariable(variable2, scope);
   tv._id = variable2._id;
   tv.name = variable2.name;
@@ -40332,15 +40768,23 @@ function transformCrudVariable(variable2, scope) {
   tv.dataBinding = variable2._transformedDataBinding || variable2.dataBinding;
   tv.classname = "CrudVariable";
   tv.group = "variable";
+  tv.crudTargets = buildCrudTargets(variable2, crudOperationsById);
   tv.isStaticParams = isStaticParamsVariable(variable2);
   return tv;
 }
-var variable_transformer_default = (variable2, scope, appUrl, imports102) => {
+var variable_transformer_default = (variable2, scope, appUrl, imports102, validServiceClassNames, methodArgsByOperation, methodNameByOperation, servicePathByOperation, crudOperationsById) => {
   switch (variable2.category) {
     case "wm.Variable":
       return transformModelVariable(variable2, scope);
     case "wm.ServiceVariable":
-      return transformServiceVariable(variable2, scope);
+      return transformServiceVariable(
+        variable2,
+        scope,
+        validServiceClassNames,
+        methodArgsByOperation,
+        methodNameByOperation,
+        servicePathByOperation
+      );
     case "wm.NavigationAction":
       return transformNavigationAction(variable2, scope);
     case "wm.TimerAction":
@@ -40354,9 +40798,16 @@ var variable_transformer_default = (variable2, scope, appUrl, imports102) => {
     case "wm.LogoutAction":
       return transformLogoutVariable(variable2, scope);
     case "wm.LiveVariable":
-      return transformLiveVariable(variable2, scope);
+      return transformLiveVariable(
+        variable2,
+        scope,
+        validServiceClassNames,
+        methodArgsByOperation,
+        methodNameByOperation,
+        servicePathByOperation
+      );
     case "wm.CrudVariable":
-      return transformCrudVariable(variable2, scope);
+      return transformCrudVariable(variable2, scope, crudOperationsById);
   }
   return null;
 };
@@ -40583,9 +41034,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 +41056,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 +41078,7 @@ var transformRepeatChildAttr = (element, replace2, replaceWith) => {
   });
   element.childNodes.forEach((c) => {
     if (isHTMLElement(c)) {
-      transformRepeatChildAttr(c, replace2, replaceWith);
+      transformRepeatChildAttr(c, replace2, replaceWith, skipAttrNames);
     }
   });
 };
@@ -42245,6 +42702,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 +42851,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 +42866,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 +42934,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 +42963,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 +42977,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 +43000,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 +43013,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 +43156,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 +43303,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 +43565,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 +43606,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 +43840,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 +43870,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 +43878,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 +43955,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 +43976,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 +43992,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 +44586,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 +44890,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 +44925,7 @@ var list_transformer_default = {
             `Variables.${variableName}.dataSet`
           ];
           dataPatterns.forEach((pattern) => {
-            transformRepeatChildAttr(template, pattern, "$item");
+            transformRepeatChildAttr(template, pattern, "$item", ["dataset", "datasource"]);
           });
         }
       }
@@ -44391,6 +44946,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;
@@ -45221,9 +45777,14 @@ var dialog_transformer_default = {
   pre: (element, context) => {
     element.getAttribute("name");
     const hasExplicitBody = element.childNodes.some(
-      (e) => isHTMLElement(e) && ["wm-dialogcontent", "wm-dialogbody"].includes(e.tagName.toLowerCase())
+      (e) => isHTMLElement(e) && ["wm-dialogcontent", "wm-dialogbody"].includes(e.tagName.toLowerCase()) && e.childNodes.some(isHTMLElement)
     );
     if (!hasExplicitBody) {
+      const markerIndex = element.childNodes.findIndex(
+        (e) => isHTMLElement(e) && ["wm-dialogcontent", "wm-dialogbody"].includes(e.tagName.toLowerCase())
+      );
+      const marker = markerIndex >= 0 ? element.childNodes[markerIndex] : null;
+      const remainingChildren = markerIndex >= 0 ? element.childNodes.filter((_, i) => i !== markerIndex) : element.childNodes;
       const content = new HTMLElement(
         "wm-dialogbody",
         {},
@@ -45232,10 +45793,13 @@ var dialog_transformer_default = {
         [0, 41]
       );
       content.nodeType = NodeType.ELEMENT_NODE;
-      const actionsIndex = element.childNodes.findIndex(
+      if (marker) {
+        content.setAttributes(marker.attributes);
+      }
+      const actionsIndex = remainingChildren.findIndex(
         (e) => isHTMLElement(e) && e.tagName.toLowerCase() === "wm-dialogactions"
       );
-      content.childNodes = element.childNodes;
+      content.childNodes = remainingChildren;
       element.childNodes = [content];
       if (actionsIndex >= 0) {
         const actions = content.childNodes.splice(actionsIndex, 1);
@@ -45265,10 +45829,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 +45849,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;
@@ -45354,15 +45916,21 @@ var tabs_transformer_default = {
           `fragment.Widgets.${widgetName}.currentItem`,
           "currentItem"
         );
+        transformRepeatChildAttr(repeatTemplate, "fragment.item", "$item");
+        transformRepeatChildAttr(repeatTemplate, "fragment.index", "$index");
         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];
@@ -45459,6 +46027,8 @@ var prefab_container_transformer_default = {
 __toESM(require_lodash());
 var DefaultProfile = {
   generateWeb: false,
+  generateWmxComponents: true,
+  groupPagesByLayout: true,
   copyResources: true,
   lazyloadPages: true,
   lazyloadPartials: true,
@@ -45776,7 +46346,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 +46356,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 +47582,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`);
         }
       }