eas-cli 2.1.0 → 2.2.0

package/build/commands/account/view.js

@@ -6,11 +6,6 @@ const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasComm
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const User_1 = require("../../user/User");
 class AccountView extends EasCommand_1.default {
-    constructor() {
-        super(...arguments);
-        this.mustBeRunInsideProject = false;
-        this.requiresAuthentication = false;
-    }
     async runAsync() {
         const user = await (0, User_1.getUserAsync)();
         if (user) {

package/build/commands/analytics.d.ts

@@ -5,6 +5,5 @@ export default class AnalyticsView extends EasCommand {
         name: string;
         options: string[];
     }[];
-    protected requiresAuthentication: boolean;
     runAsync(): Promise<void>;
 }

package/build/commands/analytics.js

@@ -5,10 +5,6 @@ const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand
 const log_1 = tslib_1.__importDefault(require("../log"));
 const UserSettings_1 = tslib_1.__importDefault(require("../user/UserSettings"));
 class AnalyticsView extends EasCommand_1.default {
-    constructor() {
-        super(...arguments);
-        this.requiresAuthentication = false;
-    }
     async runAsync() {
         const { STATUS: status } = (await this.parse(AnalyticsView)).args;
         if (status) {

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

@@ -10,6 +10,10 @@ export default class BranchCreate extends EasCommand {
     }[];
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/create.js

@@ -1,18 +1,18 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUpdateBranchOnAppAsync = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const utils_1 = require("../../branch/utils");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const client_1 = require("../../graphql/client");
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
-const vcs_1 = require("../../vcs");
 async function createUpdateBranchOnAppAsync({ appId, name, }) {
     const result = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
         .mutation((0, graphql_tag_1.default) `
@@ -38,38 +38,38 @@ async function createUpdateBranchOnAppAsync({ appId, name, }) {
 exports.createUpdateBranchOnAppAsync = createUpdateBranchOnAppAsync;
 class BranchCreate extends EasCommand_1.default {
     async runAsync() {
-        let { args: { name }, flags, } = await this.parse(BranchCreate);
-        if (flags.json) {
+        let { args: { name }, flags: { json: jsonFlag, 'non-interactive': nonInteractive }, } = await this.parse(BranchCreate);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BranchCreate, {
+            nonInteractive,
+        });
+        if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const fullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
         if (!name) {
             const validationMessage = 'Branch name may not be empty.';
-            if (flags.json) {
+            if (nonInteractive) {
                 throw new Error(validationMessage);
             }
             ({ name } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'name',
                 message: 'Provide a branch name:',
-                initial: (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
-                    `branch-${Math.random().toString(36).substr(2, 4)}`,
+                initial: await (0, utils_1.getDefaultBranchNameAsync)(),
                 validate: value => (value ? true : validationMessage),
             }));
         }
         const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });
-        if (flags.json) {
+        if (jsonFlag) {
             (0, json_1.printJsonOnlyOutput)(newBranch);
         }
         else {
-            log_1.default.withTick(`️Created a new branch: ${chalk_1.default.bold(newBranch.name)} on project ${chalk_1.default.bold(fullName)}.`);
+            log_1.default.withTick(`️Created a new branch: ${chalk_1.default.bold(newBranch.name)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
         }
     }
 }
 exports.default = BranchCreate;
+_a = BranchCreate;
 BranchCreate.description = 'create a branch';
 BranchCreate.args = [
     {
@@ -79,8 +79,8 @@ BranchCreate.args = [
     },
 ];
 BranchCreate.flags = {
-    json: core_1.Flags.boolean({
-        description: 'return a json with the new branch ID and name.',
-        default: false,
-    }),
+    ...flags_1.EasNonInteractiveAndJsonFlags,
+};
+BranchCreate.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

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

@@ -1,6 +1,9 @@
 import EasCommand from '../../commandUtils/EasCommand';
 export default class BranchDelete extends EasCommand {
     static description: string;
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     static args: {
         name: string;
         required: boolean;
@@ -8,6 +11,7 @@ export default class BranchDelete extends EasCommand {
     }[];
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/delete.js

@@ -1,13 +1,15 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const queries_1 = require("../../branch/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
+const pagination_1 = require("../../commandUtils/pagination");
 const client_1 = require("../../graphql/client");
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
@@ -50,40 +52,40 @@ async function deleteBranchOnAppAsync({ branchId, }) {
 }
 class BranchDelete extends EasCommand_1.default {
     async runAsync() {
-        var _a, _b;
-        let { args: { name }, flags: { json: jsonFlag }, } = await this.parse(BranchDelete);
+        var _b, _c;
+        let { args: { name: branchName }, flags, } = await this.parse(BranchDelete);
+        const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
+        const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const fullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        if (!name) {
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BranchDelete, { nonInteractive });
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
+        if (!branchName) {
             const validationMessage = 'branch name may not be empty.';
-            if (jsonFlag) {
+            if (nonInteractive) {
                 throw new Error(validationMessage);
             }
-            ({ name } = await (0, prompts_1.promptAsync)({
-                type: 'text',
-                name: 'name',
-                message: 'Provide the name of the branch to delete:',
-                validate: value => (value ? true : validationMessage),
+            ({ name: branchName } = await (0, queries_1.selectBranchOnAppAsync)({
+                projectId,
+                displayTextForListItem: updateBranch => updateBranch.name,
+                promptTitle: 'Which branch would you like to delete?',
+                paginatedQueryOptions,
             }));
         }
-        const data = await getBranchInfoAsync({ appId: projectId, name });
-        const branchId = (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.updateBranchByName) === null || _b === void 0 ? void 0 : _b.id;
+        const data = await getBranchInfoAsync({ appId: projectId, name: branchName });
+        const branchId = (_c = (_b = data.app) === null || _b === void 0 ? void 0 : _b.byId.updateBranchByName) === null || _c === void 0 ? void 0 : _c.id;
         if (!branchId) {
-            throw new Error(`Could not find branch ${name} on ${fullName}`);
+            throw new Error(`Could not find branch ${branchName} on ${projectDisplayName}`);
         }
-        if (!jsonFlag) {
+        if (!nonInteractive) {
             log_1.default.addNewLineIfNone();
-            log_1.default.warn(`You are about to permanently delete branch: "${name}" and all of the updates published on it.` +
+            log_1.default.warn(`You are about to permanently delete branch: "${branchName}" and all of the updates published on it.` +
                 `\nThis action is irreversible.`);
             log_1.default.newLine();
             const confirmed = await (0, prompts_1.toggleConfirmAsync)({ message: 'Are you sure you wish to proceed?' });
             if (!confirmed) {
-                log_1.default.error(`Cancelled deletion of branch: "${name}".`);
+                log_1.default.error(`Cancelled deletion of branch: "${branchName}".`);
                 process.exit(1);
             }
         }
@@ -94,12 +96,16 @@ class BranchDelete extends EasCommand_1.default {
             (0, json_1.printJsonOnlyOutput)(deletionResult);
         }
         else {
-            log_1.default.withTick(`️Deleted branch "${name}" and all of its updates on project ${chalk_1.default.bold(fullName)}.`);
+            log_1.default.withTick(`️Deleted branch "${branchName}" and all of its updates on project ${chalk_1.default.bold(projectDisplayName)}.`);
         }
     }
 }
 exports.default = BranchDelete;
+_a = BranchDelete;
 BranchDelete.description = 'delete a branch';
+BranchDelete.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};
 BranchDelete.args = [
     {
         name: 'name',
@@ -108,8 +114,5 @@ BranchDelete.args = [
     },
 ];
 BranchDelete.flags = {
-    json: core_1.Flags.boolean({
-        description: `return JSON with the edited branch's ID and name.`,
-        default: false,
-    }),
+    ...flags_1.EasNonInteractiveAndJsonFlags,
 };

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

@@ -2,10 +2,13 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class BranchList extends EasCommand {
     static description: string;
     static flags: {
-        offset: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
-        limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
         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;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/list.js

@@ -1,27 +1,32 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const queries_1 = require("../../branch/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const pagination_1 = require("../../commandUtils/pagination");
-const expoConfig_1 = require("../../project/expoConfig");
-const projectUtils_1 = require("../../project/projectUtils");
 const json_1 = require("../../utils/json");
 class BranchList extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(BranchList);
-        const options = (0, pagination_1.getPaginatedQueryOptions)(flags);
-        if (options.json) {
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BranchList, {
+            nonInteractive: flags['non-interactive'],
+        });
+        const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
+        if (paginatedQueryOptions.json) {
             (0, json_1.enableJsonOutput)();
         }
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        await (0, queries_1.listAndRenderPaginatedBranchesAsync)(projectId, options);
+        await (0, queries_1.listAndRenderBranchesOnAppAsync)({ projectId, paginatedQueryOptions });
     }
 }
 exports.default = BranchList;
+_a = BranchList;
 BranchList.description = 'list all branches';
 BranchList.flags = {
     ...pagination_1.EasPaginatedQueryFlags,
+    ...flags_1.EasNonInteractiveAndJsonFlags,
+};
+BranchList.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

package/build/commands/branch/rename.d.ts

@@ -2,9 +2,13 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class BranchRename extends EasCommand {
     static description: string;
     static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         from: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         to: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/rename.js

@@ -1,13 +1,14 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const client_1 = require("../../graphql/client");
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
@@ -34,17 +35,17 @@ async function renameUpdateBranchOnAppAsync({ appId, name, newName, }) {
 }
 class BranchRename extends EasCommand_1.default {
     async runAsync() {
-        let { flags: { json: jsonFlag, from: currentName, to: newName }, } = await this.parse(BranchRename);
+        let { flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive }, } = await this.parse(BranchRename);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BranchRename, {
+            nonInteractive,
+        });
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const fullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
         if (!currentName) {
             const validationMessage = 'current name may not be empty.';
-            if (jsonFlag) {
+            if (nonInteractive) {
                 throw new Error(validationMessage);
             }
             ({ currentName } = await (0, prompts_1.promptAsync)({
@@ -56,7 +57,7 @@ class BranchRename extends EasCommand_1.default {
         }
         if (!newName) {
             const validationMessage = 'new name may not be empty.';
-            if (jsonFlag) {
+            if (nonInteractive) {
                 throw new Error(validationMessage);
             }
             ({ newName } = await (0, prompts_1.promptAsync)({
@@ -75,11 +76,12 @@ class BranchRename extends EasCommand_1.default {
             (0, json_1.printJsonOnlyOutput)(editedBranch);
         }
         else {
-            log_1.default.withTick(`️Renamed branch from ${currentName} to ${chalk_1.default.bold(editedBranch.name)} on project ${chalk_1.default.bold(fullName)}.`);
+            log_1.default.withTick(`️Renamed branch from ${currentName} to ${chalk_1.default.bold(editedBranch.name)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
         }
     }
 }
 exports.default = BranchRename;
+_a = BranchRename;
 BranchRename.description = 'rename a branch';
 BranchRename.flags = {
     from: core_1.Flags.string({
@@ -90,8 +92,8 @@ BranchRename.flags = {
         description: 'new name of the branch.',
         required: false,
     }),
-    json: core_1.Flags.boolean({
-        description: `return a json with the edited branch's ID and name.`,
-        default: false,
-    }),
+    ...flags_1.EasNonInteractiveAndJsonFlags,
+};
+BranchRename.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

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

@@ -7,10 +7,13 @@ export default class BranchView extends EasCommand {
         description: string;
     }[];
     static flags: {
-        offset: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
-        limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        limit: any;
         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>;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/view.js

@@ -1,36 +1,49 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const queries_1 = require("../../branch/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const pagination_1 = require("../../commandUtils/pagination");
-const expoConfig_1 = require("../../project/expoConfig");
-const projectUtils_1 = require("../../project/projectUtils");
 const queries_2 = require("../../update/queries");
 const json_1 = require("../../utils/json");
 class BranchView extends EasCommand_1.default {
     async runAsync() {
         let { args: { name: branchName }, flags, } = await this.parse(BranchView);
-        const options = (0, pagination_1.getPaginatedQueryOptions)(flags);
-        if (options.json) {
+        const { 'non-interactive': nonInteractive } = flags;
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BranchView, {
+            nonInteractive,
+        });
+        const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
+        if (paginatedQueryOptions.json) {
             (0, json_1.enableJsonOutput)();
         }
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        // provide help to a user if they ran the command with missing args
         if (!branchName) {
-            if (options.nonInteractive) {
+            if (nonInteractive) {
                 throw new Error('Branch name may not be empty.');
             }
-            ({ name: branchName } = await (0, queries_1.selectBranchFromPaginatedQueryAsync)(projectId, 'Which branch would you like to view?', 
-            // discard limit and offset because this query is not those flag's intended target
-            { json: options.json, nonInteractive: options.nonInteractive, offset: 0 }));
+            ({ name: branchName } = await (0, queries_1.selectBranchOnAppAsync)({
+                projectId,
+                promptTitle: 'Which branch would you like to view?',
+                displayTextForListItem: updateBranch => updateBranch.name,
+                // discard limit and offset because this query is not their intended target
+                paginatedQueryOptions: {
+                    json: paginatedQueryOptions.json,
+                    nonInteractive,
+                    offset: 0,
+                },
+            }));
         }
-        await (0, queries_2.listAndRenderUpdatesOnBranchByNameAsync)(projectId, branchName, options);
+        await (0, queries_2.listAndRenderUpdateGroupsOnBranchAsync)({
+            projectId,
+            branchName,
+            paginatedQueryOptions,
+        });
     }
 }
 exports.default = BranchView;
+_a = BranchView;
 BranchView.description = 'view a branch';
 BranchView.args = [
     {
@@ -41,4 +54,9 @@ BranchView.args = [
 ];
 BranchView.flags = {
     ...pagination_1.EasPaginatedQueryFlags,
+    ...flags_1.EasNonInteractiveAndJsonFlags,
+    limit: (0, pagination_1.getLimitFlagWithCustomValues)({ defaultTo: 25, limit: 50 }),
+};
+BranchView.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

package/build/commands/build/cancel.d.ts

@@ -1,8 +1,15 @@
 import EasCommand from '../../commandUtils/EasCommand';
+export declare function selectBuildToCancelAsync(projectId: string, projectDisplayName: string): Promise<string | null>;
 export default class BuildCancel extends EasCommand {
     static description: string;
     static args: {
         name: string;
     }[];
+    static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/build/cancel.js

@@ -1,16 +1,18 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectBuildToCancelAsync = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const client_1 = require("../../graphql/client");
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
 const platform_1 = require("../../platform");
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 async function cancelBuildAsync(buildId) {
@@ -44,42 +46,54 @@ function formatUnfinishedBuild(build) {
     const status = chalk_1.default.blue(statusText);
     return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
 }
-async function selectBuildToCancelAsync(projectId, projectFullName) {
+async function selectBuildToCancelAsync(projectId, projectDisplayName) {
     const spinner = (0, ora_1.ora)().start('Fetching the uncompleted builds…');
     let builds;
     try {
         const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-            BuildQuery_1.BuildQuery.allForAppAsync(projectId, { filter: { status: generated_1.BuildStatus.New } }),
-            BuildQuery_1.BuildQuery.allForAppAsync(projectId, { filter: { status: generated_1.BuildStatus.InQueue } }),
-            BuildQuery_1.BuildQuery.allForAppAsync(projectId, { filter: { status: generated_1.BuildStatus.InProgress } }),
+            BuildQuery_1.BuildQuery.viewBuildsOnAppAsync({
+                appId: projectId,
+                offset: 0,
+                limit: 10,
+                filter: { status: generated_1.BuildStatus.New },
+            }),
+            BuildQuery_1.BuildQuery.viewBuildsOnAppAsync({
+                appId: projectId,
+                offset: 0,
+                limit: 10,
+                filter: { status: generated_1.BuildStatus.InQueue },
+            }),
+            BuildQuery_1.BuildQuery.viewBuildsOnAppAsync({
+                appId: projectId,
+                offset: 0,
+                limit: 10,
+                filter: { status: generated_1.BuildStatus.InProgress },
+            }),
         ]);
         spinner.stop();
         builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
     }
     catch (error) {
-        spinner.fail(`Something went wrong and we couldn't fetch the builds for the project ${projectFullName}.`);
+        spinner.fail(`Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`);
         throw error;
     }
     if (builds.length === 0) {
-        log_1.default.warn(`There aren't any uncompleted builds for the project ${projectFullName}.`);
+        log_1.default.warn(`There aren't any uncompleted builds for the project ${projectDisplayName}.`);
         return null;
     }
-    else if (builds.length === 1) {
-        log_1.default.log('Found one build');
-        log_1.default.log(formatUnfinishedBuild(builds[0]));
-        await (0, prompts_1.confirmAsync)({
-            message: 'Do you want to cancel it?',
-        });
-        return builds[0].id;
-    }
     else {
         const buildId = await (0, prompts_1.selectAsync)('Which build do you want to cancel?', builds.map(build => ({
             title: formatUnfinishedBuild(build),
             value: build.id,
         })));
-        return buildId;
+        return (await (0, prompts_1.confirmAsync)({
+            message: 'Are you sure you want to cancel it?',
+        }))
+            ? buildId
+            : null;
     }
 }
+exports.selectBuildToCancelAsync = selectBuildToCancelAsync;
 async function ensureBuildExistsAsync(buildId) {
     try {
         await BuildQuery_1.BuildQuery.byIdAsync(buildId);
@@ -90,17 +104,23 @@ async function ensureBuildExistsAsync(buildId) {
 }
 class BuildCancel extends EasCommand_1.default {
     async runAsync() {
-        const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const projectFullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
+        const { args: { BUILD_ID: buildIdFromArg }, flags: { 'non-interactive': nonInteractive }, } = await this.parse(BuildCancel);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(BuildCancel, {
+            nonInteractive,
+        });
+        const displayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
         if (buildIdFromArg) {
             await ensureBuildExistsAsync(buildIdFromArg);
         }
-        const buildId = buildIdFromArg || (await selectBuildToCancelAsync(projectId, projectFullName));
+        let buildId = buildIdFromArg;
         if (!buildId) {
-            return;
+            if (nonInteractive) {
+                throw new Error('BUILD_ID must not be empty in non-interactive mode');
+            }
+            buildId = await selectBuildToCancelAsync(projectId, displayName);
+            if (!buildId) {
+                return;
+            }
         }
         const spinner = (0, ora_1.ora)().start('Canceling the build…');
         try {
@@ -120,5 +140,12 @@ class BuildCancel extends EasCommand_1.default {
     }
 }
 exports.default = BuildCancel;
+_a = BuildCancel;
 BuildCancel.description = 'cancel a build';
 BuildCancel.args = [{ name: 'BUILD_ID' }];
+BuildCancel.flags = {
+    ...flags_1.EASNonInteractiveFlag,
+};
+BuildCancel.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};