feat: add globbing support for package roots

package.json

@@ -58,5 +58,8 @@
     "tsconfig.json",
     "README.md"
   ],
-  "packageManager": "yarn@3.2.3"
+  "packageManager": "yarn@3.2.3",
+  "dependencies": {
+    "glob": "^10.3.3"
+  }
 }

src/package.spec.ts

@@ -7,29 +7,60 @@ import {
   getPathsByPackageNames,
   parsePackageFiles,
 } from './package'
+import { createFsFromJSON } from './utils/testing'
 
 describe('package', () => {
   let fs: Volume
 
   describe('getPackageRoots', () => {
     it('should return normalized package roots', async () => {
-      fs = Volume.fromJSON({
+      fs = createFsFromJSON({
         'lerna.json': JSON.stringify({
-          packages: ['libraries/*', 'modules/*', 'single/package'],
+          packages: ['libraries', 'modules/*', 'single/package', 'nested/**/package'],
         }),
+        'libraries/wayne-manor/package.json': 'some content',
+        'modules/wayne-tower/package.json': 'some content',
+        'single/package/package.json': 'some content',
+        'nested/bruce-wayne/package/package.json': 'some content',
+        'nested/batman/package/package.json': 'some content',
       })
 
       await expect(getPackageRoots({ filesystem: fs as never })).resolves.toEqual([
         'libraries',
         'modules',
         'single/package',
+        'nested/bruce-wayne/package',
+        'nested/batman/package',
+      ])
+    })
+
+    it('should return normalized paths for grouped package roots', async () => {
+      fs = createFsFromJSON({
+        'lerna.json': JSON.stringify({
+          packages: [
+            'libraries',
+            'modules/exchange/{exchange,exchange-monitors}',
+            'single/package',
+          ],
+        }),
+        'libraries/wayne-manor/package.json': 'some content',
+        'modules/exchange/exchange/package.json': 'some content',
+        'modules/exchange/exchange-monitors/package.json': 'some content',
+        'single/package/package.json': 'some content',
+      })
+
+      await expect(getPackageRoots({ filesystem: fs as never })).resolves.toEqual([
+        'libraries',
+        'single/package',
+        'modules/exchange/exchange',
+        'modules/exchange/exchange-monitors',
       ])
     })
   })
 
   describe('getPackageNameByPath', () => {
     beforeEach(() => {
-      fs = Volume.fromJSON({
+      fs = createFsFromJSON({
         'lerna.json': JSON.stringify({
           packages: ['packages/*'],
         }),
@@ -53,7 +84,7 @@ describe('package', () => {
   })
 
   const setup = (additionalContents: { [path: string]: string } = {}) => {
-    fs = Volume.fromJSON({
+    fs = createFsFromJSON({
       'lerna.json': JSON.stringify({
         packages: ['modules/*', 'libraries/*', 'empty/*'],
       }),
@@ -112,7 +143,7 @@ describe('package', () => {
 
   describe('parsePackageFiles', () => {
     it('should parse files as JSON and return contents ', async () => {
-      fs = Volume.fromJSON({
+      fs = createFsFromJSON({
         'lerna.json': JSON.stringify({
           packages: ['modules/*', 'libraries/*', 'empty/*'],
         }),

src/package.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs'
 import { readJson } from './utils/fs'
 import { LernaConfig, PackageJson } from './utils/types'
 import { filterAsync } from './utils/arrays'
+import { glob } from 'glob'
 
 type DefaultParams = {
   filesystem?: typeof fs
@@ -12,11 +13,14 @@ export async function getPackageRoots({ filesystem = fs }: DefaultParams = {}):
   const lernaConfig = await readJson<LernaConfig>('lerna.json', { filesystem })
   const packageRoots = lernaConfig?.packages ?? ['packages/*']
 
-  return packageRoots.map((root: string) => {
-    if (root.endsWith('*')) return path.dirname(root)
+  return glob(
+    packageRoots.map((root: string) => {
+      if (root.endsWith('*')) return path.dirname(root)
 
-    return root
-  })
+      return root
+    }),
+    { fs: filesystem }
+  )
 }
 
 export async function getPackagePaths({ filesystem = fs }: DefaultParams = {}): Promise<string[]> {

src/user-input.spec.ts

@@ -1,5 +1,6 @@
 import { Volume } from 'memfs/lib/volume'
 import { normalizePackages } from './user-input'
+import { createFsFromJSON } from './utils/testing'
 
 describe('normalizePackages', () => {
   let fs: Volume
@@ -27,7 +28,7 @@ describe('normalizePackages', () => {
   })
 
   beforeEach(() => {
-    fs = Volume.fromJSON({
+    fs = createFsFromJSON({
       'lerna.json': lernaConfig,
       'modules/storage-mobile/package.json': packageContents.storageMobile,
       'deeply/nested/package/root/the-ultimate-package/package.json':

src/utils/testing.ts

@@ -0,0 +1,6 @@
+import { createFsFromVolume } from 'memfs'
+import { DirectoryJSON, Volume } from 'memfs/lib/volume'
+
+export function createFsFromJSON(json: DirectoryJSON) {
+  return createFsFromVolume(Volume.fromJSON(json))
+}