fix: show individual cft in a retrieve (#728)

mshanemc · SF-CLI-BOT · web-flow · commit 44dae0cdb3f8 · 2022-10-05T12:23:00.000-05:00
* fix: show individual cft in a retrieve

* test: record perf

Co-authored-by: SF-CLI-BOT &lt;alm-cli@salesforce.com&gt;
diff --git 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 }));
         }
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
@@ -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
   }
 ]
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
@@ -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
   }
 ]
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
@@ -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
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ export class RetrieveResult implements MetadataTransferResult {`
`100`	`100`	`state: this.localComponents.has(retrievedComponent) ? ComponentStatus.Changed : ComponentStatus.Created,`
`101`	`101`	`};`
`102`	`102`
`103`		`- if (!type.children) {`
	`103`	`+ if (!type.children \|\| Object.values(type.children.types).some((t) => t.unaddressableWithoutParent)) {`
`104`	`104`	`for (const filePath of retrievedComponent.walkContent()) {`
`105`	`105`	`this.fileResponses.push(Object.assign({}, baseResponse, { filePath }));`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 227.84873699999298`
	`4`	`+ "duration": 217.93947700003628`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 5575.808999000001`
	`8`	`+ "duration": 5880.5675030000275`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 5121.344982999988`
	`12`	`+ "duration": 5136.219725999981`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 4306.255004000006`
	`16`	`+ "duration": 4138.7591559999855`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 464.14559599998756`
	`4`	`+ "duration": 431.07157500006724`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 8464.103521000012`
	`8`	`+ "duration": 8174.430239000008`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 7716.617144000018`
	`12`	`+ "duration": 7697.708233000012`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 5273.308957000001`
	`16`	`+ "duration": 4943.100770000019`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 782.2161900000065`
	`4`	`+ "duration": 748.0606320000952`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 12909.834803000005`
	`8`	`+ "duration": 12974.12760899996`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 11247.063521999982`
	`12`	`+ "duration": 10737.532497000066`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 12979.326094000018`
	`16`	`+ "duration": 12639.02305800002`
`17`	`17`	`}`
`18`	`18`	`]`