@solidjs/router 1.0.0-next.7 → 1.0.0-next.9

package/dist/claims.js

@@ -84,7 +84,14 @@ export function setupLinkClaims(router, explicitLinks) {
     // linkState derives from (the in-flight pendingTarget is readable in the
     // effect phase because the isRouting write flushes after the target is
     // assigned), the effect phase sweeps the registry untracked.
-    createRenderEffect(() => (router.location.pathname, router.isRouting()), () => registry.forEach(a => refresh(a, claimed.get(a))));
+    //
+    // `transparent` keeps the effect invisible to the hydration id scheme.
+    // This setup is client-only, so an id-consuming node here has no server
+    // counterpart and every subsequent hydration id would shift by one child
+    // slot — lazy-route lookups miss and hydration leaves server nodes
+    // unclaimed. (The option is honored by the runtime but missing from the
+    // published EffectOptions type, hence the cast.)
+    createRenderEffect(() => (router.location.pathname, router.isRouting()), () => registry.forEach(a => refresh(a, claimed.get(a))), { transparent: true });
     onCleanup(registerElementClaim(node => {
         if (node.nodeName.toUpperCase() !== "A")
             return;

package/dist/data/action.js

@@ -157,6 +157,13 @@ function actionImpl(fn, options = {}) {
         form && setFormBusy(form, 1);
         let settled;
         let response;
+        // The transport consumer is awaited before a single-flight mutation
+        // resolves, so a counter delta over the call tells whether this action's
+        // metadata was already applied. Overlapping mutations can cross-attribute
+        // a run (skipping one default revalidation another pass just covered) —
+        // a far smaller window than predicting from the function's identity,
+        // which misses every response the server returned without flight data.
+        const flightApplicationsBefore = flightApplications;
         try {
             settled = await settleActionResult(run({
                 call: runMutation,
@@ -167,7 +174,7 @@ function actionImpl(fn, options = {}) {
                     }
                     : undefined
             }));
-            response = await handleResponse(settled.value, settled.error, router.navigatorFactory());
+            response = await handleResponse(settled.value, settled.error, router.navigatorFactory(), flightApplications !== flightApplicationsBefore);
         }
         finally {
             form && setFormBusy(form, -1);
@@ -263,6 +270,11 @@ async function settleActionResult(result) {
     }
     return result;
 }
+// Invocation count of the flight-data consumer. An action compares it across
+// its mutation call to learn whether the transport already applied this
+// response's metadata (and so the default revalidation pass must not run
+// again and wipe the freshly seeded cache).
+let flightApplications = 0;
 /**
  * Registers the router as the single-flight consumer of the server function
  * transport. Subscribing is the opt-in: while registered, the transport
@@ -275,7 +287,10 @@ async function settleActionResult(result) {
  * collection work on the server. Returns the unsubscribe function.
  */
 export function setupFlightDataConsumer(router) {
-    return subscribeFlightData((data, { response }) => applyResponseMetadata(response, router.navigatorFactory(), data));
+    return subscribeFlightData((data, { response }) => {
+        flightApplications++;
+        return applyResponseMetadata(response, router.navigatorFactory(), data);
+    });
 }
 /**
  * Applies a server function response's integration metadata: `X-Revalidate`
@@ -306,7 +321,7 @@ async function applyResponseMetadata(metadata, navigate, flightData) {
     // trigger revalidation
     await revalidate(keys, false);
 }
-async function handleResponse(response, error, navigate) {
+async function handleResponse(response, error, navigate, metadataHandled) {
     let data;
     let flightData;
     let metadata;
@@ -335,6 +350,10 @@ async function handleResponse(response, error, navigate) {
         return { error: response };
     else
         data = response;
-    await applyResponseMetadata(metadata, navigate, flightData);
+    // The transport consumer applies metadata before returning a server
+    // function's unwrapped value. Do not treat that value as a second plain
+    // action response and invalidate the freshly seeded query cache again.
+    if (!metadataHandled || metadata || flightData)
+        await applyResponseMetadata(metadata, navigate, flightData);
     return data != null ? { data } : undefined;
 }

package/dist/index.d.ts

@@ -4,6 +4,6 @@ export { useHref, useIsRouting, useLinkState, useLocation, useMatch, useNavigate
 export type { LinkState } from "./routing.js";
 export { mergeSearchString as _mergeSearchString } from "./utils.js";
 export { int } from "./paths.js";
-export type { RoutePaths, PathParamsOf, PathEnd, TypedMatchFilter } from "./paths.js";
+export type { RoutePaths, PathParamsOf, PathEnd, TypedMatchFilter, DefaultSearchTypes } from "./paths.js";
 export * from "./data/index.js";
-export type { Location, LocationChange, SearchParams, MatchFilter, MatchFilters, NavigateOptions, Navigator, OutputMatch, Params, PathMatch, RouteSectionProps, RoutePreloadFunc, RoutePreloadFuncArgs, RouteDefinition, RouteDescription, RouteMatch, RouterIntegration, RouterUtils, SetParams, Submission, BeforeLeaveEventArgs, TypedPath, TypedSearchPath, StandardSchemaV1 } from "./types.js";
+export type { Location, LocationChange, SearchParams, MatchFilter, MatchFilters, NavigateOptions, Navigator, OutputMatch, Params, PathMatch, RouteSectionProps, RoutePreloadFunc, RoutePreloadFuncArgs, RouteDefinition, RouteDescription, RouteMatch, RouterIntegration, RouterUtils, SetParams, SetSearchParams, Submission, BeforeLeaveEventArgs, TypedPath, TypedSearchPath, StandardSchemaV1 } from "./types.js";

package/dist/index.js

@@ -267,7 +267,16 @@ function setupLinkClaims(router, explicitLinks) {
   // linkState derives from (the in-flight pendingTarget is readable in the
   // effect phase because the isRouting write flushes after the target is
   // assigned), the effect phase sweeps the registry untracked.
-  createRenderEffect(() => (router.location.pathname, router.isRouting()), () => registry.forEach(a => refresh(a, claimed.get(a))));
+  //
+  // `transparent` keeps the effect invisible to the hydration id scheme.
+  // This setup is client-only, so an id-consuming node here has no server
+  // counterpart and every subsequent hydration id would shift by one child
+  // slot — lazy-route lookups miss and hydration leaves server nodes
+  // unclaimed. (The option is honored by the runtime but missing from the
+  // published EffectOptions type, hence the cast.)
+  createRenderEffect(() => (router.location.pathname, router.isRouting()), () => registry.forEach(a => refresh(a, claimed.get(a))), {
+    transparent: true
+  });
   onCleanup(registerElementClaim(node => {
     if (node.nodeName.toUpperCase() !== "A") return;
     const a = node;
@@ -2372,6 +2381,13 @@ function actionImpl(fn, options = {}) {
     form && setFormBusy(form, 1);
     let settled;
     let response;
+    // The transport consumer is awaited before a single-flight mutation
+    // resolves, so a counter delta over the call tells whether this action's
+    // metadata was already applied. Overlapping mutations can cross-attribute
+    // a run (skipping one default revalidation another pass just covered) —
+    // a far smaller window than predicting from the function's identity,
+    // which misses every response the server returned without flight data.
+    const flightApplicationsBefore = flightApplications;
     try {
       settled = await settleActionResult(run({
         call: runMutation,
@@ -2379,7 +2395,7 @@ function actionImpl(fn, options = {}) {
           for (const hook of submitHooks.values()) hook(...variables);
         } : undefined
       }));
-      response = await handleResponse(settled.value, settled.error, router.navigatorFactory());
+      response = await handleResponse(settled.value, settled.error, router.navigatorFactory(), flightApplications !== flightApplicationsBefore);
     } finally {
       form && setFormBusy(form, -1);
     }
@@ -2474,6 +2490,12 @@ async function settleActionResult(result) {
   return result;
 }
 
+// Invocation count of the flight-data consumer. An action compares it across
+// its mutation call to learn whether the transport already applied this
+// response's metadata (and so the default revalidation pass must not run
+// again and wipe the freshly seeded cache).
+let flightApplications = 0;
+
 /**
  * Registers the router as the single-flight consumer of the server function
  * transport. Subscribing is the opt-in: while registered, the transport
@@ -2488,7 +2510,10 @@ async function settleActionResult(result) {
 function setupFlightDataConsumer(router) {
   return subscribeFlightData((data, {
     response
-  }) => applyResponseMetadata(response, router.navigatorFactory(), data));
+  }) => {
+    flightApplications++;
+    return applyResponseMetadata(response, router.navigatorFactory(), data);
+  });
 }
 
 /**
@@ -2518,7 +2543,7 @@ async function applyResponseMetadata(metadata, navigate, flightData) {
   // trigger revalidation
   await revalidate(keys, false);
 }
-async function handleResponse(response, error, navigate) {
+async function handleResponse(response, error, navigate, metadataHandled) {
   let data;
   let flightData;
   let metadata;
@@ -2544,7 +2569,10 @@ async function handleResponse(response, error, navigate) {
   } else if (error) return {
     error: response
   };else data = response;
-  await applyResponseMetadata(metadata, navigate, flightData);
+  // The transport consumer applies metadata before returning a server
+  // function's unwrapped value. Do not treat that value as a second plain
+  // action response and invalidate the freshly seeded query cache again.
+  if (!metadataHandled || metadata || flightData) await applyResponseMetadata(metadata, navigate, flightData);
   return data != null ? {
     data
   } : undefined;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "1.0.0-next.7",
+  "version": "1.0.0-next.9",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",