Fix CDS extractor monorepo support

Fixes a regression in the CDS extractor's processing of monorepos.

Author: data-douser

extractors/cds/tools/index-files.cmd

@@ -1,59 +1,48 @@
 @echo off
 
-if "%~1"=="" (
-    echo Usage: %0 ^<response_file_path^>
-    exit /b 1
-)
+REM This script currently:
+REM - ignores any arguments passed to it;
+REM - assumes it is run from the root of the project source directory;
 
 where node >nul 2>nul
 if %ERRORLEVEL% neq 0 (
     echo node executable is required (in PATH) to run the 'cds-extractor.js' script. Please install Node.js and try again.
     exit /b 2
 )
 
-where npm >nul 2>nul
-if %ERRORLEVEL% neq 0 (
-    echo npm executable is required (in PATH) to install the dependencies for the 'cds-extractor.js' script.
-    exit /b 3
-)
-
-set "_response_file_path=%~1"
-set "_run_mode=index-files"
-set "_script_dir=%~dp0"
-REM Set _cwd before changing the working directory to the script directory.
-REM We assume this script is called from the source root directory of the
-REM to be scanned project.
+REM Set the _cwd variable to the present working directory as the directory
+REM from which this script was called, which we assume is the "source root" directory
+REM of the project that to be scanned / indexed.
 set "_cwd=%CD%"
+set "_script_dir=%~dp0"
+set "_cds_extractor_js_path=%_script_dir%dist\cds-extractor.js"
+set "_cds_extractor_node_modules_dir=%_script_dir%node_modules"
 
-echo Checking response file for CDS files to index
+if not exist "%_cds_extractor_js_path%" (
+    echo Error: The 'cds-extractor.js' script does not exist at the expected path: %_cds_extractor_js_path%
+    echo Please ensure that the script has been built and is available in the 'dist' directory.
+    exit /b 3
+)
 
-REM Terminate early if the _response_file_path doesn't exist or is empty,
-REM which indicates that no CDS files were selected or found.
-if not exist "%_response_file_path%" (
-    echo 'codeql database cds-extractor --language cds' command terminated early as response file '%_response_file_path%' does not exist or is empty. This is because no CDS files were selected or found.
-    exit /b 0
+if not exist "%_cds_extractor_node_modules_dir%" (
+    echo Error: The 'node_modules' directory does not exist at the expected path: %_cds_extractor_node_modules_dir%
+    echo Please ensure that the dependencies have been installed by running 'npm install' in the 'extractors\cds\tools' directory.
+    exit /b 4
 )
 
-REM Change to the directory of this script to ensure that npm looks up the
+REM Change to the directory of this batch script to ensure that npm looks up the
 REM package.json file in the correct directory and installs the dependencies
 REM (i.e. node_modules) relative to this directory. This is technically a
 REM violation of the assumption that extractor scripts will be run with the
 REM current working directory set to the root of the project source, but we
 REM also need node_modules to be installed here and not in the project source
 REM root, so we make a compromise of:
-REM  1. changing to this script's directory;
-REM  2. installing node dependencies here;
-REM  3. passing the original working directory as a parameter to the
+REM  1. changing to this batch script's directory;
+REM  2. passing the original working directory as a parameter to the
 REM     cds-extractor.js script;
-REM  4. expecting the cds-extractor.js script to immediately change back to
-REM     the original working (aka the project source root) directory.
+REM  3. expecting the cds-extractor.js script to immediately change back to
+REM     original working (aka the project source root) directory.
 
 cd /d "%_script_dir%" && ^
-echo Installing node package dependencies && ^
-npm install --quiet --no-audit --no-fund && ^
-echo Building TypeScript code && ^
-npm run build && ^
 echo Running the 'cds-extractor.js' script && ^
-node "%_script_dir%out\cds-extractor.js" "%_run_mode%" "%_cwd%" "%_response_file_path%"
-
-exit /b %ERRORLEVEL%
+node "%_cds_extractor_js_path%" "%_cwd%"

extractors/cds/tools/index-files.sh

@@ -18,12 +18,12 @@ fi
 # of the project that to be scanned / indexed.
 _cwd="$PWD"
 _script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-_cds_extractor_js_path="${_script_dir}/out/cds-extractor.js"
+_cds_extractor_js_path="${_script_dir}/dist/cds-extractor.js"
 _cds_extractor_node_modules_dir="${_script_dir}/node_modules"
 
 if [ ! -f "${_cds_extractor_js_path}" ]; then
     echo "Error: The 'cds-extractor.js' script does not exist at the expected path: ${_cds_extractor_js_path}"
-    echo "Please ensure that the script has been built and is available in the 'out' directory."
+    echo "Please ensure that the script has been built and is available in the 'dist' directory."
     exit 3
 fi
 

extractors/cds/tools/package.json

@@ -2,11 +2,11 @@
   "name": "@advanced-security/codeql-sap-js_index-cds-files",
   "version": "1.0.0",
   "description": "CodeQL extractor for DB indexing of .cds.json files produced by the 'cds' compiler.",
-  "main": "out/cds-extractor.js",
+  "main": "dist/cds-extractor.js",
   "scripts": {
     "build": "tsc",
     "build:all": "npm run lint:fix && npm run test:coverage && npm run build",
-    "clean": "rm -rf out coverage",
+    "clean": "rm -rf coverage dist",
     "prebuild": "npm run clean",
     "lint": "eslint --ext .ts src/",
     "lint:fix": "eslint --ext .ts --fix cds-extractor.ts src/ test/src/",