From d85128afde2f11bdf0fb678c7ab4893a71cb0c87 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Wed, 5 Oct 2022 11:12:16 -0500
Subject: [PATCH 1/2] fix: show individual cft in a retrieve

---
 src/client/metadataApiRetrieve.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/metadataApiRetrieve.ts b/src/client/metadataApiRetrieve.ts
index a2cc2c97d8..1ee457c5cd 100644
--- a/src/client/metadataApiRetrieve.ts
+++ b/src/client/metadataApiRetrieve.ts
@@ -100,7 +100,7 @@ export class RetrieveResult implements MetadataTransferResult {
         state: this.localComponents.has(retrievedComponent) ? ComponentStatus.Changed : ComponentStatus.Created,
       };
 
-      if (!type.children) {
+      if (!type.children || Object.values(type.children.types).some((t) => t.unaddressableWithoutParent)) {
         for (const filePath of retrievedComponent.walkContent()) {
           this.fileResponses.push(Object.assign({}, baseResponse, { filePath }));
         }

From 59aabe3c35d9b12f1133b3b391d535e4def5471e Mon Sep 17 00:00:00 2001
From: SF-CLI-BOT <alm-cli@salesforce.com>
Date: Wed, 5 Oct 2022 16:44:39 +0000
Subject: [PATCH 2/2] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
index 9b5cb649cb..1d62202153 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 227.84873699999298
+    "duration": 217.93947700003628
   },
   {
     "name": "sourceToMdapi",
-    "duration": 5575.808999000001
+    "duration": 5880.5675030000275
   },
   {
     "name": "sourceToZip",
-    "duration": 5121.344982999988
+    "duration": 5136.219725999981
   },
   {
     "name": "mdapiToSource",
-    "duration": 4306.255004000006
+    "duration": 4138.7591559999855
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
index 88864c7f2e..48a5a5f203 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 464.14559599998756
+    "duration": 431.07157500006724
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8464.103521000012
+    "duration": 8174.430239000008
   },
   {
     "name": "sourceToZip",
-    "duration": 7716.617144000018
+    "duration": 7697.708233000012
   },
   {
     "name": "mdapiToSource",
-    "duration": 5273.308957000001
+    "duration": 4943.100770000019
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
index 1d50cf74dd..c143865c19 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 782.2161900000065
+    "duration": 748.0606320000952
   },
   {
     "name": "sourceToMdapi",
-    "duration": 12909.834803000005
+    "duration": 12974.12760899996
   },
   {
     "name": "sourceToZip",
-    "duration": 11247.063521999982
+    "duration": 10737.532497000066
   },
   {
     "name": "mdapiToSource",
-    "duration": 12979.326094000018
+    "duration": 12639.02305800002
   }
 ]
\ No newline at end of file