Merge pull request #4563 from Shopify/fix-4472

Fix `shopify theme pull --only <value>` so it does not delete ignored files

.changeset/witty-insects-study.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fix `shopify theme pull --only <value>` so it does not delete ignored files

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

@@ -32,6 +32,26 @@ describe('theme-downloader', () => {
       expect(spy).toHaveBeenCalledWith('assets/deleteme.css')
     })
 
+    test('does not delete files when filters are passed', async () => {
+      // Given
+      const remote: Checksum[] = []
+      const files = new Map<string, ThemeAsset>([
+        ['assets/keepme.css', {key: 'assets/keepme.css', checksum: '1', value: 'content'}],
+      ])
+      const fileSystem = fakeThemeFileSystem(root, files, {
+        filters: {
+          only: ['templates/*'],
+        },
+      })
+      const spy = vi.spyOn(fileSystem, 'delete')
+
+      // When
+      await downloadTheme(remoteTheme, adminSession, remote, fileSystem, downloadOptions)
+
+      // Then
+      expect(spy).not.toHaveBeenCalled()
+    })
+
     test('does not delete files when nodelete is set', async () => {
       // Given
       const downloadOptions = {nodelete: true}

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

@@ -29,7 +29,7 @@ function buildDeleteTasks(remoteChecksums: Checksum[], themeFileSystem: ThemeFil
 
   const remoteKeys = new Set(remoteChecksums.map((checksum) => checksum.key))
 
-  const localKeys = Array.from(themeFileSystem.files.keys())
+  const localKeys = themeFileSystem.applyIgnoreFilters([...themeFileSystem.files.values()]).map(({key}) => key)
   const localFilesToBeDeleted = localKeys.filter((key) => !remoteKeys.has(key))
 
   return localFilesToBeDeleted.map((key) => {