eas-cli 0.44.1 → 0.47.0

package/build/build/android/graphql.js

@@ -19,6 +19,7 @@ function transformJob(job) {
         username: job.username,
         buildType: job.buildType && transformBuildType(job.buildType),
         developmentClient: job.developmentClient,
+        experimental: job.experimental,
     };
 }
 exports.transformJob = transformJob;

package/build/build/android/prepareJob.js

@@ -62,6 +62,9 @@ async function prepareJobAsync(ctx, jobData) {
         artifactPath: buildProfile.artifactPath,
         buildType,
         username,
+        experimental: {
+            prebuildCommand: ctx.buildProfile.prebuildCommand,
+        },
     };
     return (0, eas_build_job_1.sanitizeJob)(job);
 }

package/build/build/android/syncProjectConfiguration.js

@@ -8,8 +8,8 @@ const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
-const updates_1 = require("../utils/updates");
 const UpdatesModule_1 = require("./UpdatesModule");
 const version_1 = require("./version");
 async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, }) {
@@ -18,7 +18,7 @@ async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, })
     const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         await cleanUpOldEasBuildGradleScriptAsync(projectDir);
-        if ((0, updates_1.isExpoUpdatesInstalled)(projectDir)) {
+        if ((0, projectUtils_1.isExpoUpdatesInstalled)(projectDir)) {
             await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);
         }
         await (0, version_1.bumpVersionAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy });

package/build/build/ios/graphql.js

@@ -20,6 +20,7 @@ function transformJob(job) {
         username: job.username,
         developmentClient: job.developmentClient,
         simulator: job.simulator,
+        experimental: job.experimental,
     };
 }
 exports.transformJob = transformJob;

package/build/build/ios/prepareJob.js

@@ -54,6 +54,9 @@ async function prepareJobAsync(ctx, jobData) {
         buildConfiguration: ctx.buildProfile.buildConfiguration,
         artifactPath: ctx.buildProfile.artifactPath,
         username,
+        experimental: {
+            prebuildCommand: ctx.buildProfile.prebuildCommand,
+        },
     };
     return (0, eas_build_job_1.sanitizeJob)(job);
 }

package/build/build/ios/syncProjectConfiguration.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncProjectConfigurationAsync = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
+const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
-const updates_1 = require("../utils/updates");
 const UpdatesModule_1 = require("./UpdatesModule");
 const version_1 = require("./version");
 async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }) {
@@ -11,7 +11,7 @@ async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, bu
     const { autoIncrement } = buildProfile;
     const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
-        if ((0, updates_1.isExpoUpdatesInstalled)(projectDir)) {
+        if ((0, projectUtils_1.isExpoUpdatesInstalled)(projectDir)) {
             await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);
         }
         await (0, version_1.bumpVersionAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });

package/build/build/local.js

