react-router 0.0.0-experimental-2a6c7bc → 0.0.0-experimental-e89ad3012

package/dist/development/{chunk-VEWXUMGM.mjs → chunk-3O4L5GVQ.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-2a6c7bc
+ * react-router v0.0.0-experimental-e89ad3012
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -367,6 +367,10 @@ function unstable_createContext(defaultValue) {
 }
 var _map;
 var unstable_RouterContextProvider = class {
+  /**
+   * Create a new `unstable_RouterContextProvider` instance
+   * @param init An optional initial context map to populate the provider with
+   */
   constructor(init) {
     __privateAdd(this, _map, /* @__PURE__ */ new Map());
     if (init) {
@@ -375,6 +379,14 @@ var unstable_RouterContextProvider = class {
       }
     }
   }
+  /**
+   * Access a value from the context. If no value has been set for the
+   * context, it will return the context's `defaultValue` if provided, or throw an
+   * error if no `defaultValue` was set.
+   * @param context The context to get the value for
+   * @returns The value for the context, or the contexts `defaultValue` if no
+   * value was set
+   */
   get(context) {
     if (__privateGet(this, _map).has(context)) {
       return __privateGet(this, _map).get(context);
@@ -384,6 +396,14 @@ var unstable_RouterContextProvider = class {
     }
     throw new Error("No value found for context");
   }
+  /**
+   * Set a value for the context. If the context already has a value set,
+   * this will overwrite it.
+   *
+   * @param context The context to set the value for
+   * @param value The value to set for the context
+   * @returns {void}
+   */
   set(context, value) {
     __privateGet(this, _map).set(context, value);
   }
@@ -1702,7 +1722,7 @@ function createRouter(init) {
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
-    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && revalidatingFetchers.length === 0) {
+    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
         location,
@@ -2707,20 +2727,13 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_stream: stream,
-    unstable_respond: respond
+    unstable_generateMiddlewareResponse: generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
-    let shortCircuitResult = (ctx) => {
-      return stream ? stream(
-        requestContext,
-        () => Promise.resolve(ctx)
-      ) : respond ? respond(ctx) : ctx;
-    };
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2737,7 +2750,7 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return shortCircuitResult(staticContext);
+      return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
     } else if (!matches) {
       let error = getInternalRouterError(404, { pathname: location.pathname });
       let { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2754,11 +2767,9 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return shortCircuitResult(staticContext);
+      return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
     }
-    if (stream || respond && matches.some(
-      (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
-    )) {
+    if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
         "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
@@ -2781,43 +2792,26 @@ function createStaticHandler(routes, opts) {
           },
           true,
           async () => {
-            if (stream) {
-              let res2 = await stream(
-                requestContext,
-                async (revalidationRequest) => {
-                  let result3 = await queryImpl(
-                    revalidationRequest,
-                    location,
-                    matches,
-                    requestContext,
-                    dataStrategy || null,
-                    skipLoaderErrorBubbling === true,
-                    null,
-                    filterMatchesToLoad || null,
-                    skipRevalidation === true
-                  );
-                  return isResponse(result3) ? result3 : { location, basename, ...result3 };
+            let res = await generateMiddlewareResponse(
+              async (revalidationRequest) => {
+                let result2 = await queryImpl(
+                  revalidationRequest,
+                  location,
+                  matches,
+                  requestContext,
+                  dataStrategy || null,
+                  skipLoaderErrorBubbling === true,
+                  null,
+                  filterMatchesToLoad || null,
+                  skipRevalidation === true
+                );
+                if (isResponse(result2)) {
+                  return result2;
                 }
-              );
-              return res2;
-            }
-            invariant(respond, "Expected respond to be defined");
-            let result2 = await queryImpl(
-              request,
-              location,
-              matches,
-              requestContext,
-              dataStrategy || null,
-              skipLoaderErrorBubbling === true,
-              null,
-              filterMatchesToLoad || null,
-              skipRevalidation === true
+                renderedStaticContext = { location, basename, ...result2 };
+                return renderedStaticContext;
+              }
             );
-            if (isResponse(result2)) {
-              return result2;
-            }
-            renderedStaticContext = { location, basename, ...result2 };
-            let res = await respond(renderedStaticContext);
             return res;
           },
           async (error, routeId) => {
@@ -2834,7 +2828,9 @@ function createStaticHandler(routes, opts) {
                 error,
                 skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, routeId).route.id
               );
-              return stream ? stream(requestContext, () => Promise.resolve(staticContext)) : respond(staticContext);
+              return generateMiddlewareResponse(
+                () => Promise.resolve(staticContext)
+              );
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
@@ -2855,7 +2851,9 @@ function createStaticHandler(routes, opts) {
                 actionHeaders: {},
                 loaderHeaders: {}
               };
-              return stream ? stream(requestContext, () => Promise.resolve(staticContext)) : respond(staticContext);
+              return generateMiddlewareResponse(
+                () => Promise.resolve(staticContext)
+              );
             }
           }
         );
@@ -2888,8 +2886,7 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_respond: respond,
-    unstable_stream: stream
+    unstable_generateMiddlewareResponse: generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
@@ -2910,9 +2907,7 @@ function createStaticHandler(routes, opts) {
     } else if (!match) {
       throw getInternalRouterError(404, { pathname: location.pathname });
     }
-    if (stream || respond && matches.some(
-      (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
-    )) {
+    if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
         "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
@@ -2929,63 +2924,30 @@ function createStaticHandler(routes, opts) {
         },
         true,
         async () => {
-          if (stream) {
-            let res = await stream(
-              requestContext,
-              async (revalidationRequest) => {
-                let result3 = await queryImpl(
-                  revalidationRequest,
-                  location,
-                  matches,
-                  requestContext,
-                  dataStrategy || null,
-                  false,
-                  match,
-                  null,
-                  false
-                );
-                if (isResponse(result3)) {
-                  return result3;
-                }
-                let error3 = result3.errors ? Object.values(result3.errors)[0] : void 0;
-                if (error3 !== void 0) {
-                  throw error3;
-                }
-                let value2 = result3.actionData ? Object.values(result3.actionData)[0] : Object.values(result3.loaderData)[0];
-                return typeof value2 === "string" ? new Response(value2) : Response.json(value2);
-              }
-            );
-            return res;
-          }
-          invariant(respond, "Expected respond to be defined");
-          let result2 = await queryImpl(
-            request,
-            location,
-            matches,
-            requestContext,
-            dataStrategy || null,
-            false,
-            match,
-            null,
-            false
-          );
-          if (isResponse(result2)) {
-            return respond(result2);
-          }
-          let error2 = result2.errors ? Object.values(result2.errors)[0] : void 0;
-          if (error2 !== void 0) {
-            throw error2;
-          }
-          let value = result2.actionData ? Object.values(result2.actionData)[0] : Object.values(result2.loaderData)[0];
-          return respond(
-            typeof value === "string" ? new Response(value) : Response.json(value)
+          let res = await generateMiddlewareResponse(
+            async (innerRequest) => {
+              let result2 = await queryImpl(
+                innerRequest,
+                location,
+                matches,
+                requestContext,
+                dataStrategy || null,
+                false,
+                match,
+                null,
+                false
+              );
+              let processed = handleQueryResult(result2);
+              return isResponse(processed) ? processed : typeof processed === "string" ? new Response(processed) : Response.json(processed);
+            }
           );
+          return res;
         },
-        (error2) => {
-          if (isResponse(error2)) {
-            return respond ? respond(error2) : error2;
+        (error) => {
+          if (isResponse(error)) {
+            return error;
           }
-          throw error2;
+          throw error;
         }
       );
       return response;
@@ -3001,20 +2963,23 @@ function createStaticHandler(routes, opts) {
       null,
       false
     );
-    if (isResponse(result)) {
-      return result;
-    }
-    let error = result.errors ? Object.values(result.errors)[0] : void 0;
-    if (error !== void 0) {
-      throw error;
-    }
-    if (result.actionData) {
-      return Object.values(result.actionData)[0];
-    }
-    if (result.loaderData) {
-      return Object.values(result.loaderData)[0];
+    return handleQueryResult(result);
+    function handleQueryResult(result2) {
+      if (isResponse(result2)) {
+        return result2;
+      }
+      let error = result2.errors ? Object.values(result2.errors)[0] : void 0;
+      if (error !== void 0) {
+        throw error;
+      }
+      if (result2.actionData) {
+        return Object.values(result2.actionData)[0];
+      }
+      if (result2.loaderData) {
+        return Object.values(result2.loaderData)[0];
+      }
+      return void 0;
     }
-    return void 0;
   }
   async function queryImpl(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(
@@ -8902,7 +8867,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-2a6c7bc";
+    "0.0.0-experimental-e89ad3012";
   }
 } catch (e) {
 }

package/dist/development/{chunk-JRLTRGBE.js → chunk-JJHCVRDZ.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v0.0.0-experimental-2a6c7bc
+ * react-router v0.0.0-experimental-e89ad3012
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -367,6 +367,10 @@ function unstable_createContext(defaultValue) {
 }
 var _map;
 var unstable_RouterContextProvider = class {
+  /**
+   * Create a new `unstable_RouterContextProvider` instance
+   * @param init An optional initial context map to populate the provider with
+   */
   constructor(init) {
     __privateAdd(this, _map, /* @__PURE__ */ new Map());
     if (init) {
@@ -375,6 +379,14 @@ var unstable_RouterContextProvider = class {
       }
     }
   }
+  /**
+   * Access a value from the context. If no value has been set for the
+   * context, it will return the context's `defaultValue` if provided, or throw an
+   * error if no `defaultValue` was set.
+   * @param context The context to get the value for
+   * @returns The value for the context, or the contexts `defaultValue` if no
+   * value was set
+   */
   get(context) {
     if (__privateGet(this, _map).has(context)) {
       return __privateGet(this, _map).get(context);
@@ -384,6 +396,14 @@ var unstable_RouterContextProvider = class {
     }
     throw new Error("No value found for context");
   }
+  /**
+   * Set a value for the context. If the context already has a value set,
+   * this will overwrite it.
+   *
+   * @param context The context to set the value for
+   * @param value The value to set for the context
+   * @returns {void}
+   */
   set(context, value) {
     __privateGet(this, _map).set(context, value);
   }
@@ -1702,7 +1722,7 @@ function createRouter(init) {
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
-    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && revalidatingFetchers.length === 0) {
+    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
         location,
@@ -2707,20 +2727,13 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_stream: stream,
-    unstable_respond: respond
+    unstable_generateMiddlewareResponse: generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
-    let shortCircuitResult = (ctx) => {
-      return stream ? stream(
-        requestContext,
-        () => Promise.resolve(ctx)
-      ) : respond ? respond(ctx) : ctx;
-    };
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2737,7 +2750,7 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return shortCircuitResult(staticContext);
+      return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
     } else if (!matches) {
       let error = getInternalRouterError(404, { pathname: location.pathname });
       let { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2754,11 +2767,9 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return shortCircuitResult(staticContext);
+      return generateMiddlewareResponse ? generateMiddlewareResponse(() => Promise.resolve(staticContext)) : staticContext;
     }
-    if (stream || respond && matches.some(
-      (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
-    )) {
+    if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
         "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
@@ -2781,43 +2792,26 @@ function createStaticHandler(routes, opts) {
           },
           true,
           async () => {
-            if (stream) {
-              let res2 = await stream(
-                requestContext,
-                async (revalidationRequest) => {
-                  let result3 = await queryImpl(
-                    revalidationRequest,
-                    location,
-                    matches,
-                    requestContext,
-                    dataStrategy || null,
-                    skipLoaderErrorBubbling === true,
-                    null,
-                    filterMatchesToLoad || null,
-                    skipRevalidation === true
-                  );
-                  return isResponse(result3) ? result3 : { location, basename, ...result3 };
+            let res = await generateMiddlewareResponse(
+              async (revalidationRequest) => {
+                let result2 = await queryImpl(
+                  revalidationRequest,
+                  location,
+                  matches,
+                  requestContext,
+                  dataStrategy || null,
+                  skipLoaderErrorBubbling === true,
+                  null,
+                  filterMatchesToLoad || null,
+                  skipRevalidation === true
+                );
+                if (isResponse(result2)) {
+                  return result2;
                 }
-              );
-              return res2;
-            }
-            invariant(respond, "Expected respond to be defined");
-            let result2 = await queryImpl(
-              request,
-              location,
-              matches,
-              requestContext,
-              dataStrategy || null,
-              skipLoaderErrorBubbling === true,
-              null,
-              filterMatchesToLoad || null,
-              skipRevalidation === true
+                renderedStaticContext = { location, basename, ...result2 };
+                return renderedStaticContext;
+              }
             );
-            if (isResponse(result2)) {
-              return result2;
-            }
-            renderedStaticContext = { location, basename, ...result2 };
-            let res = await respond(renderedStaticContext);
             return res;
           },
           async (error, routeId) => {
@@ -2834,7 +2828,9 @@ function createStaticHandler(routes, opts) {
                 error,
                 skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, routeId).route.id
               );
-              return stream ? stream(requestContext, () => Promise.resolve(staticContext)) : respond(staticContext);
+              return generateMiddlewareResponse(
+                () => Promise.resolve(staticContext)
+              );
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
@@ -2855,7 +2851,9 @@ function createStaticHandler(routes, opts) {
                 actionHeaders: {},
                 loaderHeaders: {}
               };
-              return stream ? stream(requestContext, () => Promise.resolve(staticContext)) : respond(staticContext);
+              return generateMiddlewareResponse(
+                () => Promise.resolve(staticContext)
+              );
             }
           }
         );
@@ -2888,8 +2886,7 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_respond: respond,
-    unstable_stream: stream
+    unstable_generateMiddlewareResponse: generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
@@ -2910,9 +2907,7 @@ function createStaticHandler(routes, opts) {
     } else if (!match) {
       throw getInternalRouterError(404, { pathname: location.pathname });
     }
-    if (stream || respond && matches.some(
-      (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
-    )) {
+    if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
         "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
@@ -2929,63 +2924,30 @@ function createStaticHandler(routes, opts) {
         },
         true,
         async () => {
-          if (stream) {
-            let res = await stream(
-              requestContext,
-              async (revalidationRequest) => {
-                let result3 = await queryImpl(
-                  revalidationRequest,
-                  location,
-                  matches,
-                  requestContext,
-                  dataStrategy || null,
-                  false,
-                  match,
-                  null,
-                  false
-                );
-                if (isResponse(result3)) {
-                  return result3;
-                }
-                let error3 = result3.errors ? Object.values(result3.errors)[0] : void 0;
-                if (error3 !== void 0) {
-                  throw error3;
-                }
-                let value2 = result3.actionData ? Object.values(result3.actionData)[0] : Object.values(result3.loaderData)[0];
-                return typeof value2 === "string" ? new Response(value2) : Response.json(value2);
-              }
-            );
-            return res;
-          }
-          invariant(respond, "Expected respond to be defined");
-          let result2 = await queryImpl(
-            request,
-            location,
-            matches,
-            requestContext,
-            dataStrategy || null,
-            false,
-            match,
-            null,
-            false
-          );
-          if (isResponse(result2)) {
-            return respond(result2);
-          }
-          let error2 = result2.errors ? Object.values(result2.errors)[0] : void 0;
-          if (error2 !== void 0) {
-            throw error2;
-          }
-          let value = result2.actionData ? Object.values(result2.actionData)[0] : Object.values(result2.loaderData)[0];
-          return respond(
-            typeof value === "string" ? new Response(value) : Response.json(value)
+          let res = await generateMiddlewareResponse(
+            async (innerRequest) => {
+              let result2 = await queryImpl(
+                innerRequest,
+                location,
+                matches,
+                requestContext,
+                dataStrategy || null,
+                false,
+                match,
+                null,
+                false
+              );
+              let processed = handleQueryResult(result2);
+              return isResponse(processed) ? processed : typeof processed === "string" ? new Response(processed) : Response.json(processed);
+            }
           );
+          return res;
         },
-        (error2) => {
-          if (isResponse(error2)) {
-            return respond ? respond(error2) : error2;
+        (error) => {
+          if (isResponse(error)) {
+            return error;
           }
-          throw error2;
+          throw error;
         }
       );
       return response;
@@ -3001,20 +2963,23 @@ function createStaticHandler(routes, opts) {
       null,
       false
     );
-    if (isResponse(result)) {
-      return result;
-    }
-    let error = result.errors ? Object.values(result.errors)[0] : void 0;
-    if (error !== void 0) {
-      throw error;
-    }
-    if (result.actionData) {
-      return Object.values(result.actionData)[0];
-    }
-    if (result.loaderData) {
-      return Object.values(result.loaderData)[0];
+    return handleQueryResult(result);
+    function handleQueryResult(result2) {
+      if (isResponse(result2)) {
+        return result2;
+      }
+      let error = result2.errors ? Object.values(result2.errors)[0] : void 0;
+      if (error !== void 0) {
+        throw error;
+      }
+      if (result2.actionData) {
+        return Object.values(result2.actionData)[0];
+      }
+      if (result2.loaderData) {
+        return Object.values(result2.loaderData)[0];
+      }
+      return void 0;
     }
-    return void 0;
   }
   async function queryImpl(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(