add server-only handleServerLoad

Author: Lms24

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

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

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

@@ -79,6 +79,7 @@ export async function render_data(
 							}
 							return data;
 						},
+						handleServerLoad: options.hooks.handleServerLoad,
 					});
 				} catch (e) {
 					aborted = true;

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

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

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

@@ -151,6 +151,7 @@ export async function render_page(event, page, options, manifest, state, resolve
 							}
 							return data;
 						},
+						handleServerLoad: options.hooks.handleServerLoad,
 					});
 				} catch (e) {
 					load_error = /** @type {Error} */ (e);

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

@@ -10,10 +10,11 @@ import { validate_depends } from '../../shared.js';
  *   state: import('types').SSRState;
  *   node: import('types').SSRNode | undefined;
  *   parent: () => Promise<Record<string, any>>;
+ *   handleServerLoad: import('types').HandleServerLoad;
  * }} opts
  * @returns {Promise<import('types').ServerDataNode | null>}
  */
-export async function load_server_data({ event, state, node, parent }) {
+export async function load_server_data({ event, state, node, parent, handleServerLoad }) {
 	if (!node?.server) return null;
 
 	let done = false;
@@ -40,9 +41,9 @@ export async function load_server_data({ event, state, node, parent }) {
 		disable_search(url);
 	}
 
-	const result = await node.server.load?.call(null, {
+	const load_event = {
 		...event,
-		fetch: (info, init) => {
+		fetch: (/** @type {URL | RequestInfo} */ info, /** @type {RequestInit | undefined} */ init) => {
 			const url = new URL(info instanceof Request ? info.url : info, event.url);
 
 			if (DEV && done && !uses.dependencies.has(url.href)) {
@@ -84,7 +85,7 @@ export async function load_server_data({ event, state, node, parent }) {
 				}
 
 				uses.params.add(key);
-				return target[/** @type {string} */ (key)];
+				return target[ /** @type {string} */(key)];
 			}
 		}),
 		parent: async () => {
@@ -108,11 +109,13 @@ export async function load_server_data({ event, state, node, parent }) {
 				}
 
 				uses.route = true;
-				return target[/** @type {'id'} */ (key)];
+				return target[ /** @type {'id'} */(key)];
 			}
 		}),
 		url
-	});
+	};
+
+	const result = node.server.load ? await handleServerLoad({event: load_event, resolve: node.server.load}) : null;
 
 	const data = result ? await unwrap_promises(result) : null;
 	if (__SVELTEKIT_DEV__) {
@@ -171,8 +174,15 @@ export async function load_data({
 		depends: () => { },
 		parent
 	};
-	
+
+	console.log('--->');
+	const res = node.universal.load(load_event);
+	console.log('parent', await parent());
+	console.log('evt', load_event);
+	console.log('super-evt', event);
+
 	const result = await handleLoad({event: load_event, resolve: node.universal.load});
+	console.log('--->');
 
 	const data = result ? await unwrap_promises(result) : null;
 	if (__SVELTEKIT_DEV__) {

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

@@ -45,6 +45,7 @@ export async function respond_with_error({
 				state,
 				node: default_layout,
 				parent: async () => ({}),
+				handleServerLoad: options.hooks.handleServerLoad,
 			});
 
 			const server_data = await server_data_promise;

packages/kit/types/index.d.ts

@@ -642,6 +642,13 @@ export interface HandleLoad {
 	(input: { event: LoadEvent; resolve: Load }): ReturnType<Load>;
 }
 
+/**
+ * The `handleServerLoad` hook runs every time a server-only `load` function (for example from +page.server.js) is called on the server.
+ * This hook provides the server load `event` and a `resolve` function to call the actual hook with the event.
+ */
+export interface HandleServerLoad {
+	(input: { event: ServerLoadEvent; resolve: ServerLoad }): ReturnType<ServerLoad>;
+}
 
 /**
  * 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

@@ -14,7 +14,8 @@ import {
 	HandleFetch,
 	Actions,
 	HandleClientError,
-	HandleLoad
+	HandleLoad,
+	HandleServerLoad
 } from './index.js';
 import {
 	HttpMethod,
@@ -96,6 +97,7 @@ export interface ServerHooks {
 	handle: Handle;
 	handleError: HandleServerError;
 	handleLoad: HandleLoad;
+	handleServerLoad: HandleServerLoad;
 }
 
 export interface ClientHooks {