dara-core 1.19.0__py3-none-any.whl → 1.20.0__py3-none-any.whl

dara/core/umd/dara.core.umd.js

@@ -1292,7 +1292,7 @@
     if (null == r2) return {};
     var t2 = {};
     for (var n2 in r2) if ({}.hasOwnProperty.call(r2, n2)) {
-      if (e2.includes(n2)) continue;
+      if (-1 !== e2.indexOf(n2)) continue;
       t2[n2] = r2[n2];
     }
     return t2;
@@ -1830,7 +1830,7 @@
       invariant$1();
     };
   }
-  function noop$4() {
+  function noop$5() {
   }
   var StaticRouter = /* @__PURE__ */ function(_React$Component) {
     _inheritsLoose$1(StaticRouter2, _React$Component);
@@ -1847,10 +1847,10 @@
         return _this.navigateTo(location2, "REPLACE");
       };
       _this.handleListen = function() {
-        return noop$4;
+        return noop$5;
       };
       _this.handleBlock = function() {
-        return noop$4;
+        return noop$5;
       };
       return _this;
     }
@@ -2761,7 +2761,7 @@
     };
     var LEAF = 1;
     var COLLISION = 2;
-    var INDEX = 3;
+    var INDEX2 = 3;
     var ARRAY = 4;
     var empty = {
       __hamt_isEmpty: true
@@ -2790,7 +2790,7 @@
     };
     var IndexedNode = function IndexedNode2(edit, mask, children) {
       return {
-        type: INDEX,
+        type: INDEX2,
         edit,
         mask,
         children,
@@ -2993,7 +2993,7 @@
             }
             return alt;
           }
-          case INDEX: {
+          case INDEX2: {
             var frag = hashFragment(shift2, hash22);
             var bit = toBitmap(frag);
             if (node.mask & bit) {
@@ -3146,7 +3146,7 @@
           };
         case COLLISION:
         case ARRAY:
-        case INDEX:
+        case INDEX2:
           var children = node.children;
           return lazyVisitChildren(children.length, children, 0, f, k);
         default:
@@ -12446,14 +12446,14 @@
   function _nonIterableRest$2() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-  var noop$3 = function noop2() {
+  var noop$4 = function noop2() {
   };
   var _WINDOW = {};
   var _DOCUMENT = {};
   var _MUTATION_OBSERVER = null;
   var _PERFORMANCE = {
-    mark: noop$3,
-    measure: noop$3
+    mark: noop$4,
+    measure: noop$4
   };
   try {
     if (typeof window !== "undefined") _WINDOW = window;
@@ -15789,7 +15789,7 @@
       }
     });
   }
-  function noop$2() {
+  function noop$3() {
   }
   function errorContext(cb) {
     {
@@ -15929,9 +15929,9 @@
   }
   var EMPTY_OBSERVER = {
     closed: true,
-    next: noop$2,
+    next: noop$3,
     error: defaultErrorHandler,
-    complete: noop$2
+    complete: noop$3
   };
   var observable = function() {
     return typeof Symbol === "function" && Symbol.observable || "@@observable";
@@ -19574,6 +19574,7 @@
     }
     return value instanceof ShadowRoot || value instanceof getWindow$1(value).ShadowRoot;
   }
+  const invalidOverflowDisplayValues = /* @__PURE__ */ new Set(["inline", "contents"]);
   function isOverflowElement(element) {
     const {
       overflow,
@@ -19581,24 +19582,29 @@
       overflowY,
       display
     } = getComputedStyle$2(element);
-    return /auto|scroll|overlay|hidden|clip/.test(overflow + overflowY + overflowX) && !["inline", "contents"].includes(display);
+    return /auto|scroll|overlay|hidden|clip/.test(overflow + overflowY + overflowX) && !invalidOverflowDisplayValues.has(display);
   }
+  const tableElements = /* @__PURE__ */ new Set(["table", "td", "th"]);
   function isTableElement$1(element) {
-    return ["table", "td", "th"].includes(getNodeName$1(element));
+    return tableElements.has(getNodeName$1(element));
   }
+  const topLayerSelectors = [":popover-open", ":modal"];
   function isTopLayer(element) {
-    return [":popover-open", ":modal"].some((selector2) => {
+    return topLayerSelectors.some((selector2) => {
       try {
         return element.matches(selector2);
-      } catch (e2) {
+      } catch (_e2) {
         return false;
       }
     });
   }
+  const transformProperties = ["transform", "translate", "scale", "rotate", "perspective"];
+  const willChangeValues = ["transform", "translate", "scale", "rotate", "perspective", "filter"];
+  const containValues = ["paint", "layout", "strict", "content"];
   function isContainingBlock(elementOrCss) {
     const webkit = isWebKit();
     const css2 = isElement$1(elementOrCss) ? getComputedStyle$2(elementOrCss) : elementOrCss;
-    return css2.transform !== "none" || css2.perspective !== "none" || (css2.containerType ? css2.containerType !== "normal" : false) || !webkit && (css2.backdropFilter ? css2.backdropFilter !== "none" : false) || !webkit && (css2.filter ? css2.filter !== "none" : false) || ["transform", "perspective", "filter"].some((value) => (css2.willChange || "").includes(value)) || ["paint", "layout", "strict", "content"].some((value) => (css2.contain || "").includes(value));
+    return transformProperties.some((value) => css2[value] ? css2[value] !== "none" : false) || (css2.containerType ? css2.containerType !== "normal" : false) || !webkit && (css2.backdropFilter ? css2.backdropFilter !== "none" : false) || !webkit && (css2.filter ? css2.filter !== "none" : false) || willChangeValues.some((value) => (css2.willChange || "").includes(value)) || containValues.some((value) => (css2.contain || "").includes(value));
   }
   function getContainingBlock$1(element) {
     let currentNode = getParentNode$1(element);
@@ -19616,8 +19622,9 @@
     if (typeof CSS === "undefined" || !CSS.supports) return false;
     return CSS.supports("-webkit-backdrop-filter", "none");
   }
+  const lastTraversableNodeNames = /* @__PURE__ */ new Set(["html", "body", "#document"]);
   function isLastTraversableNode(node) {
-    return ["html", "body", "#document"].includes(getNodeName$1(node));
+    return lastTraversableNodeNames.has(getNodeName$1(node));
   }
   function getComputedStyle$2(element) {
     return getWindow$1(element).getComputedStyle(element);
@@ -19817,8 +19824,9 @@
   function getAxisLength(axis) {
     return axis === "y" ? "height" : "width";
   }
+  const yAxisSides = /* @__PURE__ */ new Set(["top", "bottom"]);
   function getSideAxis(placement) {
-    return ["top", "bottom"].includes(getSide(placement)) ? "y" : "x";
+    return yAxisSides.has(getSide(placement)) ? "y" : "x";
   }
   function getAlignmentAxis(placement) {
     return getOppositeAxis(getSideAxis(placement));
@@ -19843,19 +19851,19 @@
   function getOppositeAlignmentPlacement(placement) {
     return placement.replace(/start|end/g, (alignment) => oppositeAlignmentMap[alignment]);
   }
+  const lrPlacement = ["left", "right"];
+  const rlPlacement = ["right", "left"];
+  const tbPlacement = ["top", "bottom"];
+  const btPlacement = ["bottom", "top"];
   function getSideList(side, isStart, rtl) {
-    const lr = ["left", "right"];
-    const rl = ["right", "left"];
-    const tb = ["top", "bottom"];
-    const bt2 = ["bottom", "top"];
     switch (side) {
       case "top":
       case "bottom":
-        if (rtl) return isStart ? rl : lr;
-        return isStart ? lr : rl;
+        if (rtl) return isStart ? rlPlacement : lrPlacement;
+        return isStart ? lrPlacement : rlPlacement;
       case "left":
       case "right":
-        return isStart ? tb : bt2;
+        return isStart ? tbPlacement : btPlacement;
       default:
         return [];
     }
@@ -20617,15 +20625,20 @@
           const nextIndex2 = (((_middlewareData$flip2 = middlewareData.flip) == null ? void 0 : _middlewareData$flip2.index) || 0) + 1;
           const nextPlacement = placements2[nextIndex2];
           if (nextPlacement) {
-            return {
-              data: {
-                index: nextIndex2,
-                overflows: overflowsData
-              },
-              reset: {
-                placement: nextPlacement
-              }
-            };
+            const ignoreCrossAxisOverflow = checkCrossAxis === "alignment" ? initialSideAxis !== getSideAxis(nextPlacement) : false;
+            if (!ignoreCrossAxisOverflow || // We leave the current main axis only if every placement on that axis
+            // overflows the main axis.
+            overflowsData.every((d2) => d2.overflows[0] > 0 && getSideAxis(d2.placement) === initialSideAxis)) {
+              return {
+                data: {
+                  index: nextIndex2,
+                  overflows: overflowsData
+                },
+                reset: {
+                  placement: nextPlacement
+                }
+              };
+            }
           }
           let resetPlacement = (_overflowsData$filter = overflowsData.filter((d2) => d2.overflows[0] <= 0).sort((a2, b2) => a2.overflows[1] - b2.overflows[1])[0]) == null ? void 0 : _overflowsData$filter.placement;
           if (!resetPlacement) {
@@ -20663,6 +20676,7 @@
       }
     };
   };
+  const originSides = /* @__PURE__ */ new Set(["left", "top"]);
   async function convertValueToCoords(state, options) {
     const {
       placement,
@@ -20673,7 +20687,7 @@
     const side = getSide(placement);
     const alignment = getAlignment(placement);
     const isVertical = getSideAxis(placement) === "y";
-    const mainAxisMulti = ["left", "top"].includes(side) ? -1 : 1;
+    const mainAxisMulti = originSides.has(side) ? -1 : 1;
     const crossAxisMulti = rtl && isVertical ? -1 : 1;
     const rawValue = evaluate(options, state);
     let {
@@ -21103,6 +21117,7 @@
       y
     };
   }
+  const absoluteOrFixed = /* @__PURE__ */ new Set(["absolute", "fixed"]);
   function getInnerBoundingClientRect$1(element, strategy) {
     const clientRect = getBoundingClientRect$1(element, true, strategy === "fixed");
     const top2 = clientRect.top + element.clientTop;
@@ -21160,7 +21175,7 @@
       if (!currentNodeIsContaining && computedStyle.position === "fixed") {
         currentContainingBlockComputedStyle = null;
       }
-      const shouldDropCurrentNode = elementIsFixed ? !currentNodeIsContaining && !currentContainingBlockComputedStyle : !currentNodeIsContaining && computedStyle.position === "static" && !!currentContainingBlockComputedStyle && ["absolute", "fixed"].includes(currentContainingBlockComputedStyle.position) || isOverflowElement(currentNode) && !currentNodeIsContaining && hasFixedPositionAncestor(element, currentNode);
+      const shouldDropCurrentNode = elementIsFixed ? !currentNodeIsContaining && !currentContainingBlockComputedStyle : !currentNodeIsContaining && computedStyle.position === "static" && !!currentContainingBlockComputedStyle && absoluteOrFixed.has(currentContainingBlockComputedStyle.position) || isOverflowElement(currentNode) && !currentNodeIsContaining && hasFixedPositionAncestor(element, currentNode);
       if (shouldDropCurrentNode) {
         result = result.filter((ancestor) => ancestor !== currentNode);
       } else {
@@ -21216,6 +21231,9 @@
       scrollTop: 0
     };
     const offsets = createCoords(0);
+    function setLeftRTLScrollbarOffset() {
+      offsets.x = getWindowScrollBarX$1(documentElement);
+    }
     if (isOffsetParentAnElement || !isOffsetParentAnElement && !isFixed) {
       if (getNodeName$1(offsetParent) !== "body" || isOverflowElement(documentElement)) {
         scroll = getNodeScroll$1(offsetParent);
@@ -21225,9 +21243,12 @@
         offsets.x = offsetRect.x + offsetParent.clientLeft;
         offsets.y = offsetRect.y + offsetParent.clientTop;
       } else if (documentElement) {
-        offsets.x = getWindowScrollBarX$1(documentElement);
+        setLeftRTLScrollbarOffset();
       }
     }
+    if (isFixed && !isOffsetParentAnElement && documentElement) {
+      setLeftRTLScrollbarOffset();
+    }
     const htmlOffset = documentElement && !isOffsetParentAnElement && !isFixed ? getHTMLOffset(documentElement, scroll) : createCoords(0);
     const x = rect.left + scroll.scrollLeft - offsets.x - htmlOffset.x;
     const y = rect.top + scroll.scrollTop - offsets.y - htmlOffset.y;
@@ -21307,6 +21328,9 @@
     isElement: isElement$1,
     isRTL
   };
+  function rectsAreEqual(a2, b2) {
+    return a2.x === b2.x && a2.y === b2.y && a2.width === b2.width && a2.height === b2.height;
+  }
   function observeMove(element, onMove) {
     let io = null;
     let timeoutId2;
@@ -21325,12 +21349,13 @@
         threshold = 1;
       }
       cleanup();
+      const elementRectForRootMargin = element.getBoundingClientRect();
       const {
         left: left2,
         top: top2,
         width,
         height
-      } = element.getBoundingClientRect();
+      } = elementRectForRootMargin;
       if (!skip) {
         onMove();
       }
@@ -21361,6 +21386,9 @@
             refresh(false, ratio);
           }
         }
+        if (ratio === 1 && !rectsAreEqual(elementRectForRootMargin, element.getBoundingClientRect())) {
+          refresh();
+        }
         isFirstUpdate = false;
       }
       try {
@@ -21369,7 +21397,7 @@
           // Handle <iframe>s
           root: root.ownerDocument
         });
-      } catch (e2) {
+      } catch (_e2) {
         io = new IntersectionObserver(handleObserve, options);
       }
       io.observe(element);
@@ -21424,7 +21452,7 @@
     }
     function frameLoop() {
       const nextRefRect = getBoundingClientRect$1(reference2);
-      if (prevRefRect && (nextRefRect.x !== prevRefRect.x || nextRefRect.y !== prevRefRect.y || nextRefRect.width !== prevRefRect.width || nextRefRect.height !== prevRefRect.height)) {
+      if (prevRefRect && !rectsAreEqual(prevRefRect, nextRefRect)) {
         update();
       }
       prevRefRect = nextRefRect;
@@ -21466,7 +21494,10 @@
       platform: platformWithCache
     });
   };
-  var index$2 = typeof document !== "undefined" ? React$1.useLayoutEffect : React$1.useEffect;
+  var isClient = typeof document !== "undefined";
+  var noop$2 = function noop2() {
+  };
+  var index$2 = isClient ? React$1.useLayoutEffect : noop$2;
   function deepEqual(a2, b2) {
     if (a2 === b2) {
       return true;
@@ -22045,11 +22076,11 @@
         performedPointerEventsMutationRef.current = false;
       }
     });
+    const isClickLikeOpenEvent = useEffectEvent(() => {
+      return dataRef.current.openEvent ? ["click", "mousedown"].includes(dataRef.current.openEvent.type) : false;
+    });
     React__namespace.useEffect(() => {
       if (!enabled) return;
-      function isClickLikeOpenEvent() {
-        return dataRef.current.openEvent ? ["click", "mousedown"].includes(dataRef.current.openEvent.type) : false;
-      }
       function onMouseEnter(event) {
         clearTimeout(timeoutRef.current);
         blockMouseMoveRef.current = false;
@@ -22063,7 +22094,7 @@
               onOpenChange(true, event, "hover");
             }
           }, openDelay);
-        } else {
+        } else if (!open2) {
           onOpenChange(true, event, "hover");
         }
       }
@@ -22085,7 +22116,9 @@
             onClose() {
               clearPointerEvents();
               cleanupMouseMoveHandler();
-              closeWithDelay(event, true, "safe-polygon");
+              if (!isClickLikeOpenEvent()) {
+                closeWithDelay(event, true, "safe-polygon");
+              }
             }
           });
           const handler = handlerRef.current;
@@ -22111,7 +22144,9 @@
           onClose() {
             clearPointerEvents();
             cleanupMouseMoveHandler();
-            closeWithDelay(event);
+            if (!isClickLikeOpenEvent()) {
+              closeWithDelay(event);
+            }
           }
         })(event);
       }
@@ -22134,7 +22169,7 @@
           ref.removeEventListener("mouseleave", onMouseLeave);
         };
       }
-    }, [elements, enabled, context2, mouseOnly, restMs, move, closeWithDelay, cleanupMouseMoveHandler, clearPointerEvents, onOpenChange, open2, openRef, tree, delayRef, handleCloseRef, dataRef]);
+    }, [elements, enabled, context2, mouseOnly, restMs, move, closeWithDelay, cleanupMouseMoveHandler, clearPointerEvents, onOpenChange, open2, openRef, tree, delayRef, handleCloseRef, dataRef, isClickLikeOpenEvent]);
     index$1(() => {
       var _handleCloseRef$curre;
       if (!enabled) return;
@@ -22217,9 +22252,11 @@
         clearTimeout(timeoutRef.current);
       },
       onMouseLeave(event) {
-        closeWithDelay(event.nativeEvent, false);
+        if (!isClickLikeOpenEvent()) {
+          closeWithDelay(event.nativeEvent, false);
+        }
       }
-    }), [closeWithDelay]);
+    }), [closeWithDelay, isClickLikeOpenEvent]);
     return React__namespace.useMemo(() => enabled ? {
       reference: reference2,
       floating
@@ -22503,7 +22540,8 @@
       event: eventOption = "click",
       toggle = true,
       ignoreMouse = false,
-      keyboardHandlers = true
+      keyboardHandlers = true,
+      stickIfOpen = true
     } = props;
     const pointerTypeRef = React__namespace.useRef();
     const didKeyDownRef = React__namespace.useRef(false);
@@ -22516,7 +22554,7 @@
         if (event.button !== 0) return;
         if (eventOption === "click") return;
         if (isMouseLikePointerType(pointerType, true) && ignoreMouse) return;
-        if (open2 && toggle && (dataRef.current.openEvent ? dataRef.current.openEvent.type === "mousedown" : true)) {
+        if (open2 && toggle && (dataRef.current.openEvent && stickIfOpen ? dataRef.current.openEvent.type === "mousedown" : true)) {
           onOpenChange(false, event.nativeEvent, "click");
         } else {
           event.preventDefault();
@@ -22530,7 +22568,7 @@
           return;
         }
         if (isMouseLikePointerType(pointerType, true) && ignoreMouse) return;
-        if (open2 && toggle && (dataRef.current.openEvent ? dataRef.current.openEvent.type === "click" : true)) {
+        if (open2 && toggle && (dataRef.current.openEvent && stickIfOpen ? dataRef.current.openEvent.type === "click" : true)) {
           onOpenChange(false, event.nativeEvent, "click");
         } else {
           onOpenChange(true, event.nativeEvent, "click");
@@ -22566,7 +22604,7 @@
           }
         }
       }
-    }), [dataRef, domReference, eventOption, ignoreMouse, keyboardHandlers, onOpenChange, open2, toggle]);
+    }), [dataRef, domReference, eventOption, ignoreMouse, keyboardHandlers, onOpenChange, open2, stickIfOpen, toggle]);
     return React__namespace.useMemo(() => enabled ? {
       reference: reference2
     } : {}, [enabled, reference2]);
@@ -23906,6 +23944,10 @@
 
     border: none;
     border-radius: 0.25rem;
+
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    transition-duration: 150ms;
+    transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
 `;
   function getOutlinedButtonStyle(buttonColor, disabled2, theme2) {
     return `
@@ -32390,6 +32432,112 @@
         cursor: not-allowed;
         color: ${(props) => props.theme.colors.grey2};
     }
