Fix issue with single environment calls in theme commands

Author: EvilGenius13

.changeset/itchy-houses-kick.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+fix the way we detect single or non environments & improve output for multienvironment commands

packages/theme/src/cli/utilities/theme-command.ts

@@ -4,8 +4,10 @@ import {ArgOutput, FlagOutput, Input} from '@oclif/core/lib/interfaces/parser.js
 import Command from '@shopify/cli-kit/node/base-command'
 import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session'
 import {loadEnvironment} from '@shopify/cli-kit/node/environments'
-import {renderWarning} from '@shopify/cli-kit/node/ui'
+import {renderWarning, renderConcurrent} from '@shopify/cli-kit/node/ui'
 import {AbortError} from '@shopify/cli-kit/node/error'
+import {AbortController} from '@shopify/cli-kit/node/abort'
+import {Writable} from 'stream'
 
 export interface FlagValues {
   [key: string]: boolean | string | string[] | number | undefined
@@ -36,7 +38,11 @@ export default abstract class ThemeCommand extends Command {
     return configurationFileName
   }
 
-  async command(_flags: FlagValues, _session: AdminSession): Promise<void> {}
+  async command(
+    _flags: FlagValues,
+    _session: AdminSession,
+    _context?: {stdout?: Writable; stderr?: Writable},
+  ): Promise<void> {}
 
   async run<
     TFlags extends FlagOutput & {path?: string; verbose?: boolean},
@@ -50,20 +56,38 @@ export default abstract class ThemeCommand extends Command {
     const requiredFlags = klass.multiEnvironmentsFlags
     const {flags} = await this.parse(klass)
 
-    // Single environment
-    if (!flags.environment) {
+    // No environment provided
+    if (!flags.environment?.length) {
       const session = await this.ensureAuthenticated(flags)
+
       await this.command(flags, session)
+
       return
     }
 
-    // Synchronously authenticate all environments
-    const sessions: {[storeFqdn: string]: AdminSession} = {}
     // OCLIF parses flags.environment as an array when using the --environment & -e flag but
     // as a string when using the direct environment variable SHOPIFY_FLAG_ENVIRONMENT
     // This handles both cases
     const environments = Array.isArray(flags.environment) ? flags.environment : [flags.environment]
 
+    // If only one environment is specified, treat it as single environment mode
+    if (environments.length === 1) {
+      const environmentConfig = await loadEnvironment(environments[0], 'shopify.theme.toml', {from: flags.path})
+      const environmentFlags = {
+        ...flags,
+        ...environmentConfig,
+        environment: environments,
+      }
+
+      const session = await this.ensureAuthenticated(environmentConfig as FlagValues)
+      await this.command(environmentFlags, session)
+
+      return
+    }
+
+    // Multiple environments
+    const sessions: {[storeFqdn: string]: AdminSession} = {}
+
     // Authenticate on all environments sequentially to avoid race conditions,
     // with authentication happening in parallel.
     for (const environmentName of environments) {
@@ -73,27 +97,34 @@ export default abstract class ThemeCommand extends Command {
       sessions[environmentName] = await this.ensureAuthenticated(environmentConfig as FlagValues)
     }
 
-    // Concurrently run commands
-    await Promise.all(
-      environments.map(async (environment: string) => {
-        const environmentConfig = await loadEnvironment(environment, 'shopify.theme.toml', {from: flags.path})
-        const environmentFlags = {
-          ...flags,
-          ...environmentConfig,
-          environment: [environment],
-        }
-
-        if (!this.validConfig(environmentConfig as FlagValues, requiredFlags, environment)) return
-
-        const session = sessions[environment]
-
-        if (!session) {
-          throw new AbortError(`No session found for environment ${environment}`)
-        }
-
-        return this.command(environmentFlags, session)
-      }),
-    )
+    // Use renderConcurrent for multi-environment execution
+    const abortController = new AbortController()
+
+    await renderConcurrent({
+      processes: environments.map((environment: string) => ({
+        prefix: environment,
+        action: async (stdout: Writable, stderr: Writable, _signal) => {
+          const environmentConfig = await loadEnvironment(environment, 'shopify.theme.toml', {from: flags.path})
+          const environmentFlags = {
+            ...flags,
+            ...environmentConfig,
+            environment: [environment],
+          }
+
+          if (!this.validConfig(environmentConfig as FlagValues, requiredFlags, environment)) return
+
+          const session = sessions[environment]
+
+          if (!session) {
+            throw new AbortError(`No session found for environment ${environment}`)
+          }
+
+          await this.command(environmentFlags, session, {stdout, stderr})
+        },
+      })),
+      abortSignal: abortController.signal,
+      showTimestamps: true,
+    })
   }
 
   private async ensureAuthenticated(flags: FlagValues) {