use full test object; reset scroll

Author: gregsdennis

LearnJsonEverything/Services/InstructionsBuilder.cs

@@ -1,5 +1,6 @@
-using System.Text.Json;
+using System.Text;
 using System.Text.Json.Nodes;
+using Humanizer;
 using Json.More;
 
 namespace LearnJsonEverything.Services;
@@ -66,14 +67,46 @@ private static string BuildApiLink(LessonData lesson) =>
 
     private static string BuildTestList(JsonArray testData)
     {
-        var tests = testData.Deserialize(SerializerContext.Default.SchemaTestArray)!;
-        string[] lines =
-        [
-            "| Instance | Is Valid |",
-            "|:-|:-:|",
-            .. tests.Select(test => $"|`{test.Instance.AsJsonString()}`|{test.IsValid}|")
-        ];
-
-        return string.Join(Environment.NewLine, lines);
+		var lines = new List<string>();
+
+		var sample = testData[0]!.AsObject();
+		lines.Add($"|{string.Join("|", sample.Select(x => x.Key.Pascalize().Humanize()))}|");
+		lines.Add($"|{string.Join("|", sample.Select(_ => ":-"))}|");
+
+		foreach (var test in testData)
+		{
+			var lineContent = new StringBuilder("|");
+			foreach (var kvp in sample)
+			{
+				lineContent.Append(MaybeCode(test![kvp.Key], kvp.Key));
+				lineContent.Append('|');
+			}
+
+			lines.Add(lineContent.ToString());
+		}
+
+		return string.Join(Environment.NewLine, lines);
+
+		//string[] lines =
+  //      [
+  //          "| Instance | Is Valid |",
+  //          "|:-|:-:|",
+  //          .. testData.Select(test => $"|`{test!["instance"]!.Print()}`|{test["isValid"]!.Print()}|")
+  //      ];
+
+  //      return string.Join(Environment.NewLine, lines);
     }
+
+    private static readonly string[] KeysToFormat =
+    [
+	    "instance",
+	    "format"
+    ];
+
+	private static string MaybeCode(JsonNode? node, string key)
+	{
+		if (KeysToFormat.Contains(key)) return $"`{node.Print()}`";
+
+		return node?.Print();
+	}
 }

LearnJsonEverything/Services/LessonData.cs

@@ -8,6 +8,7 @@ public class LessonData
 {
 	public int Index { get; set; }
 	public Guid Id { get; set; }
+	public bool Skip { get; set; }
 	public string Title { get; set; }
 	public string Background { get; set; }
 	public string Docs { get; set; }

LearnJsonEverything/Services/LessonPlan.cs

@@ -61,7 +61,7 @@ public class LessonPlanJsonConverter : JsonConverter<LessonPlan>
 		var lessonData = JsonSerializer.Deserialize<LessonData[]>(ref reader, options)!;
 #pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
 
-		return new LessonPlan(lessonData);
+		return new LessonPlan(lessonData.Where(x => !x.Skip).ToArray());
 	}
 
 	public override void Write(Utf8JsonWriter writer, LessonPlan value, JsonSerializerOptions options)

LearnJsonEverything/Services/Runners/SchemaRunner.cs

@@ -1,37 +1,28 @@
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Json.More;
-using Json.Schema;
+using Json.Schema;
 
 namespace LearnJsonEverything.Services.Runners;
 
 public static class SchemaRunner
 {
-	public class SchemaTest
-	{
-		public JsonNode? Instance { get; set; }
-		public bool IsValid { get; set; }
-	}
-
 	public static string[] Run(LessonData lesson)
 	{
 		var (runner, errors) = CompilationHelpers.GetRunner<EvaluationResults>(lesson);
 
 		if (runner is null) return errors;
 
-		var tests = lesson.Tests.Deserialize(SerializerContext.Default.SchemaTestArray)!;
 		var results = new List<string>();
 
 		var correct = true;
-		foreach (var test in tests)
+		foreach (var test in lesson.Tests)
 		{
-			var result = runner.Run(new JsonObject { ["instance"] = test.Instance });
-			correct &= test.IsValid == result.IsValid;
-			results.Add($"{(test.IsValid == result.IsValid ? Iconography.SuccessIcon : Iconography.ErrorIcon)} {test.Instance.AsJsonString()}");
+			var expectedValidity = test!["isValid"]!.GetValue<bool>();
+			var result = runner.Run(test.AsObject());
+			correct &= expectedValidity == result.IsValid;
+			results.Add($"{(expectedValidity == result.IsValid ? Iconography.SuccessIcon : Iconography.ErrorIcon)} {test["instance"]!.Print()}");
 		}
 
 		lesson.Achieved |= correct;
 
 		return [.. results];
 	}
-}
+}

