Merge branch 'main' into data-douser/extractor-dev-2

Author: data-douser

.github/workflows/run-codeql-unit-tests-javascript.yml

@@ -96,10 +96,26 @@ jobs:
             for cds_file in $(find . -type f \( -iname '*.cds' \) -print)
             do
               echo "I am compiling $cds_file"
+              _out_path="${cds_file}.json"
               cds compile $cds_file \
-                -2 json \
                 --locations \
-                > "$cds_file.json" 2> "$cds_file.err"
+                --to json \
+                --dest "$_out_path" \
+                2> "$cds_file.err"
+              # Check if the output is a regular file or a (sub)directory, where
+              # files generated in an output directory will need to have the file
+              # extension changed from '.json' to '.cds.json', but we don't need
+              # to rename anything if the cds compiler just generated a single
+              # '.cds.json' file.
+              if [ -d "$_out_path" ]
+              then
+                for json_file in $(find "$_out_path" -type f \( -iname '*.json' \) -print)
+                do
+                  _new_path="${json_file%.json}.cds.json"
+                  echo "Renaming CDS compiler generated JSON file $json_file to $_new_path"
+                  mv "$json_file" "$_new_path"
+                done
+              fi
             done
             popd
           done

javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDL.qll

@@ -165,8 +165,8 @@ class CdlService extends CdlElement {
   CdlService() { kind = CdlServiceKind(this.getPropStringValue("kind")) }
 
   UserDefinedApplicationService getImplementation() {
-    this.getFile().getStem() = result.getFile().getStem() + ".cds" and
-    this.getFile().getParentContainer() = this.getFile().getParentContainer()
+    result.getFile().getRelativePath().regexpReplaceAll("\\.[^.]+$", ".cds.json") =
+      this.getFile().getRelativePath()
   }
 
   /**

javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CDS.qll

@@ -442,13 +442,7 @@ abstract class UserDefinedApplicationService extends UserDefinedService {
   /**
    * Gets the CDS definition of this service.
    */
-  CdlService getCdsDeclaration() {
-    exists(CdsFile cdsFile |
-      cdsFile.getStem() = this.getFile().getStem() + ".cds" and
-      cdsFile.getParentContainer() = this.getFile().getParentContainer() and
-      result.getFile() = cdsFile
-    )
-  }
+  CdlService getCdsDeclaration() { result.getImplementation() = this }
 
   /**
    * Gets the name of this service.