eas-cli 2.0.0 → 2.2.0

package/build/commands/config.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
@@ -10,20 +11,16 @@ const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const platform_1 = require("../platform");
-const expoConfig_1 = require("../project/expoConfig");
-const projectUtils_1 = require("../project/projectUtils");
 const prompts_1 = require("../prompts");
 class Config extends EasCommand_1.default {
-    constructor() {
-        super(...arguments);
-        this.requiresAuthentication = false;
-    }
     async runAsync() {
         const { flags } = await this.parse(Config);
         const { platform: maybePlatform, profile: maybeProfile } = flags;
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const reader = new eas_json_1.EasJsonReader(projectDir);
-        const profileName = maybeProfile !== null && maybeProfile !== void 0 ? maybeProfile : (await (0, prompts_1.selectAsync)('Select build profile', (await reader.getBuildProfileNamesAsync()).map(profileName => ({
+        const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
+            nonInteractive: false,
+        });
+        const accessor = new eas_json_1.EasJsonAccessor(projectDir);
+        const profileName = maybeProfile !== null && maybeProfile !== void 0 ? maybeProfile : (await (0, prompts_1.selectAsync)('Select build profile', (await eas_json_1.EasJsonUtils.getBuildProfileNamesAsync(accessor)).map(profileName => ({
             title: profileName,
             value: profileName,
         }))));
@@ -37,8 +34,11 @@ class Config extends EasCommand_1.default {
                 value: eas_build_job_1.Platform.IOS,
             },
         ]));
-        const profile = await reader.getBuildProfileAsync(platform, profileName);
-        const config = (0, expoConfig_1.getExpoConfig)(projectDir, { env: profile.env, isPublicConfig: true });
+        const profile = await eas_json_1.EasJsonUtils.getBuildProfileAsync(accessor, platform, profileName);
+        const { exp: config } = await getDynamicProjectConfigAsync({
+            env: profile.env,
+            isPublicConfig: true,
+        });
         log_1.default.addNewLineIfNone();
         log_1.default.log(chalk_1.default.bold((0, config_1.getProjectConfigDescription)(projectDir)));
         log_1.default.newLine();
@@ -53,8 +53,17 @@ class Config extends EasCommand_1.default {
     }
 }
 exports.default = Config;
+_a = Config;
 Config.description = 'display project configuration (app.json + eas.json)';
 Config.flags = {
-    platform: core_1.Flags.enum({ char: 'p', options: ['android', 'ios'] }),
-    profile: core_1.Flags.string(),
+    platform: core_1.Flags.enum({ char: 'p', options: [eas_build_job_1.Platform.ANDROID, eas_build_job_1.Platform.IOS] }),
+    profile: core_1.Flags.string({
+        char: 'e',
+        description: 'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+        helpValue: 'PROFILE_NAME',
+    }),
+};
+Config.contextDefinition = {
+    ..._a.ContextOptions.DynamicProjectConfig,
+    ..._a.ContextOptions.ProjectDir,
 };

package/build/commands/credentials.d.ts

@@ -4,5 +4,9 @@ export default class Credentials extends EasCommand {
     static flags: {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
+    static contextDefinition: {
+        projectConfig: import("../commandUtils/context/OptionalProjectConfigContextField").OptionalProjectConfigContextField;
+        actor: import("../commandUtils/context/ActorContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/credentials.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
@@ -7,11 +8,19 @@ const SelectPlatform_1 = require("../credentials/manager/SelectPlatform");
 class Credentials extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(Credentials);
-        await new SelectPlatform_1.SelectPlatform(flags.platform).runAsync();
+        const { actor, projectConfig } = await this.getContextAsync(Credentials, {
+            nonInteractive: false,
+        });
+        await new SelectPlatform_1.SelectPlatform(actor, projectConfig !== null && projectConfig !== void 0 ? projectConfig : null, flags.platform).runAsync();
     }
 }
 exports.default = Credentials;
+_a = Credentials;
 Credentials.description = 'manage credentials';
 Credentials.flags = {
     platform: core_1.Flags.enum({ char: 'p', options: ['android', 'ios'] }),
 };
+Credentials.contextDefinition = {
+    ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.OptionalProjectConfig,
+};

package/build/commands/device/create.d.ts

@@ -1,5 +1,9 @@
 import EasCommand from '../../commandUtils/EasCommand';
 export default class DeviceCreate extends EasCommand {
     static description: string;
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/OptionalProjectConfigContextField").OptionalProjectConfigContextField;
+        actor: import("../../commandUtils/context/ActorContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/device/create.js

@@ -1,18 +1,30 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const AppStoreApi_1 = tslib_1.__importDefault(require("../../credentials/ios/appstore/AppStoreApi"));
 const context_1 = require("../../devices/context");
 const manager_1 = tslib_1.__importDefault(require("../../devices/manager"));
-const actions_1 = require("../../user/actions");
 class DeviceCreate extends EasCommand_1.default {
     async runAsync() {
-        const user = await (0, actions_1.ensureLoggedInAsync)();
-        const ctx = await (0, context_1.createContextAsync)({ appStore: new AppStoreApi_1.default(), user });
+        // this command is interactive by design
+        const { actor, projectConfig } = await this.getContextAsync(DeviceCreate, {
+            nonInteractive: false,
+        });
+        const ctx = await (0, context_1.createContextAsync)({
+            appStore: new AppStoreApi_1.default(),
+            user: actor,
+            projectId: projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.projectId,
+        });
         const manager = new manager_1.default(ctx);
         await manager.createAsync();
     }
 }
 exports.default = DeviceCreate;
+_a = DeviceCreate;
 DeviceCreate.description = 'register new Apple Devices to use for internal distribution';
+DeviceCreate.contextDefinition = {
+    ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.OptionalProjectConfig,
+};

package/build/commands/device/delete.d.ts

@@ -1,17 +1,22 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { AppleDeviceQueryResult, AppleDevicesByTeamIdentifierQueryResult } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import { PaginatedQueryOptions } from '../../commandUtils/pagination';
+import { AppleDeviceQueryResult } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import { AppleDevice, Maybe } from '../../graphql/generated';
 export default class DeviceDelete extends EasCommand {
     static description: string;
     static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'apple-team-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        udid: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        udid: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;
-    askAndDisableOnAppleAsync(chosenDevices: (AppleDevice | AppleDeviceQueryResult)[], appleTeamIdentifier: string): Promise<void>;
-    askAndRemoveFromExpoAsync(chosenDevices: (AppleDevice | AppleDeviceQueryResult)[]): Promise<boolean>;
-    logChosenDevices(chosenDevices: (AppleDevice | AppleDeviceQueryResult)[], appleTeamName: Maybe<string> | undefined, appleTeamIdentifier: string): void;
-    chooseDevicesToDeleteAsync(appleDevices: AppleDeviceQueryResult[], udids: string[]): Promise<(AppleDevice | AppleDeviceQueryResult)[]>;
-    getDevicesForTeamAsync(accountName: string, appleTeamIdentifier: string): Promise<AppleDevicesByTeamIdentifierQueryResult | undefined>;
-    askForAppleTeamAsync(accountName: string): Promise<string | undefined>;
+    shouldDisableDeviceOnAppleAsync({ nonInteractive, }: PaginatedQueryOptions): Promise<boolean>;
+    disableDeviceOnAppleAsync(device: AppleDevice | AppleDeviceQueryResult, appleTeamIdentifier: string): Promise<void>;
+    shouldRemoveDeviceFromExpoAsync({ nonInteractive, }: PaginatedQueryOptions): Promise<boolean>;
+    removeDeviceFromExpoAsync(chosenDevice: AppleDevice | AppleDeviceQueryResult): Promise<void>;
+    logChosenDevice(device: AppleDevice | AppleDeviceQueryResult, appleTeamName: Maybe<string> | undefined, appleTeamIdentifier: string, { json }: PaginatedQueryOptions): void;
 }

package/build/commands/device/delete.js

@@ -1,181 +1,133 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const apple_utils_1 = require("@expo/apple-utils");
 const core_1 = require("@oclif/core");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const DeviceUtils_1 = require("../../credentials/ios/actions/DeviceUtils");
+const flags_1 = require("../../commandUtils/flags");
+const pagination_1 = require("../../commandUtils/pagination");
 const AppleDeviceMutation_1 = require("../../credentials/ios/api/graphql/mutations/AppleDeviceMutation");
 const AppleDeviceQuery_1 = require("../../credentials/ios/api/graphql/queries/AppleDeviceQuery");
-const AppleTeamQuery_1 = require("../../credentials/ios/api/graphql/queries/AppleTeamQuery");
 const authenticate_1 = require("../../credentials/ios/appstore/authenticate");
+const queries_1 = require("../../devices/queries");
 const formatDevice_1 = tslib_1.__importDefault(require("../../devices/utils/formatDevice"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
+const json_1 = require("../../utils/json");
 class DeviceDelete extends EasCommand_1.default {
     async runAsync() {
-        let { flags: { 'apple-team-id': appleTeamIdentifier, udid: udids }, } = await this.parse(DeviceDelete);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
+        const { flags } = await this.parse(DeviceDelete);
+        const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
+        let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
+        const { projectConfig: { projectId }, } = await this.getContextAsync(DeviceDelete, {
+            nonInteractive: paginatedQueryOptions.nonInteractive,
+        });
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(projectId);
+        let appleTeamName;
+        if (paginatedQueryOptions.json) {
+            (0, json_1.enableJsonOutput)();
+        }
         if (!appleTeamIdentifier) {
-            appleTeamIdentifier = await this.askForAppleTeamAsync(accountName);
+            const appleTeam = await (0, queries_1.selectAppleTeamOnAccountAsync)({
+                accountName: account.name,
+                selectionPromptTitle: `What Apple team would you like to list devices for?`,
+                paginatedQueryOptions,
+            });
+            appleTeamIdentifier = appleTeam.appleTeamIdentifier;
+            appleTeamName = appleTeam.appleTeamName;
         }
         (0, assert_1.default)(appleTeamIdentifier, 'No team identifier is specified');
-        const appleDevicesResult = await this.getDevicesForTeamAsync(accountName, appleTeamIdentifier);
-        if (!appleDevicesResult) {
-            return;
-        }
-        const { appleTeamName, appleDevices } = appleDevicesResult;
-        const chosenDevices = await this.chooseDevicesToDeleteAsync(appleDevices, udids);
-        if (chosenDevices.length === 0) {
-            log_1.default.newLine();
-            log_1.default.warn('No devices were chosen to be removed.');
+        const chosenDevice = udid
+            ? await AppleDeviceQuery_1.AppleDeviceQuery.getByDeviceIdentifierAsync(account.name, udid)
+            : await (0, queries_1.selectAppleDeviceOnAppleTeamAsync)({
+                accountName: account.name,
+                appleTeamIdentifier,
+                selectionPromptTitle: `Which device would you like to disable?`,
+                paginatedQueryOptions,
+            });
+        this.logChosenDevice(chosenDevice, appleTeamName, appleTeamIdentifier, paginatedQueryOptions);
+        if (!(await this.shouldRemoveDeviceFromExpoAsync(paginatedQueryOptions))) {
             return;
         }
-        this.logChosenDevices(chosenDevices, appleTeamName, appleTeamIdentifier);
-        const hasRemoved = await this.askAndRemoveFromExpoAsync(chosenDevices);
-        if (!hasRemoved) {
-            return;
+        await this.removeDeviceFromExpoAsync(chosenDevice);
+        if (await this.shouldDisableDeviceOnAppleAsync(paginatedQueryOptions)) {
+            await this.disableDeviceOnAppleAsync(chosenDevice, appleTeamIdentifier);
         }
-        await this.askAndDisableOnAppleAsync(chosenDevices, appleTeamIdentifier);
     }
-    async askAndDisableOnAppleAsync(chosenDevices, appleTeamIdentifier) {
-        log_1.default.newLine();
-        const deleteOnApple = await (0, prompts_1.toggleConfirmAsync)({
-            message: 'Do you want to disable these devices on your Apple account as well?',
-        });
-        if (!deleteOnApple) {
-            return;
+    async shouldDisableDeviceOnAppleAsync({ nonInteractive, }) {
+        if (!nonInteractive) {
+            log_1.default.newLine();
+            return await (0, prompts_1.toggleConfirmAsync)({
+                message: 'Do you want to disable this device on your Apple account as well?',
+            });
         }
+        return true;
+    }
+    async disableDeviceOnAppleAsync(device, appleTeamIdentifier) {
         const ctx = await (0, authenticate_1.authenticateAsync)({ teamId: appleTeamIdentifier });
         const context = (0, authenticate_1.getRequestContext)(ctx);
         log_1.default.addNewLineIfNone();
-        const removeAppleSpinner = (0, ora_1.ora)('Disabling devices on Apple').start();
+        const removeAppleSpinner = (0, ora_1.ora)('Disabling device on Apple').start();
         try {
-            let realDevices = await apple_utils_1.Device.getAllIOSProfileDevicesAsync(context);
-            realDevices = realDevices.filter(d => chosenDevices.map(cd => cd.identifier).includes(d.attributes.udid));
-            for (const device of realDevices) {
-                await device.updateAsync({ status: apple_utils_1.DeviceStatus.DISABLED });
+            const appleValidatedDevices = await apple_utils_1.Device.getAsync(context);
+            const appleValidatedDevice = appleValidatedDevices.find(d => d.id === device.id);
+            if (appleValidatedDevice) {
+                await appleValidatedDevice.updateAsync({ status: apple_utils_1.DeviceStatus.DISABLED });
             }
-            removeAppleSpinner.succeed('Disabled devices on Apple');
+            removeAppleSpinner.succeed('Disabled device on Apple');
         }
         catch (err) {
             removeAppleSpinner.fail();
             throw err;
         }
     }
-    async askAndRemoveFromExpoAsync(chosenDevices) {
-        log_1.default.warn(`You are about to remove the Apple device${chosenDevices.length > 1 ? 's' : ''} listed above from your Expo account.`);
-        log_1.default.newLine();
-        const confirmed = await (0, prompts_1.toggleConfirmAsync)({
-            message: 'Are you sure you wish to proceed?',
-        });
-        if (confirmed) {
-            const removalSpinner = (0, ora_1.ora)(`Removing Apple devices on Expo`).start();
-            try {
-                for (const chosenDevice of chosenDevices) {
-                    await AppleDeviceMutation_1.AppleDeviceMutation.deleteAppleDeviceAsync(chosenDevice.id);
-                }
-                removalSpinner.succeed('Removed Apple devices from Expo');
-            }
-            catch (err) {
-                removalSpinner.fail();
-                throw err;
-            }
-        }
-        return confirmed;
-    }
-    logChosenDevices(chosenDevices, appleTeamName, appleTeamIdentifier) {
-        log_1.default.addNewLineIfNone();
-        chosenDevices.forEach(device => {
-            log_1.default.log((0, formatDevice_1.default)(device, {
-                appleTeamName,
-                appleTeamIdentifier: appleTeamIdentifier,
-            }));
+    async shouldRemoveDeviceFromExpoAsync({ nonInteractive, }) {
+        if (!nonInteractive) {
+            log_1.default.warn(`You are about to remove the Apple device listed above from your Expo account.`);
             log_1.default.newLine();
-        });
-    }
-    async chooseDevicesToDeleteAsync(appleDevices, udids) {
-        let chosenDevices = [];
-        log_1.default.newLine();
-        if (udids) {
-            udids.forEach(udid => {
-                const foundDevice = appleDevices.find(device => device.identifier === udid);
-                if (foundDevice) {
-                    chosenDevices.push(foundDevice);
-                }
-                else {
-                    log_1.default.warn(`No device found with UDID ${udid}.`);
-                }
+            return await (0, prompts_1.toggleConfirmAsync)({
+                message: 'Are you sure you wish to proceed?',
             });
         }
-        if (chosenDevices.length === 0) {
-            log_1.default.addNewLineIfNone();
-            chosenDevices = await (0, DeviceUtils_1.chooseDevicesToDeleteAsync)(appleDevices);
-            log_1.default.newLine();
-        }
-        return chosenDevices;
+        return true;
     }
-    async getDevicesForTeamAsync(accountName, appleTeamIdentifier) {
-        const devicesSpinner = (0, ora_1.ora)().start('Fetching the list of devices for the team…');
+    async removeDeviceFromExpoAsync(chosenDevice) {
+        const removalSpinner = (0, ora_1.ora)(`Removing Apple device on Expo`).start();
         try {
-            const result = await AppleDeviceQuery_1.AppleDeviceQuery.getAllForAppleTeamAsync(accountName, appleTeamIdentifier);
-            if (result === null || result === void 0 ? void 0 : result.appleDevices.length) {
-                const { appleTeamName, appleDevices } = result;
-                devicesSpinner.succeed(`Found ${appleDevices.length} devices for team ${appleTeamName !== null && appleTeamName !== void 0 ? appleTeamName : appleTeamIdentifier}`);
-                return result;
-            }
-            else {
-                devicesSpinner.fail(`Couldn't find any devices for the team ${appleTeamIdentifier}`);
-                return;
-            }
+            await AppleDeviceMutation_1.AppleDeviceMutation.deleteAppleDeviceAsync(chosenDevice.id);
+            removalSpinner.succeed('Removed Apple device from Expo');
         }
-        catch (e) {
-            devicesSpinner.fail(`Something went wrong and we couldn't fetch the device list`);
-            throw e;
+        catch (err) {
+            removalSpinner.fail();
+            throw err;
         }
     }
-    async askForAppleTeamAsync(accountName) {
-        const teamSpinner = (0, ora_1.ora)().start('Fetching the list of teams for the project…');
-        try {
-            const teams = await AppleTeamQuery_1.AppleTeamQuery.getAllForAccountAsync(accountName);
-            if (teams.length > 0) {
-                teamSpinner.succeed('Fetched the list of teams for the project');
-                if (teams.length === 1) {
-                    return teams[0].appleTeamIdentifier;
-                }
-                const result = await (0, prompts_1.promptAsync)({
-                    type: 'select',
-                    name: 'appleTeamIdentifier',
-                    message: 'What Apple Team would you like to list devices for?',
-                    choices: teams.map(team => ({
-                        title: team.appleTeamName
-                            ? `${team.appleTeamName} (ID: ${team.appleTeamIdentifier})`
-                            : team.appleTeamIdentifier,
-                        value: team.appleTeamIdentifier,
-                    })),
-                });
-                return result.appleTeamIdentifier;
-            }
-            else {
-                teamSpinner.fail(`Couldn't find any teams for the account ${accountName}`);
-                return;
-            }
+    logChosenDevice(device, appleTeamName, appleTeamIdentifier, { json }) {
+        if (json) {
+            (0, json_1.printJsonOnlyOutput)(device);
         }
-        catch (e) {
-            teamSpinner.fail(`Something went wrong and we couldn't fetch the list of teams`);
-            throw e;
+        else {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log((0, formatDevice_1.default)(device, {
+                appleTeamName,
+                appleTeamIdentifier: appleTeamIdentifier,
+            }));
+            log_1.default.newLine();
         }
     }
 }
 exports.default = DeviceDelete;
+_a = DeviceDelete;
 DeviceDelete.description = 'remove a registered device from your account';
 DeviceDelete.flags = {
-    'apple-team-id': core_1.Flags.string(),
-    udid: core_1.Flags.string({ multiple: true }),
+    'apple-team-id': core_1.Flags.string({ description: 'The Apple team ID on which to find the device' }),
+    udid: core_1.Flags.string({ description: 'The Apple device ID to disable' }),
+    ...flags_1.EasNonInteractiveAndJsonFlags,
+};
+DeviceDelete.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

package/build/commands/device/list.d.ts

@@ -2,7 +2,14 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class BuildList extends EasCommand {
     static description: string;
     static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        offset: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        limit: any;
         'apple-team-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/device/list.js

@@ -1,82 +1,61 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const assert_1 = tslib_1.__importDefault(require("assert"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const AppleDeviceQuery_1 = require("../../credentials/ios/api/graphql/queries/AppleDeviceQuery");
-const AppleTeamQuery_1 = require("../../credentials/ios/api/graphql/queries/AppleTeamQuery");
-const formatDevice_1 = tslib_1.__importDefault(require("../../devices/utils/formatDevice"));
-const log_1 = tslib_1.__importDefault(require("../../log"));
-const ora_1 = require("../../ora");
-const expoConfig_1 = require("../../project/expoConfig");
+const flags_1 = require("../../commandUtils/flags");
+const pagination_1 = require("../../commandUtils/pagination");
+const queries_1 = require("../../devices/queries");
 const projectUtils_1 = require("../../project/projectUtils");
-const prompts_1 = require("../../prompts");
+const json_1 = require("../../utils/json");
 class BuildList extends EasCommand_1.default {
     async runAsync() {
-        let appleTeamIdentifier = (await this.parse(BuildList)).flags['apple-team-id'];
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        let spinner;
+        const { flags } = await this.parse(BuildList);
+        const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BuildList, {
+            nonInteractive: paginatedQueryOptions.nonInteractive,
+        });
+        let appleTeamIdentifier = flags['apple-team-id'];
+        let appleTeamName;
+        if (paginatedQueryOptions.json) {
+            (0, json_1.enableJsonOutput)();
+        }
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(projectId);
+        // if they don't provide a team id, fetch devices on their account
         if (!appleTeamIdentifier) {
-            spinner = (0, ora_1.ora)().start('Fetching the list of teams for the project…');
-            try {
-                const teams = await AppleTeamQuery_1.AppleTeamQuery.getAllForAccountAsync(accountName);
-                if (teams.length > 0) {
-                    spinner.succeed();
-                    if (teams.length === 1) {
-                        appleTeamIdentifier = teams[0].appleTeamIdentifier;
-                    }
-                    else {
-                        const result = await (0, prompts_1.promptAsync)({
-                            type: 'select',
-                            name: 'appleTeamIdentifier',
-                            message: 'What Apple Team would you like to list devices for?',
-                            choices: teams.map(team => ({
-                                title: team.appleTeamName
-                                    ? `${team.appleTeamName} (ID: ${team.appleTeamIdentifier})`
-                                    : team.appleTeamIdentifier,
-                                value: team.appleTeamIdentifier,
-                            })),
-                        });
-                        appleTeamIdentifier = result.appleTeamIdentifier;
-                    }
-                }
-                else {
-                    spinner.fail(`Couldn't find any teams for the account ${accountName}`);
-                }
-            }
-            catch (e) {
-                spinner.fail(`Something went wrong and we couldn't fetch the list of teams`);
-                throw e;
-            }
+            const selectedAppleTeam = await (0, queries_1.selectAppleTeamOnAccountAsync)({
+                accountName: account.name,
+                paginatedQueryOptions: {
+                    ...paginatedQueryOptions,
+                    offset: 0,
+                    limit: undefined,
+                },
+                selectionPromptTitle: 'What Apple team would you like to list devices for?',
+            });
+            appleTeamIdentifier = selectedAppleTeam.appleTeamIdentifier;
+            appleTeamName = selectedAppleTeam.appleTeamName;
         }
         (0, assert_1.default)(appleTeamIdentifier, 'No team identifier is specified');
-        spinner = (0, ora_1.ora)().start('Fetching the list of devices for the team…');
-        try {
-            const result = await AppleDeviceQuery_1.AppleDeviceQuery.getAllForAppleTeamAsync(accountName, appleTeamIdentifier);
-            if (result === null || result === void 0 ? void 0 : result.appleDevices.length) {
-                const { appleTeamName, appleDevices } = result;
-                spinner.succeed(`Found ${appleDevices.length} devices for team ${appleTeamName !== null && appleTeamName !== void 0 ? appleTeamName : appleTeamIdentifier}`);
-                const list = appleDevices
-                    .map(device => (0, formatDevice_1.default)(device, { appleTeamName, appleTeamIdentifier: appleTeamIdentifier }))
-                    .join(`\n\n${chalk_1.default.dim('———')}\n\n`);
-                log_1.default.log(`\n${list}`);
-            }
-            else {
-                spinner.fail(`Couldn't find any devices for the team ${appleTeamIdentifier}`);
-            }
-        }
-        catch (e) {
-            spinner.fail(`Something went wrong and we couldn't fetch the device list`);
-            throw e;
-        }
+        await (0, queries_1.listAndRenderAppleDevicesOnAppleTeamAsync)({
+            accountName: account.name,
+            appleTeam: {
+                appleTeamIdentifier,
+                appleTeamName,
+            },
+            paginatedQueryOptions,
+        });
     }
 }
 exports.default = BuildList;
+_a = BuildList;
 BuildList.description = 'list all registered devices for your account';
 BuildList.flags = {
     'apple-team-id': core_1.Flags.string(),
+    ...pagination_1.EasPaginatedQueryFlags,
+    ...flags_1.EasNonInteractiveAndJsonFlags,
+};
+BuildList.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

package/build/commands/device/view.d.ts

@@ -4,5 +4,8 @@ export default class DeviceView extends EasCommand {
     static args: {
         name: string;
     }[];
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/device/view.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
@@ -6,7 +7,6 @@ const AppleDeviceQuery_1 = require("../../credentials/ios/api/graphql/queries/Ap
 const formatDevice_1 = tslib_1.__importDefault(require("../../devices/utils/formatDevice"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 class DeviceView extends EasCommand_1.default {
     async runAsync() {
@@ -22,12 +22,13 @@ If you are not sure what is the UDID of the device you are looking for, run:
 `);
             throw new Error('Device UDID is missing');
         }
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(DeviceView, {
+            nonInteractive: true,
+        });
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(projectId);
         const spinner = (0, ora_1.ora)().start(`Fetching device details for ${UDID}…`);
         try {
-            const device = await AppleDeviceQuery_1.AppleDeviceQuery.getByDeviceIdentifierAsync(accountName, UDID);
+            const device = await AppleDeviceQuery_1.AppleDeviceQuery.getByDeviceIdentifierAsync(account.name, UDID);
             if (device) {
                 spinner.succeed('Fetched device details');
                 log_1.default.log(`\n${(0, formatDevice_1.default)(device, device.appleTeam)}`);
@@ -43,5 +44,9 @@ If you are not sure what is the UDID of the device you are looking for, run:
     }
 }
 exports.default = DeviceView;
+_a = DeviceView;
 DeviceView.description = 'view a device for your project';
 DeviceView.args = [{ name: 'UDID' }];
+DeviceView.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};