moare fixes

Author: mydea

packages/core/src/carrier.ts

@@ -1,6 +1,7 @@
 import type { AsyncContextStack } from './asyncContext/stackStrategy';
 import type { AsyncContextStrategy } from './asyncContext/types';
-import type { Client, Integration, MetricsAggregator, Scope } from './types-hoist';
+import type { Client, MetricsAggregator, Scope } from './types-hoist';
+import type { Logger } from './utils-hoist/logger';
 import { SDK_VERSION } from './utils-hoist/version';
 import { GLOBAL_OBJ } from './utils-hoist/worldwide';
 
@@ -12,25 +13,26 @@ export interface Carrier {
   __SENTRY__?: VersionedCarrier;
 }
 
-type VersionedCarrier = {
+export type VersionedCarrier = {
   version?: string;
 } & Record<Exclude<string, 'version'>, SentryCarrier>;
 
-interface SentryCarrier {
+export interface SentryCarrier {
   acs?: AsyncContextStrategy;
   stack?: AsyncContextStack;
 
   globalScope?: Scope;
   defaultIsolationScope?: Scope;
   defaultCurrentScope?: Scope;
   globalMetricsAggregators?: WeakMap<Client, MetricsAggregator> | undefined;
-
-  // TODO(v9): Remove these properties - they are no longer used and were left over in v8
-  integrations?: Integration[];
-  extensions?: {
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    [key: string]: Function;
-  };
+  logger?: Logger;
+
+  // TODO(v9): Do we still need those?
+  // --> Check with RN
+  /** Overwrites TextEncoder used in `@sentry/core`, need for `react-native@0.73` and older */
+  encodePolyfill?: (input: string) => Uint8Array;
+  /** Overwrites TextDecoder used in `@sentry/core`, need for `react-native@0.73` and older */
+  decodePolyfill?: (input: Uint8Array) => string;
 }
 
 /**

packages/core/src/metrics/exports.ts

@@ -23,9 +23,9 @@ function getMetricsAggregatorForClient(
   client: Client,
   Aggregator: MetricsAggregatorConstructor,
 ): MetricsAggregatorInterface {
-  const globalMetricsAggregators = getGlobalSingleton<WeakMap<Client, MetricsAggregatorInterface>>(
+  const globalMetricsAggregators = getGlobalSingleton(
     'globalMetricsAggregators',
-    () => new WeakMap(),
+    () => new WeakMap<Client, MetricsAggregatorInterface>(),
   );
 
   const aggregator = globalMetricsAggregators.get(client);

packages/core/src/utils-hoist/envelope.ts

@@ -1,3 +1,4 @@
+import { getSentryCarrier } from '../carrier';
 import type {
   Attachment,
   AttachmentItem,
@@ -74,18 +75,20 @@ export function envelopeContainsItemType(envelope: Envelope, types: EnvelopeItem
  * Encode a string to UTF8 array.
  */
 function encodeUTF8(input: string): Uint8Array {
-  return GLOBAL_OBJ.__SENTRY__ && GLOBAL_OBJ.__SENTRY__.encodePolyfill
-    ? GLOBAL_OBJ.__SENTRY__.encodePolyfill(input)
-    : new TextEncoder().encode(input);
+  // TODO(v9): Do we actually still need this?
+  // --> Evaluate if RN still needs this
+  const carrier = getSentryCarrier(GLOBAL_OBJ);
+  return carrier.encodePolyfill ? carrier.encodePolyfill(input) : new TextEncoder().encode(input);
 }
 
 /**
  * Decode a UTF8 array to string.
  */
 function decodeUTF8(input: Uint8Array): string {
-  return GLOBAL_OBJ.__SENTRY__ && GLOBAL_OBJ.__SENTRY__.decodePolyfill
-    ? GLOBAL_OBJ.__SENTRY__.decodePolyfill(input)
-    : new TextDecoder().decode(input);
+  // TODO(v9): Do we actually still need this?
+  // --> Evaluate if RN still needs this
+  const carrier = getSentryCarrier(GLOBAL_OBJ);
+  return carrier.decodePolyfill ? carrier.decodePolyfill(input) : new TextDecoder().decode(input);
 }
 
 /**

packages/core/src/utils-hoist/logger.ts

@@ -24,7 +24,7 @@ export const originalConsoleMethods: {
   [key in ConsoleLevel]?: (...args: unknown[]) => void;
 } = {};
 
-/** JSDoc */
+/** A Sentry Logger instance. */
 export interface Logger extends LoggerConsoleMethods {
   disable(): void;
   enable(): void;

packages/core/src/utils-hoist/worldwide.ts

@@ -12,28 +12,10 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import type { Client, MetricsAggregator, Scope } from '../types-hoist';
-
+import type { Carrier, SentryCarrier, VersionedCarrier } from '../carrier';
 import type { SdkSource } from './env';
-import type { logger } from './logger';
 import { SDK_VERSION } from './version';
 
-interface SentryCarrier {
-  acs?: any;
-  stack?: any;
-
-  globalScope?: Scope;
-  defaultIsolationScope?: Scope;
-  defaultCurrentScope?: Scope;
-  globalMetricsAggregators?: WeakMap<Client, MetricsAggregator> | undefined;
-  logger?: typeof logger;
-
-  /** Overwrites TextEncoder used in `@sentry/core`, need for `react-native@0.73` and older */
-  encodePolyfill?: (input: string) => Uint8Array;
-  /** Overwrites TextDecoder used in `@sentry/core`, need for `react-native@0.73` and older */
-  decodePolyfill?: (input: Uint8Array) => string;
-}
-
 /** Internal global with common properties and Sentry extensions  */
 export type InternalGlobal = {
   navigator?: { userAgent?: string };
@@ -60,17 +42,14 @@ export type InternalGlobal = {
    * file.
    */
   _sentryDebugIds?: Record<string, string>;
-  __SENTRY__: Record<Exclude<string, 'version'>, SentryCarrier> & {
-    version?: string;
-  };
   /**
    * Raw module metadata that is injected by bundler plugins.
    *
    * Keys are `error.stack` strings, values are the metadata.
    */
   _sentryModuleMetadata?: Record<string, any>;
   _sentryEsmLoaderHookRegistered?: boolean;
-};
+} & Carrier;
 
 /** Get's the global object for the current JavaScript runtime */
 export const GLOBAL_OBJ = globalThis as unknown as InternalGlobal;
@@ -86,15 +65,20 @@ export const GLOBAL_OBJ = globalThis as unknown as InternalGlobal;
  * @param obj (Optional) The global object on which to look for `__SENTRY__`, if not `GLOBAL_OBJ`'s return value
  * @returns the singleton
  */
-export function getGlobalSingleton<T>(name: keyof SentryCarrier, creator: () => T, obj = GLOBAL_OBJ): T {
+export function getGlobalSingleton<Prop extends keyof SentryCarrier>(
+  name: Prop,
+  creator: () => NonNullable<SentryCarrier[Prop]>,
+  obj = GLOBAL_OBJ,
+): NonNullable<SentryCarrier[Prop]> {
   const __SENTRY__ = getSentryCarrierObj(obj);
   const versionedCarrier = (__SENTRY__[SDK_VERSION] = __SENTRY__[SDK_VERSION] || {});
+
   return versionedCarrier[name] || (versionedCarrier[name] = creator());
 }
 
 function getSentryCarrierObj(
   obj: Omit<InternalGlobal, '__SENTRY__'> & Partial<Pick<InternalGlobal, '__SENTRY__'>>,
-): InternalGlobal['__SENTRY__'] {
+): VersionedCarrier {
   // Set the Sentry carrier, if it does not exist yet
   return obj.__SENTRY__ || (obj.__SENTRY__ = {});
 }