dara-core 1.21.8__py3-none-any.whl → 1.21.9__py3-none-any.whl

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

@@ -50738,9 +50738,11 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     await validateResponse(res, `Failed to cancel task with id: ${taskId}`);
     return true;
   }
-  function getUniqueIdentifier(variable) {
+  function getUniqueIdentifier(variable, opts = {
+    useNested: true
+  }) {
     let identifier = variable.uid;
-    if ("nested" in variable) {
+    if (opts.useNested && "nested" in variable) {
       identifier += variable.nested.join(",");
     }
     return identifier;
@@ -50752,12 +50754,14 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   const selectorFamilyRegistry = /* @__PURE__ */ new Map();
   const selectorFamilyMembersRegistry = /* @__PURE__ */ new Map();
   const depsRegistry = /* @__PURE__ */ new Map();
+  const SHARED_KEY_TYPES = ["result-selector", "derived-selector"];
   function getRegistryKey(variable, type) {
     let extras = "";
     if (isDerivedVariable(variable)) {
       extras = variable.loop_instance_uid ?? "";
     }
-    return `${getUniqueIdentifier(variable)}-${type}-${extras}`;
+    const opts = { useNested: !SHARED_KEY_TYPES.includes(type) };
+    return `${getUniqueIdentifier(variable, opts)}-${type}-${extras}`;
   }
   function clearRegistries_TEST() {
     for (const registry2 of [
@@ -50789,7 +50793,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         return atomFamilyMembersRegistry.get(family).size > 0;
       }
       case "DerivedVariable": {
-        const key = getRegistryKey(variable, "selector");
+        const key = getRegistryKey(variable, "selector-nested");
         return selectorFamilyRegistry.has(key);
       }
       default:
@@ -50934,7 +50938,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     return context.config;
   }
   /**
-   * react-router v7.8.2
+   * react-router v7.9.1
    *
    * Copyright (c) Remix Software Inc.
    *
@@ -51293,13 +51297,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     return new URL(href2, base);
   }
-  function unstable_createContext(defaultValue) {
+  function createContext(defaultValue) {
     return { defaultValue };
   }
   var _map;
-  var unstable_RouterContextProvider = class {
+  var RouterContextProvider$1 = class RouterContextProvider {
     /**
-     * Create a new `unstable_RouterContextProvider` instance
+     * Create a new `RouterContextProvider` instance
      * @param init An optional initial context map to populate the provider with
      */
     constructor(init) {
@@ -51359,7 +51363,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     "path",
     "id",
     "index",
-    "unstable_middleware",
+    "middleware",
     "children"
   ]);
   function isUnsupportedLazyRouteFunctionKey(key) {
@@ -52394,7 +52398,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         pendingNavigationController.signal,
         opts && opts.submission
       );
-      let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+      let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider$1();
       let pendingActionResult;
       if (opts && opts.pendingError) {
         pendingActionResult = [
@@ -52684,7 +52688,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         pendingActionResult
       );
       pendingNavigationLoadId = ++incrementingLoadId;
-      if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
+      if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.middleware) && revalidatingFetchers.length === 0) {
         let updatedFetchers2 = markFetchRedirectsDone();
         completeNavigation(
           location2,
@@ -52838,7 +52842,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         setFetcherError(key, routeId, error, { flushSync });
         return;
       }
-      let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+      let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider$1();
       let preventScrollReset = (opts && opts.preventScrollReset) === true;
       if (submission && isMutationMethod(submission.formMethod)) {
         await handleFetcherAction(
@@ -53689,13 +53693,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       skipLoaderErrorBubbling,
       skipRevalidation,
       dataStrategy,
-      unstable_generateMiddlewareResponse: generateMiddlewareResponse
+      generateMiddlewareResponse
     } = {}) {
       let url = new URL(request2.url);
       let method = request2.method;
       let location2 = createLocation("", createPath(url), null, "default");
       let matches2 = matchRoutes(dataRoutes, location2, basename);
-      requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+      requestContext = requestContext != null ? requestContext : new RouterContextProvider$1();
       if (!isValidMethod(method) && method !== "HEAD") {
         let error = getInternalRouterError(405, { method });
         let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -53733,8 +53737,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
       if (generateMiddlewareResponse) {
         invariant(
-          requestContext instanceof unstable_RouterContextProvider,
-          "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+          requestContext instanceof RouterContextProvider$1,
+          "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
         );
         try {
           await loadLazyMiddlewareForMatches(
@@ -53763,7 +53767,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
                     dataStrategy || null,
                     skipLoaderErrorBubbling === true,
                     null,
-                    "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : null,
+                    "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : filterMatchesToLoad ?? null,
                     skipRevalidation === true
                   );
                   if (isResponse(result2)) {
@@ -53861,13 +53865,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       routeId,
       requestContext,
       dataStrategy,
-      unstable_generateMiddlewareResponse: generateMiddlewareResponse
+      generateMiddlewareResponse
     } = {}) {
       let url = new URL(request2.url);
       let method = request2.method;
       let location2 = createLocation("", createPath(url), null, "default");
       let matches2 = matchRoutes(dataRoutes, location2, basename);
-      requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+      requestContext = requestContext != null ? requestContext : new RouterContextProvider$1();
       if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
         throw getInternalRouterError(405, { method });
       } else if (!matches2) {
@@ -53884,8 +53888,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
       if (generateMiddlewareResponse) {
         invariant(
-          requestContext instanceof unstable_RouterContextProvider,
-          "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+          requestContext instanceof RouterContextProvider$1,
+          "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
         );
         await loadLazyMiddlewareForMatches(matches2, manifest, mapRouteProperties2);
         let response = await runServerMiddlewarePipeline(
@@ -54875,11 +54879,11 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   }
   function loadLazyMiddlewareForMatches(matches2, manifest, mapRouteProperties2) {
     let promises = matches2.map(({ route }) => {
-      if (typeof route.lazy !== "object" || !route.lazy.unstable_middleware) {
+      if (typeof route.lazy !== "object" || !route.lazy.middleware) {
         return void 0;
       }
       return loadLazyRouteProperty({
-        key: "unstable_middleware",
+        key: "middleware",
         route,
         manifest,
         mapRouteProperties: mapRouteProperties2
@@ -54897,7 +54901,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     return keyedResults;
   }
   async function defaultDataStrategyWithMiddleware(args) {
-    if (!args.matches.some((m) => m.route.unstable_middleware)) {
+    if (!args.matches.some((m) => m.route.middleware)) {
       return defaultDataStrategy(args);
     }
     return runClientMiddlewarePipeline(args, () => defaultDataStrategy(args));
@@ -54951,7 +54955,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
     let { matches: matches2, request: request2, params, context } = args;
     let tuples = matches2.flatMap(
-      (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
+      (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
     );
     let result = await callRouteMiddleware(
       { request: request2, params, context },
@@ -55014,7 +55018,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   }
   function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request2, match2, lazyRoutePropertiesToSkip) {
     let lazyMiddlewarePromise = loadLazyRouteProperty({
-      key: "unstable_middleware",
+      key: "middleware",
       route: match2.route,
       manifest,
       mapRouteProperties: mapRouteProperties2
@@ -55114,9 +55118,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       context: scopedContext,
       matches: matches2
     };
-    let unstable_runClientMiddleware = isStaticHandler ? () => {
+    let runClientMiddleware = isStaticHandler ? () => {
       throw new Error(
-        "You cannot call `unstable_runClientMiddleware()` from a static handler `dataStrategy`. Middleware is run outside of `dataStrategy` during SSR in order to bubble up the Response.  You can enable middleware via the `respond` API in `query`/`queryRoute`"
+        "You cannot call `runClientMiddleware()` from a static handler `dataStrategy`. Middleware is run outside of `dataStrategy` during SSR in order to bubble up the Response.  You can enable middleware via the `respond` API in `query`/`queryRoute`"
       );
     } : (cb) => {
       let typedDataStrategyArgs = dataStrategyArgs;
@@ -55124,9 +55128,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         return cb({
           ...typedDataStrategyArgs,
           fetcherKey,
-          unstable_runClientMiddleware: () => {
+          runClientMiddleware: () => {
             throw new Error(
-              "Cannot call `unstable_runClientMiddleware()` from within an `unstable_runClientMiddleware` handler"
+              "Cannot call `runClientMiddleware()` from within an `runClientMiddleware` handler"
             );
           }
         });
@@ -55135,7 +55139,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     let results = await dataStrategyImpl({
       ...dataStrategyArgs,
       fetcherKey,
-      unstable_runClientMiddleware
+      runClientMiddleware
     });
     try {
       await Promise.all(
@@ -55851,6 +55855,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   FetchersContext.displayName = "Fetchers";
   var AwaitContext = React__namespace.createContext(null);
   AwaitContext.displayName = "Await";
+  var AwaitContextProvider = (props) => React__namespace.createElement(AwaitContext.Provider, props);
   var NavigationContext = React__namespace.createContext(
     null
   );
@@ -56554,7 +56559,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
   function createMemoryRouter(routes, opts) {
     return createRouter$1({
       basename: opts?.basename,
-      unstable_getContext: opts?.unstable_getContext,
+      getContext: opts?.getContext,
       future: opts?.future,
       history: createMemoryHistory({
         initialEntries: opts?.initialEntries,
@@ -57930,19 +57935,16 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     }
     return init;
   }
-  var ESCAPE_LOOKUP$1 = {
+  var ESCAPE_LOOKUP = {
     "&": "\\u0026",
     ">": "\\u003e",
     "<": "\\u003c",
     "\u2028": "\\u2028",
     "\u2029": "\\u2029"
   };
-  var ESCAPE_REGEX$1 = /[&><\u2028\u2029]/g;
-  function escapeHtml$1(html) {
-    return html.replace(ESCAPE_REGEX$1, (match2) => ESCAPE_LOOKUP$1[match2]);
-  }
-  function createHtml(html) {
-    return { __html: html };
+  var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
+  function escapeHtml(html) {
+    return html.replace(ESCAPE_REGEX, (match2) => ESCAPE_LOOKUP[match2]);
   }
   function invariant2$1(value, message) {
     if (value === false || value === null || typeof value === "undefined") {
@@ -57991,7 +57993,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
       {
         nonce,
         dangerouslySetInnerHTML: {
-          __html: `window.__reactRouterContext.streamController.enqueue(${escapeHtml$1(
+          __html: `window.__reactRouterContext.streamController.enqueue(${escapeHtml(
             JSON.stringify(value)
           )});`
         }
@@ -58037,7 +58039,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
       ssr,
       basename
     );
-    return async (args) => args.unstable_runClientMiddleware(dataStrategy);
+    return async (args) => args.runClientMiddleware(dataStrategy);
   }
   function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
     return async (args) => {
@@ -58810,7 +58812,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         Object.assign(dataRoute, {
           ...dataRoute,
           ...getRouteComponents(route, routeModule, isSpaMode),
-          unstable_middleware: routeModule.unstable_clientMiddleware,
+          middleware: routeModule.clientMiddleware,
           handle: routeModule.handle,
           shouldRevalidate: getShouldRevalidateFunction(
             dataRoute.path,
@@ -58952,17 +58954,14 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
               }
             });
           } : void 0,
-          unstable_middleware: route.hasClientMiddleware ? async () => {
-            let { unstable_clientMiddleware } = route.clientMiddlewareModule ? await import(
+          middleware: route.hasClientMiddleware ? async () => {
+            let { clientMiddleware } = route.clientMiddlewareModule ? await import(
               /* @vite-ignore */
               /* webpackIgnore: true */
               route.clientMiddlewareModule
             ) : await getLazyRoute();
-            invariant2$1(
-              unstable_clientMiddleware,
-              "No `unstable_clientMiddleware` export found"
-            );
-            return unstable_clientMiddleware;
+            invariant2$1(clientMiddleware, "No `clientMiddleware` export found");
+            return clientMiddleware;
           } : void 0,
           shouldRevalidate: async () => {
             let lazyRoute = await getLazyRoute();
@@ -59043,7 +59042,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     return {
       Component: getRouteModuleComponent(routeModule),
       ErrorBoundary: routeModule.ErrorBoundary,
-      unstable_clientMiddleware: routeModule.unstable_clientMiddleware,
+      clientMiddleware: routeModule.clientMiddleware,
       clientAction: routeModule.clientAction,
       clientLoader: routeModule.clientLoader,
       handle: routeModule.handle,
@@ -59591,7 +59590,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             {
               key: `script:ld+json:${json}`,
               type: "application/ld+json",
-              dangerouslySetInnerHTML: { __html: json }
+              dangerouslySetInnerHTML: { __html: escapeHtml(json) }
             }
           );
         } catch (err2) {
@@ -59696,7 +59695,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         {
           ...scriptProps,
           suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: createHtml(contextScript),
+          dangerouslySetInnerHTML: { __html: contextScript },
           type: void 0
         }
       ), /* @__PURE__ */ React__namespace.createElement(
@@ -59704,7 +59703,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         {
           ...scriptProps,
           suppressHydrationWarning: true,
-          dangerouslySetInnerHTML: createHtml(routeModulesScript),
+          dangerouslySetInnerHTML: { __html: routeModulesScript },
           type: "module",
           async: true
         }
@@ -59877,14 +59876,14 @@ import(${JSON.stringify(manifest.entry.module)});`;
   try {
     if (isBrowser) {
       window.__reactRouterVersion = // @ts-expect-error
-      "7.8.2";
+      "7.9.1";
     }
   } catch (e2) {
   }
   function createBrowserRouter(routes, opts) {
     return createRouter$1({
       basename: opts?.basename,
-      unstable_getContext: opts?.unstable_getContext,
+      getContext: opts?.getContext,
       future: opts?.future,
       history: createBrowserHistory({ window: opts?.window }),
       hydrationData: opts?.hydrationData || parseHydrationData(),
@@ -59899,7 +59898,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
   function createHashRouter(routes, opts) {
     return createRouter$1({
       basename: opts?.basename,
-      unstable_getContext: opts?.unstable_getContext,
+      getContext: opts?.getContext,
       future: opts?.future,
       history: createHashHistory({ window: opts?.window }),
       hydrationData: opts?.hydrationData || parseHydrationData(),
@@ -60882,7 +60881,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       },
       get future() {
         return {
-          unstable_middleware: false,
+          v8_middleware: false,
           ...opts?.future
         };
       },
@@ -61312,7 +61311,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
   }
   var setCookieExports = /* @__PURE__ */ requireSetCookie();
   /**
-   * react-router v7.8.2
+   * react-router v7.9.1
    *
    * Copyright (c) Remix Software Inc.
    *
@@ -61401,7 +61400,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         frameworkContextRef.current = {
           future: {
             unstable_subResourceIntegrity: future?.unstable_subResourceIntegrity === true,
-            unstable_middleware: future?.unstable_middleware === true
+            v8_middleware: future?.v8_middleware === true
           },
           manifest: {
             routes: {},
@@ -61418,7 +61417,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
           // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
           // types compared to `AgnosticRouteObject`
           convertRoutesToDataRoutes(routes, (r2) => r2),
-          _context !== void 0 ? _context : future?.unstable_middleware ? new unstable_RouterContextProvider() : {},
+          _context !== void 0 ? _context : future?.v8_middleware ? new RouterContextProvider$1() : {},
           frameworkContextRef.current.manifest,
           frameworkContextRef.current.routeModules
         );
@@ -61845,7 +61844,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         hasErrorBoundary: route.id === "root" || route.module.ErrorBoundary != null,
         id: route.id,
         path: route.path,
-        unstable_middleware: route.module.unstable_middleware,
+        middleware: route.module.middleware,
         // Need to use RR's version in the param typed here to permit the optional
         // context even though we know it'll always be provided in remix
         loader: route.module.loader ? async (args) => {
@@ -61909,17 +61908,6 @@ import(${JSON.stringify(manifest.entry.module)});`;
       };
     });
   }
-  var ESCAPE_LOOKUP = {
-    "&": "\\u0026",
-    ">": "\\u003e",
-    "<": "\\u003c",
-    "\u2028": "\\u2028",
-    "\u2029": "\\u2029"
-  };
-  var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
-  function escapeHtml(html) {
-    return html.replace(ESCAPE_REGEX, (match2) => ESCAPE_LOOKUP[match2]);
-  }
   function createServerHandoffString(serverHandoff) {
     return escapeHtml(JSON.stringify(serverHandoff));
   }
@@ -62009,7 +61997,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         requestContext: loadContext,
         skipLoaderErrorBubbling: true,
         skipRevalidation: true,
-        unstable_generateMiddlewareResponse: build2.future.unstable_middleware ? async (query) => {
+        generateMiddlewareResponse: build2.future.v8_middleware ? async (query) => {
           try {
             let innerResult = await query(handlerRequest);
             return handleQueryResult(innerResult);
@@ -62073,7 +62061,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         requestContext: loadContext,
         filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
         skipLoaderErrorBubbling: true,
-        unstable_generateMiddlewareResponse: build2.future.unstable_middleware ? async (query) => {
+        generateMiddlewareResponse: build2.future.v8_middleware ? async (query) => {
           try {
             let innerResult = await query(handlerRequest);
             return handleQueryResult(innerResult);
@@ -62288,15 +62276,15 @@ import(${JSON.stringify(manifest.entry.module)});`;
           request: request2
         });
       };
-      if (_build.future.unstable_middleware) {
-        if (initialContext && !(initialContext instanceof unstable_RouterContextProvider)) {
+      if (_build.future.v8_middleware) {
+        if (initialContext && !(initialContext instanceof RouterContextProvider$1)) {
           let error = new Error(
-            "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `unstable_RouterContextProvider` from your `getLoadContext` function."
+            "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `RouterContextProvider` from your `getLoadContext` function."
           );
           handleError(error);
           return returnLastResortErrorResponse(error, serverMode);
         }
-        loadContext = initialContext || new unstable_RouterContextProvider();
+        loadContext = initialContext || new RouterContextProvider$1();
       } else {
         loadContext = initialContext || {};
       }
@@ -62524,7 +62512,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
     try {
       let result = await staticHandler.query(request2, {
         requestContext: loadContext,
-        unstable_generateMiddlewareResponse: build2.future.unstable_middleware ? async (query) => {
+        generateMiddlewareResponse: build2.future.v8_middleware ? async (query) => {
           try {
             let innerResult = await query(request2);
             if (!isResponse(innerResult)) {
@@ -62660,7 +62648,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       let result = await staticHandler.queryRoute(request2, {
         routeId,
         requestContext: loadContext,
-        unstable_generateMiddlewareResponse: build2.future.unstable_middleware ? async (queryRoute) => {
+        generateMiddlewareResponse: build2.future.v8_middleware ? async (queryRoute) => {
           try {
             let innerResult = await queryRoute(request2);
             return handleQueryRouteResult(innerResult);
@@ -62872,24 +62860,36 @@ ${String(error)}`;
   }
   function href(path, ...args) {
     let params = args[0];
-    return path.split("/").map((segment) => {
-      if (segment === "*") {
-        return params ? params["*"] : void 0;
-      }
-      const match2 = segment.match(/^:([\w-]+)(\?)?/);
-      if (!match2) return segment;
-      const param = match2[1];
-      const value = params ? params[param] : void 0;
-      const isRequired = match2[2] === void 0;
-      if (isRequired && value === void 0) {
-        throw Error(
-          `Path '${path}' requires param '${param}' but it was not provided`
-        );
+    let result = path.replace(/\/*\*?$/, "").replace(
+      /\/:([\w-]+)(\?)?/g,
+      // same regex as in .\router\utils.ts: compilePath().
+      (_, param, questionMark) => {
+        const isRequired = questionMark === void 0;
+        const value = params ? params[param] : void 0;
+        if (isRequired && value === void 0) {
+          throw new Error(
+            `Path '${path}' requires param '${param}' but it was not provided`
+          );
+        }
+        return value === void 0 ? "" : "/" + value;
       }
-      return value;
-    }).filter((segment) => segment !== void 0).join("/");
+    );
+    if (path.endsWith("*")) {
+      const value = params ? params["*"] : void 0;
+      if (value !== void 0) {
+        result += "/" + value;
+      }
+    }
+    return result || "/";
   }
-  function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
+  function getHydrationData({
+    state,
+    routes,
+    getRouteInfo,
+    location: location2,
+    basename,
+    isSpaMode
+  }) {
     let hydrationData = {
       ...state,
       loaderData: { ...state.loaderData }
@@ -63134,7 +63134,7 @@ ${String(error)}`;
   function createRouterFromPayload({
     fetchImplementation,
     createFromReadableStream,
-    unstable_getContext,
+    getContext,
     payload
   }) {
     const globalVar = window;
@@ -63172,17 +63172,17 @@ ${String(error)}`;
     }, []);
     globalVar.__reactRouterDataRouter = createRouter$1({
       routes,
-      unstable_getContext,
+      getContext,
       basename: payload.basename,
       history: createBrowserHistory(),
-      hydrationData: getHydrationData(
-        {
+      hydrationData: getHydrationData({
+        state: {
           loaderData: payload.loaderData,
           actionData: payload.actionData,
           errors: payload.errors
         },
         routes,
-        (routeId) => {
+        getRouteInfo: (routeId) => {
           let match2 = payload.matches.find((m) => m.id === routeId);
           invariant(match2, "Route not found in payload");
           return {
@@ -63191,10 +63191,10 @@ ${String(error)}`;
             hasHydrateFallback: match2.hydrateFallbackElement != null
           };
         },
-        payload.location,
-        void 0,
-        false
-      ),
+        location: payload.location,
+        basename: payload.basename,
+        isSpaMode: false
+      }),
       async patchRoutesOnNavigation({ path, signal }) {
         if (discoveredPaths.has(path)) {
           return;
@@ -63282,7 +63282,7 @@ ${String(error)}`;
       routeModules: globalVar.__reactRouterRouteModules
     };
   }
-  var renderedRoutesContext = unstable_createContext();
+  var renderedRoutesContext = createContext();
   function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
     let dataStrategy = getSingleFetchDataStrategyImpl(
       getRouter,
@@ -63309,7 +63309,7 @@ ${String(error)}`;
         return M.route.hasComponent && !M.route.element;
       }
     );
-    return async (args) => args.unstable_runClientMiddleware(async () => {
+    return async (args) => args.runClientMiddleware(async () => {
       let context = args.context;
       context.set(renderedRoutesContext, []);
       let results = await dataStrategy(args);
@@ -63395,22 +63395,17 @@ ${String(error)}`;
     fetch: fetchImplementation = fetch,
     payload,
     routeDiscovery = "eager",
-    unstable_getContext
+    getContext
   }) {
     if (payload.type !== "render") throw new Error("Invalid payload type");
     let { router, routeModules } = React__namespace.useMemo(
       () => createRouterFromPayload({
         payload,
         fetchImplementation,
-        unstable_getContext,
+        getContext,
         createFromReadableStream
       }),
-      [
-        createFromReadableStream,
-        payload,
-        fetchImplementation,
-        unstable_getContext
-      ]
+      [createFromReadableStream, payload, fetchImplementation, getContext]
     );
     React__namespace.useEffect(() => {
       setIsHydrated();
@@ -63482,7 +63477,7 @@ ${String(error)}`;
       future: {
         // These flags have no runtime impact so can always be false.  If we add
         // flags that drive runtime behavior they'll need to be proxied through.
-        unstable_middleware: false,
+        v8_middleware: false,
         unstable_subResourceIntegrity: false
       },
       isSpaMode: false,
@@ -63768,19 +63763,48 @@ ${String(error)}`;
     if (!serverResponse.body) {
       throw new Error("Missing body in server response");
     }
+    const detectRedirectResponse = serverResponse.clone();
     let serverResponseB = null;
     if (hydrate2) {
       serverResponseB = serverResponse.clone();
     }
     const body = serverResponse.body;
-    let payloadPromise;
+    let buffer;
+    let streamControllers = [];
+    const createStream = () => {
+      if (!buffer) {
+        buffer = [];
+        return body.pipeThrough(
+          new TransformStream({
+            transform(chunk, controller) {
+              buffer.push(chunk);
+              controller.enqueue(chunk);
+              streamControllers.forEach((c) => c.enqueue(chunk));
+            },
+            flush() {
+              streamControllers.forEach((c) => c.close());
+              streamControllers = [];
+            }
+          })
+        );
+      }
+      return new ReadableStream({
+        start(controller) {
+          buffer.forEach((chunk) => controller.enqueue(chunk));
+          streamControllers.push(controller);
+        }
+      });
+    };
     const getPayload = async () => {
-      if (payloadPromise) return payloadPromise;
-      payloadPromise = createFromReadableStream(body);
-      return payloadPromise;
+      return createFromReadableStream(createStream());
     };
     try {
-      const payload = await getPayload();
+      if (!detectRedirectResponse.body) {
+        throw new Error("Failed to clone server response");
+      }
+      const payload = await createFromReadableStream(
+        detectRedirectResponse.body
+      );
       if (serverResponse.status === SINGLE_FETCH_REDIRECT_STATUS && payload.type === "redirect") {
         const headers2 = new Headers(serverResponse.headers);
         headers2.delete("Content-Encoding");
@@ -63891,7 +63915,7 @@ ${String(error)}`;
       future: {
         // These flags have no runtime impact so can always be false.  If we add
         // flags that drive runtime behavior they'll need to be proxied through.
-        unstable_middleware: false,
+        v8_middleware: false,
         unstable_subResourceIntegrity: false
       },
       isSpaMode: false,
@@ -63997,7 +64021,7 @@ ${String(error)}`;
     return /* @__PURE__ */ React__namespace.createElement(RouterProvider, { flushSync: ReactDOM__namespace.flushSync, ...props });
   }
   /**
-   * react-router v7.8.2
+   * react-router v7.9.1
    *
    * Copyright (c) Remix Software Inc.
    *
@@ -64026,6 +64050,7 @@ ${String(error)}`;
     PrefetchPageLinks,
     Route,
     Router,
+    RouterContextProvider: RouterContextProvider$1,
     RouterProvider,
     Routes,
     Scripts,
@@ -64033,6 +64058,7 @@ ${String(error)}`;
     ServerRouter,
     StaticRouter,
     StaticRouterProvider,
+    UNSAFE_AwaitContextProvider: AwaitContextProvider,
     UNSAFE_DataRouterContext: DataRouterContext,
     UNSAFE_DataRouterStateContext: DataRouterStateContext,
     UNSAFE_ErrorResponseImpl: ErrorResponseImpl,
@@ -64068,6 +64094,7 @@ ${String(error)}`;
     UNSAFE_withErrorBoundaryProps: withErrorBoundaryProps,
     UNSAFE_withHydrateFallbackProps: withHydrateFallbackProps,
     createBrowserRouter,
+    createContext,
     createCookie,
     createCookieSessionStorage,
     createHashRouter,
@@ -64100,9 +64127,7 @@ ${String(error)}`;
     unstable_HistoryRouter: HistoryRouter,
     unstable_RSCHydratedRouter: RSCHydratedRouter,
     unstable_RSCStaticRouter: RSCStaticRouter,
-    unstable_RouterContextProvider,
     unstable_createCallServer: createCallServer,
-    unstable_createContext,
     unstable_getRSCStream: getRSCStream,
     unstable_routeRSCServerRequest: routeRSCServerRequest,
     unstable_setDevServerHooks: setDevServerHooks,
@@ -64623,7 +64648,7 @@ Inferred class string: "${iconClasses}."`
     }
     atomFamilyMembersRegistry.get(family).set(extrasSerializable.toJSON(), atomInstance);
     if (isNested) {
-      const key = getRegistryKey(variable, "selector");
+      const key = getRegistryKey(variable, "selector-nested");
       if (!selectorFamilyRegistry.has(key)) {
         selectorFamilyRegistry.set(
           key,
@@ -69912,8 +69937,8 @@ Inferred class string: "${iconClasses}."`
     return selectorInstance;
   }
   const NOT_SET$1 = Symbol("NOT_SET");
-  function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
-    const key = getRegistryKey(variable, "selector");
+  function getOrRegisterDerivedVariableValue(variable, wsClient, taskContext, currentExtras) {
+    const key = getRegistryKey(variable, "derived-selector");
     if (!selectorFamilyRegistry.has(key)) {
       getOrRegisterTrigger(variable);
       selectorFamilyRegistry.set(
@@ -70014,7 +70039,6 @@ Inferred class string: "${iconClasses}."`
             } else {
               variableValue = variableResponse.value;
             }
-            variableValue = "nested" in variable ? resolveNested(variableValue, variable.nested) : variableValue;
             depsRegistry.set(derivedResult.depsKey, {
               args: derivedResult.relevantValues,
               result: variableValue
@@ -70034,6 +70058,35 @@ Inferred class string: "${iconClasses}."`
     selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
     return selectorInstance;
   }
+  function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
+    const key = getRegistryKey(variable, "selector-nested");
+    if (!selectorFamilyRegistry.has(key)) {
+      selectorFamilyRegistry.set(
+        key,
+        Recoil_index_11({
+          get: (extrasSerializable) => ({ get }) => {
+            const dvSelector = getOrRegisterDerivedVariableValue(
+              variable,
+              wsClient,
+              taskContext,
+              extrasSerializable.extras
+            );
+            const value = get(dvSelector);
+            return "nested" in variable ? resolveNested(value, variable.nested) : value;
+          },
+          key: nanoid$1()
+        })
+      );
+    }
+    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 preloadDerivedValue({
     key,
     variables,
@@ -74632,7 +74685,7 @@ body,
               element: /* @__PURE__ */ React__namespace.createElement(AuthenticatedRoot, { daraData: config2 }),
               loader: createAuthenticatedRootLoader(config2),
               // token must be set to access the authenticated routes
-              unstable_middleware: [
+              middleware: [
                 async () => {
                   if (verifiedToken) {
                     return;
@@ -98692,6 +98745,7 @@ body,
   exports.getIcon = getIcon;
   exports.getOrRegisterDerivedVariable = getOrRegisterDerivedVariable;
   exports.getOrRegisterDerivedVariableResult = getOrRegisterDerivedVariableResult;
+  exports.getOrRegisterDerivedVariableValue = getOrRegisterDerivedVariableValue;
   exports.getOrRegisterServerVariable = getOrRegisterServerVariable;
   exports.getRegistryKey = getRegistryKey;
   exports.getSessionToken = getSessionToken;

{dara_core-1.21.8.dist-info → dara_core-1.21.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.21.8
+Version: 1.21.9
 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.8)
+Requires-Dist: create-dara-app (==1.21.9)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.21.8) ; extra == "all"
+Requires-Dist: dara-components (==1.21.9) ; 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.8/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.21.9/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.8/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.21.9/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.8/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.8/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.8/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.9/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.9/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.9/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.8/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.9/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.8/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.9/LICENSE).
 

{dara_core-1.21.8.dist-info → dara_core-1.21.9.dist-info}/RECORD

@@ -93,7 +93,7 @@ dara/core/router/compat.py,sha256=WAVzDcJFJOVoIQ5inplIhXD58TWsWwTTebTCqpG4nGs,31
 dara/core/router/components.py,sha256=K6bj04_ZPJcU9JQjaxPJkbUeaHtA_jeJNEvCqQbDf3A,5090
 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=Cyy974YXbpht5yk_KPTu-RKahsPGVMVWXLEzE2S4-JU,5148693
+dara/core/umd/dara.core.umd.cjs,sha256=_3lj4wdDwfrH5bP1BzlH_2cTZatXsiIOOHwRcxwIRY8,5150233
 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.8.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.21.8.dist-info/METADATA,sha256=IOMPENa646ji1i8pl_gLC0ByIC-isfV8jU6BuRFh2NE,7534
-dara_core-1.21.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.21.8.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.21.8.dist-info/RECORD,,
+dara_core-1.21.9.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.21.9.dist-info/METADATA,sha256=TNCrcVLJcY7-PIrkbEgbN1q2U5v6Zncu4DD5K1lnwR4,7534
+dara_core-1.21.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.21.9.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.21.9.dist-info/RECORD,,