feat: add manifestRelPath to IPackageEntry

semrel-extra · May 25, 2023 · 6949ae0 · 6949ae0
1 parent cb2f9c2
commit 6949ae0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 30 deletions.
diff --git a/src/main/ts/interface.ts b/src/main/ts/interface.ts
@@ -19,6 +19,8 @@ export interface IPackageEntry {
   manifest: IPackageJson
   manifestRaw: string
   manifestPath: string
+  manifestRelPath: string
+  manifestAbsPath: string
   path: string
   absPath: string
   relPath: string

diff --git a/src/main/ts/topo.ts b/src/main/ts/topo.ts
@@ -30,21 +30,7 @@ export const getPackages = async (
   const { pkgFilter } = options
   const manifestsPaths = await getManifestsPaths(options)
   const entries = await Promise.all(
-    manifestsPaths.map(async manifestPath => {
-      const absPath = dirname(manifestPath)
-      const relPath = relative(options.cwd, absPath)
-      const manifestRaw = await fs.readFile(manifestPath, 'utf8')
-      const manifest = JSON.parse(manifestRaw)
-      return {
-        name: manifest.name,
-        manifestRaw,
-        manifestPath,
-        manifest,
-        path: relPath, // legacy
-        relPath,
-        absPath
-      }
-    })
+    manifestsPaths.map(manifestPath => getPackage(options.cwd, manifestPath))
   )
 
   checkDuplicates(entries)
@@ -66,19 +52,22 @@ const checkDuplicates = (named: { name: string }[]): void => {
   }
 }
 
-export const getRootPackage = async (cwd: string): Promise<IPackageEntry> => {
-  const manifestPath = resolve(cwd, 'package.json')
+export const getPackage = async (cwd: string, manifestPath: string): Promise<IPackageEntry> => {
+  const absPath = dirname(manifestPath)
+  const relPath = relative(cwd, absPath) || '.'
+  const manifestRelPath = relative(cwd, manifestPath)
   const manifestRaw = await fs.readFile(manifestPath, 'utf8')
   const manifest = JSON.parse(manifestRaw)
-
   return {
     name: manifest.name,
-    manifest,
-    manifestPath,
     manifestRaw,
-    path: '/',
-    relPath: '/',
-    absPath: dirname(manifestPath)
+    manifestPath, // legacy
+    manifestRelPath,
+    manifestAbsPath: manifestPath,
+    manifest,
+    path: relPath, // legacy
+    relPath,
+    absPath
   }
 }
 
@@ -93,7 +82,7 @@ export const topo = async (
     workspaces,
     workspacesExtra = []
   } = options
-  const root = await getRootPackage(cwd)
+  const root = await getPackage(cwd, resolve(cwd, 'package.json'))
   const _options: ITopoOptionsNormalized = {
     cwd,
     filter,

diff --git a/src/test/ts/topo.ts b/src/test/ts/topo.ts
@@ -57,6 +57,8 @@ test('`topo` returns monorepo digest: release queue, deps graph, package manifes
         },
         manifestRaw: '{\n  "name": "a",\n  "private": true\n}\n',
         manifestPath: join(cwd, 'packages/a/package.json'),
+        manifestAbsPath: join(cwd, 'packages/a/package.json'),
+        manifestRelPath: 'packages/a/package.json',
         path: 'packages/a',
         relPath: 'packages/a',
         absPath: resolve(cwd, 'packages/a')
@@ -70,6 +72,8 @@ test('`topo` returns monorepo digest: release queue, deps graph, package manifes
           }
         },
         manifestPath: join(cwd, 'packages/c/package.json'),
+        manifestAbsPath: join(cwd, 'packages/c/package.json'),
+        manifestRelPath: 'packages/c/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/c/package.json'), {
           encoding: 'utf8'
         }),
