Pass a silenced writestream down to renderTasks when the json flag is…

… provided

packages/theme/src/cli/utilities/theme-ui.test.ts

@@ -1,6 +1,8 @@
-import {themeComponent, themesComponent} from './theme-ui.js'
+import {themeComponent, themesComponent, silenceableRenderTasks, SilentWriteStream} from './theme-ui.js'
 import {Theme} from '@shopify/cli-kit/node/themes/types'
-import {test, describe, expect} from 'vitest'
+import {test, describe, expect, vi} from 'vitest'
+
+import {Task} from '@shopify/cli-kit/node/ui'
 
 describe('themeComponent', () => {
   test('returns the ui for a theme', async () => {
@@ -25,6 +27,34 @@ describe('themesComponent', () => {
     })
   })
 })
+// todo: these tests will pass no matter what
+describe('SilentWriteStream', () => {
+  test('write method should not output anything', () => {
+    const mock = vi.spyOn(process.stdout, 'write').mockImplementation(() => true)
+    const silentWriteStream = new SilentWriteStream(1)
+
+    silentWriteStream.write()
+
+    expect(mock).not.toHaveBeenCalled()
+  })
+})
+
+describe('silenceableRenderTasks', () => {
+  test('should not write to process.stdout when silent flag is true', async () => {
+    const mock = vi.spyOn(process.stdout, 'write' as any).mockImplementation(() => true)
+
+    const tasks: Task[] = [
+      {
+        title: 'task 1',
+        task: async () => {},
+      },
+    ]
+
+    await silenceableRenderTasks(tasks, true)
+
+    expect(mock).not.toHaveBeenCalled()
+  })
+})
 
 function theme(id: number) {
   return {id, name: `theme ${id}`} as Theme

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

@@ -1,5 +1,6 @@
 import {Theme} from '@shopify/cli-kit/node/themes/types'
-import {renderConfirmationPrompt, renderWarning} from '@shopify/cli-kit/node/ui'
+import {renderConfirmationPrompt, renderWarning, renderTasks, Task} from '@shopify/cli-kit/node/ui'
+import {WriteStream} from 'tty'
 
 export function themeComponent(theme: Theme) {
   return [
@@ -31,3 +32,16 @@ export async function currentDirectoryConfirmed(force: boolean) {
     message: 'Do you want to proceed?',
   })
 }
+
+export class SilentWriteStream extends WriteStream {
+  write(): boolean {
+    return true
+  }
+}
+
+export async function silenceableRenderTasks(tasks: Task[], silent?: boolean) {
+  if (tasks.length > 0) {
+    const renderOptions = silent ? {stdout: new SilentWriteStream(1)} : undefined
+    await renderTasks(tasks, {renderOptions})
+  }
+}

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

@@ -1,17 +1,19 @@
 import {partitionThemeFiles, readThemeFilesFromDisk} from './theme-fs.js'
 import {applyIgnoreFilters} from './asset-ignore.js'
+import {silenceableRenderTasks} from './theme-ui.js'
 import {AdminSession} from '@shopify/cli-kit/node/session'
 import {Result, Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types'
 import {AssetParams, bulkUploadThemeAssets, deleteThemeAsset} from '@shopify/cli-kit/node/themes/api'
 import {fileSize} from '@shopify/cli-kit/node/fs'
-import {Task, renderTasks as renderTaskOriginal} from '@shopify/cli-kit/node/ui'
+import {Task} from '@shopify/cli-kit/node/ui'
 import {outputDebug, outputInfo, outputNewline, outputWarn} from '@shopify/cli-kit/node/output'
 
 interface UploadOptions {
   path: string
   nodelete?: boolean
   ignore?: string[]
   only?: string[]
+  json?: boolean
 }
 type FileBatch = Checksum[]
 
@@ -33,8 +35,8 @@ export async function uploadTheme(
   const uploadTasks = await buildUploadTasks(remoteChecksums, themeFileSystem, options, theme, session, uploadResults)
 
   // The task execution mechanism processes tasks sequentially in the order they are added.
-  await renderTasks(deleteTasks)
-  await renderTasks(uploadTasks)
+  await silenceableRenderTasks(deleteTasks, options.json)
+  await silenceableRenderTasks(uploadTasks, options.json)
 
   reportFailedUploads(uploadResults)
   return uploadResults
@@ -321,12 +323,6 @@ async function handleFailedUploads(
   return handleBulkUpload(failedUploadParams, themeId, session, count + 1)
 }
 
-async function renderTasks(tasks: Task[]) {
-  if (tasks.length > 0) {
-    await renderTaskOriginal(tasks)
-  }
-}
-
 function reportFailedUploads(uploadResults: Map<string, Result>) {
   for (const [key, result] of uploadResults.entries()) {
     if (!result.success) {