Merge pull request #129 from lishaduck/fix-manifests

Fix monorepo manifest reads

src/__tests__/globber.test.ts

@@ -1,8 +1,8 @@
-import { join } from 'node:path'
+import * as path from 'node:path'
 import { createGlobber } from '../globber'
 
 test('returns the current directory as a match', async () => {
   const result = await createGlobber().glob(process.cwd(), 'package.json')
   expect(result).toHaveLength(1)
-  expect(result[0]).toBe(join(process.cwd(), 'package.json'))
+  expect(result[0]).toBe(path.join(process.cwd(), 'package.json'))
 })

src/__tests__/type-syncer.test.ts

@@ -187,10 +187,7 @@ function buildSyncer() {
     glob: jest.fn(async (pattern, _filename) => {
       switch (pattern) {
         case 'packages/*':
-          return [
-            'packages/package-1/package.json',
-            'packages/package-2/package.json',
-          ]
+          return ['packages/package-1/', 'packages/package-2/']
         default:
           return []
       }

src/type-syncer.ts

@@ -57,15 +57,15 @@ export function createTypeSyncer(
   ): Promise<ISyncResult> {
     const dryRun = !!flags.dry
     const syncOpts = await configService.readConfig(filePath, flags)
-    const { file, subPackages } = await getManifests(
+    const { file, subManifests } = await getManifests(
       filePath,
       globber,
       syncOpts.ignoreProjects ?? [],
     )
 
     const syncedFiles: Array<ISyncedFile> = await Promise.all([
       syncFile(filePath, file, syncOpts, dryRun),
-      ...subPackages.map((p) => syncFile(p, null, syncOpts, dryRun)),
+      ...subManifests.map((p) => syncFile(p, null, syncOpts, dryRun)),
     ])
 
     return {
@@ -91,10 +91,11 @@ export function createTypeSyncer(
       globber,
       ignoredWorkspaces,
     )
+    const subManifests = subPackages.map((p) => path.join(p, 'package.json'))
 
     return {
       file,
-      subPackages,
+      subManifests,
     }
   }
 

src/workspace-resolver.ts

@@ -1,4 +1,4 @@
-import path from 'node:path'
+import * as path from 'node:path'
 import yaml from 'js-yaml'
 import type * as fsUtils from './fs-utils'
 import { IGlobber } from './globber'
@@ -17,6 +17,7 @@ export interface IWorkspaceResolverService {
    * - `pnpm-workspace.yaml` `packages` field, as an array of globs.
    *
    * Path is relative to the current working directory.
+   * Note that this returns a list of directories, not paths to the manifests themselves.
    */
   getWorkspaces(
     packageJson: IPackageFile,