@@ -83,6 +87,8 @@ test('`topo` returns monorepo digest: release queue, deps graph, package manifes
           name: 'e'
         },
         manifestPath: join(cwd, 'packages/e/package.json'),
+        manifestAbsPath: join(cwd, 'packages/e/package.json'),
+        manifestRelPath: 'packages/e/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/e/package.json'), {
           encoding: 'utf8'
         }),
@@ -97,11 +103,13 @@ test('`topo` returns monorepo digest: release queue, deps graph, package manifes
         name: 'root'
       },
       manifestPath: join(cwd, 'package.json'),
+      manifestAbsPath: join(cwd, 'package.json'),
+      manifestRelPath: 'package.json',
       manifestRaw: fs.readFileSync(join(cwd, 'package.json'), {
         encoding: 'utf8'
       }),
-      path: '/',
-      relPath: '/',
+      path: '.',
+      relPath: '.',
       absPath: resolve(cwd)
     },
     graphs: [
@@ -143,6 +151,8 @@ test('`topo` applies filter/pkgFilter', async () => {
           }
         },
         manifestPath: join(cwd, 'packages/c/package.json'),
+        manifestAbsPath: join(cwd, 'packages/c/package.json'),
+        manifestRelPath: 'packages/c/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/c/package.json'), {
           encoding: 'utf8'
         }),
@@ -156,6 +166,8 @@ test('`topo` applies filter/pkgFilter', async () => {
           name: 'e'
         },
         manifestPath: join(cwd, 'packages/e/package.json'),
+        manifestAbsPath: join(cwd, 'packages/e/package.json'),
+        manifestRelPath: 'packages/e/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/e/package.json'), {
           encoding: 'utf8'
         }),
@@ -170,11 +182,13 @@ test('`topo` applies filter/pkgFilter', async () => {
         name: 'root'
       },
       manifestPath: join(cwd, 'package.json'),
+      manifestAbsPath: join(cwd, 'package.json'),
+      manifestRelPath: 'package.json',
       manifestRaw: fs.readFileSync(join(cwd, 'package.json'), {
         encoding: 'utf8'
       }),
-      path: '/',
-      relPath: '/',
+      path: '.',
+      relPath: '.',
       absPath: resolve(cwd)
     },
     graphs: [
@@ -209,6 +223,8 @@ test('`topo` applies depFilter', async () => {
           private: true
         },
         manifestPath: join(cwd, 'packages/a/package.json'),
+        manifestAbsPath: join(cwd, 'packages/a/package.json'),
+        manifestRelPath: 'packages/a/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/a/package.json'), {
           encoding: 'utf8'
         }),
@@ -225,6 +241,8 @@ test('`topo` applies depFilter', async () => {
           }
         },
         manifestPath: join(cwd, 'packages/c/package.json'),
+        manifestAbsPath: join(cwd, 'packages/c/package.json'),
+        manifestRelPath: 'packages/c/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/c/package.json'), {
           encoding: 'utf8'
         }),
@@ -238,6 +256,8 @@ test('`topo` applies depFilter', async () => {
           name: 'e'
         },
         manifestPath: join(cwd, 'packages/e/package.json'),
+        manifestAbsPath: join(cwd, 'packages/e/package.json'),
+        manifestRelPath: 'packages/e/package.json',
         manifestRaw: fs.readFileSync(join(cwd, 'packages/e/package.json'), {
           encoding: 'utf8'
         }),
@@ -252,11 +272,13 @@ test('`topo` applies depFilter', async () => {
         name: 'root'
       },
       manifestPath: join(cwd, 'package.json'),
+      manifestAbsPath: join(cwd, 'package.json'),
+      manifestRelPath: 'package.json',
       manifestRaw: fs.readFileSync(join(cwd, 'package.json'), {
         encoding: 'utf8'
       }),
-      path: '/',
-      relPath: '/',
+      path: '.',
+      relPath: '.',
       absPath: resolve(cwd)
     },
     graphs: [