From 8ac9b45bdf063bfa4843087a371d2e062f57cfd8 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Tue, 11 Jun 2024 13:51:19 -0600
Subject: [PATCH] chore: bump SDR, dedupe, ensure .object-meta.xml is full

---
 package.json                       |  2 +-
 test/nuts/retrieve/metadata.nut.ts | 18 ++++++++++++++++++
 yarn.lock                          |  8 ++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fe344d28..ef3520cc 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "@salesforce/kit": "^3.1.2",
     "@salesforce/plugin-info": "^3.3.6",
     "@salesforce/sf-plugins-core": "^10.0.0",
-    "@salesforce/source-deploy-retrieve": "^11.6.6",
+    "@salesforce/source-deploy-retrieve": "^11.6.7",
     "@salesforce/source-tracking": "^6.5.1",
     "@salesforce/ts-types": "^2.0.9",
     "ansis": "^3.2.0"
diff --git a/test/nuts/retrieve/metadata.nut.ts b/test/nuts/retrieve/metadata.nut.ts
index a3a6e56e..8f6a00bd 100644
--- a/test/nuts/retrieve/metadata.nut.ts
+++ b/test/nuts/retrieve/metadata.nut.ts
@@ -8,6 +8,7 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
+import * as os from 'node:os';
 import { execCmd } from '@salesforce/cli-plugins-testkit';
 import { SourceTestkit } from '@salesforce/source-testkit';
 import { expect } from 'chai';
@@ -54,6 +55,23 @@ describe('retrieve metadata NUTs', () => {
       await testkit.expect.filesToBeRetrieved([
         'force-app/main/default/objects/Broker__c/fields/Email__c.field-meta.xml',
       ]);
+      expect(
+        fs
+          .readFileSync(
+            path.join(
+              testkit.projectDir,
+              'force-app',
+              'main',
+              'default',
+              'objects',
+              'Broker__c',
+              'Broker__c.object-meta.xml'
+            ),
+            'utf8'
+          )
+          .split(os.EOL).length
+        // 4 lines would be overwritten - ensures like W-15896939 is fixed
+      ).to.be.greaterThanOrEqual(30);
     });
 
     it('should retrieve multiple metadata types', async () => {
diff --git a/yarn.lock b/yarn.lock
index 9ab76b0f..e2634ad1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1685,10 +1685,10 @@
     string-width "^7.1.0"
     terminal-link "^3.0.0"
 
-"@salesforce/source-deploy-retrieve@^11.6.5", "@salesforce/source-deploy-retrieve@^11.6.6":
-  version "11.6.6"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-11.6.6.tgz#0bec970d04cd528f68ae9009bdd52ec1db20a6b5"
-  integrity sha512-Wf7QCYtFsBwyLAFSPPuonyUnFMIz113yabDmZd9bBEeH3dKqPFQb6zHAV3HpoU5hwvHN/+xE8QDSxv3yjtyFPw==
+"@salesforce/source-deploy-retrieve@^11.6.5", "@salesforce/source-deploy-retrieve@^11.6.7":
+  version "11.6.7"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-11.6.7.tgz#538042e31fdf92d6eeca9a45266d335e96d8af73"
+  integrity sha512-66KY6EfNGRom7rGDutNzLE7wr8UIPylAruLwyvShuWbXGwXKlUIQli2Vc33h6UfU15NmcrbfiaRxyCgg9oqENw==
   dependencies:
     "@salesforce/core" "^7.3.12"
     "@salesforce/kit" "^3.1.1"