@torpor/build 0.1.32 → 0.1.34

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @torpor/build
 
+## 0.1.34
+
+### Patch Changes
+
+- 1221923: Fix: updating layouts in [parameter] routes
+- Updated dependencies [741a289]
+  - @torpor/view@0.1.11
+
+## 0.1.33
+
+### Patch Changes
+
+- 74bf42d: Fix: store (and clear) the right layout slot ranges
+- Updated dependencies [74bf42d]
+  - @torpor/view@0.1.10
+
 ## 0.1.32
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/build",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "A framework for building sites and apps with Torpor",
   "type": "module",
   "main": "dist/index.cjs",
@@ -55,8 +55,8 @@
     "dotenv": "^16.5.0",
     "vite": "^7.0.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "@torpor/view": "^0.1.6",
-    "@torpor/unplugin": "^0.1.16"
+    "@torpor/unplugin": "^0.1.16",
+    "@torpor/view": "^0.1.11"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",

package/src/site/clientEntry.ts

@@ -1,7 +1,7 @@
 import manifest from "@torpor/build/manifest";
 // @ts-ignore This errors in the Cloudflare build?
 import { $page } from "@torpor/build/state";
-import { clearLayoutSlot, hydrate, runLayoutSlot } from "@torpor/view";
+import { clearLayoutSlot, fillLayoutSlot, hydrate } from "@torpor/view";
 import { type Component, type SlotRender } from "@torpor/view";
 import { mount } from "@torpor/view";
 import type PageEndPoint from "../types/PageEndPoint.ts";
@@ -161,17 +161,15 @@ async function navigate(url: URL, firstTime = false): Promise<boolean> {
 		let slotFunctions: SlotRender[] = [];
 		// The last slot function will render the client component
 		slotFunctions[handler.layouts.length] = function clientComponent(parent, anchor, _, $context) {
-			if (clientEndPoint.component) {
-				let i = layoutStack.length - 1;
-				layoutStack[i].slotRange = runLayoutSlot(
-					clientEndPoint.component,
-					slotFunctions[i + 1],
-					parent,
-					anchor,
-					$props,
-					$context,
-				);
-			}
+			let i = layoutStack.length - 1;
+			layoutStack[i].slotRange = fillLayoutSlot(
+				clientEndPoint.component!,
+				slotFunctions[i + 1],
+				parent,
+				anchor,
+				$props,
+				$context,
+			);
 		};
 
 		// Each earlier slot function will render a layout
@@ -192,16 +190,14 @@ async function navigate(url: URL, firstTime = false): Promise<boolean> {
 					slots = { _: slotFunctions[i + 1] };
 				} else {
 					slotFunctions[i] = function layoutComponent(parent, anchor, _, $context) {
-						if (layoutEndPoint.component) {
-							layoutStack[i].slotRange = runLayoutSlot(
-								layoutEndPoint.component,
-								slotFunctions[i + 1],
-								parent,
-								anchor,
-								$props,
-								$context,
-							);
-						}
+						layoutStack[i - 1].slotRange = fillLayoutSlot(
+							layoutEndPoint.component!,
+							slotFunctions[i + 1],
+							parent,
+							anchor,
+							$props,
+							$context,
+						);
 					};
 				}
 			}
@@ -239,6 +235,9 @@ async function loadData(
 	if (handler.layouts) {
 		for (let [i, layout] of handler.layouts.entries()) {
 			let layoutPath = layout.path;
+			for (let key in params) {
+				layoutPath = layoutPath.replace(`[${key}]`, params[key]);
+			}
 			if (layoutStack.at(i)?.path === layoutPath) {
 				// We've already loaded this layout, we can just re-use its data and UI
 				if (!prefetch) {
@@ -248,9 +247,6 @@ async function loadData(
 				Object.assign(data, layoutStack[i].data);
 			} else {
 				const stackLayout = { path: layoutPath, data: {}, reuse: false, slotRange: null };
-				for (let key in params) {
-					layoutPath = layoutPath.replace(`[${key}]`, params[key]);
-				}
 				const layoutEndPoint: PageEndPoint | undefined = (await layout.endPoint())?.default;
 				const layoutServerEndPoint: PageServerEndPoint | undefined =
 					layout.serverEndPoint && (await layout.serverEndPoint())?.default;
@@ -291,10 +287,8 @@ async function loadClientAndServerData(
 ): Promise<Response | void> {
 	if (clientEndPoint?.load) {
 		if (prefetchedData[location]) {
-			//console.log("CLIENT DATA ALREADY LOADED", location);
 			Object.assign(data, prefetchedData[location]);
 		} else {
-			//console.log("CLIENT DATA LOADING", location);
 			const clientUrl = new URL(document.location.href);
 			const clientParams = buildClientParams(clientUrl, params, data);
 			const clientResponse = await clientEndPoint.load(clientParams);
@@ -315,10 +309,8 @@ async function loadClientAndServerData(
 		const serverUrl = location.replace(/\/$/, "") + "/~server";
 
 		if (prefetchedData[serverUrl]) {
-			//console.log("SERVER DATA ALREADY LOADED", serverUrl);
 			Object.assign(data, prefetchedData[serverUrl]);
 		} else {
-			//console.log("SERVER DATA LOADING", serverUrl);
 			const serverResponse = await fetch(serverUrl);
 			if (serverResponse) {
 				if (serverResponse.ok) {