eas-cli 18.9.1 → 18.11.0

package/build/commands/integrations/convex/team/invite.js

@@ -0,0 +1,113 @@
+"use strict";
+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 EasCommand_1 = tslib_1.__importDefault(require("../../../../commandUtils/EasCommand"));
+const convex_1 = require("../../../../commandUtils/convex");
+const flags_1 = require("../../../../commandUtils/flags");
+const ConvexMutation_1 = require("../../../../graphql/mutations/ConvexMutation");
+const ConvexQuery_1 = require("../../../../graphql/queries/ConvexQuery");
+const log_1 = tslib_1.__importStar(require("../../../../log"));
+const ora_1 = require("../../../../ora");
+const projectUtils_1 = require("../../../../project/projectUtils");
+const prompts_1 = require("../../../../prompts");
+class IntegrationsConvexTeamInvite extends EasCommand_1.default {
+    static description = 'send a Convex team invitation to your verified email address';
+    static args = {
+        CONVEX_TEAM: core_1.Args.string({
+            required: false,
+            description: 'Slug of the Convex team to invite yourself to',
+        }),
+    };
+    static flags = {
+        ...flags_1.EASNonInteractiveFlag,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.ProjectConfig,
+    };
+    async runAsync() {
+        const { args: { CONVEX_TEAM: team }, flags: { 'non-interactive': nonInteractive }, } = await this.parse(IntegrationsConvexTeamInvite);
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient, actor }, } = await this.getContextAsync(IntegrationsConvexTeamInvite, {
+            nonInteractive,
+            withServerSideEnvironment: null,
+        });
+        const email = this.getActorEmail(actor);
+        if (!email) {
+            log_1.default.warn(`Could not determine your verified email address, so no Convex team invitation was sent. Run ${chalk_1.default.cyan('eas integrations:convex:team:invite')} after signing in with a user account.`);
+            return;
+        }
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
+        const connections = await ConvexQuery_1.ConvexQuery.getConvexTeamConnectionsByAccountIdAsync(graphqlClient, account.id);
+        if (connections.length === 0) {
+            (0, convex_1.logNoConvexTeams)(account.name);
+            return;
+        }
+        const connection = await this.resolveConnectionAsync(connections, team, nonInteractive);
+        log_1.default.addNewLineIfNone();
+        this.logTeam(connection);
+        this.logPreviousInvite(connection);
+        log_1.default.newLine();
+        if (connection.hasBeenClaimed) {
+            log_1.default.warn('Convex team has already been claimed. Skipping Convex team invitation.');
+            return;
+        }
+        if (!(await (0, convex_1.confirmRecentConvexInviteAsync)(connection, { nonInteractive }))) {
+            log_1.default.warn('Skipped sending Convex team invitation.');
+            return;
+        }
+        const spinner = (0, ora_1.ora)(`Sending Convex team invitation to ${email}`).start();
+        try {
+            await ConvexMutation_1.ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync(graphqlClient, {
+                convexTeamConnectionId: connection.id,
+            });
+            spinner.succeed(`Sent Convex team invitation to ${chalk_1.default.bold(email)} for ${chalk_1.default.bold((0, convex_1.formatConvexTeam)(connection))}`);
+            log_1.default.log(`Convex dashboard: ${(0, log_1.link)((0, convex_1.getConvexTeamDashboardUrl)(connection), { dim: false })}`);
+        }
+        catch (error) {
+            spinner.fail('Failed to send Convex team invitation');
+            throw error;
+        }
+    }
+    getActorEmail(actor) {
+        return 'email' in actor && typeof actor.email === 'string' ? actor.email : null;
+    }
+    logTeam(connection) {
+        log_1.default.log(chalk_1.default.bold(`Convex team ${(0, convex_1.formatConvexTeam)(connection)}`));
+        log_1.default.log(`${chalk_1.default.bold('Dashboard')}: ${(0, log_1.link)((0, convex_1.getConvexTeamDashboardUrl)(connection), { dim: false })}`);
+        log_1.default.log(`${chalk_1.default.bold('Claimed')}: ${connection.hasBeenClaimed ? 'Yes' : 'No'}`);
+    }
+    logPreviousInvite(connection) {
+        if (!connection.invitedEmail && !connection.invitedAt) {
+            return;
+        }
+        log_1.default.newLine();
+        log_1.default.log(chalk_1.default.bold('Previous invite'));
+        if (connection.invitedEmail) {
+            log_1.default.log(`${chalk_1.default.bold('Email')}: ${connection.invitedEmail}`);
+        }
+        if (connection.invitedAt) {
+            log_1.default.log(`${chalk_1.default.bold('Sent at')}: ${(0, convex_1.formatConvexInviteTimestamp)(connection.invitedAt)}`);
+        }
+    }
+    async resolveConnectionAsync(connections, team, nonInteractive) {
+        if (team) {
+            const connection = connections.find(item => item.convexTeamSlug === team || item.convexTeamName === team || item.id === team);
+            if (!connection) {
+                throw new Error(`Convex team ${team} is not linked to this account.`);
+            }
+            return connection;
+        }
+        if (connections.length === 1) {
+            return connections[0];
+        }
+        if (nonInteractive) {
+            throw new Error('Convex team slug must be provided in non-interactive mode when multiple Convex team links exist.');
+        }
+        return await (0, prompts_1.selectAsync)('Select a Convex team link to invite yourself to', connections.map(connection => ({
+            title: (0, convex_1.formatConvexTeam)(connection),
+            value: connection,
+        })));
+    }
+}
+exports.default = IntegrationsConvexTeamInvite;

