Merge pull request #78 from svenheden/robust-json-isolation

Implement robust JSON isolation between .NET console app and Node.js
svenheden · May 24, 2024 · 82fcc81 · 82fcc81
2 parents a079606 + 802ff35
commit 82fcc81
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -61,7 +61,18 @@ dotnetProcess.stdout.on('end', () => {
     let json;
 
     try {
-        json = JSON.parse(stdout);
+        // Extract the JSON content between the markers
+        const startMarker = '<<<<<<START_JSON>>>>>>';
+        const endMarker = '<<<<<<END_JSON>>>>>>';
+        const startIndex = stdout.indexOf(startMarker);
+        const endIndex = stdout.indexOf(endMarker);
+
+        if (startIndex !== -1 && endIndex !== -1 && endIndex > startIndex) {
+            const jsonString = stdout.substring(startIndex + startMarker.length, endIndex).trim();
+            json = JSON.parse(jsonString);
+        } else {
+            throw new Error('JSON markers not found or invalid order of markers.');
+        }
     } catch (error) {
         return console.error([
             'The output from `csharp-models-to-json` contains invalid JSON.',

diff --git a/lib/csharp-models-to-json/Program.cs b/lib/csharp-models-to-json/Program.cs
@@ -5,6 +5,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Extensions.Configuration;
 using Ganss.IO;
+using System.Text;
 
 namespace CSharpModelsToJson
 {
@@ -36,7 +37,13 @@ static void Main(string[] args)
             }
 
             string json = JsonSerializer.Serialize(files);
-            System.Console.WriteLine(json);
+
+            var sb = new StringBuilder();
+            sb.AppendLine("<<<<<<START_JSON>>>>>>");
+            sb.AppendLine(json);
+            sb.AppendLine("<<<<<<END_JSON>>>>>>");
+
+            System.Console.WriteLine(sb.ToString());
         }
 
         static List<string> getFileNames(List<string> includes, List<string> excludes) {