[eas-cli] add simplified projectId-focused context (#2653)

<!-- If this PR requires a changelog entry, add it by commenting the PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`. -->
<!-- You can skip the changelog check by labeling the PR with "no changelog". -->

# Why

As suggested in the base PR we need a simple context focused on only getting the project ID, without specifying the server-side environment and resolving Expo config with it.

# How

Add such context. Make the `withServerSideEnvironment` argument required for standard project config context.

# Test Plan

Tests, test manually

packages/eas-cli/src/commandUtils/EasCommand.ts

@@ -16,6 +16,7 @@ import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
 import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
 import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
+import { ProjectIdContextField } from './context/ProjectIdContextField';
 import { ServerSideEnvironmentVariablesContextField } from './context/ServerSideEnvironmentVariablesContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import VcsClientContextField from './context/VcsClientContextField';
@@ -140,6 +141,12 @@ export default abstract class EasCommand extends Command {
       // eslint-disable-next-line async-protect/async-suffix
       getServerSideEnvironmentVariablesAsync: new ServerSideEnvironmentVariablesContextField(),
     },
+    /**
+     * Require the project to be identified and registered on server. Returns the project ID evaluated from the app config.
+     */
+    ProjectId: {
+      projectId: new ProjectIdContextField(),
+    },
   };
 
   /**
@@ -181,6 +188,7 @@ export default abstract class EasCommand extends Command {
       // to resolve dynamic config (if dynamic config context is used) and enable getServerSideEnvironmentVariablesAsync function (if server side environment variables context is used)
       withServerSideEnvironment,
     }: C extends
+      | GetContextType<typeof EasCommand.ContextOptions.ProjectConfig>
       | GetContextType<typeof EasCommand.ContextOptions.DynamicProjectConfig>
       | GetContextType<typeof EasCommand.ContextOptions.OptionalProjectConfig>
       | GetContextType<typeof EasCommand.ContextOptions.ServerSideEnvironmentVariables>

packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts

@@ -1,16 +1,22 @@
 import { ExpoConfig } from '@expo/config';
 
 import ContextField, { ContextOptions } from './ContextField';
+import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
 import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class PrivateProjectConfigContextField extends ContextField<{
   projectId: string;
   exp: ExpoConfig;
   projectDir: string;
 }> {
-  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
+  async getValueAsync({
+    nonInteractive,
+    sessionManager,
+    withServerSideEnvironment,
+  }: ContextOptions): Promise<{
     projectId: string;
     exp: ExpoConfig;
     projectDir: string;
@@ -20,7 +26,20 @@ export class PrivateProjectConfigContextField extends ContextField<{
     const projectId = await getProjectIdAsync(sessionManager, expBefore, {
       nonInteractive,
     });
-    const exp = getPrivateExpoConfig(projectDir);
+    let serverSideEnvVars: Record<string, string> | undefined;
+    if (withServerSideEnvironment) {
+      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
+        nonInteractive,
+      });
+      const graphqlClient = createGraphqlClient(authenticationInfo);
+      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
+        environment: withServerSideEnvironment,
+        projectId,
+        graphqlClient,
+      });
+      serverSideEnvVars = serverSideEnvironmentVariables;
+    }
+    const exp = getPrivateExpoConfig(projectDir, { env: serverSideEnvVars });
 
     return {
       projectId,

packages/eas-cli/src/commandUtils/context/ProjectIdContextField.ts

@@ -0,0 +1,15 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+import { getPrivateExpoConfig } from '../../project/expoConfig';
+
+export class ProjectIdContextField extends ContextField<string> {
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<string> {
+    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
+    const expBefore = getPrivateExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
+      nonInteractive,
+    });
+    return projectId;
+  }
+}

packages/eas-cli/src/commands/branch/create.ts

@@ -25,7 +25,7 @@ export default class BranchCreate extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -36,7 +36,7 @@ export default class BranchCreate extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(BranchCreate);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
       vcsClient,
     } = await this.getContextAsync(BranchCreate, {

packages/eas-cli/src/commands/branch/delete.ts

@@ -79,7 +79,7 @@ export default class BranchDelete extends EasCommand {
   static override description = 'delete a branch';
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -108,7 +108,7 @@ export default class BranchDelete extends EasCommand {
     }
 
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchDelete, { nonInteractive });
     const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

packages/eas-cli/src/commands/branch/list.ts

@@ -13,14 +13,14 @@ export default class BranchList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BranchList);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchList, {
       nonInteractive: flags['non-interactive'],

packages/eas-cli/src/commands/branch/rename.ts

@@ -63,7 +63,7 @@ export default class BranchRename extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -72,7 +72,7 @@ export default class BranchRename extends EasCommand {
       flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
     } = await this.parse(BranchRename);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchRename, {
       nonInteractive,

packages/eas-cli/src/commands/branch/view.ts

@@ -27,7 +27,7 @@ export default class BranchView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -38,7 +38,7 @@ export default class BranchView extends EasCommand {
     } = await this.parse(BranchView);
     const { 'non-interactive': nonInteractive } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchView, {
       nonInteractive,

packages/eas-cli/src/commands/build/cancel.ts

@@ -110,7 +110,7 @@ export default class BuildCancel extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -128,7 +128,7 @@ export default class BuildCancel extends EasCommand {
     }
 
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildCancel, {
       nonInteractive,

packages/eas-cli/src/commands/build/configure.ts

@@ -38,6 +38,7 @@ export default class BuildConfigure extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
+      withServerSideEnvironment: null,
     });
 
     Log.log(

packages/eas-cli/src/commands/build/delete.ts

@@ -94,7 +94,7 @@ export default class BuildDelete extends EasCommand {
     }),
   };
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -112,7 +112,7 @@ export default class BuildDelete extends EasCommand {
     }
 
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildDelete, { nonInteractive });
     const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

packages/eas-cli/src/commands/build/list.ts

@@ -72,7 +72,7 @@ export default class BuildList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -99,7 +99,7 @@ export default class BuildList extends EasCommand {
       process.exit(1);
     }
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildList, {
       nonInteractive,

packages/eas-cli/src/commands/build/run.ts

@@ -79,8 +79,7 @@ export default class Run extends EasCommand {
 
   static override contextDefinition = {
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.Vcs,
   };
 
@@ -90,7 +89,7 @@ export default class Run extends EasCommand {
     const queryOptions = getPaginatedQueryOptions(flags);
     const {
       loggedIn: { graphqlClient },
-      privateProjectConfig: { projectId },
+      projectId,
     } = await this.getContextAsync(Run, {
       nonInteractive: false,
     });

packages/eas-cli/src/commands/build/view.ts

@@ -18,7 +18,7 @@ export default class BuildView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -29,7 +29,7 @@ export default class BuildView extends EasCommand {
       flags,
     } = await this.parse(BuildView);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildView, {
       nonInteractive: true,

packages/eas-cli/src/commands/channel/create.ts

@@ -23,7 +23,7 @@ export default class ChannelCreate extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -33,7 +33,7 @@ export default class ChannelCreate extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelCreate);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelCreate, {
       nonInteractive,

packages/eas-cli/src/commands/channel/delete.ts

@@ -31,7 +31,7 @@ export default class ChannelDelete extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -41,7 +41,7 @@ export default class ChannelDelete extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelDelete);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelDelete, {
       nonInteractive,

packages/eas-cli/src/commands/channel/edit.ts

@@ -74,7 +74,7 @@ export default class ChannelEdit extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -84,7 +84,7 @@ export default class ChannelEdit extends EasCommand {
       flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelEdit);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelEdit, {
       nonInteractive,

packages/eas-cli/src/commands/channel/list.ts

@@ -18,7 +18,7 @@ export default class ChannelList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -27,7 +27,7 @@ export default class ChannelList extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelList, {
       nonInteractive,

packages/eas-cli/src/commands/channel/pause.ts

@@ -66,7 +66,7 @@ export default class ChannelPause extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -76,7 +76,7 @@ export default class ChannelPause extends EasCommand {
       flags: { json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelPause);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelPause, {
       nonInteractive,

packages/eas-cli/src/commands/channel/resume.ts

@@ -66,7 +66,7 @@ export default class ChannelResume extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -76,7 +76,7 @@ export default class ChannelResume extends EasCommand {
       flags: { json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelResume);
     const {
-      privateProjectConfig: { projectId },
+      projectId,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelResume, {
       nonInteractive,

packages/eas-cli/src/commands/channel/rollout.ts

@@ -138,6 +138,7 @@ export default class ChannelRollout extends EasCommand {
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelRollout, {
       nonInteractive: argsAndFlags.nonInteractive,
+      withServerSideEnvironment: null,
     });
     if (argsAndFlags.json) {
       enableJsonOutput();