Use System.Text.Json for JSON serialization and deserialization

Elements.Benchmarks/API.cs

@@ -0,0 +1,45 @@
+using System;
+using BenchmarkDotNet.Attributes;
+using Elements.Geometry;
+using Elements.Serialization.glTF;
+
+namespace Elements.Benchmarks
+{
+    [MemoryDiagnoser]
+    public class API
+    {
+        private string _model;
+
+        [Params(5, 50, 200, 500)]
+        public int Value { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            var model = new Model();
+            var r = new Random();
+            var size = 10;
+            var profile = new Profile(Polygon.L(0.1, 0.1, 0.05));
+            model.AddElement(profile);
+
+            for (var i = 0; i < this.Value; i++)
+            {
+                var start = new Vector3(r.NextDouble() * size, r.NextDouble() * size, r.NextDouble() * size);
+                var end = new Vector3(r.NextDouble() * size, r.NextDouble() * size, r.NextDouble() * size);
+                var line = new Line(start, end);
+                // var c = new Color(r.NextDouble(), r.NextDouble(), r.NextDouble(), 1.0);
+                // var m = new Material(Guid.NewGuid().ToString(), c);
+                var beam = new Beam(line, profile, null, BuiltInMaterials.Steel);
+                model.AddElement(beam);
+            }
+
+            _model = model.ToJson();
+        }
+
+        [Benchmark(Description = "API Test Serialization")]
+        public void SerializeElementsToGlTF()
+        {
+            Model.GeometricElementModelFromJson(_model);
+        }
+    }
+}