LearnJsonEverything/Services/SerializationHelpers.cs

@@ -1,13 +1,25 @@
-using LearnJsonEverything.Services.Runners;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using Microsoft.CodeAnalysis.CSharp;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
+using Json.More;
 using Json.Schema;
 
 namespace LearnJsonEverything.Services;
 
 public static class SerializationHelpers
 {
+	private static readonly JsonSerializerOptions _writeOptions = 
+			new()
+			{
+				TypeInfoResolverChain = { SerializerContext.Default },
+				PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+				Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+			};
+
+	public static string Print(this JsonNode? node) => node.AsJsonString(_writeOptions);
+
 	public static string ToLiteral(this string valueTextForCompiler)
 	{
 		var formatted = SymbolDisplay.FormatLiteral(valueTextForCompiler, true);
@@ -22,6 +34,5 @@ public static string ToLiteral(this string valueTextForCompiler)
 [JsonSerializable(typeof(LessonPlan))]
 [JsonSerializable(typeof(LessonData[]))]
 [JsonSerializable(typeof(SchemaSaveData[]))]
-[JsonSerializable(typeof(SchemaRunner.SchemaTest[]))]
 [JsonSourceGenerationOptions(WriteIndented = true, PropertyNameCaseInsensitive = true)]
 internal partial class SerializerContext : JsonSerializerContext;

LearnJsonEverything/Shared/Teacher.razor

@@ -30,7 +30,7 @@
 		</div>
 	</div>
 	<div class="col-4 d-flex h-100">
-		<div class="grid-panel flex-grow-1 scroll">
+		<div id="instructions-panel" class="grid-panel flex-grow-1 scroll">
 			<MarkdownSpan Content="@Instructions"></MarkdownSpan>
 		</div>
 	</div>
@@ -84,6 +84,7 @@
 			var userCode = await _codeEditor.GetValue();
 
 			await _outputEditor.SetValue(string.Empty);
+			await _outputEditor.SetLanguageAsync("json", JsRuntime);
 
 			_currentLesson!.UserCode = userCode;
 			var results = SchemaRunner.Run(_currentLesson);
@@ -95,7 +96,7 @@
 		catch (Exception e)
 		{
 			await _outputEditor.SetLanguageAsync("text", JsRuntime);
-			await _outputEditor.SetValue(e.Message);
+			await _outputEditor.SetValue($"An exception occurred while executing user code:\n\n{e.GetType().Name}: {e.Message}\n{e.StackTrace}");
 		}
 	}
 
@@ -124,6 +125,7 @@
 		await _codeEditor.SetValue(_currentLesson.UserCode ?? string.Empty);
 		await _outputEditor.SetValue(string.Empty);
 		UpdateNavigation();
+		await JsRuntime.InvokeVoidAsync("BlazorScrollToTopOfElement", "instructions-panel");
 	}
 
 	private void UpdateNavigation()

LearnJsonEverything/wwwroot/css/app.css

@@ -95,6 +95,10 @@ a,
 	border-style: solid;
 }
 
+.monaco-editor {
+  position: absolute !important;
+}
+
 #blazor-error-ui {
 	background-color: #1e1e1e;
 	bottom: 0;