@wavemaker/react-codegen 11.14.2-rc.6311 → 12.0.0-next.28533

package/src/transpile/components/data/list/list-transformer.js

@@ -54,30 +54,49 @@ const addTemplateClass = (element) => {
         });
     }
 };
+const stripBalancedParens = (expr) => {
+    // Recursively strip outer balanced parentheses from expression
+    let result = expr.trim();
+    while (result.startsWith("(") && result.endsWith(")")) {
+        // Check if the outer parens are actually balanced (matching pair)
+        let depth = 0;
+        let isBalanced = true;
+        for (let i = 0; i < result.length - 1; i++) {
+            if (result[i] === "(")
+                depth++;
+            else if (result[i] === ")")
+                depth--;
+            // If depth goes to 0 before the last char, outer parens aren't a matching pair
+            if (depth === 0) {
+                isBalanced = false;
+                break;
+            }
+        }
+        if (isBalanced) {
+            result = result.substring(1, result.length - 1);
+        }
+        else {
+            break;
+        }
+    }
+    return result;
+};
 const transformAttr = (name, value) => {
     if (name === "itemclass") {
         let v = value.replace(/fragment\.item/g, "item").replace(/fragment\.index/g, "index");
         //making a callback function if the itemclass is iterable expression
         const m = v.match(/^\{([\s\S]+)\}$/);
         if (m) {
-            const inner = m[1];
-            const dsIdx = inner.indexOf(".dataSet");
-            if (dsIdx >= 0) {
-                let rest = inner.substring(dsIdx + ".dataSet".length);
-                // Remove optional chaining with [0]
-                rest = rest.replace(/^\?\.\[\s*0\s*\]\??/, "");
-                // removing extra prarentheses at the end if any
-                const openParens = (rest.match(/\(/g) || []).length;
-                const closeParens = (rest.match(/\)/g) || []).length;
-                if (closeParens > openParens) {
-                    let excess = closeParens - openParens;
-                    while (excess > 0 && /\)\s*$/.test(rest)) {
-                        rest = rest.replace(/\)\s*$/, "");
-                        excess--;
-                    }
-                }
-                if (rest) {
-                    return `{(item:any)=>item${rest}}`;
+            let inner = m[1];
+            // Match pattern: (optional parens)fragment.Variables.XXX.dataSet[0] or ?.[0]?
+            const dataPathRegex = /(?:fragment\?.)?Variables\?.[^.]+\.dataSet(?:\?\.\[\s*0\s*\]\??|\[\s*0\s*\])/g;
+            if (dataPathRegex.test(inner)) {
+                // Replace the data path with "item"
+                let transformed = inner.replace(/(?:fragment\?.)?Variables\?.[^.]+\.dataSet(?:\?\.\[\s*0\s*\]\??|\[\s*0\s*\])/g, "item");
+                // Strip balanced outer parentheses
+                transformed = stripBalancedParens(transformed);
+                if (transformed) {
+                    return `{(item:any)=>${transformed}}`;
                 }
             }
         }
@@ -88,6 +107,7 @@ const transformAttr = (name, value) => {
 exports.default = {
     pre: (element, context) => {
         var _a, _b, _c, _d, _e;
+        context.set("isInsideList", true);
         const widgetName = element.attrs["name"];
         const listContent = (0, node_html_parser_1.default)(`<wm-list-content name="${widgetName + "Item"}"></wm-list-content>`)
             .firstChild;
@@ -114,12 +134,20 @@ exports.default = {
             if (formName) {
                 (0, utils_1.transformRepeatChildAttr)(template, `fragment.Widgets.${formName}.formWidgets.${widgetName}.currentItem`, "$item");
             }
-            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[0]", "list_item");
-            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[$i]", "list_item");
-            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[fragment.$i]", "list_item");
-            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[fragment.$i]", "list_item");
+            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[0]", "list_item", true, widgetName);
+            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[$i]", "list_item", true, widgetName);
+            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[fragment.$i]", "list_item", true, widgetName);
+            (0, utils_1.transformRepeatChildData)(template, dataSet.substring(5) + "[fragment.$i]", "list_item", true, widgetName);
             (0, utils_1.transformRepeatChildAttr)(template, "fragment.item", "$item");
             (0, utils_1.transformRepeatChildAttr)(template, "fragment.index", "$index");
+            (0, utils_1.transformRepeatChildAttr)(template, dataSet.substring(5), "$item");
+            // Transform itemRef patterns to use variables directly available in scope
+            (0, utils_1.transformRepeatChildAttr)(template, "itemRef.$index", "index");
+            (0, utils_1.transformRepeatChildAttr)(template, "itemRef.$first", "first");
+            (0, utils_1.transformRepeatChildAttr)(template, "itemRef.$last", "last");
+            // Transform list child widgets to add data-internal-widget and update names
+            // Commented out to avoid issue in QuickMobile project
+            //transformListChildWidgets(template as HTMLElement);
             const isLoading = (_a = dataSet
                 .match(/(fragment)+\.Variables\.[^\.]+/g)) === null || _a === void 0 ? void 0 : _a.map(v => v + ".isExecuting").join(" || ");
             if (isLoading) {
@@ -163,15 +191,6 @@ exports.default = {
             const variableArr = dataSet.match(/(fragment)+\.Variables\.[^\.]+/g);
             if (variableArr && variableArr.length === 1) {
                 const variable = variableArr[0];
-                onEndReached = ` getNextPageData={($event, $list, page) => {
-          return new Promise((resolve, reject) => {
-            return ${variable}.invoke && ${variable}.invoke({
-              page: page
-            }, (response) => {
-              resolve(${dataSet.substring(5).replace(variable + ".dataSet", "response")});
-            }, reject);
-          });
-        }} `;
             }
         }
         addTemplateClass(element);
@@ -181,12 +200,24 @@ exports.default = {
     ${disableitem || ""}
     ${itemKey || ""}
     ${onEndReached}
-     renderItem={($item:Record<string, any>, $index:number, list:Record<string, any>[] ,currentItemWidgets :any) => {
+     renderItem={($item:Record<string, any>, $index:number, list:Record<string, any>[] ,getCurrentItemWidgets :any) => {
+     const currentItemWidgetsRef = React.useRef({})   
+     const currentItemWidgets = getCurrentItemWidgets($index);
+     currentItemWidgetsRef.current = currentItemWidgets;
+       const $first = $index === 0;
+       const $last = list && $index === list.length - 1;
        return (<>`;
         context.listener = "listener";
         context.set("old_props", context.props);
         context.data.listname = widgetName;
-        context.props = ["listener", "item", "index", "currentItemWidgets", "list"];
+        context.props = [
+            "listener",
+            "item",
+            "index",
+            "currentItemWidgets",
+            "currentItemWidgetsRef",
+            "list",
+        ];
         context.data.listCount = (context.data.listCount || 0) + 1;
         return markup;
     },

package/src/transpile/components/data/list/list-transformer.js.map

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

package/src/transpile/components/data/live-filter-field.transformer.js

@@ -4,6 +4,7 @@ exports.imports = void 0;
 const node_html_parser_1 = require("node-html-parser");
 const transpile_1 = require("../../transpile");
 const util_1 = require("./form/util");
+const utils_1 = require("../utils");
 exports.imports = [
     {
         name: "WmLiveFilterField",
@@ -35,13 +36,24 @@ const getStyleProps = (element) => {
 const extractField = (element, context, filterElement) => {
     const widgetType = getAttribute(element, "widget") || "text";
     const widgetName = getAttribute(element, "key") || getAttribute(element, "name") || "text" + "_filterWidget";
-    return getFilterWidgetTemplate(widgetType, widgetName, element, getAttribute(filterElement, "filterdata"));
+    const isRange = element.getAttribute("is-range") === "true";
+    const result = getFilterWidgetTemplate(widgetType, widgetName, element, getAttribute(filterElement, "filterdata"), false);
+    // For number widget with is-range=true, create a second max widget
+    if (widgetType === "number" && isRange) {
+        const maxField = getFilterWidgetTemplate(widgetType, widgetName, element, getAttribute(filterElement, "filterdata"), true);
+        return {
+            ...result,
+            maxField: maxField.field,
+        };
+    }
+    return result;
 };
-const getFilterWidgetTemplate = (widgetType, widgetName, element, filterDataVariable) => {
+const getFilterWidgetTemplate = (widgetType, widgetName, element, filterDataVariable, isMaxWidget = false) => {
     var _a, _b;
     widgetName = widgetName.replace(".", "_");
     const inputName = (_b = (_a = getAttribute(element, "key")) === null || _a === void 0 ? void 0 : _a.split(".")) === null || _b === void 0 ? void 0 : _b.at(-1);
-    var labelMarkup = getAttribute(element, "displayname")
+    // Only show label for first widget (not max widget)
+    var labelMarkup = !isMaxWidget && getAttribute(element, "displayname")
         ? `<wm-label 
     required="bind:$formField.required"
     htmlFor="${inputName}"
@@ -67,13 +79,20 @@ const getFilterWidgetTemplate = (widgetType, widgetName, element, filterDataVari
         element.removeAttribute("placeholder");
     }
     const filterfieldName = getAttribute(element, "name");
-    var commonFields = `name="${filterfieldName}_formWidget"
+    // For max widget, add "_maxWidget" suffix to name and use maxvalue
+    const widgetNameSuffix = isMaxWidget ? "_maxWidget" : "";
+    const datavalueBinding = isMaxWidget
+        ? "bind:$formField.maxDataValue || $formField.maxdefaultvalue"
+        : "bind:$formField.datavalue || $formField.defaultvalue";
+    const isMaxWidgetProp = isMaxWidget ? "isMaxWidget={true}" : "";
+    var commonFields = `name="${filterfieldName}_formWidget${widgetNameSuffix}"
                       formfield="true"
-                      datavalue="bind:$formField.datavalue || $formField.defaultvalue"
+                      datavalue="${datavalueBinding}"
                       conditionalclass="bind:$formField.widgetCls"
                       ${placeholder ? 'placeholder="' + placeholder + '"' : ""}
                       ${onFocus ? "on-focus=" + onFocus : ""}
-                      ${onBlur ? "on-blur=" + onBlur : ""} `;
+                      ${onBlur ? "on-blur=" + onBlur : ""}
+                      ${isMaxWidgetProp} `;
     var widgetMarkup = getWidgetMarkup(widgetType, widgetName, commonFields, element);
     let currentNode = element.parentNode;
     while (currentNode) {
@@ -91,7 +110,10 @@ const getFilterWidgetTemplate = (widgetType, widgetName, element, filterDataVari
 const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
     let tmpl = "";
     const getDisplayExpr = element.getAttribute("displayexpression") || element.getAttribute("displaylabel");
-    const displayExp = getDisplayExpr ? `displayexpression='${getDisplayExpr}'` : "";
+    // Replace single quotes with &apos; to prevent breaking the attribute
+    const displayExp = getDisplayExpr
+        ? `displayexpression='${getDisplayExpr.replace(/'/g, "&apos;")}'`
+        : "";
     const filterFieldTags = ["text", "password", "number", "currency", "textarea"];
     let currentNode = element.parentNode;
     while (currentNode) {
@@ -175,6 +197,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"
@@ -184,6 +207,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":
@@ -287,7 +311,6 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
             break;
         case "fileupload":
         case "file":
-        case "upload":
             const onSelect = getAttribute(element, "on-select");
             const onDelete = getAttribute(element, "on-delete");
             tmpl = `<wm-fileupload ${commonFields} 
@@ -295,6 +318,24 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                 ${onDelete ? 'on-delete="onDelete"' : ""}
       ></wm-fileupload>`;
             break;
+        case "upload":
+            const onSelectUpload = getAttribute(element, "on-select");
+            const onDeleteUpload = getAttribute(element, "on-delete");
+            tmpl = `<wm-upload ${commonFields} 
+                ${onSelectUpload ? 'on-select="onSelect"' : ""}
+                ${onDeleteUpload ? 'on-delete="onDelete"' : ""}
+      ></wm-upload>`;
+            break;
+        case "richtext":
+            tmpl = `<wm-richtexteditor ${commonFields} ${displayExp}
+              ></wm-richtexteditor>`;
+            break;
+        case "colorpicker":
+            tmpl = `<wm-colorpicker ${commonFields}
+                updateon="bind:$formField.updateon || 'blur'"
+                ${floatinglabel}>
+              </wm-colorpicker>`;
+            break;
     }
     return tmpl;
 };
@@ -335,8 +376,18 @@ exports.default = {
             element.childNodes.push(formField.label);
         }
         element.childNodes.push(formField.field);
+        // For number widget with is-range=true, add the max widget
+        if (formField.maxField) {
+            element.childNodes.push(formField.maxField);
+        }
         element.removeAttribute("datavalue");
         element.removeAttribute("height");
+        // Convert is-range to isRange
+        const isRangeValue = element.getAttribute("is-range");
+        if (isRangeValue) {
+            element.setAttribute("isRange", isRangeValue);
+            element.removeAttribute("is-range");
+        }
         const childDatasetNode = currentNode.getAttribute("childdatasetnode");
         if (childDatasetNode) {
             element.setAttribute("formKey", childDatasetNode + "." + element.attrs["name"]);
@@ -346,7 +397,7 @@ exports.default = {
         }
         element.removeAttribute("key");
         const widgetType = getAttribute(element, "widget") || util_1.FormWidgetType.TEXT;
-        if (element.getAttribute("is-range") === "true") {
+        if (isRangeValue === "true") {
             (0, util_1.setDefaultPlaceholder)(element, widgetType, 0);
             (0, util_1.setDefaultPlaceholder)(element, widgetType, 1);
         }
@@ -355,7 +406,11 @@ exports.default = {
         }
         const fieldcolumn = element.getAttribute("field");
         element.removeAttribute("field");
-        return `<WmLiveFilterField  ${filterScope || ""} formName="${filterName}" field="true" ${fieldcolumn ? `fieldcol="${fieldcolumn}"` : ""}    ${(0, transpile_1.transformAttrs)(element, context)} renderFormFields={($formField) => (<>`;
+        if (filterName) {
+            element.setAttribute("filterName", filterName);
+            element.setAttribute("formName", filterName);
+        }
+        return `<WmLiveFilterField  ${filterScope || ""} field="true" ${fieldcolumn ? `fieldcol="${fieldcolumn}"` : ""}    ${(0, transpile_1.transformAttrs)(element, context)} renderFormFields={($formField) => (<>`;
     },
     post: (element, context) => "</>)}></WmLiveFilterField>",
     imports: (element, context) => exports.imports,

package/src/transpile/components/data/live-filter-field.transformer.js.map

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

package/src/transpile/components/data/liveform.transformer.js

@@ -27,6 +27,14 @@ 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 `
@@ -129,15 +137,14 @@ exports.default = {
         const formSuccess = getFormSuccessExpr(element);
         const datasetAttr = element.getAttribute("dataset");
         const datasourceAttr = element.getAttribute("datasource");
-        if (datasetAttr &&
+        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];
-                if (!datasourceAttr) {
-                    element.setAttribute("datasource", `{fragment?.Variables?.${variableName}}`);
-                }
+                element.setAttribute("datasource", `{fragment?.Variables?.${variableName}}`);
             }
         }
         setFormActions(element, context);

package/src/transpile/components/data/liveform.transformer.js.map

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

package/src/transpile/components/data/table/table-action.transformer.js

@@ -16,8 +16,12 @@ exports.default = {
             const tableName = (0, utils_1.findNearestElement)(element, "wm-table");
             onClickExpr = (0, utils_1.convertActionToClickHandler)(actionAttr, tableName, liveTableName);
         }
-        ["display-name", "action"].forEach(attr => element.removeAttribute(attr));
-        return `<WmTableAction listener={fragment} ${displayName ? `displayName="${displayName}"` : ""} ${onClickExpr} ${(0, transpile_1.transformAttrs)(element, context)}`;
+        element.removeAttribute("display-name");
+        if (displayName) {
+            element.setAttribute("displayName", displayName);
+        }
+        element.removeAttribute("action");
+        return `<WmTableAction listener={fragment} ${onClickExpr} ${(0, transpile_1.transformAttrs)(element, context)}`;
     },
     post: (element, context) => "/>",
     imports: (element, context) => exports.imports,

package/src/transpile/components/data/table/table-action.transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-action.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/table/table-action.transformer.ts"],"names":[],"mappings":";;;AACA,kDAA+F;AAC/F,mCAA0E;AAE7D,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,6DAA6D,EAAE;CAC/F,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,aAAa,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAClE,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC1D,WAAW,GAAG,IAAA,mCAA2B,EAAC,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAClF,CAAC;QAED,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1E,OAAO,sCAAsC,WAAW,CAAC,CAAC,CAAC,gBAAgB,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,WAAW,IAAI,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;IACtJ,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"}
+{"version":3,"file":"table-action.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/table/table-action.transformer.ts"],"names":[],"mappings":";;;AACA,kDAA+F;AAC/F,mCAA0E;AAE7D,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,6DAA6D,EAAE;CAC/F,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,aAAa,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAClE,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC1D,WAAW,GAAG,IAAA,mCAA2B,EAAC,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAClF,CAAC;QAED,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACxC,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAElC,OAAO,sCAAsC,WAAW,IAAI,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;IACjG,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"}