ref: Remove some unnecessary conditions (#14698)

I was playing around with finally enabling the
[no-unnecessary-condition](https://typescript-eslint.io/rules/no-unnecessary-condition/)
eslint rule, and figured to start fixing some of the stuff it found.
These should mostly be straightforward things, or in some cases I
adjusted tests to ensure we "correctly" check for stuff.

Author: mydea

dev-packages/e2e-tests/lib/getTestMatrix.ts

@@ -101,7 +101,7 @@ function addIncludesForTestApp(
 }
 
 function getSentryDependencies(appName: string): string[] {
-  const packageJson = getPackageJson(appName) || {};
+  const packageJson = getPackageJson(appName);
 
   const dependencies = {
     ...packageJson.devDependencies,

packages/browser/test/sdk.test.ts

@@ -89,7 +89,7 @@ describe('init', () => {
     expect(initAndBindSpy).toHaveBeenCalledTimes(1);
 
     const optionsPassed = initAndBindSpy.mock.calls[0]?.[1];
-    expect(optionsPassed?.integrations?.length).toBeGreaterThan(0);
+    expect(optionsPassed?.integrations.length).toBeGreaterThan(0);
   });
 
   test("doesn't install default integrations if told not to", () => {

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

@@ -1,9 +1,11 @@
 import { GLOBAL_OBJ } from './worldwide';
 
 interface VercelRequestContextGlobal {
-  get?(): {
-    waitUntil?: (task: Promise<unknown>) => void;
-  };
+  get?():
+    | {
+        waitUntil?: (task: Promise<unknown>) => void;
+      }
+    | undefined;
 }
 
 /**

packages/core/src/utils/applyScopeDataToEvent.ts

@@ -113,22 +113,22 @@ function applyDataToEvent(event: Event, data: ScopeData): void {
   const { extra, tags, user, contexts, level, transactionName } = data;
 
   const cleanedExtra = dropUndefinedKeys(extra);
-  if (cleanedExtra && Object.keys(cleanedExtra).length) {
+  if (Object.keys(cleanedExtra).length) {
     event.extra = { ...cleanedExtra, ...event.extra };
   }
 
   const cleanedTags = dropUndefinedKeys(tags);
-  if (cleanedTags && Object.keys(cleanedTags).length) {
+  if (Object.keys(cleanedTags).length) {
     event.tags = { ...cleanedTags, ...event.tags };
   }
 
   const cleanedUser = dropUndefinedKeys(user);
-  if (cleanedUser && Object.keys(cleanedUser).length) {
+  if (Object.keys(cleanedUser).length) {
     event.user = { ...cleanedUser, ...event.user };
   }
 
   const cleanedContexts = dropUndefinedKeys(contexts);
-  if (cleanedContexts && Object.keys(cleanedContexts).length) {
+  if (Object.keys(cleanedContexts).length) {
     event.contexts = { ...cleanedContexts, ...event.contexts };
   }
 
@@ -190,7 +190,7 @@ function applyFingerprintToEvent(event: Event, fingerprint: ScopeData['fingerpri
   }
 
   // If we have no data at all, remove empty array default
-  if (event.fingerprint && !event.fingerprint.length) {
+  if (!event.fingerprint.length) {
     delete event.fingerprint;
   }
 }

packages/core/src/utils/merge.ts

@@ -13,7 +13,7 @@ export function merge<T>(initialObj: T, mergeObj: T, levels = 2): T {
   }
 
   // If the merge object is an empty object, and the initial object is not undefined, we return the initial object
-  if (initialObj && mergeObj && Object.keys(mergeObj).length === 0) {
+  if (initialObj && Object.keys(mergeObj).length === 0) {
     return initialObj;
   }
 

packages/core/src/utils/prepareEvent.ts

@@ -179,7 +179,7 @@ export function applyDebugIds(event: Event, stackParser: StackParser): void {
     event!.exception!.values!.forEach(exception => {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       exception.stacktrace!.frames!.forEach(frame => {
-        if (filenameDebugIdMap && frame.filename) {
+        if (frame.filename) {
           frame.debug_id = filenameDebugIdMap[frame.filename];
         }
       });

packages/core/src/utils/spanUtils.ts

@@ -151,7 +151,7 @@ export function spanToJSON(span: Span): Partial<SpanJSON> {
 }
 
 function spanIsOpenTelemetrySdkTraceBaseSpan(span: Span): span is OpenTelemetrySdkTraceBaseSpan {
-  const castSpan = span as OpenTelemetrySdkTraceBaseSpan;
+  const castSpan = span as Partial<OpenTelemetrySdkTraceBaseSpan>;
   return !!castSpan.attributes && !!castSpan.startTime && !!castSpan.name && !!castSpan.endTime && !!castSpan.status;
 }
 

packages/core/test/lib/envelope.test.ts

@@ -116,7 +116,7 @@ describe('createSpanEnvelope', () => {
 
     const spanEnvelope = createSpanEnvelope([span]);
 
-    const spanItem = spanEnvelope[1]?.[0]?.[1];
+    const spanItem = spanEnvelope[1][0]?.[1];
     expect(spanItem).toEqual({
       data: {
         'sentry.origin': 'manual',
@@ -207,7 +207,7 @@ describe('createSpanEnvelope', () => {
 
     expect(beforeSendSpan).toHaveBeenCalled();
 
-    const spanItem = spanEnvelope[1]?.[0]?.[1];
+    const spanItem = spanEnvelope[1][0]?.[1];
     expect(spanItem).toEqual({
       data: {
         'sentry.origin': 'manual',
@@ -242,7 +242,7 @@ describe('createSpanEnvelope', () => {
 
     expect(beforeSendSpan).toHaveBeenCalled();
 
-    const spanItem = spanEnvelope[1]?.[0]?.[1];
+    const spanItem = spanEnvelope[1][0]?.[1];
     expect(spanItem).toEqual({
       data: {
         'sentry.origin': 'manual',

packages/core/test/lib/integrations/zoderrrors.test.ts

@@ -20,11 +20,7 @@ class ZodError extends Error {
     super();
 
     const actualProto = new.target.prototype;
-    if (Object.setPrototypeOf) {
-      Object.setPrototypeOf(this, actualProto);
-    } else {
-      (this as any).__proto__ = actualProto;
-    }
+    Object.setPrototypeOf(this, actualProto);
 
     this.name = 'ZodError';
     this.issues = issues;

packages/core/test/lib/tracing/trace.test.ts

@@ -152,9 +152,7 @@ describe('startSpan', () => {
       try {
         await startSpan({ name: 'GET users/[id]' }, () => {
           return startSpan({ name: 'SELECT * from users' }, childSpan => {
-            if (childSpan) {
-              childSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'db.query');
-            }
+            childSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'db.query');
             return callback();
           });
         });