[eas-cli] add account type to project owner prompt

CHANGELOG.md

@@ -8,6 +8,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Add account type to the items in the prompt to select project owner. ([#2083](https://github.com/expo/eas-cli/pull/2083) by [@alanjhughes](https://github.com/alanjhughes))
+
 ### 🐛 Bug fixes
 
 ### 🧹 Chores

packages/eas-cli/src/commands/project/init.ts

@@ -16,7 +16,7 @@ import { ora } from '../../ora';
 import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../project/projectUtils';
-import { confirmAsync, promptAsync } from '../../prompts';
+import { Choice, confirmAsync, promptAsync } from '../../prompts';
 import { Actor } from '../../user/User';
 
 type InitializeMethodOptions = {
@@ -234,21 +234,11 @@ export default class ProjectInit extends EasCommand {
       if (allAccounts.length === 1) {
         accountName = allAccounts[0].name;
       } else {
-        // if regular user, put primary account first
-        const sortedAccounts =
-          actor.__typename === 'Robot'
-            ? allAccounts
-            : [...allAccounts].sort((a, _b) =>
-                actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
-              );
-
-        const choices = sortedAccounts.map(account => ({
-          title: account.name,
-          value: account,
-          description: !accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(account.name)
-            ? '(Viewer Role)'
-            : undefined,
-        }));
+        const choices = ProjectInit.getAccountChoices(
+          actor,
+          accountNamesWhereUserHasSufficientPermissionsToCreateApp
+        );
+
         accountName = (
           await promptAsync({
             type: 'select',
@@ -321,6 +311,71 @@ export default class ProjectInit extends EasCommand {
     return createdProjectId;
   }
 
+  private static getAccountChoices(
+    actor: Actor,
+    namesWithSufficientPermissions: Set<string>
+  ): Choice[] {
+    const allAccounts = actor.accounts;
+
+    const sortedAccounts =
+      actor.__typename === 'Robot'
+        ? allAccounts
+        : [...allAccounts].sort((a, _b) =>
+            actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
+          );
+
+    if (actor.__typename !== 'Robot') {
+      const personalAccount = allAccounts?.find(
+        account => account?.ownerUserActor?.id === actor.id
+      );
+
+      const personalAccountChoice = personalAccount
+        ? {
+            title: personalAccount.name,
+            value: personalAccount,
+            description: !namesWithSufficientPermissions.has(personalAccount.name)
+              ? '(Personal) (Viewer Role)'
+              : '(Personal)',
+          }
+        : undefined;
+
+      const userAccounts = allAccounts
+        ?.filter(account => account.ownerUserActor && account.name !== actor.username)
+        .map(account => ({
+          title: account.name,
+          value: account,
+          description: !namesWithSufficientPermissions.has(account.name)
+            ? '(Team) (Viewer Role)'
+            : '(Team)',
+        }));
+
+      const organizationAccounts = allAccounts
+        ?.filter(account => account.name !== actor.username && !account.ownerUserActor)
+        .map(account => ({
+          title: account.name,
+          value: account,
+          description: !namesWithSufficientPermissions.has(account.name)
+            ? '(Organization) (Viewer Role)'
+            : '(Organization)',
+        }));
+
+      let choices: Choice[] = [];
+      if (personalAccountChoice) {
+        choices = [personalAccountChoice];
+      }
+
+      return [...choices, ...userAccounts, ...organizationAccounts].sort((a, _b) =>
+        actor.__typename === 'User' ? (a.value.name === actor.username ? -1 : 1) : 0
+      );
+    }
+
+    return sortedAccounts.map(account => ({
+      title: account.name,
+      value: account,
+      description: !namesWithSufficientPermissions.has(account.name) ? '(Viewer Role)' : undefined,
+    }));
+  }
+
   async runAsync(): Promise<void> {
     const {
       flags: { id: idArgument, force, 'non-interactive': nonInteractive },