@remix-run/router 1.10.0-pre.0 → 1.11.0-pre.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.10.0-pre.0
+ * @remix-run/router v1.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1019,20 +1019,29 @@
         end: true
       };
     }
-    let [matcher, paramNames] = compilePath(pattern.path, pattern.caseSensitive, pattern.end);
+    let [matcher, compiledParams] = compilePath(pattern.path, pattern.caseSensitive, pattern.end);
     let match = pathname.match(matcher);
     if (!match) return null;
     let matchedPathname = match[0];
     let pathnameBase = matchedPathname.replace(/(.)\/+$/, "$1");
     let captureGroups = match.slice(1);
-    let params = paramNames.reduce((memo, paramName, index) => {
+    let params = compiledParams.reduce((memo, _ref, index) => {
+      let {
+        paramName,
+        isOptional
+      } = _ref;
       // We need to compute the pathnameBase here using the raw splat value
       // instead of using params["*"] later because it will be decoded then
       if (paramName === "*") {
         let splatValue = captureGroups[index] || "";
         pathnameBase = matchedPathname.slice(0, matchedPathname.length - splatValue.length).replace(/(.)\/+$/, "$1");
       }
-      memo[paramName] = safelyDecodeURIComponent(captureGroups[index] || "", paramName);
+      const value = captureGroups[index];
+      if (isOptional && !value) {
+        memo[paramName] = undefined;
+      } else {
+        memo[paramName] = safelyDecodeURIComponent(value || "", paramName);
+      }
       return memo;
     }, {});
     return {
@@ -1050,16 +1059,21 @@
       end = true;
     }
     warning(path === "*" || !path.endsWith("*") || path.endsWith("/*"), "Route path \"" + path + "\" will be treated as if it were " + ("\"" + path.replace(/\*$/, "/*") + "\" because the `*` character must ") + "always follow a `/` in the pattern. To get rid of this warning, " + ("please change the route path to \"" + path.replace(/\*$/, "/*") + "\"."));
-    let paramNames = [];
+    let params = [];
     let regexpSource = "^" + path.replace(/\/*\*?$/, "") // Ignore trailing / and /*, we'll handle it below
     .replace(/^\/*/, "/") // Make sure it has a leading /
-    .replace(/[\\.*+^$?{}|()[\]]/g, "\\$&") // Escape special regex chars
-    .replace(/\/:(\w+)/g, (_, paramName) => {
-      paramNames.push(paramName);
-      return "/([^\\/]+)";
+    .replace(/[\\.*+^${}|()[\]]/g, "\\$&") // Escape special regex chars
+    .replace(/\/:(\w+)(\?)?/g, (_, paramName, isOptional) => {
+      params.push({
+        paramName,
+        isOptional: isOptional != null
+      });
+      return isOptional ? "/?([^\\/]+)?" : "/([^\\/]+)";
     });
     if (path.endsWith("*")) {
-      paramNames.push("*");
+      params.push({
+        paramName: "*"
+      });
       regexpSource += path === "*" || path === "/*" ? "(.*)$" // Already matched the initial /, just match the rest
       : "(?:\\/(.+)|\\/*)$"; // Don't include the / in params["*"]
     } else if (end) {
@@ -1076,7 +1090,7 @@
       regexpSource += "(?:(?=\\/|$))";
     } else ;
     let matcher = new RegExp(regexpSource, caseSensitive ? undefined : "i");
-    return [matcher, paramNames];
+    return [matcher, params];
   }
   function safelyDecodeURI(value) {
     try {
@@ -1304,8 +1318,8 @@
       let onAbort = () => reject(new AbortedDeferredError("Deferred data aborted"));
       this.unlistenAbortSignal = () => this.controller.signal.removeEventListener("abort", onAbort);
       this.controller.signal.addEventListener("abort", onAbort);
-      this.data = Object.entries(data).reduce((acc, _ref) => {
-        let [key, value] = _ref;
+      this.data = Object.entries(data).reduce((acc, _ref2) => {
+        let [key, value] = _ref2;
         return Object.assign(acc, {
           [key]: this.trackPromise(key, value)
         });
@@ -1405,8 +1419,8 @@
     }
     get unwrappedData() {
       invariant(this.data !== null && this.done, "Can only unwrap data on initialized and settled deferreds");
-      return Object.entries(this.data).reduce((acc, _ref2) => {
-        let [key, value] = _ref2;
+      return Object.entries(this.data).reduce((acc, _ref3) => {
+        let [key, value] = _ref3;
         return Object.assign(acc, {
           [key]: unwrapTrackedPromise(value)
         });
@@ -1651,6 +1665,7 @@
     let basename = init.basename || "/";
     // Config driven behavior flags
     let future = _extends({
+      v7_fetcherPersist: false,
       v7_normalizeFormMethod: false,
       v7_prependBasename: false
     }, init.future);
@@ -1770,6 +1785,10 @@
     // Most recent href/match for fetcher.load calls for fetchers
     let fetchLoadMatches = new Map();
 
+    // Fetchers that have requested a delete when using v7_fetcherPersist,
+    // they'll be officially removed after they return to idle
+    let deletedFetchers = new Set();
+
     // Store DeferredData instances for active route matches.  When a
     // route loader returns defer() we stick one in here.  Then, when a nested
     // promise resolves we update loaderData.  If a new navigation starts we
@@ -1885,6 +1904,24 @@
       subscribers.forEach(subscriber => subscriber(state, {
         unstable_viewTransitionOpts: viewTransitionOpts
       }));
+
+      // Remove idle fetchers from state since we only care about in-flight fetchers.
+      if (future.v7_fetcherPersist) {
+        state.fetchers.forEach((fetcher, key) => {
+          if (fetcher.state === "idle") {
+            if (deletedFetchers.has(key)) {
+              // If the fetcher has unmounted and called router.deleteFetcher(),
+              // we can totally delete the fetcher
+              deleteFetcher(key);
+            } else {
+              // Otherwise, it must still be mounted in the UI so we just remove
+              // it from state now that we've handed off the data to the React
+              // layer.  Things such as fetchLoadMatches remain for revalidation.
+              state.fetchers.delete(key);
+            }
+          }
+        });
+      }
     }
 
     // Complete a navigation returning the state.navigation back to the IDLE_NAVIGATION
@@ -2626,7 +2663,7 @@
         let doneFetcher = getDoneFetcher(actionResult.data);
         state.fetchers.set(key, doneFetcher);
       }
-      let didAbortFetchLoads = abortStaleFetchLoads(loadId);
+      abortStaleFetchLoads(loadId);
 
       // If we are currently in a navigation loading state and this fetcher is
       // more recent than the navigation, we want the newer data so abort the
@@ -2644,12 +2681,11 @@
         // otherwise just update with the fetcher data, preserving any existing
         // loaderData for loaders that did not need to reload.  We have to
         // manually merge here since we aren't going through completeNavigation
-        updateState(_extends({
+        updateState({
           errors,
-          loaderData: mergeLoaderData(state.loaderData, loaderData, matches, errors)
-        }, didAbortFetchLoads || revalidatingFetchers.length > 0 ? {
+          loaderData: mergeLoaderData(state.loaderData, loaderData, matches, errors),
           fetchers: new Map(state.fetchers)
-        } : {}));
+        });
         isRevalidationRequired = false;
       }
     }
@@ -2890,8 +2926,19 @@
       fetchLoadMatches.delete(key);
       fetchReloadIds.delete(key);
       fetchRedirectIds.delete(key);
+      deletedFetchers.delete(key);
       state.fetchers.delete(key);
     }
+    function deleteFetcherAndUpdateState(key) {
+      if (future.v7_fetcherPersist) {
+        deletedFetchers.add(key);
+      } else {
+        deleteFetcher(key);
+      }
+      updateState({
+        fetchers: new Map(state.fetchers)
+      });
+    }
     function abortFetcher(key) {
       let controller = fetchControllers.get(key);
       invariant(controller, "Expected fetch controller: " + key);
@@ -3086,7 +3133,7 @@
       createHref: to => init.history.createHref(to),
       encodeLocation: to => init.history.encodeLocation(to),
       getFetcher,
-      deleteFetcher,
+      deleteFetcher: deleteFetcherAndUpdateState,
       dispose,
       getBlocker,
       deleteBlocker,