@wavemaker/react-runtime 11.14.1-rc.241 → 11.14.2-1.6423

package/core/proxy-service.js

@@ -28,8 +28,8 @@ var createArrayProxy = function createArrayProxy(array, widgetName, propName, se
     return array;
   }
   var arrayProxy = new Proxy(array, {
-    get: function get(target, prop) {
-      var value = target[prop];
+    get: function get(target, prop, receiver) {
+      var value = Reflect.get(target, prop, receiver);
 
       // If it's a mutating method, wrap it to trigger updates
       if (typeof prop === "string" && MUTATING_ARRAY_METHODS.includes(prop) && typeof value === "function") {
@@ -50,8 +50,8 @@ var createArrayProxy = function createArrayProxy(array, widgetName, propName, se
       }
       return value;
     },
-    set: function set(target, prop, value) {
-      var result = Reflect.set(target, prop, value);
+    set: function set(target, prop, value, receiver) {
+      var result = Reflect.set(target, prop, value, receiver);
 
       // Trigger update for index assignments (arr[0] = value)
       if (typeof prop === "string" && /^\d+$/.test(prop)) {
@@ -74,8 +74,8 @@ var createStateArrayProxy = function createStateArrayProxy(array, path, propName
     return array;
   }
   var arrayProxy = new Proxy(array, {
-    get: function get(target, prop) {
-      var value = target[prop];
+    get: function get(target, prop, receiver) {
+      var value = Reflect.get(target, prop, receiver);
 
       // If it's a mutating method, wrap it to trigger updates
       if (typeof prop === "string" && MUTATING_ARRAY_METHODS.includes(prop) && typeof value === "function") {
@@ -104,8 +104,8 @@ var createStateArrayProxy = function createStateArrayProxy(array, path, propName
       }
       return value;
     },
-    set: function set(target, prop, value) {
-      var result = Reflect.set(target, prop, value);
+    set: function set(target, prop, value, receiver) {
+      var result = Reflect.set(target, prop, value, receiver);
 
       // Trigger update for index assignments (arr[0] = value)
       if (typeof prop === "string" && /^\d+$/.test(prop)) {
@@ -135,14 +135,15 @@ var createWidgetProxy = exports.createWidgetProxy = function createWidgetProxy(w
     return widget;
   }
   var proxy = new Proxy(widget, {
-    set: function set(target, prop, value) {
+    set: function set(target, prop, value, receiver) {
       // Ignore internal properties
       if ((0, _typeof2["default"])(prop) === "symbol" || prop === "prototype") {
-        return true;
+        return Reflect.set(target, prop, value, receiver);
       }
 
       // Skip if value hasn't changed
-      if (target[prop] === value) {
+      var currentVal = Reflect.get(target, prop, receiver);
+      if (currentVal === value) {
         return true;
       }
 
@@ -151,7 +152,7 @@ var createWidgetProxy = exports.createWidgetProxy = function createWidgetProxy(w
         var widgetId = widget["data-widget-id"];
         (0, _scriptRegistry.trackOverriddenProps)(widgetName, prop, value, widgetId);
       }
-      target[prop] = value;
+      Reflect.set(target, prop, value, receiver);
       setPageContext(function (prevContext) {
         // Check if widget-id matches before updating context
         var currentWidget = prevContext.Widgets[widgetName];
@@ -173,9 +174,9 @@ var createWidgetProxy = exports.createWidgetProxy = function createWidgetProxy(w
       });
       return true;
     },
-    get: function get(target, prop) {
+    get: function get(target, prop, receiver) {
       if ((0, _typeof2["default"])(prop) === "symbol" || prop === "prototype") {
-        return undefined;
+        return Reflect.get(target, prop, receiver);
       }
 
       //  setProperty method to set properties dynamically
@@ -188,7 +189,7 @@ var createWidgetProxy = exports.createWidgetProxy = function createWidgetProxy(w
 
       // Special getter for $element - return jQuery-like wrapped element
       if (prop === "$element") {
-        var rawElement = target[prop];
+        var rawElement = Reflect.get(target, prop, receiver);
         if (rawElement) {
           // If already wrapped, return as-is
           if (rawElement.length === 1 && (0, _dom.isDOMElement)(rawElement[0])) {
@@ -201,17 +202,22 @@ var createWidgetProxy = exports.createWidgetProxy = function createWidgetProxy(w
         }
 
         // Try to find element in DOM directly
-        var widgetId = widget["data-widget-id"];
-        var element = (0, _widgetObserver.findWidgetElement)(widgetName, widgetId);
+        var _widgetId = widget["data-widget-id"];
+        var element = (0, _widgetObserver.findWidgetElement)(widgetName, _widgetId);
         if (element) {
           var wrappedElement = (0, _dom.wrapWithNativeDOM)(element);
-          target[prop] = wrappedElement; // Cache the wrapped element
+          Reflect.defineProperty(target, prop, {
+            value: wrappedElement,
+            writable: true,
+            configurable: true,
+            enumerable: false
+          });
           return wrappedElement;
         }
 
         // Register for future element updates if not found
         if (!target._elementCallbackRegistered) {
-          var key = widgetId ? "".concat(widgetName, ":").concat(widgetId) : widgetName;
+          var key = _widgetId ? "".concat(widgetName, ":").concat(_widgetId) : widgetName;
           var callbacks = _widgetObserver.widgetElementCallbacks.get(key);
           if (!callbacks) {
             callbacks = new Set();
@@ -219,14 +225,30 @@ var createWidgetProxy = exports.createWidgetProxy = function createWidgetProxy(w
           }
           callbacks.add(function (element) {
             if (element) {
-              target[prop] = (0, _dom.wrapWithNativeDOM)(element);
+              var wrapped = (0, _dom.wrapWithNativeDOM)(element);
+              Reflect.defineProperty(target, prop, {
+                value: wrapped,
+                writable: true,
+                configurable: true,
+                enumerable: false
+              });
             }
           });
-          target._elementCallbackRegistered = true;
+          Reflect.defineProperty(target, "_elementCallbackRegistered", {
+            value: true,
+            writable: true,
+            configurable: true,
+            enumerable: false
+          });
         }
         return null;
       }
-      var value = target[prop];
+      var value = Reflect.get(target, prop, receiver);
+      var widgetId = widget["data-widget-id"];
+      var widgetOverrides = (0, _scriptRegistry.getWidgetOverrides)(widgetName, widgetId);
+      if (prop in widgetOverrides) {
+        return widgetOverrides[prop];
+      }
 
       // Return DOM elements directly to preserve their context
       if ((0, _dom.isDOMElement)(value)) {
@@ -278,7 +300,12 @@ var createPageProxy = exports.createPageProxy = function createPageProxy(target,
         if (widget !== originalTarget || Object.keys(widget).length > Object.keys(originalTarget).length) {
           // Copy all properties from widget to originalTarget
           for (var key in widget) {
-            originalTarget[key] = widget[key];
+            Reflect.defineProperty(originalTarget, key, {
+              value: widget[key],
+              writable: true,
+              configurable: true,
+              enumerable: true
+            });
           }
         }
         return _proxy;
@@ -304,9 +331,18 @@ var createPageProxy = exports.createPageProxy = function createPageProxy(target,
         var originalTarget = originalTargets.get(proxy);
 
         // Only copy changed properties
-        for (var key in widgetValue) {
-          if (originalTarget[key] !== widgetValue[key]) {
-            originalTarget[key] = widgetValue[key];
+        if (widgetValue && (0, _typeof2["default"])(widgetValue) === "object") {
+          for (var key in widgetValue) {
+            var newVal = widgetValue[key];
+            var oldVal = originalTarget[key];
+            if (oldVal !== newVal) {
+              Reflect.defineProperty(originalTarget, key, {
+                value: newVal,
+                writable: true,
+                configurable: true,
+                enumerable: true
+              });
+            }
           }
         }
       } else if (widgetValue && (0, _typeof2["default"])(widgetValue) === "object") {
@@ -314,11 +350,6 @@ var createPageProxy = exports.createPageProxy = function createPageProxy(target,
         var _proxy2 = createWidgetProxy(widgetValue, widgetName, setPageContext);
         widgetProxies.set(widgetName, _proxy2);
       }
-      setPageContext(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), {}, {
-          Widgets: widgetsTarget
-        });
-      });
       return true;
     }
   });
@@ -329,7 +360,8 @@ var createStateProxy = exports.createStateProxy = function createStateProxy(obj)
   // Cache for nested proxies
   var nestedProxies = new Map();
   return new Proxy(obj, {
-    get: function get(target, prop) {
+    get: function get(target, prop, receiver) {
+      var _value$constructor;
       if (prop === "eval") {
         return function (fn) {
           var failOnError = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -352,12 +384,15 @@ var createStateProxy = exports.createStateProxy = function createStateProxy(obj)
       if (!(prop in target)) {
         return undefined;
       }
-      var value = target[prop];
+      var value = Reflect.get(target, prop, receiver);
 
       // Return primitives directly
       if ((0, _typeof2["default"])(value) !== "object" || value === null) {
         return value;
       }
+      if ((value === null || value === void 0 || (_value$constructor = value.constructor) === null || _value$constructor === void 0 ? void 0 : _value$constructor.name) === "ServiceVariable") {
+        return value;
+      }
 
       // Return DOM elements directly without proxying
       if ((0, _dom.isDOMElement)(value)) {
@@ -379,14 +414,15 @@ var createStateProxy = exports.createStateProxy = function createStateProxy(obj)
       nestedProxies.set(prop, nestedProxy);
       return nestedProxy;
     },
-    set: function set(target, prop, value) {
+    set: function set(target, prop, value, receiver) {
       // Skip if value hasn't changed
-      if (target[prop] === value) {
+      var currentVal = Reflect.get(target, prop, receiver);
+      if (currentVal === value) {
         return true;
       }
 
       // Update target directly
-      target[prop] = value;
+      Reflect.set(target, prop, value, receiver);
 
       // Clear cached proxy if value is an object (but not an array)
       if ((0, _typeof2["default"])(value) === "object" && value !== null && !Array.isArray(value) && nestedProxies.has(prop)) {

package/core/util/utils.js

@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.triggerItemAction = exports.openLink = exports.isJQueryError = exports.isInsecureContentRequest = exports.getUrlParams = exports.getRouteNameFromLink = exports.Utils = void 0;
+exports.triggerItemAction = exports.openLink = exports.isJQueryError = exports.isInsecureContentRequest = exports.getUrlParams = exports.getRouteNameFromLink = exports.getItemLink = exports.getCurrentPath = exports.Utils = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _navigationMiddleware = require("@wavemaker/react-runtime/store/middleware/navigationMiddleware");
 var _constants = require("../constants");
+var _navigation = require("next/navigation");
 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; }
@@ -171,13 +172,23 @@ var triggerItemAction = exports.triggerItemAction = function triggerItemAction(i
     var routeName = getRouteNameFromLink(originalLink);
     routeName = (0, _constants.hyperLinkMofify)(routeName);
     if (Object.keys(queryParams).length > 0) {
-      var queryString = Object.entries(queryParams).map(function (_ref) {
+      // Filter out undefined/null/empty values like Angular router does
+      var queryString = Object.entries(queryParams).filter(function (_ref) {
         var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
-          key = _ref2[0],
+          _ = _ref2[0],
           value = _ref2[1];
+        return value !== undefined && value !== null && value !== "";
+      }).map(function (_ref3) {
+        var _ref4 = (0, _slicedToArray2["default"])(_ref3, 2),
+          key = _ref4[0],
+          value = _ref4[1];
         return "".concat(key, "=").concat(encodeURIComponent(value));
       }).join("&");
-      router === null || router === void 0 || router.push("".concat(routeName, "?").concat(queryString));
+      if (queryString) {
+        router === null || router === void 0 || router.push("".concat(routeName, "?").concat(queryString));
+      } else {
+        router === null || router === void 0 || router.push(routeName);
+      }
     } else {
       router === null || router === void 0 || router.push(routeName);
     }
@@ -186,4 +197,12 @@ var triggerItemAction = exports.triggerItemAction = function triggerItemAction(i
     // For external links, use as-is (don't apply hyperLinkMofify)
     openLink(originalLink, linkTarget);
   }
+};
+var getCurrentPath = exports.getCurrentPath = function getCurrentPath() {
+  var path = (0, _navigation.usePathname)();
+  return path;
+};
+var getItemLink = exports.getItemLink = function getItemLink(item, props) {
+  var linkProperty = props.itemlink || "link";
+  return item[linkProperty];
 };

package/higherOrder/BaseApp.js

@@ -57,12 +57,14 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
         }),
         serviceDefinitions: (0, _cloneDeep["default"])((info === null || info === void 0 ? void 0 : info.serviceDefs) || {}),
         notifyApp: notifyApp,
+        notify: notify,
         eval: evaluateExpression,
         openActionDialog: openActionDialog,
         executeStartAppOperations: executeStartAppOperations,
         importModule: _helper.importModule,
-        Widgets: {}
-      })),
+        Widgets: {},
+        subscribe: subscribe
+      }, appInfo)),
       appContext = _useState[0],
       setAppContext = _useState[1];
     var appProxyRef = (0, _react.useRef)(null);
@@ -71,6 +73,7 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
     var isVariablesExecutedRef = (0, _react.useRef)(false);
     var registrationTimeoutRef = (0, _react.useRef)(null);
     var pendingWidgetRegistrations = (0, _react.useRef)({});
+    var subscribersRef = (0, _react.useRef)(new Map());
 
     // Set up service error listener using EventNotifier (outside useEffect)
     (0, _react.useEffect)(function () {
@@ -188,21 +191,24 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
               _context4.next = 9;
               return Promise.allSettled(variablePromises);
             case 9:
-              // Call onAppVariablesReady after startup variables are loaded
-              if (appProxyRef.current.onAppVariablesReady && typeof appProxyRef.current.onAppVariablesReady === "function") {
-                appProxyRef.current.onAppVariablesReady();
+              if (!(appProxyRef.current.onAppVariablesReady && typeof appProxyRef.current.onAppVariablesReady === "function")) {
+                _context4.next = 12;
+                break;
               }
-              _context4.next = 15;
-              break;
+              _context4.next = 12;
+              return appProxyRef.current.onAppVariablesReady();
             case 12:
-              _context4.prev = 12;
+              _context4.next = 17;
+              break;
+            case 14:
+              _context4.prev = 14;
               _context4.t0 = _context4["catch"](6);
               console.error("Error during app startup operations:", _context4.t0);
-            case 15:
+            case 17:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[6, 12]]);
+        }, _callee4, null, [[6, 14]]);
       }));
       return _executeStartAppOperations.apply(this, arguments);
     }
@@ -275,10 +281,13 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
                 return function executeAppStartup() {
                   return _ref2.apply(this, arguments);
                 };
-              }(); // Execute startup operations
+              }();
               _context2.next = 11;
-              return executeAppStartup();
+              return executeStartAppOperations();
             case 11:
+              _context2.next = 13;
+              return executeAppStartup();
+            case 13:
               // Initialize DialogService in appstore
               _appstore["default"].DialogService.set(_dialog["default"]);
 
@@ -291,10 +300,10 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
                   isAppReady: true
                 });
               });
-              _context2.next = 19;
+              _context2.next = 21;
               break;
-            case 15:
-              _context2.prev = 15;
+            case 17:
+              _context2.prev = 17;
               _context2.t0 = _context2["catch"](0);
               console.error("Error initializing app:", _context2.t0);
               setAppContext(function (prev) {
@@ -302,11 +311,11 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
                   isAppReady: true
                 });
               });
-            case 19:
+            case 21:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[0, 15]]);
+        }, _callee2, null, [[0, 17]]);
       }));
       return function initializeApp() {
         return _ref.apply(this, arguments);
@@ -329,7 +338,40 @@ var BaseApp = exports.BaseApp = function BaseApp(WrappedComponent, addAppScript,
         var _appProxyRef$current2;
         appProxyRef.current.lastActivePage = (_appProxyRef$current2 = appProxyRef.current) === null || _appProxyRef$current2 === void 0 ? void 0 : _appProxyRef$current2.activePageName;
         appProxyRef.current.activePageName = pageName;
-        appProxyRef.current.activePage = appProxyRef.current;
+      }
+    }
+    function subscribe(eventName, callback) {
+      if (!eventName || typeof callback !== "function") {
+        return function () {};
+      }
+      if (!subscribersRef.current.has(eventName)) {
+        subscribersRef.current.set(eventName, new Set());
+      }
+      var subscribers = subscribersRef.current.get(eventName);
+      subscribers.add(callback);
+      return function () {
+        var subs = subscribersRef.current.get(eventName);
+        if (subs) {
+          subs["delete"](callback);
+          if (subs.size === 0) {
+            subscribersRef.current["delete"](eventName);
+          }
+        }
+      };
+    }
+    function notify(eventName, value) {
+      if (!eventName) {
+        return;
+      }
+      var subscribers = subscribersRef.current.get(eventName);
+      if (subscribers && subscribers.size > 0) {
+        subscribers.forEach(function (callback) {
+          try {
+            callback(value);
+          } catch (error) {
+            console.error("Error in subscriber callback for ".concat(eventName, ":"), error);
+          }
+        });
       }
     }
     // Change locale function