enablement-build-manifest 1.8.2 → 1.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enablement-build-manifest",
-  "version": "1.8.2",
+  "version": "1.8.7",
   "description": "T8is builds a dependency tree.",
   "type": "module",
   "module": "./index.mjs",

package/src/manifest.mjs

@@ -4,7 +4,7 @@ import YAML from 'yaml'
 import path from 'path';
 
 import { detectCicdType } from './detect.mjs';
-import { resolveWorkspaceChildren, buildPackageJsonGlob, excludeChildren } from './workspace.mjs';
+import { resolveWorkspaceChildren, buildPackageJsonGlob, excludeChildren, resolvePackageFolder } from './workspace.mjs';
 import { resolveHashFilePath, writeHashFile } from './hashFile.mjs';
 
 // manifest.json's current schema version. Every `--save` run converts the
@@ -78,7 +78,7 @@ export const generateManifest = async (options) => {
       versions[pkgJson.name] = pkgJson.version;
       dependents[pkgJson.name] = []; // Initialize reverse dependency map
       const folderName = path.basename(path.dirname(pkgPath));
-      const packageFolder = path.relative(process.cwd(), path.dirname(path.dirname(pkgPath)));
+      const packageFolder = resolvePackageFolder(pkgPath);
       if (pkgJson['.cicd']) {
         const cicdEntry = { ...pkgJson['.cicd'] };
         delete cicdEntry.templates;
@@ -132,7 +132,7 @@ export const generateManifest = async (options) => {
       if (!cicd[pkgName].folderName)
         cicd[pkgName].folderName = path.basename(path.dirname(pkgPath));
       if (!cicd[pkgName].packageFolder)
-        cicd[pkgName].packageFolder = path.relative(process.cwd(), path.dirname(path.dirname(pkgPath)));
+        cicd[pkgName].packageFolder = resolvePackageFolder(pkgPath);
     }
   });
 

package/src/workspace.mjs

@@ -100,3 +100,8 @@ export function buildPackageJsonGlob(children) {
   if (roots.length === 0) return '*/**/package.json';
   return roots.length > 1 ? `{${roots.join(',')}}/**/package.json` : `${roots[0]}/**/package.json`;
 }
+
+// Resolve the workspace-relative package folder from a package.json path.
+export function resolvePackageFolder(packageJsonPath, workspaceRoot = process.cwd()) {
+  return path.relative(workspaceRoot, path.dirname(path.dirname(packageJsonPath)));
+}

package/tests/workspace.test.mjs

@@ -8,6 +8,7 @@ import {
   resolveWorkspaceChildren,
   buildPackageJsonGlob,
   excludeChildren,
+  resolvePackageFolder,
 } from '../src/workspace.mjs';
 
 describe('parseWorkspacePatterns', () => {
@@ -175,3 +176,10 @@ describe('excludeChildren', () => {
     expect(excludeChildren('packages,apps', ['packages', 'apps'])).toBeNull();
   });
 });
+
+describe('resolvePackageFolder', () => {
+  it('returns the workspace-relative directory containing package roots', () => {
+    expect(resolvePackageFolder('/repo/packages/example/package.json', '/repo')).toBe('packages');
+    expect(resolvePackageFolder('/repo/apps/example/package.json', '/repo')).toBe('apps');
+  });
+});