ref(core): Rename types-hoist to types

packages/core/src/api.ts

@@ -1,6 +1,6 @@
 import type { ReportDialogOptions } from './report-dialog';
-import type { DsnComponents, DsnLike } from './types-hoist/dsn';
-import type { SdkInfo } from './types-hoist/sdkinfo';
+import type { DsnComponents, DsnLike } from './types/dsn';
+import type { SdkInfo } from './types/sdkinfo';
 import { dsnToString, makeDsn } from './utils/dsn';
 
 export const SENTRY_API_VERSION = '7';

packages/core/src/attributes.ts

@@ -1,5 +1,5 @@
-import type { DurationUnit, FractionUnit, InformationUnit } from './types-hoist/measurement';
-import type { Primitive } from './types-hoist/misc';
+import type { DurationUnit, FractionUnit, InformationUnit } from './types/measurement';
+import type { Primitive } from './types/misc';
 import { isPrimitive } from './utils/is';
 
 export type RawAttributes<T> = T & ValidatedAttributes<T>;

packages/core/src/breadcrumbs.ts

@@ -1,5 +1,5 @@
 import { getClient, getIsolationScope } from './currentScopes';
-import type { Breadcrumb, BreadcrumbHint } from './types-hoist/breadcrumb';
+import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb';
 import { consoleSandbox } from './utils/debug-logger';
 import { dateTimestampInSeconds } from './utils/time';
 

packages/core/src/browser-exports.ts

@@ -5,12 +5,12 @@
  */
 export { getComponentName, getLocationHref, htmlTreeAsString } from './utils/browser';
 export { supportsDOMError, supportsHistory, supportsNativeFetch, supportsReportingObserver } from './utils/supports';
-export type { XhrBreadcrumbData, XhrBreadcrumbHint } from './types-hoist/breadcrumb';
+export type { XhrBreadcrumbData, XhrBreadcrumbHint } from './types/breadcrumb';
 export type {
   HandlerDataXhr,
   HandlerDataDom,
   HandlerDataHistory,
   SentryXhrData,
   SentryWrappedXMLHttpRequest,
-} from './types-hoist/instrument';
-export type { BrowserClientReplayOptions, BrowserClientProfilingOptions } from './types-hoist/browseroptions';
+} from './types/instrument';
+export type { BrowserClientReplayOptions, BrowserClientProfilingOptions } from './types/browseroptions';

packages/core/src/carrier.ts

@@ -2,8 +2,8 @@ import type { AsyncContextStack } from './asyncContext/stackStrategy';
 import type { AsyncContextStrategy } from './asyncContext/types';
 import type { Client } from './client';
 import type { Scope } from './scope';
-import type { SerializedLog } from './types-hoist/log';
-import type { SerializedMetric } from './types-hoist/metric';
+import type { SerializedLog } from './types/log';
+import type { SerializedMetric } from './types/metric';
 import { SDK_VERSION } from './utils/version';
 import { GLOBAL_OBJ } from './utils/worldwide';
 

packages/core/src/checkin.ts

@@ -1,7 +1,7 @@
-import type { SerializedCheckIn } from './types-hoist/checkin';
-import type { DsnComponents } from './types-hoist/dsn';
-import type { CheckInEnvelope, CheckInItem, DynamicSamplingContext } from './types-hoist/envelope';
-import type { SdkMetadata } from './types-hoist/sdkmetadata';
+import type { SerializedCheckIn } from './types/checkin';
+import type { DsnComponents } from './types/dsn';
+import type { CheckInEnvelope, CheckInItem, DynamicSamplingContext } from './types/envelope';
+import type { SdkMetadata } from './types/sdkmetadata';
 import { dsnToString } from './utils/dsn';
 import { createEnvelope } from './utils/envelope';
 

packages/core/src/client.ts

@@ -14,29 +14,29 @@ import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingCon
 import { isStreamedBeforeSendSpanCallback } from './tracing/spans/beforeSendSpan';
 import { extractGenAiSpansFromEvent } from './tracing/spans/extractGenAiSpans';
 import { DEFAULT_TRANSPORT_BUFFER_SIZE } from './transports/base';
