eas-cli 16.31.0 → 18.0.1

package/build/commands/account/usage.js

@@ -0,0 +1,326 @@
+"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 flags_1 = require("../../commandUtils/flags");
+const usageUtils_1 = require("../../commandUtils/usageUtils");
+const generated_1 = require("../../graphql/generated");
+const AccountQuery_1 = require("../../graphql/queries/AccountQuery");
+const log_1 = tslib_1.__importStar(require("../../log"));
+const ora_1 = require("../../ora");
+const prompts_1 = require("../../prompts");
+const json_1 = require("../../utils/json");
+const checkForOverages_1 = require("../../utils/usage/checkForOverages");
+const MiB = 1024 * 1024;
+const GiB = 1024 * MiB;
+const TiB = 1024 * GiB;
+function formatBytes(bytes) {
+    if (bytes >= TiB) {
+        return { value: bytes / TiB, unit: 'TiB' };
+    }
+    else if (bytes >= GiB) {
+        return { value: bytes / GiB, unit: 'GiB' };
+    }
+    else {
+        return { value: bytes / MiB, unit: 'MiB' };
+    }
+}
+function formatBytesDisplay(bytes) {
+    const { value, unit } = formatBytes(bytes);
+    return `${(0, usageUtils_1.formatNumber)(value, value < 10 ? 2 : value < 100 ? 1 : 0)} ${unit}`;
+}
+function displayBandwidthMetric(metric, indent = '  ') {
+    const progressBar = (0, checkForOverages_1.createProgressBar)(metric.percentUsed, 20);
+    const percentStr = `${metric.percentUsed}%`;
+    const planUsageStr = `${formatBytesDisplay(metric.planValue)}/${formatBytesDisplay(metric.limit)}`;
+    let color = chalk_1.default.green;
+    if (metric.percentUsed >= 100) {
+        color = chalk_1.default.red;
+    }
+    else if (metric.percentUsed >= 85) {
+        color = chalk_1.default.yellow;
+    }
+    log_1.default.log(`${indent}${metric.name} (plan): ${color(planUsageStr)}`);
+    log_1.default.log(`${indent}${progressBar} ${color(percentStr)}`);
+    if (metric.overageValue > 0) {
+        log_1.default.log(`${indent}${metric.name} (overage): ${chalk_1.default.red(formatBytesDisplay(metric.overageValue))} (${(0, usageUtils_1.formatCurrency)(metric.overageCost)})`);
+    }
+}
+function displayMetric(metric, indent = '  ') {
+    const progressBar = (0, checkForOverages_1.createProgressBar)(metric.percentUsed, 20);
+    const percentStr = `${metric.percentUsed}%`;
+    const planUsageStr = `${(0, usageUtils_1.formatNumber)(metric.planValue)}/${(0, usageUtils_1.formatNumber)(metric.limit)} ${metric.unit ?? ''}`;
+    let color = chalk_1.default.green;
+    if (metric.percentUsed >= 100) {
+        color = chalk_1.default.red;
+    }
+    else if (metric.percentUsed >= 85) {
+        color = chalk_1.default.yellow;
+    }
+    log_1.default.log(`${indent}${metric.name} (plan): ${color(planUsageStr)}`);
+    log_1.default.log(`${indent}${progressBar} ${color(percentStr)}`);
+    if (metric.overageValue > 0) {
+        log_1.default.log(`${indent}${metric.name} (overage): ${chalk_1.default.red(`${(0, usageUtils_1.formatNumber)(metric.overageValue)} ${metric.unit ?? ''}`)} (${(0, usageUtils_1.formatCurrency)(metric.overageCost)})`);
+    }
+}
+function billingUrl(accountName) {
+    return `https://expo.dev/accounts/${accountName}/settings/billing`;
+}
+function displayUsage(data, usageData) {
+    const subscription = usageData.subscription;
+    log_1.default.newLine();
+    log_1.default.log(chalk_1.default.bold(`Account: ${data.accountName}`));
+    log_1.default.log(`Plan: ${data.subscriptionPlan}`);
+    if (subscription?.concurrencies) {
+        log_1.default.log(`Concurrencies: ${subscription.concurrencies.total} total (iOS: ${subscription.concurrencies.ios}, Android: ${subscription.concurrencies.android})`);
+    }
+    log_1.default.log(`Billing Period: ${(0, usageUtils_1.formatDate)(data.billingPeriod.start)} - ${(0, usageUtils_1.formatDate)(data.billingPeriod.end)}`);
+    const periodInfo = (0, usageUtils_1.calculateBillingPeriodInfo)(data);
+    log_1.default.log(`Days: ${periodInfo.daysElapsed} elapsed / ${periodInfo.totalDays} total (${periodInfo.daysRemaining} remaining)`);
+    log_1.default.newLine();
+    log_1.default.log(chalk_1.default.bold.underline('EAS Build'));
+    displayMetric(data.builds.total);
+    if (data.builds.ios) {
+        displayMetric(data.builds.ios, '    ');
+    }
+    if (data.builds.android) {
+        displayMetric(data.builds.android, '    ');
+    }
+    // Show build counts by platform and worker size
+    if (data.builds.countsByPlatformAndSize.length > 0) {
+        log_1.default.log('  Breakdown by platform/worker:');
+        for (const item of data.builds.countsByPlatformAndSize) {
+            const platformName = item.platform === 'ios' ? 'iOS' : 'Android';
+            log_1.default.log(`    ${platformName} ${item.resourceClass}: ${(0, usageUtils_1.formatNumber)(item.count)} builds`);
+        }
+    }
+    log_1.default.newLine();
+    log_1.default.log(chalk_1.default.bold.underline('EAS Update'));
+    displayMetric(data.updates.mau);
+    displayBandwidthMetric(data.updates.bandwidth);
+    log_1.default.newLine();
+    log_1.default.log(chalk_1.default.bold.underline('Billing'));
+    const upcomingInvoice = subscription?.upcomingInvoice;
+    // Show subscription addons
+    if (subscription?.addons && subscription.addons.length > 0) {
+        log_1.default.log('  Addons:');
+        for (const addon of subscription.addons) {
+            log_1.default.log(`    ${addon.name}: ${addon.quantity}`);
+        }
+    }
+    // Show upcoming invoice line items
+    if (upcomingInvoice?.lineItems && upcomingInvoice.lineItems.length > 0) {
+        log_1.default.newLine();
+        log_1.default.log('  Upcoming invoice:');
+        for (const lineItem of upcomingInvoice.lineItems) {
+            const amount = lineItem.amount;
+            const amountStr = amount < 0 ? chalk_1.default.green((0, usageUtils_1.formatCurrency)(amount)) : (0, usageUtils_1.formatCurrency)(amount);
+            log_1.default.log(`    ${lineItem.description}: ${amountStr}`);
+        }
+        log_1.default.newLine();
+        log_1.default.log(`  Invoice total: ${chalk_1.default.bold((0, usageUtils_1.formatCurrency)(upcomingInvoice.total))}`);
+    }
+    else {
+        // Fallback to the calculated estimate if no upcoming invoice
+        if (data.recurringCents !== null && data.recurringCents > 0) {
+            log_1.default.log(`  Base subscription: ${(0, usageUtils_1.formatCurrency)(data.recurringCents)}`);
+        }
+        if (data.totalOverageCostCents > 0) {
+            log_1.default.log(`  Current overages: ${chalk_1.default.yellow((0, usageUtils_1.formatCurrency)(data.totalOverageCostCents))}`);
+            if (data.builds.overageCostCents > 0) {
+                log_1.default.log(`    Build overages: ${(0, usageUtils_1.formatCurrency)(data.builds.overageCostCents)}`);
+                // Show breakdown by worker size
+                for (const overage of data.builds.overagesByWorkerSize) {
+                    const platformName = overage.platform === generated_1.AppPlatform.Ios ? 'iOS' : 'Android';
+                    const sizeName = overage.resourceClass === generated_1.EasBuildBillingResourceClass.Large ? 'large' : 'medium';
+                    log_1.default.log(`      ${platformName} ${sizeName}: ${(0, usageUtils_1.formatNumber)(overage.count)} builds (${(0, usageUtils_1.formatCurrency)(overage.costCents)})`);
+                }
+            }
+            if (data.updates.overageCostCents > 0) {
+                log_1.default.log(`    Update overages: ${(0, usageUtils_1.formatCurrency)(data.updates.overageCostCents)}`);
+            }
+        }
+        log_1.default.log(`  Estimated bill: ${chalk_1.default.bold((0, usageUtils_1.formatCurrency)(data.estimatedBillCents))}`);
+    }
+    log_1.default.newLine();
+    log_1.default.log(chalk_1.default.dim(`View detailed billing: ${(0, log_1.link)(billingUrl(data.accountName))}`));
+}
+class AccountUsage extends EasCommand_1.default {
+    static description = 'view account usage and billing for the current cycle';
+    static args = [
+        {
+            name: 'ACCOUNT_NAME',
+            description: 'Account name to view usage for. If not provided, the account will be selected interactively (or defaults to the only account if there is just one)',
+        },
+    ];
+    static flags = {
+        ...flags_1.EasJsonOnlyFlag,
+        ...flags_1.EASNonInteractiveFlag,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.LoggedIn,
+    };
+    async runAsync() {
+        const { args: { ACCOUNT_NAME: accountName }, flags: { json: jsonFlag, 'non-interactive': nonInteractive }, } = await this.parse(AccountUsage);
+        // Enable JSON output if either --json or --non-interactive is passed
+        const json = jsonFlag || nonInteractive;
+        if (json) {
+            (0, json_1.enableJsonOutput)();
+        }
+        const { loggedIn: { graphqlClient, actor }, } = await this.getContextAsync(AccountUsage, {
+            nonInteractive,
+        });
+        // Find the target account
+        const defaultAccount = actor.accounts[0];
+        let targetAccount;
+        const availableAccounts = actor.accounts.map(a => a.name).join(', ');
+        if (accountName) {
+            // First check if it's one of the user's accounts
+            const found = actor.accounts.find(a => a.name === accountName);
+            if (found) {
+                targetAccount = found;
+            }
+            else {
+                // Try to look up the account by name (user may have access via organization)
+                try {
+                    const account = await AccountQuery_1.AccountQuery.getByNameAsync(graphqlClient, accountName);
+                    if (!account) {
+                        throw new Error(`Account "${accountName}" not found. Available accounts: ${availableAccounts}`);
+                    }
+                    targetAccount = account;
+                }
+                catch {
+                    throw new Error(`Account "${accountName}" not found or you don't have access. Available accounts: ${availableAccounts}`);
+                }
+            }
+        }
+        else if (nonInteractive) {
+            throw new Error('ACCOUNT_NAME argument must be provided when running in `--non-interactive` mode.');
+        }
+        else if (actor.accounts.length === 1) {
+            // Only one account, use it directly
+            targetAccount = defaultAccount;
+        }
+        else {
+            // Prompt user to select an account
+            targetAccount = await (0, prompts_1.selectAsync)('Select account to view usage for:', actor.accounts.map(account => ({
+                title: account.name,
+                value: account,
+            })), { initial: defaultAccount });
+        }
+        const spinner = (0, ora_1.ora)(`Fetching usage data for account ${targetAccount.name}`).start();
+        try {
+            const currentDate = new Date();
+            const { start, end } = await AccountQuery_1.AccountQuery.getBillingPeriodAsync(graphqlClient, targetAccount.id, currentDate);
+            const usageData = await AccountQuery_1.AccountQuery.getFullUsageAsync(graphqlClient, targetAccount.id, currentDate, start, end);
+            log_1.default.debug(JSON.stringify(usageData, null, 2));
+            spinner.succeed(`Usage data loaded for ${targetAccount.name}`);
+            const displayData = (0, usageUtils_1.extractUsageData)(usageData);
+            const periodInfo = (0, usageUtils_1.calculateBillingPeriodInfo)(displayData);
+            if (json) {
+                const subscription = usageData.subscription;
+                (0, json_1.printJsonOnlyOutput)({
+                    account: {
+                        name: displayData.accountName,
+                        plan: displayData.subscriptionPlan,
+                        concurrencies: subscription?.concurrencies ?? null,
+                        billingPeriod: {
+                            start: displayData.billingPeriod.start,
+                            end: displayData.billingPeriod.end,
+                            daysElapsed: periodInfo.daysElapsed,
+                            daysRemaining: periodInfo.daysRemaining,
+                            totalDays: periodInfo.totalDays,
+                        },
+                    },
+                    builds: {
+                        plan: {
+                            used: displayData.builds.total.planValue,
+                            limit: displayData.builds.total.limit,
+                            percentUsed: displayData.builds.total.percentUsed,
+                        },
+                        overage: {
+                            count: displayData.builds.total.overageValue,
+                            costCents: displayData.builds.total.overageCost,
+                            byWorkerSize: displayData.builds.overagesByWorkerSize.map(o => ({
+                                platform: o.platform.toLowerCase(),
+                                resourceClass: o.resourceClass.toLowerCase(),
+                                count: o.count,
+                                costCents: o.costCents,
+                            })),
+                        },
+                        byPlatformAndSize: displayData.builds.countsByPlatformAndSize.map(item => ({
+                            platform: item.platform,
+                            resourceClass: item.resourceClass,
+                            count: item.count,
+                        })),
+                        ios: displayData.builds.ios
+                            ? {
+                                plan: {
+                                    used: displayData.builds.ios.planValue,
+                                    limit: displayData.builds.ios.limit,
+                                    percentUsed: displayData.builds.ios.percentUsed,
+                                },
+                            }
+                            : null,
+                        android: displayData.builds.android
+                            ? {
+                                plan: {
+                                    used: displayData.builds.android.planValue,
+                                    limit: displayData.builds.android.limit,
+                                    percentUsed: displayData.builds.android.percentUsed,
+                                },
+                            }
+                            : null,
+                    },
+                    updates: {
+                        uniqueUpdaters: {
+                            plan: {
+                                used: displayData.updates.mau.planValue,
+                                limit: displayData.updates.mau.limit,
+                                percentUsed: displayData.updates.mau.percentUsed,
+                            },
+                            overage: {
+                                count: displayData.updates.mau.overageValue,
+                                costCents: displayData.updates.mau.overageCost,
+                            },
+                        },
+                        bandwidth: {
+                            plan: {
+                                usedBytes: displayData.updates.bandwidth.planValue,
+                                usedFormatted: formatBytesDisplay(displayData.updates.bandwidth.planValue),
+                                limitBytes: displayData.updates.bandwidth.limit,
+                                limitFormatted: formatBytesDisplay(displayData.updates.bandwidth.limit),
+                                percentUsed: displayData.updates.bandwidth.percentUsed,
+                            },
+                            overage: {
+                                usedBytes: displayData.updates.bandwidth.overageValue,
+                                usedFormatted: formatBytesDisplay(displayData.updates.bandwidth.overageValue),
+                                costCents: displayData.updates.bandwidth.overageCost,
+                            },
+                        },
+                        overageCostCents: displayData.updates.overageCostCents,
+                    },
+                    billing: {
+                        addons: subscription?.addons ?? [],
+                        upcomingInvoice: subscription?.upcomingInvoice ?? null,
+                        estimated: {
+                            recurringCents: displayData.recurringCents,
+                            overageCents: displayData.totalOverageCostCents,
+                            totalCents: displayData.estimatedBillCents,
+                        },
+                    },
+                    billingUrl: billingUrl(displayData.accountName),
+                });
+            }
+            else {
+                displayUsage(displayData, usageData);
+            }
+        }
+        catch (error) {
+            spinner.fail('Failed to fetch usage data');
+            throw error;
+        }
+    }
+}
+exports.default = AccountUsage;