+`;
+  styled.div`
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    background-color: ${(props) => props.theme.colors.blue1};
+    border-radius: 4px;
+    outline: none;
+    box-shadow: rgb(0 0 0 / 10%) 0 2px 5px;
+
+    & > button:first-child {
+        border-radius: 4px;
+    }
+
+    &.enter {
+        transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
+        transition-duration: 100ms;
+        transition-property: opacity, transform;
+    }
+
+    &.enter-from {
+        transform: scale(0.95);
+        opacity: 0;
+    }
+
+    &.enter-to {
+        transform: scale(1);
+        opacity: 1;
+    }
+
+    &.leave {
+        transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
+        transition-duration: 75ms;
+        transition-property: opacity, transform;
+    }
+
+    &.leave-from {
+        transform: scale(1);
+        opacity: 1;
+    }
+
+    &.leave-to {
+        transform: scale(0.95);
+        opacity: 0;
+    }
+`;
+  styled.button`
+    cursor: pointer;
+
+    display: flex;
+    gap: 0.25rem;
+    align-items: center;
+    justify-content: space-between;
+
+    width: 100%;
+    min-width: 160px;
+    height: fit-content;
+    padding: 5px 8px;
+
+    font-size: 0.9rem;
+    color: ${(props) => props.theme.colors.text};
+    white-space: nowrap;
+
+    background-color: ${(props) => props.theme.colors.blue1};
+    border: none;
+    border-radius: 4px;
+    box-shadow: none;
+
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    transition-duration: 150ms;
+    transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
+
+    &:hover {
+        background-color: ${(props) => props.theme.colors.grey1};
+    }
+
+    &:active {
+        background-color: ${(props) => props.theme.colors.grey2};
+    }
+
+    &:disabled {
+        cursor: not-allowed;
+        color: ${(props) => props.theme.colors.grey3};
+
+        svg {
+            color: ${(props) => props.theme.colors.grey3};
+        }
+    }
+`;
+  styled.div`
+    padding: 4px;
+`;
+  styled.hr`
+    width: 100%;
+    margin: 0.25rem 0;
+    border: none;
+    border-top: 1px solid ${(props) => props.theme.colors.grey2};
+`;
+  styled.div`
+    display: flex;
+    gap: 0.5rem;
+    width: 100%;
+`;
+  styled.div`
+    color: ${(props) => props.theme.colors.grey3};
 `;
   var locale$1 = {
     localize: localize$1
@@ -37785,7 +37933,7 @@
     effect,
     data: {}
   };
-  var hash$2 = {
+  var hash$1 = {
     left: "right",
     right: "left",
     bottom: "top",
@@ -37793,16 +37941,16 @@
   };
   function getOppositePlacement(placement) {
     return placement.replace(/left|right|bottom|top/g, function(matched) {
-      return hash$2[matched];
+      return hash$1[matched];
     });
   }
-  var hash$1 = {
+  var hash = {
     start: "end",
     end: "start"
   };
   function getOppositeVariationPlacement(placement) {
     return placement.replace(/start|end/g, function(matched) {
-      return hash$1[matched];
+      return hash[matched];
     });
   }
   function getWindowScroll(node) {
@@ -43506,10 +43654,13 @@
     const unpackedItems = React$1.useMemo(() => unpackSectionedList(props.items), [props.items]);
     const [pendingHighlight, setPendingHighlight] = React$1.useState(null);
     const [items, setItems] = React$1.useState(unpackedItems);
-    const [inputValue, setInputValue] = React$1.useState((_b = (_a = props.selectedItem) === null || _a === void 0 ? void 0 : _a.label) !== null && _b !== void 0 ? _b : "");
+    const [inputValue, setInputValue] = React$1.useState(((_a = props.selectedItem) === null || _a === void 0 ? void 0 : _a.label) && props.selectedItem.label !== "null" ? props.selectedItem.label : (_b = props.placeholder) !== null && _b !== void 0 ? _b : "");
     const [kbdHighlightIdx, setKbdHighlightIdx] = React$1.useState();
     const { selectedItem, isOpen, getMenuProps, getInputProps, getToggleButtonProps, getItemProps, setHighlightedIndex } = useCombobox(Object.assign(Object.assign(Object.assign({ initialIsOpen: false, initialSelectedItem: (_c = props.initialValue) !== null && _c !== void 0 ? _c : props.selectedItem, itemToString: (item) => item ? item.label : "", items, onInputValueChange: (change) => {
-      setInputValue(change.inputValue);
+      const shouldUpdateInput = [stateChangeTypes.ItemClick, stateChangeTypes.InputChange].includes(change.type);
+      if (shouldUpdateInput) {
+        setInputValue(change.inputValue);
+      }
       if (!change.inputValue) {
         setItems(unpackedItems);
         return;
@@ -43574,10 +43725,11 @@
       }
     }, [isOpen, pendingHighlight, setHighlightedIndex]);
     React$1.useEffect(() => {
+      var _a2;
       if (props.selectedItem === null) {
-        setInputValue("");
+        setInputValue((_a2 = props.placeholder) !== null && _a2 !== void 0 ? _a2 : "");
       }
-    }, [props.selectedItem]);
+    }, [props.selectedItem, props.placeholder]);
     const { refs, floatingStyles, context: context2 } = useFloating({
       open: isOpen,
       placement: "bottom-start",
@@ -43639,9 +43791,11 @@
   requireRound();
   const $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c = typeof document !== "undefined" ? React$1.useLayoutEffect : () => {
   };
+  var $8ae05eaa5c114e9c$var$_React_useInsertionEffect;
+  const $8ae05eaa5c114e9c$var$useEarlyEffect = ($8ae05eaa5c114e9c$var$_React_useInsertionEffect = React$1["useInsertionEffect"]) !== null && $8ae05eaa5c114e9c$var$_React_useInsertionEffect !== void 0 ? $8ae05eaa5c114e9c$var$_React_useInsertionEffect : $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c;
   function $8ae05eaa5c114e9c$export$7f54fc3180508a52(fn) {
     const ref = React$1.useRef(null);
-    $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c(() => {
+    $8ae05eaa5c114e9c$var$useEarlyEffect(() => {
       ref.current = fn;
     }, [
       fn
@@ -43881,11 +44035,54 @@
     "ping",
     "referrerPolicy"
   ]);
+  const $65484d02dcb7eb3e$var$globalAttrs = /* @__PURE__ */ new Set([
+    "dir",
+    "lang",
+    "hidden",
+    "inert",
+    "translate"
+  ]);
+  const $65484d02dcb7eb3e$var$globalEvents = /* @__PURE__ */ new Set([
+    "onClick",
+    "onAuxClick",
+    "onContextMenu",
+    "onDoubleClick",
+    "onMouseDown",
+    "onMouseEnter",
+    "onMouseLeave",
+    "onMouseMove",
+    "onMouseOut",
+    "onMouseOver",
+    "onMouseUp",
+    "onTouchCancel",
+    "onTouchEnd",
+    "onTouchMove",
+    "onTouchStart",
+    "onPointerDown",
+    "onPointerMove",
+    "onPointerUp",
+    "onPointerCancel",
+    "onPointerEnter",
+    "onPointerLeave",
+    "onPointerOver",
+    "onPointerOut",
+    "onGotPointerCapture",
+    "onLostPointerCapture",
+    "onScroll",
+    "onWheel",
+    "onAnimationStart",
+    "onAnimationEnd",
+    "onAnimationIteration",
+    "onTransitionCancel",
+    "onTransitionEnd",
+    "onTransitionRun",
+    "onTransitionStart"
+  ]);
   const $65484d02dcb7eb3e$var$propRe = /^(data-.*)$/;
   function $65484d02dcb7eb3e$export$457c3d6518dd4c6f(props, opts = {}) {
-    let { labelable, isLink, propNames } = opts;
+    let { labelable, isLink, global: global2, events = global2, propNames } = opts;
     let filteredProps = {};
-    for (const prop in props) if (Object.prototype.hasOwnProperty.call(props, prop) && ($65484d02dcb7eb3e$var$DOMPropNames.has(prop) || labelable && $65484d02dcb7eb3e$var$labelablePropNames.has(prop) || isLink && $65484d02dcb7eb3e$var$linkPropNames.has(prop) || (propNames === null || propNames === void 0 ? void 0 : propNames.has(prop)) || $65484d02dcb7eb3e$var$propRe.test(prop))) filteredProps[prop] = props[prop];
+    for (const prop in props) if (Object.prototype.hasOwnProperty.call(props, prop) && ($65484d02dcb7eb3e$var$DOMPropNames.has(prop) || labelable && $65484d02dcb7eb3e$var$labelablePropNames.has(prop) || isLink && $65484d02dcb7eb3e$var$linkPropNames.has(prop) || global2 && $65484d02dcb7eb3e$var$globalAttrs.has(prop) || events && $65484d02dcb7eb3e$var$globalEvents.has(prop) || prop.endsWith("Capture") && $65484d02dcb7eb3e$var$globalEvents.has(prop.slice(0, -7)) || (propNames === null || propNames === void 0 ? void 0 : propNames.has(prop)) || $65484d02dcb7eb3e$var$propRe.test(prop))) filteredProps[prop] = props[prop];
     return filteredProps;
   }
   function $7215afc6de606d6b$export$de79e2c695e052f3(element) {
@@ -43943,7 +44140,8 @@
   function $c87311424ea30a05$var$testUserAgent(re) {
     var _window_navigator_userAgentData;
     if (typeof window === "undefined" || window.navigator == null) return false;
-    return ((_window_navigator_userAgentData = window.navigator["userAgentData"]) === null || _window_navigator_userAgentData === void 0 ? void 0 : _window_navigator_userAgentData.brands.some((brand) => re.test(brand.brand))) || re.test(window.navigator.userAgent);
+    let brands = (_window_navigator_userAgentData = window.navigator["userAgentData"]) === null || _window_navigator_userAgentData === void 0 ? void 0 : _window_navigator_userAgentData.brands;
+    return Array.isArray(brands) && brands.some((brand) => re.test(brand.brand)) || re.test(window.navigator.userAgent);
   }
   function $c87311424ea30a05$var$testPlatform(re) {
     var _window_navigator_userAgentData;
@@ -44133,9 +44331,8 @@
     return event.detail === 0 && !event.pointerType;
   }
   function $99facab73266f662$export$5add1d006293d136(ref, initialValue, onReset) {
-    let resetValue = React$1.useRef(initialValue);
     let handleReset2 = $8ae05eaa5c114e9c$export$7f54fc3180508a52(() => {
-      if (onReset) onReset(resetValue.current);
+      if (onReset) onReset(initialValue);
     });
     React$1.useEffect(() => {
       var _ref_current;
@@ -44196,9 +44393,14 @@
   }
   function $9446cca9a3875146$export$e1a7b8e69ef6c52f(value, step) {
     let roundedValue = value;
+    let precision = 0;
     let stepString = step.toString();
-    let pointIndex = stepString.indexOf(".");
-    let precision = pointIndex >= 0 ? stepString.length - pointIndex : 0;
+    let eIndex = stepString.toLowerCase().indexOf("e-");
+    if (eIndex > 0) precision = Math.abs(Math.floor(Math.log10(Math.abs(step)))) + eIndex;
+    else {
+      let pointIndex = stepString.indexOf(".");
+      if (pointIndex >= 0) precision = stepString.length - pointIndex;
+    }
     if (precision > 0) {
       let pow = Math.pow(10, precision);
       roundedValue = Math.round(roundedValue * pow) / pow;
@@ -44785,7 +44987,9 @@
   }
   function $6179b936705e76d3$var$setupGlobalTouchEvents() {
     if (typeof document === "undefined") return;
-    if (typeof PointerEvent !== "undefined") document.addEventListener("pointerup", $6179b936705e76d3$var$handleGlobalPointerEvent);
+    if ($6179b936705e76d3$var$hoverCount === 0) {
+      if (typeof PointerEvent !== "undefined") document.addEventListener("pointerup", $6179b936705e76d3$var$handleGlobalPointerEvent);
+    }
     $6179b936705e76d3$var$hoverCount++;
     return () => {
       $6179b936705e76d3$var$hoverCount--;
@@ -45320,7 +45524,8 @@
       step
     ]);
     let value = React$1.useMemo(() => restrictValues($28f99e3e86e6ec45$var$convertValue(props.value)), [
-      props.value
+      props.value,
+      restrictValues
     ]);
     let defaultValue = React$1.useMemo(() => {
       var _convertValue;
@@ -45329,11 +45534,13 @@
       ]);
     }, [
       props.defaultValue,
-      minValue
+      minValue,
+      restrictValues
     ]);
     let onChange2 = $28f99e3e86e6ec45$var$createOnChange(props.value, props.defaultValue, props.onChange);
     let onChangeEnd = $28f99e3e86e6ec45$var$createOnChange(props.value, props.defaultValue, props.onChangeEnd);
     const [values, setValuesState] = $458b0a5536c1a7cf$export$40bfa8c7b0832715(value, defaultValue, onChange2);
+    let [initialValues] = React$1.useState(values);
     const [isDraggings, setDraggingsState] = React$1.useState(new Array(values.length).fill(false));
     const isEditablesRef = React$1.useRef(new Array(values.length).fill(true));
     const [focusedIndex, setFocusedIndex] = React$1.useState(void 0);
@@ -45401,6 +45608,7 @@
     }
     return {
       values,
+      defaultValues: props.defaultValue !== void 0 ? defaultValue : initialValues,
       getThumbValue: (index2) => values[index2],
       setThumbValue: updateValue,
       setThumbPercent,
@@ -45619,7 +45827,7 @@
     };
   }
   function $47b897dc8cdb026b$export$8d15029008292ae(opts, state) {
-    let { index: index2 = 0, isRequired, validationState, isInvalid, trackRef, inputRef, orientation = state.orientation, name } = opts;
+    let { index: index2 = 0, isRequired, validationState, isInvalid, trackRef, inputRef, orientation = state.orientation, name, form } = opts;
     let isDisabled = opts.isDisabled || state.isDisabled;
     let isVertical = orientation === "vertical";
     let { direction } = $18f2051aff69b9bf$export$43bb16f9c6d9e3f7();
@@ -45738,7 +45946,7 @@
         onDown(e2.changedTouches[0].identifier);
       }
     }) : {};
-    $99facab73266f662$export$5add1d006293d136(inputRef, value, (v) => {
+    $99facab73266f662$export$5add1d006293d136(inputRef, state.defaultValues[index2], (v) => {
       state.setThumbValue(index2, v);
     });
     return {
@@ -45750,6 +45958,7 @@
         step: state.step,
         value,
         name,
+        form,
         disabled: isDisabled,
         "aria-orientation": orientation,
         "aria-valuetext": state.getThumbValueLabel(index2),
@@ -45810,7 +46019,9 @@
       },
       defaultClassName: "react-aria-Slider"
     });
-    let DOMProps = $65484d02dcb7eb3e$export$457c3d6518dd4c6f(props);
+    let DOMProps = $65484d02dcb7eb3e$export$457c3d6518dd4c6f(props, {
+      global: true
+    });
     delete DOMProps.id;
     return /* @__PURE__ */ React$1.createElement($64fa3d84918910a7$export$2881499e37b75b9a, {
       values: [
@@ -45838,9 +46049,7 @@
         ]
       ]
     }, /* @__PURE__ */ React$1.createElement("div", {
-      ...DOMProps,
-      ...groupProps,
-      ...renderProps,
+      ...$3ef42575df84b30b$export$9d1611c77c2fe928(DOMProps, renderProps, groupProps),
       ref,
       slot: props.slot || void 0,
       "data-orientation": state.orientation,
@@ -45904,7 +46113,9 @@
         isDisabled
       }
     });
-    let DOMProps = $65484d02dcb7eb3e$export$457c3d6518dd4c6f(props);
+    let DOMProps = $65484d02dcb7eb3e$export$457c3d6518dd4c6f(props, {
+      global: true
+    });
     delete DOMProps.id;
     return /* @__PURE__ */ React$1.createElement("div", {
       ...$3ef42575df84b30b$export$9d1611c77c2fe928(DOMProps, thumbProps, hoverProps),
@@ -56275,14 +56486,26 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   const maxDisconnectedTime = 1e4;
   const interPingInterval = 5e3;
   const maxAttempts = Math.round(maxDisconnectedTime / interAttemptTimeout);
+  class TaskCancelledError extends Error {
+    constructor(message, task_id) {
+      super(message);
+      this.task_id = task_id;
+    }
+  }
+  class TaskError extends Error {
+    constructor(message, task_id) {
+      super(message);
+      this.task_id = task_id;
+    }
+  }
   function isInitMessage(message) {
     return message.type === "init";
   }
   function isTaskNotification(message) {
     return message.type === "message" && "status" in message.message && "task_id" in message.message;
   }
-  function isServerTriggerMessage(message) {
-    return message.type === "message" && "data_id" in message.message;
+  function isServerVariableMessage(message) {
+    return message.type === "message" && "__type" in message.message && message.message.__type === "ServerVariable";
   }
   function isServerErrorMessage(message) {
     return message.type === "message" && "error" in message.message;
@@ -56408,6 +56631,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         map$2((msg) => msg.message)
       );
     }
+    serverVariableMessages$() {
+      return this.messages$.pipe(
+        filter(isServerVariableMessage),
+        map$2((msg) => msg.message)
+      );
+    }
     /**
      * Get the observable to receive the new channel when the socket reconnects
      */
@@ -56442,17 +56671,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         )
       );
     }
-    /**
-     * Get the observable to receive server trigger messages for a given data variable
-     *
-     * @param dataId id of the data variable triggered
-     */
-    serverTriggers$(dataId) {
-      return this.messages$.pipe(
-        filter(isServerTriggerMessage),
-        filter((msg) => msg.message?.data_id === dataId)
-      );
-    }
     /**
      * Get the observable to receive server error messages
      */
@@ -56483,21 +56701,21 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return this.messages$.pipe(filter(isCustomMessage));
     }
     /**
-     * Returns a promise that will resolve when the task is completed. If the task is cancelled then this will throw an
+     * Returns a promise that will resolve when the task is completed. If the task is cancelled or errored then this will throw an
      * error to signify that.
      *
      * @param task_id the id of the task to wait for
      */
     waitForTask(task_id) {
       return this.messages$.pipe(
-        filter(
-          (msg) => isTaskNotification(msg) && msg.message?.task_id === task_id && msg.message.status !== "PROGRESS"
-          /* PROGRESS */
-          // don't take progress updates
-        ),
+        filter((msg) => {
+          return isTaskNotification(msg) && msg.message?.task_id === task_id && msg.message.status !== "PROGRESS";
+        }),
         map$2((msg) => {
-          if (isTaskNotification(msg) && msg.message.status === "CANCELED") {
-            throw new Error("CANCELED");
+          if (msg.message.status === "CANCELED") {
+            throw new TaskCancelledError("Task was cancelled", msg.message.task_id);
+          } else if (msg.message.status === "ERROR") {
+            throw new TaskError(msg.message.error, msg.message.task_id);
           }
           return msg;
         }),
@@ -56638,17 +56856,14 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   function isVariable(variable) {
     return variable && typeof variable == "object" && variable.hasOwnProperty("uid") && variable.hasOwnProperty("__typename") && variable.__typename.includes("Variable");
   }
-  function isUrlVariable(variable) {
-    return isVariable(variable) && variable.__typename === "UrlVariable";
+  function isSingleVariable(variable) {
+    return isVariable(variable) && variable.__typename === "Variable";
   }
   function isDerivedVariable(variable) {
     return isVariable(variable) && variable.__typename === "DerivedVariable";
   }
-  function isDataVariable(variable) {
-    return isVariable(variable) && variable.__typename === "DataVariable";
-  }
-  function isDerivedDataVariable(variable) {
-    return isVariable(variable) && variable.__typename === "DerivedDataVariable";
+  function isServerVariable(variable) {
+    return isVariable(variable) && variable.__typename === "ServerVariable";
   }
   function isLoopVariable(variable) {
     return variable && typeof variable == "object" && variable.hasOwnProperty("uid") && variable.hasOwnProperty("__typename") && variable.__typename === "LoopVariable";
@@ -56656,14 +56871,14 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   function isSwitchVariable(variable) {
     return isVariable(variable) && variable.__typename === "SwitchVariable";
   }
+  function isStateVariable(variable) {
+    return isVariable(variable) && variable.__typename === "StateVariable";
+  }
   function isResolvedDerivedVariable(value) {
     return value && typeof value === "object" && "values" in value && "type" in value && value.type === "derived" && "uid" in value;
   }
-  function isResolvedDataVariable(value) {
-    return value && typeof value === "object" && "filters" in value && "type" in value && value.type === "data" && "uid" in value;
-  }
-  function isResolvedDerivedDataVariable(value) {
-    return value && typeof value === "object" && "filters" in value && "values" in value && "type" in value && value.type === "derived-data" && "uid" in value;
+  function isResolvedServerVariable(value) {
+    return value && typeof value === "object" && "type" in value && value.type === "server" && "uid" in value && "sequence_number" in value;
   }
   function isResolvedSwitchVariable(value) {
     return value && typeof value === "object" && "type" in value && value.type === "switch" && "uid" in value && "value_map" in value;
@@ -56672,7 +56887,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     return action && typeof action === "object" && action.__typename === "ActionImpl";
   }
   function isAnnotatedAction(action) {
-    return action && "uid" in action && "definition_uid" in action && "dynamic_kwargs" in action;
+    return action && isObject(action) && "uid" in action && "definition_uid" in action && "dynamic_kwargs" in action;
   }
   const isPyComponent = (value) => isObject(value) && "props" in value && isObject(value.props) && "func_name" in value.props && "dynamic_kwargs" in value.props;
   function isCondition(value) {
@@ -56801,813 +57016,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     });
     return res.ok;
   }
-  function commonjsRequire(path) {
-    throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-  }
-  var object_hash = { exports: {} };
-  var hasRequiredObject_hash;
-  function requireObject_hash() {
-    if (hasRequiredObject_hash) return object_hash.exports;
-    hasRequiredObject_hash = 1;
-    (function(module2, exports2) {
-      !function(e2) {
-        module2.exports = e2();
-      }(function() {
-        return function r2(o2, i2, u) {
-          function s(n2, e3) {
-            if (!i2[n2]) {
-              if (!o2[n2]) {
-                var t2 = "function" == typeof commonjsRequire && commonjsRequire;
-                if (!e3 && t2) return t2(n2, true);
-                if (a2) return a2(n2, true);
-                throw new Error("Cannot find module '" + n2 + "'");
-              }
-              e3 = i2[n2] = { exports: {} };
-              o2[n2][0].call(e3.exports, function(e4) {
-                var t3 = o2[n2][1][e4];
-                return s(t3 || e4);
-              }, e3, e3.exports, r2, o2, i2, u);
-            }
-            return i2[n2].exports;
-          }
-          for (var a2 = "function" == typeof commonjsRequire && commonjsRequire, e2 = 0; e2 < u.length; e2++) s(u[e2]);
-          return s;
-        }({ 1: [function(w2, b2, m) {
-          !(function(e2, n2, s, c, d2, h, p2, g, y) {
-            var r2 = w2("crypto");
-            function t2(e3, t3) {
-              t3 = u(e3, t3);
-              var n3;
-              return void 0 === (n3 = "passthrough" !== t3.algorithm ? r2.createHash(t3.algorithm) : new l2()).write && (n3.write = n3.update, n3.end = n3.update), f(t3, n3).dispatch(e3), n3.update || n3.end(""), n3.digest ? n3.digest("buffer" === t3.encoding ? void 0 : t3.encoding) : (e3 = n3.read(), "buffer" !== t3.encoding ? e3.toString(t3.encoding) : e3);
-            }
-            (m = b2.exports = t2).sha1 = function(e3) {
-              return t2(e3);
-            }, m.keys = function(e3) {
-              return t2(e3, { excludeValues: true, algorithm: "sha1", encoding: "hex" });
-            }, m.MD5 = function(e3) {
-              return t2(e3, { algorithm: "md5", encoding: "hex" });
-            }, m.keysMD5 = function(e3) {
-              return t2(e3, { algorithm: "md5", encoding: "hex", excludeValues: true });
-            };
-            var o2 = r2.getHashes ? r2.getHashes().slice() : ["sha1", "md5"], i2 = (o2.push("passthrough"), ["buffer", "hex", "binary", "base64"]);
-            function u(e3, t3) {
-              var n3 = {};
-              if (n3.algorithm = (t3 = t3 || {}).algorithm || "sha1", n3.encoding = t3.encoding || "hex", n3.excludeValues = !!t3.excludeValues, n3.algorithm = n3.algorithm.toLowerCase(), n3.encoding = n3.encoding.toLowerCase(), n3.ignoreUnknown = true === t3.ignoreUnknown, n3.respectType = false !== t3.respectType, n3.respectFunctionNames = false !== t3.respectFunctionNames, n3.respectFunctionProperties = false !== t3.respectFunctionProperties, n3.unorderedArrays = true === t3.unorderedArrays, n3.unorderedSets = false !== t3.unorderedSets, n3.unorderedObjects = false !== t3.unorderedObjects, n3.replacer = t3.replacer || void 0, n3.excludeKeys = t3.excludeKeys || void 0, void 0 === e3) throw new Error("Object argument required.");
-              for (var r3 = 0; r3 < o2.length; ++r3) o2[r3].toLowerCase() === n3.algorithm.toLowerCase() && (n3.algorithm = o2[r3]);
-              if (-1 === o2.indexOf(n3.algorithm)) throw new Error('Algorithm "' + n3.algorithm + '"  not supported. supported values: ' + o2.join(", "));
-              if (-1 === i2.indexOf(n3.encoding) && "passthrough" !== n3.algorithm) throw new Error('Encoding "' + n3.encoding + '"  not supported. supported values: ' + i2.join(", "));
-              return n3;
-            }
-            function a2(e3) {
-              if ("function" == typeof e3) return null != /^function\s+\w*\s*\(\s*\)\s*{\s+\[native code\]\s+}$/i.exec(Function.prototype.toString.call(e3));
-            }
-            function f(o3, t3, i3) {
-              i3 = i3 || [];
-              function u2(e3) {
-                return t3.update ? t3.update(e3, "utf8") : t3.write(e3, "utf8");
-              }
-              return { dispatch: function(e3) {
-                return this["_" + (null === (e3 = o3.replacer ? o3.replacer(e3) : e3) ? "null" : typeof e3)](e3);
-              }, _object: function(t4) {
-                var n3, e3 = Object.prototype.toString.call(t4), r3 = /\[object (.*)\]/i.exec(e3);
-                r3 = (r3 = r3 ? r3[1] : "unknown:[" + e3 + "]").toLowerCase();
-                if (0 <= (e3 = i3.indexOf(t4))) return this.dispatch("[CIRCULAR:" + e3 + "]");
-                if (i3.push(t4), void 0 !== s && s.isBuffer && s.isBuffer(t4)) return u2("buffer:"), u2(t4);
-                if ("object" === r3 || "function" === r3 || "asyncfunction" === r3) return e3 = Object.keys(t4), o3.unorderedObjects && (e3 = e3.sort()), false === o3.respectType || a2(t4) || e3.splice(0, 0, "prototype", "__proto__", "constructor"), o3.excludeKeys && (e3 = e3.filter(function(e4) {
-                  return !o3.excludeKeys(e4);
-                })), u2("object:" + e3.length + ":"), n3 = this, e3.forEach(function(e4) {
-                  n3.dispatch(e4), u2(":"), o3.excludeValues || n3.dispatch(t4[e4]), u2(",");
-                });
-                if (!this["_" + r3]) {
-                  if (o3.ignoreUnknown) return u2("[" + r3 + "]");
-                  throw new Error('Unknown object type "' + r3 + '"');
-                }
-                this["_" + r3](t4);
-              }, _array: function(e3, t4) {
-                t4 = void 0 !== t4 ? t4 : false !== o3.unorderedArrays;
-                var n3 = this;
-                if (u2("array:" + e3.length + ":"), !t4 || e3.length <= 1) return e3.forEach(function(e4) {
-                  return n3.dispatch(e4);
-                });
-                var r3 = [], t4 = e3.map(function(e4) {
-                  var t5 = new l2(), n4 = i3.slice();
-                  return f(o3, t5, n4).dispatch(e4), r3 = r3.concat(n4.slice(i3.length)), t5.read().toString();
-                });
-                return i3 = i3.concat(r3), t4.sort(), this._array(t4, false);
-              }, _date: function(e3) {
-                return u2("date:" + e3.toJSON());
-              }, _symbol: function(e3) {
-                return u2("symbol:" + e3.toString());
-              }, _error: function(e3) {
-                return u2("error:" + e3.toString());
-              }, _boolean: function(e3) {
-                return u2("bool:" + e3.toString());
-              }, _string: function(e3) {
-                u2("string:" + e3.length + ":"), u2(e3.toString());
-              }, _function: function(e3) {
-                u2("fn:"), a2(e3) ? this.dispatch("[native]") : this.dispatch(e3.toString()), false !== o3.respectFunctionNames && this.dispatch("function-name:" + String(e3.name)), o3.respectFunctionProperties && this._object(e3);
-              }, _number: function(e3) {
-                return u2("number:" + e3.toString());
-              }, _xml: function(e3) {
-                return u2("xml:" + e3.toString());
-              }, _null: function() {
-                return u2("Null");
-              }, _undefined: function() {
-                return u2("Undefined");
-              }, _regexp: function(e3) {
-                return u2("regex:" + e3.toString());
-              }, _uint8array: function(e3) {
-                return u2("uint8array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _uint8clampedarray: function(e3) {
-                return u2("uint8clampedarray:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _int8array: function(e3) {
-                return u2("int8array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _uint16array: function(e3) {
-                return u2("uint16array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _int16array: function(e3) {
-                return u2("int16array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _uint32array: function(e3) {
-                return u2("uint32array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _int32array: function(e3) {
-                return u2("int32array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _float32array: function(e3) {
-                return u2("float32array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _float64array: function(e3) {
-                return u2("float64array:"), this.dispatch(Array.prototype.slice.call(e3));
-              }, _arraybuffer: function(e3) {
-                return u2("arraybuffer:"), this.dispatch(new Uint8Array(e3));
-              }, _url: function(e3) {
-                return u2("url:" + e3.toString());
-              }, _map: function(e3) {
-                u2("map:");
-                e3 = Array.from(e3);
-                return this._array(e3, false !== o3.unorderedSets);
-              }, _set: function(e3) {
-                u2("set:");
-                e3 = Array.from(e3);
-                return this._array(e3, false !== o3.unorderedSets);
-              }, _file: function(e3) {
-                return u2("file:"), this.dispatch([e3.name, e3.size, e3.type, e3.lastModfied]);
-              }, _blob: function() {
-                if (o3.ignoreUnknown) return u2("[blob]");
-                throw Error('Hashing Blob objects is currently not supported\n(see https://github.com/puleos/object-hash/issues/26)\nUse "options.replacer" or "options.ignoreUnknown"\n');
-              }, _domwindow: function() {
-                return u2("domwindow");
-              }, _bigint: function(e3) {
-                return u2("bigint:" + e3.toString());
-              }, _process: function() {
-                return u2("process");
-              }, _timer: function() {
-                return u2("timer");
-              }, _pipe: function() {
-                return u2("pipe");
-              }, _tcp: function() {
-                return u2("tcp");
-              }, _udp: function() {
-                return u2("udp");
-              }, _tty: function() {
-                return u2("tty");
-              }, _statwatcher: function() {
-                return u2("statwatcher");
-              }, _securecontext: function() {
-                return u2("securecontext");
-              }, _connection: function() {
-                return u2("connection");
-              }, _zlib: function() {
-                return u2("zlib");
-              }, _context: function() {
-                return u2("context");
-              }, _nodescript: function() {
-                return u2("nodescript");
-              }, _httpparser: function() {
-                return u2("httpparser");
-              }, _dataview: function() {
-                return u2("dataview");
-              }, _signal: function() {
-                return u2("signal");
-              }, _fsevent: function() {
-                return u2("fsevent");
-              }, _tlswrap: function() {
-                return u2("tlswrap");
-              } };
-            }
-            function l2() {
-              return { buf: "", write: function(e3) {
-                this.buf += e3;
-              }, end: function(e3) {
-                this.buf += e3;
-              }, read: function() {
-                return this.buf;
-              } };
-            }
-            m.writeToStream = function(e3, t3, n3) {
-              return void 0 === n3 && (n3 = t3, t3 = {}), f(t3 = u(e3, t3), n3).dispatch(e3);
-            };
-          }).call(this, w2("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, w2("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/fake_9a5aa49d.js", "/");
-        }, { buffer: 3, crypto: 5, lYpoI2: 11 }], 2: [function(e2, t2, f) {
-          !(function(e3, t3, n2, r2, o2, i2, u, s, a2) {
-            !function(e4) {
-              var a3 = "undefined" != typeof Uint8Array ? Uint8Array : Array, t4 = "+".charCodeAt(0), n3 = "/".charCodeAt(0), r3 = "0".charCodeAt(0), o3 = "a".charCodeAt(0), i3 = "A".charCodeAt(0), u2 = "-".charCodeAt(0), s2 = "_".charCodeAt(0);
-              function f2(e5) {
-                e5 = e5.charCodeAt(0);
-                return e5 === t4 || e5 === u2 ? 62 : e5 === n3 || e5 === s2 ? 63 : e5 < r3 ? -1 : e5 < r3 + 10 ? e5 - r3 + 26 + 26 : e5 < i3 + 26 ? e5 - i3 : e5 < o3 + 26 ? e5 - o3 + 26 : void 0;
-              }
-              e4.toByteArray = function(e5) {
-                var t5, n4;
-                if (0 < e5.length % 4) throw new Error("Invalid string. Length must be a multiple of 4");
-                var r4 = e5.length, r4 = "=" === e5.charAt(r4 - 2) ? 2 : "=" === e5.charAt(r4 - 1) ? 1 : 0, o4 = new a3(3 * e5.length / 4 - r4), i4 = 0 < r4 ? e5.length - 4 : e5.length, u3 = 0;
-                function s3(e6) {
-                  o4[u3++] = e6;
-                }
-                for (t5 = 0; t5 < i4; t5 += 4, 0) s3((16711680 & (n4 = f2(e5.charAt(t5)) << 18 | f2(e5.charAt(t5 + 1)) << 12 | f2(e5.charAt(t5 + 2)) << 6 | f2(e5.charAt(t5 + 3)))) >> 16), s3((65280 & n4) >> 8), s3(255 & n4);
-                return 2 == r4 ? s3(255 & (n4 = f2(e5.charAt(t5)) << 2 | f2(e5.charAt(t5 + 1)) >> 4)) : 1 == r4 && (s3((n4 = f2(e5.charAt(t5)) << 10 | f2(e5.charAt(t5 + 1)) << 4 | f2(e5.charAt(t5 + 2)) >> 2) >> 8 & 255), s3(255 & n4)), o4;
-              }, e4.fromByteArray = function(e5) {
-                var t5, n4, r4, o4, i4 = e5.length % 3, u3 = "";
-                function s3(e6) {
-                  return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(e6);
-                }
-                for (t5 = 0, r4 = e5.length - i4; t5 < r4; t5 += 3) n4 = (e5[t5] << 16) + (e5[t5 + 1] << 8) + e5[t5 + 2], u3 += s3((o4 = n4) >> 18 & 63) + s3(o4 >> 12 & 63) + s3(o4 >> 6 & 63) + s3(63 & o4);
-                switch (i4) {
-                  case 1:
-                    u3 = (u3 += s3((n4 = e5[e5.length - 1]) >> 2)) + s3(n4 << 4 & 63) + "==";
-                    break;
-                  case 2:
-                    u3 = (u3 = (u3 += s3((n4 = (e5[e5.length - 2] << 8) + e5[e5.length - 1]) >> 10)) + s3(n4 >> 4 & 63)) + s3(n4 << 2 & 63) + "=";
-                }
-                return u3;
-              };
-            }(void 0 === f ? this.base64js = {} : f);
-          }).call(this, e2("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, e2("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/base64-js/lib/b64.js", "/node_modules/gulp-browserify/node_modules/base64-js/lib");
-        }, { buffer: 3, lYpoI2: 11 }], 3: [function(O, e2, H) {
-          !(function(e3, n2, f, r2, h, p2, g, y, w2) {
-            var a2 = O("base64-js"), i2 = O("ieee754");
-            function f(e4, t3, n3) {
-              if (!(this instanceof f)) return new f(e4, t3, n3);
-              var r3, o3, i3, u2, s2 = typeof e4;
-              if ("base64" === t3 && "string" == s2) for (e4 = (u2 = e4).trim ? u2.trim() : u2.replace(/^\s+|\s+$/g, ""); e4.length % 4 != 0; ) e4 += "=";
-              if ("number" == s2) r3 = j(e4);
-              else if ("string" == s2) r3 = f.byteLength(e4, t3);
-              else {
-                if ("object" != s2) throw new Error("First argument needs to be a number, array or string.");
-                r3 = j(e4.length);
-              }
-              if (f._useTypedArrays ? o3 = f._augment(new Uint8Array(r3)) : ((o3 = this).length = r3, o3._isBuffer = true), f._useTypedArrays && "number" == typeof e4.byteLength) o3._set(e4);
-              else if (C(u2 = e4) || f.isBuffer(u2) || u2 && "object" == typeof u2 && "number" == typeof u2.length) for (i3 = 0; i3 < r3; i3++) f.isBuffer(e4) ? o3[i3] = e4.readUInt8(i3) : o3[i3] = e4[i3];
-              else if ("string" == s2) o3.write(e4, 0, t3);
-              else if ("number" == s2 && !f._useTypedArrays && !n3) for (i3 = 0; i3 < r3; i3++) o3[i3] = 0;
-              return o3;
-            }
-            function b2(e4, t3, n3, r3) {
-              return f._charsWritten = c(function(e5) {
-                for (var t4 = [], n4 = 0; n4 < e5.length; n4++) t4.push(255 & e5.charCodeAt(n4));
-                return t4;
-              }(t3), e4, n3, r3);
-            }
-            function m(e4, t3, n3, r3) {
-              return f._charsWritten = c(function(e5) {
-                for (var t4, n4, r4 = [], o3 = 0; o3 < e5.length; o3++) n4 = e5.charCodeAt(o3), t4 = n4 >> 8, n4 = n4 % 256, r4.push(n4), r4.push(t4);
-                return r4;
-              }(t3), e4, n3, r3);
-            }
-            function v(e4, t3, n3) {
-              var r3 = "";
-              n3 = Math.min(e4.length, n3);
-              for (var o3 = t3; o3 < n3; o3++) r3 += String.fromCharCode(e4[o3]);
-              return r3;
-            }
-            function o2(e4, t3, n3, r3) {
-              r3 || (d2("boolean" == typeof n3, "missing or invalid endian"), d2(null != t3, "missing offset"), d2(t3 + 1 < e4.length, "Trying to read beyond buffer length"));
-              var o3, r3 = e4.length;
-              if (!(r3 <= t3)) return n3 ? (o3 = e4[t3], t3 + 1 < r3 && (o3 |= e4[t3 + 1] << 8)) : (o3 = e4[t3] << 8, t3 + 1 < r3 && (o3 |= e4[t3 + 1])), o3;
-            }
-            function u(e4, t3, n3, r3) {
-              r3 || (d2("boolean" == typeof n3, "missing or invalid endian"), d2(null != t3, "missing offset"), d2(t3 + 3 < e4.length, "Trying to read beyond buffer length"));
-              var o3, r3 = e4.length;
-              if (!(r3 <= t3)) return n3 ? (t3 + 2 < r3 && (o3 = e4[t3 + 2] << 16), t3 + 1 < r3 && (o3 |= e4[t3 + 1] << 8), o3 |= e4[t3], t3 + 3 < r3 && (o3 += e4[t3 + 3] << 24 >>> 0)) : (t3 + 1 < r3 && (o3 = e4[t3 + 1] << 16), t3 + 2 < r3 && (o3 |= e4[t3 + 2] << 8), t3 + 3 < r3 && (o3 |= e4[t3 + 3]), o3 += e4[t3] << 24 >>> 0), o3;
-            }
-            function _(e4, t3, n3, r3) {
-              if (r3 || (d2("boolean" == typeof n3, "missing or invalid endian"), d2(null != t3, "missing offset"), d2(t3 + 1 < e4.length, "Trying to read beyond buffer length")), !(e4.length <= t3)) return r3 = o2(e4, t3, n3, true), 32768 & r3 ? -1 * (65535 - r3 + 1) : r3;
-            }
-            function E(e4, t3, n3, r3) {
-              if (r3 || (d2("boolean" == typeof n3, "missing or invalid endian"), d2(null != t3, "missing offset"), d2(t3 + 3 < e4.length, "Trying to read beyond buffer length")), !(e4.length <= t3)) return r3 = u(e4, t3, n3, true), 2147483648 & r3 ? -1 * (4294967295 - r3 + 1) : r3;
-            }
-            function I(e4, t3, n3, r3) {
-              return r3 || (d2("boolean" == typeof n3, "missing or invalid endian"), d2(t3 + 3 < e4.length, "Trying to read beyond buffer length")), i2.read(e4, t3, n3, 23, 4);
-            }
-            function A(e4, t3, n3, r3) {
-              return r3 || (d2("boolean" == typeof n3, "missing or invalid endian"), d2(t3 + 7 < e4.length, "Trying to read beyond buffer length")), i2.read(e4, t3, n3, 52, 8);
-            }
-            function s(e4, t3, n3, r3, o3) {
-              o3 || (d2(null != t3, "missing value"), d2("boolean" == typeof r3, "missing or invalid endian"), d2(null != n3, "missing offset"), d2(n3 + 1 < e4.length, "trying to write beyond buffer length"), Y(t3, 65535));
-              o3 = e4.length;
-              if (!(o3 <= n3)) for (var i3 = 0, u2 = Math.min(o3 - n3, 2); i3 < u2; i3++) e4[n3 + i3] = (t3 & 255 << 8 * (r3 ? i3 : 1 - i3)) >>> 8 * (r3 ? i3 : 1 - i3);
-            }
-            function l2(e4, t3, n3, r3, o3) {
-              o3 || (d2(null != t3, "missing value"), d2("boolean" == typeof r3, "missing or invalid endian"), d2(null != n3, "missing offset"), d2(n3 + 3 < e4.length, "trying to write beyond buffer length"), Y(t3, 4294967295));
-              o3 = e4.length;
-              if (!(o3 <= n3)) for (var i3 = 0, u2 = Math.min(o3 - n3, 4); i3 < u2; i3++) e4[n3 + i3] = t3 >>> 8 * (r3 ? i3 : 3 - i3) & 255;
-            }
-            function B(e4, t3, n3, r3, o3) {
-              o3 || (d2(null != t3, "missing value"), d2("boolean" == typeof r3, "missing or invalid endian"), d2(null != n3, "missing offset"), d2(n3 + 1 < e4.length, "Trying to write beyond buffer length"), F(t3, 32767, -32768)), e4.length <= n3 || s(e4, 0 <= t3 ? t3 : 65535 + t3 + 1, n3, r3, o3);
-            }
-            function L(e4, t3, n3, r3, o3) {
-              o3 || (d2(null != t3, "missing value"), d2("boolean" == typeof r3, "missing or invalid endian"), d2(null != n3, "missing offset"), d2(n3 + 3 < e4.length, "Trying to write beyond buffer length"), F(t3, 2147483647, -2147483648)), e4.length <= n3 || l2(e4, 0 <= t3 ? t3 : 4294967295 + t3 + 1, n3, r3, o3);
-            }
-            function U(e4, t3, n3, r3, o3) {
-              o3 || (d2(null != t3, "missing value"), d2("boolean" == typeof r3, "missing or invalid endian"), d2(null != n3, "missing offset"), d2(n3 + 3 < e4.length, "Trying to write beyond buffer length"), D(t3, 34028234663852886e22, -34028234663852886e22)), e4.length <= n3 || i2.write(e4, t3, n3, r3, 23, 4);
-            }
-            function x(e4, t3, n3, r3, o3) {
-              o3 || (d2(null != t3, "missing value"), d2("boolean" == typeof r3, "missing or invalid endian"), d2(null != n3, "missing offset"), d2(n3 + 7 < e4.length, "Trying to write beyond buffer length"), D(t3, 17976931348623157e292, -17976931348623157e292)), e4.length <= n3 || i2.write(e4, t3, n3, r3, 52, 8);
-            }
-            H.Buffer = f, H.SlowBuffer = f, H.INSPECT_MAX_BYTES = 50, f.poolSize = 8192, f._useTypedArrays = function() {
-              try {
-                var e4 = new ArrayBuffer(0), t3 = new Uint8Array(e4);
-                return t3.foo = function() {
-                  return 42;
-                }, 42 === t3.foo() && "function" == typeof t3.subarray;
-              } catch (e5) {
-                return false;
-              }
-            }(), f.isEncoding = function(e4) {
-              switch (String(e4).toLowerCase()) {
-                case "hex":
-                case "utf8":
-                case "utf-8":
-                case "ascii":
-                case "binary":
-                case "base64":
-                case "raw":
-                case "ucs2":
-                case "ucs-2":
-                case "utf16le":
-                case "utf-16le":
-                  return true;
-                default:
-                  return false;
-              }
-            }, f.isBuffer = function(e4) {
-              return !(null == e4 || !e4._isBuffer);
-            }, f.byteLength = function(e4, t3) {
-              var n3;
-              switch (e4 += "", t3 || "utf8") {
-                case "hex":
-                  n3 = e4.length / 2;
-                  break;
-                case "utf8":
-                case "utf-8":
-                  n3 = T(e4).length;
-                  break;
-                case "ascii":
-                case "binary":
-                case "raw":
-                  n3 = e4.length;
-                  break;
-                case "base64":
-                  n3 = M(e4).length;
-                  break;
-                case "ucs2":
-                case "ucs-2":
-                case "utf16le":
-                case "utf-16le":
-                  n3 = 2 * e4.length;
-                  break;
-                default:
-                  throw new Error("Unknown encoding");
-              }
-              return n3;
-            }, f.concat = function(e4, t3) {
-              if (d2(C(e4), "Usage: Buffer.concat(list, [totalLength])\nlist should be an Array."), 0 === e4.length) return new f(0);
-              if (1 === e4.length) return e4[0];
-              if ("number" != typeof t3) for (o3 = t3 = 0; o3 < e4.length; o3++) t3 += e4[o3].length;
-              for (var n3 = new f(t3), r3 = 0, o3 = 0; o3 < e4.length; o3++) {
-                var i3 = e4[o3];
-                i3.copy(n3, r3), r3 += i3.length;
-              }
-              return n3;
-            }, f.prototype.write = function(e4, t3, n3, r3) {
-              isFinite(t3) ? isFinite(n3) || (r3 = n3, n3 = void 0) : (a3 = r3, r3 = t3, t3 = n3, n3 = a3), t3 = Number(t3) || 0;
-              var o3, i3, u2, s2, a3 = this.length - t3;
-              switch ((!n3 || a3 < (n3 = Number(n3))) && (n3 = a3), r3 = String(r3 || "utf8").toLowerCase()) {
-                case "hex":
-                  o3 = function(e5, t4, n4, r4) {
-                    n4 = Number(n4) || 0;
-                    var o4 = e5.length - n4;
-                    (!r4 || o4 < (r4 = Number(r4))) && (r4 = o4), d2((o4 = t4.length) % 2 == 0, "Invalid hex string"), o4 / 2 < r4 && (r4 = o4 / 2);
-                    for (var i4 = 0; i4 < r4; i4++) {
-                      var u3 = parseInt(t4.substr(2 * i4, 2), 16);
-                      d2(!isNaN(u3), "Invalid hex string"), e5[n4 + i4] = u3;
-                    }
-                    return f._charsWritten = 2 * i4, i4;
-                  }(this, e4, t3, n3);
-                  break;
-                case "utf8":
-                case "utf-8":
-                  i3 = this, u2 = t3, s2 = n3, o3 = f._charsWritten = c(T(e4), i3, u2, s2);
-                  break;
-                case "ascii":
-                case "binary":
-                  o3 = b2(this, e4, t3, n3);
-                  break;
-                case "base64":
-                  i3 = this, u2 = t3, s2 = n3, o3 = f._charsWritten = c(M(e4), i3, u2, s2);
-                  break;
-                case "ucs2":
-                case "ucs-2":
-                case "utf16le":
-                case "utf-16le":
-                  o3 = m(this, e4, t3, n3);
-                  break;
-                default:
-                  throw new Error("Unknown encoding");
-              }
-              return o3;
-            }, f.prototype.toString = function(e4, t3, n3) {
-              var r3, o3, i3, u2, s2 = this;
-              if (e4 = String(e4 || "utf8").toLowerCase(), t3 = Number(t3) || 0, (n3 = void 0 !== n3 ? Number(n3) : s2.length) === t3) return "";
-              switch (e4) {
-                case "hex":
-                  r3 = function(e5, t4, n4) {
-                    var r4 = e5.length;
-                    (!t4 || t4 < 0) && (t4 = 0);
-                    (!n4 || n4 < 0 || r4 < n4) && (n4 = r4);
-                    for (var o4 = "", i4 = t4; i4 < n4; i4++) o4 += k(e5[i4]);
-                    return o4;
-                  }(s2, t3, n3);
-                  break;
-                case "utf8":
-                case "utf-8":
-                  r3 = function(e5, t4, n4) {
-                    var r4 = "", o4 = "";
-                    n4 = Math.min(e5.length, n4);
-                    for (var i4 = t4; i4 < n4; i4++) e5[i4] <= 127 ? (r4 += N(o4) + String.fromCharCode(e5[i4]), o4 = "") : o4 += "%" + e5[i4].toString(16);
-                    return r4 + N(o4);
-                  }(s2, t3, n3);
-                  break;
-                case "ascii":
-                case "binary":
-                  r3 = v(s2, t3, n3);
-                  break;
-                case "base64":
-                  o3 = s2, u2 = n3, r3 = 0 === (i3 = t3) && u2 === o3.length ? a2.fromByteArray(o3) : a2.fromByteArray(o3.slice(i3, u2));
-                  break;
-                case "ucs2":
-                case "ucs-2":
-                case "utf16le":
-                case "utf-16le":
-                  r3 = function(e5, t4, n4) {
-                    for (var r4 = e5.slice(t4, n4), o4 = "", i4 = 0; i4 < r4.length; i4 += 2) o4 += String.fromCharCode(r4[i4] + 256 * r4[i4 + 1]);
-                    return o4;
-                  }(s2, t3, n3);
-                  break;
-                default:
-                  throw new Error("Unknown encoding");
-              }
-              return r3;
-            }, f.prototype.toJSON = function() {
-              return { type: "Buffer", data: Array.prototype.slice.call(this._arr || this, 0) };
-            }, f.prototype.copy = function(e4, t3, n3, r3) {
-              if (t3 = t3 || 0, (r3 = r3 || 0 === r3 ? r3 : this.length) !== (n3 = n3 || 0) && 0 !== e4.length && 0 !== this.length) {
-                d2(n3 <= r3, "sourceEnd < sourceStart"), d2(0 <= t3 && t3 < e4.length, "targetStart out of bounds"), d2(0 <= n3 && n3 < this.length, "sourceStart out of bounds"), d2(0 <= r3 && r3 <= this.length, "sourceEnd out of bounds"), r3 > this.length && (r3 = this.length);
-                var o3 = (r3 = e4.length - t3 < r3 - n3 ? e4.length - t3 + n3 : r3) - n3;
-                if (o3 < 100 || !f._useTypedArrays) for (var i3 = 0; i3 < o3; i3++) e4[i3 + t3] = this[i3 + n3];
-                else e4._set(this.subarray(n3, n3 + o3), t3);
-              }
-            }, f.prototype.slice = function(e4, t3) {
-              var n3 = this.length;
-              if (e4 = S(e4, n3, 0), t3 = S(t3, n3, n3), f._useTypedArrays) return f._augment(this.subarray(e4, t3));
-              for (var r3 = t3 - e4, o3 = new f(r3, void 0, true), i3 = 0; i3 < r3; i3++) o3[i3] = this[i3 + e4];
-              return o3;
-            }, f.prototype.get = function(e4) {
-              return console.log(".get() is deprecated. Access using array indexes instead."), this.readUInt8(e4);
-            }, f.prototype.set = function(e4, t3) {
-              return console.log(".set() is deprecated. Access using array indexes instead."), this.writeUInt8(e4, t3);
-            }, f.prototype.readUInt8 = function(e4, t3) {
-              if (t3 || (d2(null != e4, "missing offset"), d2(e4 < this.length, "Trying to read beyond buffer length")), !(e4 >= this.length)) return this[e4];
-            }, f.prototype.readUInt16LE = function(e4, t3) {
-              return o2(this, e4, true, t3);
-            }, f.prototype.readUInt16BE = function(e4, t3) {
-              return o2(this, e4, false, t3);
-            }, f.prototype.readUInt32LE = function(e4, t3) {
-              return u(this, e4, true, t3);
-            }, f.prototype.readUInt32BE = function(e4, t3) {
-              return u(this, e4, false, t3);
-            }, f.prototype.readInt8 = function(e4, t3) {
-              if (t3 || (d2(null != e4, "missing offset"), d2(e4 < this.length, "Trying to read beyond buffer length")), !(e4 >= this.length)) return 128 & this[e4] ? -1 * (255 - this[e4] + 1) : this[e4];
-            }, f.prototype.readInt16LE = function(e4, t3) {
-              return _(this, e4, true, t3);
-            }, f.prototype.readInt16BE = function(e4, t3) {
-              return _(this, e4, false, t3);
-            }, f.prototype.readInt32LE = function(e4, t3) {
-              return E(this, e4, true, t3);
-            }, f.prototype.readInt32BE = function(e4, t3) {
-              return E(this, e4, false, t3);
-            }, f.prototype.readFloatLE = function(e4, t3) {
-              return I(this, e4, true, t3);
-            }, f.prototype.readFloatBE = function(e4, t3) {
-              return I(this, e4, false, t3);
-            }, f.prototype.readDoubleLE = function(e4, t3) {
-              return A(this, e4, true, t3);
-            }, f.prototype.readDoubleBE = function(e4, t3) {
-              return A(this, e4, false, t3);
-            }, f.prototype.writeUInt8 = function(e4, t3, n3) {
-              n3 || (d2(null != e4, "missing value"), d2(null != t3, "missing offset"), d2(t3 < this.length, "trying to write beyond buffer length"), Y(e4, 255)), t3 >= this.length || (this[t3] = e4);
-            }, f.prototype.writeUInt16LE = function(e4, t3, n3) {
-              s(this, e4, t3, true, n3);
-            }, f.prototype.writeUInt16BE = function(e4, t3, n3) {
-              s(this, e4, t3, false, n3);
-            }, f.prototype.writeUInt32LE = function(e4, t3, n3) {
-              l2(this, e4, t3, true, n3);
-            }, f.prototype.writeUInt32BE = function(e4, t3, n3) {
-              l2(this, e4, t3, false, n3);
-            }, f.prototype.writeInt8 = function(e4, t3, n3) {
-              n3 || (d2(null != e4, "missing value"), d2(null != t3, "missing offset"), d2(t3 < this.length, "Trying to write beyond buffer length"), F(e4, 127, -128)), t3 >= this.length || (0 <= e4 ? this.writeUInt8(e4, t3, n3) : this.writeUInt8(255 + e4 + 1, t3, n3));
-            }, f.prototype.writeInt16LE = function(e4, t3, n3) {
-              B(this, e4, t3, true, n3);
-            }, f.prototype.writeInt16BE = function(e4, t3, n3) {
-              B(this, e4, t3, false, n3);
-            }, f.prototype.writeInt32LE = function(e4, t3, n3) {
-              L(this, e4, t3, true, n3);
-            }, f.prototype.writeInt32BE = function(e4, t3, n3) {
-              L(this, e4, t3, false, n3);
-            }, f.prototype.writeFloatLE = function(e4, t3, n3) {
-              U(this, e4, t3, true, n3);
-            }, f.prototype.writeFloatBE = function(e4, t3, n3) {
-              U(this, e4, t3, false, n3);
-            }, f.prototype.writeDoubleLE = function(e4, t3, n3) {
-              x(this, e4, t3, true, n3);
-            }, f.prototype.writeDoubleBE = function(e4, t3, n3) {
-              x(this, e4, t3, false, n3);
-            }, f.prototype.fill = function(e4, t3, n3) {
-              if (t3 = t3 || 0, n3 = n3 || this.length, d2("number" == typeof (e4 = "string" == typeof (e4 = e4 || 0) ? e4.charCodeAt(0) : e4) && !isNaN(e4), "value is not a number"), d2(t3 <= n3, "end < start"), n3 !== t3 && 0 !== this.length) {
-                d2(0 <= t3 && t3 < this.length, "start out of bounds"), d2(0 <= n3 && n3 <= this.length, "end out of bounds");
-                for (var r3 = t3; r3 < n3; r3++) this[r3] = e4;
-              }
-            }, f.prototype.inspect = function() {
-              for (var e4 = [], t3 = this.length, n3 = 0; n3 < t3; n3++) if (e4[n3] = k(this[n3]), n3 === H.INSPECT_MAX_BYTES) {
-                e4[n3 + 1] = "...";
-                break;
-              }
-              return "<Buffer " + e4.join(" ") + ">";
-            }, f.prototype.toArrayBuffer = function() {
-              if ("undefined" == typeof Uint8Array) throw new Error("Buffer.toArrayBuffer not supported in this browser");
-              if (f._useTypedArrays) return new f(this).buffer;
-              for (var e4 = new Uint8Array(this.length), t3 = 0, n3 = e4.length; t3 < n3; t3 += 1) e4[t3] = this[t3];
-              return e4.buffer;
-            };
-            var t2 = f.prototype;
-            function S(e4, t3, n3) {
-              return "number" != typeof e4 ? n3 : t3 <= (e4 = ~~e4) ? t3 : 0 <= e4 || 0 <= (e4 += t3) ? e4 : 0;
-            }
-            function j(e4) {
-              return (e4 = ~~Math.ceil(+e4)) < 0 ? 0 : e4;
-            }
-            function C(e4) {
-              return (Array.isArray || function(e5) {
-                return "[object Array]" === Object.prototype.toString.call(e5);
-              })(e4);
-            }
-            function k(e4) {
-              return e4 < 16 ? "0" + e4.toString(16) : e4.toString(16);
-            }
-            function T(e4) {
-              for (var t3 = [], n3 = 0; n3 < e4.length; n3++) {
-                var r3 = e4.charCodeAt(n3);
-                if (r3 <= 127) t3.push(e4.charCodeAt(n3));
-                else for (var o3 = n3, i3 = (55296 <= r3 && r3 <= 57343 && n3++, encodeURIComponent(e4.slice(o3, n3 + 1)).substr(1).split("%")), u2 = 0; u2 < i3.length; u2++) t3.push(parseInt(i3[u2], 16));
-              }
-              return t3;
-            }
-            function M(e4) {
-              return a2.toByteArray(e4);
-            }
-            function c(e4, t3, n3, r3) {
-              for (var o3 = 0; o3 < r3 && !(o3 + n3 >= t3.length || o3 >= e4.length); o3++) t3[o3 + n3] = e4[o3];
-              return o3;
-            }
-            function N(e4) {
-              try {
-                return decodeURIComponent(e4);
-              } catch (e5) {
-                return String.fromCharCode(65533);
-              }
-            }
-            function Y(e4, t3) {
-              d2("number" == typeof e4, "cannot write a non-number as a number"), d2(0 <= e4, "specified a negative value for writing an unsigned value"), d2(e4 <= t3, "value is larger than maximum value for type"), d2(Math.floor(e4) === e4, "value has a fractional component");
-            }
-            function F(e4, t3, n3) {
-              d2("number" == typeof e4, "cannot write a non-number as a number"), d2(e4 <= t3, "value larger than maximum allowed value"), d2(n3 <= e4, "value smaller than minimum allowed value"), d2(Math.floor(e4) === e4, "value has a fractional component");
-            }
-            function D(e4, t3, n3) {
-              d2("number" == typeof e4, "cannot write a non-number as a number"), d2(e4 <= t3, "value larger than maximum allowed value"), d2(n3 <= e4, "value smaller than minimum allowed value");
-            }
-            function d2(e4, t3) {
-              if (!e4) throw new Error(t3 || "Failed assertion");
-            }
-            f._augment = function(e4) {
-              return e4._isBuffer = true, e4._get = e4.get, e4._set = e4.set, e4.get = t2.get, e4.set = t2.set, e4.write = t2.write, e4.toString = t2.toString, e4.toLocaleString = t2.toString, e4.toJSON = t2.toJSON, e4.copy = t2.copy, e4.slice = t2.slice, e4.readUInt8 = t2.readUInt8, e4.readUInt16LE = t2.readUInt16LE, e4.readUInt16BE = t2.readUInt16BE, e4.readUInt32LE = t2.readUInt32LE, e4.readUInt32BE = t2.readUInt32BE, e4.readInt8 = t2.readInt8, e4.readInt16LE = t2.readInt16LE, e4.readInt16BE = t2.readInt16BE, e4.readInt32LE = t2.readInt32LE, e4.readInt32BE = t2.readInt32BE, e4.readFloatLE = t2.readFloatLE, e4.readFloatBE = t2.readFloatBE, e4.readDoubleLE = t2.readDoubleLE, e4.readDoubleBE = t2.readDoubleBE, e4.writeUInt8 = t2.writeUInt8, e4.writeUInt16LE = t2.writeUInt16LE, e4.writeUInt16BE = t2.writeUInt16BE, e4.writeUInt32LE = t2.writeUInt32LE, e4.writeUInt32BE = t2.writeUInt32BE, e4.writeInt8 = t2.writeInt8, e4.writeInt16LE = t2.writeInt16LE, e4.writeInt16BE = t2.writeInt16BE, e4.writeInt32LE = t2.writeInt32LE, e4.writeInt32BE = t2.writeInt32BE, e4.writeFloatLE = t2.writeFloatLE, e4.writeFloatBE = t2.writeFloatBE, e4.writeDoubleLE = t2.writeDoubleLE, e4.writeDoubleBE = t2.writeDoubleBE, e4.fill = t2.fill, e4.inspect = t2.inspect, e4.toArrayBuffer = t2.toArrayBuffer, e4;
-            };
-          }).call(this, O("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, O("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/buffer/index.js", "/node_modules/gulp-browserify/node_modules/buffer");
-        }, { "base64-js": 2, buffer: 3, ieee754: 10, lYpoI2: 11 }], 4: [function(c, d2, e2) {
-          !(function(e3, t2, a2, n2, r2, o2, i2, u, s) {
-            var a2 = c("buffer").Buffer, f = 4, l2 = new a2(f);
-            l2.fill(0);
-            d2.exports = { hash: function(e4, t3, n3, r3) {
-              for (var o3 = t3(function(e5, t4) {
-                e5.length % f != 0 && (n4 = e5.length + (f - e5.length % f), e5 = a2.concat([e5, l2], n4));
-                for (var n4, r4 = [], o4 = t4 ? e5.readInt32BE : e5.readInt32LE, i4 = 0; i4 < e5.length; i4 += f) r4.push(o4.call(e5, i4));
-                return r4;
-              }(e4 = a2.isBuffer(e4) ? e4 : new a2(e4), r3), 8 * e4.length), t3 = r3, i3 = new a2(n3), u2 = t3 ? i3.writeInt32BE : i3.writeInt32LE, s2 = 0; s2 < o3.length; s2++) u2.call(i3, o3[s2], 4 * s2, true);
-              return i3;
-            } };
-          }).call(this, c("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, c("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/crypto-browserify/helpers.js", "/node_modules/gulp-browserify/node_modules/crypto-browserify");
-        }, { buffer: 3, lYpoI2: 11 }], 5: [function(v, e2, _) {
-          !(function(l2, c, u, d2, h, p2, g, y, w2) {
-            var u = v("buffer").Buffer, e3 = v("./sha"), t2 = v("./sha256"), n2 = v("./rng"), b2 = { sha1: e3, sha256: t2, md5: v("./md5") }, s = 64, a2 = new u(s);
-            function r2(e4, n3) {
-              var r3 = b2[e4 = e4 || "sha1"], o3 = [];
-              return r3 || i2("algorithm:", e4, "is not yet supported"), { update: function(e5) {
-                return u.isBuffer(e5) || (e5 = new u(e5)), o3.push(e5), e5.length, this;
-              }, digest: function(e5) {
-                var t3 = u.concat(o3), t3 = n3 ? function(e6, t4, n4) {
-                  u.isBuffer(t4) || (t4 = new u(t4)), u.isBuffer(n4) || (n4 = new u(n4)), t4.length > s ? t4 = e6(t4) : t4.length < s && (t4 = u.concat([t4, a2], s));
-                  for (var r4 = new u(s), o4 = new u(s), i3 = 0; i3 < s; i3++) r4[i3] = 54 ^ t4[i3], o4[i3] = 92 ^ t4[i3];
-                  return n4 = e6(u.concat([r4, n4])), e6(u.concat([o4, n4]));
-                }(r3, n3, t3) : r3(t3);
-                return o3 = null, e5 ? t3.toString(e5) : t3;
-              } };
-            }
-            function i2() {
-              var e4 = [].slice.call(arguments).join(" ");
-              throw new Error([e4, "we accept pull requests", "http://github.com/dominictarr/crypto-browserify"].join("\n"));
-            }
-            a2.fill(0), _.createHash = function(e4) {
-              return r2(e4);
-            }, _.createHmac = r2, _.randomBytes = function(e4, t3) {
-              if (!t3 || !t3.call) return new u(n2(e4));
-              try {
-                t3.call(this, void 0, new u(n2(e4)));
-              } catch (e5) {
-                t3(e5);
-              }
-            };
-            var o2, f = ["createCredentials", "createCipher", "createCipheriv", "createDecipher", "createDecipheriv", "createSign", "createVerify", "createDiffieHellman", "pbkdf2"], m = function(e4) {
-              _[e4] = function() {
-                i2("sorry,", e4, "is not implemented yet");
-              };
-            };
-            for (o2 in f) m(f[o2]);
-          }).call(this, v("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, v("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/crypto-browserify/index.js", "/node_modules/gulp-browserify/node_modules/crypto-browserify");
-        }, { "./md5": 6, "./rng": 7, "./sha": 8, "./sha256": 9, buffer: 3, lYpoI2: 11 }], 6: [function(w2, b2, e2) {
-          !(function(e3, r2, o2, i2, u, a2, f, l2, y) {
-            var t2 = w2("./helpers");
-            function n2(e4, t3) {
-              e4[t3 >> 5] |= 128 << t3 % 32, e4[14 + (t3 + 64 >>> 9 << 4)] = t3;
-              for (var n3 = 1732584193, r3 = -271733879, o3 = -1732584194, i3 = 271733878, u2 = 0; u2 < e4.length; u2 += 16) {
-                var s2 = n3, a3 = r3, f2 = o3, l3 = i3, n3 = c(n3, r3, o3, i3, e4[u2 + 0], 7, -680876936), i3 = c(i3, n3, r3, o3, e4[u2 + 1], 12, -389564586), o3 = c(o3, i3, n3, r3, e4[u2 + 2], 17, 606105819), r3 = c(r3, o3, i3, n3, e4[u2 + 3], 22, -1044525330);
-                n3 = c(n3, r3, o3, i3, e4[u2 + 4], 7, -176418897), i3 = c(i3, n3, r3, o3, e4[u2 + 5], 12, 1200080426), o3 = c(o3, i3, n3, r3, e4[u2 + 6], 17, -1473231341), r3 = c(r3, o3, i3, n3, e4[u2 + 7], 22, -45705983), n3 = c(n3, r3, o3, i3, e4[u2 + 8], 7, 1770035416), i3 = c(i3, n3, r3, o3, e4[u2 + 9], 12, -1958414417), o3 = c(o3, i3, n3, r3, e4[u2 + 10], 17, -42063), r3 = c(r3, o3, i3, n3, e4[u2 + 11], 22, -1990404162), n3 = c(n3, r3, o3, i3, e4[u2 + 12], 7, 1804603682), i3 = c(i3, n3, r3, o3, e4[u2 + 13], 12, -40341101), o3 = c(o3, i3, n3, r3, e4[u2 + 14], 17, -1502002290), n3 = d2(n3, r3 = c(r3, o3, i3, n3, e4[u2 + 15], 22, 1236535329), o3, i3, e4[u2 + 1], 5, -165796510), i3 = d2(i3, n3, r3, o3, e4[u2 + 6], 9, -1069501632), o3 = d2(o3, i3, n3, r3, e4[u2 + 11], 14, 643717713), r3 = d2(r3, o3, i3, n3, e4[u2 + 0], 20, -373897302), n3 = d2(n3, r3, o3, i3, e4[u2 + 5], 5, -701558691), i3 = d2(i3, n3, r3, o3, e4[u2 + 10], 9, 38016083), o3 = d2(o3, i3, n3, r3, e4[u2 + 15], 14, -660478335), r3 = d2(r3, o3, i3, n3, e4[u2 + 4], 20, -405537848), n3 = d2(n3, r3, o3, i3, e4[u2 + 9], 5, 568446438), i3 = d2(i3, n3, r3, o3, e4[u2 + 14], 9, -1019803690), o3 = d2(o3, i3, n3, r3, e4[u2 + 3], 14, -187363961), r3 = d2(r3, o3, i3, n3, e4[u2 + 8], 20, 1163531501), n3 = d2(n3, r3, o3, i3, e4[u2 + 13], 5, -1444681467), i3 = d2(i3, n3, r3, o3, e4[u2 + 2], 9, -51403784), o3 = d2(o3, i3, n3, r3, e4[u2 + 7], 14, 1735328473), n3 = h(n3, r3 = d2(r3, o3, i3, n3, e4[u2 + 12], 20, -1926607734), o3, i3, e4[u2 + 5], 4, -378558), i3 = h(i3, n3, r3, o3, e4[u2 + 8], 11, -2022574463), o3 = h(o3, i3, n3, r3, e4[u2 + 11], 16, 1839030562), r3 = h(r3, o3, i3, n3, e4[u2 + 14], 23, -35309556), n3 = h(n3, r3, o3, i3, e4[u2 + 1], 4, -1530992060), i3 = h(i3, n3, r3, o3, e4[u2 + 4], 11, 1272893353), o3 = h(o3, i3, n3, r3, e4[u2 + 7], 16, -155497632), r3 = h(r3, o3, i3, n3, e4[u2 + 10], 23, -1094730640), n3 = h(n3, r3, o3, i3, e4[u2 + 13], 4, 681279174), i3 = h(i3, n3, r3, o3, e4[u2 + 0], 11, -358537222), o3 = h(o3, i3, n3, r3, e4[u2 + 3], 16, -722521979), r3 = h(r3, o3, i3, n3, e4[u2 + 6], 23, 76029189), n3 = h(n3, r3, o3, i3, e4[u2 + 9], 4, -640364487), i3 = h(i3, n3, r3, o3, e4[u2 + 12], 11, -421815835), o3 = h(o3, i3, n3, r3, e4[u2 + 15], 16, 530742520), n3 = p2(n3, r3 = h(r3, o3, i3, n3, e4[u2 + 2], 23, -995338651), o3, i3, e4[u2 + 0], 6, -198630844), i3 = p2(i3, n3, r3, o3, e4[u2 + 7], 10, 1126891415), o3 = p2(o3, i3, n3, r3, e4[u2 + 14], 15, -1416354905), r3 = p2(r3, o3, i3, n3, e4[u2 + 5], 21, -57434055), n3 = p2(n3, r3, o3, i3, e4[u2 + 12], 6, 1700485571), i3 = p2(i3, n3, r3, o3, e4[u2 + 3], 10, -1894986606), o3 = p2(o3, i3, n3, r3, e4[u2 + 10], 15, -1051523), r3 = p2(r3, o3, i3, n3, e4[u2 + 1], 21, -2054922799), n3 = p2(n3, r3, o3, i3, e4[u2 + 8], 6, 1873313359), i3 = p2(i3, n3, r3, o3, e4[u2 + 15], 10, -30611744), o3 = p2(o3, i3, n3, r3, e4[u2 + 6], 15, -1560198380), r3 = p2(r3, o3, i3, n3, e4[u2 + 13], 21, 1309151649), n3 = p2(n3, r3, o3, i3, e4[u2 + 4], 6, -145523070), i3 = p2(i3, n3, r3, o3, e4[u2 + 11], 10, -1120210379), o3 = p2(o3, i3, n3, r3, e4[u2 + 2], 15, 718787259), r3 = p2(r3, o3, i3, n3, e4[u2 + 9], 21, -343485551), n3 = g(n3, s2), r3 = g(r3, a3), o3 = g(o3, f2), i3 = g(i3, l3);
-              }
-              return Array(n3, r3, o3, i3);
-            }
-            function s(e4, t3, n3, r3, o3, i3) {
-              return g((t3 = g(g(t3, e4), g(r3, i3))) << o3 | t3 >>> 32 - o3, n3);
-            }
-            function c(e4, t3, n3, r3, o3, i3, u2) {
-              return s(t3 & n3 | ~t3 & r3, e4, t3, o3, i3, u2);
-            }
-            function d2(e4, t3, n3, r3, o3, i3, u2) {
-              return s(t3 & r3 | n3 & ~r3, e4, t3, o3, i3, u2);
-            }
-            function h(e4, t3, n3, r3, o3, i3, u2) {
-              return s(t3 ^ n3 ^ r3, e4, t3, o3, i3, u2);
-            }
-            function p2(e4, t3, n3, r3, o3, i3, u2) {
-              return s(n3 ^ (t3 | ~r3), e4, t3, o3, i3, u2);
-            }
-            function g(e4, t3) {
-              var n3 = (65535 & e4) + (65535 & t3);
-              return (e4 >> 16) + (t3 >> 16) + (n3 >> 16) << 16 | 65535 & n3;
-            }
-            b2.exports = function(e4) {
-              return t2.hash(e4, n2, 16);
-            };
-          }).call(this, w2("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, w2("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/crypto-browserify/md5.js", "/node_modules/gulp-browserify/node_modules/crypto-browserify");
-        }, { "./helpers": 4, buffer: 3, lYpoI2: 11 }], 7: [function(e2, l2, t2) {
-          !(function(e3, t3, n2, r2, o2, i2, u, s, f) {
-            l2.exports = function(e4) {
-              for (var t4, n3 = new Array(e4), r3 = 0; r3 < e4; r3++) 0 == (3 & r3) && (t4 = 4294967296 * Math.random()), n3[r3] = t4 >>> ((3 & r3) << 3) & 255;
-              return n3;
-            };
-          }).call(this, e2("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, e2("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/crypto-browserify/rng.js", "/node_modules/gulp-browserify/node_modules/crypto-browserify");
-        }, { buffer: 3, lYpoI2: 11 }], 8: [function(c, d2, e2) {
-          !(function(e3, t2, n2, r2, o2, s, a2, f, l2) {
-            var i2 = c("./helpers");
-            function u(l3, c2) {
-              l3[c2 >> 5] |= 128 << 24 - c2 % 32, l3[15 + (c2 + 64 >> 9 << 4)] = c2;
-              for (var e4, t3, n3, r3 = Array(80), o3 = 1732584193, i3 = -271733879, u2 = -1732584194, s2 = 271733878, d3 = -1009589776, h = 0; h < l3.length; h += 16) {
-                for (var p2 = o3, g = i3, y = u2, w2 = s2, b2 = d3, a3 = 0; a3 < 80; a3++) {
-                  r3[a3] = a3 < 16 ? l3[h + a3] : v(r3[a3 - 3] ^ r3[a3 - 8] ^ r3[a3 - 14] ^ r3[a3 - 16], 1);
-                  var f2 = m(m(v(o3, 5), (f2 = i3, t3 = u2, n3 = s2, (e4 = a3) < 20 ? f2 & t3 | ~f2 & n3 : !(e4 < 40) && e4 < 60 ? f2 & t3 | f2 & n3 | t3 & n3 : f2 ^ t3 ^ n3)), m(m(d3, r3[a3]), (e4 = a3) < 20 ? 1518500249 : e4 < 40 ? 1859775393 : e4 < 60 ? -1894007588 : -899497514)), d3 = s2, s2 = u2, u2 = v(i3, 30), i3 = o3, o3 = f2;
-                }
-                o3 = m(o3, p2), i3 = m(i3, g), u2 = m(u2, y), s2 = m(s2, w2), d3 = m(d3, b2);
-              }
-              return Array(o3, i3, u2, s2, d3);
-            }
-            function m(e4, t3) {
-              var n3 = (65535 & e4) + (65535 & t3);
-              return (e4 >> 16) + (t3 >> 16) + (n3 >> 16) << 16 | 65535 & n3;
-            }
-            function v(e4, t3) {
-              return e4 << t3 | e4 >>> 32 - t3;
-            }
-            d2.exports = function(e4) {
-              return i2.hash(e4, u, 20, true);
-            };
-          }).call(this, c("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, c("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/crypto-browserify/sha.js", "/node_modules/gulp-browserify/node_modules/crypto-browserify");
-        }, { "./helpers": 4, buffer: 3, lYpoI2: 11 }], 9: [function(c, d2, e2) {
-          !(function(e3, t2, n2, r2, u, s, a2, f, l2) {
-            function b2(e4, t3) {
-              var n3 = (65535 & e4) + (65535 & t3);
-              return (e4 >> 16) + (t3 >> 16) + (n3 >> 16) << 16 | 65535 & n3;
-            }
-            function o2(e4, l3) {
-              var c2, d3 = new Array(1116352408, 1899447441, 3049323471, 3921009573, 961987163, 1508970993, 2453635748, 2870763221, 3624381080, 310598401, 607225278, 1426881987, 1925078388, 2162078206, 2614888103, 3248222580, 3835390401, 4022224774, 264347078, 604807628, 770255983, 1249150122, 1555081692, 1996064986, 2554220882, 2821834349, 2952996808, 3210313671, 3336571891, 3584528711, 113926993, 338241895, 666307205, 773529912, 1294757372, 1396182291, 1695183700, 1986661051, 2177026350, 2456956037, 2730485921, 2820302411, 3259730800, 3345764771, 3516065817, 3600352804, 4094571909, 275423344, 430227734, 506948616, 659060556, 883997877, 958139571, 1322822218, 1537002063, 1747873779, 1955562222, 2024104815, 2227730452, 2361852424, 2428436474, 2756734187, 3204031479, 3329325298), t3 = new Array(1779033703, 3144134277, 1013904242, 2773480762, 1359893119, 2600822924, 528734635, 1541459225), n3 = new Array(64);
-              e4[l3 >> 5] |= 128 << 24 - l3 % 32, e4[15 + (l3 + 64 >> 9 << 4)] = l3;
-              for (var r3, o3, h = 0; h < e4.length; h += 16) {
-                for (var i3 = t3[0], u2 = t3[1], s2 = t3[2], p2 = t3[3], a3 = t3[4], g = t3[5], y = t3[6], w2 = t3[7], f2 = 0; f2 < 64; f2++) n3[f2] = f2 < 16 ? e4[f2 + h] : b2(b2(b2((o3 = n3[f2 - 2], m(o3, 17) ^ m(o3, 19) ^ v(o3, 10)), n3[f2 - 7]), (o3 = n3[f2 - 15], m(o3, 7) ^ m(o3, 18) ^ v(o3, 3))), n3[f2 - 16]), c2 = b2(b2(b2(b2(w2, m(o3 = a3, 6) ^ m(o3, 11) ^ m(o3, 25)), a3 & g ^ ~a3 & y), d3[f2]), n3[f2]), r3 = b2(m(r3 = i3, 2) ^ m(r3, 13) ^ m(r3, 22), i3 & u2 ^ i3 & s2 ^ u2 & s2), w2 = y, y = g, g = a3, a3 = b2(p2, c2), p2 = s2, s2 = u2, u2 = i3, i3 = b2(c2, r3);
-                t3[0] = b2(i3, t3[0]), t3[1] = b2(u2, t3[1]), t3[2] = b2(s2, t3[2]), t3[3] = b2(p2, t3[3]), t3[4] = b2(a3, t3[4]), t3[5] = b2(g, t3[5]), t3[6] = b2(y, t3[6]), t3[7] = b2(w2, t3[7]);
-              }
-              return t3;
-            }
-            var i2 = c("./helpers"), m = function(e4, t3) {
-              return e4 >>> t3 | e4 << 32 - t3;
-            }, v = function(e4, t3) {
-              return e4 >>> t3;
-            };
-            d2.exports = function(e4) {
-              return i2.hash(e4, o2, 32, true);
-            };
-          }).call(this, c("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, c("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/crypto-browserify/sha256.js", "/node_modules/gulp-browserify/node_modules/crypto-browserify");
-        }, { "./helpers": 4, buffer: 3, lYpoI2: 11 }], 10: [function(e2, t2, f) {
-          !(function(e3, t3, n2, r2, o2, i2, u, s, a2) {
-            f.read = function(e4, t4, n3, r3, o3) {
-              var i3, u2, l2 = 8 * o3 - r3 - 1, c = (1 << l2) - 1, d2 = c >> 1, s2 = -7, a3 = n3 ? o3 - 1 : 0, f2 = n3 ? -1 : 1, o3 = e4[t4 + a3];
-              for (a3 += f2, i3 = o3 & (1 << -s2) - 1, o3 >>= -s2, s2 += l2; 0 < s2; i3 = 256 * i3 + e4[t4 + a3], a3 += f2, s2 -= 8) ;
-              for (u2 = i3 & (1 << -s2) - 1, i3 >>= -s2, s2 += r3; 0 < s2; u2 = 256 * u2 + e4[t4 + a3], a3 += f2, s2 -= 8) ;
-              if (0 === i3) i3 = 1 - d2;
-              else {
-                if (i3 === c) return u2 ? NaN : 1 / 0 * (o3 ? -1 : 1);
-                u2 += Math.pow(2, r3), i3 -= d2;
-              }
-              return (o3 ? -1 : 1) * u2 * Math.pow(2, i3 - r3);
-            }, f.write = function(e4, t4, l2, n3, r3, c) {
-              var o3, i3, u2 = 8 * c - r3 - 1, s2 = (1 << u2) - 1, a3 = s2 >> 1, d2 = 23 === r3 ? Math.pow(2, -24) - Math.pow(2, -77) : 0, f2 = n3 ? 0 : c - 1, h = n3 ? 1 : -1, c = t4 < 0 || 0 === t4 && 1 / t4 < 0 ? 1 : 0;
-              for (t4 = Math.abs(t4), isNaN(t4) || t4 === 1 / 0 ? (i3 = isNaN(t4) ? 1 : 0, o3 = s2) : (o3 = Math.floor(Math.log(t4) / Math.LN2), t4 * (n3 = Math.pow(2, -o3)) < 1 && (o3--, n3 *= 2), 2 <= (t4 += 1 <= o3 + a3 ? d2 / n3 : d2 * Math.pow(2, 1 - a3)) * n3 && (o3++, n3 /= 2), s2 <= o3 + a3 ? (i3 = 0, o3 = s2) : 1 <= o3 + a3 ? (i3 = (t4 * n3 - 1) * Math.pow(2, r3), o3 += a3) : (i3 = t4 * Math.pow(2, a3 - 1) * Math.pow(2, r3), o3 = 0)); 8 <= r3; e4[l2 + f2] = 255 & i3, f2 += h, i3 /= 256, r3 -= 8) ;
-              for (o3 = o3 << r3 | i3, u2 += r3; 0 < u2; e4[l2 + f2] = 255 & o3, f2 += h, o3 /= 256, u2 -= 8) ;
-              e4[l2 + f2 - h] |= 128 * c;
-            };
-          }).call(this, e2("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, e2("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/ieee754/index.js", "/node_modules/gulp-browserify/node_modules/ieee754");
-        }, { buffer: 3, lYpoI2: 11 }], 11: [function(e2, h, t2) {
-          !(function(e3, t3, n2, r2, o2, f, l2, c, d2) {
-            var i2, u, s;
-            function a2() {
-            }
-            (e3 = h.exports = {}).nextTick = (u = "undefined" != typeof window && window.setImmediate, s = "undefined" != typeof window && window.postMessage && window.addEventListener, u ? function(e4) {
-              return window.setImmediate(e4);
-            } : s ? (i2 = [], window.addEventListener("message", function(e4) {
-              var t4 = e4.source;
-              t4 !== window && null !== t4 || "process-tick" !== e4.data || (e4.stopPropagation(), 0 < i2.length && i2.shift()());
-            }, true), function(e4) {
-              i2.push(e4), window.postMessage("process-tick", "*");
-            }) : function(e4) {
-              setTimeout(e4, 0);
-            }), e3.title = "browser", e3.browser = true, e3.env = {}, e3.argv = [], e3.on = a2, e3.addListener = a2, e3.once = a2, e3.off = a2, e3.removeListener = a2, e3.removeAllListeners = a2, e3.emit = a2, e3.binding = function(e4) {
-              throw new Error("process.binding is not supported");
-            }, e3.cwd = function() {
-              return "/";
-            }, e3.chdir = function(e4) {
-              throw new Error("process.chdir is not supported");
-            };
-          }).call(this, e2("lYpoI2"), "undefined" != typeof self ? self : "undefined" != typeof window ? window : {}, e2("buffer").Buffer, arguments[3], arguments[4], arguments[5], arguments[6], "/node_modules/gulp-browserify/node_modules/process/browser.js", "/node_modules/gulp-browserify/node_modules/process");
-        }, { buffer: 3, lYpoI2: 11 }] }, {}, [1])(1);
-      });
-    })(object_hash);
-    return object_hash.exports;
-  }
-  var object_hashExports = requireObject_hash();
-  const hash = /* @__PURE__ */ getDefaultExportFromCjs(object_hashExports);
-  function hashObject(obj) {
-    return hash(obj, { unorderedArrays: true, unorderedObjects: true, unorderedSets: true });
-  }
-  function getUniqueIdentifier(variable) {
-    let identifier = variable.uid;
-    if ("nested" in variable) {
-      identifier += variable.nested.join(",");
-    }
-    if ("filters" in variable && variable.filters) {
-      identifier += hashObject(variable.filters);
-    }
-    return identifier;
-  }
   function isPlaceholder(value) {
     return typeof value === "object" && "__ref" in value;
   }
@@ -57616,9 +57024,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     if ("nested" in variable && variable.nested.length > 0) {
       id += `:${variable.nested.join(",")}`;
     }
-    if ("filters" in variable) {
-      id += `:${hashObject(variable.filters)}`;
-    }
     return id;
   }
   function getEntries(obj) {
@@ -57649,7 +57054,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     const normalizedValues = [];
     let lookup = {};
     for (const [key, val] of resolved.values.entries()) {
-      if (isResolvedDerivedVariable(val) || isResolvedDerivedDataVariable(val)) {
+      if (isResolvedDerivedVariable(val)) {
         const { data: nestedNormalized, lookup: nestedLookup } = normalizeResolvedDerivedVariable(
           val,
           def.variables[key]
@@ -57686,7 +57091,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       const kwargDef = kwargsDefinition[key];
       if (!kwargDef) {
         data[key] = val;
-      } else if (isDerivedVariable(kwargDef) || isDerivedDataVariable(kwargDef)) {
+      } else if (isDerivedVariable(kwargDef)) {
         const { data: nestedData, lookup: nestedLookup } = normalizeResolvedDerivedVariable(val, kwargDef);
         data[key] = nestedData;
         lookup = {
@@ -57778,7 +57183,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     await validateResponse(res, `Failed to cancel task with id: ${taskId}`);
     return true;
   }
-  const dataRegistry = /* @__PURE__ */ new Map();
+  function getUniqueIdentifier(variable) {
+    let identifier = variable.uid;
+    if ("nested" in variable) {
+      identifier += variable.nested.join(",");
+    }
+    return identifier;
+  }
   const atomRegistry = /* @__PURE__ */ new Map();
   const atomFamilyRegistry = /* @__PURE__ */ new Map();
   const atomFamilyMembersRegistry = /* @__PURE__ */ new Map();
@@ -57795,7 +57206,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   }
   function clearRegistries_TEST() {
     for (const registry of [
-      dataRegistry,
       atomRegistry,
       atomFamilyRegistry,
       atomFamilyMembersRegistry,
@@ -57812,6 +57222,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return false;
     }
     switch (variable.__typename) {
+      case "ServerVariable":
       case "Variable": {
         if (atomRegistry.has(variable.uid)) {
           return true;
@@ -57822,17 +57233,10 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         }
         return atomFamilyMembersRegistry.get(family).size > 0;
       }
-      case "UrlVariable":
-      case "DataVariable":
-        return atomRegistry.has(variable.uid);
       case "DerivedVariable": {
         const key = getRegistryKey(variable, "selector");
         return selectorFamilyRegistry.has(key);
       }
-      case "DerivedDataVariable": {
-        const key = getRegistryKey(variable, "selector");
-        return selectorFamilyRegistry.has(key);
-      }
       default:
         return false;
     }
@@ -58095,8 +57499,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     console.warn("No valid theme was found. Defaulting to light theme.");
     return theme;
   }
-  function useDeferLoadable(loadable) {
-    const { suspend } = useFallbackCtx();
+  function useDeferLoadable(loadable, suspendOverride) {
+    const { suspend: ctxSuspend } = useFallbackCtx();
+    const suspend = suspendOverride ?? ctxSuspend;
     const [availableState, setAvailableState] = React$1.useState(() => loadable.getValue());
     const timerId = React$1.useRef(null);
     const isFirstRender = React$1.useRef(true);
@@ -58258,16 +57663,9 @@ Inferred class string: "${iconClasses}."`
     return /* @__PURE__ */ React__namespace.createElement(EventBusContext.Provider, { value: bus }, children);
   }
   class StateSynchronizer {
-    static #instance;
-    #observers = /* @__PURE__ */ new Map();
-    // eslint-disable-next-line no-useless-constructor, no-empty-function
+    #observers;
     constructor() {
-    }
-    static getInstance() {
-      if (!StateSynchronizer.#instance) {
-        StateSynchronizer.#instance = new StateSynchronizer();
-      }
-      return StateSynchronizer.#instance;
+      this.#observers = /* @__PURE__ */ new Map();
     }
     /**
      * Register a key in the state synchronizer
@@ -58329,6 +57727,7 @@ Inferred class string: "${iconClasses}."`
       this.#observers.get(key).next(update);
     }
   }
+  const STATE_SYNCHRONIZER$1 = new StateSynchronizer();
   function getOrRegisterPlainVariable(variable, wsClient, taskContext, extras) {
     const isNested = variable.nested && variable.nested.length > 0;
     const isDefaultDerived = isDerivedVariable(variable.default);
@@ -58352,15 +57751,15 @@ Inferred class string: "${iconClasses}."`
           ) : variable.default,
           effects: (extrasSerializable2) => {
             const familySync = ({ onSet, setSelf, resetSelf, node }) => {
-              if (!StateSynchronizer.getInstance().isRegistered(variable.uid)) {
-                StateSynchronizer.getInstance().register(variable.uid, variable.default);
+              if (!STATE_SYNCHRONIZER$1.isRegistered(variable.uid)) {
+                STATE_SYNCHRONIZER$1.register(variable.uid, variable.default);
               } else {
-                const currentState = StateSynchronizer.getInstance().getCurrentState(variable.uid);
+                const currentState = STATE_SYNCHRONIZER$1.getCurrentState(variable.uid);
                 if (!isDefaultDerived || currentState?.type !== "initial") {
                   setSelf(currentState?.value);
                 }
               }
-              const unsub = StateSynchronizer.getInstance().subscribe(variable.uid, (update) => {
+              const unsub = STATE_SYNCHRONIZER$1.subscribe(variable.uid, (update) => {
                 if (update.type === "initial") {
                   return;
                 }
@@ -58374,7 +57773,7 @@ Inferred class string: "${iconClasses}."`
                 }
               });
               onSet((newValue, oldValue, isReset) => {
-                StateSynchronizer.getInstance().notify(variable.uid, {
+                STATE_SYNCHRONIZER$1.notify(variable.uid, {
                   isReset,
                   nodeKey: node.key,
                   oldValue,
@@ -58388,12 +57787,15 @@ Inferred class string: "${iconClasses}."`
             const storeEffect = getEffect(variable);
             if (storeEffect) {
               effects.push(storeEffect(variable, extrasSerializable2, wsClient, taskContext));
-            } else {
-              if (variable.persist_value || isEmbedded()) {
-                effects.push(
-                  STORES.BrowserStore.effect(variable, extrasSerializable2, wsClient, taskContext)
-                );
-              }
+            } else if (isEmbedded()) {
+              effects.push(
+                STORES.BrowserStore.effect(
+                  variable,
+                  extrasSerializable2,
+                  wsClient,
+                  taskContext
+                )
+              );
             }
             return effects;
           },
@@ -58440,6 +57842,108 @@ Inferred class string: "${iconClasses}."`
     }
     return atomInstance;
   }
+  function createDataUrl(path, pagination) {
+    const url = new URL(path, window.location.origin);
+    if (pagination?.limit) {
+      url.searchParams.set("limit", String(pagination.limit));
+    }
+    if (pagination?.offset) {
+      url.searchParams.set("offset", String(pagination.offset));
+    }
+    if (pagination?.sort) {
+      url.searchParams.set("order_by", (pagination.sort.desc ? "-" : "") + pagination.sort.id);
+    }
+    if (pagination?.index) {
+      url.searchParams.set("index", String(pagination.index));
+    }
+    return url;
+  }
+  async function validateTabularResponse(uid2, response) {
+    if (response.status === 415) {
+      let msg = `The requested variable ${uid2} data is not tabular`;
+      try {
+        const data = await response.json();
+        if ("detail" in data) {
+          msg += `. ${data.detail}`;
+        }
+      } catch {
+      }
+      throw new UserError(msg);
+    }
+  }
+  function isDataResponse(response) {
+    return response && typeof response === "object" && "data" in response && "count" in response;
+  }
+  async function fetchTabularServerVariable({
+    variable,
+    // Explicitly unused, required for the callback dependency to ensure its identity changes
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    seqNumber,
+    wsClient,
+    extras,
+    filters = null,
+    pagination = null
+  }) {
+    const url = createDataUrl(`/api/core/tabular-variable/${variable.uid}`, pagination);
+    const body = {
+      filters: filters ?? null,
+      ws_channel: await wsClient.getChannel()
+    };
+    const response = await request(url, { body: JSON.stringify(body), method: HTTP_METHOD.POST }, extras);
+    await handleAuthErrors(response, true);
+    await validateTabularResponse(variable.uid, response);
+    await validateResponse(response, "Failed to fetch tabular data");
+    return response.json();
+  }
+  function useFetchTabularServerVariable(variable, seqNumber, wsClient, extras) {
+    return React$1.useCallback(
+      async (filters, pagination) => {
+        return fetchTabularServerVariable({ variable, seqNumber, wsClient, extras, filters, pagination });
+      },
+      [wsClient, variable, seqNumber, extras]
+    );
+  }
+  function useFetchTabularDerivedVariable(variable, dvResult, wsClient, taskContext, extras) {
+    const previousResult = React$1.useRef({
+      data: null,
+      count: 0,
+      schema: { fields: [], primaryKey: [] }
+    });
+    return React$1.useCallback(
+      async (filters, pagination) => {
+        const url = createDataUrl(`/api/core/tabular-variable/${variable.uid}`, pagination);
+        const body = {
+          filters: filters ?? null,
+          ws_channel: await wsClient.getChannel(),
+          dv_values: normalizeRequest(cleanArgs(dvResult.values), variable.variables)
+        };
+        const response = await request(url, { body: JSON.stringify(body), method: HTTP_METHOD.POST }, extras);
+        await handleAuthErrors(response, true);
+        await validateTabularResponse(variable.uid, response);
+        await validateResponse(response, "Failed to fetch tabular data");
+        const responseJson = await response.json();
+        const variableTaskId = `${variable.uid}-filter`;
+        taskContext.cleanupRunningTasks(variableTaskId);
+        if (!("task_id" in responseJson)) {
+          previousResult.current = responseJson;
+          return responseJson;
+        }
+        const taskId = responseJson.task_id;
+        taskContext.startTask(taskId, variableTaskId);
+        try {
+          await wsClient.waitForTask(taskId);
+        } catch {
+          return previousResult.current;
+        } finally {
+          taskContext.endTask(taskId);
+        }
+        const taskResult = await fetchTaskResult(taskId, extras);
+        previousResult.current = taskResult;
+        return taskResult;
+      },
+      [variable.uid, variable.variables, dvResult, wsClient, taskContext, extras]
+    );
+  }
   function _defineProperty(obj, key, value) {
     if (key in obj) {
       Object.defineProperty(obj, key, {
@@ -58784,183 +58288,109 @@ Inferred class string: "${iconClasses}."`
     mixed: mixed$1
   };
   var Refine_index_6 = Refine_index.mixed;
-  function getOrRegisterUrlVariable(variable) {
-    if (!atomRegistry.has(variable.uid)) {
-      atomRegistry.set(
+  const STORE_EXTRAS_MAP$1 = /* @__PURE__ */ new Map();
+  function serverSyncEffect(variable, requestExtras) {
+    STORE_EXTRAS_MAP$1.set(variable.uid, requestExtras);
+    return RecoilSync_index_2({
+      /** Use store uid as the unique identifier */
+      itemKey: variable.uid,
+      refine: Refine_index_6(),
+      storeKey: "ServerVariable"
+    });
+  }
+  const STATE_SYNCHRONIZER = new StateSynchronizer();
+  function getOrRegisterServerVariable(variable, extras) {
+    if (!atomFamilyRegistry.has(variable.uid)) {
+      atomFamilyRegistry.set(
         variable.uid,
-        Recoil_index_8({
-          default: variable.default,
-          effects: [
-            RecoilSync_index_6({
-              history: "push",
-              itemKey: variable.query,
-              refine: Refine_index_6()
-            })
-          ],
+        Recoil_index_10({
+          // NOTE: No default provided, atom starts in a pending state
+          effects: (extrasSerializable2) => {
+            const familySync = ({ onSet, setSelf, resetSelf, node }) => {
+              if (!STATE_SYNCHRONIZER.isRegistered(variable.uid)) {
+                STATE_SYNCHRONIZER.register(variable.uid, null);
+              } else {
+                const currentState = STATE_SYNCHRONIZER.getCurrentState(variable.uid);
+                if (currentState?.type !== "initial") {
+                  setSelf(currentState?.value);
+                }
+              }
+              const unsub = STATE_SYNCHRONIZER.subscribe(variable.uid, (update) => {
+                if (update.type === "initial") {
+                  return;
+                }
+                if (update.nodeKey === node.key) {
+                  return;
+                }
+                if (update.isReset) {
+                  resetSelf();
+                } else {
+                  setSelf(update.value);
+                }
+              });
+              onSet((newValue, oldValue, isReset) => {
+                STATE_SYNCHRONIZER.notify(variable.uid, {
+                  isReset,
+                  nodeKey: node.key,
+                  oldValue,
+                  type: "update",
+                  value: newValue
+                });
+              });
+              return unsub;
+            };
+            return [familySync, serverSyncEffect(variable, extrasSerializable2)];
+          },
           key: variable.uid
         })
       );
     }
-    return atomRegistry.get(variable.uid);
-  }
-  function useUrlVariable(variable) {
-    return Recoil_index_22(getOrRegisterUrlVariable(variable));
-  }
-  function combineFilters(combinator, queries) {
-    const validQueries = queries.filter(Boolean);
-    if (validQueries.length === 0) {
-      return null;
-    }
-    if (validQueries.length === 1) {
-      return validQueries[0];
+    const family = atomFamilyRegistry.get(variable.uid);
+    const extrasSerializable = new RequestExtrasSerializable(extras);
+    const atomInstance = family(extrasSerializable);
+    if (!atomFamilyMembersRegistry.has(family)) {
+      atomFamilyMembersRegistry.set(family, /* @__PURE__ */ new Map());
     }
-    return {
-      clauses: validQueries,
-      combinator
-    };
+    atomFamilyMembersRegistry.get(family).set(extrasSerializable.toJSON(), atomInstance);
+    return atomInstance;
   }
-  function resolveDataVariable(variable) {
+  async function resolveServerVariable(variable, extras, resolver) {
+    const atom2 = getOrRegisterServerVariable(variable, extras);
+    const seqNumber = await resolver(atom2);
     return {
-      filters: variable.filters,
-      type: "data",
-      uid: variable.uid
+      type: "server",
+      uid: variable.uid,
+      sequence_number: seqNumber
     };
   }
-  function createDataUrl(path, pagination) {
-    const url = new URL(path, window.location.origin);
-    if (pagination?.limit) {
-      url.searchParams.set("limit", String(pagination.limit));
-    }
-    if (pagination?.offset) {
-      url.searchParams.set("offset", String(pagination.offset));
-    }
-    if (pagination?.sort) {
-      url.searchParams.set("order_by", (pagination.sort.desc ? "-" : "") + pagination.sort.id);
-    }
-    if (pagination?.index) {
-      url.searchParams.set("index", String(pagination.index));
-    }
-    return url;
-  }
-  async function fetchDataVariable(uid2, extras, filters, pagination) {
-    const url = createDataUrl(`/api/core/data-variable/${uid2}`, pagination);
-    const response = await request(url, { body: JSON.stringify({ filters }), method: HTTP_METHOD.POST }, extras);
-    await handleAuthErrors(response, true);
-    await validateResponse(response, "Failed to fetch data variable");
-    return response.json();
-  }
-  async function fetchDerivedDataVariable(uid2, extras, cacheKey, wsChannel, filters, pagination) {
-    const url = createDataUrl(`/api/core/data-variable/${uid2}`, pagination);
-    const response = await request(
-      url,
-      { body: JSON.stringify({ cache_key: cacheKey, filters, ws_channel: wsChannel }), method: HTTP_METHOD.POST },
-      extras
-    );
-    await handleAuthErrors(response, true);
-    await validateResponse(response, "Failed to fetch data variable");
-    return response.json();
-  }
-  async function fetchDataVariableCount(uid2, extras, filters, cacheKey) {
-    const response = await request(
-      `/api/core/data-variable/${uid2}/count`,
-      { body: JSON.stringify({ cache_key: cacheKey, filters }), method: HTTP_METHOD.POST },
-      extras
-    );
-    await handleAuthErrors(response, true);
-    await validateResponse(response, "Failed to fetch data variable total count");
-    return response.json();
-  }
-  async function fetchDataVariableSchema(uid2, extras, cacheKey) {
-    const queryString = cacheKey ? new URLSearchParams({ cache_key: cacheKey }).toString() : "";
-    const response = await request(
-      `/api/core/data-variable/${uid2}/schema?${queryString}`,
-      { method: HTTP_METHOD.GET },
-      extras
-    );
-    await handleAuthErrors(response, true);
-    await validateResponse(response, "Failed to fetch data variable schema");
-    return response.json();
-  }
-  function useFetchDataVariable(variable, serverTriggerCounter) {
-    const eventBus = useEventBus();
-    const extras = useRequestExtras();
-    const dataCallback = React$1.useCallback(
-      async (filters, pagination, options) => {
-        const mergedFilters = combineFilters("AND", [variable.filters, filters]);
-        const data = await fetchDataVariable(variable.uid, extras, mergedFilters, pagination);
-        const [totalCount, schema = null] = await Promise.all([
-          fetchDataVariableCount(variable.uid, extras, mergedFilters),
-          ...options?.schema ? [fetchDataVariableSchema(variable.uid, extras)] : []
-        ]);
-        eventBus.publish("DATA_VARIABLE_LOADED", { variable, value: { data, totalCount } });
-        return {
-          data,
-          totalCount,
-          ...schema !== null && { schema }
-        };
-      },
-      [variable, extras, serverTriggerCounter, eventBus]
-    );
-    return dataCallback;
-  }
-  function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValuePromise) {
-    const eventBus = useEventBus();
-    const extras = useRequestExtras();
-    const previousResult = React$1.useRef({ data: null, totalCount: 0, schema: { fields: [], primaryKey: [] } });
-    const dataCallback = React$1.useCallback(
-      async (filters, pagination, options) => {
-        const mergedFilters = combineFilters("AND", [variable.filters, filters]);
-        const dvValue = await dvValuePromise;
-        const response = await fetchDerivedDataVariable(
-          variable.uid,
-          extras,
-          dvValue.cache_key,
-          await wsClient.getChannel(),
-          mergedFilters,
-          pagination
-        );
-        let data = null;
-        const variableTaskId = `${variable.uid}-filter`;
-        taskContext.cleanupRunningTasks(variableTaskId);
-        if (response && "task_id" in response) {
-          const taskId = response.task_id;
-          taskContext.startTask(taskId, variableTaskId);
-          try {
-            await wsClient.waitForTask(taskId);
-          } catch {
-            eventBus.publish("DERIVED_DATA_VARIABLE_LOADED", { variable, value: null });
-            return previousResult.current;
-          } finally {
-            taskContext.endTask(taskId);
-          }
-          data = await fetchTaskResult(taskId, extras);
-        } else {
-          data = response;
-        }
-        const [totalCount, schema = null] = await Promise.all([
-          fetchDataVariableCount(variable.uid, extras, mergedFilters, dvValue.cache_key),
-          ...options?.schema ? [fetchDataVariableSchema(variable.uid, extras, dvValue.cache_key)] : []
-        ]);
-        previousResult.current = {
-          data,
-          totalCount,
-          ...schema !== null && { schema }
-        };
-        eventBus.publish("DERIVED_DATA_VARIABLE_LOADED", { variable, value: { data, totalCount } });
-        return {
-          data,
-          totalCount,
-          ...schema !== null && { schema }
+  function ServerVariableSyncProvider({ children }) {
+    const { client: client2 } = React$1.useContext(websocketCtx);
+    const getStoreValue = React$1.useCallback(async (itemKey) => {
+      const serializableExtras = STORE_EXTRAS_MAP$1.get(itemKey);
+      const response = await request(
+        `/api/core/server-variable/${itemKey}/sequence`,
+        serializableExtras?.extras ?? {}
+      );
+      await handleAuthErrors(response, true);
+      await validateResponse(response, `Failed to fetch the sequence number for key: ${itemKey}`);
+      const { sequence_number } = await response.json();
+      return sequence_number;
+    }, []);
+    const listenToStoreChanges = React$1.useCallback(
+      ({ updateItem }) => {
+        if (!client2) {
+          return;
+        }
+        const valueSub = client2.serverVariableMessages$().subscribe((message) => {
+          updateItem(message.uid, message.sequence_number);
+        });
+        return () => {
+          valueSub.unsubscribe();
         };
       },
-      [variable, extras, dvValuePromise, eventBus]
+      [client2]
     );
-    return dataCallback;
-  }
-  function registerDataVariable(variable) {
-    if (!atomRegistry.has(variable.uid)) {
-      atomRegistry.set(variable.uid, Recoil_index_8({ default: true, key: variable.uid }));
-    }
+    return /* @__PURE__ */ React$1.createElement(RecoilSync_index_1, { listen: listenToStoreChanges, read: getStoreValue, storeKey: "ServerVariable" }, children);
   }
   var set_1;
   var hasRequiredSet;
@@ -58992,50 +58422,11 @@ Inferred class string: "${iconClasses}."`
     }
     return atomRegistry.get(triggerKey);
   }
-  function getOrRegisterDataVariableTrigger(variable, wsClient) {
-    const key = `${variable.uid}-data`;
-    if (!dataRegistry.has(key)) {
-      dataRegistry.set(
-        key,
-        Recoil_index_8({
-          default: {
-            force_key: null,
-            inc: 0
-          },
-          effects: [
-            // synchronize with server triggers - increment when the variable is triggered on the server side
-            // In the DataVariable case we always force so new key is generated
-            ({ setSelf }) => {
-              const subscription = wsClient.serverTriggers$(variable.uid).subscribe(() => {
-                setSelf((v) => {
-                  if (typeof v === "object" && "inc" in v) {
-                    return {
-                      force_key: nanoid(),
-                      inc: v.inc + 1
-                    };
-                  }
-                  return {
-                    force_key: nanoid(),
-                    inc: 1
-                  };
-                });
-              });
-              return () => {
-                subscription?.unsubscribe();
-              };
-            }
-          ],
-          key
-        })
-      );
-    }
-    return dataRegistry.get(key);
-  }
   function buildTriggerList(variables) {
     const triggers = [];
     function walk(vars, path) {
       for (const [idx, variable] of vars.entries()) {
-        if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
+        if (isDerivedVariable(variable)) {
           const varPath = [...path, String(idx)];
           triggers.push({
             path: varPath,
@@ -59043,27 +58434,17 @@ Inferred class string: "${iconClasses}."`
           });
           walk(variable.variables, [...varPath, "values"]);
         }
-        if (isDataVariable(variable)) {
-          triggers.push({
-            path: path.length > 0 ? path.slice(0, -1) : [],
-            variable
-          });
-        }
       }
     }
     walk(variables, []);
     return triggers;
   }
-  function registerChildTriggers(triggerList, wsClient, registerFunc = Recoil_index_20) {
+  function registerChildTriggers(triggerList, registerFunc = Recoil_index_20) {
     return triggerList.map((triggerInfo) => {
-      if (isDerivedVariable(triggerInfo.variable) || isDerivedDataVariable(triggerInfo.variable)) {
+      if (isDerivedVariable(triggerInfo.variable)) {
         const triggerIndex = getOrRegisterTrigger(triggerInfo.variable);
         return registerFunc(triggerIndex);
       }
-      if (isDataVariable(triggerInfo.variable)) {
-        const serverTrigger = getOrRegisterDataVariableTrigger(triggerInfo.variable, wsClient);
-        return registerFunc(serverTrigger);
-      }
       throw new Error("Invalid trigger variable type");
     });
   }
@@ -59076,8 +58457,7 @@ Inferred class string: "${iconClasses}."`
     force_key,
     variableUid,
     values,
-    wsClient,
-    is_data_variable = false
+    wsClient
   }) {
     const cacheControl = cache2 === null ? {
       "cache-control": "none"
@@ -59086,7 +58466,7 @@ Inferred class string: "${iconClasses}."`
     const res = await request(
       `/api/core/derived-variable/${variableUid}`,
       {
-        body: JSON.stringify({ is_data_variable, values, ws_channel, force_key: force_key ?? null }),
+        body: JSON.stringify({ values, ws_channel, force_key: force_key ?? null }),
         headers: { ...cacheControl },
         method: HTTP_METHOD.POST
       },
@@ -59105,8 +58485,7 @@ Inferred class string: "${iconClasses}."`
     wsClient,
     extras,
     cache: cache2,
-    force_key,
-    is_data_variable = false
+    force_key
   }) {
     if (!debouncedFetchSubjects[selectorKey]) {
       debouncedFetchSubjects[selectorKey] = new BehaviorSubject(null);
@@ -59121,7 +58500,6 @@ Inferred class string: "${iconClasses}."`
       cache: cache2,
       extras,
       force_key,
-      is_data_variable,
       selectorKey,
       values,
       variableUid,
@@ -59132,7 +58510,7 @@ Inferred class string: "${iconClasses}."`
     });
   }
   function resolveValue(value, getter) {
-    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
+    if (isResolvedDerivedVariable(value)) {
       const resolvedValues = value.values.map((v) => resolveValue(v, getter));
       return {
         ...value,
@@ -59147,8 +58525,11 @@ Inferred class string: "${iconClasses}."`
         default: resolveValue(value.default, getter)
       };
     }
-    if (isResolvedDataVariable(value)) {
-      return value;
+    if (isResolvedServerVariable(value)) {
+      return {
+        ...value,
+        sequence_number: Recoil_index_2(value.sequence_number) ? getter(value.sequence_number) : value.sequence_number
+      };
     }
     if (isCondition(value)) {
       return {
@@ -59167,9 +58548,12 @@ Inferred class string: "${iconClasses}."`
       if (deps && !deps.includes(idx)) {
         return [];
       }
-      if (isResolvedDerivedVariable(val) || isResolvedDerivedDataVariable(val)) {
+      if (isResolvedDerivedVariable(val)) {
         return getDeps(val.values, val.deps).flat();
       }
+      if (isResolvedServerVariable(val)) {
+        return val.sequence_number;
+      }
       if (isResolvedSwitchVariable(val)) {
         return getDeps([val.value, val.value_map, val.default], [0, 1, 2]).flat();
       }
@@ -59179,9 +58563,9 @@ Inferred class string: "${iconClasses}."`
   function useTriggerIndex(variable) {
     return Recoil_index_20(getOrRegisterTrigger(variable));
   }
-  function resolveDerivedValue(key, variables, deps, resolvedVariables, wsClient, get, selfTrigger) {
+  function resolveDerivedValue(key, variables, deps, resolvedVariables, get, selfTrigger) {
     const triggerList = buildTriggerList(variables);
-    const triggers = registerChildTriggers(triggerList, wsClient, get);
+    const triggers = registerChildTriggers(triggerList, get);
     if (selfTrigger) {
       triggers.unshift(selfTrigger);
     }
@@ -59200,7 +58584,9 @@ Inferred class string: "${iconClasses}."`
       if (areArgsTheSame) {
         return {
           entry: previousEntry,
-          type: "previous"
+          type: "previous",
+          values,
+          depsKey: key
         };
       }
       const previousTriggerCounters = previousEntry.args.slice(
@@ -59227,18 +58613,20 @@ Inferred class string: "${iconClasses}."`
         relevantValues,
         selfTriggerForceKey,
         type: "current",
-        values
+        values,
+        depsKey: key
       };
     }
     return {
       relevantValues,
       selfTriggerForceKey: null,
       type: "current",
-      values
+      values,
+      depsKey: key
     };
   }
-  function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
-    const key = getRegistryKey(variable, "selector");
+  function getOrRegisterDerivedVariableResult(variable, wsClient, taskContext, currentExtras) {
+    const key = getRegistryKey(variable, "result-selector");
     if (!selectorFamilyRegistry.has(key)) {
       getOrRegisterTrigger(variable);
       selectorFamilyRegistry.set(
@@ -59248,34 +58636,68 @@ Inferred class string: "${iconClasses}."`
             eviction: "most-recent"
           },
           get: (extrasSerializable) => async ({ get }) => {
-            const resolvedVariables = variable.variables.map((v) => {
-              if (!isVariable(v)) {
-                return v;
-              }
-              return resolveVariable(v, wsClient, taskContext, currentExtras);
-            });
+            const resolvedVariables = await Promise.all(
+              variable.variables.map(async (v) => {
+                if (!isVariable(v)) {
+                  return Promise.resolve(v);
+                }
+                return resolveVariable(v, wsClient, taskContext, currentExtras);
+              })
+            );
             const selfTrigger = get(getOrRegisterTrigger(variable));
-            const { extras } = extrasSerializable;
             const selectorKey = key + extrasSerializable.toJSON();
             const derivedResult = resolveDerivedValue(
               selectorKey,
               variable.variables,
               variable.deps,
               resolvedVariables,
-              wsClient,
               get,
               selfTrigger
             );
+            return derivedResult;
+          },
+          key: nanoid()
+        })
+      );
+    }
+    const family = selectorFamilyRegistry.get(key);
+    const serializableExtras = new RequestExtrasSerializable(currentExtras);
+    const selectorInstance = family(serializableExtras);
+    if (!selectorFamilyMembersRegistry.has(family)) {
+      selectorFamilyMembersRegistry.set(family, /* @__PURE__ */ new Map());
+    }
+    selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
+    return selectorInstance;
+  }
+  function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
+    const key = getRegistryKey(variable, "selector");
+    if (!selectorFamilyRegistry.has(key)) {
+      getOrRegisterTrigger(variable);
+      selectorFamilyRegistry.set(
+        key,
+        Recoil_index_11({
+          cachePolicy_UNSTABLE: {
+            eviction: "most-recent"
+          },
+          get: (extrasSerializable) => async ({ get }) => {
+            const selectorKey = key + extrasSerializable.toJSON();
+            const dvResultSelector = getOrRegisterDerivedVariableResult(
+              variable,
+              wsClient,
+              taskContext,
+              extrasSerializable.extras
+            );
+            const derivedResult = get(dvResultSelector);
             if (derivedResult.type === "previous") {
               return { cache_key: derivedResult.entry.cacheKey, value: derivedResult.entry.result };
             }
+            const { extras } = extrasSerializable;
             let variableResponse = null;
             try {
               variableResponse = await debouncedFetchDerivedVariable({
                 cache: variable.cache,
                 extras,
                 force_key: derivedResult.selfTriggerForceKey,
-                is_data_variable: isDerivedDataVariable(variable),
                 selectorKey,
                 values: normalizeRequest(cleanArgs(derivedResult.values), variable.variables),
                 variableUid: variable.uid,
@@ -59288,34 +58710,37 @@ Inferred class string: "${iconClasses}."`
             }
             const cacheKey = variableResponse.cache_key;
             let variableValue = null;
-            if (isDerivedVariable(variable)) {
-              taskContext.cleanupRunningTasks(variable.uid);
-              if (isTaskResponse$1(variableResponse)) {
-                const taskId = variableResponse.task_id;
-                taskContext.startTask(taskId, variable.uid, getRegistryKey(variable, "trigger"));
-                try {
-                  await wsClient.waitForTask(taskId);
-                } catch {
-                  return {
-                    cache_key: cacheKey,
-                    value: null
-                  };
-                } finally {
-                  taskContext.endTask(taskId);
-                }
-                try {
-                  variableValue = await fetchTaskResult(taskId, extras);
-                } catch (e2) {
+            taskContext.cleanupRunningTasks(variable.uid);
+            if (isTaskResponse$1(variableResponse)) {
+              const taskId = variableResponse.task_id;
+              taskContext.startTask(taskId, variable.uid, getRegistryKey(variable, "trigger"));
+              try {
+                await wsClient.waitForTask(taskId);
+              } catch (e2) {
+                if (e2 instanceof TaskError) {
                   e2.selectorId = key;
                   e2.selectorExtras = extrasSerializable.toJSON();
                   throw e2;
                 }
-              } else {
-                variableValue = variableResponse.value;
+                return {
+                  cache_key: cacheKey,
+                  value: null
+                };
+              } finally {
+                taskContext.endTask(taskId);
+              }
+              try {
+                variableValue = await fetchTaskResult(taskId, extras);
+              } catch (e2) {
+                e2.selectorId = key;
+                e2.selectorExtras = extrasSerializable.toJSON();
+                throw e2;
               }
+            } else {
+              variableValue = variableResponse.value;
             }
             variableValue = "nested" in variable ? resolveNested(variableValue, variable.nested) : variableValue;
-            depsRegistry.set(selectorKey, {
+            depsRegistry.set(derivedResult.depsKey, {
               args: derivedResult.relevantValues,
               cacheKey,
               result: variableValue
@@ -59427,20 +58852,13 @@ Inferred class string: "${iconClasses}."`
     cloned[key] = nested.length === 1 ? newValue : setNested(cloned[key], nested.slice(1), newValue);
     return cloned;
   }
-  function resolveVariable(variable, client2, taskContext, extras, resolver = (val) => val) {
-    if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
+  async function resolveVariable(variable, client2, taskContext, extras, resolver = (state) => Promise.resolve(state)) {
+    if (isDerivedVariable(variable)) {
       getOrRegisterDerivedVariable(variable, client2, taskContext, extras);
-      const values = variable.variables.map((v) => resolveVariable(v, client2, taskContext, extras, resolver));
+      const values = await Promise.all(
+        variable.variables.map((v) => resolveVariable(v, client2, taskContext, extras, resolver))
+      );
       const deps = variable.deps.map((dep) => variable.variables.findIndex((v) => v.uid === dep.uid));
-      if (isDerivedDataVariable(variable)) {
-        return {
-          deps,
-          filters: variable.filters,
-          type: "derived-data",
-          uid: variable.uid,
-          values
-        };
-      }
       return {
         deps,
         type: "derived",
@@ -59448,22 +58866,20 @@ Inferred class string: "${iconClasses}."`
         values
       };
     }
-    if (isDataVariable(variable)) {
-      return resolveDataVariable(variable);
-    }
-    if (isUrlVariable(variable)) {
-      return resolver(getOrRegisterUrlVariable(variable));
+    if (isServerVariable(variable)) {
+      getOrRegisterServerVariable(variable, extras);
+      return resolveServerVariable(variable, extras, resolver);
     }
     if (isSwitchVariable(variable)) {
-      let resolvedValue = isVariable(variable.value) ? resolveVariable(variable.value, client2, taskContext, extras, resolver) : variable.value;
+      let resolvedValue = isVariable(variable.value) ? await resolveVariable(variable.value, client2, taskContext, extras, resolver) : variable.value;
       if (isCondition(resolvedValue)) {
         resolvedValue = {
           ...resolvedValue,
-          variable: resolveVariable(resolvedValue.variable, client2, taskContext, extras, resolver)
+          variable: await resolveVariable(resolvedValue.variable, client2, taskContext, extras, resolver)
         };
       }
-      const resolvedValueMap = isVariable(variable.value_map) ? resolveVariable(variable.value_map, client2, taskContext, extras, resolver) : variable.value_map;
-      const resolvedDefault = isVariable(variable.default) ? resolveVariable(variable.default, client2, taskContext, extras, resolver) : variable.default;
+      const resolvedValueMap = isVariable(variable.value_map) ? await resolveVariable(variable.value_map, client2, taskContext, extras, resolver) : variable.value_map;
+      const resolvedDefault = isVariable(variable.default) ? await resolveVariable(variable.default, client2, taskContext, extras, resolver) : variable.default;
       return {
         type: "switch",
         uid: variable.uid,
@@ -59472,10 +58888,13 @@ Inferred class string: "${iconClasses}."`
         default: resolvedDefault
       };
     }
+    if (isStateVariable(variable)) {
+      throw new Error("StateVariable should not be resolved - it should be handled by useVariable hook");
+    }
     return resolver(getOrRegisterPlainVariable(variable, client2, taskContext, extras));
   }
   function cleanValue(value, forceKeyOverride) {
-    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
+    if (isResolvedDerivedVariable(value)) {
       const { deps, ...rest } = value;
       const cleanedValues = value.values.map((v) => cleanValue(v));
       return {
@@ -60383,19 +59802,27 @@ Inferred class string: "${iconClasses}."`
       storeKey: "BrowserStore"
     });
   }
+  function urlEffect(variable) {
+    return RecoilSync_index_6({
+      history: "push",
+      itemKey: variable.store.query,
+      refine: Refine_index_6()
+    });
+  }
   const STORES = {
     BackendStore: {
-      effect: backendStoreEffect,
-      sync: BackendStoreSync
+      effect: backendStoreEffect
     },
     BrowserStore: {
-      effect: localStorageEffect,
-      sync: BrowserStoreSync
+      effect: localStorageEffect
+    },
+    QueryParamStore: {
+      effect: urlEffect
     }
   };
   function getEffect(variable) {
     const storeName = variable.store?.__typename;
-    if (!storeName) {
+    if (!storeName || !(storeName in STORES)) {
       return null;
     }
     return STORES[storeName]?.effect ?? null;
@@ -60427,25 +59854,290 @@ Inferred class string: "${iconClasses}."`
     }
     throw new Error(`Unexpected operator ${String(operator)} passed to conditional (If) component`);
   }
-  function useConditionOrVariable(arg) {
+  function useConditionOrVariable(arg, opts = {}) {
     if (isCondition(arg)) {
-      const value = useVariable(arg.variable)[0];
-      const other = useVariable(arg.other)[0];
+      const value = useVariable(arg.variable, opts)[0];
+      const other = useVariable(arg.other, opts)[0];
       return isConditionTrue(arg.operator, value, other);
     }
-    return useVariable(arg)[0];
+    return useVariable(arg, opts)[0];
   }
   function useSwitchVariable(variable) {
-    const value = useConditionOrVariable(variable.value);
-    const [valueMap] = useVariable(variable.value_map);
-    const [defaultValue] = useVariable(variable.default);
+    const value = useConditionOrVariable(variable.value, { suspend: false });
+    const [valueMap] = useVariable(variable.value_map, { suspend: false });
+    const [defaultValue] = useVariable(variable.default, { suspend: false });
     const lookupKey = String(value);
     return valueMap[lookupKey] ?? defaultValue;
   }
+  const COLUMN_PREFIX_REGEX = /__(?:col|index)__\d+__/;
+  function combineFilters(combinator, queries) {
+    const validQueries = queries.filter((x) => x !== null && x !== void 0);
+    if (validQueries.length === 0) {
+      return null;
+    }
+    if (validQueries.length === 1) {
+      return validQueries[0];
+    }
+    return {
+      clauses: validQueries,
+      combinator
+    };
+  }
+  function inferColumnType(value, hint) {
+    if (typeof value === "number") {
+      return "numerical";
+    }
+    if (typeof value === "string") {
+      return "categorical";
+    }
+    if (value instanceof Date) {
+      return "datetime";
+    }
+    return "categorical";
+  }
+  function filterRow(row, column, operator, value, columnHints) {
+    const cellValue = row[column];
+    if (operator === "CONTAINS") {
+      return String(cellValue).toLowerCase().includes(String(value).toLowerCase());
+    }
+    const colType = inferColumnType(cellValue);
+    try {
+      let processedValue = value;
+      let processedCellValue = cellValue;
+      if (Array.isArray(value)) {
+        return value.includes(cellValue);
+      }
+      if (colType === "datetime") {
+        if (Array.isArray(value)) {
+          processedValue = value.map((v) => new Date(v).getTime());
+        } else {
+          processedValue = new Date(value).getTime();
+        }
+        if (typeof cellValue === "number") {
+          processedCellValue = cellValue;
+        } else if (cellValue instanceof Date) {
+          processedCellValue = cellValue.getTime();
+        } else if (typeof cellValue === "string") {
+          processedCellValue = parseISO$1(cellValue).getTime();
+        } else {
+          processedCellValue = 0;
+        }
+      } else if (colType === "categorical") {
+        processedValue = String(value);
+        processedCellValue = String(cellValue);
+      } else if (colType === "numerical") {
+        if (Array.isArray(value)) {
+          processedValue = value.map((v) => {
+            const num = Number(v);
+            return Number.isNaN(num) ? 0 : num;
+          });
+        } else {
+          const num = Number(value);
+          processedValue = Number.isNaN(num) ? 0 : num;
+        }
+        const cellNum = Number(cellValue);
+        processedCellValue = Number.isNaN(cellNum) ? 0 : cellNum;
+      }
+      switch (operator) {
+        case "GT":
+          return processedCellValue > processedValue;
+        case "LT":
+          return processedCellValue < processedValue;
+        case "NE":
+          return processedCellValue !== processedValue;
+        case "BT":
+          if (Array.isArray(processedValue) && processedValue.length === 2) {
+            return processedCellValue >= processedValue[0] && processedCellValue <= processedValue[1];
+          }
+          return false;
+        case "EQ":
+        default:
+          return processedCellValue === processedValue;
+      }
+    } catch (error) {
+      console.warn("Filter error:", error, { column, value, operator });
+      return true;
+    }
+  }
+  function resolveFilterQuery(row, query, columnHints) {
+    if ("column" in query) {
+      const cleanColumn = query.column.replace(COLUMN_PREFIX_REGEX, "");
+      return filterRow(row, cleanColumn, query.operator, query.value);
+    }
+    const results = query.clauses.map((clause) => resolveFilterQuery(row, clause));
+    if (query.combinator === "AND") {
+      return results.every((result) => result);
+    }
+    if (query.combinator === "OR") {
+      return results.some((result) => result);
+    }
+    return true;
+  }
+  function applyFilters(data, filters, pagination, columnHints) {
+    if (!data || data.length === 0) {
+      return { data: [], count: 0, schema: null };
+    }
+    let filteredData = data;
+    if (filters) {
+      filteredData = data.filter((row) => resolveFilterQuery(row, filters));
+    }
+    const totalCount = filteredData.length;
+    if (pagination) {
+      if (pagination.index !== void 0) {
+        const targetRow = data[pagination.index];
+        return {
+          data: targetRow ? [targetRow] : [],
+          count: totalCount,
+          schema: null
+        };
+      }
+      if (pagination.sort) {
+        const { id, desc } = pagination.sort;
+        filteredData = [...filteredData].sort((a2, b2) => {
+          const aVal = a2[id];
+          const bVal = b2[id];
+          if (aVal == null && bVal == null) {
+            return 0;
+          }
+          if (aVal == null) {
+            return desc ? 1 : -1;
+          }
+          if (bVal == null) {
+            return desc ? -1 : 1;
+          }
+          const colType = inferColumnType(aVal);
+          let comparison = 0;
+          if (colType === "numerical") {
+            comparison = Number(aVal) - Number(bVal);
+          } else if (colType === "datetime") {
+            let aTime = 0;
+            if (typeof aVal === "number") {
+              aTime = aVal;
+            } else if (aVal instanceof Date) {
+              aTime = aVal.getTime();
+            } else if (typeof aVal === "string") {
+              aTime = parseISO$1(aVal).getTime();
+            }
+            let bTime = 0;
+            if (typeof bVal === "number") {
+              bTime = bVal;
+            } else if (bVal instanceof Date) {
+              bTime = bVal.getTime();
+            } else if (typeof bVal === "string") {
+              bTime = parseISO$1(bVal).getTime();
+            }
+            comparison = aTime - bTime;
+          } else {
+            comparison = String(aVal).localeCompare(String(bVal));
+          }
+          return desc ? -comparison : comparison;
+        });
+      }
+      const startIndex = pagination.offset || 0;
+      const endIndex = pagination.limit ? startIndex + pagination.limit : filteredData.length;
+      filteredData = filteredData.slice(startIndex, endIndex);
+    }
+    return {
+      data: filteredData,
+      count: totalCount,
+      schema: null
+    };
+  }
+  const INDEX = "__index__";
+  function appendIndex(df) {
+    if (df.length > 0 && !(INDEX in df[0])) {
+      return df.map((row, i2) => ({ ...row, [INDEX]: i2 }));
+    }
+    return df;
+  }
+  function createFetcher(df) {
+    const data = appendIndex(df);
+    return async (filters, pagination) => {
+      return applyFilters(data, filters, pagination);
+    };
+  }
+  function useTabularVariable(variable) {
+    const extras = useRequestExtras();
+    const { client: wsClient } = React$1.useContext(websocketCtx);
+    if (!isVariable(variable) || isSingleVariable(variable)) {
+      const [data] = useVariable(variable);
+      return React$1.useMemo(() => createFetcher(data), [data]);
+    }
+    const variablesContext = React$1.useContext(variablesCtx);
+    variablesContext?.variables.current.add(variable.uid);
+    React$1.useEffect(() => {
+      return () => {
+        variablesContext?.variables.current.delete(variable.uid);
+      };
+    }, []);
+    if (isServerVariable(variable)) {
+      const serverAtom = getOrRegisterServerVariable(variable, extras);
+      const atomCount = Recoil_index_20(serverAtom);
+      return useFetchTabularServerVariable(variable, atomCount, wsClient, extras);
+    }
+    const taskContext = useTaskContext();
+    const dvResultSelector = getOrRegisterDerivedVariableResult(variable, wsClient, taskContext, extras);
+    const dvResultLoadable = Recoil_index_21(dvResultSelector);
+    const [dvResult, setDvResult] = React$1.useState(() => dvResultLoadable.getValue());
+    React$1.useEffect(() => {
+      if (dvResultLoadable.state === "hasValue") {
+        setDvResult(dvResultLoadable.getValue());
+      }
+    }, [dvResultLoadable]);
+    return useFetchTabularDerivedVariable(variable, dvResult, wsClient, taskContext, extras);
+  }
+  async function getTabularVariableValue(variable, ctx) {
+    if (!isVariable(variable)) {
+      return variable;
+    }
+    if (isSingleVariable(variable)) {
+      return resolveVariable(
+        variable,
+        ctx.client,
+        ctx.taskContext,
+        ctx.extras,
+        (v) => ctx.snapshot.getLoadable(v).toPromise()
+      );
+    }
+    if (isServerVariable(variable)) {
+      const response2 = await fetchTabularServerVariable({
+        variable,
+        // doesn't matter for fetching, will get up to date anyway
+        seqNumber: 0,
+        wsClient: ctx.client,
+        extras: ctx.extras
+      });
+      return response2.data;
+    }
+    const resolved = await resolveVariable(
+      variable,
+      ctx.client,
+      ctx.taskContext,
+      ctx.extras,
+      (v) => ctx.snapshot.getLoadable(v).toPromise()
+    );
+    const result = await fetchDerivedVariable({
+      cache: variable.cache,
+      extras: ctx.extras,
+      force_key: null,
+      /**
+       * In this case we're not concerned about different selectors fetching the value so just use the uid
+       */
+      selectorKey: resolved.uid,
+      values: normalizeRequest(cleanArgs(resolved.values), variable.variables),
+      variableUid: resolved.uid,
+      wsClient: ctx.client
+    });
+    if (isTaskResponse$1(result)) {
+      throw new UserError("Task DerivedVariables are not supported in this context");
+    }
+    const response = result.value;
+    return response.data;
+  }
   function warnUpdateOnDerivedState() {
     console.warn("You tried to call update on variable with derived state, this is a noop and will be ignored.");
   }
-  function useVariable(variable) {
+  function useVariable(variable, opts = { serverVariable: "disallow" }) {
     const extras = useRequestExtras();
     const { client: wsClient } = React$1.useContext(websocketCtx);
     const taskContext = useTaskContext();
@@ -60466,9 +60158,6 @@ Inferred class string: "${iconClasses}."`
         variablesContext?.variables.current.delete(variable.uid);
       };
     }, []);
-    if (isDataVariable(variable) || isDerivedDataVariable(variable)) {
-      throw new Error(`Non-data variable expected, got ${variable.__typename}`);
-    }
     if (isDerivedVariable(variable)) {
       const selector2 = useDerivedVariable(variable, wsClient, taskContext, extras);
       const selectorLoadable = Recoil_index_28(selector2);
@@ -60477,19 +60166,52 @@ Inferred class string: "${iconClasses}."`
           bus.publish("DERIVED_VARIABLE_LOADED", { variable, value: selectorLoadable.contents });
         }
       }, [selectorLoadable]);
-      const deferred2 = useDeferLoadable(selectorLoadable);
+      const deferred2 = useDeferLoadable(selectorLoadable, opts.suspend);
       return [deferred2.value, warnUpdateOnDerivedState];
     }
-    if (isUrlVariable(variable)) {
-      const [urlValue, setUrlValue] = useUrlVariable(variable);
-      React$1.useEffect(() => {
-        bus.publish("URL_VARIABLE_LOADED", { variable, value: urlValue });
-      }, [urlValue]);
-      return [urlValue, setUrlValue];
-    }
     if (isSwitchVariable(variable)) {
       return [useSwitchVariable(variable), warnUpdateOnDerivedState];
     }
+    if (isStateVariable(variable)) {
+      const parentSelector = useDerivedVariable(variable.parent_variable, wsClient, taskContext, extras);
+      const parentLoadable = Recoil_index_28(parentSelector);
+      let stateValue;
+      switch (variable.property_name) {
+        case "loading":
+          stateValue = parentLoadable.state === "loading";
+          break;
+        case "error":
+          stateValue = parentLoadable.state === "hasError";
+          break;
+        case "hasValue":
+          stateValue = parentLoadable.state === "hasValue";
+          break;
+        default:
+          stateValue = false;
+      }
+      return [stateValue, warnUpdateOnDerivedState];
+    }
+    if (isServerVariable(variable)) {
+      if (opts.serverVariable === "disallow") {
+        throw new UserError("ServerVariable cannot be directly consumed by this component");
+      }
+      const atom2 = React$1.useMemo(() => getOrRegisterServerVariable(variable, extras), [variable, extras]);
+      const [seqNumber] = Recoil_index_22(atom2);
+      const fetcher = useTabularVariable(variable);
+      const { data } = reactQuery.useSuspenseQuery({
+        // use the seq number as a dependency to refetch on changes
+        queryKey: ["use-variable-server-variable", variable.uid, seqNumber],
+        queryFn: async () => {
+          const result = await fetcher(null, {
+            limit: 1,
+            offset: 0
+          });
+          return result.data;
+        },
+        refetchOnWindowFocus: false
+      });
+      return [data?.[0] ?? null, warnUpdateOnDerivedState];
+    }
     const recoilState = getOrRegisterPlainVariable(variable, wsClient, taskContext, extras);
     if (!isDerivedVariable(variable.default)) {
       const [value, setValue] = Recoil_index_22(recoilState);
@@ -60504,7 +60226,7 @@ Inferred class string: "${iconClasses}."`
         bus.publish("PLAIN_VARIABLE_LOADED", { variable, value: loadable.contents });
       }
     }, [loadable]);
-    const deferred = useDeferLoadable(loadable);
+    const deferred = useDeferLoadable(loadable, opts.suspend);
     return [deferred, setLoadable];
   }
   function flexStyles(props, displayCtx2, useDisplayContext) {
@@ -60747,24 +60469,18 @@ Inferred class string: "${iconClasses}."`
     return React$1.useMemo(() => ({ get }), [get]);
   }
   async function invokeAction(input, executionId, annotatedAction, actionCtx) {
-    const resolvedKwargs = Object.keys(annotatedAction.dynamic_kwargs).reduce(
-      (acc, k) => {
-        const value = annotatedAction.dynamic_kwargs[k];
-        acc[k] = isVariable(value) ? resolveVariable(
+    const resolvedKwargs = await Promise.all(
+      Object.entries(annotatedAction.dynamic_kwargs).map(async ([k, value]) => {
+        const resolvedValue = isVariable(value) ? await resolveVariable(
           value,
           actionCtx.wsClient,
           actionCtx.taskCtx,
           actionCtx.extras,
-          (v) => (
-            // This is only called for primitive variables so it should always resolve successfully
-            // hence not using a promise
-            actionCtx.snapshot.getLoadable(v).getValue()
-          )
+          (v) => actionCtx.snapshot.getLoadable(v).toPromise()
         ) : value;
-        return acc;
-      },
-      {}
-    );
+        return [k, resolvedValue];
+      })
+    ).then((entries) => Object.fromEntries(entries));
     const ws_channel = await actionCtx.wsClient.getChannel();
     const res = await request(
       `/api/core/action/${annotatedAction.definition_uid}`,
@@ -61038,128 +60754,6 @@ Inferred class string: "${iconClasses}."`
     const { login, logout, ...extraRoutes } = authConfig.auth_components;
     return /* @__PURE__ */ React.createElement(Switch$1, null, /* @__PURE__ */ React.createElement(Route, { path: "/login" }, /* @__PURE__ */ React.createElement(DynamicAuthComponent, { component: login })), /* @__PURE__ */ React.createElement(Route, { path: "/logout" }, /* @__PURE__ */ React.createElement(DynamicAuthComponent, { component: logout })), Object.entries(extraRoutes).map(([path, component]) => /* @__PURE__ */ React.createElement(Route, { key: path, path: `/${path}` }, /* @__PURE__ */ React.createElement(DynamicAuthComponent, { component }))), /* @__PURE__ */ React.createElement(Route, { component: ErrorPage, path: "/error" }), /* @__PURE__ */ React.createElement(Route, { path: "/", render: () => /* @__PURE__ */ React.createElement(PrivateRoute, null, props.children) }));
   }
-  function useDataVariable(variable) {
-    const extras = useRequestExtras();
-    const { client: wsClient } = React$1.useContext(websocketCtx);
-    if (isDataVariable(variable)) {
-      registerDataVariable(variable);
-      const serverTriggers$ = React$1.useMemo(() => wsClient.serverTriggers$(variable.uid), []);
-      const [serverTriggerCounter, setServerTriggerCounter] = React$1.useState(0);
-      React$1.useEffect(() => {
-        const sub = serverTriggers$.subscribe(() => setServerTriggerCounter((c) => c + 1));
-        return () => sub.unsubscribe();
-      }, [serverTriggers$]);
-      const fetchDataVariable2 = useFetchDataVariable(variable, serverTriggerCounter);
-      return fetchDataVariable2;
-    }
-    const variablesContext = React$1.useContext(variablesCtx);
-    variablesContext?.variables.current.add(variable.uid);
-    React$1.useEffect(() => {
-      return () => {
-        variablesContext?.variables.current.delete(variable.uid);
-      };
-    }, []);
-    const taskContext = useTaskContext();
-    const dvSelector = useDerivedVariable(variable, wsClient, taskContext, extras);
-    const dvLoadable = Recoil_index_21(dvSelector);
-    const [dvValue, setDvValue] = React$1.useState(dvLoadable.toPromise());
-    React$1.useEffect(() => {
-      if (dvLoadable.state === "loading") {
-        setDvValue(dvLoadable.toPromise());
-      }
-    }, [dvLoadable]);
-    const fetchDerivedDataVariable2 = useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValue);
-    return fetchDerivedDataVariable2;
-  }
-  function useAnyVariable(variable) {
-    if (isDataVariable(variable) || isDerivedDataVariable(variable)) {
-      const getData = useDataVariable(variable);
-      const { data, refetch } = reactQuery.useQuery({
-        // ideally would be 0 but that causes infinite loops, see https://github.com/TanStack/query/issues/2367
-        cacheTime: 1,
-        queryFn: async () => {
-          const dataResponse = await getData();
-          return dataResponse.data;
-        },
-        queryKey: ["any-variable-data", variable.uid],
-        refetchOnWindowFocus: false,
-        suspense: true
-      });
-      React$1.useEffect(() => {
-        refetch();
-      }, [getData]);
-      return data ?? void 0;
-    }
-    return useVariable(variable)[0];
-  }
-  function getVariableValue(variable, shouldFetchVariable = false, ctx) {
-    const resolved = resolveVariable(
-      variable,
-      ctx.client,
-      ctx.taskContext,
-      ctx.extras,
-      (v) => ctx.snapshot.getLoadable(v).getValue()
-    );
-    if (isResolvedSwitchVariable(resolved)) {
-      throw new UserError("Switch variables are not supported in this context");
-    }
-    if (!shouldFetchVariable || !isDerivedVariable(variable) && !isDataVariable(variable) && !isDerivedDataVariable(variable)) {
-      return resolved;
-    }
-    if (!isResolvedDerivedVariable(resolved) && !isResolvedDataVariable(resolved) && !isResolvedDerivedDataVariable(resolved)) {
-      return resolved;
-    }
-    if (isResolvedDataVariable(resolved)) {
-      return fetchDataVariable(resolved.uid, ctx.extras, resolved.filters);
-    }
-    return fetchDerivedVariable({
-      cache: variable.cache,
-      extras: ctx.extras,
-      force_key: null,
-      /**
-       * In this case we're not concerned about different selectors fetching the value so just use the uid
-       */
-      selectorKey: resolved.uid,
-      values: normalizeRequest(
-        cleanArgs(resolved.values),
-        variable.variables
-      ),
-      variableUid: resolved.uid,
-      wsClient: ctx.client
-    }).then((resp) => {
-      if (isTaskResponse$1(resp)) {
-        throw new Error("Task DerivedVariables are not supported in this context");
-      }
-      if (isDerivedDataVariable(variable)) {
-        return ctx.client.getChannel().then(
-          (chan) => fetchDerivedDataVariable(variable.uid, ctx.extras, resp.cache_key, chan, variable.filters)
-        );
-      }
-      return resp.value;
-    });
-  }
-  function useVariableValue(variable, shouldFetchVariable = false) {
-    const taskContext = useTaskContext();
-    const { client: client2 } = React$1.useContext(websocketCtx);
-    const { search } = useLocation();
-    const extras = useRequestExtras();
-    if (!isVariable(variable)) {
-      return () => variable;
-    }
-    return Recoil_index_31(
-      ({ snapshot }) => {
-        return () => {
-          return getVariableValue(variable, shouldFetchVariable, {
-            client: client2,
-            extras,
-            snapshot,
-            taskContext
-          });
-        };
-      },
-      [variable.uid, useDeepCompare(taskContext), client2, search, extras]
-    );
-  }
   function useRefreshSelector() {
     return Recoil_index_31(({ refresh }) => {
       return (key, extras) => {
@@ -61178,16 +60772,16 @@ Inferred class string: "${iconClasses}."`
     const { client: client2 } = React$1.useContext(websocketCtx);
     const taskCtx = useTaskContext();
     return Recoil_index_31(({ snapshot }) => {
-      return (variable) => {
+      return async (variable) => {
         if (!isRegistered(variable)) {
           return "__NOT_REGISTERED__";
         }
-        const resolvedVariable = resolveVariable(
+        const resolvedVariable = await resolveVariable(
           variable,
           client2,
           taskCtx,
           extras,
-          (v) => snapshot.getLoadable(v).getValue()
+          (v) => snapshot.getLoadable(v).toPromise()
         );
         return resolvedVariable;
       };
@@ -61476,14 +61070,12 @@ Inferred class string: "${iconClasses}."`
             eviction: "most-recent"
           },
           get: (extrasSerializable) => async ({ get }) => {
-            const resolvedKwargs = Object.keys(dynamicKwargs).reduce(
-              (acc, k) => {
-                const value = dynamicKwargs[k];
-                acc[k] = isVariable(value) ? resolveVariable(value, wsClient, taskContext, currentExtras) : value;
-                return acc;
-              },
-              {}
-            );
+            const resolvedKwargs = await Promise.all(
+              Object.entries(dynamicKwargs).map(async ([k, value]) => {
+                const resolvedValue = isVariable(value) ? await resolveVariable(value, wsClient, taskContext, currentExtras) : value;
+                return [k, resolvedValue];
+              })
+            ).then((entries) => Object.fromEntries(entries));
             const resolvedKwargsList = Object.values(resolvedKwargs);
             const kwargsList = Object.values(dynamicKwargs);
             const triggerAtom = getOrRegisterComponentTrigger(uid2);
@@ -61495,7 +61087,6 @@ Inferred class string: "${iconClasses}."`
               kwargsList,
               // pass deps=kwargs
               resolvedKwargsList,
-              wsClient,
               get,
               selfTrigger
             );
@@ -61531,8 +61122,10 @@ Inferred class string: "${iconClasses}."`
               taskContext.startTask(taskId, key, getComponentRegistryKey(uid2, true));
               try {
                 await wsClient.waitForTask(taskId);
-              } catch {
-                return null;
+              } catch (e2) {
+                e2.selectorId = key;
+                e2.selectorExtras = extrasSerializable.toJSON();
+                throw e2;
               } finally {
                 taskContext.endTask(taskId);
               }
@@ -61891,7 +61484,9 @@ Inferred class string: "${iconClasses}."`
         const taskIds = findRunningTasks(taskContext, props.variablesRef);
         if (taskIds.length > 0) {
           setSubscribedTaskIds(taskIds);
-          progressSubscription = wsClient.progressUpdates$(...taskIds).subscribe((notif) => setLatestProgressUpdate(notif.message));
+          progressSubscription = wsClient.progressUpdates$(...taskIds).subscribe((notif) => {
+            setLatestProgressUpdate(notif.message);
+          });
           clearInterval(timer2);
         }
       }, POLLING_INTERVAL);
@@ -62069,7 +61664,7 @@ Inferred class string: "${iconClasses}."`
       pollingInterval = variable.polling_interval;
     }
     variable.variables.forEach((value) => {
-      if (isDerivedVariable(value) || isDerivedDataVariable(value)) {
+      if (isDerivedVariable(value)) {
         const innerPollingInterval = getDerivedVariablePollingInterval(value);
         if (innerPollingInterval && (!pollingInterval || pollingInterval > innerPollingInterval)) {
           pollingInterval = innerPollingInterval;
@@ -62081,7 +61676,7 @@ Inferred class string: "${iconClasses}."`
   function computePollingInterval(kwargs, componentInterval) {
     let pollingInterval;
     Object.values(kwargs).forEach((value) => {
-      if (isDerivedVariable(value) || isDerivedDataVariable(value)) {
+      if (isDerivedVariable(value)) {
         const innerPollingInterval = getDerivedVariablePollingInterval(value);
         if (innerPollingInterval && (!pollingInterval || pollingInterval > innerPollingInterval)) {
           pollingInterval = innerPollingInterval;
@@ -62782,9 +62377,9 @@ Inferred class string: "${iconClasses}."`
   function VariableStateProvider(props) {
     const getVariableState = useVariableState();
     React$1.useEffect(() => {
-      const sub = props.wsClient?.variableRequests$().subscribe((req) => {
+      const sub = props.wsClient?.variableRequests$().subscribe(async (req) => {
         try {
-          const variableValue = getVariableState(req.message.variable);
+          const variableValue = await getVariableState(req.message.variable);
           props.wsClient.sendVariable(variableValue, req.message.__rchan);
         } catch (err2) {
           console.warn(`Error when processing a getVariableValue request: ${String(err2)}`);
@@ -62894,7 +62489,7 @@ Inferred class string: "${iconClasses}."`
       {
         value: { actionRegistry: actions, componentRegistry: components, refetchComponents }
       },
-      /* @__PURE__ */ React.createElement(DynamicContext, { contextComponents: config2?.context_components ?? [] }, /* @__PURE__ */ React.createElement(StoreProviders, null, /* @__PURE__ */ React.createElement(RootWrapper, null, /* @__PURE__ */ React.createElement(DynamicComponent$1, { component: template.layout }), /* @__PURE__ */ React.createElement(VariableStateProvider, { wsClient }), config2?.enable_devtools && /* @__PURE__ */ React.createElement(DevTools, null))))
+      /* @__PURE__ */ React.createElement(DynamicContext, { contextComponents: config2?.context_components ?? [] }, /* @__PURE__ */ React.createElement(StoreProviders, null, /* @__PURE__ */ React.createElement(ServerVariableSyncProvider, null, /* @__PURE__ */ React.createElement(RootWrapper, null, /* @__PURE__ */ React.createElement(DynamicComponent$1, { component: template.layout }), /* @__PURE__ */ React.createElement(VariableStateProvider, { wsClient }), config2?.enable_devtools && /* @__PURE__ */ React.createElement(DevTools, null)))))
     )));
   }
   const Wrapper = styled.div`
@@ -62948,21 +62543,22 @@ Inferred class string: "${iconClasses}."`
   };
   const ResetVariables = (ctx, actionImpl) => {
     actionImpl.variables.filter(isVariable).forEach((variable) => {
-      if (isDerivedVariable(variable) || isDerivedDataVariable(variable)) {
+      if (isDerivedVariable(variable)) {
         const triggerAtom = getOrRegisterTrigger(variable);
         ctx.set(triggerAtom, (triggerIndexValue) => ({
           force_key: nanoid(),
           inc: triggerIndexValue.inc + 1
         }));
-      } else if (isUrlVariable(variable)) {
-        const urlAtom = getOrRegisterUrlVariable(variable);
-        ctx.set(urlAtom, variable.default);
-        ctx.eventBus.publish("URL_VARIABLE_LOADED", { variable, value: variable.default });
-      } else if (isDataVariable(variable)) ;
-      else if (isSwitchVariable(variable)) ;
+      } else if (isSwitchVariable(variable)) ;
+      else if (isStateVariable(variable)) ;
+      else if (isServerVariable(variable)) ;
       else {
         const plainAtom = getOrRegisterPlainVariable(variable, ctx.wsClient, ctx.taskCtx, ctx.extras);
-        ctx.reset(plainAtom);
+        if (variable.store?.__typename === "QueryParamStore") {
+          ctx.set(plainAtom, variable.default);
+        } else {
+          ctx.reset(plainAtom);
+        }
         ctx.eventBus.publish("PLAIN_VARIABLE_LOADED", { variable, value: variable.default });
       }
     });
@@ -62977,20 +62573,10 @@ Inferred class string: "${iconClasses}."`
   const INPUT = "__dara_input__";
   const TOGGLE = "__dara_toggle__";
   const UpdateVariable = async (ctx, actionImpl) => {
-    let varAtom;
-    let eventName;
-    switch (actionImpl.variable.__typename) {
-      case "Variable":
-        varAtom = getOrRegisterPlainVariable(actionImpl.variable, ctx.wsClient, ctx.taskCtx, ctx.extras);
-        eventName = "PLAIN_VARIABLE_LOADED";
-        break;
-      case "UrlVariable":
-        varAtom = getOrRegisterUrlVariable(actionImpl.variable);
-        eventName = "URL_VARIABLE_LOADED";
-        break;
-      case "DataVariable":
-        throw new Error("DataVariable is not supported in UpdateVariable action");
+    if (actionImpl.variable.__typename !== "Variable") {
+      throw new UserError("UpdateVariable action only supports Variables");
     }
+    const varAtom = getOrRegisterPlainVariable(actionImpl.variable, ctx.wsClient, ctx.taskCtx, ctx.extras);
     let newValue;
     if (actionImpl.value === INPUT) {
       newValue = ctx.input;
@@ -63001,8 +62587,11 @@ Inferred class string: "${iconClasses}."`
       newValue = actionImpl.value;
     }
     ctx.set(varAtom, newValue);
-    ctx.eventBus.publish(eventName, { variable: actionImpl.variable, value: newValue });
+    ctx.eventBus.publish("PLAIN_VARIABLE_LOADED", { variable: actionImpl.variable, value: newValue });
   };
+  function commonjsRequire(path) {
+    throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
+  }
   var exceljs_min = { exports: {} };
   /*! ExcelJS 19-10-2023 */
   var hasRequiredExceljs_min;
@@ -86205,10 +85794,37 @@ Inferred class string: "${iconClasses}."`
     return FileSaver_min$1.exports;
   }
   var FileSaver_minExports = requireFileSaver_min();
+  const COL_PATTERN = /^__col__\d+__(.+)$/;
+  const INDEX_PATTERN = /^__index__\d+__(.+)$/;
+  const restoreColumnName = (colName) => {
+    const colMatch = colName.match(COL_PATTERN);
+    if (colMatch) {
+      return colMatch[1];
+    }
+    const indexMatch = colName.match(INDEX_PATTERN);
+    if (indexMatch) {
+      return indexMatch[1];
+    }
+    return colName;
+  };
+  const processDataForDownload = (content) => {
+    return content.map((row) => {
+      const processedRow = {};
+      Object.entries(row).forEach(([key, value]) => {
+        if (key === "__index__") {
+          return;
+        }
+        const restoredKey = restoreColumnName(key);
+        processedRow[restoredKey] = value;
+      });
+      return processedRow;
+    });
+  };
   const createMatrixFromArrayOfObjects = (content) => {
+    const processedContent = processDataForDownload(content);
     const headings = [];
     const indexes = {};
-    content.forEach((c) => {
+    processedContent.forEach((c) => {
       Object.keys(c).forEach((k) => {
         if (!headings.includes(k)) {
           headings.push(k);
@@ -86218,7 +85834,7 @@ Inferred class string: "${iconClasses}."`
     });
     const headingsLength = headings.length;
     const matrix = [];
-    content.forEach((c) => {
+    processedContent.forEach((c) => {
       const row = new Array(headingsLength);
       Object.entries(c).forEach(([k, v]) => {
         row[indexes[k]] = v;
@@ -86290,22 +85906,24 @@ Inferred class string: "${iconClasses}."`
     return null;
   };
   const DownloadVariable = async (ctx, actionImpl) => {
-    let value = getVariableValue(actionImpl.variable, true, {
+    let value = await getTabularVariableValue(actionImpl.variable, {
       client: ctx.wsClient,
       extras: ctx.extras,
       search: ctx.location.search,
       snapshot: ctx.snapshot,
       taskContext: ctx.taskCtx
     });
-    if (value instanceof Promise) {
-      value = await value;
+    if (value === null) {
+      ctx.notificationCtx.pushNotification({
+        key: "_downloadVariable",
+        message: "Failed to fetch the variable value",
+        status: Status.ERROR,
+        title: "Error fetching variable value"
+      });
+      return;
     }
-    if (actionImpl.variable.__typename === "DataVariable" || actionImpl.variable.__typename === "DerivedDataVariable") {
-      for (const row of value) {
-        if ("__index__" in row) {
-          delete row.__index__;
-        }
-      }
+    if (Array.isArray(value)) {
+      value = processDataForDownload(value);
     }
     const fileName = actionImpl.file_name || "Data";
     const fileNameWithExt = `${fileName}.${actionImpl.type}`;
@@ -86611,7 +86229,7 @@ Inferred class string: "${iconClasses}."`
     return /* @__PURE__ */ React__namespace.createElement(DynamicComponent$1, { component: transformedRenderer });
   }, isEqual$5);
   function ForImpl(props) {
-    const items = useAnyVariable(props.items);
+    const [items] = useVariable(props.items, { suspend: false });
     const markers = React__namespace.useMemo(() => getInjectionMarkers(props.renderer), [props.renderer]);
     const key = React__namespace.useMemo(() => props.key_accessor?.split(".") ?? null, [props.key_accessor]);
     const getItemKey = React__namespace.useCallback(
@@ -86694,6 +86312,7 @@ Inferred class string: "${iconClasses}."`
   exports.ResetVariables = ResetVariables;
   exports.RouterContent = RouterContent;
   exports.RowFallback = RowFallback;
+  exports.ServerVariableSyncProvider = ServerVariableSyncProvider;
   exports.SideBarFrame = SideBarFrame;
   exports.TemplateRoot = TemplateRoot;
   exports.TopBarFrame = TopBarFrame;
@@ -86713,29 +86332,30 @@ Inferred class string: "${iconClasses}."`
   exports.clearCaches_TEST = clearCaches_TEST;
   exports.clearRegistries_TEST = clearRegistries_TEST;
   exports.combineFilters = combineFilters;
-  exports.dataRegistry = dataRegistry;
   exports.default = run;
   exports.depsRegistry = depsRegistry;
   exports.fetchDerivedVariable = fetchDerivedVariable;
+  exports.fetchTabularServerVariable = fetchTabularServerVariable;
   exports.fetchTaskResult = fetchTaskResult;
   exports.getComponentRegistryKey = getComponentRegistryKey;
   exports.getDeps = getDeps;
   exports.getIcon = getIcon;
   exports.getOrRegisterDerivedVariable = getOrRegisterDerivedVariable;
+  exports.getOrRegisterDerivedVariableResult = getOrRegisterDerivedVariableResult;
   exports.getOrRegisterDerivedVariableValue = getOrRegisterDerivedVariableValue;
+  exports.getOrRegisterServerVariable = getOrRegisterServerVariable;
   exports.getRegistryKey = getRegistryKey;
   exports.getSessionToken = getSessionToken;
+  exports.getTabularVariableValue = getTabularVariableValue;
   exports.getToken = getToken;
   exports.getTokenKey = getTokenKey;
-  exports.getVariableValue = getVariableValue;
   exports.handleAuthErrors = handleAuthErrors;
   exports.injectCss = injectCss;
   exports.isActionImpl = isActionImpl;
   exports.isAnnotatedAction = isAnnotatedAction;
   exports.isCondition = isCondition;
   exports.isConditionTrue = isConditionTrue;
-  exports.isDataVariable = isDataVariable;
-  exports.isDerivedDataVariable = isDerivedDataVariable;
+  exports.isDataResponse = isDataResponse;
   exports.isDerivedVariable = isDerivedVariable;
   exports.isInvalidComponent = isInvalidComponent;
   exports.isJsComponent = isJsComponent;
@@ -86743,13 +86363,14 @@ Inferred class string: "${iconClasses}."`
   exports.isPyComponent = isPyComponent;
   exports.isRawString = isRawString;
   exports.isRegistered = isRegistered;
-  exports.isResolvedDataVariable = isResolvedDataVariable;
-  exports.isResolvedDerivedDataVariable = isResolvedDerivedDataVariable;
   exports.isResolvedDerivedVariable = isResolvedDerivedVariable;
+  exports.isResolvedServerVariable = isResolvedServerVariable;
   exports.isResolvedSwitchVariable = isResolvedSwitchVariable;
+  exports.isServerVariable = isServerVariable;
+  exports.isSingleVariable = isSingleVariable;
+  exports.isStateVariable = isStateVariable;
   exports.isSwitchVariable = isSwitchVariable;
   exports.isTaskResponse = isTaskResponse$1;
-  exports.isUrlVariable = isUrlVariable;
   exports.isVariable = isVariable;
   exports.normalizeRequest = normalizeRequest;
   exports.onTokenChange = onTokenChange;
@@ -86760,6 +86381,7 @@ Inferred class string: "${iconClasses}."`
   exports.resolveDerivedValue = resolveDerivedValue;
   exports.resolveNested = resolveNested;
   exports.resolveReferrer = resolveReferrer;
+  exports.resolveServerVariable = resolveServerVariable;
   exports.resolveTheme = resolveTheme;
   exports.revokeSession = revokeSession;
   exports.selectorFamilyMembersRegistry = selectorFamilyMembersRegistry;
@@ -86771,17 +86393,17 @@ Inferred class string: "${iconClasses}."`
   exports.useAction = useAction;
   exports.useActionIsLoading = useActionIsLoading;
   exports.useActions = useActions;
-  exports.useAnyVariable = useAnyVariable;
   exports.useAuthConfig = useAuthConfig;
   exports.useComponentRegistry = useComponentRegistry;
   exports.useComponentStyles = useComponentStyles;
   exports.useComponents = useComponents;
   exports.useConditionOrVariable = useConditionOrVariable;
   exports.useConfig = useConfig;
-  exports.useDataVariable = useDataVariable;
   exports.useDeferLoadable = useDeferLoadable;
   exports.useDerivedVariable = useDerivedVariable;
   exports.useEventBus = useEventBus;
+  exports.useFetchTabularDerivedVariable = useFetchTabularDerivedVariable;
+  exports.useFetchTabularServerVariable = useFetchTabularServerVariable;
   exports.useInterval = useInterval;
   exports.usePrevious = usePrevious;
   exports.useRefreshSelector = useRefreshSelector;
@@ -86790,6 +86412,7 @@ Inferred class string: "${iconClasses}."`
   exports.useSession = useSession;
   exports.useSessionToken = useSessionToken;
   exports.useSwitchVariable = useSwitchVariable;
+  exports.useTabularVariable = useTabularVariable;
   exports.useTaskContext = useTaskContext;
   exports.useTemplate = useTemplate;
   exports.useTriggerIndex = useTriggerIndex;
@@ -86797,7 +86420,6 @@ Inferred class string: "${iconClasses}."`
   exports.useUser = useUser;
   exports.useVariable = useVariable;
   exports.useVariableState = useVariableState;
-  exports.useVariableValue = useVariableValue;
   exports.useWindowTitle = useWindowTitle;
   exports.verifySessionToken = verifySessionToken;
   Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });