Add getProjects helper

Author: andreiborza

packages/bundler-plugin-core/src/build-plugin-manager.ts

@@ -19,7 +19,12 @@ import {
   safeFlushTelemetry,
 } from "./sentry/telemetry";
 import { Options, SentrySDKBuildFlags } from "./types";
-import { arrayify, getTurborepoEnvPassthroughWarning, stripQueryAndHashFromPath } from "./utils";
+import {
+  arrayify,
+  getProjects,
+  getTurborepoEnvPassthroughWarning,
+  stripQueryAndHashFromPath,
+} from "./utils";
 import { glob } from "glob";
 import { defaultRewriteSourcesHook, prepareBundleForDebugIdUpload } from "./debug-id-upload";
 
@@ -95,7 +100,7 @@ function createCliInstance(options: NormalizedOptions): SentryCli {
     authToken: options.authToken,
     org: options.org,
     // Default to the first project if multiple projects are specified
-    project: Array.isArray(options.project) ? options.project[0] : options.project,
+    project: getProjects(options.project)?.[0],
     silent: options.silent,
     url: options.url,
     vcsRemote: options.release.vcsRemote,
@@ -361,12 +366,8 @@ export function createSentryBuildPluginManager(
     if (typeof options.moduleMetadata === "function") {
       const args = {
         org: options.org,
-        project: Array.isArray(options.project) ? options.project[0] : options.project,
-        projects: Array.isArray(options.project)
-          ? options.project
-          : options.project
-          ? [options.project]
-          : undefined,
+        project: getProjects(options.project)?.[0],
+        projects: getProjects(options.project),
         release: options.release.name,
       };
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -492,7 +493,7 @@ export function createSentryBuildPluginManager(
             dist: options.release.dist,
             // @ts-expect-error - projects is not a valid option for uploadSourceMaps but is implemented in the CLI
             // Remove once https://github.com/getsentry/sentry-cli/pull/2856 is released
-            projects: Array.isArray(options.project) ? options.project : [options.project],
+            projects: getProjects(options.project),
             // We want this promise to throw if the sourcemaps fail to upload so that we know about it.
             // see: https://github.com/getsentry/sentry-cli/pull/2605
             live: "rejectOnError",
@@ -639,7 +640,7 @@ export function createSentryBuildPluginManager(
                   ignore: ignorePaths,
                   // @ts-expect-error - projects is not a valid option for uploadSourceMaps but is implemented in the CLI
                   // Remove once https://github.com/getsentry/sentry-cli/pull/2856 is released
-                  projects: Array.isArray(options.project) ? options.project : [options.project],
+                  projects: getProjects(options.project),
                   live: "rejectOnError",
                 });
               });
@@ -752,9 +753,7 @@ export function createSentryBuildPluginManager(
                           ],
                           // @ts-expect-error - projects is not a valid option for uploadSourceMaps but is implemented in the CLI
                           // Remove once https://github.com/getsentry/sentry-cli/pull/2856 is released
-                          projects: Array.isArray(options.project)
-                            ? options.project
-                            : [options.project],
+                          projects: getProjects(options.project),
                           live: "rejectOnError",
                         }
                       );
@@ -863,7 +862,7 @@ function canUploadSourceMaps(
     );
     return false;
   }
-  if (!options.project || (Array.isArray(options.project) && options.project.length === 0)) {
+  if (!getProjects(options.project)?.[0]) {
     logger.warn(
       "No project provided. Will not upload source maps. Please set the `project` option to your Sentry project slug." +
         getTurborepoEnvPassthroughWarning("SENTRY_PROJECT")

packages/bundler-plugin-core/src/sentry/telemetry.ts

@@ -5,6 +5,7 @@ import { NormalizedOptions, SENTRY_SAAS_URL } from "../options-mapping";
 import { Scope } from "@sentry/core";
 import { createStackParser, nodeStackLineParser } from "@sentry/utils";
 import { makeOptionallyEnabledNodeTransport } from "./transports";
+import { getProjects } from "../utils";
 
 const SENTRY_SAAS_HOSTNAME = "sentry.io";
 
@@ -129,7 +130,7 @@ export async function allowedToSendTelemetry(options: NormalizedOptions): Promis
     url,
     authToken,
     org,
-    project: Array.isArray(project) ? project[0] : project,
+    project: getProjects(project)?.[0],
     vcsRemote: release.vcsRemote,
     silent,
     headers,

packages/bundler-plugin-core/src/utils.ts

@@ -393,3 +393,18 @@ export function getTurborepoEnvPassthroughWarning(envVarName: string): string {
     ? `\nYou seem to be using Turborepo, did you forget to put ${envVarName} in \`passThroughEnv\`? https://turbo.build/repo/docs/reference/configuration#passthroughenv`
     : "";
 }
+
+/**
+ * Gets the projects from the project option. This might be a single project or an array of projects.
+ */
+export function getProjects(project: string | string[] | undefined): string[] | undefined {
+  if (Array.isArray(project)) {
+    return project;
+  }
+
+  if (project) {
+    return [project];
+  }
+
+  return undefined;
+}