feat: multiple resolve targets when parsing manifest (#211)

forcedotcom · Dec 3, 2020 · cede5f6 · cede5f6
1 parent 1a4f35a
commit cede5f6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/collections/types.ts b/src/collections/types.ts
@@ -29,7 +29,7 @@ export interface FromSourceOptions extends WorkingSetOptions {
 }
 
 export interface FromManifestOptions extends FromSourceOptions {
-  resolve?: string;
+  resolve?: Iterable<string>;
   literalWildcard?: boolean;
 }
 

diff --git a/src/collections/workingSet.ts b/src/collections/workingSet.ts
@@ -71,7 +71,7 @@ export class WorkingSet implements MetadataSet, Iterable<MetadataComponent> {
   ): Promise<WorkingSet> {
     const registry = options?.registry ?? new RegistryAccess();
     const tree = options?.tree ?? new NodeFSTreeContainer();
-    const shouldResolve = options?.resolve;
+    const shouldResolve = !!options?.resolve;
 
     const ws = new WorkingSet(options?.registry);
     const filterSet = new ComponentSet<MetadataComponent>();
@@ -93,10 +93,14 @@ export class WorkingSet implements MetadataSet, Iterable<MetadataComponent> {
     }
 
     if (shouldResolve) {
-      ws.resolveSourceComponents(options.resolve, {
-        tree,
-        filter: filterSet,
-      });
+      // if it's a string, don't iterate over the characters
+      const toResolve = typeof options.resolve === 'string' ? [options.resolve] : options.resolve;
+      for (const fsPath of toResolve) {
+        ws.resolveSourceComponents(fsPath, {
+          tree,
+          filter: filterSet,
+        });
+      }
     }
 
     return ws;

diff --git a/test/collections/workingSet.test.ts b/test/collections/workingSet.test.ts
@@ -187,7 +187,7 @@ describe('WorkingSet', () => {
         ]);
       });
 
-      it('should initialize with source backed components when specifying resolve option', async () => {
+      it('should initialize with source backed components when specifying string resolve option', async () => {
         const ws = await WorkingSet.fromManifestFile('subset.xml', {
           registry: mockRegistry,
           tree,
@@ -201,6 +201,20 @@ describe('WorkingSet', () => {
         expect(Array.from(ws)).to.deep.equal(expected);
       });
 
+      it('should initialize with source backed components when specifying non-string iterable resolve option', async () => {
+        const ws = await WorkingSet.fromManifestFile('subset.xml', {
+          registry: mockRegistry,
+          tree,
+          resolve: ['decomposedTopLevels', 'mixedSingleFiles'],
+        });
+
+        const expected = new MetadataResolver(mockRegistry, tree).getComponentsFromPath('.');
+        const missingIndex = expected.findIndex((c) => c.fullName === 'c');
+        expected.splice(missingIndex, 1);
+
+        expect(Array.from(ws)).to.deep.equal(expected);
+      });
+
       it('should interpret wildcard members literally by default', async () => {
         const ws = await WorkingSet.fromManifestFile('wildcard.xml', {
           registry: mockRegistry,