eas-cli 18.9.1 → 18.11.0

package/build/observe/formatEvents.js

@@ -4,25 +4,9 @@ exports.buildObserveEventsTable = buildObserveEventsTable;
 exports.buildObserveEventsJson = buildObserveEventsJson;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const renderTextTable_1 = tslib_1.__importDefault(require("../utils/renderTextTable"));
+const formatUtils_1 = require("./formatUtils");
 const metricNames_1 = require("./metricNames");
-function formatTimestamp(isoString) {
-    const date = new Date(isoString);
-    return date.toLocaleDateString('en-US', {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-    });
-}
-function formatDate(isoString) {
-    const date = new Date(isoString);
-    return date.toLocaleDateString('en-US', {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-    });
-}
 function resolveCustomParams(event) {
     return event.customParams ?? null;
 }
@@ -47,31 +31,18 @@ function buildObserveEventsTable(events, pageInfo, options) {
         `${event.deviceOs} ${event.deviceOsVersion}`,
         event.deviceModel,
         event.countryCode ?? '-',
-        formatTimestamp(event.timestamp),
+        (0, formatUtils_1.formatTimestamp)(event.timestamp),
     ]);
-    const colWidths = headers.map((h, i) => Math.max(h.length, ...rows.map(r => r[i].length)));
-    const headerLine = headers.map((h, i) => h.padEnd(colWidths[i])).join('  ');
-    const separatorLine = colWidths.map(w => '-'.repeat(w)).join('  ');
-    const dataLines = rows.map(row => row.map((cell, i) => cell.padEnd(colWidths[i])).join('  '));
     const lines = [];
     if (options) {
         const metricDisplay = (0, metricNames_1.getMetricDisplayName)(options.metricName);
-        let timeDesc;
-        if (options.daysBack) {
-            timeDesc = `for the last ${options.daysBack} days`;
-        }
-        else if (options.startTime && options.endTime) {
-            timeDesc = `from ${formatDate(options.startTime)} to ${formatDate(options.endTime)}`;
-        }
-        else {
-            timeDesc = '';
-        }
+        const timeDesc = (0, formatUtils_1.buildTimeRangeDescription)(options);
         const totalDesc = options.totalEventCount != null
             ? ` — ${options.totalEventCount.toLocaleString()} total events`
             : '';
         lines.push(chalk_1.default.bold(`${metricDisplay} events ${timeDesc}${totalDesc}`.trim()), '');
     }
-    lines.push(chalk_1.default.bold(headerLine), separatorLine, ...dataLines);
+    lines.push((0, renderTextTable_1.default)(headers, rows));
     if (pageInfo.hasNextPage && pageInfo.endCursor) {
         lines.push('', `Next page: --after ${pageInfo.endCursor}`);
     }

package/build/observe/formatMetrics.js

@@ -10,6 +10,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const errors_1 = require("../commandUtils/errors");
 const platform_1 = require("../platform");
 const renderTextTable_1 = tslib_1.__importDefault(require("../utils/renderTextTable"));
