react-router 0.0.0-experimental-73e447577 → 0.0.0-experimental-e613d4238

package/dist/development/{chunk-PF7FO4KS.mjs → chunk-5P3HEZQU.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-73e447577
+ * react-router v0.0.0-experimental-e613d4238
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -454,23 +454,19 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
     if (isIndexRoute(route)) {
       let indexRoute = {
         ...route,
+        ...mapRouteProperties2(route),
         id
       };
-      manifest[id] = mergeRouteUpdates(
-        indexRoute,
-        mapRouteProperties2(indexRoute)
-      );
+      manifest[id] = indexRoute;
       return indexRoute;
     } else {
       let pathOrLayoutRoute = {
         ...route,
+        ...mapRouteProperties2(route),
         id,
         children: void 0
       };
-      manifest[id] = mergeRouteUpdates(
-        pathOrLayoutRoute,
-        mapRouteProperties2(pathOrLayoutRoute)
-      );
+      manifest[id] = pathOrLayoutRoute;
       if (route.children) {
         pathOrLayoutRoute.children = convertRoutesToDataRoutes(
           route.children,
@@ -484,17 +480,6 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
     }
   });
 }
-function mergeRouteUpdates(route, updates) {
-  return Object.assign(route, {
-    ...updates,
-    ...typeof updates.lazy === "object" && updates.lazy != null ? {
-      lazy: {
-        ...route.lazy,
-        ...updates.lazy
-      }
-    } : {}
-  });
-}
 function matchRoutes(routes, locationArg, basename = "/") {
   return matchRoutesImpl(routes, locationArg, basename, false);
 }
