fix more tests

Author: mydea

packages/core/test/lib/prepareEvent.test.ts

@@ -1,3 +1,4 @@
+import type { ScopeContext } from '../../src';
 import { GLOBAL_OBJ, createStackParser, getGlobalScope, getIsolationScope } from '../../src';
 import type {
   Attachment,
@@ -7,7 +8,6 @@ import type {
   Event,
   EventHint,
   EventProcessor,
-  ScopeContext,
 } from '../../src/types-hoist';
 
 import { Scope } from '../../src/scope';

packages/core/test/lib/utils/applyScopeDataToEvent.test.ts

@@ -1,5 +1,6 @@
+import type { ScopeData } from '../../../src';
 import { startInactiveSpan } from '../../../src';
-import type { Attachment, Breadcrumb, Event, EventProcessor, EventType, ScopeData } from '../../../src/types-hoist';
+import type { Attachment, Breadcrumb, Event, EventProcessor, EventType } from '../../../src/types-hoist';
 import {
   applyScopeDataToEvent,
   mergeAndOverwriteScopeData,

packages/core/test/utils-hoist/requestdata.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable deprecation/deprecation */
 import type * as net from 'net';
-import { addRequestDataToEvent, extractPathForTransaction, extractRequestData } from '@sentry/core';
+import { addRequestDataToEvent, extractPathForTransaction, extractRequestData } from '../../src';
 import type { Event, PolymorphicRequest, TransactionSource, User } from '../../src/types-hoist';
 import { getClientIPAddress } from '../../src/utils-hoist/vendor/getIpAddress';
 

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureException 1`] = `
                 "});",
                 "",
                 "Deno.test('captureMessage', async t => {",
-                "  let ev: sentryTypes.Event | undefined;",
+                "  let ev: sentryCore.Event | undefined;",
               ],
               pre_context: [
                 "    ev = event;",
@@ -86,7 +86,7 @@ snapshot[`captureException 1`] = `
               ],
               pre_context: [
                 "Deno.test('captureException', async t => {",
-                "  let ev: sentryTypes.Event | undefined;",
+                "  let ev: sentryCore.Event | undefined;",
                 "  const client = getTestClient(event => {",
                 "    ev = event;",
                 "  });",

packages/deno/test/build.ts

@@ -1,4 +1,2 @@
 // We use this as the entry point to bundle Sentry dependencies that are used by the tests.
-export * as sentryTypes from '@sentry/core';
-export * as sentryUtils from '@sentry/core';
 export * as sentryCore from '@sentry/core';

packages/deno/test/mod.test.ts

@@ -1,21 +1,20 @@
 import { assertEquals } from 'https://deno.land/[email protected]/assert/assert_equals.ts';
 import { assertSnapshot } from 'https://deno.land/[email protected]/testing/snapshot.ts';
 
-import type { sentryTypes } from '../build-test/index.js';
-import { sentryUtils } from '../build-test/index.js';
+import { sentryCore } from '../build-test/index.js';
 import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
 import { getNormalizedEvent } from './normalize.ts';
 import { makeTestTransport } from './transport.ts';
 
 function getTestClient(
-  callback: (event?: sentryTypes.Event) => void,
-  integrations: sentryTypes.Integration[] = [],
+  callback: (event?: sentryCore.Event) => void,
+  integrations: sentryCore.Integration[] = [],
 ): DenoClient {
   const client = new DenoClient({
     dsn: 'https://[email protected]/5650507',
     debug: true,
     integrations: [...getDefaultIntegrations({}), ...integrations],
-    stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
+    stackParser: sentryCore.createStackParser(sentryCore.nodeStackLineParser()),
     transport: makeTestTransport(envelope => {
       callback(getNormalizedEvent(envelope));
     }),
@@ -34,7 +33,7 @@ function delay(time: number): Promise<void> {
 }
 
 Deno.test('captureException', async t => {
-  let ev: sentryTypes.Event | undefined;
+  let ev: sentryCore.Event | undefined;
   const client = getTestClient(event => {
     ev = event;
   });
@@ -50,7 +49,7 @@ Deno.test('captureException', async t => {
 });
 
 Deno.test('captureMessage', async t => {
-  let ev: sentryTypes.Event | undefined;
+  let ev: sentryCore.Event | undefined;
   const client = getTestClient(event => {
     ev = event;
   });
@@ -62,7 +61,7 @@ Deno.test('captureMessage', async t => {
 });
 
 Deno.test('captureMessage twice', async t => {
-  let ev: sentryTypes.Event | undefined;
+  let ev: sentryCore.Event | undefined;
   const client = getTestClient(event => {
     ev = event;
   });

packages/deno/test/normalize.ts

@@ -1,21 +1,20 @@
 /* eslint-disable complexity */
-import type { sentryTypes } from '../build-test/index.js';
-import { sentryUtils } from '../build-test/index.js';
+import { sentryCore } from '../build-test/index.js';
 
-type EventOrSession = sentryTypes.Event | sentryTypes.Session;
+type EventOrSession = sentryCore.Event | sentryCore.Session;
 
-export function getNormalizedEvent(envelope: sentryTypes.Envelope): sentryTypes.Event | undefined {
-  let event: sentryTypes.Event | undefined;
+export function getNormalizedEvent(envelope: sentryCore.Envelope): sentryCore.Event | undefined {
+  let event: sentryCore.Event | undefined;
 
-  sentryUtils.forEachEnvelopeItem(envelope, item => {
+  sentryCore.forEachEnvelopeItem(envelope, item => {
     const [headers, body] = item;
 
     if (headers.type === 'event') {
-      event = body as sentryTypes.Event;
+      event = body as sentryCore.Event;
     }
   });
 
-  return normalize(event) as sentryTypes.Event | undefined;
+  return normalize(event) as sentryCore.Event | undefined;
 }
 
 export function normalize(event: EventOrSession | undefined): EventOrSession | undefined {
@@ -24,14 +23,14 @@ export function normalize(event: EventOrSession | undefined): EventOrSession | u
   }
 
   if (eventIsSession(event)) {
-    return normalizeSession(event as sentryTypes.Session);
+    return normalizeSession(event as sentryCore.Session);
   } else {
-    return normalizeEvent(event as sentryTypes.Event);
+    return normalizeEvent(event as sentryCore.Event);
   }
 }
 
 export function eventIsSession(data: EventOrSession): boolean {
-  return !!(data as sentryTypes.Session)?.sid;
+  return !!(data as sentryCore.Session)?.sid;
 }
 
 /**
@@ -40,7 +39,7 @@ export function eventIsSession(data: EventOrSession): boolean {
  * All properties that are timestamps, versions, ids or variables that may vary
  * by platform are replaced with placeholder strings
  */
-function normalizeSession(session: sentryTypes.Session): sentryTypes.Session {
+function normalizeSession(session: sentryCore.Session): sentryCore.Session {
   if (session.sid) {
     session.sid = '{{id}}';
   }
@@ -66,7 +65,7 @@ function normalizeSession(session: sentryTypes.Session): sentryTypes.Session {
  * All properties that are timestamps, versions, ids or variables that may vary
  * by platform are replaced with placeholder strings
  */
-function normalizeEvent(event: sentryTypes.Event): sentryTypes.Event {
+function normalizeEvent(event: sentryCore.Event): sentryCore.Event {
   if (event.sdk?.version) {
     event.sdk.version = '{{version}}';
   }

packages/deno/test/transport.ts

@@ -1,19 +1,18 @@
-import type { sentryTypes } from '../build-test/index.js';
-import { sentryCore, sentryUtils } from '../build-test/index.js';
+import { sentryCore } from '../build-test/index.js';
 
-export interface TestTransportOptions extends sentryTypes.BaseTransportOptions {
-  callback: (envelope: sentryTypes.Envelope) => void;
+export interface TestTransportOptions extends sentryCore.BaseTransportOptions {
+  callback: (envelope: sentryCore.Envelope) => void;
 }
 
 /**
  * Creates a Transport that uses the Fetch API to send events to Sentry.
  */
-export function makeTestTransport(callback: (envelope: sentryTypes.Envelope) => void) {
-  return (options: sentryTypes.BaseTransportOptions): sentryTypes.Transport => {
+export function makeTestTransport(callback: (envelope: sentryCore.Envelope) => void) {
+  return (options: sentryCore.BaseTransportOptions): sentryCore.Transport => {
     async function doCallback(
-      request: sentryTypes.TransportRequest,
-    ): Promise<sentryTypes.TransportMakeRequestResponse> {
-      await callback(sentryUtils.parseEnvelope(request.body));
+      request: sentryCore.TransportRequest,
+    ): Promise<sentryCore.TransportMakeRequestResponse> {
+      await callback(sentryCore.parseEnvelope(request.body));
 
       return Promise.resolve({
         statusCode: 200,