@remix-run/router 0.0.0-experimental-d90c8fb3 → 0.0.0-experimental-e7ce8959

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-d90c8fb3
+ * @remix-run/router v0.0.0-experimental-e7ce8959
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -754,14 +754,14 @@
     rankRouteBranches(branches);
     let matches = null;
     for (let i = 0; matches == null && i < branches.length; ++i) {
+      matches = matchRouteBranch(branches[i],
       // Incoming pathnames are generally encoded from either window.location
       // or from router.navigate, but we want to match against the unencoded
       // paths in the route definitions.  Memory router locations won't be
       // encoded here but there also shouldn't be anything to decode so this
       // should be a safe operation.  This avoids needing matchRoutes to be
       // history-aware.
-      let decoded = decodePath(pathname);
-      matches = matchRouteBranch(branches[i], decoded);
+      safelyDecodeURI(pathname));
     }
     return matches;
   }
@@ -1040,7 +1040,7 @@
       if (isOptional && !value) {
         memo[paramName] = undefined;
       } else {
-        memo[paramName] = (value || "").replace(/%2F/g, "/");
+        memo[paramName] = safelyDecodeURIComponent(value || "", paramName);
       }
       return memo;
     }, {});
@@ -1092,14 +1092,22 @@
     let matcher = new RegExp(regexpSource, caseSensitive ? undefined : "i");
     return [matcher, params];
   }
-  function decodePath(value) {
+  function safelyDecodeURI(value) {
     try {
-      return value.split("/").map(v => decodeURIComponent(v).replace(/\//g, "%2F")).join("/");
+      return decodeURI(value);
     } catch (error) {
       warning(false, "The URL path \"" + value + "\" could not be decoded because it is is a " + "malformed URL segment. This is probably due to a bad percent " + ("encoding (" + error + ")."));
       return value;
     }
   }
+  function safelyDecodeURIComponent(value, paramName) {
+    try {
+      return decodeURIComponent(value);
+    } catch (error) {
+      warning(false, "The value for the URL param \"" + paramName + "\" will not be decoded because" + (" the string \"" + value + "\" is a malformed URL segment. This is probably") + (" due to a bad percent encoding (" + error + ")."));
+      return value;
+    }
+  }
 
   /**
    * @private
@@ -3269,7 +3277,8 @@
     }
     // Config driven behavior flags
     let future = _extends({
-      v7_relativeSplatPath: false
+      v7_relativeSplatPath: false,
+      v7_throwAbortReason: false
     }, opts ? opts.future : null);
     let dataRoutes = convertRoutesToDataRoutes(routes, mapRouteProperties, undefined, manifest);
 
@@ -3492,8 +3501,7 @@
           requestContext
         });
         if (request.signal.aborted) {
-          let method = isRouteRequest ? "queryRoute" : "query";
-          throw new Error(method + "() call aborted: " + request.method + " " + request.url);
+          throwStaticHandlerAbortedError(request, isRouteRequest, future);
         }
       }
       if (isRedirectResult(result)) {
@@ -3611,8 +3619,7 @@
         requestContext
       }))]);
       if (request.signal.aborted) {
-        let method = isRouteRequest ? "queryRoute" : "query";
-        throw new Error(method + "() call aborted: " + request.method + " " + request.url);
+        throwStaticHandlerAbortedError(request, isRouteRequest, future);
       }
 
       // Process and commit output from loaders
@@ -3657,6 +3664,13 @@
     });
     return newContext;
   }
+  function throwStaticHandlerAbortedError(request, isRouteRequest, future) {
+    if (future.v7_throwAbortReason && request.signal.reason !== undefined) {
+      throw request.signal.reason;
+    }
+    let method = isRouteRequest ? "queryRoute" : "query";
+    throw new Error(method + "() call aborted: " + request.method + " " + request.url);
+  }
   function isSubmissionNavigation(opts) {
     return opts != null && ("formData" in opts && opts.formData != null || "body" in opts && opts.body !== undefined);
   }