@sifxprime/krouter 0.5.166 → 0.5.168

package/app/node_modules/next/dist/client/components/router-reducer/reducers/refresh-reducer.js

@@ -21,10 +21,11 @@ _export(exports, {
     }
 });
 const _routerreducertypes = require("../router-reducer-types");
-const _navigation = require("../../segment-cache/navigation");
+const _approuterstate = require("../../app-router-state");
+const _decodeserverresponse = require("../../segment-cache/decode-server-response");
 const _cache = require("../../segment-cache/cache");
 const _hasinterceptionrouteincurrenttree = require("./has-interception-route-in-current-tree");
-const _pprnavigations = require("../ppr-navigations");
+const _rendertree = require("../../render-tree");
 const _bfcache = require("../../segment-cache/bfcache");
 function refreshReducer(state, action) {
     // During a refresh, we invalidate the segment cache but not the route cache.
@@ -38,11 +39,11 @@ function refreshReducer(state, action) {
     const bypassCacheInvalidation = process.env.__NEXT_EXPOSE_TESTING_API && action.bypassCacheInvalidation;
     if (!bypassCacheInvalidation) {
         const currentNextUrl = state.nextUrl;
-        const currentRouterState = state.tree;
-        (0, _cache.invalidateSegmentCacheEntries)(currentNextUrl, currentRouterState);
+        const currentRoot = state.root;
+        (0, _cache.invalidateSegmentCacheEntries)(currentNextUrl, currentRoot);
     }
     // A full refresh has no HMR generation to cancel.
-    return refreshDynamicData(state, _pprnavigations.FreshnessPolicy.RefreshAll, undefined);
+    return refreshDynamicData(state, _rendertree.FreshnessPolicy.RefreshAll, undefined);
 }
 function refreshDynamicData(state, freshnessPolicy, signal) {
     // During a refresh, invalidate the BFCache, which may contain dynamic data.
@@ -59,7 +60,7 @@ function refreshDynamicData(state, freshnessPolicy, signal) {
     const currentRenderedSearch = state.renderedSearch;
     const currentFlightRouterState = state.tree;
     const scrollBehavior = _routerreducertypes.ScrollBehavior.NoScroll;
-    const navigationLock = (0, _pprnavigations.getCurrentNavigationLock)();
+    const navigationLock = (0, _rendertree.getCurrentNavigationLock)();
     // Create a NavigationSeed from the current FlightRouterState.
     // TODO: Eventually we will store this type directly on the state object
     // instead of reconstructing it on demand. Part of a larger series of
@@ -67,13 +68,15 @@ function refreshDynamicData(state, freshnessPolicy, signal) {
     const now = Date.now();
     // TODO: Store the dynamic stale time on the top-level state so it's known
     // during restores and refreshes.
-    const refreshSeed = (0, _navigation.convertServerPatchToFullTree)(now, currentFlightRouterState, null, currentRenderedSearch, _bfcache.UnknownDynamicStaleTime);
+    const refreshSeed = (0, _decodeserverresponse.createNavigationSeed)(now, currentFlightRouterState, // No transport data (and so no vary params, no partiality, and no
+    // pathname to parse params from) — this converts the base tree alone.
+    null, null, true, null, currentRenderedSearch, null, _bfcache.UnknownDynamicStaleTime);
     // If the previous navigation hasn't pushed its history entry yet (React
     // hasn't committed its state), this refresh may commit in its place, so it
     // takes over the push. If the navigation does commit first, HistoryUpdater
     // sees that the URL already matches and replaces instead.
     const navigateType = state.pushRef.pendingPush ? 'push' : 'replace';
-    return (0, _navigation.navigateToKnownRoute)(now, state, currentUrl, currentCanonicalUrl, refreshSeed, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, freshnessPolicy, nextUrlForRefresh, scrollBehavior, navigateType, navigationLock, // A refresh is bound to the shared map.
+    return (0, _approuterstate.navigateToKnownRoute)(now, state, currentUrl, currentCanonicalUrl, refreshSeed, currentUrl, currentRenderedSearch, state.root, freshnessPolicy, nextUrlForRefresh, scrollBehavior, navigateType, navigationLock, // A refresh is bound to the shared map.
     _cache.segmentCacheMap, null, // Refresh navigations don't use route prediction, so there's no route
     // cache entry to mark as having a dynamic rewrite on mismatch. If a
     // mismatch occurs, the retry handler will traverse the known route tree

package/app/node_modules/next/dist/client/components/router-reducer/reducers/restore-reducer.js

@@ -9,8 +9,9 @@ Object.defineProperty(exports, "restoreReducer", {
     }
 });
 const _computechangedpath = require("../compute-changed-path");
-const _pprnavigations = require("../ppr-navigations");
-const _navigation = require("../../segment-cache/navigation");
+const _rendertree = require("../../render-tree");
+const _approuterstate = require("../../app-router-state");
+const _decodeserverresponse = require("../../segment-cache/decode-server-response");
 const _cache = require("../../segment-cache/cache");
 const _bfcache = require("../../segment-cache/bfcache");
 function restoreReducer(state, action) {
@@ -40,14 +41,16 @@ function restoreReducer(state, action) {
         separateRefreshUrls: null,
         scrollRef: null
     };
-    const restoreSeed = (0, _navigation.convertServerPatchToFullTree)(now, treeToRestore, null, renderedSearch, _bfcache.UnknownDynamicStaleTime);
-    const task = (0, _pprnavigations.startPPRNavigation)(now, currentUrl, state.renderedSearch, state.cache, state.tree, restoreSeed.routeTree, restoreSeed.metadataVaryPath, _pprnavigations.FreshnessPolicy.HistoryTraversal, null, null, restoreSeed.dynamicStaleAt, false, accumulation, // A history-traversal restore is bound to the shared map.
+    const restoreSeed = (0, _decodeserverresponse.createNavigationSeed)(now, treeToRestore, // No transport data (and so no vary params, no partiality, and no
+    // pathname to parse params from) — this converts the base tree alone.
+    null, null, true, null, renderedSearch, null, _bfcache.UnknownDynamicStaleTime);
+    const navigation = (0, _rendertree.startPPRNavigation)(now, currentUrl, state.renderedSearch, state.root, restoreSeed.root, _rendertree.FreshnessPolicy.HistoryTraversal, restoreSeed.dynamicStaleAt, false, accumulation, // A history-traversal restore is bound to the shared map.
     _cache.segmentCacheMap, // A history-traversal restore never restricts to the shell.
     false);
-    if (task === null) {
-        return (0, _navigation.completeHardNavigation)(state, restoredUrl, 'replace');
+    if (navigation === null) {
+        return (0, _approuterstate.completeHardNavigation)(state, restoredUrl, 'replace');
     }
-    (0, _pprnavigations.spawnDynamicRequests)(task, restoredUrl, restoredNextUrl, _pprnavigations.FreshnessPolicy.HistoryTraversal, accumulation, // History traversal doesn't use route prediction, so there's no route
+    (0, _rendertree.spawnDynamicRequests)(navigation, restoredUrl, restoredNextUrl, _rendertree.FreshnessPolicy.HistoryTraversal, accumulation, // History traversal doesn't use route prediction, so there's no route
     // cache entry to mark as having a dynamic rewrite on mismatch. If a
     // mismatch occurs, the retry handler will traverse the known route tree
     // to find and mark the entry.
@@ -62,8 +65,8 @@ function restoreReducer(state, action) {
     // pending scope — releasing any data withheld by prior forward navigations and
     // returning the panel to "awaiting" — without ending the testing session.
     // No-op when the testing API is disabled or no lock is held.
-    (0, _pprnavigations.resetNavigationLockToPending)();
-    return (0, _navigation.completeTraverseNavigation)(state, restoredUrl, renderedSearch, task.node, task.route, restoredNextUrl);
+    (0, _rendertree.resetNavigationLockToPending)();
+    return (0, _approuterstate.completeTraverseNavigation)(state, restoredUrl, renderedSearch, navigation, restoredNextUrl);
 }
 
 if ((typeof exports.default === 'function' || (typeof exports.default === 'object' && exports.default !== null)) && typeof exports.default.__esModule === 'undefined') {

package/app/node_modules/next/dist/client/components/router-reducer/reducers/server-action-reducer.js

@@ -28,11 +28,12 @@ const _scheduler = require("../../segment-cache/scheduler");
 const _deploymentid = require("../../../../shared/lib/deployment-id");
 const _navigationbuildid = require("../../../navigation-build-id");
 const _constants = require("../../../../lib/constants");
-const _navigation = require("../../segment-cache/navigation");
+const _approuterstate = require("../../app-router-state");
+const _decodeserverresponse = require("../../segment-cache/decode-server-response");
 const _optimisticroutes = require("../../segment-cache/optimistic-routes");
 const _actionrevalidationkind = require("../../../../shared/lib/action-revalidation-kind");
 const _approuterutils = require("../../app-router-utils");
-const _pprnavigations = require("../ppr-navigations");
+const _rendertree = require("../../render-tree");
 const _fetchserverresponse = require("../fetch-server-response");
 const _bfcache = require("../../segment-cache/bfcache");
 const createFromFetch = _client.createFromFetch;
@@ -101,11 +102,7 @@ async function fetchServerAction(state, nextUrl, action) {
     // Handle server actions that the server didn't recognize.
     const unrecognizedActionHeader = res.headers.get(_approuterheaders.NEXT_ACTION_NOT_FOUND_HEADER);
     if (unrecognizedActionHeader === '1') {
-        throw Object.defineProperty(new _unrecognizedactionerror.UnrecognizedActionError(`Server Action "${actionId}" was not found on the server. \nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action`), "__NEXT_ERROR_CODE", {
-            value: "E715",
-            enumerable: false,
-            configurable: true
-        });
+        throw new _unrecognizedactionerror.UnrecognizedActionError(`Server Action "${actionId}" was not found on the server. \nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action`);
     }
     const redirectHeader = res.headers.get('x-action-redirect');
     const [location1, _redirectType] = redirectHeader?.split(';') || [];
@@ -141,11 +138,7 @@ async function fetchServerAction(state, nextUrl, action) {
         // The server can respond with a text/plain error message, but we'll fallback to something generic
         // if there isn't one.
         const message = res.status >= 400 && contentType === 'text/plain' ? await res.text() : 'An unexpected response was received from the server.';
-        throw Object.defineProperty(new Error(message), "__NEXT_ERROR_CODE", {
-            value: "E394",
-            enumerable: false,
-            configurable: true
-        });
+        throw new Error(message);
     }
     let actionResult;
     let actionFlightData;
@@ -179,10 +172,12 @@ async function fetchServerAction(state, nextUrl, action) {
         // still be processed, and the absence of flight data will cause an
         // MPA navigation via completeHardNavigation().
         } else {
-            const maybeFlightData = (0, _flightdatahelpers.normalizeFlightData)(response.f);
-            if (maybeFlightData !== '') {
-                actionFlightData = maybeFlightData;
+            if (response.t !== undefined) {
+                actionFlightData = response.t;
                 actionFlightDataRenderedSearch = response.q;
+            } else if (response.n !== undefined) {
+                // The server responded with an MPA navigation URL.
+                actionFlightData = response.n;
             }
         }
     } else {
@@ -231,7 +226,7 @@ function serverActionReducer(state, action) {
             // invalidate both caches until we have a way to detect cookie
             // mutations on the client.
             if (revalidationKind === _actionrevalidationkind.ActionDidRevalidateStaticAndDynamic) {
-                (0, _cache.invalidateEntirePrefetchCache)(nextUrl, state.tree);
+                (0, _cache.invalidateEntirePrefetchCache)(nextUrl, state.root);
             }
             // Start a cooldown before re-prefetching to allow CDN cache
             // propagation.
@@ -250,7 +245,7 @@ function serverActionReducer(state, action) {
                 const redirectHref = redirectLocation.href;
                 const redirectError = createRedirectErrorForAction(redirectHref, navigateType);
                 reject(redirectError);
-                return (0, _navigation.completeHardNavigation)(state, redirectLocation, navigateType);
+                return (0, _approuterstate.completeHardNavigation)(state, redirectLocation, navigateType);
             } else {
                 // Internal redirect. Triggers an SPA navigation.
                 const redirectWithBasepath = (0, _createhreffromurl.createHrefFromUrl)(redirectLocation, false);
@@ -276,12 +271,12 @@ function serverActionReducer(state, action) {
             // an external redirect.
             // TODO: We should refactor the action response type to be more explicit
             // about the various response types.
-            return (0, _navigation.completeHardNavigation)(state, redirectLocation, navigateType);
+            return (0, _approuterstate.completeHardNavigation)(state, redirectLocation, navigateType);
         }
         if (typeof flightData === 'string') {
             // If the flight data is just a string, something earlier in the
             // response handling triggered an external redirect.
-            return (0, _navigation.completeHardNavigation)(state, new URL(flightData, location.origin), navigateType);
+            return (0, _approuterstate.completeHardNavigation)(state, new URL(flightData, location.origin), navigateType);
         }
         // The action triggered a navigation — either a redirect, a revalidation,
         // or both.
@@ -294,7 +289,7 @@ function serverActionReducer(state, action) {
         const scrollBehavior = _routerreducertypes.ScrollBehavior.Default;
         // If the action triggered a revalidation of the cache, we should also
         // refresh all the dynamic data.
-        const freshnessPolicy = revalidationKind === _actionrevalidationkind.ActionDidNotRevalidate ? _pprnavigations.FreshnessPolicy.Default : _pprnavigations.FreshnessPolicy.RefreshAll;
+        const freshnessPolicy = revalidationKind === _actionrevalidationkind.ActionDidNotRevalidate ? _rendertree.FreshnessPolicy.Default : _rendertree.FreshnessPolicy.RefreshAll;
         // The server may have sent back new data. If so, we will perform a
         // "seeded" navigation that uses the data from the response.
         // TODO: Currently the server always renders from the root in
@@ -309,15 +304,21 @@ function serverActionReducer(state, action) {
             const now = Date.now();
             // TODO: Store the dynamic stale time on the top-level state so it's
             // known during restores and refreshes.
-            const redirectSeed = (0, _navigation.convertServerPatchToFullTree)(now, currentFlightRouterState, flightData, flightDataRenderedSearch, _bfcache.UnknownDynamicStaleTime);
+            const redirectSeed = (0, _decodeserverresponse.createNavigationSeed)(now, currentFlightRouterState, flightData, // Action responses stream in incrementally, so their vary params
+            // can't be drained here — and nothing consumes them from a
+            // navigation seed (only segment-cache writes read vary params, and
+            // those decode their own, buffered, payloads).
+            null, // Same for partiality: only segment-cache writes consume it, and
+            // action responses are never written to the segment cache. Pass
+            // the conservative value.
+            true, // Navigation responses always include the param values in the
+            // tree, so there's no pathname to parse them from (nor a need to).
+            null, flightDataRenderedSearch, null, _bfcache.UnknownDynamicStaleTime);
             // Learn the route pattern so we can predict it for future navigations.
-            const metadataVaryPath = redirectSeed.metadataVaryPath;
-            if (metadataVaryPath !== null) {
-                (0, _optimisticroutes.discoverKnownRoute)(now, redirectUrl.pathname, redirectUrl.search, nextUrl, null, redirectSeed.routeTree, metadataVaryPath, couldBeIntercepted, redirectCanonicalUrl, isPrerender, false // hasDynamicRewrite
-                );
-            }
-            const navigationLock = (0, _pprnavigations.getCurrentNavigationLock)();
-            return (0, _navigation.navigateToKnownRoute)(now, state, redirectUrl, redirectCanonicalUrl, redirectSeed, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, // A server-action redirect navigation is bound to the shared map.
+            (0, _optimisticroutes.discoverKnownRoute)(now, redirectUrl.pathname, redirectUrl.search, nextUrl, null, redirectSeed.root, couldBeIntercepted, redirectCanonicalUrl, redirectSeed.renderedSearch, isPrerender, false // hasDynamicRewrite
+            );
+            const navigationLock = (0, _rendertree.getCurrentNavigationLock)();
+            return (0, _approuterstate.navigateToKnownRoute)(now, state, redirectUrl, redirectCanonicalUrl, redirectSeed, currentUrl, currentRenderedSearch, state.root, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, // A server-action redirect navigation is bound to the shared map.
             _cache.segmentCacheMap, null, // Server action redirects don't use route prediction - we already
             // have the route tree from the server response. If a mismatch occurs
             // during dynamic data fetch, the retry handler will traverse the
@@ -327,7 +328,7 @@ function serverActionReducer(state, action) {
         }
         // The server did not send back new data. We'll perform a regular, non-
         // seeded navigation — effectively the same as <Link> or router.push().
-        return (0, _navigation.navigate)(state, redirectUrl, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType);
+        return (0, _approuterstate.navigate)(state, redirectUrl, currentUrl, currentRenderedSearch, state.root, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType);
     }, (e)=>{
         // When the server action is rejected we don't update the state and instead call the reject handler of the promise.
         reject(e);

package/app/node_modules/next/dist/client/components/router-reducer/reducers/server-patch-reducer.js

@@ -10,10 +10,10 @@ Object.defineProperty(exports, "serverPatchReducer", {
 });
 const _createhreffromurl = require("../create-href-from-url");
 const _routerreducertypes = require("../router-reducer-types");
-const _navigation = require("../../segment-cache/navigation");
+const _approuterstate = require("../../app-router-state");
 const _cache = require("../../segment-cache/cache");
 const _refreshreducer = require("./refresh-reducer");
-const _pprnavigations = require("../ppr-navigations");
+const _rendertree = require("../../render-tree");
 function serverPatchReducer(state, action) {
     // A "retry" is a navigation that happens due to a route mismatch. It's
     // similar to a refresh, because we will omit any existing dynamic data on
@@ -26,7 +26,7 @@ function serverPatchReducer(state, action) {
     if (retryMpa || retrySeed === null) {
         // If the server did not send back data during the mismatch, fall back to
         // an MPA navigation.
-        return (0, _navigation.completeHardNavigation)(state, retryUrl, navigateType);
+        return (0, _approuterstate.completeHardNavigation)(state, retryUrl, navigateType);
     }
     const currentUrl = new URL(state.canonicalUrl, location.origin);
     const currentRenderedSearch = state.renderedSearch;
@@ -48,9 +48,9 @@ function serverPatchReducer(state, action) {
     const retryCanonicalUrl = (0, _createhreffromurl.createHrefFromUrl)(retryUrl);
     const retryNextUrl = action.nextUrl;
     const scrollBehavior = _routerreducertypes.ScrollBehavior.Default;
-    const navigationLock = (0, _pprnavigations.getCurrentNavigationLock)();
+    const navigationLock = (0, _rendertree.getCurrentNavigationLock)();
     const now = Date.now();
-    return (0, _navigation.navigateToKnownRoute)(now, state, retryUrl, retryCanonicalUrl, retrySeed, currentUrl, currentRenderedSearch, state.cache, state.tree, action.freshnessPolicy, retryNextUrl, scrollBehavior, navigateType, navigationLock, // A server-patch retry navigation is bound to the shared map.
+    return (0, _approuterstate.navigateToKnownRoute)(now, state, retryUrl, retryCanonicalUrl, retrySeed, currentUrl, currentRenderedSearch, state.root, action.freshnessPolicy, retryNextUrl, scrollBehavior, navigateType, navigationLock, // A server-patch retry navigation is bound to the shared map.
     _cache.segmentCacheMap, null, // Server patch (retry) navigations don't use route prediction. This is
     // typically a retry after a previous mismatch, so the route was already
     // marked as having a dynamic rewrite when the mismatch was detected.

package/app/node_modules/next/dist/client/components/router-reducer/router-reducer.js

@@ -40,11 +40,7 @@ const _serveractionreducer = require("./reducers/server-action-reducer");
                     const { hmrRefreshReducer } = require('./reducers/hmr-refresh-reducer');
                     return hmrRefreshReducer(state, action);
                 } else {
-                    throw Object.defineProperty(new Error('hmrRefresh can only be used in development mode. Please use refresh instead.'), "__NEXT_ERROR_CODE", {
-                        value: "E485",
-                        enumerable: false,
-                        configurable: true
-                    });
+                    throw new Error('hmrRefresh can only be used in development mode. Please use refresh instead.');
                 }
             }
         case _routerreducertypes.ACTION_SERVER_ACTION:
@@ -53,11 +49,7 @@ const _serveractionreducer = require("./reducers/server-action-reducer");
             }
         // This case should never be hit as dispatch is strongly typed.
         default:
-            throw Object.defineProperty(new Error('Unknown action'), "__NEXT_ERROR_CODE", {
-                value: "E295",
-                enumerable: false,
-                configurable: true
-            });
+            throw new Error('Unknown action');
     }
 }
 function serverReducer(state, _action) {

package/app/node_modules/next/dist/client/components/segment-cache/bfcache.js

@@ -8,8 +8,7 @@ Object.defineProperty(exports, "__esModule", {
     invalidateBfCache: null,
     readFromBFCache: null,
     readFromBFCacheDuringRegularNavigation: null,
-    updateBFCacheEntryStaleAt: null,
-    writeHeadToBFCache: null,
+    updateBFCacheEntryFromDynamicResponse: null,
     writeToBFCache: null
 });
 function _export(target, all) {
@@ -34,11 +33,8 @@ _export(exports, {
     readFromBFCacheDuringRegularNavigation: function() {
         return readFromBFCacheDuringRegularNavigation;
     },
-    updateBFCacheEntryStaleAt: function() {
-        return updateBFCacheEntryStaleAt;
-    },
-    writeHeadToBFCache: function() {
-        return writeHeadToBFCache;
+    updateBFCacheEntryFromDynamicResponse: function() {
+        return updateBFCacheEntryFromDynamicResponse;
     },
     writeToBFCache: function() {
         return writeToBFCache;
@@ -58,18 +54,15 @@ function invalidateBfCache() {
     }
     currentBfCacheVersion++;
 }
-function writeToBFCache(now, varyPath, rsc, prefetchRsc, head, prefetchHead, dynamicStaleAt, bfcacheId) {
+function writeToBFCache(now, varyPath, cacheNode, dynamicStaleAt) {
     if (typeof window === 'undefined') {
         return;
     }
     const entry = {
-        rsc,
-        prefetchRsc,
-        // TODO: These fields will be removed from both BFCacheEntry and
-        // SegmentCacheEntry. The head has its own separate cache entry.
-        head,
-        prefetchHead,
-        bfcacheId,
+        rsc: cacheNode.rsc,
+        prefetchRsc: cacheNode.prefetchRsc,
+        varyParams: cacheNode.varyParams,
+        bfcacheId: cacheNode.bfcacheId,
         ref: null,
         // TODO: This is just a heuristic. Getting the actual size of the segment
         // isn't feasible because it's part of a larger streaming response. The
@@ -88,19 +81,16 @@ function writeToBFCache(now, varyPath, rsc, prefetchRsc, head, prefetchHead, dyn
     const isRevalidation = false;
     (0, _cachemap.setInCacheMap)(bfcacheMap, varyPath, entry, isRevalidation);
 }
-function writeHeadToBFCache(now, varyPath, head, prefetchHead, dynamicStaleAt, bfcacheId) {
-    // Read the special "segment" that represents the head data.
-    writeToBFCache(now, varyPath, head, prefetchHead, null, null, dynamicStaleAt, bfcacheId);
-}
-function updateBFCacheEntryStaleAt(varyPath, newStaleAt) {
+function updateBFCacheEntryFromDynamicResponse(varyPath, cacheNode, newStaleAt) {
     if (typeof window === 'undefined') {
         return;
     }
     const isRevalidation = false;
     // Read with staleness bypass (-1) so we can update even stale entries
     const entry = (0, _cachemap.getFromCacheMap)(-1, currentBfCacheVersion, bfcacheMap, varyPath, isRevalidation, false);
-    if (entry !== null) {
+    if (entry !== null && entry.rsc === cacheNode.rsc) {
         entry.staleAt = newStaleAt;
+        entry.varyParams = cacheNode.varyParams;
     }
 }
 function readFromBFCache(varyPath) {