@@ -950,229 +935,6 @@ var ErrorResponseImpl = class {
 function isRouteErrorResponse(error) {
   return error != null && typeof error.status === "number" && typeof error.statusText === "string" && typeof error.internal === "boolean" && "data" in error;
 }
-function getRoutePattern(paths) {
-  return paths.filter(Boolean).join("/").replace(/\/\/*/g, "/");
-}
-
-// lib/router/instrumentation.ts
-var UninstrumentedSymbol = Symbol("Uninstrumented");
-function getInstrumentedImplementation(impls, handler, getInfo = () => void 0) {
-  if (impls.length === 0) {
-    return null;
-  }
-  return async (...args) => {
-    let value;
-    let info = getInfo(...args);
-    await recurseRight(
-      impls,
-      info,
-      async () => {
-        value = await handler(...args);
-      },
-      impls.length - 1
-    );
-    return value;
-  };
-}
-async function recurseRight(impls, info, handler, index) {
-  let impl = impls[index];
-  if (!impl) {
-    await handler();
-  } else {
-    await impl(async () => {
-      await recurseRight(impls, info, handler, index - 1);
-    }, info);
-  }
-}
-function getInstrumentationInfo(args) {
-  let { request, context, params, pattern } = args;
-  return {
-    // pseudo "Request" with the info they may want to read from
-    request: {
-      method: request.method,
-      url: request.url,
-      // Maybe make this a proxy that only supports `get`?
-      headers: {
-        get: (...args2) => request.headers.get(...args2)
-      }
-    },
-    params: { ...params },
-    pattern,
-    context: {
-      get: (...args2) => context.get(...args2)
-    }
-  };
-}
-function getInstrumentationsByType(instrumentations, key) {
-  let value = [];
-  for (let i in instrumentations) {
-    let instrumentation = instrumentations[i];
-    if (key in instrumentation && instrumentation[key] != null) {
-      value.push(instrumentation[key]);
-    }
-  }
-  return value;
-}
-function getInstrumentationUpdates(fns, route) {
-  let instrumentations = [];
-  fns.forEach(
-    (fn) => fn({
-      id: route.id,
-      index: route.index,
-      path: route.path,
-      instrument(i) {
-        instrumentations.push(i);
-      }
-    })
-  );
-  let updates = {};
-  if (instrumentations.length > 0) {
-    ["lazy", "loader", "action"].forEach((key) => {
-      let func = route[key];
-      if (typeof func === "function") {
-        let original = func[UninstrumentedSymbol] ?? func;
-        let instrumented = getInstrumentedImplementation(
-          getInstrumentationsByType(instrumentations, key),
-          original,
-          key === "lazy" ? () => void 0 : (...args) => getInstrumentationInfo(
-            args[0]
-          )
-        );
-        if (instrumented) {
-          instrumented[UninstrumentedSymbol] = original;
-          updates[key] = instrumented;
-        }
-      }
-    });
-    if (route.middleware && route.middleware.length > 0) {
-      updates.middleware = route.middleware.map((middleware) => {
-        let original = middleware[UninstrumentedSymbol] ?? middleware;
-        let instrumented = getInstrumentedImplementation(
-          getInstrumentationsByType(instrumentations, "middleware"),
-          original,
-          (...args) => getInstrumentationInfo(
-            args[0]
-          )
-        );
-        if (instrumented) {
-          instrumented[UninstrumentedSymbol] = original;
-          return instrumented;
-        }
-        return middleware;
-      });
-    }
-    if (typeof route.lazy === "object") {
-      let lazyObject = route.lazy;
-      ["middleware", "loader", "action"].forEach((key) => {
-        let func = lazyObject[key];
-        if (typeof func === "function") {
-          let instrumented = getInstrumentedImplementation(
-            getInstrumentationsByType(instrumentations, `lazy.${key}`),
-            func
-          );
-          if (instrumented) {
-            updates.lazy = Object.assign(updates.lazy || {}, {
-              [key]: instrumented
-            });
-          }
-        }
-      });
-    }
-  }
-  return updates;
-}
-function instrumentClientSideRouter(router, fns) {
-  let instrumentations = [];
-  fns.forEach(
-    (fn) => fn({
-      instrument(i) {
-        instrumentations.push(i);
-      }
-    })
-  );
-  if (instrumentations.length > 0) {
-    let navigate = router.navigate[UninstrumentedSymbol] ?? router.navigate;
-    let instrumentedNavigate = getInstrumentedImplementation(
-      getInstrumentationsByType(instrumentations, "navigate"),
-      navigate,
-      (...args) => {
-        let [to, opts] = args;
-        opts = opts ?? {};
-        let info = {
-          to: typeof to === "number" || typeof to === "string" ? to : to ? createPath(to) : ".",
-          currentUrl: createPath(router.state.location),
-          ..."formMethod" in opts ? { formMethod: opts.formMethod } : {},
-          ..."formEncType" in opts ? { formEncType: opts.formEncType } : {},
-          ..."formData" in opts ? { formData: opts.formData } : {},
-          ..."body" in opts ? { body: opts.body } : {}
-        };
-        return info;
-      }
-    );
-    if (instrumentedNavigate) {
-      instrumentedNavigate[UninstrumentedSymbol] = navigate;
-      router.navigate = instrumentedNavigate;
-    }
-    let fetch2 = router.fetch[UninstrumentedSymbol] ?? router.fetch;
-    let instrumentedFetch = getInstrumentedImplementation(
-      getInstrumentationsByType(instrumentations, "fetch"),
-      fetch2,
-      (...args) => {
-        let [key, , href, opts] = args;
-        opts = opts ?? {};
-        let info = {
-          href: href ?? ".",
-          currentUrl: createPath(router.state.location),
-          fetcherKey: key,
-          ..."formMethod" in opts ? { formMethod: opts.formMethod } : {},
-          ..."formEncType" in opts ? { formEncType: opts.formEncType } : {},
-          ..."formData" in opts ? { formData: opts.formData } : {},
-          ..."body" in opts ? { body: opts.body } : {}
-        };
-        return info;
-      }
-    );
-    if (instrumentedFetch) {
-      instrumentedFetch[UninstrumentedSymbol] = fetch2;
-      router.fetch = instrumentedFetch;
-    }
-  }
-  return router;
-}
-function instrumentHandler(handler, fns) {
-  let instrumentations = [];
-  fns.forEach(
-    (fn) => fn({
-      instrument(i) {
-        instrumentations.push(i);
-      }
-    })
-  );
-  if (instrumentations.length === 0) {
-    return handler;
-  }
-  let instrumentedHandler = getInstrumentedImplementation(
-    getInstrumentationsByType(instrumentations, "request"),
-    handler,
-    (...args) => {
-      let [request, context] = args;
-      let info = {
-        request: {
-          method: request.method,
-          url: request.url,
-          headers: {
-            get: (...args2) => request.headers.get(...args2)
-          }
-        },
-        context: {
-          get: (ctx) => context ? context.get(ctx) : void 0
-        }
-      };
-      return info;
-    }
-  );
-  return instrumentedHandler ?? handler;
-}
 
 // lib/router/router.ts
 var validMutationMethodsArr = [
@@ -1232,20 +994,7 @@ function createRouter(init) {
     "You must provide a non-empty routes array to createRouter"
   );
   let hydrationRouteProperties2 = init.hydrationRouteProperties || [];
-  let _mapRouteProperties = init.mapRouteProperties || defaultMapRouteProperties;
-  let mapRouteProperties2 = _mapRouteProperties;
-  if (init.unstable_instrumentations) {
-    let instrumentations = init.unstable_instrumentations;
-    mapRouteProperties2 = (route) => {
-      return {
-        ..._mapRouteProperties(route),
-        ...getInstrumentationUpdates(
-          instrumentations.map((i) => i.route).filter(Boolean),
-          route
-        )
-      };
-    };
-  }
+  let mapRouteProperties2 = init.mapRouteProperties || defaultMapRouteProperties;
   let manifest = {};
   let dataRoutes = convertRoutesToDataRoutes(
     init.routes,
@@ -2997,12 +2746,6 @@ function createRouter(init) {
       updateState(newState);
     }
   };
-  if (init.unstable_instrumentations) {
-    router = instrumentClientSideRouter(
-      router,
-      init.unstable_instrumentations.map((i) => i.router).filter(Boolean)
-    );
-  }
   return router;
 }
 function createStaticHandler(routes, opts) {
@@ -3012,20 +2755,7 @@ function createStaticHandler(routes, opts) {
   );
   let manifest = {};
   let basename = (opts ? opts.basename : null) || "/";
-  let _mapRouteProperties = opts?.mapRouteProperties || defaultMapRouteProperties;
-  let mapRouteProperties2 = _mapRouteProperties;
-  if (opts?.unstable_instrumentations) {
-    let instrumentations = opts.unstable_instrumentations;
-    mapRouteProperties2 = (route) => {
-      return {
-        ..._mapRouteProperties(route),
-        ...getInstrumentationUpdates(
-          instrumentations.map((i) => i.route).filter(Boolean),
-          route
-        )
-      };
-    };
-  }
+  let mapRouteProperties2 = opts?.mapRouteProperties || defaultMapRouteProperties;
   let dataRoutes = convertRoutesToDataRoutes(
     routes,
     mapRouteProperties2,
@@ -3095,7 +2825,6 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            pattern: getRoutePattern(matches.map((m) => m.route.path)),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -3241,7 +2970,6 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          pattern: getRoutePattern(matches.map((m) => m.route.path)),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -3523,7 +3251,6 @@ function createStaticHandler(routes, opts) {
             mapRouteProperties2,
             manifest,
             request,
-            getRoutePattern(matches.map((m) => m.route.path)),
             match,
             [],
             requestContext,
@@ -3534,7 +3261,6 @@ function createStaticHandler(routes, opts) {
           mapRouteProperties2,
           manifest,
           request,
-          getRoutePattern(matches.map((m) => m.route.path)),
           match,
           [],
           requestContext,
@@ -3838,7 +3564,6 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
         mapRouteProperties2,
         manifest,
         request,
-        getRoutePattern(matches.map((m) => m.route.path)),
         match,
         lazyRoutePropertiesToSkip,
         scopedContext,
@@ -3859,7 +3584,6 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
       mapRouteProperties2,
       manifest,
       request,
-      getRoutePattern(matches.map((m) => m.route.path)),
       match,
       lazyRoutePropertiesToSkip,
       scopedContext,
@@ -4318,12 +4042,7 @@ async function runMiddlewarePipeline(args, handler, processResult, isResult, err
     (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
   let result = await callRouteMiddleware(
-    {
-      request,
-      params,
-      context,
-      pattern: getRoutePattern(matches.map((m) => m.route.path))
-    },
+    { request, params, context },
     tuples,
     handler,
     processResult,
@@ -4401,7 +4120,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties2, manifest, request, pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties2, manifest, request, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties2,
@@ -4429,10 +4148,12 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, pattern, m
       return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
-      if (isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) {
+      let { lazy, loader, middleware } = match.route;
+      let callHandler = isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (lazy || loader);
+      let isMiddlewareOnlyRoute = middleware && middleware.length > 0 && !loader && !lazy;
+      if (callHandler && !isMiddlewareOnlyRoute) {
         return callLoaderOrAction({
           request,
-          pattern,
           match,
           lazyHandlerPromise: _lazyPromises?.handler,
           lazyRoutePromise: _lazyPromises?.route,
@@ -4466,7 +4187,6 @@ function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request,
       mapRouteProperties2,
       manifest,
       request,
-      getRoutePattern(matches.map((m) => m.route.path)),
       match,
       lazyRoutePropertiesToSkip,
       scopedContext,
@@ -4481,7 +4201,6 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   }
   let dataStrategyArgs = {
     request,
-    pattern: getRoutePattern(matches.map((m) => m.route.path)),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -4522,7 +4241,6 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
 }
 async function callLoaderOrAction({
   request,
-  pattern,
   match,
   lazyHandlerPromise,
   lazyRoutePromise,
@@ -4549,7 +4267,6 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
-          pattern,
           params: match.params,
           context: scopedContext
         },
@@ -5835,6 +5552,15 @@ function warningOnce(key, cond, message) {
     warning(false, message);
   }
 }
+function useRoute(routeId) {
+  const state = useDataRouterState("useRouteLoaderData" /* UseRouteLoaderData */);
+  const route = state.matches.find(({ route: route2 }) => route2.id === routeId);
+  if (route === void 0) return void 0;
+  return {
+    loaderData: state.loaderData[routeId],
+    actionData: state.actionData?.[routeId]
+  };
+}
 
 // lib/components.tsx
 import * as React3 from "react";
@@ -5917,8 +5643,7 @@ function createMemoryRouter(routes, opts) {
     hydrationRouteProperties,
     mapRouteProperties,
     dataStrategy: opts?.dataStrategy,
-    patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    patchRoutesOnNavigation: opts?.patchRoutesOnNavigation
   }).initialize();
 }
 var Deferred = class {
@@ -5940,6 +5665,119 @@ var Deferred = class {
     });
   }
 };