Elements.CodeGeneration/src/Templates/Catalog.liquid

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Elements.Geometry;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Elements {
 public static class {{ catalog.name | safeidentifierupper }} {

Elements.CodeGeneration/src/Templates/Class.liquid

@@ -1,9 +1,6 @@
 {% if HasDescription -%}
 /// <summary>{{ Description | csharpdocs }}</summary>
 {% endif -%}
-{% if HasDiscriminator -%}
-[JsonConverter(typeof(Elements.Serialization.JSON.JsonInheritanceConverter), "{{ Discriminator }}")]
-{% endif -%}
 [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "{{ ToolchainVersion }}")]
 {% if InheritsExceptionSchema -%}
 [JsonObjectAttribute]
@@ -30,7 +27,7 @@
 {%   if property.HasDescription -%}
     /// <summary>{{ property.Description | csharpdocs }}</summary>
 {%   endif -%}
-    [JsonProperty("{{ property.Name }}", Required = {{ property.JsonPropertyRequiredCode }}{% if property.IsStringEnumArray %}, ItemConverterType = typeof(Newtonsoft.Json.Converters.StringEnumConverter){% endif %})]
+    [JsonPropertyName("{{ property.Name }}")]
 {%   if property.RenderRequiredAttribute -%}
     [System.ComponentModel.DataAnnotations.Required{% if property.AllowEmptyStrings %}(AllowEmptyStrings = true){% endif %}]
 {%   endif -%}
@@ -50,7 +47,7 @@
     [System.ComponentModel.DataAnnotations.RegularExpression(@"{{ property.RegularExpressionValue }}")]
 {%   endif -%}
 {%   if property.IsStringEnum -%}
-    [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+    [JsonConverter(typeof(JsonStringEnumMemberConverter))]
 {%   endif -%}
 {%   if property.IsDate and UseDateFormatConverter -%}
     [JsonConverter(typeof(DateFormatConverter))]

Elements.CodeGeneration/src/Templates/File.liquid

@@ -10,7 +10,7 @@ using Elements.Geometry.Solids;
 using Elements.Spatial;
 using Elements.Validators;
 using Elements.Serialization.JSON;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Elements.CodeGeneration/src/TypeGenerator.cs

@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 using NJsonSchema;
 using NJsonSchema.CodeGeneration.CSharp;
 using Elements.Generate.StringUtils;

Elements.Components/src/ComponentDefinition.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using Elements;
 using Elements.Geometry;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Elements.Components
 {

Elements.Components/src/ContentCatalogRetrieval.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using Elements.Geometry;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Elements.Components
 {

Elements.Components/src/Rules/SizeBasedPlacementRule.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elements.Geometry;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Elements.Components
 {

Elements.Components/src/SpaceConfiguration.cs

@@ -2,8 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elements;
-using Elements.Components;
+using System.Text.Json.Serialization;
 using Elements.Geometry;
 
 namespace Elements.Components
@@ -99,7 +98,7 @@ private ContentElement MakeContentElement()
             /// <summary>
             /// The content element corresponding to this item.
             /// </summary>
-            [Newtonsoft.Json.JsonIgnore]
+            [JsonIgnore]
             public ContentElement ContentElement
             {
                 get

Elements.Playground/Elements.Playground.csproj

@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <BlazorEnableCompression>false</BlazorEnableCompression>
     <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
     <PublishTrimmed>false</PublishTrimmed>
+    <RunAOTCompilation>true</RunAOTCompilation>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.11.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Elements.Playground/Pages/Model.razor

@@ -3,20 +3,23 @@
 @using Microsoft.CodeAnalysis
 @using Microsoft.CodeAnalysis.CSharp
 @using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting
+@using System.Diagnostics
 @using System.Reflection
 @using System.IO
 @using System.Threading
 @using System.Web
+@using System.Diagnostics
 
 @inject IJSRuntime JSRuntime
 @inject IJSUnmarshalledRuntime JSUnmarshalledRuntime
 @inject NavigationManager MyNavigationManager
-
+@using System.Text.RegularExpressions;
 <div class="grid">
     <button class="run" disabled=@loading @onclick="Run">Run</button>
     <div id="editor">@csharp</div>
     <div id="model"></div>
-    <div class="output">@((MarkupString)Output)</div>
+    <div class="output">@((MarkupString)Regex.Replace(
+        HttpUtility.HtmlEncode(@Output), "\r?\n|\r", "<br />"))</div>
 </div>
 
 @code {
@@ -32,35 +35,35 @@ var p = wf.GetProfileByType(WideFlangeProfileType.W10x100);
 
 for(var i=0; i<1; i++)
 {
-    var start = new Vector3(i, 0, 0);
-    var end = new Vector3(i, length, i);
+var start = new Vector3(i, 0, 0);
+var end = new Vector3(i, length, i);
 
-    // The bottom chord
-    var bottomChord = new Line(start, end);
-    var bottomChordBeam = new Beam(bottomChord, p, m);
-    model.AddElement(bottomChordBeam);
+// The bottom chord
+var bottomChord = new Line(start, end);
+var bottomChordBeam = new Beam(bottomChord, p, null, m);
+model.AddElement(bottomChordBeam);
 
-    var topChord = new Line(start + new Vector3(0,0,5), end + new Vector3(0,0,5));
-    var topChordBeam = new Beam(topChord, p, m);
-    model.AddElement(topChordBeam);
+var topChord = new Line(start + new Vector3(0,0,5), end + new Vector3(0,0,5));
+var topChordBeam = new Beam(topChord, p, null, m);
+model.AddElement(topChordBeam);
 
-    Vector3 last = default(Vector3);
-    for(var j=0.0; j<=1.0; j+=0.1)
-    {
-        var pt = bottomChord.PointAt(j);
-        var top = pt + new Vector3(0,0,5);
-        var panelLine = new Line(pt, top);
-        var panelBeam = new Beam(panelLine, p, m);
-        model.AddElement(panelBeam);
+Vector3 last = default(Vector3);
+for(var j=0.0; j<=1.0; j+=0.1)
+{
+var pt = bottomChord.PointAt(j);
+var top = pt + new Vector3(0,0,5);
+var panelLine = new Line(pt, top);
+var panelBeam = new Beam(panelLine, p, null, m);
+model.AddElement(panelBeam);
 
-        if(j > 0.0)
-        {
-            var braceLine = new Line(top, last);
-            var braceBeam = new Beam(braceLine, p, m);
-            model.AddElement(braceBeam);
-        }
-        last = pt;
-    }
+if(j > 0.0)
+{
+var braceLine = new Line(top, last);
+var braceBeam = new Beam(braceLine, p, null, m);
+model.AddElement(braceBeam);
+}
+last = pt;
+}
 }
 return model;";
     private static string Output = "";
@@ -115,6 +118,11 @@ return model;";
         var writer = new StringWriter();
         Console.SetOut(writer);
 
+        // Redirect debug to the console.
+        Trace.Listeners.Clear();
+        Trace.Listeners.Add(
+        new TextWriterTraceListener(Console.Out));
+
         Exception exception = null;
         try
         {
@@ -143,7 +151,6 @@ return model;";
         Output = writer.ToString();
         if (exception != null)
         {
-
             Output += "\r\n" + exception.ToString();
         }
         Console.SetOut(currentOut);

Elements.Playground/README.md

@@ -9,7 +9,7 @@ This is a minimal example using .NET 5, Blazor webassembly, and Elements.
 Visit http://localhost:5000.
 
 ### Publishing
-`dotnet public -c release`
+`dotnet publish -c release`
 
 ### Notes about hosting on Github Pages
 - In the site's repo on github

Elements.Playground/wwwroot/js/model.js

@@ -58,18 +58,9 @@ function initializeEditor() {
         enableLiveAutocompletion: true
     });
 
-    let timer;
-    let runTimer = () => {
-        timer = setTimeout(() => {
-            invokeRun();
-        }, 2000);
-    }
-
     editor.getSession().on('change', function () {
         var code = editor.getValue();
         DotNet.invokeMethod('Elements.Playground', 'SetCodeValue', code)
-        clearTimeout(timer);
-        runTimer();
     });
 }
 

Elements.Serialization.DXF/tests/DxfTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.Json;
 using Elements.Geometry;
 using Xunit;
 
@@ -67,7 +68,7 @@ public void DxfFromModel()
             var renderer = new DXF.ModelToDxf();
 
             var configJson = File.ReadAllText("../../../TestModels/cad-standard.json");
-            var config = Newtonsoft.Json.JsonConvert.DeserializeObject<MappingConfiguration>(configJson);
+            var config = JsonSerializer.Deserialize<MappingConfiguration>(configJson);
             renderer.SetMappingConfiguration(config);
             var stream = renderer.Render(model);
             stream.Position = 0;

Elements.Serialization.SVG/test/SvgTests.cs

@@ -23,7 +23,7 @@ public class SvgTests
         public void Plan()
         {
             var json = File.ReadAllText("../../../models/tower.json");
-            var model = Model.FromJson(json, out _);
+            var model = Model.FromJson(json);
 
             model.UpdateRepresentations();
             model.UpdateBoundsAndComputedSolids();

Elements.Wasm/.gitignore

@@ -0,0 +1 @@
+deploy

Elements.Wasm/Elements.Wasm.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <RunAOTCompilation>true</RunAOTCompilation>
+    <!-- Don't cache boot resources to avoid checksum failures for re-bundled files. -->
+    <BlazorCacheBootResources>false</BlazorCacheBootResources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.2" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Elements\src\Elements.csproj" />
+  </ItemGroup>
+
+</Project>