npm - @wavemaker/react-codegen - Versions diffs - 11.14.3-rc.6401 → 11.15.0-rc.6403 - Mend

@wavemaker/react-codegen 11.14.3-rc.6401 → 11.15.0-rc.6403

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (102) hide show

package/src/transpile/components/container/repeat-template.transformer.js CHANGED Viewed

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.imports = void 0;
-exports.imports = [];
-exports.default = {
-    pre: (element, context) => {
-        return ``;
+const transpile_1 = require("../../transpile");
+exports.imports = [
+    {
+        name: "WmRepeatTemplate",
+        from: "@wavemaker/react-runtime/components/container/repeat-template",
     },
-    post: (element, context) => "",
+];
+exports.default = {
+    pre: (element, context) => `<WmRepeatTemplate ${(0, transpile_1.transformAttrs)(element, context)}>`,
+    post: (element, context) => "</WmRepeatTemplate>",
     imports: (element, context) => exports.imports,
 };
 //# sourceMappingURL=repeat-template.transformer.js.map

package/src/transpile/components/container/repeat-template.transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"repeat-template.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/container/repeat-template.transformer.ts"],"names":[],"mappings":";;;~~AAIa~~,QAAA,OAAO,GAAa,EAAE,CAAC;~~AAEpC~~,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE~~;QAC3D~~,OAAO,EAAE,CAAC~~;IACZ~~,~~CAAC~~;~~IACD~~,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,~~EAAE~~;~~IACjE~~,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;CAC3D,CAAC"}
1	+ {"version":3,"file":"repeat-template.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/container/repeat-template.transformer.ts"],"names":[],"mappings":";;;AAEA,+CAA4F;AAE/E,QAAA,OAAO,GAAa;IAC/B;QACE,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,+DAA+D;KACtE;CACF,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAC3D,qBAAqB,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,GAAG;IAC1D,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,qBAAqB;IACpF,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;CAC3D,CAAC"}

package/src/transpile/components/container/tabpane.transformer.js CHANGED Viewed

