dara-core 1.21.3__py3-none-any.whl → 1.21.4__py3-none-any.whl

dara/core/umd/dara.core.umd.cjs

@@ -5466,7 +5466,6 @@
   var Recoil_index_24 = Recoil_index.useSetRecoilState;
   var Recoil_index_28 = Recoil_index.useRecoilValueLoadable_TRANSITION_SUPPORT_UNSTABLE;
   var Recoil_index_31 = Recoil_index.useRecoilCallback;
-  var Recoil_index_34 = Recoil_index.useRecoilSnapshot;
   var Key;
   (function(Key2) {
     Key2["BACKSPACE"] = "Backspace";
@@ -31976,9 +31975,15 @@
     width: 10px;
     height: 10px;
 
-    color: ${(props) => props.theme.colors.grey4};
+    color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
 
-    background-color: ${(props) => props.theme.colors.grey4};
+    background-color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
     border-radius: 5px;
 
     animation: dot-flashing 1s infinite linear alternate;
@@ -31998,9 +32003,15 @@
         width: 10px;
         height: 10px;
 
-        color: ${(props) => props.theme.colors.grey4};
+        color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
 
-        background-color: ${(props) => props.theme.colors.grey4};
+        background-color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
         border-radius: 5px;
 
         animation: dot-flashing 1s infinite alternate;
@@ -32013,9 +32024,15 @@
         width: 10px;
         height: 10px;
 
-        color: ${(props) => props.theme.colors.grey4};
+        color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
 
-        background-color: ${(props) => props.theme.colors.grey4};
+        background-color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
         border-radius: 5px;
 
         animation: dot-flashing 1s infinite alternate;
@@ -32024,17 +32041,23 @@
 
     @keyframes dot-flashing {
         0% {
-            background-color: ${(props) => props.theme.colors.grey4};
+            background-color: ${(props) => {
+    var _a;
+    return (_a = props.$grey4) !== null && _a !== void 0 ? _a : props.theme.colors.grey4;
+  }};
         }
 
         50%,
         100% {
-            background-color: ${(props) => props.theme.colors.grey3};
+            background-color: ${(props) => {
+    var _a;
+    return (_a = props.$grey3) !== null && _a !== void 0 ? _a : props.theme.colors.grey3;
+  }};
         }
     }
 `;
   function Dots(props) {
-    return jsxRuntimeExports.jsx(Wrapper$4, { className: props.className, style: props.style, children: jsxRuntimeExports.jsx(FlashingDots, { "data-testid": "LOADING" }) });
+    return jsxRuntimeExports.jsx(Wrapper$4, { className: props.className, style: props.style, children: jsxRuntimeExports.jsx(FlashingDots, { "$grey3": props.grey3, "$grey4": props.grey4, "data-testid": "LOADING" }) });
   }
   var COMMON_MIME_TYPES = /* @__PURE__ */ new Map([
     ["avi", "video/avi"],
@@ -50502,6 +50525,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     url.searchParams.set("token", sessionToken);
     return new WebSocketClient(socketUrl, sessionToken, liveReload);
   }
+  function isPathParamStore(store2) {
+    return store2.__typename === "_PathParamStore";
+  }
   var ComponentType = /* @__PURE__ */ ((ComponentType2) => {
     ComponentType2["JS"] = "js";
     ComponentType2["PY"] = "py";
@@ -64112,15 +64138,17 @@ ${String(error)}`;
     children,
     routeDefinitions,
     routeObjects,
-    routeDefMap
+    routeDefMap,
+    defaultPath
   }) {
     const value = React__namespace.useMemo(
       () => ({
         routeDefinitions,
         routeObjects,
-        routeDefMap
+        routeDefMap,
+        defaultPath
       }),
-      [routeDefinitions, routeObjects, routeDefMap]
+      [routeDefinitions, routeObjects, routeDefMap, defaultPath]
     );
     return /* @__PURE__ */ React__namespace.createElement(RouterContext.Provider, { value }, children);
   }
