@sveltejs/kit 3.0.0-next.19 → 3.0.0-next.20

package/src/runtime/server/internal.js

@@ -1,5 +1,18 @@
 /** @import { SSRManifest } from '@sveltejs/kit'; */
 import { restore, save } from './dev.js';
+import {
+	has_data_suffix,
+	has_resolution_suffix,
+	strip_data_suffix,
+	strip_resolution_suffix
+} from '../../pathname.js';
+import { has_remote_prefix, strip_remote_prefix } from '../../runtime/server/remote-functions.js';
+
+// using `getBuiltinModule` rather than `import` makes this safe to run in non-Node-compatible environments
+const styleText =
+	// eslint-disable-next-line n/prefer-global/process
+	globalThis.process?.getBuiltinModule?.('node:util')?.styleText ??
+	/** @type {(format: unknown, text: string) => string} */ ((_format, text) => text);
 
 const read_implementation_key = Symbol.for('sveltekit.read_implementation');
 const manifest_key = Symbol.for('sveltekit.manifest');
@@ -29,4 +42,30 @@ export function set_manifest(value) {
 	if (__SVELTEKIT_DEV__) save(manifest_key, value);
 }
 
+/**
+ * @param {number} status
+ * @param {Request} request
+ */
+export function log_response(status, request) {
+	const url = new URL(request.url);
+	const requested = url.href.replace(url.origin, '');
+
+	let log = `${styleText(status < 400 ? ['cyan'] : ['bold', 'red'], `${status}`)} ${request.method} `;
+
+	if (has_data_suffix(url.pathname)) {
+		const pathname = strip_data_suffix(url.pathname) || '/';
+		log += pathname + styleText('dim', requested.slice(pathname.length));
+	} else if (has_resolution_suffix(url.pathname)) {
+		const pathname = strip_resolution_suffix(url.pathname) || '/';
+		log += pathname + styleText('dim', requested.slice(pathname.length));
+	} else if (has_remote_prefix(url)) {
+		const id = /** @type {string} */ (strip_remote_prefix(url).split('/').pop());
+		log += styleText('dim', url.pathname.slice(0, -id.length)) + id + styleText('dim', url.search);
+	} else {
+		log += requested;
+	}
+
+	console.log(log);
+}
+
 export { fix_stack_trace, set_fix_stack_trace } from './sourcemaps.js';

package/src/runtime/server/page/load_data.js

@@ -260,7 +260,7 @@ export async function load_data({
  * @param {import('types').PrerenderOptions | undefined} prerendering
  * @param {import('./types.js').Fetched[]} fetched
  * @param {boolean} csr
- * @param {Pick<Required<import('@sveltejs/kit').ResolveOptions>, 'filterSerializedResponseHeaders'>} resolve_opts
+ * @param {Pick<Required<import('@sveltejs/kit/hooks').ResolveOptions>, 'filterSerializedResponseHeaders'>} resolve_opts
  * @returns {typeof fetch}
  */
 export function create_universal_fetch(event, prerendering, fetched, csr, resolve_opts) {

package/src/runtime/server/remote-functions.js

@@ -1,4 +1,5 @@
-/** @import { RemoteForm, RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { RemoteForm } from '$app/server' */
 /** @import { ActionResult } from '$app/forms' */
 /** @import { RemoteFormInternals, RemoteFunctionData, RemoteFunctionResponse, RemoteInternals, RequestState, SSROptions } from 'types' */
 
@@ -609,14 +610,25 @@ async function handle_remote_form_post_internal(event, state, manifest, id) {
 	}
 }
 
+/**
+ * @param {URL} url
+ */
+export function has_remote_prefix(url) {
+	return url.pathname.startsWith(`${base}/${app_dir}/remote/`);
+}
+
+/**
+ * @param {URL} url
+ */
+export function strip_remote_prefix(url) {
+	return url.pathname.replace(`${base}/${app_dir}/remote/`, '');
+}
+
 /**
  * @param {URL} url
  */
 export function get_remote_id(url) {
-	return (
-		url.pathname.startsWith(`${base}/${app_dir}/remote/`) &&
-		url.pathname.replace(`${base}/${app_dir}/remote/`, '')
-	);
+	return has_remote_prefix(url) && strip_remote_prefix(url);
 }
 
 /**

package/src/runtime/server/respond.js

@@ -576,7 +576,7 @@ export async function internal_respond(request, options, manifest, state) {
 	/**
 	 * @param {import('@sveltejs/kit').RequestEvent} event
 	 * @param {PageNodes | undefined} page_nodes
-	 * @param {import('@sveltejs/kit').ResolveOptions} [opts]
+	 * @param {import('@sveltejs/kit/hooks').ResolveOptions} [opts]
 	 */
 	async function resolve(event, page_nodes, opts) {
 		try {

package/src/types/internal.d.ts

@@ -2,28 +2,28 @@ import { Component } from 'svelte';
 import {
 	Config,
 	ServerLoad,
-	Handle,
-	HandleServerError,
 	KitConfig,
 	Load,
 	RequestHandler,
-	ResolveOptions,
 	Server,
 	ServerInitOptions,
-	HandleFetch,
 	Actions,
-	HandleClientError,
-	Reroute,
 	RequestEvent,
 	SSRManifest,
-	Emulator,
-	ServerInit,
-	ClientInit,
-	Transport,
-	RemoteFormIssue,
-	RemoteQuery,
-	RemoteLiveQuery
+	Emulator
 } from '@sveltejs/kit';
+import { RemoteFormIssue, RemoteQuery, RemoteLiveQuery } from '$app/server';
+import {
+	ClientInit,
+	Handle,
+	HandleClientError,
+	HandleFetch,
+	HandleServerError,
+	Reroute,
+	ResolveOptions,
+	ServerInit,
+	Transport
+} from '@sveltejs/kit/hooks';
 import {
 	HttpMethod,
 	MaybePromise,
@@ -48,6 +48,7 @@ export interface ServerInternalModule {
 	set_version(version: string): void;
 	set_fix_stack_trace(fix_stack_trace: (error: Error) => void): void;
 	get_hooks: () => Promise<Record<string, any>>;
+	log_response: (status: number, request: Request) => void;
 }
 
 export interface Asset {

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '3.0.0-next.19';
+export const VERSION = '3.0.0-next.20';