+const formatUtils_1 = require("./formatUtils");
 const metricNames_1 = require("./metricNames");
 exports.STAT_ALIASES = {
     min: 'min',
@@ -105,12 +106,6 @@ function buildObserveMetricsJson(metricsMap, metricNames, stats, totalEventCount
 function buildStatsDescription(displayStats) {
     return displayStats.map(s => exports.STAT_DISPLAY_NAMES[s]).join(', ');
 }
-function buildTimeRangeDescription(daysBack) {
-    if (daysBack) {
-        return `for the last ${daysBack} days`;
-    }
-    return '';
-}
 function buildObserveMetricsTable(metricsMap, metricNames, stats, options) {
     const { versions: results } = buildObserveMetricsJson(metricsMap, metricNames, stats);
     if (results.length === 0) {
@@ -120,7 +115,7 @@ function buildObserveMetricsTable(metricsMap, metricNames, stats, options) {
     const hasEventCount = stats.includes('eventCount');
     // Build summary header
     const statsDesc = displayStats.length > 0 ? buildStatsDescription(displayStats) : 'Event count';
-    const timeDesc = buildTimeRangeDescription(options?.daysBack);
+    const timeDesc = (0, formatUtils_1.buildTimeRangeDescription)({ daysBack: options?.daysBack });
     const countSuffix = hasEventCount && displayStats.length > 0 ? ' (event count)' : '';
     const summaryLine = `${statsDesc} values${countSuffix}${timeDesc ? ` ${timeDesc}` : ''}`;
     // Group results by platform

package/build/observe/formatUtils.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Format an ISO timestamp for display in event tables (minute precision).
+ * Uses the runtime's default locale.
+ */
+export declare function formatTimestamp(isoString: string): string;
+/**
+ * Format an ISO timestamp for display in log tables (millisecond precision).
+ * Use this instead of formatTimestamp when the table represents individual
+ * log entries where sub-minute resolution matters. Uses the runtime's
+ * default locale.
+ */
+export declare function formatLogTimestamp(isoString: string): string;
+/**
+ * Format an ISO timestamp for display as a date only (no time). Uses the
+ * runtime's default locale.
+ */
+export declare function formatDate(isoString: string): string;
+/**
+ * Build the time-range fragment used in summary headers, e.g.
+ * "for the last 7 days" or "from Jan 1, 2025 to Feb 1, 2025".
+ * Returns an empty string when no range information is provided.
+ */
+export declare function buildTimeRangeDescription(options: {
+    daysBack?: number;
+    startTime?: string;
+    endTime?: string;
+}): string;

package/build/observe/formatUtils.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatTimestamp = formatTimestamp;
+exports.formatLogTimestamp = formatLogTimestamp;
+exports.formatDate = formatDate;
+exports.buildTimeRangeDescription = buildTimeRangeDescription;
+/**
+ * Format an ISO timestamp for display in event tables (minute precision).
+ * Uses the runtime's default locale.
+ */
+function formatTimestamp(isoString) {
+    const date = new Date(isoString);
+    return date.toLocaleDateString(undefined, {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+    });
+}
+/**
+ * Format an ISO timestamp for display in log tables (millisecond precision).
+ * Use this instead of formatTimestamp when the table represents individual
+ * log entries where sub-minute resolution matters. Uses the runtime's
+ * default locale.
+ */
+function formatLogTimestamp(isoString) {
+    const date = new Date(isoString);
+    return date.toLocaleDateString(undefined, {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit',
+        fractionalSecondDigits: 3,
+    });
+}
+/**
+ * Format an ISO timestamp for display as a date only (no time). Uses the
+ * runtime's default locale.
+ */
+function formatDate(isoString) {
+    const date = new Date(isoString);
+    return date.toLocaleDateString(undefined, {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+    });
+}
+/**
+ * Build the time-range fragment used in summary headers, e.g.
+ * "for the last 7 days" or "from Jan 1, 2025 to Feb 1, 2025".
+ * Returns an empty string when no range information is provided.
+ */
+function buildTimeRangeDescription(options) {
+    if (options.daysBack) {
+        return `for the last ${options.daysBack} days`;
+    }
+    if (options.startTime && options.endTime) {
+        return `from ${formatDate(options.startTime)} to ${formatDate(options.endTime)}`;
+    }
+    return '';
+}

package/build/observe/formatVersions.js

@@ -6,14 +6,7 @@ const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const platform_1 = require("../platform");
 const renderTextTable_1 = tslib_1.__importDefault(require("../utils/renderTextTable"));
-function formatDate(isoString) {
-    const date = new Date(isoString);
-    return date.toLocaleDateString('en-US', {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-    });
-}
+const formatUtils_1 = require("./formatUtils");
 function mapEasBuilds(easBuilds) {
     return easBuilds.map(b => ({
         easBuildId: b.easBuildId,
@@ -74,7 +67,7 @@ function buildObserveVersionsTable(results) {
         sections.push(chalk_1.default.bold(platform_1.appPlatformDisplayNames[platform]));
         const rows = appVersions.map(version => [
             version.appVersion,
-            formatDate(version.firstSeenAt),
+            (0, formatUtils_1.formatDate)(version.firstSeenAt),
             String(version.eventCount),
             String(version.uniqueUserCount),
             String(version.buildNumbers.length),

package/build/observe/platforms.d.ts

@@ -0,0 +1,21 @@
+import { AppObservePlatform, AppPlatform } from '../graphql/generated';
+/**
+ * Allowed values for the --platform flag in observe commands.
+ * Derived from the AppObservePlatform enum so new platforms added on
+ * the server are automatically picked up.
+ */
+export declare const allowedPlatformFlagValues: string[];
+type PlatformFlagValue = (typeof allowedPlatformFlagValues)[number];
+/**
+ * Resolve a single AppObservePlatform from a --platform flag value.
+ * Returns undefined when no flag was provided.
+ */
+export declare function appObservePlatformFromFlag(flag: PlatformFlagValue | undefined): AppObservePlatform | undefined;
+/**
+ * Resolve a list of AppPlatform values from a --platform flag value.
+ * Returns the single matching platform when a flag is provided, or all
+ * known platforms when no flag is provided (so the caller queries every
+ * platform).
+ */
+export declare function appPlatformsFromFlag(flag: PlatformFlagValue | undefined): AppPlatform[];
+export {};

package/build/observe/platforms.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allowedPlatformFlagValues = void 0;
+exports.appObservePlatformFromFlag = appObservePlatformFromFlag;
+exports.appPlatformsFromFlag = appPlatformsFromFlag;
+const generated_1 = require("../graphql/generated");
+/**
+ * Allowed values for the --platform flag in observe commands.
+ * Derived from the AppObservePlatform enum so new platforms added on
+ * the server are automatically picked up.
+ */
+exports.allowedPlatformFlagValues = Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase());
+const defaultAppObservePlatform = generated_1.AppObservePlatform.Ios;
+const defaultAppPlatform = generated_1.AppPlatform.Ios;
+/**
+ * Resolve a single AppObservePlatform from a --platform flag value.
+ * Returns undefined when no flag was provided.
+ */
+function appObservePlatformFromFlag(flag) {
+    if (!flag) {
+        return undefined;
+    }
+    switch (flag) {
+        case 'android':
+            return generated_1.AppObservePlatform.Android;
+        case 'ios':
+            return generated_1.AppObservePlatform.Ios;
+    }
+    return defaultAppObservePlatform;
+}
+/**
+ * Resolve a list of AppPlatform values from a --platform flag value.
+ * Returns the single matching platform when a flag is provided, or all
+ * known platforms when no flag is provided (so the caller queries every
+ * platform).
+ */
+function appPlatformsFromFlag(flag) {
+    if (!flag) {
+        return [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+    }
+    switch (flag) {
+        case 'android':
+            return [generated_1.AppPlatform.Android];
+        case 'ios':
+            return [generated_1.AppPlatform.Ios];
+    }
+    return [defaultAppPlatform];
+}

package/build/observe/resolveProjectContext.d.ts

@@ -0,0 +1,22 @@
+import EasCommand, { ContextInput } from '../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+/**
+ * Shared context resolution for observe commands.
+ *
+ * If `projectIdOverride` is provided (typically via `--project-id`), the
+ * helper only requires the LoggedIn context (so the command can run outside
+ * of a project directory). Otherwise it uses the full context definition,
+ * which derives the project ID from the local app config.
+ */
+export declare function resolveObserveCommandContextAsync({ command, commandClass, loggedInOnlyContextDefinition, projectIdOverride, nonInteractive, }: {
+    command: EasCommand;
+    commandClass: {
+        contextDefinition: ContextInput<any>;
+    };
+    loggedInOnlyContextDefinition: ContextInput<any>;
+    projectIdOverride?: string;
+    nonInteractive: boolean;
+}): Promise<{
+    projectId: string;
+    graphqlClient: ExpoGraphqlClient;
+}>;

package/build/observe/resolveProjectContext.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveObserveCommandContextAsync = resolveObserveCommandContextAsync;
+/**
+ * Shared context resolution for observe commands.
+ *
+ * If `projectIdOverride` is provided (typically via `--project-id`), the
+ * helper only requires the LoggedIn context (so the command can run outside
+ * of a project directory). Otherwise it uses the full context definition,
+ * which derives the project ID from the local app config.
+ */
+async function resolveObserveCommandContextAsync({ command, commandClass, loggedInOnlyContextDefinition, projectIdOverride, nonInteractive, }) {
+    // `getContextAsync` is `protected` on EasCommand; cast to access from this helper.
+    const commandWithContextAccess = command;
+    if (projectIdOverride) {
+        const ctx = await commandWithContextAccess.getContextAsync({ contextDefinition: loggedInOnlyContextDefinition }, { nonInteractive });
+        return { projectId: projectIdOverride, graphqlClient: ctx.loggedIn.graphqlClient };
+    }
+    const ctx = await commandWithContextAccess.getContextAsync(commandClass, { nonInteractive });
+    return { projectId: ctx.projectId, graphqlClient: ctx.loggedIn.graphqlClient };
+}

package/build/run/ios/run.d.ts

@@ -1 +1,2 @@
-export declare function runAppOnIosSimulatorAsync(appPath: string): Promise<void>;
+export type SimulatorRunTarget = true | string | undefined;
+export declare function runAppOnIosSimulatorAsync(appPath: string, simulatorRunTarget?: SimulatorRunTarget): Promise<void>;

package/build/run/ios/run.js

@@ -6,9 +6,13 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const simulator = tslib_1.__importStar(require("./simulator"));
 const systemRequirements_1 = require("./systemRequirements");
-async function runAppOnIosSimulatorAsync(appPath) {
+async function runAppOnIosSimulatorAsync(appPath, simulatorRunTarget) {
     await (0, systemRequirements_1.validateSystemRequirementsAsync)();
-    const selectedSimulator = await simulator.selectSimulatorAsync();
+    const selectedSimulator = simulatorRunTarget === true
+        ? await simulator.selectSimulatorAsync({ forcePrompt: true })
+        : simulatorRunTarget
+            ? await simulator.getIosSimulatorByIdOrNameAsync(simulatorRunTarget)
+            : await simulator.selectSimulatorAsync();
     await simulator.ensureSimulatorBootedAsync(selectedSimulator);
     await simulator.ensureSimulatorAppOpenedAsync(selectedSimulator.udid);
     const bundleIdentifier = await getAppBundleIdentifierAsync(appPath);

package/build/run/ios/simulator.d.ts

@@ -9,7 +9,10 @@ interface IosSimulator {
     udid: string;
     lastBootedAt?: Date;
 }
-export declare function selectSimulatorAsync(): Promise<IosSimulator>;
+export declare function selectSimulatorAsync({ forcePrompt, }?: {
+    forcePrompt?: boolean;
+}): Promise<IosSimulator>;
+export declare function getIosSimulatorByIdOrNameAsync(simulator: string): Promise<IosSimulator>;
 export declare function getFirstBootedIosSimulatorAsync(): Promise<IosSimulator | undefined>;
 export declare function getAvaliableIosSimulatorsListAsync(query?: string): Promise<IosSimulator[]>;
 export declare function ensureSimulatorBootedAsync(simulator: IosSimulator): Promise<void>;

package/build/run/ios/simulator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectSimulatorAsync = selectSimulatorAsync;
+exports.getIosSimulatorByIdOrNameAsync = getIosSimulatorByIdOrNameAsync;
 exports.getFirstBootedIosSimulatorAsync = getFirstBootedIosSimulatorAsync;
 exports.getAvaliableIosSimulatorsListAsync = getAvaliableIosSimulatorsListAsync;
 exports.ensureSimulatorBootedAsync = ensureSimulatorBootedAsync;
@@ -16,8 +17,8 @@ const simctl_1 = require("./simctl");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
 const promise_1 = require("../../utils/promise");
-async function selectSimulatorAsync() {
-    const bootedSimulator = await getFirstBootedIosSimulatorAsync();
+async function selectSimulatorAsync({ forcePrompt = false, } = {}) {
+    const bootedSimulator = forcePrompt ? undefined : await getFirstBootedIosSimulatorAsync();
     if (bootedSimulator) {
         return bootedSimulator;
     }
@@ -32,6 +33,17 @@ async function selectSimulatorAsync() {
             value: simulator,
         })),
     });
+    if (!selectedSimulator) {
+        throw new Error('No simulator selected.');
+    }
+    return selectedSimulator;
+}
+async function getIosSimulatorByIdOrNameAsync(simulator) {
+    const simulators = await getAvaliableIosSimulatorsListAsync();
+    const selectedSimulator = simulators.find(availableSimulator => availableSimulator.udid === simulator || availableSimulator.name === simulator);
+    if (!selectedSimulator) {
+        throw new Error(`Could not find an available iOS simulator with name or UDID "${simulator}".`);
+    }
     return selectedSimulator;
 }
 async function getFirstBootedIosSimulatorAsync() {

package/build/run/run.d.ts

@@ -1,3 +1,4 @@
+import { SimulatorRunTarget } from './ios/run';
 import { AppPlatform } from '../graphql/generated';
 export interface RunArchiveFlags {
     latest?: boolean;
@@ -5,5 +6,5 @@ export interface RunArchiveFlags {
     path?: string;
     url?: string;
 }
-export declare function runAsync(simulatorBuildPath: string, selectedPlatform: AppPlatform): Promise<void>;
+export declare function runAsync(simulatorBuildPath: string, selectedPlatform: AppPlatform, simulator?: SimulatorRunTarget): Promise<void>;
 export declare function getEasBuildRunCachedAppPath(projectId: string, buildId: string, platform: AppPlatform): string;

package/build/run/run.js

@@ -8,9 +8,9 @@ const run_1 = require("./android/run");
 const run_2 = require("./ios/run");
 const generated_1 = require("../graphql/generated");
 const paths_1 = require("../utils/paths");
-async function runAsync(simulatorBuildPath, selectedPlatform) {
+async function runAsync(simulatorBuildPath, selectedPlatform, simulator) {
     if (selectedPlatform === generated_1.AppPlatform.Ios) {
-        await (0, run_2.runAppOnIosSimulatorAsync)(simulatorBuildPath);
+        await (0, run_2.runAppOnIosSimulatorAsync)(simulatorBuildPath, simulator);
     }
     else {
         await (0, run_1.runAppOnAndroidEmulatorAsync)(simulatorBuildPath);