Merge pull request #6193 from Shopify/jb-multi-env-delete

Allow theme delete command to be called with multiple environments

Author: dejmedus

.changeset/early-cobras-worry.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': minor
+---
+
+Remove deprecated positional arguments from theme delete command

.changeset/silver-worms-punch.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': minor
+---
+
+Allow theme delete command to be called with multiple environments

packages/cli/oclif.manifest.json

@@ -5291,10 +5291,18 @@
       "hiddenAliases": [
       ],
       "id": "theme:delete",
+      "multiEnvironmentsFlags": [
+        "store",
+        "password",
+        [
+          "development",
+          "theme"
+        ]
+      ],
       "pluginAlias": "@shopify/cli",
       "pluginName": "@shopify/cli",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "summary": "Delete remote themes from the connected store. This command can't be undone."
     },
     "theme:dev": {

packages/theme/src/cli/commands/theme/delete.ts

@@ -1,11 +1,12 @@
-import {ensureThemeStore} from '../../utilities/theme-store.js'
 import ThemeCommand from '../../utilities/theme-command.js'
 import {themeFlags} from '../../flags.js'
-import {themesDelete, renderDeprecatedArgsWarning} from '../../services/delete.js'
+import {themesDelete} from '../../services/delete.js'
 import {Flags} from '@oclif/core'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
-import {ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session'
+import {OutputFlags} from '@oclif/core/interfaces'
+import {AdminSession} from '@shopify/cli-kit/node/session'
 
+type DeleteFlags = OutputFlags<typeof Delete.flags>
 export default class Delete extends ThemeCommand {
   static summary = "Delete remote themes from the connected store. This command can't be undone."
 
@@ -17,9 +18,6 @@ export default class Delete extends ThemeCommand {
 
   static description = this.descriptionWithoutMarkdown()
 
-  // Accept any number of args without naming them
-  static strict = false
-
   static flags = {
     ...globalFlags,
     ...themeFlags,
@@ -46,24 +44,22 @@ export default class Delete extends ThemeCommand {
     }),
   }
 
-  async run(): Promise<void> {
-    const {flags, argv} = await this.parse(Delete)
-    const {development, force, password, theme} = flags
-    const themes = [...argv, ...(theme ?? [])]
-
-    const store = ensureThemeStore(flags)
-    const adminSession = await ensureAuthenticatedThemes(store, password)
+  static multiEnvironmentsFlags = ['store', 'password', ['development', 'theme']]
 
-    const hasDeprecatedArgs = argv.length > 0
-    if (hasDeprecatedArgs) {
-      renderDeprecatedArgsWarning(argv)
-    }
+  async command(flags: DeleteFlags, adminSession: AdminSession, multiEnvironment: boolean) {
+    const {environment, development, force, theme} = flags
+    const themes = theme ?? []
 
-    await themesDelete(adminSession, {
-      selectTheme: flags['show-all'],
-      development,
-      themes,
-      force,
-    })
+    await themesDelete(
+      adminSession,
+      {
+        selectTheme: flags['show-all'],
+        environment,
+        development,
+        themes,
+        force,
+      },
+      multiEnvironment,
+    )
   }
 }

packages/theme/src/cli/services/delete.test.ts

@@ -1,9 +1,9 @@
-import {themesDelete, renderDeprecatedArgsWarning} from './delete.js'
+import {themesDelete} from './delete.js'
 import {findOrSelectTheme, findThemes} from '../utilities/theme-selector.js'
 import {themeDelete} from '@shopify/cli-kit/node/themes/api'
 import {Theme} from '@shopify/cli-kit/node/themes/types'
 import {test, describe, expect, vi} from 'vitest'
-import {renderConfirmationPrompt, renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui'
+import {renderConfirmationPrompt, renderSuccess} from '@shopify/cli-kit/node/ui'
 
 vi.mock('@shopify/cli-kit/node/ui')
 vi.mock('@shopify/cli-kit/node/themes/api')
@@ -142,21 +142,3 @@ describe('themesDelete', () => {
     expect(renderSuccess).not.toBeCalled()
   })
 })
-
-describe('renderDeprecatedArgsWarning', () => {
-  test('renders the the deprecated-args warning message', async () => {
-    // Given/When
-    renderDeprecatedArgsWarning(['1', '2'])
-
-    // Then
-    expect(renderWarning).toBeCalledWith({
-      body: [
-        'Positional arguments are deprecated. Use the',
-        {command: '--theme'},
-        'flag instead:\n\n',
-        {command: `$ shopify theme delete --theme 1 2`},
-        {char: '.'},
-      ],
-    })
-  })
-})

packages/theme/src/cli/services/delete.ts

@@ -8,7 +8,6 @@ import {
   renderConfirmationPrompt,
   RenderConfirmationPromptOptions,
   renderSuccess,
-  renderWarning,
   InlineToken,
   LinkToken,
 } from '@shopify/cli-kit/node/ui'
@@ -18,12 +17,13 @@ import {isDevelopmentTheme} from '@shopify/cli-kit/node/themes/utils'
 
 interface DeleteOptions {
   selectTheme: boolean
+  environment?: string[]
   development: boolean
   force: boolean
   themes: string[]
 }
 
-export async function themesDelete(adminSession: AdminSession, options: DeleteOptions) {
+export async function themesDelete(adminSession: AdminSession, options: DeleteOptions, multiEnvironment?: boolean) {
   let themeIds = options.themes
   if (options.development) {
     const theme = await new DevelopmentThemeManager(adminSession).find()
@@ -33,7 +33,7 @@ export async function themesDelete(adminSession: AdminSession, options: DeleteOp
   const store = adminSession.storeFqdn
   const themes = await findThemesByDeleteOptions(adminSession, {...options, themes: themeIds, development: false})
 
-  if (!options.force && !(await isConfirmed(themes, store))) {
+  if (!options.force && !multiEnvironment && !(await isConfirmed(themes, store))) {
     return
   }
 
@@ -46,11 +46,13 @@ export async function themesDelete(adminSession: AdminSession, options: DeleteOp
     }),
   )
 
+  const environment = options.environment ? [{subdued: `Environment: ${options.environment}\n\n`}] : []
+
   renderSuccess({
     body: pluralize(
       themes,
-      (themes) => [`The following themes were deleted from ${store}:`, themesComponent(themes)],
-      (theme) => ['The theme', ...themeComponent(theme), `was deleted from ${store}.`],
+      (themes) => [...environment, `The following themes were deleted from ${store}:`, themesComponent(themes)],
+      (theme) => [...environment, 'The theme', ...themeComponent(theme), `was deleted from ${store}.`],
     ),
   })
 }
@@ -88,17 +90,3 @@ async function isConfirmed(themes: Theme[], store: string) {
 
   return renderConfirmationPrompt(options)
 }
-
-export function renderDeprecatedArgsWarning(argv: string[]) {
-  const ids = argv.join(' ')
-
-  renderWarning({
-    body: [
-      'Positional arguments are deprecated. Use the',
-      {command: '--theme'},
-      'flag instead:\n\n',
-      {command: `$ shopify theme delete --theme ${ids}`},
-      {char: '.'},
-    ],
-  })
-}