Merge branch 'main' into tte/disable-null-bubbling-option

Author: michaelstaib

.github/workflows/ci.yml

@@ -183,13 +183,6 @@ jobs:
             7.x
             8.x
 
-      - uses: actions/cache@v3
-        with:
-          path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-nuget-
-
       - name: Run Build
         id: run-build
         run: dotnet build ${{ matrix.path }} --framework net7.0 --verbosity q --property WarningLevel=0
@@ -282,11 +275,7 @@ jobs:
           path: |
             **/__mismatch__/*
 
-      - name: Fail if tests failed or were cancelled
-        run: exit 1
-        if: |
-          steps.run-tests.outcome == 'failure' ||
-          steps.run-tests.outcome == 'cancelled'
+
 
   codeql:
     name: CodeQL
@@ -311,13 +300,6 @@ jobs:
           7.x
           8.x
 
-    - uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-
     - name: Restore
       run: ./build.sh restore
 
@@ -350,14 +332,6 @@ jobs:
           7.x
           8.x
 
-    - uses: actions/cache@v3
-      if: ${{ !cancelled() }}
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-
     - name: Create All.sln
       if: ${{ !cancelled() }}
       run: ./build.sh CreateAllSln

.github/workflows/coverage.yml

@@ -58,13 +58,6 @@ jobs:
             7.x
             8.x
 
-      - uses: actions/cache@v3
-        with:
-          path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-nuget-
-
       - name: Run Build
         id: run-build
         run: dotnet build ${{ matrix.path }} --framework net7.0 --verbosity q --property WarningLevel=0
@@ -128,14 +121,6 @@ jobs:
           7.x
           8.x
 
-    - uses: actions/cache@v3
-      if: ${{ !cancelled() }}
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-
     - name: Create All.sln
       if: ${{ !cancelled() }}
       run: ./build.sh CreateAllSln

.github/workflows/release.yml

@@ -24,13 +24,6 @@ jobs:
       id: get_version
       run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
-    - uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-
     - name: Build Packages
       run: |
         ./build.sh pack --SemVersion ${{ env.GIT_TAG }} --Configuration Release

.gitignore

@@ -323,3 +323,4 @@ conferences.db-wal
 .server/
 .nuke/
 .mono/
+packages.lock.json

src/CookieCrumble/src/CookieCrumble/Extensions/SnapshotExtensions.cs

@@ -15,7 +15,7 @@ public static void MatchInlineSnapshot(
 
     public static void MatchSnapshot(this Snapshot value)
         => value.Match();
-
+    
     public static void MatchSnapshot(
         this object? value,
         object? postFix = null,

src/CookieCrumble/src/CookieCrumble/Formatters/ExecutionResultSnapshotValueFormatter.cs

@@ -1,5 +1,4 @@
 using System.Buffers;
-using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using HotChocolate;
@@ -21,6 +20,26 @@ protected override void Format(IBufferWriter<byte> snapshot, IExecutionResult va
             FormatStreamAsync(snapshot, (IResponseStream)value).Wait();
         }
     }
+    
+    protected override void FormatMarkdown(IBufferWriter<byte> snapshot, IExecutionResult value)
+    {
+        if (value.Kind is ExecutionResultKind.SingleResult)
+        {
+            snapshot.Append("```json");
+            snapshot.AppendLine();
+            snapshot.Append(value.ToJson());
+        }
+        else
+        {
+            snapshot.Append("```text");
+            snapshot.AppendLine();
+            FormatStreamAsync(snapshot, (IResponseStream)value).Wait();
+        }
+        
+        snapshot.AppendLine();
+        snapshot.Append("```");
+        snapshot.AppendLine();
+    }
 
     private static async Task FormatStreamAsync(
         IBufferWriter<byte> snapshot,
@@ -79,7 +98,7 @@ private static async Task FormatStreamAsync(
     }
 }
 
-internal class JsonResultPatcher
+internal sealed class JsonResultPatcher
 {
     private const string _data = "data";
     private const string _items = "items";

src/CookieCrumble/src/CookieCrumble/Formatters/GraphQLHttpResponseFormatter.cs

@@ -65,4 +65,4 @@ private static async Task FormatStreamAsync(
             }
         }
     }
-}
+}

src/CookieCrumble/src/CookieCrumble/Formatters/GraphQLSnapshotValueFormatter.cs

@@ -1,5 +1,4 @@
 using System.Buffers;
-using HotChocolate;
 using HotChocolate.Language;
 using HotChocolate.Language.Utilities;
 
@@ -27,4 +26,14 @@ protected override void Format(IBufferWriter<byte> snapshot, ISyntaxNode value)
 
         ArrayPool<char>.Shared.Return(buffer);
     }
+    
+    protected override void FormatMarkdown(IBufferWriter<byte> snapshot, ISyntaxNode value)
+    {
+        snapshot.Append("```graphql");
+        snapshot.AppendLine();
+        Format(snapshot, value);
+        snapshot.AppendLine();
+        snapshot.Append("```");
+        snapshot.AppendLine();
+    }
 }

src/CookieCrumble/src/CookieCrumble/Formatters/IMarkdownSnapshotValueFormatter.cs

@@ -0,0 +1,32 @@
+using System.Buffers;
+
+namespace CookieCrumble.Formatters;
+
+/// <summary>
+/// Formats a snapshot segment value for the snapshot file.
+/// </summary>
+public interface IMarkdownSnapshotValueFormatter
+{
+    /// <summary>
+    /// Specifies if the formatter can handle the snapshot segment value.
+    /// </summary>
+    /// <param name="value">
+    /// The snapshot segment value.
+    /// </param>
+    /// <returns>
+    /// <c>true</c> if the formatter can handle the snapshot segment value;
+    /// otherwise, <c>false</c>.
+    /// </returns>
+    bool CanHandle(object? value);
+
+    /// <summary>
+    /// Formats the specified snapshot segment value for the snapshot file.
+    /// </summary>
+    /// <param name="snapshot">
+    /// The snapshot file writer.
+    /// </param>
+    /// <param name="value">
+    ///  The snapshot segment vale.
+    /// </param>
+    void FormatMarkdown(IBufferWriter<byte> snapshot, object? value);
+}

src/CookieCrumble/src/CookieCrumble/Formatters/ISnapshotValueFormatter.cs

@@ -29,4 +29,4 @@ public interface ISnapshotValueFormatter
     ///  The snapshot segment vale.
     /// </param>
     void Format(IBufferWriter<byte> snapshot, object? value);
-}
+}