move event-state to internal

elliott-with-the-longest-name-on-github · elliott-with-the-longest-name-on-github · commit b5268319f730 · 2025-08-11T16:07:54.000-06:00
diff --git a/packages/kit/src/exports/hooks/sequence.js b/packages/kit/src/exports/hooks/sequence.js
@@ -1,8 +1,6 @@
 /** @import { Handle, RequestEvent, ResolveOptions } from '@sveltejs/kit' */
 /** @import { MaybePromise } from 'types' */
-import { with_event } from '@sveltejs/kit/internal';
-import { get_event_state } from '../../runtime/server/event-state.js';
-import { merge_tracing } from '../../runtime/utils.js';
+import { with_event, get_event_state, merge_tracing } from '@sveltejs/kit/internal';
 
 /**
  * A helper function for sequencing multiple `handle` calls in a middleware-like manner.
diff --git a/packages/kit/src/exports/hooks/sequence.spec.js b/packages/kit/src/exports/hooks/sequence.spec.js
@@ -1,19 +1,21 @@
 import { assert, expect, test } from 'vitest';
 import { sequence } from './sequence.js';
 import { installPolyfills } from '../node/polyfills.js';
-import { EVENT_STATE } from '../../runtime/server/event-state.js';
+import { EVENT_STATE } from '@sveltejs/kit/internal';
 
 installPolyfills();
 
-const dummy_event = /** @type {import('@sveltejs/kit').RequestEvent} */ ({
-	tracing: { root: {} },
-	[EVENT_STATE]: {
-		tracing: {
-			// @ts-expect-error
-			record_span: ({ fn }) => fn()
+const dummy_event = /** @type {import('@sveltejs/kit').RequestEvent} */ (
+	/** @type {unknown} */ ({
+		tracing: { root: {} },
+		[EVENT_STATE]: {
+			tracing: {
+				// @ts-expect-error
+				record_span: ({ fn }) => fn()
+			}
 		}
-	}
-});
+	})
+);
 
 test('applies handlers in sequence', async () => {
 	/** @type {string[]} */
diff --git a/packages/kit/src/exports/internal/event-state.js b/packages/kit/src/exports/internal/event-state.js
@@ -1,6 +1,5 @@
 /** @import { RequestEvent } from '@sveltejs/kit' */
-/** @import { MaybePromise, PrerenderOptions, ServerHooks, SSROptions, SSRState } from 'types' */
-/** @import { type record_span } from '../telemetry/record_span.js' */
+/** @import { MaybePromise, PrerenderOptions, ServerHooks, SSROptions, SSRState, RecordSpan } from 'types' */
 
 export const EVENT_STATE = Symbol('remote');
 
@@ -12,7 +11,7 @@ export const EVENT_STATE = Symbol('remote');
  *  transport: ServerHooks['transport'];
  *  handleValidationError: ServerHooks['handleValidationError'];
  *  tracing: {
- *    record_span: typeof record_span
+ *    record_span: RecordSpan
  *  }
  *  form_instances?: Map<any, any>;
  * 	remote_data?: Record<string, MaybePromise<any>>;
@@ -23,7 +22,7 @@ export const EVENT_STATE = Symbol('remote');
 /**
  * @param {SSRState} state
  * @param {SSROptions} options
- * @param {typeof record_span} record_span
+ * @param {RecordSpan} record_span
  * @returns {RequestEventState}
  */
 export function create_event_state(state, options, record_span) {
diff --git a/packages/kit/src/exports/internal/index.js b/packages/kit/src/exports/internal/index.js
@@ -64,4 +64,22 @@ export class ActionFailure {
 
 export { with_event, getRequestEvent } from './event.js';
 
+export { EVENT_STATE, get_event_state, create_event_state } from './event-state.js';
+
 export { validate_remote_functions } from './remote-functions.js';
+
+/**
+ * @template {{ tracing: { enabled: boolean, root: import('@opentelemetry/api').Span, current: import('@opentelemetry/api').Span } }} T
+ * @param {T} event_like
+ * @param {import('@opentelemetry/api').Span} current
+ * @returns {T}
+ */
+export function merge_tracing(event_like, current) {
+	return {
+		...event_like,
+		tracing: {
+			...event_like.tracing,
+			current
+		}
+	};
+}
diff --git a/packages/kit/src/runtime/app/server/remote/command.js b/packages/kit/src/runtime/app/server/remote/command.js
@@ -1,9 +1,8 @@
 /** @import { RemoteCommand } from '@sveltejs/kit' */
 /** @import { RemoteInfo, MaybePromise } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
-import { getRequestEvent } from '@sveltejs/kit/internal';
+import { getRequestEvent, get_event_state } from '@sveltejs/kit/internal';
 import { check_experimental, create_validator, run_remote_function } from './shared.js';
-import { get_event_state } from '../../../server/event-state.js';
 
 /**
  * Creates a remote command. When called from the browser, the function will be invoked on the server via a `fetch` call.
diff --git a/packages/kit/src/runtime/app/server/remote/form.js b/packages/kit/src/runtime/app/server/remote/form.js
@@ -1,8 +1,7 @@
 /** @import { RemoteForm } from '@sveltejs/kit' */
 /** @import { RemoteInfo, MaybePromise } from 'types' */
-import { getRequestEvent } from '@sveltejs/kit/internal';
+import { getRequestEvent, get_event_state } from '@sveltejs/kit/internal';
 import { check_experimental, run_remote_function } from './shared.js';
-import { get_event_state } from '../../../server/event-state.js';
 
 /**
  * Creates a form object that can be spread onto a `<form>` element.
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 '@sveltejs/kit/internal';
+import { getRequestEvent, get_event_state } from '@sveltejs/kit/internal';
 import { create_remote_cache_key, stringify, stringify_remote_arg } from '../../../shared.js';
 import { app_dir, base } from '__sveltekit/paths';
 import {
@@ -13,7 +13,6 @@ import {
 	parse_remote_response,
 	run_remote_function
 } from './shared.js';
-import { get_event_state } from '../../../server/event-state.js';
 
 /**
  * Creates a remote prerender function. When called from the browser, the function will be invoked on the server via a `fetch` call.
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 '@sveltejs/kit/internal';
+import { getRequestEvent, get_event_state } from '@sveltejs/kit/internal';
 import { create_remote_cache_key, stringify_remote_arg } from '../../../shared.js';
 import { prerendering } from '__sveltekit/environment';
 import {
@@ -10,7 +10,6 @@ import {
 	get_response,
 	run_remote_function
 } from './shared.js';
-import { get_event_state } from '../../../server/event-state.js';
 
 /**
  * Creates a remote query. When called from the browser, the function will be invoked on the server via a `fetch` call.
diff --git a/packages/kit/src/runtime/app/server/remote/shared.js b/packages/kit/src/runtime/app/server/remote/shared.js
@@ -2,9 +2,8 @@
 /** @import { ServerHooks, MaybePromise } from 'types' */
 import { parse } from 'devalue';
 import { error } from '@sveltejs/kit';
-import { getRequestEvent, with_event } from '@sveltejs/kit/internal';
+import { getRequestEvent, with_event, EVENT_STATE, get_event_state } 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';
 
 /**
  * @param {any} validate_or_fn
diff --git a/packages/kit/src/runtime/server/page/actions.js b/packages/kit/src/runtime/server/page/actions.js
@@ -8,13 +8,13 @@ import {
 	Redirect,
 	ActionFailure,
 	SvelteKitError,
-	with_event
+	with_event,
+	merge_tracing
 } 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 { record_span } from '../../telemetry/record_span.js';
-import { merge_tracing } from '../../utils.js';
 
 /** @param {RequestEvent} event */
 export function is_action_json_request(event) {
diff --git a/packages/kit/src/runtime/server/page/load_data.js b/packages/kit/src/runtime/server/page/load_data.js
@@ -1,8 +1,8 @@
 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 '@sveltejs/kit/internal';
+import { b64_encode } from '../../utils.js';
+import { with_event, merge_tracing } 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,8 +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 '@sveltejs/kit/internal';
-import { get_event_state } from '../event-state.js';
+import { with_event, get_event_state } from '@sveltejs/kit/internal';
 
 // TODO rename this function/module
 
diff --git a/packages/kit/src/runtime/server/remote.js b/packages/kit/src/runtime/server/remote.js
@@ -2,17 +2,22 @@
 /** @import { RemoteFunctionResponse, RemoteInfo, SSROptions } from 'types' */
 
 import { json, error } from '@sveltejs/kit';
-import { HttpError, Redirect, SvelteKitError, with_event } from '@sveltejs/kit/internal';
+import {
+	HttpError,
+	Redirect,
+	SvelteKitError,
+	with_event,
+	get_event_state,
+	merge_tracing
+} from '@sveltejs/kit/internal';
 import { app_dir, base } from '__sveltekit/paths';
 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';
 import { normalize_error } from '../../utils/error.js';
 import { check_incorrect_fail_use } from './page/actions.js';
 import { DEV } from 'esm-env';
-import { get_event_state } from './event-state.js';
 import { record_span } from '../telemetry/record_span.js';
-import { merge_tracing } from '../utils.js';
 
 /** @type {typeof handle_remote_call_internal} */
 export async function handle_remote_call(event, options, manifest, id) {
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
@@ -1,6 +1,13 @@
 import { DEV } from 'esm-env';
 import { json, text } from '@sveltejs/kit';
-import { Redirect, SvelteKitError, with_event } from '@sveltejs/kit/internal';
+import {
+	Redirect,
+	SvelteKitError,
+	with_event,
+	create_event_state,
+	EVENT_STATE,
+	merge_tracing
+} 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';
@@ -35,8 +42,6 @@ import {
 } from '../pathname.js';
 import { get_remote_id, handle_remote_call } from './remote.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';
 import { otel } from '../telemetry/otel.js';
 
 /* global __SVELTEKIT_ADAPTER_NAME__ */
diff --git a/packages/kit/src/runtime/telemetry/record_span.js b/packages/kit/src/runtime/telemetry/record_span.js
@@ -1,16 +1,9 @@
-/** @import { Attributes, Span } from '@opentelemetry/api' */
+/** @import { RecordSpan } from 'types' */
 import { HttpError, Redirect } from '@sveltejs/kit/internal';
 import { noop_span } from './noop.js';
 import { otel } from './otel.js';
 
-/**
- * @template T
- * @param {Object} options
- * @param {string} options.name
- * @param {Attributes} options.attributes
- * @param {function(Span): Promise<T>} options.fn
- * @returns {Promise<T>}
- */
+/** @type {RecordSpan} */
 export async function record_span({ name, attributes, fn }) {
 	if (otel === null) {
 		return fn(noop_span);
diff --git a/packages/kit/src/runtime/utils.js b/packages/kit/src/runtime/utils.js
@@ -53,19 +53,3 @@ export function get_relative_path(from, to) {
 
 	return from_parts.concat(to_parts).join('/');
 }
-
-/**
- * @template {{ tracing: { enabled: boolean, root: import('@opentelemetry/api').Span, current: import('@opentelemetry/api').Span } }} T
- * @param {T} event_like
- * @param {import('@opentelemetry/api').Span} current
- * @returns {T}
- */
-export function merge_tracing(event_like, current) {
-	return {
-		...event_like,
-		tracing: {
-			...event_like.tracing,
-			current
-		}
-	};
-}
diff --git a/packages/kit/src/types/internal.d.ts b/packages/kit/src/types/internal.d.ts
@@ -30,6 +30,7 @@ import {
 	RequestOptions,
 	TrailingSlash
 } from './private.js';
+import { Span } from '@opentelemetry/api';
 
 export interface ServerModule {
 	Server: typeof InternalServer;
@@ -566,5 +567,11 @@ export type RemoteInfo =
 			inputs?: RemotePrerenderInputsGenerator;
 	  };
 
+export type RecordSpan = <T>(options: {
+	name: string;
+	attributes: Record<string, any>;
+	fn: (current: Span) => Promise<T>;
+}) => Promise<T>;
+
 export * from '../exports/index.js';
 export * from './private.js';
