@uniflowed/router 0.0.0-alpha.27 → 0.0.0-alpha.29

package/internal/payload-rows.js

@@ -57,6 +57,7 @@ import {
   PAYLOAD_ROW_ATTRIBUTE,
   PayloadRowError,
   PayloadValueError,
+  payloadRowId,
   parseRowMessage,
 } from "./payload.js";
 
@@ -149,8 +150,8 @@ export function createPayloadReader(
     if (attribute == null) {
       return;
     }
-    const id = Number.parseInt(attribute, 10);
-    if (!Number.isSafeInteger(id)) {
+    const id = payloadRowId(attribute);
+    if (id == null) {
       return;
     }
     const slot = slots.get(id);

package/internal/payload.js

@@ -580,6 +580,19 @@ function decodeReference(value: string, path: string, resolve: RowResolver): mix
   return resolve(id);
 }
 
+/**
+ * The row id carried by a streamed row element, or `null` when the attribute
+ * is not one.
+ *
+ * This is the same grammar as the `$P<n>` reference without the `$P` tag:
+ * digits only, in range. The browser reads row elements from a live document,
+ * so accepting `Number.parseInt`'s looser spellings would let `1x` satisfy the
+ * row the model named as `$P1`.
+ */
+export function payloadRowId(value: string): number | null {
+  return parsePayloadRowId(value);
+}
+
 /**
  * The row a reference names, or `null` when the string is not one.
  *
@@ -591,7 +604,10 @@ function rowId(value: string): number | null {
   if (!value.startsWith(REFERENCE_PREFIX + ROW_TAG)) {
     return null;
   }
-  const digits = value.slice(2);
+  return parsePayloadRowId(value.slice(2));
+}
+
+function parsePayloadRowId(digits: string): number | null {
   if (digits.length === 0 || digits.length > 3) {
     return null;
   }

package/internal/runtime.js

@@ -1227,7 +1227,12 @@ async function resolveRoute(
   // are: a slot is matched against the URL and depends on nothing the loader
   // produces, so the second match and its imports overlap the first page's
   // loader rather than following it.
-  const slots = resolveSlots(matched.route.slots ?? [], pathname, matched.route.layouts.length);
+  const slots = resolveSlots(
+    matched.route.slots ?? [],
+    pathname,
+    matched.route.layouts.length,
+    matched.params,
+  );
 
   // The loader, run here and awaited below — or not awaited at all.
   //
@@ -1311,17 +1316,21 @@ async function resolveSlots(
   records: $ReadOnlyArray<SlotRecord>,
   pathname: string,
   layoutCount: number,
+  fallbackParams: RouteParams,
 ): Promise<$ReadOnlyArray<ResolvedSlot>> {
   if (records.length === 0) {
     return [];
   }
-  return Promise.all(records.map((record) => resolveSlot(record, pathname, layoutCount)));
+  return Promise.all(
+    records.map((record) => resolveSlot(record, pathname, layoutCount, fallbackParams)),
+  );
 }
 
 async function resolveSlot(
   record: SlotRecord,
   pathname: string,
   layoutCount: number,
+  fallbackParams: RouteParams,
 ): Promise<ResolvedSlot> {
   // Clamped exactly as a template's `above` is, and for the same reason: a
   // hand-written table, or a `(group)` between the layout and the route, can
@@ -1331,7 +1340,7 @@ async function resolveSlot(
     name: record.name,
     above,
     page: null,
-    params: {},
+    params: fallbackParams,
     layouts: [],
     slots: [],
   };
@@ -1373,7 +1382,7 @@ async function resolveSlot(
     layouts: loaded,
     // The slot's own layouts are what a nested slot is measured against, so
     // the count handed down is this slot's rather than the route's.
-    slots: await resolveSlots(route.slots, pathname, loaded.length),
+    slots: await resolveSlots(route.slots, pathname, loaded.length, matched.params),
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/router",
-  "version": "0.0.0-alpha.27",
+  "version": "0.0.0-alpha.29",
   "description": "The file-system router for Flow React applications: matching, layouts, loaders, navigation, server rendering and hydration.",
   "type": "module",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "react-dom": ">=19"
   },
   "dependencies": {
-    "@uniflowed/hooks": "0.0.0-alpha.27",
-    "@uniflowed/server": "0.0.0-alpha.27"
+    "@uniflowed/hooks": "0.0.0-alpha.29",
+    "@uniflowed/server": "0.0.0-alpha.29"
   }
 }