@@ -9,13 +9,28 @@ const partial_container_transformer_1 = __importDefault(require("../page/partial
 exports.imports = [
     { name: "WmTabPane", from: "@wavemaker/react-runtime/components/container/tabs/tab-pane" },
 ];
+function isInsideDynamicTabs(element) {
+    var _a, _b, _c, _d;
+    let current = element.parentNode;
+    while (current) {
+        const tagName = ((_b = (_a = current.rawTagName) === null || _a === void 0 ? void 0 : _a.toLowerCase) === null || _b === void 0 ? void 0 : _b.call(_a)) ||
+            ((_d = (_c = current.tagName) === null || _c === void 0 ? void 0 : _c.toLowerCase) === null || _d === void 0 ? void 0 : _d.call(_c));
+        if (tagName === "wm-tabs") {
+            return current.getAttribute("type") === "dynamic";
+        }
+        current = current.parentNode;
+    }
+    return false;
+}
 exports.default = {
     pre: (element, context) => {
         let partial = partial_container_transformer_1.default.pre(element, context) || "";
         if (partial) {
             partial = `renderPartial={(props:Record<string, any>, onLoad:()=>void) => (${partial})}`;
         }
-        return `<WmTabPane ${(0, transpile_1.transformAttrs)(element, context)} ${partial}>`;
+        const isDynamicTabs = isInsideDynamicTabs(element);
+        const itemProp = isDynamicTabs ? " item={$item}" : "";
+        return `<WmTabPane listener={fragment} ${(0, transpile_1.transformAttrs)(element, context)}${itemProp} ${partial}>`;
     },
     post: (element, context) => "</WmTabPane>",
     imports: (element, context) => exports.imports.concat(partial_container_transformer_1.default.imports(element, context)),

package/src/transpile/components/container/tabpane.transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tabpane.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/container/tabpane.transformer.ts"],"names":[],"mappings":";;;;;;AAEA,+CAA4F;AAC5F,0GAAgF;AAEnE,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,6DAA6D,EAAE;CAC3F,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,IAAI,OAAO,GAAG,uCAA2B,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACtE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,mEAAmE,OAAO,IAAI,CAAC;QAC3F,CAAC;QACD,OAAO,~~cAAc~~,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC;~~IACtE~~,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,cAAc;IAC7E,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAC/D,eAAO,CAAC,MAAM,CAAC,uCAA2B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACzD,CAAC"}
1	+ {"version":3,"file":"tabpane.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/container/tabpane.transformer.ts"],"names":[],"mappings":";;;;;;AAEA,+CAA4F;AAC5F,0GAAgF;AAEnE,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,6DAA6D,EAAE;CAC3F,CAAC;AAEF,SAAS,mBAAmB,CAAC,OAAoB;;IAC/C,IAAI,OAAO,GAAuB,OAAO,CAAC,UAAgC,CAAC;IAC3E,OAAO,OAAO,EAAE,CAAC;QACf,MAAM,OAAO,GACX,CAAA,MAAA,MAAC,OAAuB,CAAC,UAAU,0CAAE,WAAW,kDAAI;aACpD,MAAA,MAAC,OAAuB,CAAC,OAAO,0CAAE,WAAW,kDAAI,CAAA,CAAC;QACpD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAQ,OAAuB,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;QACrE,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,UAAgC,CAAC;IACrD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,IAAI,OAAO,GAAG,uCAA2B,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACtE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,mEAAmE,OAAO,IAAI,CAAC;QAC3F,CAAC;QACD,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,kCAAkC,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,GAAG,QAAQ,IAAI,OAAO,GAAG,CAAC;IACrG,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,cAAc;IAC7E,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAC/D,eAAO,CAAC,MAAM,CAAC,uCAA2B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACzD,CAAC"}

package/src/transpile/components/container/tabs.transformer.js CHANGED Viewed

@@ -62,9 +62,16 @@ exports.default = {
             const repeatTemplate = (0, node_html_parser_1.default)(`<wm-list-content name="${widgetName + "Item"}"></wm-list-content>`).firstChild;
             // Store all children before removing them
             const children = [...element.childNodes];
+            const firstElementChild = children.find((c) => c instanceof node_html_parser_1.HTMLElement);
+            const firstChildIsRepeatTemplate = (firstElementChild === null || firstElementChild === void 0 ? void 0 : firstElementChild.rawTagName) === "wm-repeat-template";
+            context.set("tabsFirstChildIsRepeatTemplate", firstChildIsRepeatTemplate);
             if (repeatTemplate) {
                 // Move all children to the repeat template
                 repeatTemplate.childNodes = children;
+                // Ensure each wm-tabpane inside dynamic tabs receives index={$index}
+                (0, utils_1.findElement)(repeatTemplate, "WM-TABPANE", (e) => {
+                    e.setAttribute("index", "bind:$index");
+                });
                 (0, utils_1.transformRepeatChildAttr)(repeatTemplate, `fragment.Widgets.${widgetName}.currentItemWidgets`, "currentItemWidgets");
                 (0, utils_1.transformRepeatChildData)(repeatTemplate, `fragment.Widgets.${widgetName}.currentItem`, "currentItem");
                 (0, utils_1.transformRepeatChildData)(repeatTemplate, dataSet.substring(5) + "[0]", "list_item");
@@ -72,14 +79,16 @@ exports.default = {
                 // Get the children content after transformation
                 repeatTemplate.childNodes = element.childNodes;
                 element.childNodes = [repeatTemplate];
-                return `<WmTabs listener={fragment} ${(0, transpile_1.transformAttrs)(element, context, transformAttr)} render={($item:Record<string, any> ,$index:number, data:Record<string, any>[]) => (<> `;
+                const renderWrapper = firstChildIsRepeatTemplate ? "" : "<> ";
+                return `<WmTabs listener={fragment} ${(0, transpile_1.transformAttrs)(element, context, transformAttr)} render={($item:Record<string, any>, $index:number, data:Record<string, any>[]) => (${renderWrapper}`;
             }
         }
         return `<WmTabs listener={fragment} ${(0, transpile_1.transformAttrs)(element, context)}>`;
     },
     post: (element, context) => {
         if (element.getAttribute("type") === "dynamic") {
-            return " </>)}/>";
+            const useRepeatTemplate = context.get("tabsFirstChildIsRepeatTemplate");
+            return useRepeatTemplate ? ")}/>" : " </>)}/>";
         }
         return "</WmTabs>";
     },

package/src/transpile/components/container/tabs.transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tabs.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/container/tabs.transformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAsD;AAEtD,+CAMyB;AACzB,~~oCAA8E~~;~~AAEjE~~,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,oDAAoD,EAAE;CAC/E,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE;IACpD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,gCAAgC;QAChC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC7B,IAAI,CAAC,YAAY,8BAAW,IAAI,CAAC,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC;gBAC9D,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;QAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;QAE1D,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACtD,MAAM,cAAc,GAAG,IAAA,0BAAK,EAC1B,0BAA0B,UAAU,GAAG,MAAM,sBAAsB,CACpE,CAAC,UAAyB,CAAC;YAE5B,0CAA0C;YAC1C,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;~~YAEzC~~,IAAI,cAAc,EAAE,CAAC;gBACnB,2CAA2C;gBAC3C,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC;gBAErC,IAAA,gCAAwB,EACtB,cAA6B,EAC7B,oBAAoB,UAAU,qBAAqB,EACnD,oBAAoB,CACrB,CAAC;gBACF,IAAA,gCAAwB,EACtB,cAA6B,EAC7B,oBAAoB,UAAU,cAAc,EAC5C,aAAa,CACd,CAAC;gBACF,IAAA,gCAAwB,EACtB,cAA6B,EAC7B,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,EAC5B,WAAW,CACZ,CAAC;gBACF,IAAA,gCAAwB,EACtB,cAA6B,EAC7B,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,EAC7B,WAAW,CACZ,CAAC;gBAEF,gDAAgD;gBAChD,cAAc,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;gBAC/C,OAAO,CAAC,UAAU,GAAG,CAAC,cAAc,CAAC,CAAC;gBAEtC,OAAO,+BAA+B,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,~~yFAAyF~~,CAAC;~~YACjL~~,CAAC;QACH,CAAC;QAED,OAAO,+BAA+B,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAC5E,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC5D,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/C,OAAO,UAAU,CAAC;~~QACpB~~,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;IACzE,eAAe,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QACvE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACjD,CAAC;QACD,MAAM,eAAe,GAAG,IAAA,2BAAe,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;QACnB,OAAO,eAAe,CAAC;IACzB,CAAC;CACa,CAAC"}
1	+ {"version":3,"file":"tabs.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/container/tabs.transformer.ts"],"names":[],"mappings":"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"}

package/src/transpile/components/data/card/card-content.transformer.js CHANGED Viewed

@@ -11,7 +11,11 @@ exports.imports = [
 ];
 exports.default = {
     pre: (element, context) => {
-        return `<WmCardContent ${(0, transpile_1.transformAttrs)(element, context)} >`;
+        let partial = partial_container_transformer_1.default.pre(element, context) || "";
+        if (partial) {
+            partial = `renderPartial={(props:Record<string, any>, onLoad:()=>void) => (${partial})}`;
+        }
+        return `<WmCardContent ${(0, transpile_1.transformAttrs)(element, context)} ${partial}>`;
     },
     post: (element, context) => "</WmCardContent>",
     imports: (element, context) => exports.imports.concat(partial_container_transformer_1.default.imports(element, context)),

package/src/transpile/components/data/card/card-content.transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"card-content.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/card/card-content.transformer.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA+F;AAC/F,6GAAmF;AAEtE,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,4DAA4D,EAAE;CAC9F,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,OAAO,kBAAkB,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;~~IAChE~~,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,kBAAkB;IACjF,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAC/D,eAAO,CAAC,MAAM,CAAC,uCAA2B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACzD,CAAC"}
1	+ {"version":3,"file":"card-content.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/card/card-content.transformer.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA+F;AAC/F,6GAAmF;AAEtE,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,4DAA4D,EAAE;CAC9F,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,IAAI,OAAO,GAAG,uCAA2B,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACtE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,mEAAmE,OAAO,IAAI,CAAC;QAC3F,CAAC;QACD,OAAO,kBAAkB,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC;IAC1E,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,kBAAkB;IACjF,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAC/D,eAAO,CAAC,MAAM,CAAC,uCAA2B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACzD,CAAC"}

package/src/transpile/components/data/form/form-action.transformer.js CHANGED Viewed

@@ -8,11 +8,33 @@ exports.imports = [
         from: "@wavemaker/react-runtime/components/data/form/form-action",
     },
 ];
