fix(errors): adhere to SARIF 2.1.0 schema and fix output stream handling

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

fix: global driver name, version

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

fix: version to have a cleaner result

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

fix: unwanted change

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

fix: more cleaner version

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

fix: more cleaner version without trailing beta

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

fix: unused variable removal

Signed-off-by: royalpinto007 <royalpinto007@gmail.com>

compiler/src/dmd/errors.d

@@ -122,33 +122,67 @@ void generateSarifReport(const ref Loc loc, const(char)* format, va_list ap, Err
     // Create an OutBuffer to store the SARIF report
     OutBuffer ob;
 
+    // Extract and clean the version string
+    const(char)* rawVersionChars = global.versionChars();
+
+    // Remove 'v' prefix if it exists
+    if (*rawVersionChars == 'v') {
+        rawVersionChars += 1;
+    }
+
+    // Find the first non-numeric character after the version number
+    const(char)* nonNumeric = strchr(rawVersionChars, '-');
+    size_t length;
+    if (nonNumeric !is null) {
+        length = cast(size_t)(nonNumeric - rawVersionChars);
+    } else {
+        length = strlen(rawVersionChars);
+    }
+
     // Build SARIF report using OutBuffer
     ob.writestring("{\n");
-    ob.writestring("  \"invocation\": {\n");
-    ob.writestring("    \"executionSuccessful\": false\n");
-    ob.writestring("  },\n");
-    ob.writestring("  \"results\": [\n    {\n");
-
-    // Write location information with relative path
-    ob.writestring("      \"location\": {\n");
-    ob.writestring("        \"artifactLocation\": {\n");
-    ob.printf("          \"uri\": \"%s\"\n", loc.filename);
-    ob.writestring("        },\n");
-    ob.writestring("        \"region\": {\n");
-    ob.printf("          \"startLine\": %d,\n", loc.linnum);
-    ob.printf("          \"startColumn\": %d\n", loc.charnum);
+    ob.writestring("  \"version\": \"2.1.0\",\n");
+    ob.writestring("  \"$schema\": \"https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0.json\",\n");
+    ob.writestring("  \"runs\": [\n    {\n");
+
+    // Tool Information
+    ob.writestring("      \"tool\": {\n");
+    ob.writestring("        \"driver\": {\n");
+    ob.printf("          \"name\": \"%s\",\n", global.compileEnv.vendor.ptr);
+    ob.printf("          \"version\": \"%.*s\",\n", cast(int)length, rawVersionChars);
+    ob.writestring("          \"informationUri\": \"https://dlang.org/dmd.html\"\n");
     ob.writestring("        }\n");
     ob.writestring("      },\n");
 
-    // Write message and ruleId
-    ob.printf("      \"message\": \"%s\",\n", formattedMessage.ptr);
-    ob.writestring("      \"ruleId\": \"DMD\"\n");
-
-    // Close the results and SARIF report
-    ob.writestring("    }\n  ],\n");
-    ob.writestring("  \"tool\": {\n");
-    ob.printf("    \"name\": \"DMD\"\n");
-    ob.writestring("  }\n");
+    // Invocation Information
+    ob.writestring("      \"invocations\": [\n");
+    ob.writestring("        {\n");
+    ob.writestring("          \"executionSuccessful\": false\n");
+    ob.writestring("        }\n");
+    ob.writestring("      ],\n");
+
+    // Results Array
+    ob.writestring("      \"results\": [\n        {\n");
+    ob.writestring("          \"ruleId\": \"DMD\",\n");
+    ob.printf("          \"message\": { \"text\": \"%s\" },\n", formattedMessage.ptr);
+
+    // Location Information
+    ob.writestring("          \"locations\": [\n            {\n");
+    ob.writestring("              \"physicalLocation\": {\n");
+    ob.writestring("                \"artifactLocation\": {\n");
+    ob.printf("                  \"uri\": \"%s\"\n", loc.filename);
+    ob.writestring("                },\n");
+    ob.writestring("                \"region\": {\n");
+    ob.printf("                  \"startLine\": %d,\n", loc.linnum);
+    ob.printf("                  \"startColumn\": %d\n", loc.charnum);
+    ob.writestring("                }\n");
+    ob.writestring("              }\n");
+    ob.writestring("            }\n");
+    ob.writestring("          ]\n");
+    ob.writestring("        }\n      ]\n");
+
+    // Close the run and SARIF JSON
+    ob.writestring("    }\n  ]\n");
     ob.writestring("}\n");
 
     // Extract the final null-terminated string and print it to stdout

compiler/test/fail_compilation/sarif_test.d

@@ -3,27 +3,43 @@ TEST_OUTPUT:
 ---
 fail_compilation/sarif_test.d: Error: undefined identifier `x`
 {
-  "invocation": {
-    "executionSuccessful": false
-  },
-  "results": [
+  "version": "2.1.0",
+  "$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0.json",
+  "runs": [
     {
-      "location": {
-        "artifactLocation": {
-          "uri": "fail_compilation/sarif_test.d"
-        },
-        "region": {
-          "startLine": 33,
-          "startColumn": 5
+      "tool": {
+        "driver": {
+          "name": "Digital Mars D",
+          "version": "2.110.0",
+          "informationUri": "https://dlang.org/dmd.html"
         }
       },
-      "message": "undefined identifier `x`",
-      "ruleId": "DMD"
+      "invocations": [
+        {
+          "executionSuccessful": false
+        }
+      ],
+      "results": [
+        {
+          "ruleId": "DMD",
+          "message": { "text": "undefined identifier `x`" },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "fail_compilation/sarif_test.d"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 5
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
-  ],
-  "tool": {
-    "name": "DMD"
-  }
+  ]
 }
 ---
 */