refactor: use platformInfo utility

react-native-community · Dec 19, 2023 · 1d4d80e · 1d4d80e
1 parent 91f2604
commit 1d4d80e
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 43 deletions.
diff --git a/packages/cli-platform-apple/src/commands/logCommand/createLog.ts b/packages/cli-platform-apple/src/commands/logCommand/createLog.ts
@@ -5,8 +5,7 @@ import os from 'os';
 import path from 'path';
 import getSimulators from '../../tools/getSimulators';
 import listDevices from '../../tools/listDevices';
-import getPlatformReadableName from '../runCommand/getPlatformReadableName';
-import getSDKNamefromPlatform from '../runCommand/getSDKNameFromPlatform';
+import {getPlatformInfo} from '../runCommand/getPlatformInfo';
 import {BuilderCommand} from '../../types';
 
 /**
@@ -21,7 +20,7 @@ const createLog =
   ({platformName}: BuilderCommand) =>
   async (_: Array<string>, ctx: Config, args: Args) => {
     const platform = ctx.project[platformName] as IOSProjectConfig;
-    const platformReadableName = getPlatformReadableName(platformName);
+    const {readableName: platformReadableName} = getPlatformInfo(platformName);
 
     if (platform === undefined) {
       throw new CLIError(`Unable to find ${platform} platform config`);
@@ -34,7 +33,7 @@ const createLog =
       .reduce((acc, val) => acc.concat(val), [])
       .filter(({state}) => state === 'Booted');
 
-    const sdkNames = getSDKNamefromPlatform(platformName);
+    const {sdkNames} = getPlatformInfo(platformName);
     const devices = await listDevices(sdkNames);
 
     const availableSimulators = devices.filter(

diff --git a/packages/cli-platform-apple/src/commands/runCommand/createRun.ts b/packages/cli-platform-apple/src/commands/runCommand/createRun.ts
@@ -29,8 +29,7 @@ import {buildProject} from '../buildCommand/buildProject';
 import {getConfiguration} from '../buildCommand/getConfiguration';
 import {getXcodeProjectAndDir} from '../buildCommand/getXcodeProjectAndDir';
 import {getFallbackSimulator} from './getFallbackSimulator';
-import getPlatformReadableName from './getPlatformReadableName';
-import getSDKNamefromPlatform from './getSDKNameFromPlatform';
+import {getPlatformInfo} from './getPlatformInfo';
 import {printFoundDevices, matchingDevice} from './matchingDevice';
 import {runOnDevice} from './runOnDevice';
 import {runOnSimulator} from './runOnSimulator';
@@ -53,7 +52,8 @@ const createRun =
     // React Native docs assume platform is always ios/android
     link.setPlatform('ios');
     const platform = ctx.project[platformName] as IOSProjectConfig;
-    const platformReadableName = getPlatformReadableName(platformName);
+    const {sdkNames, readableName: platformReadableName} =
+      getPlatformInfo(platformName);
 
     if (platform === undefined) {
       throw new CLIError(
@@ -133,7 +133,6 @@ const createRun =
       return;
     }
 
-    const sdkNames = getSDKNamefromPlatform(platformName);
     const devices = await listDevices(sdkNames);
 
     const availableDevices = devices.filter(

diff --git a/packages/cli-platform-apple/src/commands/runCommand/getPlatformInfo.ts b/packages/cli-platform-apple/src/commands/runCommand/getPlatformInfo.ts
@@ -0,0 +1,33 @@
+interface PlatformInfo {
+  readableName: string;
+  sdkNames: string[];
+}
+
+export function getPlatformInfo(platform: string): PlatformInfo {
+  const iosPlatformInfo: PlatformInfo = {
+    readableName: 'iOS',
+    sdkNames: ['iphonesimulator', 'iphoneos'],
+  };
+
+  switch (platform) {
+    case 'ios':
+      return iosPlatformInfo;
+    case 'tvos':
+      return {
+        readableName: 'tvOS',
+        sdkNames: ['appletvsimulator', 'appletvos'],
+      };
+    case 'visionos':
+      return {
+        readableName: 'visionOS',
+        sdkNames: ['xrsimulator', 'xros'],
+      };
+    case 'macos':
+      return {
+        readableName: 'macOS',
+        sdkNames: ['macosx'],
+      };
+    default:
+      return iosPlatformInfo;
+  }
+}
diff --git a/packages/cli-platform-apple/src/commands/runCommand/getPlatformReadableName.ts b/packages/cli-platform-apple/src/commands/runCommand/getPlatformReadableName.ts
diff --git a/packages/cli-platform-apple/src/commands/runCommand/getSDKNameFromPlatform.ts b/packages/cli-platform-apple/src/commands/runCommand/getSDKNameFromPlatform.ts
diff --git a/packages/cli-platform-apple/src/tools/__tests__/listDevices.test.ts b/packages/cli-platform-apple/src/tools/__tests__/listDevices.test.ts
@@ -8,7 +8,7 @@
 
 import execa from 'execa';
 import listDevices from '../listDevices';
-import getSDKNamefromPlatform from '../../commands/runCommand/getSDKNameFromPlatform';
+import {getPlatformInfo} from '../../commands/runCommand/getPlatformInfo';
 
 jest.mock('execa', () => {
   return {sync: jest.fn()};
@@ -165,7 +165,7 @@ const xcrunOut = `
 describe('listDevices', () => {
   it('parses output from xcdevice list for iOS', async () => {
     (execa.sync as jest.Mock).mockReturnValueOnce({stdout: xcrunOut});
-    const sdkNames = getSDKNamefromPlatform('ios');
+    const {sdkNames} = getPlatformInfo('ios');
     const devices = await listDevices(sdkNames);
 
     // Find all available simulators
@@ -231,7 +231,7 @@ describe('listDevices', () => {
 
   it('parses output from xcdevice list for tvOS', async () => {
     (execa.sync as jest.Mock).mockReturnValueOnce({stdout: xcrunOut});
-    const sdkNames = getSDKNamefromPlatform('tvos');
+    const {sdkNames} = getPlatformInfo('tvos');
     const devices = await listDevices(sdkNames);
 
     // Filter out all available simulators