refactor: remove redundant indexed access fallbacks

thymikee · thymikee · commit a23c4668da15 · 2026-05-28T09:26:15.000+02:00
diff --git a/src/cli.ts b/src/cli.ts
@@ -480,8 +480,7 @@ function hasExplicitMetroRuntimeOverrides(explicitFlagKeys: Set<FlagKey>): boole
 
 function guessSessionFromArgv(argv: string[]): string | null {
   for (let i = 0; i < argv.length; i += 1) {
-    const token = argv[i];
-    if (token === undefined) continue;
+    const token = argv[i]!;
     if (token.startsWith('--session=')) {
       const inline = token.slice('--session='.length).trim();
       return inline.length > 0 ? inline : null;
diff --git a/src/command-codecs/targets.ts b/src/command-codecs/targets.ts
@@ -69,10 +69,7 @@ export function readFillTargetFromPositionals(positionals: string[]): DecodedFil
       kind: 'ref',
       target: {
         ref,
-        label:
-          positionals.length >= 3 && maybeLabel !== undefined
-            ? optionalTrimmedText([maybeLabel])
-            : undefined,
+        label: positionals.length >= 3 ? optionalTrimmedText([maybeLabel!]) : undefined,
       },
       text,
     };
diff --git a/src/command-codecs/wait.ts b/src/command-codecs/wait.ts
@@ -67,8 +67,7 @@ export function waitOptionsToPositionals(options: WaitCommandOptions): string[]
 
 export function parseWaitPositionals(args: string[]): WaitParsed | null {
   if (args.length === 0) return null;
-  const firstArg = args[0];
-  if (firstArg === undefined) return null;
+  const firstArg = args[0]!;
 
   const sleepMs = parseTimeout(firstArg);
   if (sleepMs !== null) return { kind: 'sleep', durationMs: sleepMs };
diff --git a/src/commands/interaction-targeting.ts b/src/commands/interaction-targeting.ts
@@ -80,9 +80,7 @@ function findPreferredActionableDescendant(
     if (sameRectChildren.length !== 1) {
       break;
     }
-    const next = sameRectChildren[0];
-    if (next === undefined) break;
-    current = next;
+    current = sameRectChildren[0]!;
   }
 
   return current === node ? null : current;
diff --git a/src/commands/react-native/overlay.ts b/src/commands/react-native/overlay.ts
@@ -177,17 +177,15 @@ function actionFromDismissNode(node: SnapshotNode): ReactNativeOverlayDismissTar
 function chooseCollapsedWarningNode(nodes: SnapshotNode[]): SnapshotNode | null {
   const withRect = nodes.filter((node) => node.rect);
   if (withRect.length === 0) return null;
-  return (
-    withRect.sort((a, b) => {
-      const aHittable = a.hittable === true ? 1 : 0;
-      const bHittable = b.hittable === true ? 1 : 0;
-      if (aHittable !== bHittable) return bHittable - aHittable;
-      const aWidth = a.rect?.width ?? 0;
-      const bWidth = b.rect?.width ?? 0;
-      if (aWidth !== bWidth) return bWidth - aWidth;
-      return (b.rect?.y ?? 0) - (a.rect?.y ?? 0);
-    })[0] ?? null
-  );
+  return withRect.sort((a, b) => {
+    const aHittable = a.hittable === true ? 1 : 0;
+    const bHittable = b.hittable === true ? 1 : 0;
+    if (aHittable !== bHittable) return bHittable - aHittable;
+    const aWidth = a.rect?.width ?? 0;
+    const bWidth = b.rect?.width ?? 0;
+    if (aWidth !== bWidth) return bWidth - aWidth;
+    return (b.rect?.y ?? 0) - (a.rect?.y ?? 0);
+  })[0]!;
 }
 
 function collapsedBannerClosePoint(node: SnapshotNode): Point {
diff --git a/src/core/dispatch-series.ts b/src/core/dispatch-series.ts
@@ -34,9 +34,7 @@ export function shouldUseIosDragSeries(device: DeviceInfo, count: number): boole
 
 export function computeDeterministicJitter(index: number, jitterPx: number): [number, number] {
   if (jitterPx <= 0) return [0, 0];
-  const [dx, dy] = DETERMINISTIC_JITTER_PATTERN[index % DETERMINISTIC_JITTER_PATTERN.length] ?? [
-    0, 0,
-  ];
+  const [dx, dy] = DETERMINISTIC_JITTER_PATTERN[index % DETERMINISTIC_JITTER_PATTERN.length]!;
   return [dx * jitterPx, dy * jitterPx];
 }
 
diff --git a/src/daemon/artifact-archive.ts b/src/daemon/artifact-archive.ts
@@ -92,8 +92,7 @@ function resolveArchiveRootName(entries: string[], platform: 'ios' | 'android'):
   const rootEntries = [...roots];
   if (platform === 'ios') {
     const appRoots = rootEntries.filter((entry) => entry.toLowerCase().endsWith('.app'));
-    const appRoot = appRoots[0];
-    if (appRoots.length === 1 && appRoot !== undefined) return appRoot;
+    if (appRoots.length === 1) return appRoots[0]!;
     if (appRoots.length === 0) {
       throw new AppError(
         'INVALID_ARGS',
@@ -105,8 +104,7 @@ function resolveArchiveRootName(entries: string[], platform: 'ios' | 'android'):
       `iOS app bundle archives must contain exactly one top-level .app directory, found: ${appRoots.join(', ')}`,
     );
   }
-  const rootEntry = rootEntries[0];
-  if (rootEntries.length === 1 && rootEntry !== undefined) return rootEntry;
+  if (rootEntries.length === 1) return rootEntries[0]!;
   throw new AppError(
     'INVALID_ARGS',
     `Archive must contain a single top-level bundle, found: ${rootEntries.join(', ')}`,
diff --git a/src/daemon/handlers/find.ts b/src/daemon/handlers/find.ts
@@ -140,11 +140,9 @@ export async function handleFindCommands(params: {
 
   if (requiresRect && bestMatches.matches.length > 1) {
     if (req.flags?.findFirst) {
-      const firstMatch = bestMatches.matches[0];
-      if (firstMatch !== undefined) bestMatches.matches = [firstMatch];
+      bestMatches.matches = [bestMatches.matches[0]!];
     } else if (req.flags?.findLast) {
-      const lastMatch = bestMatches.matches.at(-1);
-      if (lastMatch !== undefined) bestMatches.matches = [lastMatch];
+      bestMatches.matches = [bestMatches.matches[bestMatches.matches.length - 1]!];
     } else {
       return buildAmbiguousMatchError(bestMatches.matches, locator, query);
     }
diff --git a/src/daemon/session-routing.ts b/src/daemon/session-routing.ts
@@ -12,8 +12,7 @@ export function resolveEffectiveSessionName(
   if (sessionStore.has(requested)) return requested;
 
   const sessions = sessionStore.toArray();
-  const onlySession = sessions[0];
-  if (sessions.length === 1 && onlySession !== undefined) return onlySession.name;
+  if (sessions.length === 1) return sessions[0]!.name;
   return requested;
 }
 
diff --git a/src/platforms/android/app-lifecycle.ts b/src/platforms/android/app-lifecycle.ts
@@ -68,11 +68,10 @@ export async function resolveAndroidApp(
   const matches = packages.filter((pkg: string) =>
     pkg.toLowerCase().includes(trimmed.toLowerCase()),
   );
-  const match = matches[0];
-  if (matches.length === 1 && match !== undefined) {
+  if (matches.length === 1) {
     return androidAppResolutionCache.set(cacheScope, trimmed, {
       type: 'package',
-      value: match,
+      value: matches[0]!,
     });
   }
 
@@ -424,10 +423,9 @@ export function parseAndroidLaunchComponent(stdout: string): string | null {
     .map((line: string) => line.trim())
     .filter(Boolean);
   for (let index = lines.length - 1; index >= 0; index -= 1) {
-    const line = lines[index];
-    if (line === undefined) continue;
+    const line = lines[index]!;
     if (!line.includes('/')) continue;
-    return line.split(/\s+/)[0] ?? null;
+    return line.split(/\s+/)[0]!;
   }
   return null;
 }
diff --git a/src/platforms/android/ui-hierarchy.ts b/src/platforms/android/ui-hierarchy.ts
@@ -388,8 +388,7 @@ export function parseUiHierarchyTree(xml: string): AndroidUiHierarchy {
       continue;
     }
     const attrs = readAndroidUiNodeMetadata(token);
-    const parent = stack.at(-1);
-    if (parent === undefined) continue;
+    const parent = stack[stack.length - 1]!;
     const node: AndroidUiHierarchy = {
       type: attrs.className,
       label: attrs.text || attrs.desc,
diff --git a/src/platforms/install-source.ts b/src/platforms/install-source.ts
@@ -266,8 +266,8 @@ function isBlockedIpv4(address: string): boolean {
   if (octets.length !== 4 || octets.some((part) => Number.isNaN(part) || part < 0 || part > 255)) {
     return false;
   }
-  const [a, b] = octets;
-  if (a === undefined || b === undefined) return false;
+  const a = octets[0]!;
+  const b = octets[1]!;
   if (a === 10 || a === 127) return true;
   if (a === 169 && b === 254) return true;
   if (a === 172 && b >= 16 && b <= 31) return true;
@@ -323,11 +323,10 @@ async function resolveInstallableCandidate(
 
   if (stat.isDirectory()) {
     const installables = await collectMatchingPaths(candidatePath, params.isInstallablePath);
-    const installable = installables[0];
-    if (installables.length === 1 && installable !== undefined) {
+    if (installables.length === 1) {
       return {
         archivePath: params.archivePath,
-        installablePath: installable,
+        installablePath: installables[0]!,
       };
     }
     if (installables.length > 1) {
@@ -343,10 +342,7 @@ async function resolveInstallableCandidate(
       (entryPath, entryStat) => entryStat.isFile() && isArchivePath(entryPath),
     );
     if (archives.length === 1) {
-      const archive = archives[0];
-      if (archive === undefined) {
-        throw new AppError('INVALID_ARGS', `No ${params.installableLabel} archive found`);
-      }
+      const archive = archives[0]!;
       if (!params.allowArchiveExtraction) {
         throw new AppError(
           'INVALID_ARGS',
diff --git a/src/platforms/ios/apps.ts b/src/platforms/ios/apps.ts
@@ -114,9 +114,8 @@ export async function resolveIosApp(device: DeviceInfo, app: string): Promise<st
       ? await listSimulatorApps(device)
       : await listIosDeviceApps(device, 'all');
   const matches = list.filter((entry) => entry.name.toLowerCase() === trimmed.toLowerCase());
-  const match = matches[0];
-  if (matches.length === 1 && match !== undefined) {
-    return iosAppResolutionCache.set(cacheScope, trimmed, match.bundleId);
+  if (matches.length === 1) {
+    return iosAppResolutionCache.set(cacheScope, trimmed, matches[0]!.bundleId);
   }
   if (matches.length > 1) {
     throw new AppError('INVALID_ARGS', `Multiple apps matched "${app}"`, { matches });
diff --git a/src/platforms/ios/install-artifact.ts b/src/platforms/ios/install-artifact.ts
@@ -120,9 +120,8 @@ async function resolveIosInstallablePath(
         installPath: path.join(payloadDir, entry.name),
         bundleName: entry.name.replace(/\.app$/i, ''),
       }));
-    const appBundle = appBundles[0];
-    if (appBundles.length === 1 && appBundle !== undefined) {
-      return { installPath: appBundle.installPath, cleanup };
+    if (appBundles.length === 1) {
+      return { installPath: appBundles[0]!.installPath, cleanup };
     }
     if (appBundles.length === 0) {
       throw new AppError(
diff --git a/src/platforms/ios/macos-apps.ts b/src/platforms/ios/macos-apps.ts
@@ -40,9 +40,12 @@ export async function resolveMacOsApp(app: string): Promise<string> {
 
   const apps = await listMacApps('all');
   const matches = apps.filter((entry) => entry.name.toLowerCase() === trimmed.toLowerCase());
-  const match = matches[0];
-  if (matches.length === 1 && match !== undefined) {
-    return macOsAppResolutionCache.set(MACOS_APP_RESOLUTION_CACHE_SCOPE, trimmed, match.bundleId);
+  if (matches.length === 1) {
+    return macOsAppResolutionCache.set(
+      MACOS_APP_RESOLUTION_CACHE_SCOPE,
+      trimmed,
+      matches[0]!.bundleId,
+    );
   }
   if (matches.length > 1) {
     throw new AppError('INVALID_ARGS', `Multiple apps matched "${app}"`, { matches });
diff --git a/src/replay/script-utils.ts b/src/replay/script-utils.ts
@@ -200,8 +200,7 @@ export function parseReplaySeriesFlags(
         : undefined;
 
   for (let index = 0; index < args.length; index += 1) {
-    const token = args[index];
-    if (token === undefined) continue;
+    const token = args[index]!;
 
     if (isClickLikeCommand(command) && token === '--double-tap') {
       flags.doubleTap = true;
@@ -263,8 +262,7 @@ export function parseReplayRuntimeFlags(args: string[]): {
   } = {};
 
   for (let index = 0; index < args.length; index += 1) {
-    const token = args[index];
-    if (token === undefined) continue;
+    const token = args[index]!;
     const nextArg = args[index + 1];
     if (token === '--platform' && nextArg !== undefined) {
       const platform = nextArg;
diff --git a/src/replay/script.ts b/src/replay/script.ts
@@ -189,8 +189,7 @@ function parseReplayScriptLine(line: string): SessionAction | null {
   if (trimmed.length === 0 || trimmed.startsWith('#')) return null;
   const tokens = tokenizeReplayLine(trimmed);
   if (tokens.length === 0) return null;
-  const command = tokens[0];
-  if (command === undefined) return null;
+  const command = tokens[0]!;
   const args = tokens.slice(1);
   if (command === 'context') return null;
 
@@ -262,8 +261,7 @@ function parseReplayScriptLine(line: string): SessionAction | null {
     const parsed = parseReplaySeriesFlags(command, args);
     Object.assign(action.flags, parsed.flags);
     if (parsed.positionals.length === 0) return action;
-    const target = parsed.positionals[0];
-    if (target === undefined) return action;
+    const target = parsed.positionals[0]!;
     if (target.startsWith('@')) {
       action.positionals = [target];
       if (parsed.positionals[1]) {
@@ -288,17 +286,14 @@ function parseReplayScriptLine(line: string): SessionAction | null {
       action.positionals = parsed.positionals;
       return action;
     }
-    const target = parsed.positionals[0];
-    if (target === undefined) return action;
+    const target = parsed.positionals[0]!;
     if (target.startsWith('@')) {
       if (parsed.positionals.length >= 3) {
         action.positionals = [target, parsed.positionals.slice(2).join(' ')];
         action.result = { refLabel: parsed.positionals[1] };
         return action;
       }
-      const text = parsed.positionals[1];
-      if (text === undefined) return action;
-      action.positionals = [target, text];
+      action.positionals = [target, parsed.positionals[1]!];
       return action;
     }
     action.positionals = [target, parsed.positionals.slice(1).join(' ')];
@@ -310,9 +305,8 @@ function parseReplayScriptLine(line: string): SessionAction | null {
       action.positionals = args;
       return action;
     }
-    const sub = args[0];
-    const target = args[1];
-    if (sub === undefined || target === undefined) return action;
+    const sub = args[0]!;
+    const target = args[1]!;
     if (target.startsWith('@')) {
       action.positionals = [sub, target];
       if (args[2]) {
@@ -334,8 +328,7 @@ function parseReplayScriptLine(line: string): SessionAction | null {
   if (command === 'record') {
     const positionals: string[] = [];
     for (let index = 0; index < args.length; index += 1) {
-      const token = args[index];
-      if (token === undefined) continue;
+      const token = args[index]!;
       if (token === '--hide-touches') {
         action.flags.hideTouches = true;
         continue;
@@ -365,8 +358,7 @@ function parseReplayScriptLine(line: string): SessionAction | null {
   if (command === 'screenshot') {
     const positionals: string[] = [];
     for (let index = 0; index < args.length; index += 1) {
-      const token = args[index];
-      if (token === undefined) continue;
+      const token = args[index]!;
       const screenshotFlag = readScreenshotScriptFlag({ args, index, flags: action.flags });
       if (screenshotFlag.handled) {
         index = screenshotFlag.nextIndex;
diff --git a/src/utils/args.ts b/src/utils/args.ts
@@ -49,8 +49,7 @@ export function parseRawArgs(argv: string[]): RawParsedArgs {
   let parseFlags = true;
 
   for (let i = 0; i < argv.length; i += 1) {
-    const arg = argv[i];
-    if (arg === undefined) continue;
+    const arg = argv[i]!;
     if (parseFlags && arg === '--') {
       parseFlags = false;
       continue;
diff --git a/src/utils/device.ts b/src/utils/device.ts
@@ -116,8 +116,7 @@ export async function resolveDevice(
     return match;
   }
 
-  const onlyCandidate = candidates[0];
-  if (candidates.length === 1 && onlyCandidate !== undefined) return onlyCandidate;
+  if (candidates.length === 1) return candidates[0]!;
 
   if (candidates.length === 0) {
     const simulatorSetPath = context.simulatorSetPath;
@@ -139,12 +138,9 @@ export async function resolveDevice(
   }
 
   const booted = candidates.filter((d) => d.booted);
-  const onlyBooted = booted[0];
-  if (booted.length === 1 && onlyBooted !== undefined) return onlyBooted;
+  if (booted.length === 1) return booted[0]!;
 
   // When multiple candidates remain equally valid, preserve discovery order from
   // the underlying platform tools rather than introducing another tie-breaker here.
-  const preferred = booted[0] ?? candidates[0];
-  if (preferred !== undefined) return preferred;
-  throw new AppError('DEVICE_NOT_FOUND', 'No devices found', { selector });
+  return booted[0] ?? candidates[0]!;
 }
diff --git a/src/utils/snapshot-diff.ts b/src/utils/snapshot-diff.ts
diff --git a/src/utils/snapshot-processing.ts b/src/utils/snapshot-processing.ts

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,7 @@ function findPreferredActionableDescendant(`
`80`	`80`	`if (sameRectChildren.length !== 1) {`
`81`	`81`	`break;`
`82`	`82`	`}`
`83`		`- const next = sameRectChildren[0];`
`84`		`- if (next === undefined) break;`
`85`		`- current = next;`
	`83`	`+ current = sameRectChildren[0]!;`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`return current === node ? null : current;`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@ export function shouldUseIosDragSeries(device: DeviceInfo, count: number): boole`
`34`	`34`
`35`	`35`	`export function computeDeterministicJitter(index: number, jitterPx: number): [number, number] {`
`36`	`36`	`if (jitterPx <= 0) return [0, 0];`
`37`		`- const [dx, dy] = DETERMINISTIC_JITTER_PATTERN[index % DETERMINISTIC_JITTER_PATTERN.length] ?? [`
`38`		`- 0, 0,`
`39`		`- ];`
	`37`	`+ const [dx, dy] = DETERMINISTIC_JITTER_PATTERN[index % DETERMINISTIC_JITTER_PATTERN.length]!;`
`40`	`38`	`return [dx * jitterPx, dy * jitterPx];`
`41`	`39`	`}`
`42`	`40`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ export function resolveEffectiveSessionName(`
`12`	`12`	`if (sessionStore.has(requested)) return requested;`
`13`	`13`
`14`	`14`	`const sessions = sessionStore.toArray();`
`15`		`- const onlySession = sessions[0];`
`16`		`- if (sessions.length === 1 && onlySession !== undefined) return onlySession.name;`
	`15`	`+ if (sessions.length === 1) return sessions[0]!.name;`
`17`	`16`	`return requested;`
`18`	`17`	`}`
`19`	`18`