move event.js to internal

elliott-with-the-longest-name-on-github · elliott-with-the-longest-name-on-github · commit 30ffc686e768 · 2025-08-11T15:39:30.000-06:00
diff --git a/packages/kit/src/exports/hooks/sequence.js b/packages/kit/src/exports/hooks/sequence.js
@@ -1,6 +1,6 @@
 /** @import { Handle, RequestEvent, ResolveOptions } from '@sveltejs/kit' */
 /** @import { MaybePromise } from 'types' */
-import { with_event } from '../../runtime/app/server/event.js';
+import { with_event } from '@sveltejs/kit/internal';
 import { get_event_state } from '../../runtime/server/event-state.js';
 import { merge_tracing } from '../../runtime/utils.js';
 
diff --git a/packages/kit/src/exports/internal/event.js b/packages/kit/src/exports/internal/event.js
@@ -3,7 +3,7 @@
 /** @type {RequestEvent | null} */
 let request_event = null;
 
-/** @type {import('node:async_hooks').AsyncLocalStorage<RequestEvent | null>} */
+/** @type {import('node:async_hooks').AsyncLocalStorage<RequestEvent | null> | null} */
 let als;
 
 import('node:async_hooks')
diff --git a/packages/kit/src/exports/internal/index.js b/packages/kit/src/exports/internal/index.js
@@ -62,4 +62,6 @@ export class ActionFailure {
 	}
 }
 
+export { with_event, getRequestEvent } from './event.js';
+
 export { validate_remote_functions } from './remote-functions.js';
diff --git a/packages/kit/src/runtime/app/server/index.js b/packages/kit/src/runtime/app/server/index.js
@@ -72,6 +72,6 @@ export function read(asset) {
 	throw new Error(`Asset does not exist: ${file}`);
 }
 
-export { getRequestEvent } from './event.js';
+export { getRequestEvent } from '@sveltejs/kit/internal';
 
 export { query, prerender, command, form } from './remote/index.js';
diff --git a/packages/kit/src/runtime/app/server/remote/command.js b/packages/kit/src/runtime/app/server/remote/command.js
@@ -1,7 +1,7 @@
 /** @import { RemoteCommand } from '@sveltejs/kit' */
 /** @import { RemoteInfo, MaybePromise } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
-import { getRequestEvent } from '../event.js';
+import { getRequestEvent } from '@sveltejs/kit/internal';
 import { check_experimental, create_validator, run_remote_function } from './shared.js';
 import { get_event_state } from '../../../server/event-state.js';
 
diff --git a/packages/kit/src/runtime/app/server/remote/form.js b/packages/kit/src/runtime/app/server/remote/form.js
@@ -1,6 +1,6 @@
 /** @import { RemoteForm } from '@sveltejs/kit' */
 /** @import { RemoteInfo, MaybePromise } from 'types' */
-import { getRequestEvent } from '../event.js';
+import { getRequestEvent } from '@sveltejs/kit/internal';
 import { check_experimental, run_remote_function } from './shared.js';
 import { get_event_state } from '../../../server/event-state.js';
 
diff --git a/packages/kit/src/runtime/app/server/remote/prerender.js b/packages/kit/src/runtime/app/server/remote/prerender.js
@@ -3,7 +3,7 @@
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { error, json } from '@sveltejs/kit';
 import { DEV } from 'esm-env';