+function shallowDiff(a, b) {
+  if (a === b) {
+    return false;
+  }
+  let aKeys = Object.keys(a);
+  let bKeys = Object.keys(b);
+  if (aKeys.length !== bKeys.length) {
+    return true;
+  }
+  for (let key of aKeys) {
+    if (a[key] !== b[key]) {
+      return true;
+    }
+  }
+  return false;
+}
+function UNSTABLE_TransitionEnabledRouterProvider({
+  router,
+  flushSync: reactDomFlushSyncImpl,
+  unstable_onError
+}) {
+  let fetcherData = React3.useRef(/* @__PURE__ */ new Map());
+  let [revalidating, startRevalidation] = React3.useTransition();
+  let [state, setState] = React3.useState(router.state);
+  router.__setPendingRerender = (promise) => startRevalidation(
+    // @ts-expect-error - need react 19 types for this to be async
+    async () => {
+      const rerender = await promise;
+      startRevalidation(() => {
+        rerender();
+      });
+    }
+  );
+  let navigator = React3.useMemo(() => {
+    return {
+      createHref: router.createHref,
+      encodeLocation: router.encodeLocation,
+      go: (n) => router.navigate(n),
+      push: (to, state2, opts) => router.navigate(to, {
+        state: state2,
+        preventScrollReset: opts?.preventScrollReset
+      }),
+      replace: (to, state2, opts) => router.navigate(to, {
+        replace: true,
+        state: state2,
+        preventScrollReset: opts?.preventScrollReset
+      })
+    };
+  }, [router]);
+  let basename = router.basename || "/";
+  let dataRouterContext = React3.useMemo(
+    () => ({
+      router,
+      navigator,
+      static: false,
+      basename,
+      unstable_onError
+    }),
+    [router, navigator, basename, unstable_onError]
+  );
+  React3.useLayoutEffect(() => {
+    return router.subscribe(
+      (newState, { deletedFetchers, flushSync, viewTransitionOpts }) => {
+        newState.fetchers.forEach((fetcher, key) => {
+          if (fetcher.data !== void 0) {
+            fetcherData.current.set(key, fetcher.data);
+          }
+        });
+        deletedFetchers.forEach((key) => fetcherData.current.delete(key));
+        const diff = shallowDiff(state, newState);
+        if (!diff) return;
+        if (flushSync) {
+          if (reactDomFlushSyncImpl) {
+            reactDomFlushSyncImpl(() => setState(newState));
+          } else {
+            setState(newState);
+          }
+        } else {
+          React3.startTransition(() => {
+            setState(newState);
+          });
+        }
+      }
+    );
+  }, [router, reactDomFlushSyncImpl, state]);
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React3.createElement(
+    DataRouterStateContext.Provider,
+    {
+      value: {
+        ...state,
+        revalidation: revalidating ? "loading" : state.revalidation
+      }
+    },
+    /* @__PURE__ */ React3.createElement(FetchersContext.Provider, { value: fetcherData.current }, /* @__PURE__ */ React3.createElement(
+      Router,
+      {
+        basename,
+        location: state.location,
+        navigationType: state.historyAction,
+        navigator
+      },
+      /* @__PURE__ */ React3.createElement(
+        MemoizedDataRoutes,
+        {
+          routes: router.routes,
+          future: router.future,
+          state,
+          unstable_onError
+        }
+      )
+    ))
+  )), null);
+}
 function RouterProvider({
   router,
   flushSync: reactDomFlushSyncImpl,
@@ -7642,8 +7480,8 @@ async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
     }
   }
   let res = await fetch(url, await createRequestInit(request));
