enablement-build-template-generate 1.7.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enablement-build-template-generate",
-  "version": "1.7.0",
+  "version": "1.8.2",
   "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.8.0"
+    "enablement-build-manifest": "1.8.7"
   },
   "devDependencies": {
     "jest": "^30.4.2"

package/src/index.mjs

@@ -17,6 +17,7 @@ import {
   wrapWithBanner,
   resolveWorkspaceChildren,
   excludeChildren,
+  resolvePackageFolder,
   buildPackageJsonGlob,
   detectCicdType,
   isAdvancedTemplatedFormat,
@@ -174,10 +175,8 @@ async function convertLegacyTemplatedJson(rawConfig, templatePath, options) {
 }
 
 // ---------------------------------------------------------------------------
-// Discover packages not yet assigned to any template and add them, using
-// detected package type + the existing convention (same packageFolder, else
-// same output type, else the default "PACKAGES" placeholder). Mutates
-// `templated`/`cicd` in place; returns true if anything was added.
+// Discover package metadata and assign packages not yet mapped to a template.
+// Mutates `templated`/`cicd` in place; returns true if either config changed.
 // ---------------------------------------------------------------------------
 async function detectAndAssignNewPackages(templated, cicd, options, templatePath) {
   const assigned = collectAssignedPackages(templated);
@@ -194,15 +193,24 @@ async function detectAndAssignNewPackages(templated, cicd, options, templatePath
   pkgPaths.forEach(pkgPath => {
     let pkg;
     try { pkg = JSON.parse(readFileSync(pkgPath, 'utf8')); } catch { return; }
-    if (!pkg.name || !pkg.version || assigned.has(pkg.name)) return;
+    if (!pkg.name || !pkg.version) return;
 
     const folderName = path.basename(path.dirname(pkgPath));
     if (options.exclude.includes(folderName)) return;
 
-    const packageFolder = path.relative(
-      process.cwd(),
-      path.dirname(path.dirname(pkgPath)),
-    );
+    const packageFolder = resolvePackageFolder(pkgPath);
+    const existingCicd = cicd[pkg.name] || {};
+    if (!existingCicd.folderName || !existingCicd.packageFolder) {
+      cicd[pkg.name] = {
+        ...existingCicd,
+        folderName: existingCicd.folderName || folderName,
+        packageFolder: existingCicd.packageFolder || packageFolder,
+      };
+      added = true;
+    }
+
+    if (assigned.has(pkg.name)) return;
+
     const detected = detectCicdType(pkg.name, pkg, pkgPath);
     const { pipelineFile, placeholder, template } = chooseAssignmentForNewPackage({
       packageFolder,
@@ -309,7 +317,10 @@ async function main(options) {
     writeFileSync(manifestPath, JSON.stringify(manifestToPersist, null, 2), 'utf8');
   }
   if (templatedJsonDirty) {
-    writeFileSync(templatedJsonPath, JSON.stringify({ version: TEMPLATED_JSON_ADVANCED_VERSION, templated, cicd }, null, 2), 'utf8');
+    const sortedCicd = Object.fromEntries(
+      Object.entries(cicd).sort(([nameA], [nameB]) => nameA.localeCompare(nameB)),
+    );
+    writeFileSync(templatedJsonPath, JSON.stringify({ version: TEMPLATED_JSON_ADVANCED_VERSION, templated, cicd: sortedCicd }, null, 2), 'utf8');
   }
 
   // ── Generate.

package/src/lib.mjs

@@ -1,7 +1,7 @@
 import path from 'path';
 import { readdirSync } from 'fs';
 import { detectCicdType } from 'enablement-build-manifest/src/detect.mjs';
-import { resolveWorkspaceChildren, buildPackageJsonGlob, excludeChildren } from 'enablement-build-manifest/src/workspace.mjs';
+import { resolveWorkspaceChildren, buildPackageJsonGlob, excludeChildren, resolvePackageFolder } from 'enablement-build-manifest/src/workspace.mjs';
 
 // Re-exposes the manifest package's pure package-type detector (output/language/
 // tier/packageType from package.json shape or csproj/pyproject.toml/Dockerfile)
@@ -12,7 +12,7 @@ export { detectCicdType };
 // (pnpm-workspace.yaml or package.json#workspaces), the exclude filter for it,
 // and the glob it implies, so template-generate can find package roots
 // without needing manifest.json.
-export { resolveWorkspaceChildren, buildPackageJsonGlob, excludeChildren };
+export { resolveWorkspaceChildren, buildPackageJsonGlob, excludeChildren, resolvePackageFolder };
 
 // Re-exposes the manifest package's dependency-order sort, so a package's
 // local dependencies (per manifest.json's "dependencies") are generated

package/tests/index.test.mjs

@@ -311,7 +311,7 @@ describe('templated.json migration', () => {
     }
   });
 
-  it('detects a new package, assigns it a template by type, and leaves existing packages untouched', () => {
+  it('detects new packages and fills missing cicd metadata for existing assignments', () => {
     const root = mkdtempSync(path.join(os.tmpdir(), 'template-generate-'));
     try {
       mkdirSync(path.join(root, '.cicd', 'templates'), { recursive: true });
@@ -346,21 +346,20 @@ describe('templated.json migration', () => {
             PACKAGES: { 'existing-lib': 'job.yml' },
           },
         },
-        cicd: {
-          'existing-lib': { folderName: 'existing-lib', packageFolder: 'packages' },
-        },
+        cicd: {},
       });
 
       const firstOut = runGenerator(root);
       const templatedAfterFirst = JSON.parse(readFileSync(path.join(root, '.cicd', 'templates', 'templated.json'), 'utf8'));
 
-      // Existing package untouched.
+      // Existing assignment remains, and missing cicd metadata is detected from its path.
       expect(templatedAfterFirst.templated['build.yml'].PACKAGES['existing-lib']).toBe('job.yml');
       expect(templatedAfterFirst.cicd['existing-lib']).toEqual({ folderName: 'existing-lib', packageFolder: 'packages' });
 
       // New package detected, classified as a node package, and assigned the node build template.
       expect(templatedAfterFirst.templated['build.yml'].PACKAGES['new-svc']).toBe('_build_node_package.yml');
       expect(templatedAfterFirst.cicd['new-svc']).toEqual({ folderName: 'new-svc', packageFolder: 'apps' });
+      expect(Object.keys(templatedAfterFirst.cicd)).toEqual(['existing-lib', 'new-svc']);
 
       expect(firstOut).toContain('NAME=existing-lib');
       expect(firstOut).toContain('NAME=new-svc');