-const getFormActionExpr = (action) => {
-    return `($event) => {
-        ${action}
+const getFormActionExpr = (action, isAsync = false) => {
+    const asyncKeyword = isAsync ? "async " : "";
+    const awaitKeyword = isAsync ? "await " : "";
+    // For async submit actions, add await before the submit call
+    const processedAction = isAsync && action.includes("?.submit();")
+        ? action.replace(/(\S+\?\.submit\(\);)/g, `${awaitKeyword}$1`)
+        : action;
+    return `${asyncKeyword}($event) => {
+        ${processedAction}
     }`;
 };
+/**
+ * Generates widget accessor with proper syntax for dynamic (bound) vs static form names.
+ * @param prefix - Base path like "fragment?.Widgets" or "list.itemWidgets[$index]"
+ * @param formName - The form name (may contain $item for dynamic)
+ * @param suffix - Method call like ".formreset()" or ".submit()"
+ * @param isDynamic - Whether formName is a dynamic expression
+ */
+const getWidgetAccessor = (prefix, formName, suffix, isDynamic) => {
+    if (isDynamic) {
+        // Use bracket notation with optional chaining for dynamic access
+        // Convert $item.taskId to $item?.taskId for safe access
+        const safeFormName = formName.replace(/\./g, "?.");
+        return `${prefix}?.[${safeFormName}]${suffix}`;
+    }
+    return `${prefix}.${formName}${suffix}`;
+};
 exports.default = {
     pre: (element, context) => {
         var _a;
@@ -26,21 +48,33 @@ exports.default = {
         element.removeAttribute("update-mode");
         const widgetType = element.getAttribute("widget-type") || "button";
         element.removeAttribute("widget-type");
-        const formName = element.getAttribute("formKey") || element.attrs["key"] || element.attrs["name"];
+        let formName = element.getAttribute("formKey") || element.attrs["key"] || element.attrs["name"];
+        let isDynamicFormName = false;
+        if (formName.startsWith("bind:")) {
+            formName = formName.replace("bind:", "");
+            isDynamicFormName = true;
+        }
         const actionType = element.getAttribute("type");
         const name = element.getAttribute("name");
         let action = element.getAttribute("action");
         let btnClass = "btn-default";
+        // Define prefixes for list vs non-list context
+        const listPrefix = "list.itemWidgets[$index]";
+        const fragmentPrefix = "fragment?.Widgets";
+        const widgetsPrefix = "Widgets";
         if (actionType === "submit") {
             btnClass = "btn-primary";
             action = listName
-                ? (action = `list.itemWidgets[$index].${formName}.submit();` + (action || ""))
-                : `Widgets.${formName}.submit();` + (action || "");
+                ? getWidgetAccessor(listPrefix, formName, "?.submit();", isDynamicFormName) + (action || "")
+                : getWidgetAccessor(widgetsPrefix, formName, "?.submit();", isDynamicFormName) +
+                    (action || "");
         }
         if (actionType === "reset") {
             action = listName
-                ? `list.itemWidgets[$index].${formName}.formreset()` + (action || "")
-                : `Widgets.${formName}.formreset();` + (action || "");
+                ? getWidgetAccessor(listPrefix, formName, "?.formreset()", isDynamicFormName) +
+                    (action || "")
+                : getWidgetAccessor(widgetsPrefix, formName, "?.formreset();", isDynamicFormName) +
+                    (action || "");
         }
         if (action) {
             action = action.endsWith(";") ? action.substring(0, action.length - 1) : action;
@@ -49,23 +83,38 @@ exports.default = {
                 .map(s => {
                 if (s === "reset()") {
                     return listName
-                        ? `list.itemWidgets[$index].${formName}.formreset()`
-                        : `fragment.Widgets.${formName}.formreset()`;
+                        ? getWidgetAccessor(listPrefix, formName, "?.formreset()", isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?.formreset()", isDynamicFormName);
                 }
                 else if (s === "edit()" || s === "new()" || s === "cancel()" || s === "delete()") {
                     return listName
-                        ? `list.itemWidgets[$index].${formName}.` + s
-                        : `fragment.Widgets.${formName}.` + s;
+                        ? getWidgetAccessor(listPrefix, formName, "?." + s, isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?." + s, isDynamicFormName);
                 }
                 else if (s === "filter()") {
                     return listName
-                        ? `list.itemWidgets[$index].${formName}.filter()`
-                        : `fragment.Widgets.${formName}.filter()`;
+                        ? getWidgetAccessor(listPrefix, formName, "?.filter()", isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?.filter()", isDynamicFormName);
                 }
                 else if (s === "clearFilter()") {
                     return listName
-                        ? `list.itemWidgets[$index].${formName}.clearFilter()`
-                        : `fragment.Widgets.${formName}.clearFilter()`;
+                        ? getWidgetAccessor(listPrefix, formName, "?.clearFilter()", isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?.clearFilter()", isDynamicFormName);
+                }
+                else if (s === "saveAndNew()") {
+                    return listName
+                        ? getWidgetAccessor(listPrefix, formName, "?.saveAndNew()", isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?.saveAndNew()", isDynamicFormName);
+                }
+                else if (s === "saveAndView()") {
+                    return listName
+                        ? getWidgetAccessor(listPrefix, formName, "?.saveAndView()", isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?.saveAndView()", isDynamicFormName);
+                }
+                else if (s === "highlightInvalidFields()") {
+                    return listName
+                        ? getWidgetAccessor(listPrefix, formName, "?.highlightInvalidFields()", isDynamicFormName)
+                        : getWidgetAccessor(fragmentPrefix, formName, "?.highlightInvalidFields()", isDynamicFormName);
                 }
                 else {
                     return listName ? s : "fragment." + s;
@@ -78,8 +127,14 @@ exports.default = {
         element.removeAttribute("action");
         element.removeAttribute("type");
         element.setAttribute("name", name || key || formName);
-        return `<WmFormAction formRef={fragment?.Widgets?.${formName}?.ref}  ${(0, transpile_1.transformAttrs)(element, context)}
-            ${action && actionType ? `onClick={${getFormActionExpr(action)}} widgettype="${widgetType}"` : ""} `;
+        // Generate formRef with proper accessor syntax
+        const formRefExpr = isDynamicFormName
+            ? `fragment?.Widgets?.[${formName.replace(/\./g, "?.")}]?.ref`
+            : `fragment?.Widgets?.${formName}?.ref`;
+        // Use async/await for submit actions
+        const isAsyncAction = actionType === "submit";
+        return `<WmFormAction formRef={${formRefExpr}}  ${(0, transpile_1.transformAttrs)(element, context)}
+            ${action && actionType ? `onClick={${getFormActionExpr(action, isAsyncAction)}} widgettype="${widgetType}"` : ""} `;
     },
     post: (element, context) => "/>",
     imports: (element, context) => exports.imports,

package/src/transpile/components/data/form/form-action.transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-action.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/form/form-action.transformer.ts"],"names":[],"mappings":";;;AAEA,kDAA+F;AAElF,QAAA,OAAO,GAAa;IAC/B;QACE,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,2DAA2D;KAClE;CACF,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE;~~IAC3C~~,OAAO;~~UACC~~,MAAM;~~MACV~~,CAAC;AACP,CAAC,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;;QAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACxC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,mCAAI,MAAM,CAAC;QAC1D,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC/C,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;QACnE,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QAEvC,~~MAAM~~,QAAQ,~~GACZ~~,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;~~QACnF~~,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,QAAQ,GAAG,aAAa,CAAC;~~QAC7B~~,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,QAAQ,GAAG,aAAa,CAAC;YACzB,MAAM,GAAG,QAAQ;gBACf,CAAC,CAAC,CAAC,~~MAAM~~,~~GAAG~~,~~4BAA4B,~~QAAQ,~~YAAY~~,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC~~;gBAC9E~~,CAAC,CAAC,~~WAAW~~,QAAQ,~~YAAY~~,~~GAAG~~,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;~~QACvD~~,CAAC;QACD,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,GAAG,QAAQ;gBACf,CAAC,CAAC,~~4BAA4B~~,QAAQ,~~cAAc~~,~~GAAG~~,CAAC,MAAM,IAAI,EAAE,CAAC;~~gBACrE~~,CAAC,CAAC,~~WAAW~~,QAAQ,~~eAAe~~,~~GAAG~~,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;~~QAC1D~~,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAChF,MAAM,GAAG,MAAM;iBACZ,KAAK,CAAC,GAAG,CAAC;iBACV,GAAG,CAAC,CAAC,CAAC,EAAE;gBACP,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;oBACpB,OAAO,QAAQ;wBACb,CAAC,CAAC,~~4BAA4B~~,QAAQ,~~cAAc~~;~~wBACpD~~,CAAC,CAAC,~~oBAAoB~~,~~QAAQ~~,cAAc,CAAC;~~gBACjD~~,CAAC;qBAAM,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;oBACnF,OAAO,QAAQ;wBACb,CAAC,CAAC,~~4BAA4B~~,QAAQ,~~GAAG~~,GAAG,CAAC;~~wBAC7C~~,CAAC,CAAC,~~oBAAoB~~,QAAQ,~~GAAG~~,GAAG,CAAC,CAAC;~~gBAC1C~~,CAAC;qBAAM,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,OAAO,QAAQ;wBACb,CAAC,CAAC,~~4BAA4B~~,QAAQ,~~WAAW~~;~~wBACjD~~,CAAC,CAAC,~~oBAAoB~~,QAAQ,~~WAAW~~,CAAC;~~gBAC9C~~,CAAC;qBAAM,IAAI,CAAC,KAAK,eAAe,EAAE,CAAC;oBACjC,OAAO,QAAQ;wBACb,CAAC,CAAC,~~4BAA4B~~,QAAQ,gBAAgB;~~wBACtD~~,CAAC,CAAC,~~oBAAoB~~,QAAQ,gBAAgB,CAAC;~~gBACnD~~,CAAC;qBAAM,CAAC;oBACN,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QAED,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC3C,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,IAAI,GAAG,IAAI,QAAQ,CAAC,CAAC;~~QACtD~~,OAAO,~~6CAA6C~~,QAAQ,WAAW,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC;~~cAC7F~~,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,YAAY,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;~~IAC/G~~,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,IAAI;IACnE,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;CAC3D,CAAC"}
1	+ {"version":3,"file":"form-action.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/form/form-action.transformer.ts"],"names":[],"mappings":"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"}

package/src/transpile/components/data/form/form-field.transformer.js CHANGED Viewed

@@ -94,7 +94,9 @@ const getDisplayExpression = (displayExpr) => {
     //if the expression is "Label ' location' sample" then it should be as it is. but failing
     //that is why if there is bind display expression should be with single quote else double quote
     if (displayExpr.includes("bind:")) {
-        return `displayexpression='${displayExpr}'`;
+        // Replace single quotes with &apos; to prevent breaking the attribute
+        const escapedExpr = displayExpr.replace(/'/g, "&apos;");
+        return `displayexpression='${escapedExpr}'`;
     }
     return `displayexpression="${displayExpr}"`;
 };
@@ -184,6 +186,7 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
               ></wm-select>`;
             break;
         case "autocomplete":
+            const datasource = (0, utils_1.getDatasourceExpr)(element);
             tmpl = `<wm-search ${commonFields} ${displayExp}
                 type="autocomplete"
                 limit="bind:$formField.limit"
@@ -193,6 +196,7 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                 dataset="bind:$formField.dataset"
                 displayfield="bind:$formField.displaylabel"
                 datafield="bind:$formField.datafield"
+                ${datasource ? `datasource="${datasource}"` : ""}
                 ></wm-search>`;
             break;
         case "chips":
@@ -227,6 +231,10 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                 uncheckedvalue="bind:$formField.uncheckedvalue || false">
               </wm-checkbox>`;
             break;
+        case "richtext":
+            tmpl = `<wm-richtexteditor ${commonFields} disabled="bind:$formField.disabled || false" readonly="bind:$formField.readonly || false" ${displayExp}
+              ></wm-richtexteditor>`;
+            break;
         case "switch":
             tmpl = `<wm-switch ${commonFields} ${displayExp}
                 dataset="bind:$formField.dataset || 'yes, no, maybe'"
@@ -297,12 +305,16 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
         case "fileupload":
         case "file":
         case "upload":
-            const onSelect = getAttribute(element, "on-select");
-            const onDelete = getAttribute(element, "on-delete");
-            tmpl = `<wm-fileupload ${commonFields}
-                ${onSelect ? 'on-select="onSelect"' : ""}
-                ${onDelete ? 'on-delete="onDelete"' : ""}
-      ></wm-fileupload>`;
+            tmpl = `<wm-upload  ${commonFields}
+                type="${element.getAttribute("type") || "file"}"
+                updateon="bind:$formField.updateon || 'blur'"
+              ></wm-upload>`;
+            break;
+        case "colorpicker":
+            tmpl = `<wm-colorpicker ${commonFields}
+                updateon="bind:$formField.updateon || 'blur'"
+                ${floatinglabel}>
+              </wm-colorpicker>`;
             break;
     }
     return tmpl;
