fix: add to component set even if unresolved source (#217)

forcedotcom · Dec 3, 2020 · c2dd4b1 · c2dd4b1
1 parent 9fdf131
commit c2dd4b1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/client/index.ts b/src/client/index.ts
@@ -13,6 +13,7 @@ export {
   MetadataApiDeployOptions,
   RetrieveOptions,
   RetrievePathOptions,
+  RetrieveStatus,
   SourceDeployResult,
   RetrieveMessage,
   SourceRetrieveResult,

diff --git a/src/collections/componentSet.ts b/src/collections/componentSet.ts
@@ -83,11 +83,11 @@ export class ComponentSet implements Iterable<MetadataComponent> {
     ws.apiVersion = manifestObj.Package.version;
 
     for (const component of ComponentSet.getComponentsFromManifestObject(manifestObj, registry)) {
-      const memberIsWildcard = component.fullName === ComponentSet.WILDCARD;
       if (shouldResolve) {
         filterSet.add(component);
       }
-      if (!shouldResolve || (memberIsWildcard && options?.literalWildcard)) {
+      const memberIsWildcard = component.fullName === ComponentSet.WILDCARD;
+      if (!memberIsWildcard || options?.literalWildcard || !shouldResolve) {
         ws.add(component);
       }
     }

diff --git a/src/index.ts b/src/index.ts
@@ -9,6 +9,7 @@ export {
   MetadataApiDeployOptions,
   RetrieveOptions,
   RetrievePathOptions,
+  RetrieveStatus,
   SourceDeployResult,
   RetrieveMessage,
   SourceRetrieveResult,

diff --git a/test/collections/componentSet.test.ts b/test/collections/componentSet.test.ts
@@ -263,10 +263,25 @@ describe('ComponentSet', () => {
           { fullName: '*', type: mockRegistryData.types.mixedcontentsinglefile },
           ...sourceComponents,
         ]);
+
+        it('should add components even if they were not resolved', async () => {
+          const set = await ComponentSet.fromManifestFile('folderComponent.xml', {
+            registry: mockRegistry,
+            tree,
+            resolve: '.',
+          });
+
+          expect(Array.from(set)).to.deep.equal([
+            {
+              fullName: 'Test_Folder',
+              type: mockRegistryData.types.tinafeyfolder,
+            },
+          ]);
+        });
       });
     });
 
-    describe('fromComponents', () => {
+    describe('constructor', () => {
       it('should initialize non-source backed components from members', () => {
         const set = new ComponentSet(
           [