@nanoforge-dev/editor 0.0.2-beta.580354c → 0.0.2-beta.82a2d26

package/dist/server/index.js

@@ -1,8 +1,8 @@
 import { t as __commonJSMin } from "./chunks/chunk-ByNZkrT6.js";
-import { St as writable, rt as readable, vt as uneval } from "./chunks/events-Bhh2w-5S.js";
-import { i as SvelteKitError, n as HttpError, r as Redirect, t as ActionFailure } from "./chunks/internal-DsA4iYdx.js";
-import { $ as text_encoder, A as with_request_store, B as coalesce_to_error, C as validate_layout_exports, D as merge_tracing, E as validate_page_server_exports, F as override, G as noop, H as get_message, I as reset, J as parse, K as normalize_error, L as INVALIDATED_PARAM, M as assets, N as base, Q as stringify$1, R as TRAILING_SLASH_PARAM, S as strip_resolution_suffix, T as validate_page_exports, U as get_relative_path, V as create_remote_key, W as get_status, X as split_remote_key, Y as parse_remote_arg, Z as stringify, _ as noop_span, a as set_read_implementation, c as compact, d as find_route, g as make_trackable, h as hash, i as set_manifest, j as app_dir, l as decode_pathname, m as has_resolution_suffix, n as options, o as add_data_suffix, p as has_data_suffix, q as once, r as read_implementation, s as add_resolution_suffix, t as get_hooks, u as disable_search, v as normalize_path, w as validate_layout_server_exports, x as strip_data_suffix, y as resolve, z as base64_encode } from "./chunks/internal2-DF9-voLX.js";
-import { i as json, o as text, r as isRedirect, t as error } from "./chunks/exports-CWOtdr_a.js";
+import { J as readable, St as uneval, ut as writable } from "./chunks/index-server-BthNUqCR.js";
+import { i as SvelteKitError, n as HttpError, r as Redirect, t as ActionFailure } from "./chunks/internal-vr3mPczx.js";
+import { $ as text_encoder, A as with_request_store, B as coalesce_to_error, C as validate_layout_exports, D as merge_tracing, E as validate_page_server_exports, F as override, G as noop, H as get_message, I as reset, J as parse, K as normalize_error, L as INVALIDATED_PARAM, M as assets, N as base, Q as stringify$1, R as TRAILING_SLASH_PARAM, S as strip_resolution_suffix, T as validate_page_exports, U as get_relative_path, V as create_remote_key, W as get_status, X as split_remote_key, Y as parse_remote_arg, Z as stringify, _ as noop_span, a as set_read_implementation, c as compact, d as find_route, g as make_trackable, h as hash, i as set_manifest, j as app_dir, l as decode_pathname, m as has_resolution_suffix, n as options, o as add_data_suffix, p as has_data_suffix, q as once, r as read_implementation, s as add_resolution_suffix, t as get_hooks, u as disable_search, v as normalize_path, w as validate_layout_server_exports, x as strip_data_suffix, y as resolve, z as base64_encode } from "./chunks/internal2-DhEJvRRa.js";
+import { i as json, o as text, r as isRedirect, t as error } from "./chunks/exports-D0uQzbjy.js";
 import { i as set_public_env, n as public_env, r as set_private_env } from "./chunks/shared-server-Cha0Qlv9.js";
 import { n as set_app } from "./chunks/app-DUeJj5RD.js";
 //#region .svelte-kit/adapter-bun/chunks/utils.js
@@ -1890,19 +1890,20 @@ var Csp = class {
 		this.report_only_provider.add_style(content);
 	}
 };
+/** @import { SSRManifest } from '@sveltejs/kit' */
 /**
 * @param {import('types').SSRClientRoute} route
 * @param {URL} url
-* @param {import('@sveltejs/kit').SSRManifest} manifest
+* @param {NonNullable<SSRManifest['_']['client']>} client
 * @returns {string}
 */
