@remix-run/router 0.0.0-experimental-a0888892 → 0.0.0-experimental-acfea932

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-a0888892
+ * @remix-run/router v0.0.0-experimental-acfea932
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3328,9 +3328,15 @@ function createStaticHandler(routes, opts) {
    * redirect response is returned or thrown from any action/loader.  We
    * propagate that out and return the raw Response so the HTTP server can
    * return it directly.
+   *
+   * - `opts.loadRouteIds` is an optional array of routeIds if you wish to only
+   *    run a subset of route loaders on a GET request
+   * - `opts.requestContext` is an optional server context that will be passed
+   *    to actions/loaders in the `context` parameter
    */
   async function query(request, _temp3) {
     let {
+      loadRouteIds,
       requestContext
     } = _temp3 === void 0 ? {} : _temp3;
     let url = new URL(request.url);
@@ -3384,7 +3390,7 @@ function createStaticHandler(routes, opts) {
         activeDeferreds: null
       };
     }
-    let result = await queryImpl(request, location, matches, requestContext);
+    let result = await queryImpl(request, location, matches, requestContext, loadRouteIds || null, null);
     if (isResponse(result)) {
       return result;
     }
@@ -3417,6 +3423,12 @@ function createStaticHandler(routes, opts) {
    * serialize the error as they see fit while including the proper response
    * code.  Examples here are 404 and 405 errors that occur prior to reaching
    * any user-defined loaders.
+   *
+   * - `opts.routeId` allows you to specify the specific route handler to call.
+   *   If not provided the handler will determine the proper route by matching
+   *   against `request.url`
+   * - `opts.requestContext` is an optional server context that will be passed
+   *    to actions/loaders in the `context` parameter
    */
   async function queryRoute(request, _temp4) {
     let {
@@ -3450,7 +3462,7 @@ function createStaticHandler(routes, opts) {
         pathname: location.pathname
       });
     }
-    let result = await queryImpl(request, location, matches, requestContext, match);
+    let result = await queryImpl(request, location, matches, requestContext, null, match);
     if (isResponse(result)) {
       return result;
     }
@@ -3477,14 +3489,14 @@ function createStaticHandler(routes, opts) {
     }
     return undefined;
   }
-  async function queryImpl(request, location, matches, requestContext, routeMatch) {
+  async function queryImpl(request, location, matches, requestContext, loadRouteIds, routeMatch) {
     invariant(request.signal, "query()/queryRoute() requests must contain an AbortController signal");
     try {
       if (isMutationMethod(request.method.toLowerCase())) {
-        let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), requestContext, routeMatch != null);
+        let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), requestContext, loadRouteIds, routeMatch != null);
         return result;
       }
-      let result = await loadRouteData(request, matches, requestContext, routeMatch);
+      let result = await loadRouteData(request, matches, requestContext, loadRouteIds, routeMatch);
       return isResponse(result) ? result : _extends({}, result, {
         actionData: null,
         actionHeaders: {}
@@ -3507,7 +3519,7 @@ function createStaticHandler(routes, opts) {
       throw e;
     }
   }
-  async function submit(request, matches, actionMatch, requestContext, isRouteRequest) {
+  async function submit(request, matches, actionMatch, requestContext, loadRouteIds, isRouteRequest) {
     let result;
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       let error = getInternalRouterError(405, {
@@ -3574,11 +3586,18 @@ function createStaticHandler(routes, opts) {
         activeDeferreds: null
       };
     }
+
+    // Create a GET request for the loaders
+    let loaderRequest = new Request(request.url, {
+      headers: request.headers,
+      redirect: request.redirect,
+      signal: request.signal
+    });
     if (isErrorResult(result)) {
       // Store off the pending error - we use it to determine which loaders
       // to call and will commit it when we complete the navigation
       let boundaryMatch = findNearestBoundary(matches, actionMatch.route.id);
-      let context = await loadRouteData(request, matches, requestContext, undefined, {
+      let context = await loadRouteData(loaderRequest, matches, requestContext, loadRouteIds, null, {
         [boundaryMatch.route.id]: result.error
       });
 
@@ -3591,14 +3610,7 @@ function createStaticHandler(routes, opts) {
         } : {})
       });
     }
-
-    // Create a GET request for the loaders
-    let loaderRequest = new Request(request.url, {
-      headers: request.headers,
-      redirect: request.redirect,
-      signal: request.signal
-    });
-    let context = await loadRouteData(loaderRequest, matches, requestContext);
+    let context = await loadRouteData(loaderRequest, matches, requestContext, loadRouteIds, null);
     return _extends({}, context, {
       actionData: {
         [actionMatch.route.id]: result.data
@@ -3612,7 +3624,7 @@ function createStaticHandler(routes, opts) {
       actionHeaders: {}
     });
   }
-  async function loadRouteData(request, matches, requestContext, routeMatch, pendingActionError) {
+  async function loadRouteData(request, matches, requestContext, loadRouteIds, routeMatch, pendingActionError) {
     let isRouteRequest = routeMatch != null;
 
     // Short circuit if we have no loaders to run (queryRoute())
@@ -3625,6 +3637,9 @@ function createStaticHandler(routes, opts) {
     }
     let requestMatches = routeMatch ? [routeMatch] : getLoaderMatchesUntilBoundary(matches, Object.keys(pendingActionError || {})[0]);
     let matchesToLoad = requestMatches.filter(m => m.route.loader || m.route.lazy);
+    if (loadRouteIds) {
+      matchesToLoad = matchesToLoad.filter(m => loadRouteIds.includes(m.route.id));
+    }
 
     // Short circuit if we have no loaders to run (query())
     if (matchesToLoad.length === 0) {
@@ -4129,13 +4144,14 @@ async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLo
   // back out below.
   let results = await dataStrategyImpl({
     matches: matches.map(match => {
+      let bikeshed_load = routeIdsToLoad.has(match.route.id);
       // `bikeshed_loadRoute` encapsulates the route.lazy, executing the
       // loader/action, and mapping return values/thrown errors to a
       // HandlerResult.  Users can pass a callback to take fine-grained control
       // over the execution of the loader/action
       let bikeshed_loadRoute = handlerOverride => {
         loadedMatches.add(match.route.id);
-        return routeIdsToLoad.has(match.route.id) ? callLoaderOrAction(type, request, match, manifest, mapRouteProperties, handlerOverride, requestContext) :
+        return bikeshed_load ? callLoaderOrAction(type, request, match, manifest, mapRouteProperties, handlerOverride, requestContext) :
         // TODO: What's the best thing to do here - return an empty "success" result?
         // Or return a success result with the current route loader/action data?
         // We strip these results out if the route didn't need to be revalidated in
@@ -4147,6 +4163,7 @@ async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLo
         });
       };
       return _extends({}, match, {
+        bikeshed_load,
         bikeshed_loadRoute
       });
     }),