@@ -323,11 +335,26 @@ exports.default = {
         let formName, formScope, control;
         if ((currentNode === null || currentNode === void 0 ? void 0 : currentNode.getAttribute("type")) === "dynamic") {
             formName = currentNode.getAttribute("dynamicForm");
-            formScope = `formScope={() => fragment.Widgets.${formName}}`;
+            formScope = `formScope={() => fragment?.Widgets?.${formName}}`;
         }
         else {
             formName = currentNode === null || currentNode === void 0 ? void 0 : currentNode.getAttribute("name");
         }
+        // Strip formdata prefix from name and key attributes if parent form has formdataprefix
+        const formdataPrefix = currentNode === null || currentNode === void 0 ? void 0 : currentNode.getAttribute("formdataprefix");
+        if (formdataPrefix) {
+            const currentName = element.getAttribute("name");
+            // Name uses dot notation: Formdata.booleancol
+            if (currentName && currentName.startsWith(formdataPrefix + ".")) {
+                const strippedName = currentName.substring(formdataPrefix.length + 1);
+                element.setAttribute("name", strippedName);
+            }
+            const currentKey = element.getAttribute("key");
+            if (currentKey && currentKey.startsWith(formdataPrefix + ".")) {
+                const strippedKey = currentKey.substring(formdataPrefix.length + 1);
+                element.setAttribute("key", strippedKey);
+            }
+        }
         // @ts-ignore
         // element.setAttribute("formRef", formName);
         if (element.attrs["primary-key"]) {
@@ -371,16 +398,21 @@ exports.default = {
             element.childNodes.push(formField.label);
         }
         element.childNodes.push(formField.field);
+        // Remove displayexpression/displaylabel from form field - they're already on the child widget
+        element.removeAttribute("displayexpression");
+        element.removeAttribute("displaylabel");
         element.removeAttribute("datavalue");
         element.removeAttribute("height");
         // element.setAttribute("on-validate", validate);
         const childDatasetNode = currentNode === null || currentNode === void 0 ? void 0 : currentNode.getAttribute("childdatasetnode");
+        let formKey = "";
         if (childDatasetNode) {
-            element.setAttribute("formKey", childDatasetNode + "." + element.attrs["name"]);
+            formKey = childDatasetNode + "." + element.attrs["name"];
         }
         else {
-            element.setAttribute("formKey", element.attrs["key"] || element.attrs["name"]);
+            formKey = element.attrs["key"] || element.attrs["name"];
         }
+        element.setAttribute("formKey", formKey);
         // Set searchkey to the value of key attribute before removing it
         const keyAttribute = element.getAttribute("key");
         if (keyAttribute) {
@@ -396,7 +428,10 @@ exports.default = {
         }
         const fieldcolumn = element.getAttribute("field");
         element.removeAttribute("field");
-        return `<WmFormField ${formScope || ""} field="true" ${fieldcolumn ? `fieldcol="${fieldcolumn}"` : ""} formName="${formName}"  ${(0, utils_1.extractDatasetInfo)(element)}  ${(0, transpile_1.transformAttrs)(element, context)} renderFormFields={($formField) => (<>`;
+        if (formName) {
+            element.setAttribute("formName", formName);
+        }
+        return `<WmFormField ${formScope || ""} field="true" ${fieldcolumn ? `fieldcol="${fieldcolumn}"` : ""}  role="form-field"  ${(0, utils_1.extractDatasetInfo)(element)}  ${(0, transpile_1.transformAttrs)(element, context)} renderFormFields={($formField) => (<>`;
     },
     post: (element, context) => "    </>)}></WmFormField>",
     imports: (element, context) => exports.imports,

package/src/transpile/components/data/form/form-field.transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-field.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/form/form-field.transformer.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"form-field.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/form/form-field.transformer.ts"],"names":[],"mappings":"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"}