-function generate_route_object(route, url, manifest) {
+function generate_route_object(route, url, client) {
 	const { errors, layouts, leaf } = route;
 	const nodes = [
 		...errors,
 		...layouts.map((l) => l?.[1]),
 		leaf[1]
-	].filter((n) => typeof n === "number").map((n) => `'${n}': () => ${create_client_import(manifest._.client.nodes?.[n], url)}`).join(",\n		");
+	].filter((n) => typeof n === "number").map((n) => `'${n}': () => ${create_client_import(client.nodes?.[n], url)}`).join(",\n		");
 	/** @type {import('types').CSRRouteServer} */
 	return [
 		`{\n\tid: ${s(route.id)}`,
@@ -1927,27 +1928,27 @@ function create_client_import(import_path, url) {
 /**
 * @param {string} resolved_path
 * @param {URL} url
-* @param {import('@sveltejs/kit').SSRManifest} manifest
+* @param {SSRManifest} manifest
 * @returns {Promise<Response>}
 */
 async function resolve_route(resolved_path, url, manifest) {
-	if (!manifest._.client.routes) return text("Server-side route resolution disabled", { status: 400 });
+	if (!manifest._.client?.routes) return text("Server-side route resolution disabled", { status: 400 });
 	const matchers = await manifest._.matchers();
 	const result = find_route(resolved_path, manifest._.client.routes, matchers);
-	return create_server_routing_response(result?.route ?? null, result?.params ?? {}, url, manifest).response;
+	return create_server_routing_response(result?.route ?? null, result?.params ?? {}, url, manifest._.client).response;
 }
 /**
 * @param {import('types').SSRClientRoute | null} route
 * @param {Partial<Record<string, string>>} params
 * @param {URL} url
-* @param {import('@sveltejs/kit').SSRManifest} manifest
+* @param {NonNullable<SSRManifest['_']['client']>} client
 * @returns {{response: Response, body: string}}
 */
-function create_server_routing_response(route, params, url, manifest) {
+function create_server_routing_response(route, params, url, client) {
 	const headers = new Headers({ "content-type": "application/javascript; charset=utf-8" });
 	if (route) {
-		const csr_route = generate_route_object(route, url, manifest);
-		const body = `${create_css_import(route, url, manifest)}\nexport const route = ${csr_route}; export const params = ${JSON.stringify(params)};`;
+		const csr_route = generate_route_object(route, url, client);
+		const body = `${create_css_import(route, url, client)}\nexport const route = ${csr_route}; export const params = ${JSON.stringify(params)};`;
 		return {
 			response: text(body, { headers }),
 			body
@@ -1965,10 +1966,10 @@ function create_server_routing_response(route, params, url, manifest) {
 *
 * @param {import('types').SSRClientRoute} route
 * @param {URL} url
-* @param {import('@sveltejs/kit').SSRManifest} manifest
+* @param {NonNullable<SSRManifest['_']['client']>} client
 * @returns {string}
 */
-function create_css_import(route, url, manifest) {
+function create_css_import(route, url, client) {
 	const { errors, layouts, leaf } = route;
 	let css = "";
 	for (const node of [
@@ -1977,11 +1978,339 @@ function create_css_import(route, url, manifest) {
 		leaf[1]
 	]) {
 		if (typeof node !== "number") continue;
-		const node_css = manifest._.client.css?.[node];
+		const node_css = client.css?.[node];
 		for (const css_path of node_css ?? []) css += `'${assets || base}/${css_path}',`;
 	}
 	if (!css) return "";
-	return `${create_client_import(manifest._.client.start, url)}.then(x => x.load_css([${css}]));`;
+	return `${create_client_import(client.start, url)}.then(x => x.load_css([${css}]));`;
+}
+/** @import { ActionResult, RemoteForm, RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { RemoteFormInternals, RemoteFunctionData, RemoteFunctionResponse, RemoteInternals, RequestState, SSROptions } from 'types' */
+/** @type {typeof handle_remote_call_internal} */
+async function handle_remote_call(event, state, options, manifest, id) {
+	return record_span({
+		name: "sveltekit.remote.call",
+		attributes: { "sveltekit.remote.call.id": id },
+		fn: (current) => {
+			const traced_event = merge_tracing(event, current);
+			return with_request_store({
+				event: traced_event,
+				state
+			}, () => handle_remote_call_internal(traced_event, state, options, manifest, id));
+		}
+	});
+}
+/**
+* @param {RequestEvent} event
+* @param {RequestState} state
+* @param {SSROptions} options
+* @param {SSRManifest} manifest
+* @param {string} id
+*/
+async function handle_remote_call_internal(event, state, options, manifest, id) {
+	const [hash, name, additional_args] = id.split("/");
+	const remotes = manifest._.remotes;
+	if (!remotes[hash]) error(404);
+	const fn = (await remotes[hash]()).default[name];
+	if (!fn) error(404);
+	/** @type {RemoteInternals} */
+	const internals = fn.__;
+	const transport = options.hooks.transport;
+	event.tracing.current.setAttributes({
+		"sveltekit.remote.call.type": internals.type,
+		"sveltekit.remote.call.name": internals.name
+	});
+	try {
+		/** @type {RemoteFunctionData} */
+		const data = {};
+		switch (internals.type) {
+			case "query_live": {
+				if (event.request.method !== "GET") throw new SvelteKitError(405, "Method Not Allowed", `\`query.live\` functions must be invoked via GET request, not ${event.request.method}`);
+				const payload = new URL(event.request.url).searchParams.get("payload");
+				const generator = internals.run(event, state, parse_remote_arg(payload, transport));
+				const encoder = new TextEncoder();
+				/**
+				* @param {ReadableStreamDefaultController} controller
+				* @param {any} payload
+				*/
+				function send(controller, payload) {
+					controller.enqueue(encoder.encode("data: " + JSON.stringify(payload) + "\n\n"));
+				}
+				let closed = false;
+				/** @type {string | undefined} */
+				let result = void 0;
+				async function cancel() {
+					if (closed) return;
+					closed = true;
+					await generator.return(void 0);
+				}
+				event.request.signal.addEventListener("abort", cancel, { once: true });
+				return new Response(new ReadableStream({
+					async pull(controller) {
+						if (event.request.signal.aborted) {
+							await cancel();
+							controller.close();
+							return;
+						}
+						try {
+							while (true) {
+								const { value, done } = await generator.next();
+								if (done) {
+									await cancel();
+									controller.close();
+									return;
+								}
+								if (result !== (result = stringify(value, transport))) {
+									send(controller, {
+										type: "result",
+										result
+									});
+									return;
+								}
+							}
+						} catch (error) {
+							if (!event.request.signal.aborted) if (error instanceof Redirect) send(controller, {
+								type: "redirect",
+								location: error.location
+							});
+							else {
+								const status = error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500;
+								send(controller, {
+									type: "error",
+									error: await handle_error_and_jsonify(event, state, options, error),
+									status
+								});
+							}
+							await cancel();
+							controller.close();
+						}
+					},
+					cancel
+				}), { headers: {
+					"cache-control": "private, no-store",
+					"content-type": "text/event-stream"
+				} });
+			}
+			case "query_batch": {
+				if (event.request.method !== "POST") throw new SvelteKitError(405, "Method Not Allowed", `\`query.batch\` functions must be invoked via POST request, not ${event.request.method}`);
+				/** @type {{ payloads: string[] }} */
+				const { payloads } = await event.request.json();
+				const args = await Promise.all(payloads.map((payload) => parse_remote_arg(payload, transport)));
+				data._ = await with_request_store({
+					event,
+					state
+				}, () => internals.run(args, options));
+				break;
+			}
+			case "form": {
+				if (event.request.method !== "POST") throw new SvelteKitError(405, "Method Not Allowed", `\`form\` functions must be invoked via POST request, not ${event.request.method}`);
+				if (!is_form_content_type(event.request)) throw new SvelteKitError(415, "Unsupported Media Type", `\`form\` functions expect form-encoded data — received ${event.request.headers.get("content-type")}`);
+				const { data: input, meta, form_data } = await deserialize_binary_form(event.request);
+				state.remote.requested = create_requested_map(meta.remote_refreshes);
+				if (additional_args && !("id" in input)) input.id = JSON.parse(decodeURIComponent(additional_args));
+				const fn = internals.fn;
+				data._ = await with_request_store({
+					event,
+					state: {
+						...state,
+						is_in_remote_form_or_command: true
+					}
+				}, () => fn(input, meta, form_data));
+				if (data._.issues) return json({
+					type: "result",
+					data: stringify(data, transport)
+				});
+				break;
+			}
+			case "command": {
+				/** @type {{ payload: string, refreshes?: string[] }} */
+				const { payload, refreshes } = await event.request.json();
+				state.remote.requested = create_requested_map(refreshes);
+				const arg = parse_remote_arg(payload, transport);
+				data._ = await with_request_store({
+					event,
+					state: {
+						...state,
+						is_in_remote_form_or_command: true
+					}
+				}, () => fn(arg));
+				break;
+			}
+			case "prerender":
+				data._ = await with_request_store({
+					event,
+					state
+				}, () => fn(parse_remote_arg(additional_args, transport)));
+				break;
+			case "query": {
+				const payload = new URL(event.request.url).searchParams.get("payload");
+				data._ = await with_request_store({
+					event,
+					state
+				}, () => fn(parse_remote_arg(payload, transport)));
+				break;
+			}
+		}
+		await collect_remote_data(data, event, state, options);
+		return json({
+			type: "result",
+			data: stringify(data, transport)
+		});
+	} catch (error) {
+		if (error instanceof Redirect) return json({
+			type: "result",
+			data: stringify(await collect_remote_data({ redirect: error.location }, event, state, options), transport)
+		});
+		const status = error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500;
+		return json({
+			type: "error",
+			error: await handle_error_and_jsonify(event, state, options, error),
+			status
+		}, {
+			status: state.prerendering ? status : void 0,
+			headers: { "cache-control": "private, no-store" }
+		});
+	}
+}
+/**
+* Collects all the query/prerender data that was retrieved
+* during the request and adds it to `data`
+* @param {RemoteFunctionData} data
+* @param {RequestEvent} event
+* @param {RequestState} state
+* @param {SSROptions} options
+*/
+async function collect_remote_data(data, event, state, options) {
+	/**
+	*
+	* @param {unknown} error
+	* @returns {Promise<[status: number, error: App.Error]>}
+	*/
+	async function convert_error(error) {
+		return [error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500, await handle_error_and_jsonify(event, state, options, error)];
+	}
+	/** @type {Promise<any>[]} */
+	const promises = [];
+	if (state.remote.explicit) for (const [remote_key, { internals, promise }] of state.remote.explicit) {
+		data.r = true;
+		const type = internals.type === "query_live" ? "l" : internals.type[0];
+		await promise.then((v) => {
+			((data[type] ??= {})[remote_key] ??= {}).v = v;
+		}, async (e) => {
+			if (e instanceof Redirect) return;
+			((data[type] ??= {})[remote_key] ??= {}).e = await convert_error(e);
+		});
+	}
+	await Promise.all(promises);
+	if (state.remote.implicit) for (const [internals, record] of state.remote.implicit) {
+		if (!internals.id) continue;
+		for (const key in record) {
+			const remote_key = internals.type === "form" ? key : create_remote_key(internals.id, key);
+			const type = internals.type === "query_live" ? "l" : internals.type[0];
+			const promise = state.remote.data?.get(internals)?.[key] ?? record[key]();
+			let resolved = true;
+			await Promise.race([Promise.resolve(promise).then((v) => {
+				if (resolved) ((data[type] ??= {})[remote_key] ??= {}).v = v;
+			}, (e) => {
+				if (e instanceof Redirect) return;
+				if (resolved) promises.push(convert_error(e).then((e) => {
+					((data[type] ??= {})[remote_key] ??= {}).e = e;
+				}));
+			}), Promise.resolve().then(() => resolved = false)]);
+		}
+	}
+	await Promise.all(promises);
+	return data;
+}
+/**
+* @param {string[] | undefined} refreshes
+*/
+function create_requested_map(refreshes) {
+	/** @type {Map<string, string[]>} */
+	const requested = /* @__PURE__ */ new Map();
+	for (const key of refreshes ?? []) {
+		const parts = split_remote_key(key);
+		const existing = requested.get(parts.id);
+		if (existing) existing.push(parts.payload);
+		else requested.set(parts.id, [parts.payload]);
+	}
+	return requested;
+}
+/** @type {typeof handle_remote_form_post_internal} */
+async function handle_remote_form_post(event, state, manifest, id) {
+	return record_span({
+		name: "sveltekit.remote.form.post",
+		attributes: { "sveltekit.remote.form.post.id": id },
+		fn: (current) => {
+			const traced_event = merge_tracing(event, current);
+			return with_request_store({
+				event: traced_event,
+				state
+			}, () => handle_remote_form_post_internal(traced_event, state, manifest, id));
+		}
+	});
+}
+/**
+* @param {RequestEvent} event
+* @param {RequestState} state
+* @param {SSRManifest} manifest
+* @param {string} id
+* @returns {Promise<ActionResult>}
+*/
+async function handle_remote_form_post_internal(event, state, manifest, id) {
+	const [hash, name, ...rest] = id.split("/");
+	const action_id = rest.join("/");
+	let form = (await manifest._.remotes[hash]?.())?.default[name];
+	if (!form) {
+		event.setHeaders({ allow: "GET" });
+		return {
+			type: "error",
+			error: new SvelteKitError(405, "Method Not Allowed", `POST method not allowed. No form actions exist for this page`)
+		};
+	}
+	if (action_id) form = with_request_store({
+		event,
+		state
+	}, () => form.for(JSON.parse(action_id)));
+	try {
+		const fn = form.__.fn;
+		const { data, meta, form_data } = await deserialize_binary_form(event.request);
+		if (action_id && !("id" in data)) data.id = JSON.parse(decodeURIComponent(action_id));
+		await with_request_store({
+			event,
+			state: {
+				...state,
+				is_in_remote_form_or_command: true
+			}
+		}, () => fn(data, meta, form_data));
+		return {
+			type: "success",
+			status: 200
+		};
+	} catch (e) {
+		const err = normalize_error(e);
+		if (err instanceof Redirect) return {
+			type: "redirect",
+			status: err.status,
+			location: err.location
+		};
+		return {
+			type: "error",
+			error: check_incorrect_fail_use(err)
+		};
+	}
+}
+/**
+* @param {URL} url
+*/
+function get_remote_id(url) {
+	return url.pathname.startsWith(`${base}/_app/remote/`) && url.pathname.replace(`${base}/_app/remote/`, "");
+}
+/**
+* @param {URL} url
+*/
+function get_remote_action(url) {
+	return url.searchParams.get("/remote");
 }
 var updated = {
 	...readable(false),
@@ -2012,9 +2341,9 @@ async function render_response({ branch, fetched, options, manifest, state, page
 		if (options.app_template_contains_nonce) throw new Error("Cannot use prerendering if page template contains %sveltekit.nonce%");
 	}
 	const { client } = manifest._;
-	const modulepreloads = new Set(client.imports);
-	const stylesheets = new Set(client.stylesheets);
-	const fonts = new Set(client.fonts);
+	const modulepreloads = new Set(client?.imports);
+	const stylesheets = new Set(client?.stylesheets);
+	const fonts = new Set(client?.fonts);
 	/**
 	* The value of the Link header that is added to the response when not prerendering
 	* @type {Set<string>}
@@ -2128,7 +2457,7 @@ async function render_response({ branch, fetched, options, manifest, state, page
 		for (const url of node.imports) modulepreloads.add(url);
 		for (const url of node.stylesheets) stylesheets.add(url);
 		for (const url of node.fonts) fonts.add(url);
-		if (node.inline_styles && !client.inline) Object.entries(await node.inline_styles()).forEach(([filename, css]) => {
+		if (node.inline_styles && !client?.inline) Object.entries(await node.inline_styles()).forEach(([filename, css]) => {
 			if (typeof css === "string") {
 				inline_styles.set(filename, css);
 				return;
@@ -2143,7 +2472,7 @@ async function render_response({ branch, fetched, options, manifest, state, page
 		if (path.startsWith("/")) return base + path;
 		return `${assets$1}/${path}`;
 	};
-	const style = client.inline ? client.inline?.style : Array.from(inline_styles.values()).join("\n");
+	const style = client?.inline ? client.inline?.style : Array.from(inline_styles.values()).join("\n");
 	if (style) {
 		const attributes = [];
 		if (csp.style_needs_nonce) attributes.push(`nonce="${csp.nonce}"`);
@@ -2179,8 +2508,8 @@ async function render_response({ branch, fetched, options, manifest, state, page
 	const global = get_global_name(options);
 	const { data, chunks } = data_serializer.get_data(csp);
 	if (page_config.ssr && page_config.csr) body += `\n\t\t\t${fetched.map((item) => serialize_data(item, resolve_opts.filterSerializedResponseHeaders, !!state.prerendering)).join("\n			")}`;
-	if (page_config.csr) {
-		const route = manifest._.client.routes?.find((r) => r.id === event.route.id) ?? null;
+	if (page_config.csr && client) {
+		const route = client.routes?.find((r) => r.id === event.route.id) ?? null;
 		if (client.uses_env_dynamic_public && state.prerendering) modulepreloads.add(`${app_dir}/env.js`);
 		if (!client.inline) {
 			const included_modulepreloads = Array.from(modulepreloads, (dep) => prefixed(dep)).filter((path) => resolve_opts.preload({
@@ -2193,9 +2522,9 @@ async function render_response({ branch, fetched, options, manifest, state, page
 				else head.add_link_tag(path, ["rel=\"modulepreload\""]);
 			}
 		}
-		if (manifest._.client.routes && state.prerendering && !state.prerendering.fallback) {
+		if (client.routes && state.prerendering && !state.prerendering.fallback) {
 			const pathname = add_resolution_suffix(event.url.pathname);
-			state.prerendering.dependencies.set(pathname, create_server_routing_response(route, event.params, new URL(pathname, event.url), manifest));
+			state.prerendering.dependencies.set(pathname, create_server_routing_response(route, event.params, new URL(pathname, event.url), client));
 		}
 		const blocks = [];
 		const load_env_eagerly = client.uses_env_dynamic_public && state.prerendering;
@@ -2248,62 +2577,26 @@ async function render_response({ branch, fetched, options, manifest, state, page
 				`error: ${serialized.error}`
 			];
 			if (status !== 200) hydrate.push(`status: ${status}`);
-			if (manifest._.client.routes) {
+			if (client.routes) {
 				if (route) {
-					const stringified = generate_route_object(route, event.url, manifest).replaceAll("\n", "\n							");
+					const stringified = generate_route_object(route, event.url, client).replaceAll("\n", "\n							");
 					hydrate.push(`params: ${uneval(event.params)}`, `server_route: ${stringified}`);
 				}
 			} else if (options.embedded) hydrate.push(`params: ${uneval(event.params)}`, `route: ${s(event.route)}`);
 			const indent = "	".repeat(load_env_eagerly ? 7 : 6);
 			args.push(`{\n${indent}\t${hydrate.join(`,\n${indent}\t`)}\n${indent}}`);
 		}
-		const { remote } = event_state;
-		let serialized_query_data = "";
-		let serialized_prerender_data = "";
-		if (remote.data) {
-			/** @type {Record<string, any>} */
-			const query = {};
-			/** @type {Record<string, any>} */
-			const prerender = {};
-			for (const [internals, cache] of remote.data) {
-				if (!internals.id) continue;
-				for (const key in cache) {
-					const entry = cache[key];
-					if (!entry.serialize) continue;
-					const remote_key = create_remote_key(internals.id, key);
-					const store = internals.type === "prerender" ? prerender : query;
-					if (event_state.remote.refreshes?.has(remote_key) || event_state.remote.reconnects?.has(remote_key)) store[remote_key] = await entry.data;
-					else {
-						const result = await Promise.race([Promise.resolve(entry.data).then((v) => ({
-							settled: true,
-							value: v
-						}), (e) => ({
-							settled: true,
-							error: e
-						})), new Promise((resolve) => {
-							queueMicrotask(() => resolve({ settled: false }));
-						})]);
-						if (result.settled) {
-							if ("error" in result) throw result.error;
-							store[remote_key] = result.value;
-						}
-					}
-				}
-			}
-			const replacer = create_replacer(options.hooks.transport);
-			if (Object.keys(query).length > 0) serialized_query_data = `${global}.query = ${uneval(query, replacer)};\n\n\t\t\t\t\t\t`;
-			if (Object.keys(prerender).length > 0) serialized_prerender_data = `${global}.prerender = ${uneval(prerender, replacer)};\n\n\t\t\t\t\t\t`;
-		}
-		const serialized_remote_data = `${serialized_query_data}${serialized_prerender_data}`;
+		const remote_data = await collect_remote_data({}, event, event_state, options);
+		const serialized_data = Object.keys(remote_data).length > 0 ? `${global}.data = ${uneval(remote_data, create_replacer(options.hooks.transport))};\n\n\t\t\t\t\t\t` : "";
 		const boot = client.inline ? `${client.inline.script}
 
-					${serialized_remote_data}${global}.app.start(${args.join(", ")});` : client.app ? `Promise.all([
+					${serialized_data}${global}.app.start(${args.join(", ")});` : client.app ? `Promise.all([
 						import(${s(prefixed(client.start))}),
 						import(${s(prefixed(client.app))})
 					]).then(([kit, app]) => {
-						${serialized_remote_data}kit.start(app, ${args.join(", ")});
+						${serialized_data}kit.start(app, ${args.join(", ")});
 					});` : `import(${s(prefixed(client.start))}).then((app) => {
-						${serialized_remote_data}app.start(${args.join(", ")})
+						${serialized_data}app.start(${args.join(", ")})
 					});`;
 		if (load_env_eagerly) blocks.push(`import(${s(`${base$1}/${app_dir}/env.js`)}).then(({ env }) => {
 						${global}.env = env;
@@ -2328,6 +2621,7 @@ async function render_response({ branch, fetched, options, manifest, state, page
 		}
 		const init_app = `
 				{
+					
 					${blocks.join("\n\n					")}
 				}
 			`;
@@ -2588,287 +2882,6 @@ async function respond_with_error({ event, event_state, options, manifest, state
 		return static_error_page(options, get_status(e), (await handle_error_and_jsonify(event, event_state, options, e)).message);
 	}
 }
-/** @import { ActionResult, RemoteForm, RequestEvent, SSRManifest } from '@sveltejs/kit' */
-/** @import { RemoteFormInternals, RemoteFunctionResponse, RemoteInternals, RequestState, SSROptions } from 'types' */
-/** @type {typeof handle_remote_call_internal} */
-async function handle_remote_call(event, state, options, manifest, id) {
-	return record_span({
-		name: "sveltekit.remote.call",
-		attributes: { "sveltekit.remote.call.id": id },
-		fn: (current) => {
-			const traced_event = merge_tracing(event, current);
-			return with_request_store({
-				event: traced_event,
-				state
-			}, () => handle_remote_call_internal(traced_event, state, options, manifest, id));
-		}
-	});
-}
-/**
-* @param {RequestEvent} event
-* @param {RequestState} state
-* @param {SSROptions} options
-* @param {SSRManifest} manifest
-* @param {string} id
-*/
-async function handle_remote_call_internal(event, state, options, manifest, id) {
-	const [hash, name, additional_args] = id.split("/");
-	const remotes = manifest._.remotes;
-	if (!remotes[hash]) error(404);
-	const fn = (await remotes[hash]()).default[name];
-	if (!fn) error(404);
-	/** @type {RemoteInternals} */
-	const internals = fn.__;
-	const transport = options.hooks.transport;
-	event.tracing.current.setAttributes({
-		"sveltekit.remote.call.type": internals.type,
-		"sveltekit.remote.call.name": internals.name
-	});
-	try {
-		if (internals.type === "query_batch") {
-			if (event.request.method !== "POST") throw new SvelteKitError(405, "Method Not Allowed", `\`query.batch\` functions must be invoked via POST request, not ${event.request.method}`);
-			/** @type {{ payloads: string[] }} */
-			const { payloads } = await event.request.json();
-			const args = await Promise.all(payloads.map((payload) => parse_remote_arg(payload, transport)));
-			return json({
-				type: "result",
-				result: stringify(await with_request_store({
-					event,
-					state
-				}, () => internals.run(args, options)), transport)
-			});
-		}
-		if (internals.type === "form") {
-			if (event.request.method !== "POST") throw new SvelteKitError(405, "Method Not Allowed", `\`form\` functions must be invoked via POST request, not ${event.request.method}`);
-			if (!is_form_content_type(event.request)) throw new SvelteKitError(415, "Unsupported Media Type", `\`form\` functions expect form-encoded data — received ${event.request.headers.get("content-type")}`);
-			const { data, meta, form_data } = await deserialize_binary_form(event.request);
-			state.remote.requested = create_requested_map(meta.remote_refreshes);
-			if (additional_args && !("id" in data)) data.id = JSON.parse(decodeURIComponent(additional_args));
-			const fn = internals.fn;
-			const result = await with_request_store({
-				event,
-				state
-			}, () => fn(data, meta, form_data));
-			return json({
-				type: "result",
-				result: stringify(result, transport),
-				refreshes: result.issues ? void 0 : await serialize_singleflight(state.remote.refreshes),
-				reconnects: result.issues ? void 0 : await serialize_singleflight(state.remote.reconnects)
-			});
-		}
-		if (internals.type === "command") {
-			/** @type {{ payload: string, refreshes?: string[] }} */
-			const { payload, refreshes } = await event.request.json();
-			state.remote.requested = create_requested_map(refreshes);
-			const arg = parse_remote_arg(payload, transport);
-			return json({
-				type: "result",
-				result: stringify(await with_request_store({
-					event,
-					state
-				}, () => fn(arg)), transport),
-				refreshes: await serialize_singleflight(state.remote.refreshes),
-				reconnects: await serialize_singleflight(state.remote.reconnects)
-			});
-		}
-		if (internals.type === "query_live") {
-			if (event.request.method !== "GET") throw new SvelteKitError(405, "Method Not Allowed", `\`query.live\` functions must be invoked via GET request, not ${event.request.method}`);
-			const payload = new URL(event.request.url).searchParams.get("payload");
-			const generator = internals.run(event, state, parse_remote_arg(payload, transport));
-			const encoder = new TextEncoder();
-			/**
-			* @param {ReadableStreamDefaultController} controller
-			* @param {any} payload
-			*/
-			function send(controller, payload) {
-				controller.enqueue(encoder.encode(JSON.stringify(payload) + "\n"));
-			}
-			let closed = false;
-			/** @type {string | undefined} */
-			let result = void 0;
-			async function cancel() {
-				if (closed) return;
-				closed = true;
-				await generator.return(void 0);
-			}
-			event.request.signal.addEventListener("abort", cancel, { once: true });
-			return new Response(new ReadableStream({
-				async pull(controller) {
-					if (event.request.signal.aborted) {
-						await cancel();
-						controller.close();
-						return;
-					}
-					try {
-						while (true) {
-							const { value, done } = await generator.next();
-							if (done) {
-								await cancel();
-								controller.close();
-								return;
-							}
-							if (result !== (result = stringify(value, transport))) {
-								send(controller, {
-									type: "result",
-									result
-								});
-								return;
-							}
-						}
-					} catch (error) {
-						if (!event.request.signal.aborted) if (error instanceof Redirect) send(controller, {
-							type: "redirect",
-							location: error.location
-						});
-						else {
-							const status = error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500;
-							send(controller, {
-								type: "error",
-								error: await handle_error_and_jsonify(event, state, options, error),
-								status
-							});
-						}
-						await cancel();
-						controller.close();
-					}
-				},
-				cancel
-			}), { headers: {
-				"cache-control": "private, no-store",
-				"content-type": "application/x-ndjson"
-			} });
-		}
-		const payload = internals.type === "prerender" ? additional_args : new URL(event.request.url).searchParams.get("payload");
-		return json({
-			type: "result",
-			result: stringify(await with_request_store({
-				event,
-				state
-			}, () => fn(parse_remote_arg(payload, transport))), transport)
-		});
-	} catch (error) {
-		if (error instanceof Redirect) return json({
-			type: "redirect",
-			location: error.location,
-			refreshes: await serialize_singleflight(state.remote.refreshes),
-			reconnects: await serialize_singleflight(state.remote.reconnects)
-		});
-		const status = error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500;
-		return json({
-			type: "error",
-			error: await handle_error_and_jsonify(event, state, options, error),
-			status
-		}, {
-			status: state.prerendering ? status : void 0,
-			headers: { "cache-control": "private, no-store" }
-		});
-	}
-	/** @param {Map<string, Promise<any>> | null} map */
-	async function serialize_singleflight(map) {
-		if (!map || map.size === 0) return;
-		const results = await Promise.all(Array.from(map, async ([key, promise]) => {
-			try {
-				return [key, {
-					type: "result",
-					data: await promise
-				}];
-			} catch (error) {
-				return [key, {
-					type: "error",
-					status: error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500,
-					error: await handle_error_and_jsonify(event, state, options, error)
-				}];
-			}
-		}));
-		return stringify(Object.fromEntries(results), transport);
-	}
-}
-/**
-* @param {string[] | undefined} refreshes
-*/
-function create_requested_map(refreshes) {
-	/** @type {Map<string, string[]>} */
-	const requested = /* @__PURE__ */ new Map();
-	for (const key of refreshes ?? []) {
-		const parts = split_remote_key(key);
-		const existing = requested.get(parts.id);
-		if (existing) existing.push(parts.payload);
-		else requested.set(parts.id, [parts.payload]);
-	}
-	return requested;
-}
-/** @type {typeof handle_remote_form_post_internal} */
-async function handle_remote_form_post(event, state, manifest, id) {
-	return record_span({
-		name: "sveltekit.remote.form.post",
-		attributes: { "sveltekit.remote.form.post.id": id },
-		fn: (current) => {
-			const traced_event = merge_tracing(event, current);
-			return with_request_store({
-				event: traced_event,
-				state
-			}, () => handle_remote_form_post_internal(traced_event, state, manifest, id));
-		}
-	});
-}
-/**
-* @param {RequestEvent} event
-* @param {RequestState} state
-* @param {SSRManifest} manifest
-* @param {string} id
-* @returns {Promise<ActionResult>}
-*/
-async function handle_remote_form_post_internal(event, state, manifest, id) {
-	const [hash, name, action_id] = id.split("/");
-	let form = (await manifest._.remotes[hash]?.())?.default[name];
-	if (!form) {
-		event.setHeaders({ allow: "GET" });
-		return {
-			type: "error",
-			error: new SvelteKitError(405, "Method Not Allowed", `POST method not allowed. No form actions exist for this page`)
-		};
-	}
-	if (action_id) form = with_request_store({
-		event,
-		state
-	}, () => form.for(JSON.parse(action_id)));
-	try {
-		const fn = form.__.fn;
-		const { data, meta, form_data } = await deserialize_binary_form(event.request);
-		if (action_id && !("id" in data)) data.id = JSON.parse(decodeURIComponent(action_id));
-		await with_request_store({
-			event,
-			state
-		}, () => fn(data, meta, form_data));
-		return {
-			type: "success",
-			status: 200
-		};
-	} catch (e) {
-		const err = normalize_error(e);
-		if (err instanceof Redirect) return {
-			type: "redirect",
-			status: err.status,
-			location: err.location
-		};
-		return {
-			type: "error",
-			error: check_incorrect_fail_use(err)
-		};
-	}
-}
-/**
-* @param {URL} url
-*/
-function get_remote_id(url) {
-	return url.pathname.startsWith(`${base}/_app/remote/`) && url.pathname.replace(`${base}/_app/remote/`, "");
-}
-/**
-* @param {URL} url
-*/
-function get_remote_action(url) {
-	return url.searchParams.get("/remote");
-}
 /** @import { ActionResult, RequestEvent, SSRManifest } from '@sveltejs/kit' */
 /** @import { PageNodeIndexes, RequestState, RequiredResolveOptions, ServerDataNode, SSRComponent, SSRNode, SSROptions, SSRState } from 'types' */
 /**
@@ -3840,14 +3853,16 @@ async function internal_respond(request, options, manifest, state) {
 		tracing: { record_span },
 		remote: {
 			data: null,
+			explicit: null,
+			implicit: null,
 			forms: null,
-			refreshes: null,
 			requested: null,
-			reconnects: null,
 			batches: null,
 			live_iterators: null
 		},
 		is_in_remote_function: false,
+		is_in_remote_form_or_command: false,
+		is_in_remote_query: false,
 		is_in_render: false,
 		is_in_universal_load: false
 	};