@wavemaker-ai/react-runtime 1.0.0-rc.647712 → 12.0.0-rc.335

package/components/navbar/index.js

@@ -31,7 +31,7 @@ var __objRest = (source, exclude) => {
   return target;
 };
 import { jsx, jsxs } from "react/jsx-runtime";
-import { memo, useMemo, useState } from "react";
+import { memo, useEffect, useMemo, useRef, useState } from "react";
 import clsx from "clsx";
 import Box from "@mui/material/Box";
 import Link from "@mui/material/Link";
@@ -66,7 +66,10 @@ const WmNavbar = memo(
       "menuiconurl",
       "listener"
     ]);
+    const collapseRef = useRef(null);
+    const timersRef = useRef([]);
     const [isCollapsed, setIsCollapsed] = useState(true);
+    useEffect(() => () => timersRef.current.forEach(clearTimeout), []);
     const processedStyles = useMemo(() => {
       if (!styles) return styles;
       if (styles == null ? void 0 : styles.backgroundImage) {
@@ -74,8 +77,32 @@ const WmNavbar = memo(
       }
       return __spreadValues({}, styles);
     }, [styles]);
-    const handleToggle = () => {
-      setIsCollapsed(!isCollapsed);
+    const handleToggle = (event) => {
+      var _a2, _b;
+      event.stopPropagation();
+      const el = collapseRef.current;
+      if (!el) return;
+      const open = isCollapsed;
+      (_a2 = el.getAnimations) == null ? void 0 : _a2.call(el).forEach((a) => a.cancel());
+      el.style.overflow = "hidden";
+      el.style.display = "block";
+      const h = `${el.scrollHeight}px`;
+      el.style.height = open ? "0" : h;
+      timersRef.current.forEach(clearTimeout);
+      const finalize = () => {
+        animation == null ? void 0 : animation.cancel();
+        Object.assign(el.style, { display: open ? "block" : "none", height: "", overflow: "" });
+      };
+      const animation = (_b = el.animate) == null ? void 0 : _b.call(el, [{ height: open ? "0" : h }, { height: open ? h : "0" }], {
+        duration: 400,
+        fill: "forwards"
+      });
+      if (animation) {
+        animation.onfinish = finalize;
+      } else {
+        timersRef.current[0] = setTimeout(finalize, 400);
+      }
+      open ? setIsCollapsed(false) : timersRef.current[1] = setTimeout(() => setIsCollapsed(true), 500);
     };
     return /* @__PURE__ */ jsx(
       Box,
@@ -114,11 +141,9 @@ const WmNavbar = memo(
           /* @__PURE__ */ jsx(
             Box,
             {
+              ref: collapseRef,
               component: "div",
-              className: clsx("navbar-collapse", {
-                collapse: isCollapsed,
-                in: !isCollapsed
-              }),
+              className: clsx("navbar-collapse collapse", { in: !isCollapsed }),
               children
             }
           )

package/components/navigation/menu/index.js

@@ -744,10 +744,13 @@ const WmMenu = memo((props) => {
     ]
   );
   useEffect(() => {
+    if (props.hidden) {
+      setOpen(false);
+    }
     if (!open) return;
     setActiveItem(null);
     setFocusedIndex(-1);
-  }, [open]);
+  }, [open, props.hidden]);
   useEffect(() => {
     if (autoopen === AUTO_OPEN.ALWAYS) {
       setOpen(true);
@@ -994,7 +997,8 @@ const WmMenu = memo((props) => {
       onKeyDown: handleKeyDown,
       role: "menu",
       "aria-label": arialabel || "Menu",
-      "aria-expanded": open
+      "aria-expanded": open,
+      hidden: props.hidden
     }), { type, name }), {
       children: [
         /* @__PURE__ */ jsx(Tooltip, { title: hint || "", enterDelay: TOOLTIP_ENTER_DELAY, disableHoverListener: !hint, children: type === "anchor" ? /* @__PURE__ */ jsxs(

package/components/page/index.js

@@ -50,12 +50,58 @@ function WmPage(props) {
   }));
   const [hasFullNavHeight, setHasFullNavHeight] = useState(false);
   const [leftPanelPageClasses, setLeftPanelPageClasses] = useState();
+  const [hasLeftPanel, setHasLeftPanel] = useState(false);
+  const [leftPanelExpanded, setLeftPanelExpanded] = useState(false);
   const handleNavHeightChange = useCallback((isFull) => {
     setHasFullNavHeight(isFull);
   }, []);
   const handleLeftPanelPageClassesChange = useCallback((pageClasses) => {
     setLeftPanelPageClasses(pageClasses);
   }, []);
+  const handleLeftPanelPresenceChange = useCallback((present) => {
+    setHasLeftPanel(present);
+    if (!present) {
+      setLeftPanelExpanded(false);
+    }
+  }, []);
+  const toggleLeftPanel = useCallback(() => {
+    setLeftPanelExpanded((expanded) => !expanded);
+  }, []);
+  const handlePageClick = useCallback(
+    (event) => {
+      if (!leftPanelExpanded) {
+        return;
+      }
+      const target = event.target;
+      if (!target) {
+        return;
+      }
+      if (target.closest(".app-left-panel")) {
+        return;
+      }
+      if (target.closest("[data-role='page-left-panel-icon']")) {
+        return;
+      }
+      setLeftPanelExpanded(false);
+    },
+    [leftPanelExpanded]
+  );
+  const pageLayoutContextValue = useMemo(
+    () => ({
+      onLeftPanelPageClassesChange: handleLeftPanelPageClassesChange,
+      onLeftPanelPresenceChange: handleLeftPanelPresenceChange,
+      hasLeftPanel,
+      leftPanelExpanded,
+      toggleLeftPanel
+    }),
+    [
+      handleLeftPanelPageClassesChange,
+      handleLeftPanelPresenceChange,
+      hasLeftPanel,
+      leftPanelExpanded,
+      toggleLeftPanel
+    ]
+  );
   const handleResize = useCallback(() => {
     const newSize = {
       width: window.innerWidth,
@@ -122,25 +168,20 @@ function WmPage(props) {
       return child;
     });
   }, [children, handleNavHeightChange]);
-  return /* @__PURE__ */ jsx(
-    PageLayoutContext.Provider,
-    {
-      value: { onLeftPanelPageClassesChange: handleLeftPanelPageClassesChange },
-      children: /* @__PURE__ */ jsx(
-        Container,
-        __spreadProps(__spreadValues({}, removeInvalidAttributes(restProps)), {
-          className: clsx(
-            getDefaultClass(pageName),
-            { "app-nav-full": hasFullNavHeight },
-            leftPanelPageClasses,
-            className
-          ),
-          sx: __spreadValues({}, styles),
-          children: childrenWithCallback
-        })
-      )
-    }
-  );
+  return /* @__PURE__ */ jsx(PageLayoutContext.Provider, { value: pageLayoutContextValue, children: /* @__PURE__ */ jsx(
+    Container,
+    __spreadProps(__spreadValues({}, removeInvalidAttributes(restProps)), {
+      onClick: handlePageClick,
+      className: clsx(
+        getDefaultClass(pageName),
+        { "app-nav-full": hasFullNavHeight },
+        leftPanelPageClasses,
+        className
+      ),
+      sx: __spreadValues({}, styles),
+      children: childrenWithCallback
+    })
+  ) });
 }
 WmPage.displayName = "WmPage";
 var page_default = WmPage;

package/components/page/page-context.d.ts

@@ -1,4 +1,8 @@
 export interface PageLayoutContextValue {
     onLeftPanelPageClassesChange?: (pageClasses?: string) => void;
+    onLeftPanelPresenceChange?: (present: boolean) => void;
+    hasLeftPanel?: boolean;
+    leftPanelExpanded?: boolean;
+    toggleLeftPanel?: () => void;
 }
 export declare const PageLayoutContext: import("react").Context<PageLayoutContextValue>;

package/core/proxy-service.js

@@ -54,6 +54,8 @@ const NON_PROXYABLE_TAGS = /* @__PURE__ */ new Set([
 const isNonProxyableBuiltin = (value) => NON_PROXYABLE_TAGS.has(Object.prototype.toString.call(value)) || // Covers every TypedArray flavour plus DataView in one check.
 ArrayBuffer.isView(value);
 const proxyMap = /* @__PURE__ */ new WeakMap();
+const stateProxyMap = /* @__PURE__ */ new WeakMap();
+const isKnownProxy = (value) => proxyMap.has(value) || stateProxyMap.has(value);
 const pageWidgetProxyCaches = /* @__PURE__ */ new WeakMap();
 function clearPageWidgetProxyCache(widgetsProxy) {
   var _a;
@@ -118,6 +120,7 @@ function queueBatchedWidgetContextUpdate(widgetName, widget, prop, value, setPag
   }
 }
 const originalTargets = /* @__PURE__ */ new WeakMap();
+const objectsBeingProxied = /* @__PURE__ */ new WeakSet();
 const MUTATING_ARRAY_METHODS = [
   "push",
   "pop",
@@ -389,7 +392,10 @@ const createPageProxy = (target, setPageContext, overriddenPropsRegistry) => {
         }
         return proxy2;
       }
-      const proxy = widget ? createWidgetProxy(widget, widgetName, setPageContext, overriddenPropsRegistry) : void 0;
+      if (!widget) {
+        return void 0;
+      }
+      const proxy = createWidgetProxy(widget, widgetName, setPageContext, overriddenPropsRegistry);
       widgetProxies.set(widgetName, proxy);
       return proxy;
     },
@@ -398,24 +404,23 @@ const createPageProxy = (target, setPageContext, overriddenPropsRegistry) => {
         return true;
       }
       widgetsTarget[widgetName] = widgetValue;
-      if (widgetProxies.has(widgetName)) {
-        const proxy = widgetProxies.get(widgetName);
-        const originalTarget = originalTargets.get(proxy);
-        if (widgetValue && typeof widgetValue === "object") {
-          for (const key in widgetValue) {
-            const newVal = widgetValue[key];
-            const oldVal = originalTarget[key];
-            if (oldVal !== newVal) {
-              Reflect.defineProperty(originalTarget, key, {
-                value: newVal,
-                writable: true,
-                configurable: true,
-                enumerable: true
-              });
-            }
+      const isObjectValue = !!widgetValue && typeof widgetValue === "object";
+      const cachedProxy = widgetProxies.get(widgetName);
+      const originalTarget = cachedProxy ? originalTargets.get(cachedProxy) : void 0;
+      if (originalTarget && isObjectValue) {
+        for (const key in widgetValue) {
+          const newVal = widgetValue[key];
+          const oldVal = originalTarget[key];
+          if (oldVal !== newVal) {
+            Reflect.defineProperty(originalTarget, key, {
+              value: newVal,
+              writable: true,
+              configurable: true,
+              enumerable: true
+            });
           }
         }
-      } else if (widgetValue && typeof widgetValue === "object") {
+      } else if (isObjectValue) {
         const proxy = createWidgetProxy(
           widgetValue,
           widgetName,
@@ -423,6 +428,8 @@ const createPageProxy = (target, setPageContext, overriddenPropsRegistry) => {
           overriddenPropsRegistry
         );
         widgetProxies.set(widgetName, proxy);
+      } else {
+        widgetProxies.delete(widgetName);
       }
       return true;
     }
@@ -430,15 +437,68 @@ const createPageProxy = (target, setPageContext, overriddenPropsRegistry) => {
   pageWidgetProxyCaches.set(widgetsProxy, widgetProxies);
   return widgetsProxy;
 };
+const dataSetRaw = /* @__PURE__ */ new WeakMap();
 const wrapVariableProxy = (variable, path, varName, setPageContext) => {
   if (proxyMap.has(variable)) {
     return variable;
   }
-  const varProxy = new Proxy(variable, {
+  const dataSetProxies = /* @__PURE__ */ new WeakMap();
+  let varProxy;
+  const refreshDataSet = () => {
+    const dataSet = variable.dataSet;
+    varProxy.dataSet = Array.isArray(dataSet) ? [...dataSet] : __spreadValues({}, dataSet);
+  };
+  const createDataSetProxy = (value, isRootDataSet = false) => {
+    if (typeof value !== "object" || value === null || isNonProxyableBuiltin(value)) {
+      return value;
+    }
+    const cached = dataSetProxies.get(value);
+    if (cached) return cached;
+    const proxy = new Proxy(value, {
+      get(target, prop, receiver) {
+        const nestedValue = Reflect.get(target, prop, receiver);
+        if (Array.isArray(target) && typeof prop === "string" && MUTATING_ARRAY_METHODS.includes(prop) && typeof nestedValue === "function") {
+          return (...args) => {
+            const mutationTarget = isRootDataSet ? variable.dataSet : target;
+            const result = Reflect.get(mutationTarget, prop).apply(mutationTarget, args);
+            refreshDataSet();
+            return result;
+          };
+        }
+        return createDataSetProxy(nestedValue);
+      },
+      set(target, prop, value2) {
+        const mutationTarget = isRootDataSet ? variable.dataSet : target;
+        if (Reflect.get(mutationTarget, prop) === value2) {
+          return true;
+        }
+        const result = Reflect.set(mutationTarget, prop, value2);
+        refreshDataSet();
+        return result;
+      },
+      deleteProperty(target, prop) {
+        const result = Reflect.deleteProperty(isRootDataSet ? variable.dataSet : target, prop);
+        refreshDataSet();
+        return result;
+      }
+    });
+    dataSetProxies.set(value, proxy);
+    dataSetRaw.set(proxy, value);
+    return proxy;
+  };
+  varProxy = new Proxy(variable, {
+    get(target, prop, receiver) {
+      const value = Reflect.get(target, prop, receiver);
+      return prop === "dataSet" ? createDataSetProxy(value, true) : value;
+    },
     set(target, prop, value, receiver) {
       if (typeof prop === "symbol") {
         return Reflect.set(target, prop, value, receiver);
       }
+      if (prop === "dataSet" && dataSetRaw.has(value)) {
+        const raw = dataSetRaw.get(value);
+        value = Array.isArray(raw) ? [...raw] : __spreadValues({}, raw);
+      }
       const prevVal = Reflect.get(target, prop, receiver);
       const result = Reflect.set(target, prop, value, receiver);
       if (prevVal !== value) {
@@ -462,8 +522,12 @@ const wrapVariableProxy = (variable, path, varName, setPageContext) => {
   return varProxy;
 };
 const createStateProxy = (obj, path = [], setPageContext, overriddenPropsRegistry) => {
+  if (isKnownProxy(obj) || objectsBeingProxied.has(obj)) {
+    return obj;
+  }
   const nestedProxies = /* @__PURE__ */ new Map();
-  return new Proxy(obj, {
+  objectsBeingProxied.add(obj);
+  const proxy = new Proxy(obj, {
     get(target, prop, receiver) {
       if (prop === "eval") {
         return (fn, failOnError = false) => {
@@ -591,6 +655,9 @@ const createStateProxy = (obj, path = [], setPageContext, overriddenPropsRegistr
       return true;
     }
   });
+  stateProxyMap.set(proxy, true);
+  objectsBeingProxied.delete(obj);
+  return proxy;
 };
 const getFormFieldEntries = (formfields) => {
   const canonicalKeyByField = /* @__PURE__ */ new Map();

package/higherOrder/BaseApp.js

@@ -354,7 +354,7 @@ const BaseApp = (WrappedComponent, addAppScript, getAppVariables, appInfo = {})
           showTypeLabel: showTypeLabel != null ? showTypeLabel : false
         });
         notificationAction.config.paramProvider = newParams;
-        notificationAction.invoke();
+        notificationAction.invoke(__spreadValues({ message }, newParams()));
       } else {
         console.warn(
           `The default Action "appNotification" doesn't exist in the app.  App notified following error:

package/higherOrder/BasePage.js

@@ -154,7 +154,8 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
       formatMessage,
       overriddenPropsRegistryRef: overriddenPropsRegistryRef.current,
       layoutReady,
-      activePageName: componentInfo == null ? void 0 : componentInfo.componentName
+      activePageName: componentInfo == null ? void 0 : componentInfo.componentName,
+      pageName: componentInfo == null ? void 0 : componentInfo.componentName
     }));
     useActivePageReactivity({
       componentType: componentInfo == null ? void 0 : componentInfo.componentType,

package/higherOrder/withBaseWrapper.js

@@ -31,7 +31,7 @@ var __objRest = (source, exclude) => {
   return target;
 };
 import { createElement } from "react";
-import React, { useEffect, useMemo, useCallback } from "react";
+import React, { useEffect, useMemo, useCallback, useRef } from "react";
 import isEqual from "lodash-es/isEqual";
 import { useDeviceVisibility } from "../hooks/useDeviceVisibility";
 import { usePageContext } from "../context/WidgetProvider";
@@ -40,11 +40,19 @@ const withBaseWrapper = (WrappedComponent) => {
   const WithBaseComponent = (props) => {
     var _b, _c, _d;
     const _a = props, { show = true, deferload, standalone = false } = _a, rest = __objRest(_a, ["show", "deferload", "standalone"]);
+    const previousDataValueRef = useRef(props.datavalue);
     const name = props["item-id"] || props.name;
     const { pageContext, updateWidgetState, destroy, proxy } = usePageContext(standalone);
     const { isHidden } = useDeviceVisibility(props.showindevice || ["all"]);
     const componentWidgetId = useMemo(() => props == null ? void 0 : props["data-widget-id"], [props == null ? void 0 : props["data-widget-id"]]);
     const widgetFromContext = name ? (_b = pageContext == null ? void 0 : pageContext.Widgets) == null ? void 0 : _b[name] : void 0;
+    const previousDataValueHasChanged = useMemo(() => {
+      if (previousDataValueRef.current != props.datavalue) {
+        previousDataValueRef.current = props.datavalue;
+        return true;
+      }
+      return false;
+    }, [props.datavalue]);
     useEffect(() => {
       if (name && (props == null ? void 0 : props.iswidget) !== "false" && (pageContext == null ? void 0 : pageContext.Widgets)) {
         const widget = (widgetFromContext == null ? void 0 : widgetFromContext["data-widget-id"]) === componentWidgetId ? widgetFromContext : {};
@@ -67,7 +75,7 @@ const withBaseWrapper = (WrappedComponent) => {
       let mergedState = __spreadValues({}, props);
       const registry = pageContext == null ? void 0 : pageContext.overriddenPropsRegistry;
       const widgetDatavalue = widget.datavalue;
-      const datavalue = props["item-id"] ? props.datavalue : widgetDatavalue != null ? widgetDatavalue : props.datavalue;
+      const datavalue = props["item-id"] || previousDataValueHasChanged ? props.datavalue : widgetDatavalue != null ? widgetDatavalue : props.datavalue;
       if (shouldMergeFromContext && (registry == null ? void 0 : registry.isWidgetOverridden(name, componentWidgetId || "")) && !props.formfield) {
         const widgetOverrides = registry == null ? void 0 : registry.getWidgetOverrides(name, componentWidgetId || "");
         if (widgetOverrides) {

package/hooks/useHttp.d.ts

@@ -22,12 +22,21 @@ declare class ModernHttpService implements HttpClientService {
      * Get the currently stored context
      * @returns The stored context object
      */
+    /**
+     * The axios instance carrying every interceptor setupInterceptors() attaches.
+     *
+     * For module-scope callers that build their own request config and cannot use the useHttp()
+     * hook — the generated service classes in an app's `services/` folder. Without this they had to
+     * own a separate instance and re-implement each interceptor, which drifted (the app's
+     * onBeforeServiceCall stopped firing). Prefer send()/sendCall() for the normal variable flow.
+     */
+    getAxiosInstance(): AxiosInstance;
     getContext(): any;
     getAppManager(): any;
     private handleSessionFailure;
     private setupInterceptors;
-    send(options: any, variable: any): Promise<any>;
-    sendCall(requestParams: any, variable: any): Promise<any>;
+    send(options: any, variable: any, params?: any): Promise<any>;
+    sendCall(requestParams: any, variable: any, params?: any): Promise<any>;
     setLocale(locale: string): void;
     getLocale(): any;
     cancel(variable: any): void;
@@ -46,13 +55,14 @@ export declare const useHttp: () => HttpContextType;
 export declare const getHttpService: () => ModernHttpService;
 export declare const httpService: {
     readonly instance: ModernHttpService;
-    send: (options: any, variable: any) => Promise<any>;
-    sendCall: (requestParams: any, variable: any) => Promise<any>;
+    send: (options: any, variable: any, params?: any) => Promise<any>;
+    sendCall: (requestParams: any, variable: any, params?: any) => Promise<any>;
     cancel: (variable: any) => void;
     uploadFile: (url: string, data: any, variable: any, options?: any) => Promise<any>;
     setLocale: (locale: string) => void;
     getLocale: () => any;
     setContext: (context: any) => void;
     getContext: () => any;
+    getAxiosInstance: () => AxiosInstance;
 };
 export default httpService;

package/hooks/useHttp.js

@@ -28,12 +28,16 @@ import { createContext, useContext, useRef, useMemo } from "react";
 import { WS_CONSTANTS } from "../variables/constants";
 import { store } from "../store";
 import { XSRF_HEADER_NAME } from "../store/slices/authSlice";
+import { getActiveRoutingBasePath, PREVIEW_ROUTING_BASEPATH } from "../core/constants";
 class ModernHttpService {
   constructor(baseURL = "") {
     __publicField(this, "axiosInstance");
     __publicField(this, "_context", null);
     __publicField(this, "localeObject", store.getState().i18n.appLocale);
-    this.axiosInstance = axios.create({ baseURL });
+    this.axiosInstance = axios.create({
+      baseURL,
+      formSerializer: { indexes: null }
+    });
     this.setupInterceptors();
   }
   /**
@@ -47,6 +51,17 @@ class ModernHttpService {
    * Get the currently stored context
    * @returns The stored context object
    */
+  /**
+   * The axios instance carrying every interceptor setupInterceptors() attaches.
+   *
+   * For module-scope callers that build their own request config and cannot use the useHttp()
+   * hook — the generated service classes in an app's `services/` folder. Without this they had to
+   * own a separate instance and re-implement each interceptor, which drifted (the app's
+   * onBeforeServiceCall stopped firing). Prefer send()/sendCall() for the normal variable flow.
+   */
+  getAxiosInstance() {
+    return this.axiosInstance;
+  }
   getContext() {
     return this._context;
   }
@@ -156,8 +171,8 @@ class ModernHttpService {
       }
     );
   }
-  async send(options, variable) {
-    var _a, _b, _c, _d;
+  async send(options, variable, params) {
+    var _a, _b, _c, _d, _e, _f, _g;
     const serviceInfo = variable.serviceInfo;
     let headers = new AxiosHeaders(options.headers);
     let requestBody = options.data;
@@ -186,12 +201,19 @@ class ModernHttpService {
     if (!options.isDirectCall) {
       headers = headers.set("X-Requested-With", "XMLHttpRequest");
     }
+    const plainHeaders = {};
+    const rawHeaders = typeof headers.toJSON === "function" ? headers.toJSON() : headers;
+    if (rawHeaders && typeof rawHeaders === "object") {
+      for (const [k, v] of Object.entries(rawHeaders)) {
+        if (v != null && typeof v !== "function") plainHeaders[k] = String(v);
+      }
+    }
     const methodType = ((serviceInfo == null ? void 0 : serviceInfo.methodType) || options.method || "get").toLowerCase();
     const isNonDataMethod = WS_CONSTANTS.NON_DATA_AXIOS_METHODS.indexOf(methodType.toUpperCase()) > -1;
     const axiosConfig = __spreadProps(__spreadValues({
       url: url.endsWith("/") ? url.slice(0, -1) : url,
       method: methodType,
-      headers,
+      headers: plainHeaders,
       cancelToken: variable.cancelTokenSource.token,
       withCredentials: (options == null ? void 0 : options.withCredentials) !== false
     }, isNonDataMethod ? {} : { data: requestBody || {} }), {
@@ -200,7 +222,8 @@ class ModernHttpService {
         owner: variable.config._context.name,
         operation: variable.operation
         // Add operation to the context
-      }
+      },
+      __axiosInstance: this.axiosInstance
     });
     if (variable.operation === "getDownloadFile" || (serviceInfo == null ? void 0 : serviceInfo.operationId) === "FileController_getDownloadFile") {
       axiosConfig.responseType = "blob";
@@ -209,7 +232,21 @@ class ModernHttpService {
       axiosConfig.onUploadProgress = options.onUploadProgress;
     }
     try {
-      const response = await this.axiosInstance.request(axiosConfig);
+      const isPreview = getActiveRoutingBasePath() === PREVIEW_ROUTING_BASEPATH;
+      let response;
+      if (isPreview || variable.invokeHttp == void 0) {
+        response = await this.axiosInstance.request(axiosConfig);
+      } else {
+        response = await variable.invokeHttp(
+          __spreadProps(__spreadValues({}, axiosConfig), { serviceInfo }),
+          (_g = (_f = (_e = params != null ? params : variable.resolvedParams) != null ? _e : variable.lastInvokedParams) != null ? _f : variable.inputFields) != null ? _g : variable.params,
+          // CrudVariable only: it sets lastInvokedOperation per call. Not `variable.operation`
+          // (for a CrudVariable that is the entity name, "Loan") and not axiosConfig.method
+          // (that is the HTTP verb, "get") — either hits the generated switch's default and
+          // throws. The generated glue defaults an undefined value to its own operationType.
+          variable.lastInvokedOperation
+        );
+      }
       if (variable.operation === "getDownloadFile" || (serviceInfo == null ? void 0 : serviceInfo.operationId) === "FileController_getDownloadFile") {
         return this.handleFileDownload(response, options, variable);
       }
@@ -218,9 +255,9 @@ class ModernHttpService {
       throw error.response || error;
     }
   }
-  async sendCall(requestParams, variable) {
+  async sendCall(requestParams, variable, params) {
     try {
-      const response = await this.send(requestParams, variable);
+      const response = await this.send(requestParams, variable, params);
       return response;
     } catch (error) {
       throw error;
@@ -342,7 +379,8 @@ const httpService = {
   setLocale: (...args) => getHttpService().setLocale(...args),
   getLocale: () => getHttpService().getLocale(),
   setContext: (...args) => getHttpService().setContext(...args),
-  getContext: () => getHttpService().getContext()
+  getContext: () => getHttpService().getContext(),
+  getAxiosInstance: () => getHttpService().getAxiosInstance()
 };
 var useHttp_default = httpService;
 export {