-import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbHint, XhrBreadcrumbHint } from './types-hoist/breadcrumb';
-import type { CheckIn, MonitorConfig } from './types-hoist/checkin';
-import type { EventDropReason, Outcome } from './types-hoist/clientreport';
-import type { DataCategory } from './types-hoist/datacategory';
-import type { DsnComponents } from './types-hoist/dsn';
-import type { DynamicSamplingContext, Envelope } from './types-hoist/envelope';
-import type { ErrorEvent, Event, EventHint, EventType, TransactionEvent } from './types-hoist/event';
-import type { EventProcessor } from './types-hoist/eventprocessor';
-import type { FeedbackEvent } from './types-hoist/feedback';
-import type { Integration } from './types-hoist/integration';
-import type { Log } from './types-hoist/log';
-import type { Metric } from './types-hoist/metric';
-import type { Primitive } from './types-hoist/misc';
-import type { ClientOptions } from './types-hoist/options';
-import type { ParameterizedString } from './types-hoist/parameterize';
-import type { ReplayEndEvent, ReplayStartEvent } from './types-hoist/replay';
-import type { RequestEventData } from './types-hoist/request';
-import type { SdkMetadata } from './types-hoist/sdkmetadata';
-import type { Session, SessionAggregates } from './types-hoist/session';
-import type { SeverityLevel } from './types-hoist/severity';
-import type { Span, SpanAttributes, SpanContextData, SpanJSON, StreamedSpanJSON } from './types-hoist/span';
-import type { StartSpanOptions } from './types-hoist/startSpanOptions';
-import type { Transport, TransportMakeRequestResponse } from './types-hoist/transport';
+import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbHint, XhrBreadcrumbHint } from './types/breadcrumb';
+import type { CheckIn, MonitorConfig } from './types/checkin';
+import type { EventDropReason, Outcome } from './types/clientreport';
+import type { DataCategory } from './types/datacategory';
+import type { DsnComponents } from './types/dsn';
+import type { DynamicSamplingContext, Envelope } from './types/envelope';
+import type { ErrorEvent, Event, EventHint, EventType, TransactionEvent } from './types/event';
+import type { EventProcessor } from './types/eventprocessor';
+import type { FeedbackEvent } from './types/feedback';
+import type { Integration } from './types/integration';
+import type { Log } from './types/log';
+import type { Metric } from './types/metric';
+import type { Primitive } from './types/misc';
+import type { ClientOptions } from './types/options';
+import type { ParameterizedString } from './types/parameterize';
+import type { ReplayEndEvent, ReplayStartEvent } from './types/replay';
+import type { RequestEventData } from './types/request';
+import type { SdkMetadata } from './types/sdkmetadata';
+import type { Session, SessionAggregates } from './types/session';
+import type { SeverityLevel } from './types/severity';
+import type { Span, SpanAttributes, SpanContextData, SpanJSON, StreamedSpanJSON } from './types/span';
+import type { StartSpanOptions } from './types/startSpanOptions';
+import type { Transport, TransportMakeRequestResponse } from './types/transport';
 import { createClientReportEnvelope } from './utils/clientreport';
 import { debug } from './utils/debug-logger';
 import { dsnToString, makeDsn } from './utils/dsn';

packages/core/src/currentScopes.ts

@@ -2,7 +2,7 @@ import { getAsyncContextStrategy } from './asyncContext';
 import { getGlobalSingleton, getMainCarrier } from './carrier';
 import type { Client } from './client';
 import { Scope } from './scope';
-import type { TraceContext } from './types-hoist/context';
+import type { TraceContext } from './types/context';
 import { generateSpanId } from './utils/propagationContext';
 
 let _externalPropagationContextProvider: (() => { traceId: string; spanId: string } | undefined) | undefined;

packages/core/src/envelope.ts

@@ -2,8 +2,8 @@ import type { Client } from './client';
 import { getDynamicSamplingContextFromSpan } from './tracing/dynamicSamplingContext';
 import type { SentrySpan } from './tracing/sentrySpan';
 import { isStreamedBeforeSendSpanCallback } from './tracing/spans/beforeSendSpan';
