@sveltejs/kit 3.0.0-next.25 → 3.0.0-next.27

package/src/runtime/client/remote-functions/shared.svelte.js

@@ -109,8 +109,9 @@ export function get_remote_request_headers() {
 /**
  * @param {string} url
  * @param {RequestInit} [init]
+ * @param {Set<string> | null} [refreshes]
  */
-export async function remote_request(url, init) {
+export async function remote_request(url, init, refreshes) {
 	const response = await fetch(url, init);
 	const status = response.status;
 
@@ -158,6 +159,7 @@ export async function remote_request(url, init) {
 	// update queries with refreshed data
 	if (data.q) {
 		for (const key in data.q) {
+			refreshes?.delete(key);
 			const parts = split_remote_key(key);
 			const entry = query_map.get(parts.id)?.get(parts.payload);
 
@@ -168,6 +170,7 @@ export async function remote_request(url, init) {
 	// reconnect live queries
 	if (data.l) {
 		for (const key in data.l) {
+			refreshes?.delete(key);
 			const parts = split_remote_key(key);
 			const entry = live_query_map.get(parts.id)?.get(parts.payload);
 
@@ -182,9 +185,27 @@ export async function remote_request(url, init) {
 		}
 	}
 
+	for (const key of data.i ?? []) refreshes?.delete(key);
+
 	return data;
 }
 
+/** @param {Set<string> | null} refreshes */
+export function fail_unhandled_refreshes(refreshes) {
+	for (const key of refreshes ?? []) {
+		const parts = split_remote_key(key);
+		const entry =
+			query_map.get(parts.id)?.get(parts.payload) ??
+			live_query_map.get(parts.id)?.get(parts.payload);
+		entry?.resource.fail(
+			new HttpError({
+				status: 400,
+				message: 'Requested update was not handled by the remote function'
+			})
+		);
+	}
+}
+
 /**
  * @param {RemoteFunctionResponse} response
  * @returns {Promise<Extract<RemoteFunctionResponse, { type: 'result' }>>}

package/src/runtime/client/scroll.js

@@ -0,0 +1,39 @@
+import { hash_routing } from '$app/paths/internal/client';
+import { reset_focus } from './focus.js';
+import { get_hash_element } from './utils.js';
+
+let autoscroll = true;
+
+export function disable_scroll_handling() {
+	autoscroll = false;
+}
+
+/**
+ * @param {URL} url
+ * @param {{ x: number; y: number } | null | undefined} scroll
+ * @param {boolean} reset
+ * @param {Element | null} active_element
+ */
+export function reset_scroll_and_focus(url, scroll, reset, active_element) {
+	/** @type {Element | null} */
+	let deep_linked = null;
+
+	if (autoscroll) {
+		if (scroll) {
+			scrollTo(scroll.x, scroll.y);
+		} else if ((deep_linked = get_hash_element(url, hash_routing))) {
+			deep_linked.scrollIntoView();
+		} else {
+			scrollTo(0, 0);
+		}
+	}
+
+	const changed_focus =
+		document.activeElement !== active_element && document.activeElement !== document.body;
+
+	if (reset && !changed_focus) {
+		reset_focus(url, !deep_linked);
+	}
+
+	autoscroll = true;
+}

package/src/runtime/client/utils.js

@@ -238,6 +238,34 @@ export function is_external_url(url, base, hash_routing) {
 	return false;
 }
 
+/**
+ * @param {URL} url
+ * @param {boolean} hash_routing
+ * @returns {string}
+ */
+export function get_id(url, hash_routing) {
+	let id;
+
+	if (hash_routing) {
+		const [, , second] = url.hash.split('#', 3);
+		id = second ?? '';
+	} else {
+		id = url.hash.slice(1);
+	}
+
+	return decodeURIComponent(id);
+}
+
+/**
+ * @param {URL} url
+ * @param {boolean} hash_routing
+ * @returns {Element | null}
+ */
+export function get_hash_element(url, hash_routing) {
+	const id = get_id(url, hash_routing);
+	return id ? document.getElementById(id) : null;
+}
+
 /** @type {Set<string> | null} */
 let seen = null;