package/build/commands/integrations/convex/team.d.ts

@@ -0,0 +1,9 @@
+import EasCommand from '../../../commandUtils/EasCommand';
+export default class IntegrationsConvexTeam extends EasCommand {
+    static description: string;
+    static contextDefinition: {
+        loggedIn: import("../../../commandUtils/context/LoggedInContextField").default;
+        privateProjectConfig: import("../../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
+    };
+    runAsync(): Promise<void>;
+}

package/build/commands/integrations/convex/team.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const EasCommand_1 = tslib_1.__importDefault(require("../../../commandUtils/EasCommand"));
+const convex_1 = require("../../../commandUtils/convex");
+const ConvexQuery_1 = require("../../../graphql/queries/ConvexQuery");
+const log_1 = tslib_1.__importDefault(require("../../../log"));
+const projectUtils_1 = require("../../../project/projectUtils");
+class IntegrationsConvexTeam extends EasCommand_1.default {
+    static description = "display Convex teams linked to the current Expo app's owner account";
+    static contextDefinition = {
+        ...this.ContextOptions.ProjectConfig,
+    };
+    async runAsync() {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(IntegrationsConvexTeam, {
+            nonInteractive: false,
+            withServerSideEnvironment: null,
+        });
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
+        const connections = await ConvexQuery_1.ConvexQuery.getConvexTeamConnectionsByAccountIdAsync(graphqlClient, account.id);
+        if (connections.length === 0) {
+            (0, convex_1.logNoConvexTeams)(account.name);
+            return;
+        }
+        log_1.default.log(chalk_1.default.bold(`Convex teams linked to @${account.name}`));
+        for (const [index, connection] of connections.entries()) {
+            if (index > 0) {
+                log_1.default.newLine();
+            }
+            log_1.default.log((0, convex_1.formatConvexTeamConnection)(connection));
+        }
+    }
+}
+exports.default = IntegrationsConvexTeam;

package/build/commands/observe/events.js

@@ -6,11 +6,12 @@ const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasComm
 const errors_1 = require("../../commandUtils/errors");
 const flags_1 = require("../../commandUtils/flags");
 const pagination_1 = require("../../commandUtils/pagination");
-const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const fetchEvents_1 = require("../../observe/fetchEvents");
 const metricNames_1 = require("../../observe/metricNames");
 const formatEvents_1 = require("../../observe/formatEvents");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
 const startAndEndTime_1 = require("../../observe/startAndEndTime");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
@@ -34,7 +35,7 @@ class ObserveEvents extends EasCommand_1.default {
         })(),
         platform: core_1.Flags.option({
             description: 'Filter by platform',
-            options: Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase()),
+            options: platforms_1.allowedPlatformFlagValues,
         })(),
         after: core_1.Flags.string({
             description: 'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
@@ -76,20 +77,13 @@ class ObserveEvents extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags, args } = await this.parse(ObserveEvents);
-        let projectId;
-        let graphqlClient;
-        if (flags['project-id']) {
-            projectId = flags['project-id'];
-            const ctx = await this.getContextAsync({ contextDefinition: ObserveEvents.loggedInOnlyContextDefinition }, { nonInteractive: flags['non-interactive'] });
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
-        else {
-            const ctx = await this.getContextAsync(ObserveEvents, {
-                nonInteractive: flags['non-interactive'],
-            });
-            projectId = ctx.projectId;
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveEvents,
+            loggedInOnlyContextDefinition: ObserveEvents.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
@@ -113,14 +107,8 @@ class ObserveEvents extends EasCommand_1.default {
         }
         const orderBy = (0, fetchEvents_1.resolveOrderBy)(flags.sort);
         const { daysBack, startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
-        const platform = flags.platform
-            ? flags.platform === 'android'
-                ? generated_1.AppObservePlatform.Android
-                : generated_1.AppObservePlatform.Ios
-            : undefined;
-        const platforms = platform
-            ? [platform === generated_1.AppObservePlatform.Android ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios]
-            : [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+        const platform = (0, platforms_1.appObservePlatformFromFlag)(flags.platform);
+        const platforms = (0, platforms_1.appPlatformsFromFlag)(flags.platform);
         const [{ events, pageInfo }, totalEventCount] = await Promise.all([
             (0, fetchEvents_1.fetchObserveEventsAsync)(graphqlClient, projectId, {
                 metricName,

package/build/commands/observe/logs.d.ts

@@ -0,0 +1,29 @@
+import EasCommand from '../../commandUtils/EasCommand';
+export default class ObserveLogs extends EasCommand {
+    static hidden: boolean;
+    static description: string;
+    static args: {
+        eventName: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        after: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        start: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        end: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        days: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'app-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'update-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'session-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'all-events': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'project-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+        projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;
+    };
+    private static loggedInOnlyContextDefinition;
+    runAsync(): Promise<void>;
+}

package/build/commands/observe/logs.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
+const pagination_1 = require("../../commandUtils/pagination");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const ObserveQuery_1 = require("../../graphql/queries/ObserveQuery");
+const fetchCustomEvents_1 = require("../../observe/fetchCustomEvents");
+const formatCustomEvents_1 = require("../../observe/formatCustomEvents");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
+const startAndEndTime_1 = require("../../observe/startAndEndTime");
+const json_1 = require("../../utils/json");
+const DEFAULT_EVENTS_LIMIT = 10;
+class ObserveLogs extends EasCommand_1.default {
+    static hidden = true;
+    static description = 'display individual custom events (logs) emitted by the app, filtered by the event name in the argument. With no arguments, a list of the available event names and associated event counts is returned.';
+    static args = {
+        eventName: core_1.Args.string({
+            description: 'Custom event name to filter by',
+            required: false,
+        }),
+    };
+    static flags = {
+        platform: core_1.Flags.option({
+            description: 'Filter by platform',
+            options: platforms_1.allowedPlatformFlagValues,
+        })(),
+        after: core_1.Flags.string({
+            description: 'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
+        }),
+        limit: (0, pagination_1.getLimitFlagWithCustomValues)({
+            defaultTo: DEFAULT_EVENTS_LIMIT,
+            limit: 100,
+        }),
+        start: core_1.Flags.string({
+            description: 'Start of time range (ISO date)',
+            exclusive: ['days'],
+        }),
+        end: core_1.Flags.string({
+            description: 'End of time range (ISO date)',
+            exclusive: ['days'],
+        }),
+        days: core_1.Flags.integer({
+            description: 'Show events from the last N days (mutually exclusive with --start/--end)',
+            min: 1,
+            exclusive: ['start', 'end'],
+        }),
+        'app-version': core_1.Flags.string({
+            description: 'Filter by app version',
+        }),
+        'update-id': core_1.Flags.string({
+            description: 'Filter by EAS update ID',
+        }),
+        'session-id': core_1.Flags.string({
+            description: 'Filter by session ID',
+        }),
+        'all-events': core_1.Flags.boolean({
+            description: 'When no event name argument is provided, list all events across all event names instead of a summary of event names + counts.',
+            default: false,
+        }),
+        'project-id': core_1.Flags.string({
+            description: 'EAS project ID (defaults to the project ID of the current directory)',
+        }),
+        ...flags_1.EasNonInteractiveAndJsonFlags,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.ProjectId,
+        ...this.ContextOptions.LoggedIn,
+    };
+    static loggedInOnlyContextDefinition = {
+        ...this.ContextOptions.LoggedIn,
+    };
+    async runAsync() {
+        const { flags, args } = await this.parse(ObserveLogs);
+        if (args.eventName && flags['all-events']) {
+            throw new Error('--all-events cannot be combined with an event name argument. Pass an event name to filter by it, or pass --all-events to list all events across all event names.');
+        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveLogs,
+            loggedInOnlyContextDefinition: ObserveLogs.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
+        if (flags.json) {
+            (0, json_1.enableJsonOutput)();
+        }
+        else {
+            log_1.default.warn('EAS Observe is in preview and subject to breaking changes.');
+        }
+        const { daysBack, startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
+        const platform = (0, platforms_1.appObservePlatformFromFlag)(flags.platform);
+        if (!args.eventName && !flags['all-events']) {
+            const { names, isTruncated } = await ObserveQuery_1.ObserveQuery.customEventNamesAsync(graphqlClient, {
+                appId: projectId,
+                startTime,
+                endTime,
+                platform,
+            });
+            if (flags.json) {
+                (0, json_1.printJsonOnlyOutput)((0, formatCustomEvents_1.buildObserveCustomEventNamesJson)(names, isTruncated));
+            }
+            else {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log((0, formatCustomEvents_1.buildObserveCustomEventNamesTable)(names, {
+                    daysBack,
+                    startTime,
+                    endTime,
+                    isTruncated,
+                }));
+            }
+            return;
+        }
+        const { events, pageInfo } = await (0, fetchCustomEvents_1.fetchObserveCustomEventsAsync)(graphqlClient, projectId, {
+            eventName: args.eventName,
+            limit: flags.limit ?? DEFAULT_EVENTS_LIMIT,
+            ...(flags.after && { after: flags.after }),
+            startTime,
+            endTime,
+            platform,
+            appVersion: flags['app-version'],
+            updateId: flags['update-id'],
+            sessionId: flags['session-id'],
+        });
+        if (args.eventName && events.length === 0) {
+            const { names, isTruncated } = await ObserveQuery_1.ObserveQuery.customEventNamesAsync(graphqlClient, {
+                appId: projectId,
+                startTime,
+                endTime,
+                platform,
+            });
+            if (flags.json) {
+                (0, json_1.printJsonOnlyOutput)((0, formatCustomEvents_1.buildObserveCustomEventsEmptyWithSuggestionsJson)(args.eventName, names, isTruncated));
+            }
+            else {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log((0, formatCustomEvents_1.buildObserveCustomEventsEmptyWithSuggestionsTable)(args.eventName, names, {
+                    daysBack,
+                    startTime,
+                    endTime,
+                    isTruncated,
+                }));
+            }
+            return;
+        }
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)((0, formatCustomEvents_1.buildObserveCustomEventsJson)(events, pageInfo));
+        }
+        else {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log((0, formatCustomEvents_1.buildObserveCustomEventsTable)(events, pageInfo, {
+                eventName: args.eventName,
+                daysBack,
+                startTime,
+                endTime,
+            }));
+        }
+    }
+}
+exports.default = ObserveLogs;

package/build/commands/observe/metrics.js

@@ -4,11 +4,12 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
-const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const fetchMetrics_1 = require("../../observe/fetchMetrics");
 const formatMetrics_1 = require("../../observe/formatMetrics");
 const metricNames_1 = require("../../observe/metricNames");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
 const startAndEndTime_1 = require("../../observe/startAndEndTime");
 const json_1 = require("../../utils/json");
 const DEFAULT_METRICS = [
@@ -35,7 +36,7 @@ class ObserveMetrics extends EasCommand_1.default {
     static flags = {
         platform: core_1.Flags.option({
             description: 'Filter by platform',
-            options: Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase()),
+            options: platforms_1.allowedPlatformFlagValues,
         })(),
         metric: core_1.Flags.option({
             description: 'Metric name to display (can be specified multiple times).',
@@ -74,20 +75,13 @@ class ObserveMetrics extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags } = await this.parse(ObserveMetrics);
-        let projectId;
-        let graphqlClient;
-        if (flags['project-id']) {
-            projectId = flags['project-id'];
-            const ctx = await this.getContextAsync({ contextDefinition: ObserveMetrics.loggedInOnlyContextDefinition }, { nonInteractive: flags['non-interactive'] });
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
-        else {
-            const ctx = await this.getContextAsync(ObserveMetrics, {
-                nonInteractive: flags['non-interactive'],
-            });
-            projectId = ctx.projectId;
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveMetrics,
+            loggedInOnlyContextDefinition: ObserveMetrics.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
@@ -98,9 +92,7 @@ class ObserveMetrics extends EasCommand_1.default {
             ? flags.metric.map(metricNames_1.resolveMetricName)
             : DEFAULT_METRICS;
         const { daysBack, startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
-        const platforms = flags.platform
-            ? [flags.platform === 'android' ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios]
-            : [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+        const platforms = (0, platforms_1.appPlatformsFromFlag)(flags.platform);
         const { metricsMap, buildNumbersMap, updateIdsMap, totalEventCounts } = await (0, fetchMetrics_1.fetchObserveMetricsAsync)(graphqlClient, projectId, metricNames, platforms, startTime, endTime);
         const argumentsStat = flags.stat?.length
             ? Array.from(new Set(flags.stat.map(formatMetrics_1.resolveStatKey)))

package/build/commands/observe/versions.js

@@ -4,10 +4,11 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
-const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const fetchVersions_1 = require("../../observe/fetchVersions");
 const formatVersions_1 = require("../../observe/formatVersions");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
 const startAndEndTime_1 = require("../../observe/startAndEndTime");
 const json_1 = require("../../utils/json");
 class ObserveVersions extends EasCommand_1.default {
@@ -16,7 +17,7 @@ class ObserveVersions extends EasCommand_1.default {
     static flags = {
         platform: core_1.Flags.option({
             description: 'Filter by platform',
-            options: Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase()),
+            options: platforms_1.allowedPlatformFlagValues,
         })(),
         start: core_1.Flags.string({
             description: 'Start of time range (ISO date)',
@@ -45,20 +46,13 @@ class ObserveVersions extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags } = await this.parse(ObserveVersions);
-        let projectId;
-        let graphqlClient;
-        if (flags['project-id']) {
-            projectId = flags['project-id'];
-            const ctx = await this.getContextAsync({ contextDefinition: ObserveVersions.loggedInOnlyContextDefinition }, { nonInteractive: flags['non-interactive'] });
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
-        else {
-            const ctx = await this.getContextAsync(ObserveVersions, {
-                nonInteractive: flags['non-interactive'],
-            });
-            projectId = ctx.projectId;
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveVersions,
+            loggedInOnlyContextDefinition: ObserveVersions.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
@@ -66,9 +60,7 @@ class ObserveVersions extends EasCommand_1.default {
             log_1.default.warn('EAS Observe is in preview and subject to breaking changes.');
         }
         const { startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
-        const platforms = flags.platform
-            ? [flags.platform === 'android' ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios]
-            : [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+        const platforms = (0, platforms_1.appPlatformsFromFlag)(flags.platform);
         const results = await (0, fetchVersions_1.fetchObserveVersionsAsync)(graphqlClient, projectId, platforms, startTime, endTime);
         if (flags.json) {
             (0, json_1.printJsonOnlyOutput)((0, formatVersions_1.buildObserveVersionsJson)(results));