From 0303deb74fb93965f7bb13ddc4ed3aa96de73c17 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 12 Dec 2023 17:53:12 +0100
Subject: [PATCH] feat: Add top level `getCurrentScope()` method

This can be used instead of `getCurrentHub().getScope()`, and is a step towards getting rid of `getCurrentHub()` as a top level API.
---
 packages/astro/src/index.server.ts     | 1 +
 packages/browser/src/exports.ts        | 1 +
 packages/bun/src/index.ts              | 1 +
 packages/core/src/exports.ts           | 7 +++++++
 packages/core/src/index.ts             | 1 +
 packages/deno/src/index.ts             | 1 +
 packages/node/src/index.ts             | 1 +
 packages/serverless/src/index.ts       | 1 +
 packages/sveltekit/src/server/index.ts | 1 +
 packages/vercel-edge/src/index.ts      | 1 +
 10 files changed, 16 insertions(+)

diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
index a0c18c0cb6e7..c62590180266 100644
--- a/packages/astro/src/index.server.ts
+++ b/packages/astro/src/index.server.ts
@@ -25,6 +25,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   makeMain,
   Scope,
diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts
index 0804dbe49ac0..367905a2d770 100644
--- a/packages/browser/src/exports.ts
+++ b/packages/browser/src/exports.ts
@@ -36,6 +36,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   lastEventId,
   makeMain,
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
index 302d36fb0b62..5a4260aaec38 100644
--- a/packages/bun/src/index.ts
+++ b/packages/bun/src/index.ts
@@ -42,6 +42,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   lastEventId,
   makeMain,
diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts
index 6d1e80600a75..6f71e7dfbccb 100644
--- a/packages/core/src/exports.ts
+++ b/packages/core/src/exports.ts
@@ -308,3 +308,10 @@ export function lastEventId(): string | undefined {
 export function getClient<C extends Client>(): C | undefined {
   return getCurrentHub().getClient<C>();
 }
+
+/**
+ * Get the currently active scope.
+ */
+export function getCurrentScope(): Scope {
+  return getCurrentHub().getScope();
+}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 07871633f16c..f261a2963364 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -26,6 +26,7 @@ export {
   setUser,
   withScope,
   getClient,
+  getCurrentScope,
 } from './exports';
 export {
   getCurrentHub,
diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
index 846ad000bcaf..52a878bdde17 100644
--- a/packages/deno/src/index.ts
+++ b/packages/deno/src/index.ts
@@ -41,6 +41,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   lastEventId,
   makeMain,
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
index 28fa7e6e603d..9963258e48bb 100644
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -41,6 +41,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   lastEventId,
   makeMain,
diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts
index 2ac8f77274a5..6df0dbedb2c3 100644
--- a/packages/serverless/src/index.ts
+++ b/packages/serverless/src/index.ts
@@ -29,6 +29,7 @@ export {
   getActiveTransaction,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   getHubFromCarrier,
   makeMain,
   setContext,
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index f584759da054..b75fa24ebe5b 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -22,6 +22,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   makeMain,
   Scope,
diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index 3a13f97beb03..ffce59b5dceb 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -41,6 +41,7 @@ export {
   getHubFromCarrier,
   getCurrentHub,
   getClient,
+  getCurrentScope,
   Hub,
   lastEventId,
   makeMain,