fix: pull all deleted CLs will delete file (#391)

* fix: pull all deleted CLs will delete file

* refactor: remove reduce (#392)

---------

Co-authored-by: Shane McLaughlin <shane.mclaughlin@salesforce.com>

Author: WillieRuemmele

package.json

@@ -45,7 +45,7 @@
   "dependencies": {
     "@salesforce/core": "^3.36.1",
     "@salesforce/kit": "^1.9.2",
-    "@salesforce/source-deploy-retrieve": "^8.4.0",
+    "@salesforce/source-deploy-retrieve": "^8.5.1",
     "fast-xml-parser": "^4.2.2",
     "graceful-fs": "^4.2.11",
     "isomorphic-git": "1.23.0",
@@ -160,4 +160,4 @@
       "output": []
     }
   }
-}
+}

src/sourceTracking.ts

@@ -24,6 +24,7 @@ import {
   ScopedPostDeploy,
   RetrieveResult,
   RegistryAccess,
+  FileResponseSuccess,
 } from '@salesforce/source-deploy-retrieve';
 // this is not exported by SDR (see the comments in SDR regarding its limitations)
 import { filePathsFromMetadataComponent } from '@salesforce/source-deploy-retrieve/lib/src/utils/filePathGenerator';
@@ -40,7 +41,7 @@ import {
   RemoteChangeElement,
 } from './shared/types';
 import { sourceComponentGuard } from './shared/guards';
-import { supportsPartialDelete, pathIsInFolder, ensureRelative } from './shared/functions';
+import { supportsPartialDelete, pathIsInFolder, ensureRelative, deleteCustomLabels } from './shared/functions';
 import { registrySupportsType } from './shared/metadataKeys';
 import { populateFilePaths } from './shared/populateFilePaths';
 import { populateTypesAndNames } from './shared/populateTypesAndNames';
@@ -348,9 +349,33 @@ export class SourceTracking extends AsyncCreatable {
         .filter((filename) => filename)
         .map((filename) => sourceComponentByFileName.set(filename, component))
     );
+
+    // calculate what to return before we delete any files and .walkContent is no longer valid
+    const changedToBeDeleted = changesToDelete.flatMap((component) =>
+      [...component.walkContent(), component.xml].map(
+        (file): FileResponseSuccess => ({
+          state: ComponentStatus.Deleted,
+          filePath: file,
+          type: component.type.name,
+          fullName: component.fullName,
+        })
+      )
+    );
+
     const filenames = Array.from(sourceComponentByFileName.keys());
     // delete the files
-    await Promise.all(filenames.map((filename) => fs.promises.unlink(filename)));
+    await Promise.all(
+      filenames.map(async (filename) => {
+        if (sourceComponentByFileName.get(filename)?.type.id === 'customlabel') {
+          await deleteCustomLabels(
+            filename,
+            changesToDelete.filter((c) => c.type.id === 'customlabel')
+          );
+        } else {
+          return fs.promises.unlink(filename);
+        }
+      })
+    );
 
     // update the tracking files.  We're simulating SDR-style fileResponse
     await Promise.all([
@@ -364,19 +389,7 @@ export class SourceTracking extends AsyncCreatable {
         true // skip polling because it's a pull
       ),
     ]);
-    return filenames.reduce<FileResponse[]>((result, filename) => {
-      const component = sourceComponentByFileName.get(filename);
-      if (component) {
-        result.push({
-          state: ComponentStatus.Deleted,
-          filePath: filename,
-          type: component.type.name,
-          fullName: component.fullName,
-        });
-      }
-
-      return result;
-    }, []);
+    return changedToBeDeleted;
   }
 
   /**

yarn.lock

@@ -890,7 +890,7 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.7.0"
 
-"@salesforce/core@^3.34.6", "@salesforce/core@^3.34.8", "@salesforce/core@^3.36.0", "@salesforce/core@^3.36.1":
+"@salesforce/core@^3.34.6", "@salesforce/core@^3.34.8", "@salesforce/core@^3.36.1":
   version "3.36.1"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.36.1.tgz#053a5e1079b9749b62e461e6ac3e630b5689694a"
   integrity sha512-kcjyr9bj35nnL8Bqv8U39xeho3CrZYXJiS/X5X1eEHVNZLd9zckrmKrh1V7z8ElCFpsJrewT989SJsdvi9kE8w==
@@ -975,12 +975,12 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.5.1.tgz#2d1bfdcf593caaa04cd4b3e6fe621097ff7f28fe"
   integrity sha512-MRqU+tn8w5IFvZ0Lm9YKLgxYxr2MQMI+fXXsTrwfUnijsps+ybF9IOTu6MOMxxl2vCUkO8XDjA435wXlWSLI6g==
 
-"@salesforce/source-deploy-retrieve@^8.4.0":
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-8.4.0.tgz#10cadb7a02dc4657c5b941161b30a5017dabd788"
-  integrity sha512-eAOuhmbNAMoJdvhdzF1cBtqNIG/WhLR/GRCA89wevvPLidCdzMNzNGPUQWO0N+PSVWskRbbNeZG3n9ws4SV1vA==
+"@salesforce/source-deploy-retrieve@^8.5.1":
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-8.5.1.tgz#f66f590348857aa51e11fdb69dbd9fcf1d2fba93"
+  integrity sha512-bdbyLlpILlGiNzsqrZjOEu3rtp3pqQyPzixL2CA9UebKGytG6zT3J6+/0Br1jAVefbl62KW6dgwurAVL7bp6+w==
   dependencies:
-    "@salesforce/core" "^3.36.0"
+    "@salesforce/core" "^3.36.1"
     "@salesforce/kit" "^1.9.2"
     "@salesforce/ts-types" "^1.7.2"
     archiver "^5.3.1"