@@ -64622,14 +64650,19 @@ Inferred class string: "${iconClasses}."`
     }
     return atomInstance;
   }
-  function resolvePlainVariableStatic(variable, snapshot) {
+  function resolvePlainVariableStatic(variable, snapshot, params) {
+    if (variable.store && isPathParamStore(variable.store)) {
+      return params[variable.store.param_name];
+    }
     const family = atomFamilyRegistry.get(variable.uid);
     if (family) {
       const extrasSerializable = new RequestExtrasSerializable({});
-      const atomInstance = family(extrasSerializable);
-      const atomValue = snapshot.getLoadable(atomInstance).valueMaybe();
-      if (atomValue !== null && !(atomValue instanceof Promise)) {
-        return atomInstance;
+      const atomInstance = atomFamilyMembersRegistry.get(family).get(extrasSerializable.toJSON());
+      if (atomInstance) {
+        const atomValue = snapshot.getLoadable(atomInstance).valueMaybe();
+        if (atomValue !== null && !(atomValue instanceof Promise)) {
+          return atomValue;
+        }
       }
     }
     return variable.default;
@@ -69510,14 +69543,67 @@ Inferred class string: "${iconClasses}."`
   }
   var setExports = requireSet();
   const set = /* @__PURE__ */ getDefaultExportFromCjs(setExports);
