fix: invalid glob for nested dirs

fixes #8201 Signed-off-by: Rifa Achrinza <25147899+achrinza@users.noreply.github.com>
loopbackio · Jan 14, 2022 · 4e9ee8d · 4e9ee8d
1 parent 95ef66f
commit 4e9ee8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/boot/src/__tests__/unit/booters/base-artifact.booter.unit.ts b/packages/boot/src/__tests__/unit/booters/base-artifact.booter.unit.ts
@@ -28,7 +28,7 @@ describe('base-artifact booter unit tests', () => {
 
     it(`creates and sets 'glob' pattern`, async () => {
       const booterInst = givenBaseBooter();
-      const expected = '/@(test|test2)/*@(.test.js|test2.js)';
+      const expected = '/{test,test2}/*@(.test.js|test2.js)';
       await booterInst.configure();
       expect(booterInst.glob).to.equal(expected);
     });
@@ -37,7 +37,7 @@ describe('base-artifact booter unit tests', () => {
       const booterInst = givenBaseBooter(
         Object.assign({}, TEST_OPTIONS, {nested: true}),
       );
-      const expected = '/@(test|test2)/**/*@(.test.js|test2.js)';
+      const expected = '/{test,test2}/**/*@(.test.js|test2.js)';
       await booterInst.configure();
       expect(booterInst.glob).to.equal(expected);
     });

diff --git a/packages/boot/src/booters/base-artifact.booter.ts b/packages/boot/src/booters/base-artifact.booter.ts
@@ -91,14 +91,14 @@ export class BaseArtifactBooter implements Booter {
         : [this.options.extensions]
       : [];
 
-    const joinedDirs = this.dirs.join('|');
-    const joinedExts = this.extensions.join('|');
+    let joinedDirs = this.dirs.join(',');
+    if (this.dirs.length > 1) joinedDirs = `{${joinedDirs}}`;
+
+    const joinedExts = `@(${this.extensions.join('|')})`;
 
     this.glob = this.options.glob
       ? this.options.glob
-      : `/@(${joinedDirs})/${
-          this.options.nested ? '**/*' : '*'
-        }@(${joinedExts})`;
+      : `/${joinedDirs}/${this.options.nested ? '**/*' : '*'}${joinedExts}`;
   }
 
   /**