-import { getRequestEvent } from '../event.js';
+import { getRequestEvent } from '@sveltejs/kit/internal';
 import { create_remote_cache_key, stringify, stringify_remote_arg } from '../../../shared.js';
 import { app_dir, base } from '__sveltekit/paths';
 import {
diff --git a/packages/kit/src/runtime/app/server/remote/query.js b/packages/kit/src/runtime/app/server/remote/query.js
@@ -1,7 +1,7 @@
 /** @import { RemoteQuery, RemoteQueryFunction } from '@sveltejs/kit' */
 /** @import { RemoteInfo, MaybePromise } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
-import { getRequestEvent } from '../event.js';
+import { getRequestEvent } from '@sveltejs/kit/internal';
 import { create_remote_cache_key, stringify_remote_arg } from '../../../shared.js';
 import { prerendering } from '__sveltekit/environment';
 import {
diff --git a/packages/kit/src/runtime/app/server/remote/shared.js b/packages/kit/src/runtime/app/server/remote/shared.js
@@ -2,7 +2,7 @@
 /** @import { ServerHooks, MaybePromise } from 'types' */
 import { parse } from 'devalue';
 import { error } from '@sveltejs/kit';
-import { getRequestEvent, with_event } from '../event.js';
+import { getRequestEvent, with_event } from '@sveltejs/kit/internal';
 import { create_remote_cache_key, stringify_remote_arg } from '../../../shared.js';
 import { EVENT_STATE, get_event_state } from '../../../server/event-state.js';
 
diff --git a/packages/kit/src/runtime/server/endpoint.js b/packages/kit/src/runtime/server/endpoint.js
@@ -1,7 +1,6 @@
-import { Redirect } from '@sveltejs/kit/internal';
+import { Redirect, with_event } from '@sveltejs/kit/internal';
 import { ENDPOINT_METHODS, PAGE_METHODS } from '../../constants.js';
 import { negotiate } from '../../utils/http.js';
-import { with_event } from '../app/server/event.js';
 import { method_not_allowed } from './utils.js';
 
 /**
diff --git a/packages/kit/src/runtime/server/page/actions.js b/packages/kit/src/runtime/server/page/actions.js
@@ -3,11 +3,16 @@
 import * as devalue from 'devalue';
 import { DEV } from 'esm-env';
 import { json } from '@sveltejs/kit';
-import { HttpError, Redirect, ActionFailure, SvelteKitError } from '@sveltejs/kit/internal';
+import {
+	HttpError,
+	Redirect,
+	ActionFailure,
+	SvelteKitError,
+	with_event
+} from '@sveltejs/kit/internal';
 import { get_status, normalize_error } from '../../../utils/error.js';
 import { is_form_content_type, negotiate } from '../../../utils/http.js';
 import { handle_error_and_jsonify } from '../utils.js';
-import { with_event } from '../../app/server/event.js';
 import { record_span } from '../../telemetry/record_span.js';
 import { merge_tracing } from '../../utils.js';
 
diff --git a/packages/kit/src/runtime/server/page/load_data.js b/packages/kit/src/runtime/server/page/load_data.js
@@ -2,7 +2,7 @@ import { DEV } from 'esm-env';
 import { disable_search, make_trackable } from '../../../utils/url.js';
 import { validate_depends, validate_load_response } from '../../shared.js';
 import { b64_encode, merge_tracing } from '../../utils.js';
-import { with_event } from '../../app/server/event.js';
+import { with_event } from '@sveltejs/kit/internal';
 import { record_span } from '../../telemetry/record_span.js';
 import { get_node_type } from '../utils.js';
 
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
@@ -15,7 +15,7 @@ import { SVELTE_KIT_ASSETS } from '../../../constants.js';
 import { SCHEME } from '../../../utils/url.js';
 import { create_server_routing_response, generate_route_object } from './server_routing.js';
 import { add_resolution_suffix } from '../../pathname.js';
-import { with_event } from '../../app/server/event.js';
+import { with_event } from '@sveltejs/kit/internal';
 import { get_event_state } from '../event-state.js';
 
 // TODO rename this function/module
diff --git a/packages/kit/src/runtime/server/remote.js b/packages/kit/src/runtime/server/remote.js
@@ -2,9 +2,8 @@
 /** @import { RemoteFunctionResponse, RemoteInfo, SSROptions } from 'types' */
 
 import { json, error } from '@sveltejs/kit';
-import { HttpError, Redirect, SvelteKitError } from '@sveltejs/kit/internal';
+import { HttpError, Redirect, SvelteKitError, with_event } from '@sveltejs/kit/internal';
 import { app_dir, base } from '__sveltekit/paths';
-import { with_event } from '../app/server/event.js';
 import { is_form_content_type } from '../../utils/http.js';
 import { parse_remote_arg, stringify } from '../shared.js';
 import { handle_error_and_jsonify } from './utils.js';
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
@@ -1,6 +1,6 @@
 import { DEV } from 'esm-env';
 import { json, text } from '@sveltejs/kit';
-import { Redirect, SvelteKitError } from '@sveltejs/kit/internal';
+import { Redirect, SvelteKitError, with_event } from '@sveltejs/kit/internal';
 import { base, app_dir } from '__sveltekit/paths';
 import { is_endpoint_request, render_endpoint } from './endpoint.js';
 import { render_page } from './page/index.js';
@@ -34,7 +34,6 @@ import {
 	strip_resolution_suffix
 } from '../pathname.js';
 import { get_remote_id, handle_remote_call } from './remote.js';
-import { with_event } from '../app/server/event.js';
 import { record_span } from '../telemetry/record_span.js';
 import { merge_tracing } from '../utils.js';
 import { create_event_state, EVENT_STATE } from './event-state.js';
diff --git a/packages/kit/src/runtime/server/utils.js b/packages/kit/src/runtime/server/utils.js
@@ -6,7 +6,7 @@ import { negotiate } from '../../utils/http.js';
 import { fix_stack_trace } from '../shared-server.js';
 import { ENDPOINT_METHODS } from '../../constants.js';
 import { escape_html } from '../../utils/escape.js';
-import { with_event } from '../app/server/event.js';
+import { with_event } from '../../exports/internal/event.js';
 
 /** @param {any} body */
 export function is_pojo(body) {
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
@@ -4,7 +4,7 @@
 declare module '@sveltejs/kit' {
 	import type { SvelteConfig } from '@sveltejs/vite-plugin-svelte';
 	import type { StandardSchemaV1 } from '@standard-schema/spec';
-	import type { RouteId as AppRouteId, LayoutParams as AppLayoutParams, ResolvedPathname } from '$app/types';
+	import type { RouteId as AppRouteId, LayoutParams as AppLayoutParams_1, ResolvedPathname } from '$app/types';
 	import type { Span } from '@opentelemetry/api';
 	/**
 	 * [Adapters](https://svelte.dev/docs/kit/adapters) are responsible for taking the production build and turning it into something that can be deployed to a platform of your choosing.
@@ -873,7 +873,7 @@ declare module '@sveltejs/kit' {
 	 * rather than using `Load` directly.
 	 */
 	export type Load<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		InputData extends Record<string, unknown> | null = Record<string, any> | null,
 		ParentData extends Record<string, unknown> = Record<string, any>,
 		OutputData extends Record<string, unknown> | void = Record<string, any> | void,
@@ -885,7 +885,7 @@ declare module '@sveltejs/kit' {
 	 * rather than using `LoadEvent` directly.
 	 */
 	export interface LoadEvent<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		Data extends Record<string, unknown> | null = Record<string, any> | null,
 		ParentData extends Record<string, unknown> = Record<string, any>,
 		RouteId extends AppRouteId | null = AppRouteId | null
@@ -1006,7 +1006,7 @@ declare module '@sveltejs/kit' {
 	}
 
 	export interface NavigationEvent<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> {
 		/**
@@ -1146,7 +1146,7 @@ declare module '@sveltejs/kit' {
 	 * The shape of the [`page`](https://svelte.dev/docs/kit/$app-state#page) reactive object and the [`$page`](https://svelte.dev/docs/kit/$app-stores) store.
 	 */
 	export interface Page<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> {
 		/**
@@ -1194,7 +1194,7 @@ declare module '@sveltejs/kit' {
 	export type ParamMatcher = (param: string) => boolean;
 
 	export interface RequestEvent<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> {
 		/**
@@ -1305,7 +1305,7 @@ declare module '@sveltejs/kit' {
 	 * It receives `Params` as the first generic argument, which you can skip by using [generated types](https://svelte.dev/docs/kit/types#Generated-types) instead.
 	 */
 	export type RequestHandler<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> = (event: RequestEvent<Params, RouteId>) => MaybePromise<Response>;
 
@@ -1386,14 +1386,14 @@ declare module '@sveltejs/kit' {
 	 * rather than using `ServerLoad` directly.
 	 */
 	export type ServerLoad<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		ParentData extends Record<string, any> = Record<string, any>,
 		OutputData extends Record<string, any> | void = Record<string, any> | void,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> = (event: ServerLoadEvent<Params, ParentData, RouteId>) => MaybePromise<OutputData>;
 
 	export interface ServerLoadEvent<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		ParentData extends Record<string, any> = Record<string, any>,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> extends RequestEvent<Params, RouteId> {
@@ -1475,7 +1475,7 @@ declare module '@sveltejs/kit' {
 	 * See [form actions](https://svelte.dev/docs/kit/form-actions) for more information.
 	 */
 	export type Action<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		OutputData extends Record<string, any> | void = Record<string, any> | void,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> = (event: RequestEvent<Params, RouteId>) => MaybePromise<OutputData>;
@@ -1485,7 +1485,7 @@ declare module '@sveltejs/kit' {
 	 * See [form actions](https://svelte.dev/docs/kit/form-actions) for more information.
 	 */
 	export type Actions<
-		Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+		Params extends AppLayoutParams_1<'/'> = AppLayoutParams_1<'/'>,
 		OutputData extends Record<string, any> | void = Record<string, any> | void,
 		RouteId extends AppRouteId | null = AppRouteId | null
 	> = Record<string, Action<Params, OutputData, RouteId>>;

Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,6 @@ export class ActionFailure {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
	`65`	`+export { with_event, getRequestEvent } from './event.js';`
	`66`	`+`
`65`	`67`	`export { validate_remote_functions } from './remote-functions.js';`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ export function read(asset) {`
`72`	`72`	throw new Error(`Asset does not exist: ${file}`);
`73`	`73`	`}`
`74`	`74`
`75`		`-export { getRequestEvent } from './event.js';`
	`75`	`+export { getRequestEvent } from '@sveltejs/kit/internal';`
`76`	`76`
`77`	`77`	`export { query, prerender, command, form } from './remote/index.js';`