@@ -6,7 +6,7 @@ const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"))
 const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
 const ora_1 = require("../ora");
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.58';
+const PLUGIN_PACKAGE_VERSION = '0.0.62';
 async function runLocalBuildAsync(job, options) {
     var _a;
     const { command, args } = await getCommandAndArgsAsync(job);

package/build/build/metadata.js

@@ -15,7 +15,6 @@ const UpdatesModule_1 = require("./android/UpdatesModule");
 const version_1 = require("./android/version");
 const UpdatesModule_2 = require("./ios/UpdatesModule");
 const version_2 = require("./ios/version");
-const updates_1 = require("./utils/updates");
 // TODO(JJ): Replace this with the getRuntimeVersionNullable function in @expo/config-plugins
 function getRuntimeVersionNullable(...[config, platform]) {
     try {
@@ -78,7 +77,7 @@ function resolveAppIdentifier(ctx) {
     }
 }
 async function resolveChannelOrReleaseChannelAsync(ctx) {
-    if (!(0, updates_1.isExpoUpdatesInstalled)(ctx.projectDir)) {
+    if (!(0, projectUtils_1.isExpoUpdatesInstalled)(ctx.projectDir)) {
         return null;
     }
     if (ctx.buildProfile.channel) {

package/build/build/runBuildAndSubmit.js

@@ -14,6 +14,7 @@ const metroConfig_1 = require("../project/metroConfig");
 const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
+const json_1 = require("../utils/json");
 const profiles_1 = require("../utils/profiles");
 const vcs_1 = require("../vcs");
 const build_1 = require("./android/build");
@@ -92,6 +93,9 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         log_1.default.newLine();
     }
     if (!flags.wait) {
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)(startedBuilds.map(buildInfo => buildInfo.build));
+        }
         return;
     }
     const builds = await (0, build_2.waitForBuildEndAsync)(startedBuilds.map(({ build }) => build.id));

package/build/build/utils/updates.d.ts

@@ -1,3 +1,2 @@
 import { ExpoConfig } from '@expo/config';
-export declare function isExpoUpdatesInstalled(projectDir: string): boolean;
 export declare function ensureValidVersions(exp: ExpoConfig): void;

package/build/build/utils/updates.js

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureValidVersions = exports.isExpoUpdatesInstalled = void 0;
-const config_1 = require("@expo/config");
-function isExpoUpdatesInstalled(projectDir) {
-    const packageJson = (0, config_1.getPackageJson)(projectDir);
-    return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
-}
-exports.isExpoUpdatesInstalled = isExpoUpdatesInstalled;
+exports.ensureValidVersions = void 0;
 function ensureValidVersions(exp) {
     if (!exp.runtimeVersion && !exp.sdkVersion) {
         throw new Error("Couldn't find either 'runtimeVersion' or 'sdkVersion' to configure 'expo-updates'. Please specify at least one of these properties under the 'expo' key in 'app.json'");

package/build/commands/analytics.js

@@ -22,5 +22,5 @@ class AnalyticsView extends EasCommand_1.default {
     }
 }
 exports.default = AnalyticsView;
-AnalyticsView.description = 'view or change analytics settings';
+AnalyticsView.description = 'display or change analytics settings';
 AnalyticsView.args = [{ name: 'STATUS', options: ['on', 'off'] }];

package/build/commands/branch/create.js

@@ -70,7 +70,7 @@ class BranchCreate extends EasCommand_1.default {
     }
 }
 exports.default = BranchCreate;
-BranchCreate.description = 'Create a branch on the current project.';
+BranchCreate.description = 'create a branch';
 BranchCreate.args = [
     {
         name: 'name',

package/build/commands/branch/delete.js

@@ -99,7 +99,7 @@ class BranchDelete extends EasCommand_1.default {
     }
 }
 exports.default = BranchDelete;
-BranchDelete.description = 'Delete a branch on the current project';
+BranchDelete.description = 'delete a branch';
 BranchDelete.args = [
     {
         name: 'name',

package/build/commands/branch/list.js

@@ -81,7 +81,7 @@ class BranchList extends EasCommand_1.default {
     }
 }
 exports.default = BranchList;
-BranchList.description = 'List all branches on this project.';
+BranchList.description = 'list all branches';
 BranchList.flags = {
     json: core_1.Flags.boolean({
         description: 'return output as JSON',

package/build/commands/branch/rename.js

@@ -80,7 +80,7 @@ class BranchRename extends EasCommand_1.default {
     }
 }
 exports.default = BranchRename;
-BranchRename.description = 'Rename a branch.';
+BranchRename.description = 'rename a branch';
 BranchRename.flags = {
     from: core_1.Flags.string({
         description: 'current name of the branch.',

package/build/commands/branch/view.js

@@ -76,7 +76,7 @@ class BranchView extends EasCommand_1.default {
     }
 }
 exports.default = BranchView;
-BranchView.description = 'View a branch.';
+BranchView.description = 'view a branch';
 BranchView.args = [
     {
         name: 'name',

package/build/commands/build/cancel.js

@@ -120,5 +120,5 @@ class BuildCancel extends EasCommand_1.default {
     }
 }
 exports.default = BuildCancel;
-BuildCancel.description = 'Cancel a build.';
+BuildCancel.description = 'cancel a build';
 BuildCancel.args = [{ name: 'BUILD_ID' }];

package/build/commands/build/configure.js

@@ -9,7 +9,6 @@ const UpdatesModule_1 = require("../../build/android/UpdatesModule");
 const syncProjectConfiguration_1 = require("../../build/android/syncProjectConfiguration");
 const configure_1 = require("../../build/configure");
 const UpdatesModule_2 = require("../../build/ios/UpdatesModule");
-const updates_1 = require("../../build/utils/updates");
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
@@ -24,7 +23,7 @@ class BuildConfigure extends EasCommand_1.default {
         log_1.default.log('💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.');
         await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const expoUpdatesIsInstalled = (0, updates_1.isExpoUpdatesInstalled)(projectDir);
+        const expoUpdatesIsInstalled = (0, projectUtils_1.isExpoUpdatesInstalled)(projectDir);
         const platform = (_a = flags.platform) !== null && _a !== void 0 ? _a : (await promptForPlatformAsync());
         // clean up old Android configuration
         if ([platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform)) {
@@ -63,7 +62,7 @@ class BuildConfigure extends EasCommand_1.default {
     }
 }
 exports.default = BuildConfigure;
-BuildConfigure.description = 'Configure the project to support EAS Build.';
+BuildConfigure.description = 'configure the project to support EAS Build';
 BuildConfigure.flags = {
     platform: core_1.Flags.enum({
         description: 'Platform to configure',

package/build/commands/build/index.js

@@ -84,7 +84,7 @@ class Build extends EasCommand_1.default {
     }
 }
 exports.default = Build;
-Build.description = 'Start a build';
+Build.description = 'start a build';
 Build.flags = {
     platform: core_1.Flags.enum({
         char: 'p',

package/build/commands/build/inspect.js

@@ -101,7 +101,7 @@ class BuildInspect extends EasCommand_1.default {
     }
 }
 exports.default = BuildInspect;
-BuildInspect.description = 'Inspect the state of the project at specific build stages. Useful for troubleshooting.';
+BuildInspect.description = 'inspect the state of the project at specific build stages, useful for troubleshooting';
 BuildInspect.flags = {
     platform: core_1.Flags.enum({
         char: 'p',

package/build/commands/channel/create.js

@@ -8,6 +8,7 @@ const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const client_1 = require("../../graphql/client");
+const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
@@ -62,15 +63,15 @@ class ChannelCreate extends EasCommand_1.default {
         }
         let branchId;
         let branchMessage;
-        try {
-            const existingBranch = await (0, projectUtils_1.getBranchByNameAsync)({
-                appId: projectId,
-                name: channelName,
-            });
+        const existingBranch = await BranchQuery_1.BranchQuery.getBranchByNameAsync({
+            appId: projectId,
+            name: channelName,
+        });
+        if (existingBranch) {
             branchId = existingBranch.id;
             branchMessage = `We found a branch with the same name`;
         }
-        catch (e) {
+        else {
             const newBranch = await (0, create_1.createUpdateBranchOnAppAsync)({
                 appId: projectId,
                 name: channelName,
@@ -108,7 +109,7 @@ class ChannelCreate extends EasCommand_1.default {
     }
 }
 exports.default = ChannelCreate;
-ChannelCreate.description = 'Create a channel on the current project.';
+ChannelCreate.description = 'create a channel';
 ChannelCreate.args = [
     {
         name: 'name',

package/build/commands/channel/delete.js

@@ -67,7 +67,7 @@ class ChannelDelete extends EasCommand_1.default {
 }
 exports.default = ChannelDelete;
 ChannelDelete.hidden = true;
-ChannelDelete.description = 'Delete a channel on the current project';
+ChannelDelete.description = 'Delete a channel';
 ChannelDelete.args = [
     {
         name: 'name',
@@ -77,7 +77,7 @@ ChannelDelete.args = [
 ];
 ChannelDelete.flags = {
     json: core_1.Flags.boolean({
-        description: `Delete a channel on the current project`,
+        description: 'print output as a JSON object',
         default: false,
     }),
     'non-interactive': core_1.Flags.boolean({

package/build/commands/channel/edit.js

@@ -8,6 +8,7 @@ const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const client_1 = require("../../graphql/client");
+const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
@@ -62,42 +63,27 @@ async function updateChannelBranchMappingAsync({ channelId, branchMapping, }) {
 exports.updateChannelBranchMappingAsync = updateChannelBranchMappingAsync;
 class ChannelEdit extends EasCommand_1.default {
     async runAsync() {
-        let { args: { name: channelName }, flags: { branch: branchName, json: jsonFlag }, } = await this.parse(ChannelEdit);
-        if (jsonFlag) {
+        var _a, _b;
+        const { args, flags } = await this.parse(ChannelEdit);
+        if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        if (!channelName) {
-            const validationMessage = 'A channel name is required to edit a specific channel.';
-            if (jsonFlag) {
-                throw new Error(validationMessage);
-            }
-            ({ name: channelName } = await (0, prompts_1.promptAsync)({
-                type: 'text',
-                name: 'name',
-                message: 'Please enter the name of the channel to edit:',
-                validate: value => (value ? true : validationMessage),
-            }));
-        }
+        const channelName = (_a = args.name) !== null && _a !== void 0 ? _a : (await promptForChannelAsync());
         const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
         if (existingChannel.updateBranches.length > 1) {
             throw new Error('There is a rollout in progress. Please manage it with "channel:rollout" instead.');
         }
-        if (!branchName) {
-            const validationMessage = 'branch name may not be empty.';
-            if (jsonFlag) {
-                throw new Error(validationMessage);
-            }
-            ({ name: branchName } = await (0, prompts_1.promptAsync)({
-                type: 'text',
-                name: 'name',
-                message: (0, chalk_1.default) `What branch should it change to?`,
-                validate: value => (value ? true : validationMessage),
-            }));
+        const branchName = (_b = flags.branch) !== null && _b !== void 0 ? _b : (await promptForBranchAsync());
+        const branch = await BranchQuery_1.BranchQuery.getBranchByNameAsync({
+            appId: projectId,
+            name: branchName,
+        });
+        if (!branch) {
+            throw new Error(`Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
         }
-        const branch = await (0, projectUtils_1.getBranchByNameAsync)({ appId: projectId, name: branchName });
         const channel = await updateChannelBranchMappingAsync({
             channelId: existingChannel.id,
             // todo: move branch mapping logic to utility
@@ -106,7 +92,7 @@ class ChannelEdit extends EasCommand_1.default {
                 version: 0,
             }),
         });
-        if (jsonFlag) {
+        if (flags.json) {
             (0, json_1.printJsonOnlyOutput)(channel);
         }
         else {
@@ -117,7 +103,7 @@ class ChannelEdit extends EasCommand_1.default {
     }
 }
 exports.default = ChannelEdit;
-ChannelEdit.description = 'Point a channel at a new branch.';
+ChannelEdit.description = 'point a channel at a new branch';
 ChannelEdit.args = [
     {
         name: 'name',
@@ -130,7 +116,27 @@ ChannelEdit.flags = {
         description: 'Name of the branch to point to',
     }),
     json: core_1.Flags.boolean({
-        description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+        description: 'Print output as a JSON object with the channel ID, name and branch mapping',
         default: false,
     }),
 };
+async function promptForChannelAsync() {
+    log_1.default.addNewLineIfNone();
+    const { name } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'name',
+        message: 'Please enter the name of the channel to edit:',
+        validate: value => (value ? true : 'The channel name may not be empty.'),
+    });
+    return name;
+}
+async function promptForBranchAsync() {
+    log_1.default.addNewLineIfNone();
+    const { name } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'name',
+        message: `To which branch should the channel link?`,
+        validate: value => (value ? true : 'The branch name may not be empty.'),
+    });
+    return name;
+}

package/build/commands/channel/list.js

@@ -84,7 +84,7 @@ class ChannelList extends EasCommand_1.default {
     }
 }
 exports.default = ChannelList;
-ChannelList.description = 'List all channels on the current project.';
+ChannelList.description = 'list all channels';
 ChannelList.flags = {
     json: core_1.Flags.boolean({
         description: 'print output as a JSON object with the channel ID, name and branch mapping.',

package/build/commands/channel/rollout.js

@@ -5,6 +5,8 @@ const config_1 = require("@expo/config");
 const core_1 = require("@oclif/core");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
+const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
+const ChannelQuery_1 = require("../../graphql/queries/ChannelQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
@@ -29,33 +31,25 @@ async function promptForRolloutPercentAsync({ promptMessage, }) {
     });
     return rolloutPercent;
 }
-function getRolloutInfo(getUpdateChannelByNameForAppResult) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { branchMapping } = (0, view_1.getBranchMapping)((_b = (_a = getUpdateChannelByNameForAppResult.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName) === null || _b === void 0 ? void 0 : _b.branchMapping);
+function getRolloutInfo(channel) {
+    const { branchMapping } = (0, view_1.getBranchMapping)(channel.branchMapping);
     const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
-    const newBranch = (_d = (_c = getUpdateChannelByNameForAppResult.app) === null || _c === void 0 ? void 0 : _c.byId.updateChannelByName) === null || _d === void 0 ? void 0 : _d.updateBranches.filter(branch => branch.id === newBranchId)[0];
-    const oldBranch = (_f = (_e = getUpdateChannelByNameForAppResult.app) === null || _e === void 0 ? void 0 : _e.byId.updateChannelByName) === null || _f === void 0 ? void 0 : _f.updateBranches.filter(branch => branch.id === oldBranchId)[0];
+    const newBranch = channel.updateBranches.filter(branch => branch.id === newBranchId)[0];
+    const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
     if (!newBranch || !oldBranch) {
-        throw new Error(`Branch mapping rollout is missing a branch for channel "${(_h = (_g = getUpdateChannelByNameForAppResult.app) === null || _g === void 0 ? void 0 : _g.byId.updateChannelByName) === null || _h === void 0 ? void 0 : _h.name}".`);
+        throw new Error(`Branch mapping rollout is missing a branch for channel "${channel.name}".`);
     }
     const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
     return { newBranch, oldBranch, currentPercent };
 }
-async function startRolloutAsync({ channelName, branchName, percent, jsonFlag, projectId, fullName, currentBranchMapping, getUpdateChannelByNameForAppResult, }) {
-    var _a, _b, _c, _d;
-    if (!branchName) {
-        const validationMessage = 'A branch must be specified.';
-        if (jsonFlag) {
-            throw new Error(validationMessage);
-        }
-        ({ name: branchName } = await (0, prompts_1.promptAsync)({
-            type: 'text',
-            name: 'name',
-            message: `Select a branch to rollout onto ${channelName}`,
-            validate: value => (value ? true : validationMessage),
-        }));
+async function startRolloutAsync({ channelName, branchName, percent, jsonFlag, projectId, fullName, currentBranchMapping, channel, }) {
+    const branch = await BranchQuery_1.BranchQuery.getBranchByNameAsync({
+        appId: projectId,
+        name: branchName,
+    });
+    if (!branch) {
+        throw new Error(`Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
     }
-    const branch = await (0, projectUtils_1.getBranchByNameAsync)({ appId: projectId, name: branchName });
     const oldBranchId = currentBranchMapping.data[0].branchId;
     if (branch.id === oldBranchId) {
         throw new Error(`channel "${channelName}" is already pointing at branch "${branchName}". Rollouts must be done with distinct branches.`);
@@ -82,19 +76,18 @@ async function startRolloutAsync({ channelName, branchName, percent, jsonFlag, p
         ],
     };
     const newChannelInfo = await (0, edit_1.updateChannelBranchMappingAsync)({
-        channelId: (_b = (_a = getUpdateChannelByNameForAppResult.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName) === null || _b === void 0 ? void 0 : _b.id,
+        channelId: channel.id,
         branchMapping: JSON.stringify(newBranchMapping),
     });
-    const oldBranch = (_d = (_c = getUpdateChannelByNameForAppResult.app) === null || _c === void 0 ? void 0 : _c.byId.updateChannelByName) === null || _d === void 0 ? void 0 : _d.updateBranches.filter(branch => branch.id === oldBranchId)[0];
+    const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
     if (!oldBranch) {
         throw new Error(`Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`);
     }
     const logMessage = `️Started a rollout of branch ${chalk_1.default.bold(branchName)} onto channel ${chalk_1.default.bold(channelName)}! ${chalk_1.default.bold(percent)}% of users will be directed to branch ${chalk_1.default.bold(branchName)}, ${chalk_1.default.bold(100 - percent)}% to branch ${chalk_1.default.bold(oldBranch.name)}.`;
     return { newChannelInfo, logMessage };
 }
-async function editRolloutAsync({ channelName, percent, jsonFlag, currentBranchMapping, getUpdateChannelByNameForAppResult, }) {
-    var _a, _b;
-    const { newBranch, oldBranch, currentPercent } = getRolloutInfo(getUpdateChannelByNameForAppResult);
+async function editRolloutAsync({ channelName, percent, jsonFlag, currentBranchMapping, channel, }) {
+    const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
     if (percent == null) {
         if (jsonFlag) {
             throw new Error('A rollout is already in progress. If you wish to modify it you must use specify the new rollout percentage with the --percent flag.');
@@ -105,19 +98,24 @@ async function editRolloutAsync({ channelName, percent, jsonFlag, currentBranchM
     const newBranchMapping = { ...currentBranchMapping };
     newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;
     const newChannelInfo = await (0, edit_1.updateChannelBranchMappingAsync)({
-        channelId: (_b = (_a = getUpdateChannelByNameForAppResult.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName) === null || _b === void 0 ? void 0 : _b.id,
+        channelId: channel.id,
         branchMapping: JSON.stringify(newBranchMapping),
     });
     const logMessage = `️Rollout of branch ${chalk_1.default.bold(newBranch.name)} onto channel ${chalk_1.default.bold(channelName)} updated from ${chalk_1.default.bold(currentPercent)}% to ${chalk_1.default.bold(percent)}%. ${chalk_1.default.bold(percent)}% of users will be directed to branch ${chalk_1.default.bold(newBranch.name)}, ${chalk_1.default.bold(100 - percent)}% to branch ${chalk_1.default.bold(oldBranch.name)}.`;
     return { newChannelInfo, logMessage };
 }
-async function endRolloutAsync({ channelName, branchName, jsonFlag, projectId, getUpdateChannelByNameForAppResult, }) {
-    var _a, _b;
+async function endRolloutAsync({ channelName, branchName, jsonFlag, projectId, channel, }) {
     // end rollout
-    const { newBranch, oldBranch, currentPercent } = getRolloutInfo(getUpdateChannelByNameForAppResult);
+    const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
     let endOnNewBranch;
     if (branchName) {
-        const branch = await (0, projectUtils_1.getBranchByNameAsync)({ appId: projectId, name: branchName });
+        const branch = await BranchQuery_1.BranchQuery.getBranchByNameAsync({
+            appId: projectId,
+            name: branchName,
+        });
+        if (!branch) {
+            throw new Error(`Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk_1.default.bold('eas branch:list')}.`);
+        }
         switch (branch.id) {
             case newBranch.id:
                 endOnNewBranch = true;
@@ -157,7 +155,7 @@ async function endRolloutAsync({ channelName, branchName, jsonFlag, projectId, g
         ],
     };
     const newChannelInfo = await (0, edit_1.updateChannelBranchMappingAsync)({
-        channelId: (_b = (_a = getUpdateChannelByNameForAppResult.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName) === null || _b === void 0 ? void 0 : _b.id,
+        channelId: channel.id,
         branchMapping: JSON.stringify(newBranchMapping),
     });
     const logMessage = `️Rollout on channel ${chalk_1.default.bold(channelName)} ended. All traffic is now sent to branch ${chalk_1.default.bold(endOnNewBranch ? newBranch.name : oldBranch.name)}`;
@@ -165,7 +163,6 @@ async function endRolloutAsync({ channelName, branchName, jsonFlag, projectId, g
 }
 class ChannelRollout extends EasCommand_1.default {
     async runAsync() {
-        var _a, _b;
         const { args: { channel: channelName }, flags: { json: jsonFlag, end: endFlag, branch: branchName, percent }, } = await this.parse(ChannelRollout);
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
@@ -174,11 +171,14 @@ class ChannelRollout extends EasCommand_1.default {
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const fullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const getUpdateChannelByNameForAppResult = await (0, view_1.getUpdateChannelByNameForAppAsync)({
+        const channel = await ChannelQuery_1.ChannelQuery.getUpdateChannelByNameForAppAsync({
             appId: projectId,
             channelName: channelName,
         });
-        const { branchMapping: currentBranchMapping, isRollout } = (0, view_1.getBranchMapping)((_b = (_a = getUpdateChannelByNameForAppResult.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName) === null || _b === void 0 ? void 0 : _b.branchMapping);
+        if (!channel) {
+            throw new Error(`Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk_1.default.bold('eas channel:list')}.`);
+        }
+        const { branchMapping: currentBranchMapping, isRollout } = (0, view_1.getBranchMapping)(channel.branchMapping);
         if (currentBranchMapping.data.length === 0) {
             throw new Error('The channel is not pointing at any branches.');
         }
@@ -200,13 +200,13 @@ class ChannelRollout extends EasCommand_1.default {
         if (!isRollout) {
             rolloutMutationResult = await startRolloutAsync({
                 channelName,
-                branchName,
+                branchName: branchName !== null && branchName !== void 0 ? branchName : (await promptForBranchNameAsync(channelName)),
                 percent,
                 jsonFlag,
                 projectId,
                 fullName,
                 currentBranchMapping,
-                getUpdateChannelByNameForAppResult,
+                channel,
             });
         }
         else if (endFlag) {
@@ -215,7 +215,7 @@ class ChannelRollout extends EasCommand_1.default {
                 branchName,
                 jsonFlag,
                 projectId,
-                getUpdateChannelByNameForAppResult,
+                channel,
             });
         }
         else {
@@ -224,7 +224,7 @@ class ChannelRollout extends EasCommand_1.default {
                 percent,
                 jsonFlag,
                 currentBranchMapping,
-                getUpdateChannelByNameForAppResult,
+                channel,
             });
         }
         if (!rolloutMutationResult) {
@@ -267,3 +267,12 @@ ChannelRollout.flags = {
         default: false,
     }),
 };
+async function promptForBranchNameAsync(channelName) {
+    const { name } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'name',
+        message: `Select a branch to rollout onto ${channelName}`,
+        validate: value => (value ? true : 'A branch must be specified.'),
+    });
+    return name;
+}