eas-cli 16.30.0 → 16.32.0

package/build/commandUtils/context/contextUtils/createGraphqlClient.d.ts

@@ -1,9 +1,5 @@
-import { AnyVariables, Client, OperationContext, OperationResult, OperationResultSource, TypedDocumentNode } from '@urql/core';
-import { DocumentNode } from 'graphql';
+import { Client } from '@urql/core';
 export interface ExpoGraphqlClient extends Client {
-    query<Data = any, Variables extends AnyVariables = AnyVariables>(query: DocumentNode | TypedDocumentNode<Data, Variables> | string, variables: Variables, context: Partial<OperationContext> & {
-        additionalTypenames: string[];
-    }): OperationResultSource<OperationResult<Data, Variables>>;
 }
 export declare function createGraphqlClient(authInfo: {
     accessToken: string | null;

package/build/commandUtils/usageUtils.d.ts

@@ -0,0 +1,58 @@
+import { AppPlatform, EasBuildBillingResourceClass } from '../graphql/generated';
+import { AccountFullUsageData } from '../graphql/queries/AccountQuery';
+export interface UsageMetricDisplay {
+    name: string;
+    planValue: number;
+    limit: number;
+    percentUsed: number;
+    overageValue: number;
+    overageCost: number;
+    unit?: string;
+}
+export interface BuildOverageByWorkerSize {
+    platform: AppPlatform;
+    resourceClass: EasBuildBillingResourceClass;
+    count: number;
+    costCents: number;
+}
+export interface BuildCountByPlatformAndSize {
+    platform: 'ios' | 'android';
+    resourceClass: 'medium' | 'large';
+    count: number;
+}
+export interface UsageDisplayData {
+    accountName: string;
+    subscriptionPlan: string;
+    billingPeriod: {
+        start: string;
+        end: string;
+    };
+    builds: {
+        total: UsageMetricDisplay;
+        ios?: UsageMetricDisplay;
+        android?: UsageMetricDisplay;
+        countsByPlatformAndSize: BuildCountByPlatformAndSize[];
+        overagesByWorkerSize: BuildOverageByWorkerSize[];
+        overageCostCents: number;
+    };
+    updates: {
+        mau: UsageMetricDisplay;
+        bandwidth: UsageMetricDisplay;
+        overageCostCents: number;
+    };
+    totalOverageCostCents: number;
+    estimatedBillCents: number;
+    recurringCents: number | null;
+}
+export declare function formatDate(dateString: string): string;
+export declare function formatCurrency(cents: number): string;
+export declare function formatNumber(value: number, decimals?: number): string;
+export declare function calculateDaysRemaining(endDate: string): number;
+export declare function calculateDaysElapsed(startDate: string): number;
+export declare function calculateBillingPeriodDays(startDate: string, endDate: string): number;
+export declare function extractUsageData(data: AccountFullUsageData): UsageDisplayData;
+export declare function calculateBillingPeriodInfo(data: UsageDisplayData): {
+    daysRemaining: number;
+    daysElapsed: number;
+    totalDays: number;
+};

package/build/commandUtils/usageUtils.js

@@ -0,0 +1,204 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDate = formatDate;
+exports.formatCurrency = formatCurrency;
+exports.formatNumber = formatNumber;
+exports.calculateDaysRemaining = calculateDaysRemaining;
+exports.calculateDaysElapsed = calculateDaysElapsed;
+exports.calculateBillingPeriodDays = calculateBillingPeriodDays;
+exports.extractUsageData = extractUsageData;
+exports.calculateBillingPeriodInfo = calculateBillingPeriodInfo;
+const generated_1 = require("../graphql/generated");
+const checkForOverages_1 = require("../utils/usage/checkForOverages");
+function formatDate(dateString) {
+    const date = new Date(dateString);
+    return date.toLocaleDateString('en-US', {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+    });
+}
+function formatCurrency(cents) {
+    return `$${(cents / 100).toFixed(2)}`;
+}
+function formatNumber(value, decimals = 0) {
+    if (decimals === 0) {
+        return Math.round(value).toLocaleString();
+    }
+    return value.toLocaleString(undefined, {
+        minimumFractionDigits: decimals,
+        maximumFractionDigits: decimals,
+    });
+}
+function calculateDaysRemaining(endDate) {
+    const end = new Date(endDate);
+    const now = new Date();
+    const diffTime = end.getTime() - now.getTime();
+    return Math.max(0, Math.ceil(diffTime / (1000 * 60 * 60 * 24)));
+}
+function calculateDaysElapsed(startDate) {
+    const start = new Date(startDate);
+    const now = new Date();
+    const diffTime = now.getTime() - start.getTime();
+    return Math.max(1, Math.ceil(diffTime / (1000 * 60 * 60 * 24)));
+}
+function calculateBillingPeriodDays(startDate, endDate) {
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+    const diffTime = end.getTime() - start.getTime();
+    return Math.max(1, Math.ceil(diffTime / (1000 * 60 * 60 * 24)));
+}
+function extractUsageData(data) {
+    const { name, subscription, billingPeriod, usageMetrics } = data;
+    const { EAS_BUILD, EAS_UPDATE, MEDIUM_ANDROID_BUILDS, LARGE_ANDROID_BUILDS, MEDIUM_IOS_BUILDS, LARGE_IOS_BUILDS, } = usageMetrics;
+    // Find build metrics
+    const buildMetric = EAS_BUILD.planMetrics.find(m => m.serviceMetric === generated_1.EasServiceMetric.Builds && m.metricType === generated_1.UsageMetricType.Build);
+    // Extract build counts by platform and worker size
+    const countsByPlatformAndSize = [];
+    const mediumAndroidCount = MEDIUM_ANDROID_BUILDS?.[0]?.value ?? 0;
+    const largeAndroidCount = LARGE_ANDROID_BUILDS?.[0]?.value ?? 0;
+    const mediumIosCount = MEDIUM_IOS_BUILDS?.[0]?.value ?? 0;
+    const largeIosCount = LARGE_IOS_BUILDS?.[0]?.value ?? 0;
+    if (mediumAndroidCount > 0) {
+        countsByPlatformAndSize.push({
+            platform: 'android',
+            resourceClass: 'medium',
+            count: mediumAndroidCount,
+        });
+    }
+    if (largeAndroidCount > 0) {
+        countsByPlatformAndSize.push({
+            platform: 'android',
+            resourceClass: 'large',
+            count: largeAndroidCount,
+        });
+    }
+    if (mediumIosCount > 0) {
+        countsByPlatformAndSize.push({
+            platform: 'ios',
+            resourceClass: 'medium',
+            count: mediumIosCount,
+        });
+    }
+    if (largeIosCount > 0) {
+        countsByPlatformAndSize.push({ platform: 'ios', resourceClass: 'large', count: largeIosCount });
+    }
+    // Extract build overages by worker size from overage metrics with metadata
+    const overagesByWorkerSize = [];
+    for (const overage of EAS_BUILD.overageMetrics) {
+        if (overage.serviceMetric === generated_1.EasServiceMetric.Builds &&
+            overage.metadata?.billingResourceClass &&
+            overage.metadata?.platform) {
+            overagesByWorkerSize.push({
+                platform: overage.metadata.platform,
+                resourceClass: overage.metadata.billingResourceClass,
+                count: overage.value,
+                costCents: overage.totalCost,
+            });
+        }
+    }
+    // Find update metrics
+    const mauMetric = EAS_UPDATE.planMetrics.find(m => m.serviceMetric === generated_1.EasServiceMetric.UniqueUpdaters && m.metricType === generated_1.UsageMetricType.Update);
+    const bandwidthMetric = EAS_UPDATE.planMetrics.find(m => m.serviceMetric === generated_1.EasServiceMetric.BandwidthUsage &&
+        m.metricType === generated_1.UsageMetricType.Bandwidth);
+    const mauOverage = EAS_UPDATE.overageMetrics.find(m => m.serviceMetric === generated_1.EasServiceMetric.UniqueUpdaters && m.metricType === generated_1.UsageMetricType.Update);
+    const bandwidthOverage = EAS_UPDATE.overageMetrics.find(m => m.serviceMetric === generated_1.EasServiceMetric.BandwidthUsage &&
+        m.metricType === generated_1.UsageMetricType.Bandwidth);
+    // Build metrics - plan values from planMetrics, overage from overageMetrics
+    const buildPlanValue = buildMetric?.value ?? 0;
+    const buildLimit = buildMetric?.limit ?? 0;
+    const iosBuildPlanValue = buildMetric?.platformBreakdown?.ios.value ?? 0;
+    const iosBuildLimit = buildMetric?.platformBreakdown?.ios.limit ?? 0;
+    const androidBuildPlanValue = buildMetric?.platformBreakdown?.android.value ?? 0;
+    const androidBuildLimit = buildMetric?.platformBreakdown?.android.limit ?? 0;
+    // Update metrics - plan values from planMetrics, overage from overageMetrics
+    const mauPlanValue = mauMetric?.value ?? 0;
+    const mauOverageValue = mauOverage?.value ?? 0;
+    const mauLimit = mauMetric?.limit ?? 0;
+    const bandwidthPlanValue = bandwidthMetric?.value ?? 0;
+    const bandwidthOverageValue = bandwidthOverage?.value ?? 0;
+    const bandwidthLimit = bandwidthMetric?.limit ?? 0;
+    const buildOverageCostCents = EAS_BUILD.totalCost;
+    const updateOverageCostCents = EAS_UPDATE.totalCost;
+    const totalOverageCostCents = buildOverageCostCents + updateOverageCostCents;
+    // Calculate total overage count for display
+    const totalOverageBuilds = overagesByWorkerSize.reduce((sum, o) => sum + o.count, 0);
+    return {
+        accountName: name,
+        subscriptionPlan: subscription?.name ?? 'Free',
+        billingPeriod: {
+            start: billingPeriod.start,
+            end: billingPeriod.end,
+        },
+        builds: {
+            total: {
+                name: 'Builds',
+                planValue: buildPlanValue,
+                limit: buildLimit,
+                percentUsed: (0, checkForOverages_1.calculatePercentUsed)(buildPlanValue, buildLimit),
+                overageValue: totalOverageBuilds,
+                overageCost: buildOverageCostCents,
+                unit: 'builds',
+            },
+            ios: buildMetric?.platformBreakdown
+                ? {
+                    name: 'iOS Builds',
+                    planValue: iosBuildPlanValue,
+                    limit: iosBuildLimit,
+                    percentUsed: (0, checkForOverages_1.calculatePercentUsed)(iosBuildPlanValue, iosBuildLimit),
+                    overageValue: 0,
+                    overageCost: 0,
+                    unit: 'builds',
+                }
+                : undefined,
+            android: buildMetric?.platformBreakdown
+                ? {
+                    name: 'Android Builds',
+                    planValue: androidBuildPlanValue,
+                    limit: androidBuildLimit,
+                    percentUsed: (0, checkForOverages_1.calculatePercentUsed)(androidBuildPlanValue, androidBuildLimit),
+                    overageValue: 0,
+                    overageCost: 0,
+                    unit: 'builds',
+                }
+                : undefined,
+            countsByPlatformAndSize,
+            overagesByWorkerSize,
+            overageCostCents: buildOverageCostCents,
+        },
+        updates: {
+            mau: {
+                name: 'Unique Updaters',
+                planValue: mauPlanValue,
+                limit: mauLimit,
+                percentUsed: (0, checkForOverages_1.calculatePercentUsed)(mauPlanValue, mauLimit),
+                overageValue: mauOverageValue,
+                overageCost: mauOverage?.totalCost ?? 0,
+                unit: 'users',
+            },
+            bandwidth: {
+                name: 'Bandwidth',
+                planValue: bandwidthPlanValue,
+                limit: bandwidthLimit,
+                percentUsed: (0, checkForOverages_1.calculatePercentUsed)(bandwidthPlanValue, bandwidthLimit),
+                overageValue: bandwidthOverageValue,
+                overageCost: bandwidthOverage?.totalCost ?? 0,
+                unit: 'bytes',
+            },
+            overageCostCents: updateOverageCostCents,
+        },
+        totalOverageCostCents,
+        estimatedBillCents: (subscription?.recurringCents ?? 0) + totalOverageCostCents,
+        recurringCents: subscription?.recurringCents ?? null,
+    };
+}
+function calculateBillingPeriodInfo(data) {
+    const daysElapsed = calculateDaysElapsed(data.billingPeriod.start);
+    const totalDays = calculateBillingPeriodDays(data.billingPeriod.start, data.billingPeriod.end);
+    const daysRemaining = calculateDaysRemaining(data.billingPeriod.end);
+    return {
+        daysRemaining,
+        daysElapsed,
+        totalDays,
+    };
+}

package/build/commands/account/usage.d.ts

@@ -0,0 +1,16 @@
+import EasCommand from '../../commandUtils/EasCommand';
+export default class AccountUsage extends EasCommand {
+    static description: string;
+    static args: {
+        name: string;
+        description: string;
+    }[];
+    static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+    };
+    runAsync(): Promise<void>;
+}

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/submit/upload-to-asc.d.ts

@@ -0,0 +1,12 @@
+import EasCommand from '../../commandUtils/EasCommand';
+export default class SubmitUploadToAsc extends EasCommand {
+    static hidden: boolean;
+    static flags: {
+        path: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        key: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'app-id': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'bundle-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'bundle-short-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+    };
+    runAsync(): Promise<void>;
+}