-import type { LegacyCSPReport } from './types-hoist/csp';
-import type { DsnComponents } from './types-hoist/dsn';
+import type { LegacyCSPReport } from './types/csp';
+import type { DsnComponents } from './types/dsn';
 import type {
   DynamicSamplingContext,
   EventEnvelope,
@@ -14,11 +14,11 @@ import type {
   SessionItem,
   SpanEnvelope,
   SpanItem,
-} from './types-hoist/envelope';
-import type { Event } from './types-hoist/event';
-import type { SdkInfo } from './types-hoist/sdkinfo';
-import type { SdkMetadata } from './types-hoist/sdkmetadata';
-import type { Session, SessionAggregates } from './types-hoist/session';
+} from './types/envelope';
+import type { Event } from './types/event';
+import type { SdkInfo } from './types/sdkinfo';
+import type { SdkMetadata } from './types/sdkmetadata';
+import type { Session, SessionAggregates } from './types/session';
 import { dsnToString } from './utils/dsn';
 import {
   createEnvelope,

packages/core/src/eventProcessors.ts

@@ -1,6 +1,6 @@
 import { DEBUG_BUILD } from './debug-build';
-import type { Event, EventHint } from './types-hoist/event';
-import type { EventProcessor } from './types-hoist/eventprocessor';
+import type { Event, EventHint } from './types/event';
+import type { EventProcessor } from './types/eventprocessor';
 import { debug } from './utils/debug-logger';
 import { isThenable } from './utils/is';
 import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise';

packages/core/src/exports.ts

@@ -3,14 +3,14 @@ import { DEBUG_BUILD } from './debug-build';
 import type { CaptureContext } from './scope';
 import { closeSession, makeSession, updateSession } from './session';
 import { startNewTrace } from './tracing/trace';
-import type { CheckIn, FinishedCheckIn, MonitorConfig } from './types-hoist/checkin';
-import type { Event, EventHint } from './types-hoist/event';
-import type { EventProcessor } from './types-hoist/eventprocessor';
-import type { Extra, Extras } from './types-hoist/extra';
-import type { Primitive } from './types-hoist/misc';
-import type { Session, SessionContext } from './types-hoist/session';
-import type { SeverityLevel } from './types-hoist/severity';
-import type { User } from './types-hoist/user';
+import type { CheckIn, FinishedCheckIn, MonitorConfig } from './types/checkin';
+import type { Event, EventHint } from './types/event';
+import type { EventProcessor } from './types/eventprocessor';
+import type { Extra, Extras } from './types/extra';
+import type { Primitive } from './types/misc';
+import type { Session, SessionContext } from './types/session';
+import type { SeverityLevel } from './types/severity';
+import type { User } from './types/user';
 import { debug } from './utils/debug-logger';
 import { isThenable } from './utils/is';
 import { uuid4 } from './utils/misc';

packages/core/src/feedback.ts

@@ -1,6 +1,6 @@
 import { getClient, getCurrentScope } from './currentScopes';
-import type { EventHint } from './types-hoist/event';
-import type { FeedbackEvent, SendFeedbackParams } from './types-hoist/feedback';
+import type { EventHint } from './types/event';
+import type { FeedbackEvent, SendFeedbackParams } from './types/feedback';
 
 /**
  * Send user feedback to Sentry.

packages/core/src/fetch.ts

@@ -3,10 +3,10 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
 import { setHttpStatus, SPAN_STATUS_ERROR, startInactiveSpan } from './tracing';
 import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
 import { hasSpanStreamingEnabled } from './tracing/spans/hasSpanStreamingEnabled';
-import type { FetchBreadcrumbHint } from './types-hoist/breadcrumb';
-import type { HandlerDataFetch } from './types-hoist/instrument';
-import type { ResponseHookInfo } from './types-hoist/request';
-import type { Span, SpanAttributes, SpanOrigin } from './types-hoist/span';
+import type { FetchBreadcrumbHint } from './types/breadcrumb';
+import type { HandlerDataFetch } from './types/instrument';
+import type { ResponseHookInfo } from './types/request';
+import type { Span, SpanAttributes, SpanOrigin } from './types/span';
 import { SENTRY_BAGGAGE_KEY_PREFIX } from './utils/baggage';
 import { hasSpansEnabled } from './utils/hasSpansEnabled';
 import { isInstanceOf, isRequest } from './utils/is';

packages/core/src/instrument/console.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/ban-types */
 import { DEBUG_BUILD } from '../debug-build';
-import type { ConsoleLevel, HandlerDataConsole } from '../types-hoist/instrument';
+import type { ConsoleLevel, HandlerDataConsole } from '../types/instrument';
 import { CONSOLE_LEVELS, originalConsoleMethods } from '../utils/debug-logger';
 import { fill } from '../utils/object';
 import { stringMatchesSomePattern } from '../utils/string';

packages/core/src/instrument/fetch.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { getClient } from '../currentScopes';
-import type { HandlerDataFetch } from '../types-hoist/instrument';
-import type { WebFetchHeaders } from '../types-hoist/webfetchapi';
+import type { HandlerDataFetch } from '../types/instrument';
+import type { WebFetchHeaders } from '../types/webfetchapi';
 import { isError, isRequest } from '../utils/is';
 import { addNonEnumerableProperty, fill } from '../utils/object';
 import { supportsNativeFetch } from '../utils/supports';

packages/core/src/instrument/globalError.ts

@@ -1,4 +1,4 @@
-import type { HandlerDataError } from '../types-hoist/instrument';
+import type { HandlerDataError } from '../types/instrument';
 import { GLOBAL_OBJ } from '../utils/worldwide';
 import { addHandler, maybeInstrument, triggerHandlers } from './handlers';
 

packages/core/src/instrument/globalUnhandledRejection.ts

@@ -1,4 +1,4 @@
-import type { HandlerDataUnhandledRejection } from '../types-hoist/instrument';
+import type { HandlerDataUnhandledRejection } from '../types/instrument';
 import { GLOBAL_OBJ } from '../utils/worldwide';
 import { addHandler, maybeInstrument, triggerHandlers } from './handlers';
 

packages/core/src/integration.ts

@@ -1,10 +1,10 @@
 import type { Client } from './client';
 import { getClient } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
-import type { Event, EventHint } from './types-hoist/event';
-import type { Integration, IntegrationFn } from './types-hoist/integration';
-import type { CoreOptions } from './types-hoist/options';
-import type { StreamedSpanJSON } from './types-hoist/span';
+import type { Event, EventHint } from './types/event';
+import type { Integration, IntegrationFn } from './types/integration';
+import type { CoreOptions } from './types/options';
+import type { StreamedSpanJSON } from './types/span';
 import { debug } from './utils/debug-logger';
 
 export const installedIntegrations: string[] = [];

packages/core/src/integrations/captureconsole.ts

@@ -3,7 +3,7 @@ import { captureException } from '../exports';
 import { addConsoleInstrumentationHandler } from '../instrument/console';
 import { defineIntegration } from '../integration';
 import type { CaptureContext } from '../scope';
-import type { IntegrationFn } from '../types-hoist/integration';
+import type { IntegrationFn } from '../types/integration';
 import { CONSOLE_LEVELS } from '../utils/debug-logger';
 import { addExceptionMechanism } from '../utils/misc';
 import { severityLevelFromString } from '../utils/severity';

packages/core/src/integrations/consola.ts

@@ -2,7 +2,7 @@ import type { Client } from '../client';
 import { getClient } from '../currentScopes';
 import { _INTERNAL_captureLog } from '../logs/internal';
 import { createConsoleTemplateAttributes, formatConsoleArgs, hasConsoleSubstitutions } from '../logs/utils';
-import type { LogSeverityLevel } from '../types-hoist/log';
+import type { LogSeverityLevel } from '../types/log';
 import { isPlainObject } from '../utils/is';
 import { normalize } from '../utils/normalize';
 

packages/core/src/integrations/console.ts

@@ -2,7 +2,7 @@ import { addBreadcrumb } from '../breadcrumbs';
 import { getClient } from '../currentScopes';
 import { addConsoleInstrumentationFilter, addConsoleInstrumentationHandler } from '../instrument/console';
 import { defineIntegration } from '../integration';
-import type { ConsoleLevel } from '../types-hoist/instrument';
+import type { ConsoleLevel } from '../types/instrument';
 import { CONSOLE_LEVELS } from '../utils/debug-logger';
 import { severityLevelFromString } from '../utils/severity';
 import { safeJoin } from '../utils/string';

packages/core/src/integrations/conversationId.ts

@@ -2,8 +2,8 @@ import type { Client } from '../client';
 import { getCurrentScope, getIsolationScope } from '../currentScopes';
 import { defineIntegration } from '../integration';
 import { GEN_AI_CONVERSATION_ID_ATTRIBUTE } from '../semanticAttributes';
-import type { IntegrationFn } from '../types-hoist/integration';
-import type { Span } from '../types-hoist/span';
+import type { IntegrationFn } from '../types/integration';
+import type { Span } from '../types/span';
 import { spanToJSON } from '../utils/spanUtils';
 
 const INTEGRATION_NAME = 'ConversationId';

packages/core/src/integrations/dedupe.ts

@@ -1,9 +1,9 @@
 import { DEBUG_BUILD } from '../debug-build';
 import { defineIntegration } from '../integration';
-import type { Event } from '../types-hoist/event';
-import type { Exception } from '../types-hoist/exception';
-import type { IntegrationFn } from '../types-hoist/integration';
-import type { StackFrame } from '../types-hoist/stackframe';
+import type { Event } from '../types/event';
+import type { Exception } from '../types/exception';
+import type { IntegrationFn } from '../types/integration';
+import type { StackFrame } from '../types/stackframe';
 import { debug } from '../utils/debug-logger';
 import { getFramesFromEvent } from '../utils/stacktrace';
 

packages/core/src/integrations/eventFilters.ts

@@ -1,8 +1,8 @@
 import { DEBUG_BUILD } from '../debug-build';
 import { defineIntegration } from '../integration';
-import type { Event } from '../types-hoist/event';
-import type { IntegrationFn } from '../types-hoist/integration';
-import type { StackFrame } from '../types-hoist/stackframe';
+import type { Event } from '../types/event';
+import type { IntegrationFn } from '../types/integration';
+import type { StackFrame } from '../types/stackframe';
 import { debug } from '../utils/debug-logger';
 import { getPossibleEventMessages } from '../utils/eventUtils';
 import { getEventDescription } from '../utils/misc';

packages/core/src/integrations/express/patch-layer.ts

@@ -31,7 +31,7 @@ import { DEBUG_BUILD } from '../../debug-build';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
 import { SPAN_STATUS_ERROR, startSpanManual, withActiveSpan } from '../../tracing';
 import { debug } from '../../utils/debug-logger';
-import type { SpanAttributes } from '../../types-hoist/span';
+import type { SpanAttributes } from '../../types/span';
 import { getActiveSpan } from '../../utils/spanUtils';
 import { getStoredLayers, storeLayer } from './request-layer-store';
 import {

packages/core/src/integrations/express/types.ts

@@ -27,8 +27,8 @@
  * limitations under the License.
  */
 
-import type { RequestEventData } from '../../types-hoist/request';
-import type { SpanAttributes } from '../../types-hoist/span';
+import type { RequestEventData } from '../../types/request';
+import type { SpanAttributes } from '../../types/span';
 
 export const ATTR_EXPRESS_NAME = 'express.name';
 export const ATTR_HTTP_ROUTE = 'http.route';

packages/core/src/integrations/express/utils.ts

@@ -27,7 +27,7 @@
  * limitations under the License.
  */
 
-import type { SpanAttributes } from '../../types-hoist/span';
+import type { SpanAttributes } from '../../types/span';
 import { getStoredLayers } from './request-layer-store';
 import type {
   ExpressIntegrationOptions,

packages/core/src/integrations/extraerrordata.ts

@@ -1,9 +1,9 @@
 import { DEBUG_BUILD } from '../debug-build';
 import { defineIntegration } from '../integration';
-import type { Contexts } from '../types-hoist/context';
-import type { ExtendedError } from '../types-hoist/error';
-import type { Event, EventHint } from '../types-hoist/event';
-import type { IntegrationFn } from '../types-hoist/integration';
+import type { Contexts } from '../types/context';
+import type { ExtendedError } from '../types/error';
+import type { Event, EventHint } from '../types/event';
+import type { IntegrationFn } from '../types/integration';
 import { debug } from '../utils/debug-logger';
 import { isError, isPlainObject } from '../utils/is';
 import { normalize } from '../utils/normalize';

packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts

@@ -1,7 +1,7 @@
 import { type Client } from '../../client';
 import { defineIntegration } from '../../integration';
-import { type Event, type EventHint } from '../../types-hoist/event';
-import { type Integration, type IntegrationFn } from '../../types-hoist/integration';
+import { type Event, type EventHint } from '../../types/event';
+import { type Integration, type IntegrationFn } from '../../types/integration';
 import {
   _INTERNAL_addFeatureFlagToActiveSpan,
   _INTERNAL_copyFlagsFromScopeToEvent,