enablement-build-template-generate 1.5.0 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enablement-build-template-generate",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Generates build yaml for mono repos",
   "type": "module",
   "module": "./src/index.mjs",
@@ -9,7 +9,7 @@
   "dependencies": {
     "globby": "^16.2.0",
     "user": "^0.0.0",
-    "enablement-build-manifest": "1.6.0"
+    "enablement-build-manifest": "1.7.0"
   },
   "devDependencies": {
     "jest": "^30.4.2"

package/src/index.mjs

@@ -199,7 +199,10 @@ async function detectAndAssignNewPackages(templated, cicd, options, templatePath
     const folderName = path.basename(path.dirname(pkgPath));
     if (options.exclude.includes(folderName)) return;
 
-    const packageFolder = path.basename(path.dirname(path.dirname(pkgPath)));
+    const packageFolder = path.relative(
+      process.cwd(),
+      path.dirname(path.dirname(pkgPath)),
+    );
     const detected = detectCicdType(pkg.name, pkg, pkgPath);
     const { pipelineFile, placeholder, template } = chooseAssignmentForNewPackage({
       packageFolder,

package/tests/index.test.mjs

@@ -184,6 +184,58 @@ describe('template-generate mode parity', () => {
   });
 });
 
+describe('nested workspace package paths', () => {
+  it('preserves all workspace segments in {path} for newly discovered packages', () => {
+    const root = mkdtempSync(path.join(os.tmpdir(), 'template-generate-'));
+    try {
+      mkdirSync(path.join(root, '.cicd', 'templates'), { recursive: true });
+      mkdirSync(path.join(root, 'ux', 'packages', 'profile'), { recursive: true });
+      mkdirSync(path.join(root, 'ux', 'packages', 'seed'), { recursive: true });
+
+      writeJson(path.join(root, 'package.json'), {
+        private: true,
+        workspaces: ['ux/packages/*'],
+      });
+      writeJson(path.join(root, 'ux', 'packages', 'profile', 'package.json'), {
+        name: '@scope/profile',
+        version: '1.0.0',
+      });
+      writeJson(path.join(root, 'ux', 'packages', 'seed', 'package.json'), {
+        name: '@scope/seed',
+        version: '1.0.0',
+      });
+      writeJson(path.join(root, '.cicd', 'manifest.json'), {
+        templated: {
+          'build.yml': {
+            PACKAGES: { '@scope/seed': 'job.yml' },
+          },
+        },
+        cicd: { '@scope/seed': { folderName: 'seed', packageFolder: 'ux/packages' } },
+      });
+      writeFileSync(
+        path.join(root, '.cicd', 'templates', 'build.yml'),
+        'jobs:\n{PACKAGES}\n',
+        'utf8',
+      );
+      writeFileSync(
+        path.join(root, '.cicd', 'templates', 'job.yml'),
+        '  script: cd ./{path}/{name}\n',
+        'utf8',
+      );
+
+      const output = runGenerator(root);
+      const templatedJson = JSON.parse(
+        readFileSync(path.join(root, '.cicd', 'templates', 'templated.json'), 'utf8'),
+      );
+
+      expect(output).toContain('script: cd ./ux/packages/profile');
+      expect(templatedJson.cicd['@scope/profile'].packageFolder).toBe('ux/packages');
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
+
 describe('templated.json migration', () => {
   it("migrates manifest.json's templated section into templated.json and strips it from manifest.json", () => {
     const root = createFixtureWorkspace('manifest');