@wavemaker-ai/react-runtime 1.0.0-rc.309 → 1.0.0-rc.647469

package/types/index.d.ts

@@ -10,7 +10,6 @@ export interface PageContextState {
     Variables: Record<string, VariableState>;
     Actions: Record<string, any>;
     onReady: () => void;
-    pageReady: () => void;
     serviceDefinitions: Record<string, any>;
     baseUrl: string;
     [key: string]: any;

package/utils/attr.js

@@ -6,87 +6,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.removeInvalidAttributes = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var INTERNAL_ATTRIBUTES = new Set(["clearSearch", "conditionalclass", "conditionalstyle", "dataset", "destroy", "eventCallback", "formfield", "forwardedRef", "inbound", "iswidget", "listener", "onHeaderclick", "onHeaderClick", "onLoad", "onDestroy", "onNavHeightChange", "onRender", "outbound", "prefab", "ref", "showindevice", "styles", "viewParent"]);
-var SAFE_ATTRIBUTES = new Set(["accessKey", "autoCapitalize", "autoComplete", "autoCorrect", "autoFocus", "capture", "cellPadding", "cellSpacing", "charSet", "className", "cols", "colSpan", "content", "contentEditable", "controls", "coords", "crossOrigin", "dateTime", "default", "defaultChecked", "defaultValue", "dir", "disabled", "download", "draggable", "encType", "form", "height", "hidden", "hint", "href", "hrefLang", "htmlFor", "id", "inputMode", "label", "lang", "list", "max", "maxLength", "media", "method", "min", "minLength", "multiple", "name", "noValidate", "pattern", "placeholder", "readOnly", "rel", "required", "role", "rows", "rowSpan", "selected", "slot", "spellCheck", "src", "step", "style", "tabIndex", "target", "title", "translate", "type", "value", "width"]);
-var VALID_DOM_EVENT_HANDLERS = new Set(["onAbort", "onAnimationEnd", "onAnimationIteration", "onAnimationStart", "onAuxClick", "onBeforeInput", "onBlur", "onCanPlay", "onCanPlayThrough", "onChange", "onClick", "onCompositionEnd", "onCompositionStart", "onCompositionUpdate", "onContextMenu", "onCopy", "onCut", "onDoubleClick", "onDrag", "onDragEnd", "onDragEnter", "onDragExit", "onDragLeave", "onDragOver", "onDragStart", "onDrop", "onDurationChange", "onEmptied", "onEncrypted", "onEnded", "onError", "onFocus", "onGotPointerCapture", "onInput", "onInvalid", "onKeyDown", "onKeyPress", "onKeyUp", "onLoad", "onLoadedData", "onLoadedMetadata", "onLoadStart", "onLostPointerCapture", "onMouseDown", "onMouseEnter", "onMouseLeave", "onMouseMove", "onMouseOut", "onMouseOver", "onMouseUp", "onPaste", "onPause", "onPlay", "onPlaying", "onPointerCancel", "onPointerDown", "onPointerEnter", "onPointerLeave", "onPointerMove", "onPointerOut", "onPointerOver", "onPointerUp", "onProgress", "onRateChange", "onReset", "onScroll", "onSeeked", "onSeeking", "onSelect", "onStalled", "onSubmit", "onSuspend", "onTimeUpdate", "onTouchCancel", "onTouchEnd", "onTouchMove", "onTouchStart", "onTransitionEnd", "onVolumeChange", "onWaiting", "onWheel"]);
-
-// Maps lowercase HTML attribute names to their React camelCase equivalents.
-// Lowercase attributes that appear here are normalized on the way out; those
-// NOT in this map but still all-lowercase are passed through as-is (custom /
-// data-like attributes handled elsewhere).
-var LOWERCASE_TO_REACT_ATTR = {
-  autocomplete: "autoComplete",
-  autocapitalize: "autoCapitalize",
-  autocorrect: "autoCorrect",
-  autofocus: "autoFocus",
-  accesskey: "accessKey",
-  classname: "className",
-  colspan: "colSpan",
-  contenteditable: "contentEditable",
-  crossorigin: "crossOrigin",
-  datetime: "dateTime",
-  defaultchecked: "defaultChecked",
-  defaultvalue: "defaultValue",
-  enctype: "encType",
-  hreflang: "hrefLang",
-  htmlfor: "htmlFor",
-  inputmode: "inputMode",
-  maxlength: "maxLength",
-  minlength: "minLength",
-  novalidate: "noValidate",
-  readonly: "readOnly",
-  rowspan: "rowSpan",
-  spellcheck: "spellCheck",
-  tabindex: "tabIndex"
-};
-var isLowercaseAttribute = function isLowercaseAttribute(key) {
-  return key === key.toLowerCase();
-};
-var isSafeAttributeName = function isSafeAttributeName(key) {
-  return SAFE_ATTRIBUTES.has(key) || key.startsWith("aria-") || key.startsWith("data-") || isLowercaseAttribute(key) || VALID_DOM_EVENT_HANDLERS.has(key);
-};
-var isObjectLikeString = function isObjectLikeString(value) {
-  var trimmed = value.trim();
-  if (/^\[object\s*,?\s*object\]$/i.test(trimmed)) {
-    return true;
-  }
-  if (trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]")) {
-    try {
-      var parsed = JSON.parse(trimmed);
-      return (0, _typeof2["default"])(parsed) === "object" && parsed !== null;
-    } catch (e) {
-      return false;
-    }
-  }
-  return false;
-};
-var shouldStringifyBooleanAttribute = function shouldStringifyBooleanAttribute(key, value) {
-  return typeof value === "boolean" && isLowercaseAttribute(key) && !SAFE_ATTRIBUTES.has(key) && !key.startsWith("aria-") && !key.startsWith("data-");
-};
 var removeInvalidAttributes = exports.removeInvalidAttributes = function removeInvalidAttributes(attributes, explicitRemoveAttributes) {
   var filteredAttributes = {};
   Object.keys(attributes).forEach(function (key) {
-    var _LOWERCASE_TO_REACT_A;
-    if (explicitRemoveAttributes !== null && explicitRemoveAttributes !== void 0 && explicitRemoveAttributes.includes(key) || INTERNAL_ATTRIBUTES.has(key) || !isSafeAttributeName(key)) {
+    if (explicitRemoveAttributes !== null && explicitRemoveAttributes !== void 0 && explicitRemoveAttributes.includes(key)) {
       return;
     }
     var value = attributes[key];
     if (Array.isArray(value) || (0, _typeof2["default"])(value) === "object" && value !== null) {
       return;
     }
-    if (typeof value === "function" && !VALID_DOM_EVENT_HANDLERS.has(key)) {
-      return;
-    }
-    if (typeof value === "string" && value.trim() === "") {
-      return;
-    }
-    if (typeof value === "string" && isObjectLikeString(value)) {
-      return;
+    if (typeof value === "string") {
+      var trimmed = value.trim();
+      if (trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]")) {
+        try {
+          var parsed = JSON.parse(value);
+          if ((0, _typeof2["default"])(parsed) === "object" && parsed !== null) {
+            return;
+          }
+        } catch (e) {
+          // invalid json, ignore
+        }
+      }
     }
-    // Normalize lowercase HTML attribute names to their React camelCase form
-    // to prevent "Invalid DOM property" warnings (e.g. autocomplete → autoComplete).
-    var normalizedKey = (_LOWERCASE_TO_REACT_A = LOWERCASE_TO_REACT_ATTR[key]) !== null && _LOWERCASE_TO_REACT_A !== void 0 ? _LOWERCASE_TO_REACT_A : key;
-    filteredAttributes[normalizedKey] = shouldStringifyBooleanAttribute(normalizedKey, value) ? value.toString() : value;
+    filteredAttributes[key] = value;
   });
   return filteredAttributes;
 };

package/utils/lib-error-skipper.d.ts

@@ -1,11 +1,33 @@
 /**
- * Wraps page/prefab script methods with error handling that detects
- * unsupported library usage (e.g. jQuery) and surfaces all other errors
- * with full context instead of swallowing them.
+ * Utility to wrap all methods in a script object with jQuery error handling
+ * This prevents jQuery usage from breaking the React application
+ */
+/**
+ * Configuration for unsupported libraries
+ */
+interface LibraryConfig {
+    identifiers: string[];
+    errorMessage: string;
+    notificationMessage: string;
+}
+interface UnsupportedLibraries {
+    [key: string]: LibraryConfig;
+}
+/**
+ * Checks if an error is related to jQuery usage
+ * @param error - The error object to check
+ * @returns true if the error is jQuery-related
  */
 export declare const isJQueryError: (error: any) => boolean;
 interface AppContext {
     notifyApp?: (message: string, type: string) => void;
 }
-export declare const wrapWithThirdPartyErrorGuard: (pageProxy: Record<string, any>, appContext: AppContext | null | undefined, componentName: string) => void;
+/**
+ * Wraps all methods with unsupported library error handling
+ * @param pageProxy - The page/prefab proxy object
+ * @param appContext - App context for notifications
+ * @param componentName - Name of component for logging
+ * @param libraryConfig - Optional: specific libraries to check (default: all)
+ */
+export declare const wrapWithThirdPartyErrorGuard: (pageProxy: Record<string, any>, appContext: AppContext | null | undefined, componentName: string, libraryConfig?: UnsupportedLibraries) => void;
 export {};

package/utils/lib-error-skipper.js

@@ -6,70 +6,194 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.wrapWithThirdPartyErrorGuard = exports.isJQueryError = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 /**
- * Wraps page/prefab script methods with error handling that detects
- * unsupported library usage (e.g. jQuery) and surfaces all other errors
- * with full context instead of swallowing them.
+ * Utility to wrap all methods in a script object with jQuery error handling
+ * This prevents jQuery usage from breaking the React application
+ */
+
+/**
+ * Configuration for unsupported libraries
  */
 
 var UNSUPPORTED_LIBRARIES = {
   jquery: {
+    // Use specific jQuery patterns - avoid matching Wavemaker vars like $index, $data
     identifiers: ["jQuery", "$(", "$."],
     errorMessage: "jQuery is not supported in React App",
     notificationMessage: "jQuery functionality is not supported. Check console for details."
   }
+  // Add more libraries here in future
 };
+
+/**
+ * Result of unsupported library detection
+ */
+
+/**
+ * Detects if an error is related to any unsupported library
+ * @param error - The error object to check
+ * @returns Object with isUnsupported flag and library info
+ */
 function detectUnsupportedLibrary(error) {
-  if (!(error !== null && error !== void 0 && error.stack)) return null;
-  var haystack = "".concat(error.message || "", "\n").concat(error.stack);
+  if (!error || !error.stack) {
+    return {
+      isUnsupported: false,
+      library: null
+    };
+  }
+  var errorMessage = error.message || "";
+  var stackTrace = String(error.stack);
+
+  // Check each configured library
   for (var _i = 0, _Object$entries = Object.entries(UNSUPPORTED_LIBRARIES); _i < _Object$entries.length; _i++) {
     var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
-      name = _Object$entries$_i[0],
+      libraryName = _Object$entries$_i[0],
       config = _Object$entries$_i[1];
-    if (config.identifiers.some(function (id) {
-      return haystack.includes(id);
+    var identifiers = config.identifiers;
+
+    // Check if error message contains library identifiers
+    if (identifiers.some(function (identifier) {
+      return errorMessage.includes(identifier);
     })) {
       return {
-        library: name,
+        isUnsupported: true,
+        library: libraryName,
         config: config
       };
     }
+
+    // Check if stack trace contains library identifiers
+    var stackLines = stackTrace.split("\n");
+    var _iterator = _createForOfIteratorHelper(stackLines),
+      _step;
+    try {
+      var _loop = function _loop() {
+          var line = _step.value;
+          if (identifiers.some(function (identifier) {
+            return line.includes(identifier);
+          })) {
+            return {
+              v: {
+                isUnsupported: true,
+                library: libraryName,
+                config: config
+              }
+            };
+          }
+        },
+        _ret;
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        _ret = _loop();
+        if (_ret) return _ret.v;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
   }
-  return null;
+  return {
+    isUnsupported: false,
+    library: null
+  };
 }
+
+/**
+ * Checks if an error is related to jQuery usage
+ * @param error - The error object to check
+ * @returns true if the error is jQuery-related
+ */
 var isJQueryError = exports.isJQueryError = function isJQueryError(error) {
-  var _detectUnsupportedLib;
-  return ((_detectUnsupportedLib = detectUnsupportedLibrary(error)) === null || _detectUnsupportedLib === void 0 ? void 0 : _detectUnsupportedLib.library) === "jquery";
+  if (!(error !== null && error !== void 0 && error.stack)) return false;
+
+  // Use specific jQuery patterns - avoid matching Wavemaker vars like $index, $data
+  var UnSupportedFunctionality = ["jQuery", "$(", "$."];
+
+  // Check if error message contains jQuery references
+  if (error.message && UnSupportedFunctionality.some(function (func) {
+    return error.message.includes(func);
+  })) {
+    return true;
+  }
+
+  // Check stack trace for jQuery references
+  var stackLines = error.stack.split("\n");
+  var _iterator2 = _createForOfIteratorHelper(stackLines),
+    _step2;
+  try {
+    var _loop2 = function _loop2() {
+        var line = _step2.value;
+        if (UnSupportedFunctionality.some(function (func) {
+          return line.includes(func);
+        })) {
+          return {
+            v: true
+          };
+        }
+      },
+      _ret2;
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      _ret2 = _loop2();
+      if (_ret2) return _ret2.v;
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return false;
 };
-var SKIP_PROPERTIES = new Set(["Variables", "Actions", "Widgets", "App", "pageParams", "serviceDefinitions", "baseUrl", "appConfig", "notification", "toaster", "onContentReady", "onChange", "cleanup", "eval", "appLocale", "executeStartup", "formatters", "type", "componentName", "componentType", "prefabname", "onPropertyChange"]);
+/**
+ * Wraps all methods with unsupported library error handling
+ * @param pageProxy - The page/prefab proxy object
+ * @param appContext - App context for notifications
+ * @param componentName - Name of component for logging
+ * @param libraryConfig - Optional: specific libraries to check (default: all)
+ */
 var wrapWithThirdPartyErrorGuard = exports.wrapWithThirdPartyErrorGuard = function wrapWithThirdPartyErrorGuard(pageProxy, appContext, componentName) {
-  var _loop = function _loop() {
-    var methodName = _Object$keys[_i2];
-    if (typeof pageProxy[methodName] !== "function" || SKIP_PROPERTIES.has(methodName)) return 1; // continue
-    var originalMethod = pageProxy[methodName];
-    pageProxy[methodName] = function () {
-      try {
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-        return originalMethod.apply(this, args);
-      } catch (error) {
-        var detection = detectUnsupportedLibrary(error);
-        if (detection) {
-          var _appContext$notifyApp;
-          console.error("[".concat(detection.library.toUpperCase(), "] ").concat(componentName, ".").concat(methodName, "(): ").concat(detection.config.errorMessage), error);
-          appContext === null || appContext === void 0 || (_appContext$notifyApp = appContext.notifyApp) === null || _appContext$notifyApp === void 0 || _appContext$notifyApp.call(appContext, detection.config.notificationMessage, "Error");
-          return undefined;
+  var libraryConfig = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : UNSUPPORTED_LIBRARIES;
+  var skipProperties = ["Variables", "Actions", "Widgets", "App", "pageParams", "serviceDefinitions", "baseUrl", "appConfig", "notification", "toaster", "onContentReady", "onChange", "cleanup", "eval", "appLocale", "executeStartup", "formatters", "type", "componentName", "componentType", "prefabname", "onPropertyChange"];
+  Object.keys(pageProxy).forEach(function (methodName) {
+    if (typeof pageProxy[methodName] === "function" && !skipProperties.includes(methodName)) {
+      var originalMethod = pageProxy[methodName];
+      pageProxy[methodName] = function () {
+        try {
+          for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+            args[_key] = arguments[_key];
+          }
+          return originalMethod.apply(this, args);
+        } catch (error) {
+          // Detect which unsupported library caused the error
+          var detection = detectUnsupportedLibrary(error);
+          if (detection.isUnsupported && detection.library && detection.config) {
+            var library = detection.library;
+            var config = detection.config;
+
+            // Log detailed error
+            console.error("[".concat(library.toUpperCase(), " ERROR] in ").concat(componentName, ".").concat(methodName, "()"), "\n".concat(config.errorMessage), "\nError:", error);
+
+            // Show user notification
+            if (appContext !== null && appContext !== void 0 && appContext.notifyApp) {
+              appContext.notifyApp(config.notificationMessage, "Error");
+            }
+
+            // Return undefined to prevent further errors
+            return undefined;
+          } else {
+            // Not an unsupported library error - log normally
+            console.log("Error in ".concat(componentName, ".").concat(methodName, "():"));
+          }
         }
-        console.error("[script] ".concat(componentName, ".").concat(methodName, "():"), error);
-      }
-    };
-    Object.defineProperty(pageProxy[methodName], "name", {
-      value: "wrapped_".concat(methodName),
-      writable: false
-    });
-  };
-  for (var _i2 = 0, _Object$keys = Object.keys(pageProxy); _i2 < _Object$keys.length; _i2++) {
-    if (_loop()) continue;
-  }
+      };
+
+      // Preserve function name for debugging
+      Object.defineProperty(pageProxy[methodName], "name", {
+        value: "wrapped_".concat(methodName),
+        writable: false
+      });
+    }
+  });
 };

package/utils/style-utils.d.ts

@@ -20,9 +20,3 @@ export declare const mergeStyleObjects: (...styleObjects: any[]) => Record<strin
  */
 export declare const isValidStyleObject: (value: any) => boolean;
 export declare const filterAutoLayoutClasses: (layoutClassName: string | undefined, prefixesToGet: string[], mode?: "include" | "exclude") => string;
-/**
- * Normalizes a React style length (width, height, margin, etc.): numbers become pixel
- * values (`${n}px`), matching common React `style` behavior; strings pass through
- * (e.g. `100%`, `2rem`, `10px`).
- */
-export declare const toCssLength: (value: string | number) => string;

package/utils/style-utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toCssLength = exports.sanitizeStyleObject = exports.mergeStyleObjects = exports.isValidStyleObject = exports.filterAutoLayoutClasses = void 0;
+exports.sanitizeStyleObject = exports.mergeStyleObjects = exports.isValidStyleObject = exports.filterAutoLayoutClasses = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -80,13 +80,4 @@ var filterAutoLayoutClasses = exports.filterAutoLayoutClasses = function filterA
     });
     return mode === "include" ? matches : !matches;
   }).join(" ");
-};
-
-/**
- * Normalizes a React style length (width, height, margin, etc.): numbers become pixel
- * values (`${n}px`), matching common React `style` behavior; strings pass through
- * (e.g. `100%`, `2rem`, `10px`).
- */
-var toCssLength = exports.toCssLength = function toCssLength(value) {
-  return typeof value === "number" ? "".concat(value, "px") : String(value);
 };

package/variables/metadata.service.js

@@ -33,7 +33,7 @@ var MetadataService = exports.MetadataService = /*#__PURE__*/function () {
           _ref,
           _WM_APP_PROPERTIES,
           _this = this;
-        var state, appConfig, baseUrl, isPreview, serviceDefSources, url, serviceDefFileName;
+        var state, appConfig, baseUrl, isPreview, serviceDefSources, url, serviceDefFileName, previewPath;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -44,7 +44,8 @@ var MetadataService = exports.MetadataService = /*#__PURE__*/function () {
               serviceDefSources = ((_WM_APP_PROPERTIES = window._WM_APP_PROPERTIES) === null || _WM_APP_PROPERTIES === void 0 ? void 0 : _WM_APP_PROPERTIES.serviceDefSources) || "DYNAMIC";
               serviceDefFileName = prefabName ? "".concat(prefabName, "-prefab-servicedefs.json") : "app-servicedefs.json";
               if (isPreview || serviceDefSources === "DYNAMIC") {
-                url = prefabName && prefabName !== "__self__" ? "".concat(baseUrl, "/services/prefabs/").concat(prefabName, "/servicedefs") : "".concat(baseUrl, "/services/servicedefs");
+                previewPath = prefabName ? "prefabs/".concat(prefabName) : "";
+                url = "".concat(baseUrl, "/services/").concat(previewPath, "/servicedefs");
               } else {
                 url = "".concat(baseUrl, "/services/servicedefs/").concat(serviceDefFileName);
               }

package/variables/model-variable.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModelVariable = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -25,12 +24,13 @@ var ModelVariable = exports.ModelVariable = /*#__PURE__*/function (_ref) {
   function ModelVariable(config) {
     var _this;
     (0, _classCallCheck2["default"])(this, ModelVariable);
-    var initialData = config.paramProvider();
+    // Initialize with empty dataset first
     var variable = {
       name: config.name,
-      dataSet: initialData != null ? initialData : config.isList ? [] : {
+      dataSet: config.paramProvider() || {
         dataValue: ""
       },
+      // Default empty value
       isList: config.isList,
       twoWayBinding: config.twoWayBinding
     };
@@ -49,15 +49,12 @@ var ModelVariable = exports.ModelVariable = /*#__PURE__*/function (_ref) {
     value: function invoke(params, onSuccess, onError) {
       var result;
       try {
-        var provided = this.config.paramProvider();
-        if (Array.isArray(provided)) {
-          this.dataSet = provided;
-        } else if (this.dataSet && provided) {
-          this.dataSet = Array.isArray(this.dataSet) ? provided : _objectSpread(_objectSpread({}, this.dataSet), provided);
+        if (this.dataSet && this.config.paramProvider()) {
+          this.dataSet = _objectSpread(_objectSpread({}, this.dataSet), this.config.paramProvider());
         } else if (this.dataSet && Object.keys(this.dataSet).length !== 0) {
-          this.dataSet = Array.isArray(this.dataSet) ? (0, _toConsumableArray2["default"])(this.dataSet) : _objectSpread({}, this.dataSet);
+          this.dataSet = _objectSpread({}, this.dataSet);
         } else {
-          this.dataSet = provided;
+          this.dataSet = this.config.paramProvider();
         }
         this.notify(_baseVariable.VariableEvents.BEFORE_INVOKE, [this, this.dataSet]);
         result = _superPropGet(ModelVariable, "execute", this, 3)([params, function () {}]);

package/variables/service-variable.d.ts

@@ -27,7 +27,6 @@ export declare class ServiceVariable extends ServiceVariable_base {
     private dateFormatter;
     private lastParams;
     private lastParamProviderValues;
-    private dataBindingRequestBody;
     constructor(config: ServiceVariableConfig);
     private updateFirstAndLastRecord;
     private setupEventHandlers;

package/variables/service-variable.js

@@ -61,7 +61,6 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ref) {
       spinnerMessage: config.spinnerMessage,
       spinnerContext: config.spinnerContext,
       onSuccess: function onSuccess(context, args) {
-        _this.dataBindingRequestBody(args, _this.lastInvokedParams);
         _this.notify(_baseVariable.VariableEvents.AFTER_INVOKE, [args.variable, args.data, args.options]);
         _this.notify(_baseVariable.VariableEvents.SUCCESS, [args.variable, args.data, args.options]);
         _this.updateFirstAndLastRecord(args.data);
@@ -114,22 +113,6 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ref) {
   // Method to update firstRecord and lastRecord from the current dataset
   (0, _inherits2["default"])(ServiceVariable, _ref);
   return (0, _createClass2["default"])(ServiceVariable, [{
-    key: "dataBindingRequestBody",
-    value: function dataBindingRequestBody(args, invokedParams) {
-      var _invokedParams$Reques;
-      var v = args === null || args === void 0 ? void 0 : args.variable;
-      if (!v) return;
-      v.dataBinding = v.dataBinding || {};
-
-      // Keep both casings for compatibility with app scripts and Angular runtime expectations.
-      // Prefer existing values, otherwise fallback to the request payload used for invocation.
-      var existingBody = v.dataBinding.RequestBody;
-      var payload = (_invokedParams$Reques = invokedParams === null || invokedParams === void 0 ? void 0 : invokedParams.RequestBody) !== null && _invokedParams$Reques !== void 0 ? _invokedParams$Reques : invokedParams;
-      if (existingBody === undefined && payload !== undefined) {
-        v.dataBinding.RequestBody = payload;
-      }
-    }
-  }, {
     key: "updateFirstAndLastRecord",
     value: function updateFirstAndLastRecord(data) {
       try {
@@ -281,17 +264,14 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ref) {
   }, {
     key: "invoke",
     value: function invoke(options, onSuccess, onError) {
-      // Build request params locally — never mutate this.params, this.dataBinding, or options.inputFields
-      var inputFields = (0, _lodashEs.merge)({}, this.config.paramProvider(), this.dataBinding, this.params);
+      this.params = (0, _lodashEs.merge)({}, this.config.paramProvider(), this.params);
+      this.params = (0, _util.deepCopy)({}, this.params, this.dataBinding);
       if (options) {
-        var _options$inputFields;
-        var overrides = (_options$inputFields = options.inputFields) !== null && _options$inputFields !== void 0 ? _options$inputFields : options;
-        inputFields = (0, _lodashEs.merge)({}, inputFields, overrides);
-      } else {
-        options = {};
+        this.params = (0, _util.deepCopy)({}, this.params, options.inputFields ? options.inputFields : options);
       }
-      options.inputFields = inputFields;
-      this.lastInvokedParams = inputFields;
+      options = options || {};
+      options.inputFields = this.params;
+      this.lastInvokedParams = this.params;
 
       // Normalize orderBy option
       if (!options.orderBy) {

package/actions/base-action.d.ts

@@ -1,7 +0,0 @@
-import { BaseVariable, VariableConfig } from "@wavemaker-ai/react-runtime/variables/base-variable";
-export interface ActionConfig extends VariableConfig {
-}
-export declare class BaseAction<T extends ActionConfig> extends BaseVariable<T> {
-    constructor(config: T);
-    setData(dataSet: any): void;
-}

package/actions/login-action.d.ts

@@ -1,11 +0,0 @@
-import { ActionConfig, BaseAction } from "./base-action";
-import { SecurityService } from "@wavemaker-ai/react-runtime/core/security.service";
-export interface LoginActionConfig extends ActionConfig {
-    securityService: () => SecurityService;
-    baseURL: String;
-    useDefaultSuccessHandler: boolean;
-}
-export declare class LoginAction extends BaseAction<LoginActionConfig> {
-    constructor(config: LoginActionConfig);
-    invoke(options: any, successcb?: Function, errorcb?: Function): any;
-}

package/actions/logout-action.d.ts

@@ -1,10 +0,0 @@
-import { ActionConfig, BaseAction } from "./base-action";
-import { SecurityService } from "@wavemaker-ai/react-runtime/core/security.service";
-export interface LogoutActionConfig extends ActionConfig {
-    securityService: () => SecurityService;
-    baseURL: String;
-}
-export declare class LogoutAction extends BaseAction<LogoutActionConfig> {
-    constructor(config: LogoutActionConfig);
-    invoke(options: any, successcb?: Function, errorcb?: Function): any;
-}

package/actions/navigation-action.d.ts

@@ -1,35 +0,0 @@
-import { ActionConfig, BaseAction } from "./base-action";
-export declare const __resetNavigationPageParamHistoryForTests: () => void;
-export declare const __getPageQueryParamHistorySizeForTests: () => number;
-export interface NavigationParams {
-    pageName?: string;
-    tabName?: string;
-    accordionName?: string;
-    [key: string]: any;
-}
-export interface NavigationActionConfig extends ActionConfig {
-    appConfig: any;
-    operation: string;
-    _context: any;
-}
-export declare class NavigationAction extends BaseAction<NavigationActionConfig> {
-    constructor(config: NavigationActionConfig);
-    invoke(params?: Record<string, unknown>, onSuccess?: Function, onError?: Function): Promise<NavigationAction>;
-    navigate(params?: {}, onSuccess?: Function, onError?: Function): Promise<NavigationAction>;
-    private handleGoToPreviousPage;
-    private handleGotoTab;
-    private findTabWidget;
-    private handleGotoAccordion;
-    private getAppRelativePath;
-    private parseSearch;
-    private normalizePageName;
-    private getCurrentPageInfo;
-    private rememberPageQueryParams;
-    private resolveQueryParams;
-    /**
-     * Returns true if the current URL matches the target path and query params.
-     * When true, we skip router.push.
-     */
-    private isSamePageAsCurrent;
-    private handleGotoPage;
-}

package/actions/notification-action.d.ts

@@ -1,20 +0,0 @@
-import { ActionConfig, BaseAction } from "./base-action";
-import React from "react";
-export interface NotificationActionConfig extends ActionConfig {
-    showDialog: Function;
-    onOk?: Function;
-    onCancel?: Function;
-    onClose?: Function;
-    operation: string;
-    partialContent?: React.ReactNode;
-    toasterService?: () => any;
-}
-export declare class NotificationAction extends BaseAction<NotificationActionConfig> {
-    constructor(config: NotificationActionConfig);
-    notify(event: string, args: any[], emitToParent?: boolean): void;
-    notify(params?: any, onSuccess?: Function, onError?: Function): Promise<any>;
-    private prepareToastOptions;
-    invoke(params?: any, onSuccess?: Function, onError?: Function): Promise<any>;
-    private showToast;
-    getMessage(): void;
-}