package/build/commands/env/create.js

@@ -54,7 +54,10 @@ class EnvCreate extends EasCommand_1.default {
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(EnvCreate, {
             nonInteractive: validatedFlags['non-interactive'],
         });
-        const { name, value, scope, 'non-interactive': nonInteractive, environment: environments, visibility, force, type, fileName, } = await this.promptForMissingFlagsAsync(validatedFlags, args, { graphqlClient, projectId });
+        const { name, value, scope, 'non-interactive': nonInteractive, environment: environments, visibility, force, type, fileName, } = await this.promptForMissingFlagsAsync(validatedFlags, args, {
+            graphqlClient,
+            projectId,
+        });
         const [projectDisplayName, ownerAccount] = await Promise.all([
             (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId),
             (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId),
@@ -186,7 +189,7 @@ class EnvCreate extends EasCommand_1.default {
             fileName = path_1.default.basename(environmentFilePath);
         }
         value = environmentFilePath ? await fs_extra_1.default.readFile(environmentFilePath, 'base64') : value;
-        let newEnvironments = environments ? environments : environment ? [environment] : undefined;
+        let newEnvironments = environments ?? (environment ? [environment] : undefined);
         if (!newEnvironments) {
             newEnvironments = await (0, prompts_2.promptVariableEnvironmentAsync)({
                 nonInteractive,

package/build/commands/env/list.js

@@ -110,11 +110,7 @@ class EnvList extends EasCommand_1.default {
         });
     }
     sanitizeInputs(flags, { environment }) {
-        const environments = flags.environment
-            ? flags.environment
-            : environment
-                ? [environment]
-                : undefined;
+        const environments = flags.environment ?? (environment ? [environment] : undefined);
         return {
             ...flags,
             'non-interactive': flags['non-interactive'] ?? false,

package/build/commands/update/index.js

@@ -313,11 +313,11 @@ class UpdatePublish extends EasCommand_1.default {
             return {
                 ...info,
                 expoUpdatesRuntimeFingerprintSource: info.expoUpdatesRuntimeFingerprint
-                    ? (await (0, maybeUploadFingerprintAsync_1.maybeUploadFingerprintAsync)({
+                    ? ((await (0, maybeUploadFingerprintAsync_1.maybeUploadFingerprintAsync)({
                         hash: info.runtimeVersion,
                         fingerprint: info.expoUpdatesRuntimeFingerprint,
                         graphqlClient,
-                    })).fingerprintSource ?? null
+                    })).fingerprintSource ?? null)
                     : null,
             };
         }));

package/build/commands/upload.js

@@ -8,7 +8,7 @@ const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const node_stream_zip_1 = tslib_1.__importDefault(require("node-stream-zip"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const tar_1 = tslib_1.__importDefault(require("tar"));
+const tar = tslib_1.__importStar(require("tar"));
 const uuid_1 = require("uuid");
 const url_1 = require("../build/utils/url");
 const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand"));
@@ -214,7 +214,7 @@ async function uploadAppArchiveAsync(graphqlClient, originalPath) {
         const tarPath = path_1.default.join((0, paths_1.getTmpDirectory)(), `${(0, uuid_1.v4)()}.tar.gz`);
         const parentPath = path_1.default.dirname(originalPath);
         const folderName = path_1.default.basename(originalPath);
-        await tar_1.default.create({ cwd: parentPath, file: tarPath, gzip: true }, [folderName]);
+        await tar.create({ cwd: parentPath, file: tarPath, gzip: true }, [folderName]);
         filePath = tarPath;
     }
     const fileSize = (await fs_extra_1.default.stat(filePath)).size;
@@ -306,7 +306,7 @@ async function extractAppMetadataAsync(buildPath, platform) {
         try {
             let fingerprintHashPromise;
             let infoPlistPromise;
-            await tar_1.default.list({
+            await tar.list({
                 file: buildPath,
                 // eslint-disable-next-line async-protect/async-suffix
                 onentry: entry => {

package/build/credentials/ios/api/graphql/mutations/AppleDistributionCertificateMutation.js

@@ -43,9 +43,7 @@ exports.AppleDistributionCertificateMutation = {
     async deleteAppleDistributionCertificateAsync(graphqlClient, appleDistributionCertificateId) {
         await (0, client_1.withErrorHandlingAsync)(graphqlClient
             .mutation((0, graphql_tag_1.default) `
-            mutation DeleteAppleDistributionCertificateMutation(
-              $appleDistributionCertificateId: ID!
-            ) {
+            mutation DeleteAppleDistributionCertificateMutation($appleDistributionCertificateId: ID!) {
               appleDistributionCertificate {
                 deleteAppleDistributionCertificate(id: $appleDistributionCertificateId) {
                   id

package/build/devices/queries.js

@@ -18,7 +18,18 @@ exports.TEAMS_LIMIT = 50;
 exports.DEVICES_LIMIT = 50;
 async function selectAppleTeamOnAccountAsync(graphqlClient, { accountName, selectionPromptTitle, paginatedQueryOptions, }) {
     if (paginatedQueryOptions.nonInteractive) {
-        throw new Error('Unable to select an Apple team in non-interactive mode.');
+        const teams = await AppleTeamQuery_1.AppleTeamQuery.getAllForAccountAsync(graphqlClient, {
+            accountName,
+            limit: paginatedQueryOptions.limit ?? exports.TEAMS_LIMIT,
+            offset: paginatedQueryOptions.offset,
+        });
+        if (teams.length === 0) {
+            throw new Error(`No Apple teams found for account ${accountName}.`);
+        }
+        const teamList = teams
+            .map(t => t.appleTeamName ? `${t.appleTeamName} (${t.appleTeamIdentifier})` : t.appleTeamIdentifier)
+            .join('\n  ');
+        throw new Error(`Unable to select an Apple team in non-interactive mode. Use the --apple-team-id flag to specify the team. Available Apple teams for account ${accountName}:\n  ${teamList}`);
     }
     else {
         const selectedAppleTeam = await (0, queries_1.paginatedQueryWithSelectPromptAsync)({
@@ -47,7 +58,17 @@ async function selectAppleTeamOnAccountAsync(graphqlClient, { accountName, selec
 }
 async function selectAppleDeviceOnAppleTeamAsync(graphqlClient, { accountName, appleTeamIdentifier, selectionPromptTitle, paginatedQueryOptions, }) {
     if (paginatedQueryOptions.nonInteractive) {
-        throw new Error('Unable to select an Apple device in non-interactive mode.');
+        const devices = await AppleDeviceQuery_1.AppleDeviceQuery.getAllForAppleTeamAsync(graphqlClient, {
+            accountName,
+            appleTeamIdentifier,
+            limit: paginatedQueryOptions.limit ?? exports.DEVICES_LIMIT,
+            offset: paginatedQueryOptions.offset,
+        });
+        if (devices.length === 0) {
+            throw new Error(`No devices found on Apple team ${appleTeamIdentifier} for account ${accountName}.`);
+        }
+        const deviceList = devices.map(d => (0, DeviceUtils_1.formatDeviceLabel)(d)).join('\n  ');
+        throw new Error(`Unable to select an Apple device in non-interactive mode. Available devices on Apple team ${appleTeamIdentifier}:\n  ${deviceList}`);
     }
     else {
         const selectedAppleDevice = await (0, queries_1.paginatedQueryWithSelectPromptAsync)({