+  class DeferredImpl {
+    #resolve;
+    #reject;
+    #promise;
+    #status;
+    #error;
+    #value;
+    constructor() {
+      this.#status = "pending";
+      this.#promise = new Promise((res, rej) => {
+        this.#resolve = res;
+        this.#reject = rej;
+      });
+    }
+    get status() {
+      return this.#status;
+    }
+    getOrThrow() {
+      if (this.status === "pending") {
+        throw new Error("Deferred not resolved");
+      }
+      if (this.status === "rejected") {
+        throw this.#error;
+      }
+      return this.#value;
+    }
+    getValue() {
+      if (this.status === "pending") {
+        return this.#promise;
+      }
+      if (this.status === "rejected") {
+        return Promise.reject(this.#error);
+      }
+      return Promise.resolve(this.#value);
+    }
+    resolve(value) {
+      if (this.#status === "resolved") {
+        throw new Error("Deferred already resolved");
+      } else if (this.#status === "rejected") {
+        throw new Error("Deferred already rejected");
+      }
+      this.#status = "resolved";
+      this.#value = value;
+      this.#resolve(value);
+    }
+    reject(reason) {
+      if (this.#status === "resolved") {
+        throw new Error("Deferred already resolved");
+      } else if (this.#status === "rejected") {
+        throw new Error("Deferred already rejected");
+      }
+      this.#status = "rejected";
+      this.#error = reason;
+      this.#reject(reason);
+    }
+  }
   function deferred() {
-    let resolve;
-    let reject;
-    const promise = new Promise((res, rej) => {
-      resolve = res;
-      reject = rej;
-    });
-    return { promise, resolve, reject };
+    return new DeferredImpl();
+  }
+  function isDeferred(value) {
+    return value && typeof value === "object" && value instanceof DeferredImpl;
   }
   function getOrRegisterTrigger(variable) {
     const triggerKey = getRegistryKey(variable, "trigger");
@@ -69695,8 +69781,8 @@ Inferred class string: "${iconClasses}."`
     triggers
   }) {
     const values = resolvedVariables.map((v) => {
-      if (resolutionStrategy.name === "snapshot") {
-        return resolveVariableStatic(v, resolutionStrategy.snapshot);
+      if (resolutionStrategy.name === "static") {
+        return resolveVariableStatic(v, resolutionStrategy.snapshot, resolutionStrategy.params);
       }
       return resolveValue(v, resolutionStrategy.get);
     });
@@ -69713,7 +69799,7 @@ Inferred class string: "${iconClasses}."`
       const areArgsTheSame = isEqual$4(previousEntry.args, relevantValues);
       if (areArgsTheSame) {
         const previousValue = previousEntry.result;
-        if (previousValue instanceof Promise) {
+        if (isDeferred(previousValue)) {
           return {
             type: "cached",
             response: previousValue,
@@ -69861,7 +69947,7 @@ Inferred class string: "${iconClasses}."`
             let shouldFetchTask = false;
             if (derivedResult.type === "cached") {
               try {
-                const response = await derivedResult.response;
+                const response = await derivedResult.response.getValue();
                 shouldFetchTask = true;
                 if (!response.ok) {
                   throwError(new Error(response.value));
@@ -69950,14 +70036,15 @@ Inferred class string: "${iconClasses}."`
     deps,
     triggerList,
     triggers,
-    snapshot
+    snapshot,
+    params
   }) {
     const derivedResult = resolveDerivedValue({
       key,
       variables,
       deps,
       resolvedVariables: variables,
-      resolutionStrategy: { name: "snapshot", snapshot },
+      resolutionStrategy: { name: "static", snapshot, params },
       triggerList,
       triggers
     });
@@ -69966,7 +70053,7 @@ Inferred class string: "${iconClasses}."`
     }
     return { result: derivedResult, handle: deferred() };
   }
-  function preloadDerivedVariable(variable, snapshot) {
+  function preloadDerivedVariable(variable, snapshot, params) {
     const key = getRegistryKey(variable, "result-selector") + new RequestExtrasSerializable({}).toJSON();
     const triggerList = [...buildTriggerList(variable.variables), { path: [], variable }];
     const triggers = triggerList.map((ti) => resolveTriggerStatic(getOrRegisterTrigger(ti.variable), snapshot));
@@ -69976,7 +70063,8 @@ Inferred class string: "${iconClasses}."`
       deps: variable.deps,
       triggers,
       triggerList,
-      snapshot
+      snapshot,
+      params
     });
   }
   function useDerivedVariable(variable, WsClient, taskContext, extras) {
@@ -70080,9 +70168,9 @@ Inferred class string: "${iconClasses}."`
     }
     return resolver(getOrRegisterPlainVariable(variable, client2, taskContext, extras));
   }
-  function resolveVariableStatic(variable, snapshot) {
+  function resolveVariableStatic(variable, snapshot, params) {
     if (isDerivedVariable(variable)) {
-      const values = variable.variables.map((v) => resolveVariableStatic(v, snapshot));
+      const values = variable.variables.map((v) => resolveVariableStatic(v, snapshot, params));
       const deps = variable.deps.map((dep) => variable.variables.findIndex((v) => v.uid === dep.uid));
       return {
         deps,
@@ -70095,15 +70183,15 @@ Inferred class string: "${iconClasses}."`
       return resolveServerVariableStatic(variable, snapshot);
     }
     if (isSwitchVariable(variable)) {
-      let resolvedValue = isVariable(variable.value) ? resolveVariableStatic(variable.value, snapshot) : variable.value;
+      let resolvedValue = isVariable(variable.value) ? resolveVariableStatic(variable.value, snapshot, params) : variable.value;
       if (isCondition(resolvedValue)) {
         resolvedValue = {
           ...resolvedValue,
-          variable: resolveVariableStatic(resolvedValue.variable, snapshot)
+          variable: resolveVariableStatic(resolvedValue.variable, snapshot, params)
         };
       }
-      const resolvedValueMap = isVariable(variable.value_map) ? resolveVariableStatic(variable.value_map, snapshot) : variable.value_map;
-      const resolvedDefault = isVariable(variable.default) ? resolveVariableStatic(variable.default, snapshot) : variable.default;
+      const resolvedValueMap = isVariable(variable.value_map) ? resolveVariableStatic(variable.value_map, snapshot, params) : variable.value_map;
+      const resolvedDefault = isVariable(variable.default) ? resolveVariableStatic(variable.default, snapshot, params) : variable.default;
       return {
         type: "switch",
         uid: variable.uid,
@@ -70115,9 +70203,9 @@ Inferred class string: "${iconClasses}."`
     if (isStateVariable(variable)) {
       throw new Error("StateVariable should not be resolved - it should be handled by useVariable hook");
     }
-    let result = resolvePlainVariableStatic(variable, snapshot);
+    let result = resolvePlainVariableStatic(variable, snapshot, params);
     while (isDerivedVariable(result)) {
-      result = resolveVariableStatic(result, snapshot);
+      result = resolveVariableStatic(result, snapshot, params);
     }
     return result;
   }
@@ -71030,9 +71118,9 @@ Inferred class string: "${iconClasses}."`
       },
       [matchesRef, navigate, paramsRef, locationRef]
     );
-    const listenToStoreChanges = React__namespace.useCallback(({ updateAllKnownItems }) => {
+    const listenToStoreChanges = React__namespace.useCallback(({ updateItems }) => {
       function handleUpdate(newParams) {
-        updateAllKnownItems(new Map(Object.entries(newParams)));
+        updateItems(new Map(Object.entries(newParams)));
       }
       locationSubscribers.current.push(handleUpdate);
       return () => {
@@ -71631,7 +71719,7 @@ Inferred class string: "${iconClasses}."`
     return /* @__PURE__ */ React.createElement(StyledDots$1, { $rawCss: css2, style });
   }
   function DefaultFallbackStatic() {
-    return /* @__PURE__ */ React.createElement(StyledDots$1, null);
+    return /* @__PURE__ */ React.createElement(StyledDots$1, { grey3: theme.colors.grey3, grey4: theme.colors.grey4 });
   }
   const Center = styled.div`
     overflow: hidden;
@@ -71755,8 +71843,9 @@ Inferred class string: "${iconClasses}."`
     const [isError2, setIsError] = React$1.useState(false);
     const location2 = useLocation();
     const navigate = useNavigate();
+    const { defaultPath } = useRouterContext();
     const queryParams = new URLSearchParams(location2.search);
-    const previousLocation = queryParams.get("referrer") ?? "/";
+    const previousLocation = queryParams.get("referrer") ?? defaultPath;
     const login = async () => {
       setIsLoggingIn(true);
       setIsError(false);
@@ -71775,7 +71864,7 @@ Inferred class string: "${iconClasses}."`
       if (getSessionToken()) {
         verifySessionToken().then((verified) => {
           if (verified) {
-            navigate(decodeURIComponent(previousLocation));
+            navigate(decodeURIComponent(previousLocation), { replace: true });
           } else {
             setIsVerifyingToken(false);
           }
@@ -71842,8 +71931,9 @@ Inferred class string: "${iconClasses}."`
   function DefaultAuthLogin() {
     const location2 = useLocation();
     const navigate = useNavigate();
+    const { defaultPath } = useRouterContext();
     const queryParams = new URLSearchParams(location2.search);
-    const previousLocation = queryParams.get("referrer") ?? "/";
+    const previousLocation = queryParams.get("referrer") ?? defaultPath;
     async function getNewToken() {
       const sessionToken = await requestSessionToken({});
       if (sessionToken) {
@@ -71855,7 +71945,7 @@ Inferred class string: "${iconClasses}."`
       if (getSessionToken()) {
         verifySessionToken().then((verified) => {
           if (verified) {
-            navigate(decodeURIComponent(previousLocation));
+            navigate(decodeURIComponent(previousLocation), { replace: true });
           } else {
             getNewToken();
           }
@@ -72399,7 +72489,7 @@ Inferred class string: "${iconClasses}."`
             let shouldFetchTask = false;
             if (derivedResult.type === "cached") {
               try {
-                const response = await derivedResult.response;
+                const response = await derivedResult.response.getValue();
                 shouldFetchTask = true;
                 if (!response.ok) {
                   throwError(new Error(response.value));
@@ -72486,7 +72576,7 @@ Inferred class string: "${iconClasses}."`
     selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
     return selectorInstance;
   }
-  function preloadServerComponent(component, snapshot) {
+  function preloadServerComponent(component, snapshot, params) {
     const key = getComponentRegistryKey(component.uid, false, component.loop_instance_uid);
     const kwargsList = Object.values(component.props.dynamic_kwargs);
     const triggerList = buildTriggerList(kwargsList);
@@ -72500,7 +72590,8 @@ Inferred class string: "${iconClasses}."`
       deps: kwargsList,
       triggerList,
       triggers,
-      snapshot
+      snapshot,
+      params
     });
   }
   function useServerComponent(name, uid2, dynamicKwargs, loop_instance_uid) {
@@ -73846,16 +73937,25 @@ Inferred class string: "${iconClasses}."`
         border-radius: 100px;
     }
 `;
-  function TemplateRoot(props) {
+  function createAuthenticatedRootLoader(daraData) {
+    return function loader() {
+      if (window.dara.ws.status === "pending") {
+        const token = getSessionToken();
+        if (!token) {
+          throw redirect("/login");
+        }
+        window.dara.ws.resolve(setupWebsocket(token, daraData.live_reload));
+      }
+    };
+  }
+  function AuthenticatedRoot(props) {
     const navigate = useNavigate();
     const token = useSessionToken();
     const [wsClient] = React$1.useState(() => {
       if (props.initialWebsocketClient) {
         return props.initialWebsocketClient;
       }
-      const ws = setupWebsocket(token, props.daraData.live_reload);
-      window.dara.ws.resolve(ws);
-      return ws;
+      return window.dara.ws.getOrThrow();
     });
     React$1.useLayoutEffect(() => {
       if (token) {
@@ -74061,13 +74161,22 @@ body,
     clear() {
       this.cache.clear();
     }
+    /**
+     * Set a value if it doesn't exist in the cache, otherwise return the existing value.
+     * The promise resolves the the new or existing value stored.
+     *
+     * @param key cache key
+     * @param computeFn function to compute the value
+     * @param timeout optional timeout in ms
+     */
     setIfMissing(key, computeFn, timeout) {
       const entry = this.cache.get(key);
       if (entry && !this.isEntryStale(entry, timeout)) {
-        return;
+        return Promise.resolve(entry.data);
       }
       const promise = computeFn();
       this.set(key, promise);
+      return promise;
     }
     size() {
       return this.cache.size;
@@ -74145,7 +74254,7 @@ body,
       const kwargs = cleanKwargs(
         Object.fromEntries(
           Object.entries(a2.dynamic_kwargs).map(([k, v]) => {
-            return [k, resolveVariableStatic(v, snapshot)];
+            return [k, resolveVariableStatic(v, snapshot, params)];
           })
         ),
         null
@@ -74157,7 +74266,7 @@ body,
       };
     });
     const dvHandles = Object.values(route.dependency_graph?.derived_variables ?? {}).flatMap((dv) => {
-      const handle = preloadDerivedVariable(dv, snapshot);
+      const handle = preloadDerivedVariable(dv, snapshot, params);
       if (!handle) {
         return [];
       }
@@ -74171,7 +74280,7 @@ body,
       };
     });
     const pyHandles = Object.values(route.dependency_graph?.py_components ?? {}).flatMap((py) => {
-      const handle = preloadServerComponent(py, snapshot);
+      const handle = preloadServerComponent(py, snapshot, params);
       if (!handle) {
         return [];
       }
@@ -74202,13 +74311,15 @@ body,
       (acc, h) => ({ ...acc, [h.py.uid]: h }),
       {}
     );
+    const wsClient = await window.dara.ws.getValue();
+    const wsChannel = await wsClient.getChannel();
     const response = await request(`/api/core/route/${route.id}`, {
       method: HTTP_METHOD.POST,
       body: JSON.stringify({
         action_payloads: actionPayloads,
         derived_variable_payloads: dvHandles.map((h) => h.payload),
         py_component_payloads: pyHandles.map((h) => h.payload),
-        ws_channel: await (await window.dara.ws.promise).getChannel(),
+        ws_channel: wsChannel,
         params
       }),
       signal
@@ -74257,9 +74368,10 @@ body,
         }
       }
     });
+    const [templateValue, onLoadActionsValue] = await Promise.all([template.getValue(), onLoadActions.getValue()]);
     return {
-      template: await template.promise,
-      on_load: await onLoadActions.promise,
+      template: templateValue,
+      on_load: onLoadActionsValue,
       route_definition: route,
       py_components: pyHandles,
       derived_variables: dvHandles
@@ -74269,24 +74381,36 @@ body,
     return preloadCache.get(createCacheKey(routeId, params));
   }
   function usePreloadRoute() {
+    const currentMatches = useMatches();
     const { routeObjects, routeDefMap } = useRouterContext();
     return Recoil_index_31(
-      ({ snapshot }) => (url) => {
+      ({ snapshot }) => async (url) => {
         const matches2 = matchRoutes(routeObjects, url, window.dara?.base_url);
         if (!matches2) {
           return;
         }
-        matches2.forEach((match2) => {
-          const routeDef = routeDefMap.get(match2.route.id);
-          if (!routeDef) {
-            return;
-          }
-          preloadCache.setIfMissing(createCacheKey(routeDef.id, match2.params), () => {
-            return fetchRouteData(routeDef, match2.params, snapshot);
-          });
-        });
+        const release = snapshot.retain();
+        try {
+          await Promise.all(
+            matches2.filter(
+              (match2) => !currentMatches.some(
+                (m) => m.id === match2.route.id && isEqual$4(m.params, match2.params)
+              )
+            ).map((match2) => {
+              const routeDef = routeDefMap.get(match2.route.id);
+              if (!routeDef) {
+                return Promise.resolve();
+              }
+              return preloadCache.setIfMissing(createCacheKey(routeDef.id, match2.params), () => {
+                return fetchRouteData(routeDef, match2.params, snapshot);
+              });
+            })
+          );
+        } finally {
+          release();
+        }
       },
-      [routeDefMap, routeObjects]
+      [routeDefMap, routeObjects, currentMatches]
     );
   }
   function hasServerActions(route) {
@@ -74299,11 +74423,15 @@ body,
   function shouldHoldPromise(route) {
     return !((route.__typename === "IndexRoute" || route.__typename === "PageRoute") && hasServerActions(route));
   }
-  function createRouteLoader(route, snapshotRef) {
+  function createRouteLoader(route, snapshot) {
     return async function loader({ request: loaderRequest, params }) {
       let result = getFromPreloadCache(route.id, params);
       if (!result) {
-        result = fetchRouteData(route, params, snapshotRef.current, loaderRequest.signal);
+        const snapshotInstance = snapshot();
+        const release = snapshotInstance.retain();
+        result = fetchRouteData(route, params, snapshotInstance, loaderRequest.signal).finally(() => {
+          release();
+        });
       }
       if (shouldHoldPromise(route)) {
         result = await result;
@@ -74329,7 +74457,7 @@ body,
       for (const resultHandle of [...py_components, ...derived_variables]) {
         depsRegistry.set(resultHandle.result.depsKey, {
           args: resultHandle.result.relevantValues,
-          result: resultHandle.handle.promise
+          result: resultHandle.handle
         });
       }
       let cancelled = false;
@@ -74384,7 +74512,7 @@ body,
     }
     return `/${cleanParent}/${cleanChild}`;
   }
-  function createRoute(route, snapshotRef, routeDefMap) {
+  function createRoute(route, snapshot, routeDefMap) {
     routeDefMap.set(route.id, route);
     const sharedProps = {
       id: route.id,
@@ -74398,28 +74526,28 @@ body,
           ...sharedProps,
           index: true,
           element: /* @__PURE__ */ React__namespace.createElement(RouteContent, { route, key: route.id }),
-          loader: createRouteLoader(route, snapshotRef)
+          loader: createRouteLoader(route, snapshot)
         };
       case "PageRoute":
         return {
           ...sharedProps,
           path: cleanPath(route.path),
           element: /* @__PURE__ */ React__namespace.createElement(RouteContent, { route, key: route.id }),
-          loader: createRouteLoader(route, snapshotRef),
-          children: route.children.map((r2) => createRoute(r2, snapshotRef, routeDefMap))
+          loader: createRouteLoader(route, snapshot),
+          children: route.children.map((r2) => createRoute(r2, snapshot, routeDefMap))
         };
       case "LayoutRoute":
         return {
           ...sharedProps,
           element: /* @__PURE__ */ React__namespace.createElement(RouteContent, { route, key: route.id }),
-          loader: createRouteLoader(route, snapshotRef),
-          children: route.children.map((r2) => createRoute(r2, snapshotRef, routeDefMap))
+          loader: createRouteLoader(route, snapshot),
+          children: route.children.map((r2) => createRoute(r2, snapshot, routeDefMap))
         };
       case "PrefixRoute":
         return {
           ...sharedProps,
           path: cleanPath(route.path),
-          children: route.children.map((r2) => createRoute(r2, snapshotRef, routeDefMap))
+          children: route.children.map((r2) => createRoute(r2, snapshot, routeDefMap))
         };
       default:
         throw new Error(`Unknown route type ${JSON.stringify(route)}`);
@@ -74455,14 +74583,14 @@ body,
     return "/";
   }
   let verifiedToken = false;
-  function createRouter(config2, snapshotRef) {
-    let basename = "";
+  function createRouter(config2, snapshot) {
+    let basename = "/";
     if (window.dara.base_url !== "") {
       basename = new URL(window.dara.base_url, window.origin).pathname;
     }
     const { login, logout, ...extraRoutes } = config2.auth_components;
     const routeDefMap = /* @__PURE__ */ new Map();
-    const userRoutes = config2.router.children.map((r2) => createRoute(r2, snapshotRef, routeDefMap));
+    const userRoutes = config2.router.children.map((r2) => createRoute(r2, snapshot, routeDefMap));
     const defaultPath = findFirstPath(config2.router.children) || "/";
     const router = createBrowserRouter(
       [
@@ -74492,7 +74620,8 @@ body,
             })),
             // root of the app
             {
-              element: /* @__PURE__ */ React__namespace.createElement(TemplateRoot, { daraData: config2 }),
+              element: /* @__PURE__ */ React__namespace.createElement(AuthenticatedRoot, { daraData: config2 }),
+              loader: createAuthenticatedRootLoader(config2),
               // token must be set to access the authenticated routes
               unstable_middleware: [
                 async () => {
@@ -74530,19 +74659,20 @@ body,
       router,
       routeDefinitions: config2.router.children,
       routeObjects: userRoutes,
-      routeDefMap
+      routeDefMap,
+      defaultPath
     };
   }
   function RouterRoot({ daraData }) {
-    const snapshot = Recoil_index_34();
-    const snapshotRef = useLatestRef$3(snapshot);
-    const [routerData] = React$1.useState(() => createRouter(daraData, snapshotRef));
+    const getSnapshot = Recoil_index_31((ctx) => () => ctx.snapshot, []);
+    const [routerData] = React$1.useState(() => createRouter(daraData, getSnapshot));
     return /* @__PURE__ */ React.createElement(
       RouterContextProvider,
       {
         routeDefinitions: routerData.routeDefinitions,
         routeObjects: routerData.routeObjects,
-        routeDefMap: routerData.routeDefMap
+        routeDefMap: routerData.routeDefMap,
+        defaultPath: routerData.defaultPath
       },
       /* @__PURE__ */ React.createElement(RouterProvider2, { router: routerData.router })
     );
@@ -98476,7 +98606,7 @@ body,
   }
   exports.ActionImpl = ActionImpl;
   exports.AuthType = AuthType;
-  exports.AuthenticatedRoot = TemplateRoot;
+  exports.AuthenticatedRoot = AuthenticatedRoot;
   exports.BasicAuthLogin = BasicAuthLogin;
   exports.BasicAuthLogout = BasicAuthLogout;
   exports.Center = Center;
@@ -98559,10 +98689,12 @@ body,
   exports.isCondition = isCondition;
   exports.isConditionTrue = isConditionTrue;
   exports.isDataResponse = isDataResponse;
+  exports.isDeferred = isDeferred;
   exports.isDerivedVariable = isDerivedVariable;
   exports.isInvalidComponent = isInvalidComponent;
   exports.isJsComponent = isJsComponent;
   exports.isLoopVariable = isLoopVariable;
+  exports.isPathParamStore = isPathParamStore;
   exports.isPyComponent = isPyComponent;
   exports.isRawString = isRawString;
   exports.isRegistered = isRegistered;

{dara_core-1.21.3.dist-info → dara_core-1.21.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.21.3
+Version: 1.21.4
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -21,10 +21,10 @@ Requires-Dist: cachetools (>=5.0.0,<6.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (==8.1.3)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.21.3)
+Requires-Dist: create-dara-app (==1.21.4)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.21.3) ; extra == "all"
+Requires-Dist: dara-components (==1.21.4) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (>=0.115.0,<0.116.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
@@ -55,7 +55,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.21.3/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.21.4/img/dara_light.svg?raw=true">
 
 ![Master tests](https://github.com/causalens/dara/actions/workflows/tests.yml/badge.svg?branch=master)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
@@ -100,7 +100,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.21.3/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.21.4/img/components_gallery.png?raw=true)
 
 Note: `pip` installation uses [PEP 660](https://peps.python.org/pep-0660/) `pyproject.toml`-based editable installs which require `pip >= 21.3` and `setuptools >= 64.0.0`. You can upgrade both with:
 
@@ -117,9 +117,9 @@ Explore some of our favorite apps - a great way of getting started and getting t
 
 | Dara App                                                                                                 | Description                                                                                                                                                                                                       |
 | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| ![Large Language Model](https://github.com/causalens/dara/blob/v1.21.3/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
-| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.21.3/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
-| ![Graph Editor](https://github.com/causalens/dara/blob/v1.21.3/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
+| ![Large Language Model](https://github.com/causalens/dara/blob/v1.21.4/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
+| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.21.4/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
+| ![Graph Editor](https://github.com/causalens/dara/blob/v1.21.4/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -146,9 +146,9 @@ And the supporting UI packages and tools.
 - `ui-utils` - miscellaneous utility functions
 - `ui-widgets` - widget components
 
-More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.3/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.4/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.3/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.4/LICENSE).
 

{dara_core-1.21.3.dist-info → dara_core-1.21.4.dist-info}/RECORD

@@ -93,7 +93,7 @@ dara/core/router/compat.py,sha256=WAVzDcJFJOVoIQ5inplIhXD58TWsWwTTebTCqpG4nGs,31
 dara/core/router/components.py,sha256=MDaiQ8Y0-94EH0Jm4j7p9S141k8G4osSbOKSTSu3aOM,4433
 dara/core/router/dependency_graph.py,sha256=AyjSk3DuvCgACrgpID4oSpms1X6GQJUbt-scY5X_LN4,2305
 dara/core/router/router.py,sha256=1r3rFGiftOXC6GP66hKqTdcVNDRJsZWBWvL74wNG4dA,29719
-dara/core/umd/dara.core.umd.cjs,sha256=ZPpEZP3w_XsC4CmeCdt1j6gTZUuKE1fcwdBiBDG2C-0,5143753
+dara/core/umd/dara.core.umd.cjs,sha256=yL5RNTVCKf39V2ItxpFhMmwBZqFz4BdowFDjrKfH3NU,5148073
 dara/core/umd/style.css,sha256=yT3PKpi2sKI2-kQIF8xtVbTPQqgpK7-Ua7tfzDPuSsI,4095881
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=nmCsnMLXeZAjkhMYz-mIFodpVY-69IO1fvwwXbFlMQ4,2447
@@ -120,8 +120,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=UQGDooOc8ric73eHs9E0ltYP4UCrwqQ3QxqN_fb4PwY,1942
 dara/core/visual/themes/definitions.py,sha256=5g83t24w8Ar51Cl9REBJfCU7_DtlashBQeUTKDg3D1M,2862
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.21.3.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.21.3.dist-info/METADATA,sha256=P8O2VBTiSSG6w_PdTOdvOhnFDC7uVkcDSPx6zP7n5FA,7534
-dara_core-1.21.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.21.3.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.21.3.dist-info/RECORD,,
+dara_core-1.21.4.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.21.4.dist-info/METADATA,sha256=B3_u4qs8ZbvfSgO4LKfnS4IUTGM6hhFXEE_O7UUHryo,7534
+dara_core-1.21.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.21.4.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.21.4.dist-info/RECORD,,