Fix CDS extractor dist and shell exec

Author: data-douser

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

@@ -30,7 +30,8 @@ export function getCdsVersion(cdsCommand: string, cacheDir?: string): string | u
     }
 
     // Execute the CDS command with the --version flag
-    const result = spawnSync(cdsCommand, ['--version'], spawnOptions);
+    // When shell: true is used, concatenate command and args to avoid DEP0190 deprecation warning
+    const result = spawnSync(`${cdsCommand} --version`, spawnOptions);
     if (result.status === 0 && result.stdout) {
       const versionOutput = result.stdout.toString().trim();
       // Extract version number, which is typically in formats like "@sap/cds: 6.1.3" or similar

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

@@ -41,7 +41,7 @@ export function runJavaScriptExtractor(
    * the current working directory set to the project (source) root directory
    * because it assumes it is running from there.
    */
-  const result: SpawnSyncReturns<Buffer> = spawnSync(autobuildScriptPath, [], {
+  const result: SpawnSyncReturns<Buffer> = spawnSync(autobuildScriptPath, {
     cwd: sourceRoot,
     env: process.env,
     shell: true,

extractors/cds/tools/src/cds/compiler/version.ts

@@ -27,7 +27,7 @@ describe('version.ts', () => {
       const version = getCdsVersion('cds');
 
       expect(version).toBe('6.1.3');
-      expect(mockSpawnSync).toHaveBeenCalledWith('cds', ['--version'], {
+      expect(mockSpawnSync).toHaveBeenCalledWith('cds --version', {
         shell: true,
         stdio: 'pipe',
         env: { ...process.env },
@@ -122,7 +122,7 @@ describe('version.ts', () => {
       const version = getCdsVersion('cds', cacheDir);
 
       expect(version).toBe('6.1.3');
-      expect(mockSpawnSync).toHaveBeenCalledWith('cds', ['--version'], {
+      expect(mockSpawnSync).toHaveBeenCalledWith('cds --version', {
         shell: true,
         stdio: 'pipe',
         env: {
@@ -153,7 +153,7 @@ describe('version.ts', () => {
       const version = getCdsVersion('cds', cacheDir);
 
       expect(version).toBe('6.1.3');
-      expect(mockSpawnSync).toHaveBeenCalledWith('cds', ['--version'], {
+      expect(mockSpawnSync).toHaveBeenCalledWith('cds --version', {
         shell: true,
         stdio: 'pipe',
         env: expect.objectContaining({
@@ -230,7 +230,7 @@ describe('version.ts', () => {
       const version = getCdsVersion('npx cds');
 
       expect(version).toBe('6.1.3');
-      expect(mockSpawnSync).toHaveBeenCalledWith('npx cds', ['--version'], expect.any(Object));
+      expect(mockSpawnSync).toHaveBeenCalledWith('npx cds --version', expect.any(Object));
     });
 
     it('should handle multiline version output', () => {

extractors/cds/tools/src/codeql.ts

@@ -1,5 +1,6 @@
 import * as childProcess from 'child_process';
 
+import type { CdsDependencyGraph } from '../../src/cds/parser/types';
 import {
   handleEarlyExit,
   runJavaScriptExtractor,
@@ -69,7 +70,6 @@ describe('codeql', () => {
       expect(result).toEqual({ success: true });
       expect(childProcess.spawnSync).toHaveBeenCalledWith(
         '/path/to/autobuild.sh',
-        [],
         expect.objectContaining({
           cwd: '/path/to/source',
           env: process.env,
@@ -185,7 +185,7 @@ describe('codeql', () => {
         '/path/to/source',
         '/path/to/autobuild.sh',
         '/path/to/codeql',
-        dependencyGraph as any,
+        dependencyGraph as CdsDependencyGraph,
       );
 
       expect(result).toBe(true);
@@ -268,7 +268,7 @@ describe('codeql', () => {
         '/path/to/source',
         '/path/to/autobuild.sh',
         '/path/to/codeql',
-        dependencyGraph as any,
+        dependencyGraph as CdsDependencyGraph,
       );
 
       expect(addJavaScriptExtractorDiagnostic).toHaveBeenCalledWith(
@@ -287,7 +287,7 @@ describe('codeql', () => {
     beforeEach(() => {
       mockExit = jest.spyOn(process, 'exit').mockImplementation((() => {
         throw new Error('process.exit called');
-      }) as any);
+      }) as never);
       consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
       (filesystem.createMarkerFile as jest.Mock).mockReturnValue('/path/to/marker.js');
       (filesystem.removeMarkerFile as jest.Mock).mockReturnValue(undefined);