package/src/transpile/components/data/form/form.transformer.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.imports = void 0;
 const lodash_1 = require("lodash");
 const node_html_parser_1 = require("node-html-parser");
 const transpile_1 = require("../../../transpile");
+const utils_1 = require("../../utils");
 exports.imports = [
     { name: "WmForm", from: "@wavemaker/react-runtime/components/data/form" },
 ];
@@ -11,15 +12,7 @@ const getDataSetExpr = (element, bindExpr) => {
     return element.getAttribute("isLogin") ? "" : `${bindExpr}[widget.props.name] = newVal;`;
 };
 const getOnChangeExpr = (element) => {
-    var _a;
-    const formDataSet = ((_a = element.getAttribute("dataset")) === null || _a === void 0 ? void 0 : _a.split(":")) || [];
-    let bindExpr = (formDataSet === null || formDataSet === void 0 ? void 0 : formDataSet.length) > 1 ? formDataSet[1] : null;
-    if (!bindExpr || (bindExpr === null || bindExpr === void 0 ? void 0 : bindExpr.includes("Widgets"))) {
-        return "";
-    }
     let currentNode = element.parentNode, exp;
-    const variableArr = bindExpr.match(/(fragment)+\.Variables\.[^\.]+/g);
-    const variableName = variableArr && variableArr.length ? variableArr[0] : null;
     while (currentNode) {
         if (currentNode.rawTagName === "wm-form") {
             element.setAttribute("parentForm", currentNode.getAttribute("name") || "");
@@ -27,15 +20,16 @@ const getOnChangeExpr = (element) => {
             element.setAttribute("childdatasetnode", element.getAttribute("name") || "");
             break;
         }
+        else if (currentNode.rawTagName === "wm-prefab" ||
+            currentNode.rawTagName === "wm-prefab-container") {
+            // Check if the prefab has a parentForm attribute and propagate it
+            const prefabParentForm = currentNode.getAttribute("parentForm");
+            if (prefabParentForm) {
+                element.setAttribute("parentForm", prefabParentForm);
+            }
+        }
         currentNode = currentNode.parentNode;
     }
-    return `
-      ($event, widget, newVal, oldVal) => {
-        if(${variableName}?.twoWayBinding && newVal !== oldVal) {
-          ${bindExpr !== null ? getDataSetExpr(element, bindExpr) : ""}
-        }
-      }
-    `;
 };
 const getFormSubmitExpr = (element) => {
     const dataset = element.getAttribute("dataset");
@@ -103,7 +97,47 @@ const setFormActions = (element, context) => {
 };
 exports.default = {
     pre: (element, context) => {
-        const onChange = getOnChangeExpr(element);
+        // Check if form is inside a list and set parent list attributes
+        const parentListName = (0, utils_1.getParentNode)(element, "wm-list");
+        getOnChangeExpr(element);
+        if (parentListName) {
+            element.setAttribute("parentListName", parentListName);
+            element.setAttribute("isParentList", "true");
+        }
+        const datasourceAttr = element.getAttribute("datasource");
+        const datasetAttr = element.getAttribute("dataset");
+        if (!datasourceAttr &&
+            datasetAttr &&
+            datasetAttr.startsWith("bind:fragment.Variables.") &&
+            datasetAttr.endsWith(".dataSet")) {
+            const match = datasetAttr.match(/^bind:fragment\.Variables\.([^.]+)\.dataSet$/);
+            if (match) {
+                const variableName = match[1];
+                element.setAttribute("datasource", `{fragment?.Variables?.${variableName}}`);
+            }
+        }
+        // Process formdata attribute - extract single-key object wrapper
+        // Only apply this transformation if the key is exactly "Formdata"
+        let formdataAttr = element.getAttribute("formdata");
+        let formdataPrefix = "";
+        if (formdataAttr) {
+            // Handle both "bind:{ 'Formdata': ... }" and "{ 'Formdata': ... }" formats
+            let valueToMatch = formdataAttr;
+            const hasBindPrefix = formdataAttr.startsWith("bind:");
+            if (hasBindPrefix) {
+                valueToMatch = formdataAttr.substring(5); // Remove "bind:" prefix
+            }
+            // Check if formdata is an object with single key like { 'Formdata': ... }
+            const objectMatch = valueToMatch.match(/^\{\s*['"]([^'"]+)['"]\s*:\s*(.+)\s*\}$/);
+            if (objectMatch && objectMatch[1] === "Formdata") {
+                formdataPrefix = objectMatch[1]; // Extract the key ("Formdata")
+                const extractedValue = objectMatch[2].trim(); // Extract the value
+                // Set formdata to the extracted value (with bind: prefix if it was there)
+                element.setAttribute("formdata", hasBindPrefix ? "bind:" + extractedValue : extractedValue);
+                // Store the prefix so child form fields can strip it from formKey
+                element.setAttribute("formdataprefix", formdataPrefix);
+            }
+        }
         const beforeSubmit = element.getAttribute("on-beforesubmit") || element.getAttribute("on-BeforeSubmit");
         let returnBeforeSubmit = "";
         if (beforeSubmit) {
@@ -120,9 +154,11 @@ exports.default = {
         }
         const formSubmit = getFormSubmitExpr(element);
         setFormActions(element, context);
-        return `<WmForm listener={fragment} ${(0, transpile_1.transformAttrs)(element, context)}
+        return `<WmForm listener={fragment} ${(0, transpile_1.transformAttrs)(element, context)}
       ${formSubmit ? `formSubmit={${formSubmit}}` : ""}
       ${returnBeforeSubmit ? `onBeforeSubmit={${returnBeforeSubmit}}` : ""}
+      ${datasourceAttr ? `datasource={${datasourceAttr}}` : ""}
+      ${parentListName ? `formArrayIndex={$index}` : ""}
     >`;
     },
     post: (element, context) => `</WmForm>`,