Address PR review feedback

Author: data-douser

extractors/cds/tools/dist/cds-extractor.bundle.js

@@ -259,12 +259,14 @@ export function cacheInstallDependencies(
         );
         continue;
       }
+    }
 
-      // Copy the project's .npmrc (if any) so npm respects custom registries
-      const firstProjectDir = Array.from(dependencyGraph.projects.keys())[0];
-      if (firstProjectDir) {
-        copyNpmrcToCache(cacheDir, join(sourceRoot, firstProjectDir));
-      }
+    // Ensure the cache directory has an .npmrc that reflects the projects' registry configuration
+    const npmrcProjectDir = Array.from(dependencyGraph.projects.values())
+      .map(project => project.projectDir)
+      .find(projectDir => projectDir && existsSync(join(sourceRoot, projectDir, '.npmrc')));
+    if (npmrcProjectDir) {
+      copyNpmrcToCache(cacheDir, join(sourceRoot, npmrcProjectDir));
     }
 
     // Try to install dependencies in the cache directory

extractors/cds/tools/dist/cds-extractor.bundle.js.map

@@ -809,5 +809,72 @@ describe('installer', () => {
 
       expect(fs.copyFileSync).not.toHaveBeenCalled();
     });
+
+    it('should find .npmrc from the project that has one, not just the first project', () => {
+      // Only project2 has an .npmrc; project1 does not
+      (fs.existsSync as jest.Mock).mockImplementation(
+        (p: string) => p === '/source/project2/.npmrc',
+      );
+
+      const dependencyGraph = createMockDependencyGraph([
+        {
+          projectDir: 'project1',
+          packageJson: {
+            name: 'project1',
+            dependencies: { '@sap/cds': '6.1.3' },
+            devDependencies: { '@sap/cds-dk': '6.0.0' },
+          },
+        },
+        {
+          projectDir: 'project2',
+          packageJson: {
+            name: 'project2',
+            dependencies: { '@sap/cds': '6.1.3' },
+            devDependencies: { '@sap/cds-dk': '6.0.0' },
+          },
+        },
+      ]);
+
+      cacheInstallDependencies(dependencyGraph, '/source', '/codeql');
+
+      expect(fs.copyFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('.npmrc'),
+        expect.stringContaining('.npmrc'),
+      );
+    });
+
+    it('should copy .npmrc even when the cache directory already exists', () => {
+      // Simulate cache directory already existing but .npmrc present
+      (fs.existsSync as jest.Mock).mockImplementation((p: string) => {
+        if (p === '/source/project1/.npmrc') return true;
+        // Cache root exists
+        if (
+          p.includes('.cds-extractor-cache') &&
+          !p.includes('node_modules') &&
+          !p.includes('.npmrc')
+        )
+          return true;
+        return false;
+      });
+
+      const dependencyGraph = createMockDependencyGraph([
+        {
+          projectDir: 'project1',
+          packageJson: {
+            name: 'project1',
+            dependencies: { '@sap/cds': '6.1.3' },
+            devDependencies: { '@sap/cds-dk': '6.0.0' },
+          },
+        },
+      ]);
+
+      cacheInstallDependencies(dependencyGraph, '/source', '/codeql');
+
+      // .npmrc should still be copied even though cache dir already exists
+      expect(fs.copyFileSync).toHaveBeenCalledWith(
+        '/source/project1/.npmrc',
+        expect.stringContaining('.npmrc'),
+      );
+    });
   });
 });

extractors/cds/tools/src/packageManager/cacheInstaller.ts

@@ -12,9 +12,9 @@ if not defined CODEQL_EXTRACTOR_CDS_SKIP_EXTRACTION (
         -- ^
         "%CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE%"
 
-    if %ERRORLEVEL% neq 0 (
-        echo database index-files for CDS (.cds) files failed with exit code %ERRORLEVEL%.
-        exit /b %ERRORLEVEL%
+    if errorlevel 1 (
+        echo database index-files for CDS (.cds) files failed.
+        exit /b 1
     )
 
     echo Finished running database index-files for CDS (.cds) files.