add server-side handleLoad

Author: Lms24

packages/kit/src/runtime/server/ambient.d.ts

@@ -4,5 +4,6 @@ declare module '__SERVER__/internal.js' {
 		handle?: import('types').Handle;
 		handleError?: import('types').HandleServerError;
 		handleFetch?: import('types').HandleFetch;
+		handleLoad?: import('types').HandleLoad;
 	}>;
 }

packages/kit/src/runtime/server/data/index.js

@@ -78,7 +78,7 @@ export async function render_data(
 								}
 							}
 							return data;
-						}
+						},
 					});
 				} catch (e) {
 					aborted = true;

packages/kit/src/runtime/server/index.js

@@ -41,7 +41,8 @@ export class Server {
 				handle: module.handle || (({ event, resolve }) => resolve(event)),
 				// @ts-expect-error
 				handleError: module.handleError || (({ error }) => console.error(error?.stack)),
-				handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request))
+				handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request)),
+				handleLoad: module.handleLoad || (({event, resolve}) => resolve(event))
 			};
 		}
 	}

packages/kit/src/runtime/server/page/index.js

@@ -150,7 +150,7 @@ export async function render_page(event, page, options, manifest, state, resolve
 								if (parent) Object.assign(data, await parent.data);
 							}
 							return data;
-						}
+						},
 					});
 				} catch (e) {
 					load_error = /** @type {Error} */ (e);
@@ -180,7 +180,8 @@ export async function render_page(event, page, options, manifest, state, resolve
 						resolve_opts,
 						server_data_promise: server_promises[i],
 						state,
-						csr
+						csr,
+						handleLoad: options.hooks.handleLoad,
 					});
 				} catch (e) {
 					load_error = /** @type {Error} */ (e);

packages/kit/src/runtime/server/page/load_data.js

@@ -140,6 +140,7 @@ export async function load_server_data({ event, state, node, parent }) {
  *   server_data_promise: Promise<import('types').ServerDataNode | null>;
  *   state: import('types').SSRState;
  *   csr: boolean;
+ * 	 handleLoad: import('types').HandleLoad;
  * }} opts
  * @returns {Promise<Record<string, any | Promise<any>> | null>}
  */
@@ -151,24 +152,27 @@ export async function load_data({
 	server_data_promise,
 	state,
 	resolve_opts,
-	csr
+	csr,
+	handleLoad
 }) {
 	const server_data_node = await server_data_promise;
 
 	if (!node?.universal?.load) {
 		return server_data_node?.data ?? null;
 	}
 
-	const result = await node.universal.load.call(null, {
+	const load_event = {
 		url: event.url,
 		params: event.params,
 		data: server_data_node?.data ?? null,
 		route: event.route,
 		fetch: create_universal_fetch(event, state, fetched, csr, resolve_opts),
 		setHeaders: event.setHeaders,
-		depends: () => {},
+		depends: () => { },
 		parent
-	});
+	};
+	
+	const result = await handleLoad({event: load_event, resolve: node.universal.load});
 
 	const data = result ? await unwrap_promises(result) : null;
 	if (__SVELTEKIT_DEV__) {

packages/kit/src/runtime/server/page/respond_with_error.js

@@ -44,7 +44,7 @@ export async function respond_with_error({
 				event,
 				state,
 				node: default_layout,
-				parent: async () => ({})
+				parent: async () => ({}),
 			});
 
 			const server_data = await server_data_promise;
@@ -57,7 +57,8 @@ export async function respond_with_error({
 				resolve_opts,
 				server_data_promise,
 				state,
-				csr
+				csr,
+				handleLoad: options.hooks.handleLoad,
 			});
 
 			branch.push(

packages/kit/types/index.d.ts

@@ -642,6 +642,7 @@ export interface HandleLoad {
 	(input: { event: LoadEvent; resolve: Load }): ReturnType<Load>;
 }
 
+
 /**
  * The [`handleFetch`](https://kit.svelte.dev/docs/hooks#server-hooks-handlefetch) hook allows you to modify (or replace) a `fetch` request that happens inside a `load` function that runs on the server (or during pre-rendering)
  */

packages/kit/types/internal.d.ts

@@ -95,6 +95,7 @@ export interface ServerHooks {
 	handleFetch: HandleFetch;
 	handle: Handle;
 	handleError: HandleServerError;
+	handleLoad: HandleLoad;
 }
 
 export interface ClientHooks {