it's working; it's working

Author: gregsdennis

Diff for: LearnJsonEverything.Template/ILessonRunner.cs

@@ -1,6 +1,10 @@
-namespace LearnJsonEverything.Template;
+// ReSharper disable CheckNamespace
+
+using System.Text.Json.Nodes;
+
+namespace LearnJsonEverything;
 
 public interface ILessonRunner<out T>
 {
-	T Run();
+	T Run(JsonObject context);
 }

Diff for: LearnJsonEverything.Template/LearnJsonEverything.Template.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Diff for: LearnJsonEverything/LearnJsonEverything.csproj

@@ -7,6 +7,7 @@
 	  <NoWarn>NU1701</NoWarn>
 	  <PublishTrimmed>false</PublishTrimmed>
 	  <LangVersion>latest</LangVersion>
+    <WasmEnableWebcil>false</WasmEnableWebcil>
   </PropertyGroup>
 
   <ItemGroup>

Diff for: LearnJsonEverything/Pages/Schema.razor

@@ -1,6 +1,6 @@
 @page "/json-schema"
 
-<Teacher LessonSource="/data/lessons/schema.json"></Teacher>
+<Teacher LessonSource="/data/lessons/schema.yaml"></Teacher>
 
 @code {
 

Diff for: LearnJsonEverything/Services/EditorOptions.cs

@@ -4,24 +4,24 @@ namespace LearnJsonEverything.Services
 {
 	public static class EditorOptions
 	{
-		public static StandaloneEditorConstructionOptions Basic() =>
+		public static StandaloneEditorConstructionOptions Basic(string lang, int tab) =>
 			new()
 			{
 				AutomaticLayout = true,
-				Language = "csharp",
+				Language = lang,
 				Theme = "vs-dark",
 				SelectOnLineNumbers = true,
 				Scrollbar = new EditorScrollbarOptions
 				{
 					AlwaysConsumeMouseWheel = false
 				},
 				ScrollBeyondLastLine = false,
-				TabSize = 4
+				TabSize = tab
 			};
 
-		public static StandaloneEditorConstructionOptions Readonly()
+		public static StandaloneEditorConstructionOptions Readonly(string lang, int tab)
 		{
-			var options = Basic();
+			var options = Basic(lang, tab);
 			options.ReadOnly = true;
 
 			return options;

Diff for: LearnJsonEverything/Services/LessonData.cs

@@ -8,5 +8,6 @@ public class LessonData
 	public Guid Id { get; set; }
 	public string Title { get; set; }
 	public string Instructions { get; set; }
-	public JsonObject? Data { get; set; }
+	public string ContextCode { get; set; }
+	public JsonArray? Tests { get; set; }
 }

Diff for: LearnJsonEverything/Services/Runners/SchemaRunner.cs

@@ -1,35 +1,22 @@
 using System.Reflection;
 using System.Text.Json;
+using System.Text.Json.Nodes;
+using Json.More;
 using Json.Schema;
-using LearnJsonEverything.Template;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 
+using static LearnJsonEverything.Services.SerializationHelpers;
+
 namespace LearnJsonEverything.Services.Runners;
 
 public static class SchemaRunner
 {
-	private const string ContextCode =
-		"""
-		using System;
-		using System.Collections.Generic;
-		using System.Text.Json;
-		using System.Text.Json.Nodes;
-		using System.Text.Json.Serialization;
-		using Json.Schema;
-		
-		namespace JsonEverythingTemp;
-		
-		public class Lesson : ILessonRunner<EvaluationResults>
-		{
-			public EvaluationResults Run()
-			{
-				var instance = JsonNode.Parse("/* INSTANCE */");
-				
-				/* USER CODE */
-			}
-		}
-		""";
+	private class SchemaTest
+	{
+		public JsonNode? Instance { get; set; }
+		public bool IsValid { get; set; }
+	}
 
 	private const string Instructions =
 		$"""
@@ -40,20 +27,50 @@ public EvaluationResults Run()
 		 ### Code template
 
 		 ```csharp
-		 {ContextCode}
+		 /* CONTEXT CODE */
 		 ```
+
+		 ### Tests
+		 /* TESTS */
+		 
 		 """;
 
+	private const string SuccessIcon = "✔";
+	private const string ErrorIcon = "❌";
+	private const string WarnIcon = "⚠";
+	private const string MessageIcon = "ⓘ";
+
+	//public static string ErrorIcon = "<span style=\"foreground:red;\">❌</span>";
+	//public static string WarnIcon = "<span style=\"foreground:amber;\">⚠</span>";
+	//public static string MessageIcon = "<span style=\"foreground:lightblue;\">ⓘ</span>";
+
 	public static string BuildInstructions(LessonData lesson) => Instructions
 		.Replace("/* TITLE */", lesson.Title)
 		.Replace("/* INSTRUCTIONS */", lesson.Instructions)
-		.Replace("/* INSTANCE */", JsonSerializer.Serialize(lesson.Data?["instance"]));
+		.Replace("/* CONTEXT CODE */", lesson.ContextCode)
+		.Replace("/* TESTS */", BuildTestList(lesson.Tests));
 
-	public static string Run(string userCode, LessonData lesson, MetadataReference[] references)
+	private static string BuildTestList(JsonArray testData)
 	{
-		var fullSource = ContextCode
-			.Replace("/* USER CODE */", userCode)
-			.Replace("/* INSTANCE */", JsonSerializer.Serialize(lesson.Data?["instance"]));
+		var tests = testData.Deserialize<SchemaTest[]>(SerializerOptions);
+		var lines = new List<string>
+		{
+			"| Instance | Is Valid |",
+			"|:-|:-:|"
+		};
+
+		foreach (var test in tests)
+		{
+			lines.Add($"|`{test.Instance.AsJsonString()}`|{test.IsValid}|");
+		}
+
+		return string.Join(Environment.NewLine, lines);
+	}
+
+	public static string[] Run(string userCode, LessonData lesson, MetadataReference[] references)
+	{
+		var fullSource = lesson.ContextCode
+			.Replace("/* USER CODE */", userCode);
 
 		var syntaxTree = CSharpSyntaxTree.ParseText(fullSource);
 		var assemblyPath = Path.ChangeExtension(Path.GetTempFileName(), "dll");
@@ -69,24 +86,43 @@ public static string Run(string userCode, LessonData lesson, MetadataReference[]
 		var emitResult = compilation.Emit(dllStream, pdbStream, xmlStream);
 		if (!emitResult.Success)
 		{
-			Console.WriteLine("You may expect a list of what compilation errors there are, but unfortunately " +
-			                  "Roslyn doesn't seem to be giving that information out (or I don't know how to " +
-			                  "interpret it).  So instead, here are the errors in raw form.  Good luck.  If you " +
-			                  "know what these mean, please drop a line in a GitHub issue.");
-			//var errors = string.Join("\n", emitResult.Diagnostics.Where(x => x.Severity == DiagnosticSeverity.Error)
-			//	.Select(x => GetErrorDetails(source, x)));
-			//await _outputEditor.SetValue(errors);
-			return "Compilation error";
+			var diagnostics = new List<string>();
+			foreach (var diagnostic in emitResult.Diagnostics)
+			{
+				var icon = diagnostic.Severity switch
+				{
+					DiagnosticSeverity.Info => MessageIcon,
+					DiagnosticSeverity.Warning => WarnIcon,
+					DiagnosticSeverity.Error => ErrorIcon,
+					_ => string.Empty
+				};
+				diagnostics.Add($"{icon} {diagnostic.GetMessage()}");
+			}
+			return [.. diagnostics];
 		}
 
 		var assembly = Assembly.Load(dllStream.ToArray());
 
 		var type = assembly.DefinedTypes.Single(x => !x.IsInterface && x.ImplementedInterfaces.Contains(typeof(ILessonRunner<EvaluationResults>)));
 		var runner = (ILessonRunner<EvaluationResults>) Activator.CreateInstance(type)!;
 
-		var results = runner.Run();
+		var tests = lesson.Tests.Deserialize<SchemaTest[]>(SerializerOptions);
+		var results = new List<string>();
+
+		foreach (var test in tests)
+		{
+			var result = runner.Run(new JsonObject { ["instance"] = test.Instance });
+			results.Add($"{(test.IsValid == result.IsValid ? SuccessIcon : ErrorIcon)} {test.Instance.AsJsonString()}");
+		}
+
 		// run the code
 
-		return JsonSerializer.Serialize(results);
+		return results.ToArray();
+	}
+
+	private static string ToLiteral(this string valueTextForCompiler)
+	{
+		var formatted = SymbolDisplay.FormatLiteral(valueTextForCompiler, true);
+		return formatted;
 	}
 }

Diff for: LearnJsonEverything/Services/SerializationHelpers.cs

@@ -0,0 +1,15 @@
+using System.Text.Encodings.Web;
+using System.Text.Json;
+
+namespace LearnJsonEverything.Services
+{
+	public static class SerializationHelpers
+	{
+		public static readonly JsonSerializerOptions SerializerOptions = new()
+		{
+			WriteIndented = true,
+			Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+			PropertyNameCaseInsensitive = true
+		};
+	}
+}

Diff for: LearnJsonEverything/Shared/MarkdownSpan.razor.css

@@ -8,6 +8,7 @@ pre {
   padding: 9.5px;
   margin: 0 0 10px;
   font-size: 13px;
+  tab-size: 4;
   word-break: break-all;
   word-wrap: break-word;
   background-color: #f0f0f0;

Diff for: LearnJsonEverything/Shared/Teacher.razor

@@ -4,8 +4,11 @@
 @using Microsoft.CodeAnalysis
 @using Microsoft.CodeAnalysis.CSharp
 @using System.Reflection
+@using System.Text.Encodings.Web
 @using System.Text.Json
+@using Json.More
 @using LearnJsonEverything.Services.Runners
+@using Yaml2JsonNode
 @using EditorOptions = LearnJsonEverything.Services.EditorOptions
 
 @inject DataManager DataManager;
@@ -23,7 +26,7 @@
 		<div id="right-panel" class="row row-margin-reset flex-grow-1">
 			<div id="workspace" class="col-12 d-flex flex-grow-1">
 				<div class="grid-panel flex-grow-1">
-					<StandaloneCodeEditor @ref="_codeEditor" Id="editor-schema" ConstructionOptions="BasicOptions"
+					<StandaloneCodeEditor @ref="_codeEditor" Id="editor-schema" ConstructionOptions="OptionsForEditor"
 					                      CssClass="h-100"></StandaloneCodeEditor>
 				</div>
 			</div>
@@ -36,7 +39,7 @@
 			</div>
 			<div id="output" class="col-12 d-flex">
 				<div class="grid-panel flex-grow-1">
-					<StandaloneCodeEditor @ref="_outputEditor" Id="editor-output" ConstructionOptions="ReadOnlyOptions"
+					<StandaloneCodeEditor @ref="_outputEditor" Id="editor-output" ConstructionOptions="OptionsForOutput"
 					                      CssClass="h-100"></StandaloneCodeEditor>
 				</div>
 			</div>
@@ -57,8 +60,8 @@
 
 	private string Instructions { get; set; }
 
-	private static StandaloneEditorConstructionOptions BasicOptions(StandaloneCodeEditor _) => EditorOptions.Basic();
-	private static StandaloneEditorConstructionOptions ReadOnlyOptions(StandaloneCodeEditor _) => EditorOptions.Readonly();
+	private static StandaloneEditorConstructionOptions OptionsForEditor(StandaloneCodeEditor _) => EditorOptions.Basic("csharp", 4);
+	private static StandaloneEditorConstructionOptions OptionsForOutput(StandaloneCodeEditor _) => EditorOptions.Readonly("json", 2);
 #pragma warning restore CS8618
 
 	private async Task Run()
@@ -67,11 +70,9 @@
 		{
 			var userCode = await _codeEditor.GetValue();
 
-			_outputEditor.SetValue("");
-			var output = SchemaRunner.Run(userCode, _currentLesson!, _references);
-
-			await _outputEditor.SetValue(output);
-
+			await _outputEditor.SetValue("");
+			var results = SchemaRunner.Run(userCode, _currentLesson!, _references);
+			await _outputEditor.SetValue(string.Join(Environment.NewLine, results!));
 		}
 		catch (Exception e)
 		{
@@ -127,7 +128,7 @@
 		int i = 0;
 		foreach (var reference in refs.Where(x => !x.IsDynamic))
 		{
-			var source = $"/_framework/{reference.FullName!.Split(',')[0]}.wasm";
+			var source = $"/_framework/{reference.FullName!.Split(',')[0]}.dll";
 			try
 			{
 				var stream = await Client.GetStreamAsync(source);
@@ -146,6 +147,10 @@
 
 	private async Task DownloadLessonPlan()
 	{
-		_lessons = (await Client.GetFromJsonAsync<LessonPlan>(LessonSource))!;
+		var yamlText = await Client.GetStringAsync(LessonSource);
+		var yaml = YamlSerializer.Parse(yamlText);
+		var json = yaml.ToJsonNode().FirstOrDefault();
+		Console.WriteLine(json.AsJsonString());
+		_lessons = json.Deserialize<LessonPlan>(SerializerOptions)!;
 	}
 }

Diff for: LearnJsonEverything/_Imports.razor

@@ -6,4 +6,6 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
-@using LearnJsonEverything.Shared
+@using LearnJsonEverything.Shared
+
+@using static LearnJsonEverything.Services.SerializationHelpers

Diff for: LearnJsonEverything/wwwroot/css/app.css

@@ -286,6 +286,7 @@ a.navbar-brand {
 pre {
 	padding: 9.5px;
 	font-size: 13px;
+  tab-size: 4;
 	word-break: break-all;
 	word-wrap: break-word;
 	background-color: rgb(27, 27, 30);

Diff for: LearnJsonEverything/wwwroot/data/lessons/schema.json

@@ -0,0 +1,34 @@
+---
+- id: 26b6ebca-58e6-4814-86ea-4946d844c9a6
+  title: Validate a string
+  instructions: Create a _JsonSchema_ object and validate the string instance.  Return
+    the evaluation results.
+  inputTemplate: ''
+  contextCode: |-
+    using System;
+    using System.Collections.Generic;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Text.Json.Serialization;
+    using Json.Schema;
+    
+    namespace LearnJsonEverything;
+    
+    public class Lesson : ILessonRunner<EvaluationResults>
+    {
+        public EvaluationResults Run(JsonObject context)
+        {
+            var instance = context["instance"];
+
+            /* USER CODE */
+        }
+    }
+  tests:
+  - instance: a string value
+    isValid: true
+  - instance: []
+    isValid: false
+  - instance: 42
+    isValid: false
+  - instance: false
+    isValid: false