-  if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
-    throw new ErrorResponseImpl(404, "Not Found", true);
+  if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
+    throw new ErrorResponseImpl(res.status, res.statusText, await res.text());
   }
   if (res.status === 204 && res.headers.has("X-Remix-Redirect")) {
     return {
@@ -8220,7 +8058,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
       let initialError = hasInitialError ? initialState?.errors?.[route.id] : void 0;
       let isHydrationRequest = needsRevalidation == null && (routeModule.clientLoader?.hydrate === true || !route.hasLoader);
-      dataRoute.loader = async ({ request, params, context, pattern }, singleFetch) => {
+      dataRoute.loader = async ({ request, params, context }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
             invariant2(
@@ -8234,7 +8072,6 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               context,
-              pattern,
               async serverLoader() {
                 preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
@@ -8260,7 +8097,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         route.hasLoader,
         isSpaMode
       );
-      dataRoute.action = ({ request, params, context, pattern }, singleFetch) => {
+      dataRoute.action = ({ request, params, context }, singleFetch) => {
         return prefetchStylesAndCallHandler(async () => {
           invariant2(
             routeModule,
@@ -8276,7 +8113,6 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             context,
-            pattern,
             async serverAction() {
               preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
@@ -9286,7 +9122,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-73e447577";
+    "0.0.0-experimental-e613d4238";
   }
 } catch (e) {
 }
@@ -9302,8 +9138,7 @@ function createBrowserRouter(routes, opts) {
     hydrationRouteProperties,
     dataStrategy: opts?.dataStrategy,
     patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
-    window: opts?.window,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    window: opts?.window
   }).initialize();
 }
 function createHashRouter(routes, opts) {
@@ -9318,8 +9153,7 @@ function createHashRouter(routes, opts) {
     hydrationRouteProperties,
     dataStrategy: opts?.dataStrategy,
     patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
-    window: opts?.window,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    window: opts?.window
   }).initialize();
 }
 function parseHydrationData() {
@@ -10404,7 +10238,6 @@ export {
   replace,
   ErrorResponseImpl,
   isRouteErrorResponse,
-  instrumentHandler,
   IDLE_NAVIGATION,
   IDLE_FETCHER,
   IDLE_BLOCKER,
@@ -10447,10 +10280,12 @@ export {
   useAsyncValue,
   useAsyncError,
   useBlocker,
+  useRoute,
   warnOnce,
   mapRouteProperties,
   hydrationRouteProperties,
   createMemoryRouter,
+  UNSTABLE_TransitionEnabledRouterProvider,
   RouterProvider,
   MemoryRouter,
   Navigate,