eas-cli 2.0.0 → 2.2.0

package/build/devices/context.d.ts

@@ -1,14 +1,12 @@
-import { ExpoConfig } from '@expo/config';
 import AppStoreApi from '../credentials/ios/appstore/AppStoreApi';
 import { Actor } from '../user/User';
 export interface DeviceManagerContext {
     appStore: AppStoreApi;
-    exp: ExpoConfig | null;
-    projectDir: string | null;
     user: Actor;
+    projectId: string | null;
 }
-export declare function createContextAsync({ appStore, cwd, user, }: {
+export declare function createContextAsync({ appStore, user, projectId, }: {
     appStore: AppStoreApi;
-    cwd?: string;
     user: Actor;
+    projectId: string | undefined;
 }): Promise<DeviceManagerContext>;

package/build/devices/context.js

@@ -1,20 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createContextAsync = void 0;
-const config_1 = require("@expo/config");
-const projectUtils_1 = require("../project/projectUtils");
-async function createContextAsync({ appStore, cwd, user, }) {
-    const projectDir = await (0, projectUtils_1.findProjectRootAsync)({ cwd });
-    let exp = null;
-    if (projectDir) {
-        const config = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
-        exp = config.exp;
-    }
+async function createContextAsync({ appStore, user, projectId, }) {
     return {
         appStore,
-        projectDir,
-        exp,
         user,
+        projectId: projectId !== null && projectId !== void 0 ? projectId : null,
     };
 }
 exports.createContextAsync = createContextAsync;

package/build/devices/manager.d.ts

@@ -1,5 +1,4 @@
-import { ExpoConfig } from '@expo/config';
-import { Account } from '../user/Account';
+import { AccountFragment } from '../graphql/generated';
 import { Actor } from '../user/User';
 import { DeviceManagerContext } from './context';
 export default class DeviceManager {
@@ -9,10 +8,10 @@ export default class DeviceManager {
     private resolveAccountAsync;
 }
 export declare class AccountResolver {
-    private exp;
+    private projectId;
     private user;
-    constructor(exp: ExpoConfig | null, user: Actor);
-    resolveAccountAsync(): Promise<Account>;
+    constructor(projectId: string | null, user: Actor);
+    resolveAccountAsync(): Promise<AccountFragment>;
     private resolveProjectAccountAsync;
     private promptForAccountAsync;
 }

package/build/devices/manager.js

@@ -9,11 +9,9 @@ const AppleTeamQuery_1 = require("../credentials/ios/api/graphql/queries/AppleTe
 const log_1 = tslib_1.__importDefault(require("../log"));
 const projectUtils_1 = require("../project/projectUtils");
 const prompts_1 = require("../prompts");
-const Account_1 = require("../user/Account");
-const User_1 = require("../user/User");
 const action_1 = tslib_1.__importDefault(require("./actions/create/action"));
 const CREATE_COMMAND_DESCRIPTION = `This command lets you register your Apple devices (iPhones and iPads) for internal distribution of your app.
-Internal distribution means that you won't need upload your app archive to App Store / Testflight.
+Internal distribution means that you won't need to upload your app archive to App Store / Testflight.
 Your app archive (.ipa) will be installable on your equipment as long as you sign your application with an adhoc provisiong profile.
 The provisioning profile needs to contain the UDIDs (unique identifiers) of your iPhones and iPads.
 
@@ -36,18 +34,18 @@ class DeviceManager {
         await action.runAsync();
     }
     async resolveAccountAsync() {
-        const resolver = new AccountResolver(this.ctx.exp, this.ctx.user);
+        const resolver = new AccountResolver(this.ctx.projectId, this.ctx.user);
         return await resolver.resolveAccountAsync();
     }
 }
 exports.default = DeviceManager;
 class AccountResolver {
-    constructor(exp, user) {
-        this.exp = exp;
+    constructor(projectId, user) {
+        this.projectId = projectId;
         this.user = user;
     }
     async resolveAccountAsync() {
-        if (this.exp) {
+        if (this.projectId) {
             const account = await this.resolveProjectAccountAsync();
             if (account) {
                 return account;
@@ -56,17 +54,12 @@ class AccountResolver {
         return await this.promptForAccountAsync();
     }
     async resolveProjectAccountAsync() {
-        (0, assert_1.default)(this.exp, 'expo config is not set');
-        const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(this.exp);
-        const projectAccount = (0, Account_1.findAccountByName)(this.user.accounts, projectAccountName);
-        if (!projectAccount) {
-            log_1.default.warn(`Your account (${(0, User_1.getActorDisplayName)(this.user)}) doesn't have access to the ${chalk_1.default.bold(projectAccountName)} account`);
-            return;
-        }
+        (0, assert_1.default)(this.projectId, 'expo config is not set');
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(this.projectId);
         const useProjectAccount = await (0, prompts_1.confirmAsync)({
-            message: `You're inside the project directory. Would you like to use ${chalk_1.default.underline(projectAccountName)} account?`,
+            message: `You're inside the project directory. Would you like to use the ${chalk_1.default.underline(account.name)} account?`,
         });
-        return useProjectAccount ? projectAccount : undefined;
+        return useProjectAccount ? account : undefined;
     }
     async promptForAccountAsync() {
         const choices = this.user.accounts.map(account => ({

package/build/devices/queries.d.ts

@@ -0,0 +1,21 @@
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { AppleDeviceFragment, AppleTeamFragment } from '../graphql/generated';
+import { AppleTeamIdAndName } from './utils/formatDevice';
+export declare const TEAMS_LIMIT = 50;
+export declare const DEVICES_LIMIT = 50;
+export declare function selectAppleTeamOnAccountAsync({ accountName, selectionPromptTitle, paginatedQueryOptions, }: {
+    accountName: string;
+    selectionPromptTitle: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<AppleTeamFragment>;
+export declare function selectAppleDeviceOnAppleTeamAsync({ accountName, appleTeamIdentifier, selectionPromptTitle, paginatedQueryOptions, }: {
+    accountName: string;
+    appleTeamIdentifier: string;
+    selectionPromptTitle: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<AppleDeviceFragment>;
+export declare function listAndRenderAppleDevicesOnAppleTeamAsync({ accountName, appleTeam, paginatedQueryOptions, }: {
+    accountName: string;
+    appleTeam: AppleTeamIdAndName;
+    paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void>;

package/build/devices/queries.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listAndRenderAppleDevicesOnAppleTeamAsync = exports.selectAppleDeviceOnAppleTeamAsync = exports.selectAppleTeamOnAccountAsync = exports.DEVICES_LIMIT = exports.TEAMS_LIMIT = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const AppleTeamFormatting_1 = require("../credentials/ios/actions/AppleTeamFormatting");
+const DeviceUtils_1 = require("../credentials/ios/actions/DeviceUtils");
+const AppleDeviceQuery_1 = require("../credentials/ios/api/graphql/queries/AppleDeviceQuery");
+const AppleTeamQuery_1 = require("../credentials/ios/api/graphql/queries/AppleTeamQuery");
+const log_1 = tslib_1.__importDefault(require("../log"));
+const json_1 = require("../utils/json");
+const queries_1 = require("../utils/queries");
+const formatDevice_1 = tslib_1.__importDefault(require("./utils/formatDevice"));
+exports.TEAMS_LIMIT = 50;
+exports.DEVICES_LIMIT = 50;
+async function selectAppleTeamOnAccountAsync({ accountName, selectionPromptTitle, paginatedQueryOptions, }) {
+    var _a;
+    if (paginatedQueryOptions.nonInteractive) {
+        throw new Error('Unable to select an Apple team in non-interactive mode.');
+    }
+    else {
+        const selectedAppleTeam = await (0, queries_1.paginatedQueryWithSelectPromptAsync)({
+            limit: (_a = paginatedQueryOptions.limit) !== null && _a !== void 0 ? _a : exports.TEAMS_LIMIT,
+            offset: paginatedQueryOptions.offset,
+            queryToPerform: (limit, offset) => AppleTeamQuery_1.AppleTeamQuery.getAllForAccountAsync({
+                accountName,
+                limit,
+                offset,
+            }),
+            promptOptions: {
+                title: selectionPromptTitle,
+                createDisplayTextForSelectionPromptListItem: appleTeam => appleTeam.appleTeamName
+                    ? `${appleTeam.appleTeamName} (ID: ${appleTeam.appleTeamIdentifier})`
+                    : appleTeam.appleTeamIdentifier,
+                getIdentifierForQueryItem: appleTeam => appleTeam.id,
+            },
+        });
+        if (!selectedAppleTeam) {
+            throw new Error(`Couldn't find any teams for the account ${accountName}`);
+        }
+        return selectedAppleTeam;
+    }
+}
+exports.selectAppleTeamOnAccountAsync = selectAppleTeamOnAccountAsync;
+async function selectAppleDeviceOnAppleTeamAsync({ accountName, appleTeamIdentifier, selectionPromptTitle, paginatedQueryOptions, }) {
+    var _a;
+    if (paginatedQueryOptions.nonInteractive) {
+        throw new Error('Unable to select an Apple device in non-interactive mode.');
+    }
+    else {
+        const selectedAppleDevice = await (0, queries_1.paginatedQueryWithSelectPromptAsync)({
+            limit: (_a = paginatedQueryOptions.limit) !== null && _a !== void 0 ? _a : exports.DEVICES_LIMIT,
+            offset: paginatedQueryOptions.offset,
+            queryToPerform: (limit, offset) => AppleDeviceQuery_1.AppleDeviceQuery.getAllForAppleTeamAsync({
+                accountName,
+                appleTeamIdentifier,
+                limit,
+                offset,
+            }),
+            promptOptions: {
+                title: selectionPromptTitle,
+                createDisplayTextForSelectionPromptListItem: appleDevice => (0, DeviceUtils_1.formatDeviceLabel)(appleDevice),
+                getIdentifierForQueryItem: appleTeam => appleTeam.id,
+            },
+        });
+        if (!selectedAppleDevice) {
+            throw new Error(`Couldn't find any devices on the Apple team with the id ${appleTeamIdentifier}`);
+        }
+        return selectedAppleDevice;
+    }
+}
+exports.selectAppleDeviceOnAppleTeamAsync = selectAppleDeviceOnAppleTeamAsync;
+async function listAndRenderAppleDevicesOnAppleTeamAsync({ accountName, appleTeam, paginatedQueryOptions, }) {
+    var _a;
+    if (paginatedQueryOptions.nonInteractive) {
+        const devices = await AppleDeviceQuery_1.AppleDeviceQuery.getAllForAppleTeamAsync({
+            accountName,
+            appleTeamIdentifier: appleTeam.appleTeamIdentifier,
+            offset: paginatedQueryOptions.offset,
+            limit: paginatedQueryOptions.limit,
+        });
+        renderPageOfAppleDevices({ devices, appleTeam, paginatedQueryOptions });
+    }
+    else {
+        await (0, queries_1.paginatedQueryWithConfirmPromptAsync)({
+            limit: (_a = paginatedQueryOptions.limit) !== null && _a !== void 0 ? _a : exports.DEVICES_LIMIT,
+            offset: paginatedQueryOptions.offset,
+            queryToPerform: (limit, offset) => AppleDeviceQuery_1.AppleDeviceQuery.getAllForAppleTeamAsync({
+                accountName,
+                appleTeamIdentifier: appleTeam.appleTeamIdentifier,
+                limit,
+                offset,
+            }),
+            promptOptions: {
+                title: 'Load more devices?',
+                renderListItems: devices => renderPageOfAppleDevices({ devices, appleTeam, paginatedQueryOptions }),
+            },
+        });
+    }
+}
+exports.listAndRenderAppleDevicesOnAppleTeamAsync = listAndRenderAppleDevicesOnAppleTeamAsync;
+function renderPageOfAppleDevices({ devices, appleTeam, paginatedQueryOptions, }) {
+    if (paginatedQueryOptions.json) {
+        (0, json_1.printJsonOnlyOutput)(devices);
+    }
+    else {
+        if (devices.length === 0) {
+            log_1.default.log(`Could not find devices on Apple team -- ${(0, AppleTeamFormatting_1.formatAppleTeam)({
+                appleTeamIdentifier: appleTeam.appleTeamIdentifier,
+                appleTeamName: appleTeam.appleTeamName,
+            })}`);
+        }
+        else {
+            const list = devices
+                .map(device => (0, formatDevice_1.default)(device, appleTeam))
+                .join(`\n\n${chalk_1.default.dim('———')}\n\n`);
+            log_1.default.log(`\n${list}`);
+            log_1.default.addNewLineIfNone();
+        }
+    }
+}

package/build/devices/utils/errors.d.ts

@@ -0,0 +1,3 @@
+export declare class DeviceNotFoundError extends Error {
+    constructor(message?: string);
+}

package/build/devices/utils/errors.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceNotFoundError = void 0;
+class DeviceNotFoundError extends Error {
+    constructor(message) {
+        super(message !== null && message !== void 0 ? message : 'Device not found.');
+    }
+}
+exports.DeviceNotFoundError = DeviceNotFoundError;

package/build/devices/utils/formatDevice.d.ts

@@ -1,5 +1,5 @@
 import { AppleDevice, AppleTeam } from '../../graphql/generated';
-declare type Device = Pick<AppleDevice, 'id' | 'identifier' | 'name' | 'deviceClass' | 'enabled'>;
-declare type Team = Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName'>;
-export default function formatDevice(device: Device, team?: Team): string;
+declare type Device = Pick<AppleDevice, 'id' | 'identifier' | 'name' | 'deviceClass' | 'enabled' | 'model'>;
+export declare type AppleTeamIdAndName = Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName'>;
+export default function formatDevice(device: Device, team?: AppleTeamIdAndName): string;
 export {};

package/build/devices/utils/formatDevice.js

@@ -3,17 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 function formatDevice(device, team) {
-    var _a, _b, _c;
+    var _a, _b;
     const fields = [
         { label: 'ID', value: device.id },
         { label: 'Name', value: (_a = device.name) !== null && _a !== void 0 ? _a : 'Unknown' },
-        { label: 'Class', value: (_b = device.deviceClass) !== null && _b !== void 0 ? _b : 'Unknown' },
+        {
+            label: 'Class',
+            value: device.deviceClass
+                ? `${device.deviceClass}${device.model ? ` ${device.model}` : ''}`
+                : 'Unknown',
+        },
         { label: 'UDID', value: device.identifier },
     ];
     if (team) {
         fields.push(...[
             { label: 'Apple Team ID', value: team.appleTeamIdentifier },
-            { label: 'Apple Team Name', value: (_c = team.appleTeamName) !== null && _c !== void 0 ? _c : 'Unknown' },
+            { label: 'Apple Team Name', value: (_b = team.appleTeamName) !== null && _b !== void 0 ? _b : 'Unknown' },
         ]);
     }
     return (0, formatFields_1.default)(fields);