Merge pull request #118 from NeonGraal/correct-html

Correct Spec Component tests and Builtin and index Html pages

Author: NeonGraal

autoverify.ps1

@@ -1,4 +1,6 @@
 Get-ChildItem test -Filter "*.verified.*" -Recurse | Remove-Item -Force
+Get-ChildItem test/Html/* -Directory | Remove-Item -Recurse -Force
 dotnet test -e GQLPLUS_AUTOVERIFY=true -l "trx;LogFileName=TestResults.trx" -f net9.0
 Write-Host "`n"
 ./make-summary.ps1 -NoCoverage
+Start-Process test/Html/index.html

collect-samples.ps1

@@ -1,6 +1,7 @@
 [CmdletBinding()]
 param (
-    $SpecPath = "../graphql-plus.github.io"
+  [switch]$AutoVerify = $false,
+  $SpecPath = "../graphql-plus.github.io"
 )
 
 $source = Join-Path $SpecPath "samples"
@@ -23,4 +24,8 @@ Get-ChildItem $source -Recurse -Exclude "*.md","*.yml" | ForEach-Object {
   $relative = Resolve-Path -RelativeBasePath $source -Relative $_
   $to = Join-Path $dest $relative
   Copy-Item $_ $to -Force
-}
+}
+
+if ($AutoVerify) {
+  ./autoverify.ps1
+}

report.ps1

@@ -10,4 +10,5 @@ $report += "riskHotspotsAnalysisThresholds:metricThresholdForCyclomaticComplexit
 
 dotnet tool restore
 dotnet reportgenerator @report
+Start-Process test/Html/index.html
 livereloadserver coverage --port 5300

test/GqlPlus.ComponentTestBase/TestSchemaInputs.cs

@@ -47,7 +47,7 @@ public async Task Test_Spec(string sample)
   {
     string schema = await ReadSchema(sample, "Specification");
 
-    await Label_Input("Schema", schema, ["Schema", "Specification"], sample);
+    await Label_Input("Spec", schema, ["Schema", "Specification"], sample);
   }
 
   protected abstract Task Label_Input(string label, string input, string[] dirs, string test, string section = "");

test/GqlPlus.Converter.Json.ComponentTests/Sample/SchemaJsonTests/Intro_Built-In.verified.json test/GqlPlus.Converter.Json.ComponentTests/Sample/SpecJsonTests/Intro_Built-In.verified.json

@@ -11,12 +11,12 @@ public class BuiltInTests(IModelAndRender renderer)
   [Theory]
   [ClassData(typeof(BuiltInBasicData))]
   public void HtmlBasicTypes(string type)
-    => RenderTypeHtml(BuiltInData.BasicMap[type], []);
+    => RenderTypeHtml("Basic", BuiltInData.BasicMap[type], []);
 
   [Theory]
   [ClassData(typeof(BuiltInInternalData))]
   public void HtmlInternalTypes(string type)
-    => RenderTypeHtml(BuiltInData.InternalMap[type], BuiltIn.Internal);
+    => RenderTypeHtml("Internal", BuiltInData.InternalMap[type], BuiltIn.Internal);
 
   [Fact]
   public void HtmlAllBasicTypes()
@@ -38,11 +38,14 @@ public void HtmlAllInternalTypes()
     RenderSchemaHtml(schema, "!Internal");
   }
 
+  private readonly string[] _sections = ["!Basic", "!Internal"];
+
   [Fact]
   public void Html_Index()
   {
     Structured result = new Map<Structured>() {
       ["title"] = "BuiltIn",
+      ["items"] = _sections.Render(),
       ["groups"] = new Map<Structured>() {
         ["Basic"] = BuiltIn.Basic.Render(t => t.Name),
         ["Internal"] = BuiltIn.Internal.Render(t => t.Name),
@@ -110,7 +113,7 @@ private void ModelType(IGqlpType type, IGqlpType[] extras)
     context.Errors.ShouldBeEmpty(type?.Label);
   }
 
-  private void RenderTypeHtml(IGqlpType type, IGqlpType[] extras)
+  private void RenderTypeHtml(string section, IGqlpType type, IGqlpType[] extras)
   {
     Assert.SkipWhen(type is null, "type is null");
 
@@ -122,13 +125,13 @@ private void RenderTypeHtml(IGqlpType type, IGqlpType[] extras)
       Declarations = [.. extras.Where(e => e != type)]
     };
 
-    RenderSchemaHtml(schema, type.Name, extrasSchema);
+    RenderSchemaHtml(schema, type.Name, section, extrasSchema);
   }
 
-  private void RenderSchemaHtml(SchemaAst schema, string filename, SchemaAst? extras = null)
+  private void RenderSchemaHtml(SchemaAst schema, string filename, string section = "", SchemaAst? extras = null)
   {
     Structured result = renderer.RenderAst(schema, renderer.Context(), extras);
 
-    result.WriteHtmlFile("BuiltIn", filename);
+    result.WriteHtmlFile("BuiltIn" + section.Prefixed("/"), filename);
   }
 }

test/GqlPlus.Converter.Json.ComponentTests/Sample/SchemaJsonTests/Intro_Category.verified.json test/GqlPlus.Converter.Json.ComponentTests/Sample/SpecJsonTests/Intro_Category.verified.json

@@ -35,7 +35,7 @@
           {%- endfor %}
         </div>
       </article>
-      {%- else -%}
+      {%- endif -%}
       {%- for group in groups %}
       <article>
         <header>
@@ -50,7 +50,6 @@
         </div>
       </article>
       {%- endfor %}
-      {%- endif -%}
     </main>
   </body>
 </html>

test/GqlPlus.Converter.Json.ComponentTests/Sample/SchemaJsonTests/Intro_Common.verified.json test/GqlPlus.Converter.Json.ComponentTests/Sample/SpecJsonTests/Intro_Common.verified.json

@@ -16,8 +16,8 @@ public async Task Index_Samples()
     IEnumerable<string> objects = await ReplaceSchemaKeys("Objects");
     Structured result = new Map<Structured>() {
       ["title"] = "Samples",
+      ["items"] = all.Render(),
       ["groups"] = new Map<Structured>() {
-        ["All"] = all.Render(),
         ["Globals"] = SamplesSchemaGlobalsData.Strings.Render(),
         ["Merges"] = merges.Render(),
         ["Objects"] = objects.Render(),

test/GqlPlus.Converter.Json.ComponentTests/Sample/SchemaJsonTests/Intro_Complete.verified.json test/GqlPlus.Converter.Json.ComponentTests/Sample/SpecJsonTests/Intro_Complete.verified.json

@@ -2,13 +2,13 @@ $clean = -not (git status -s)
 dotnet outdated .\ -vl minor -u
 if ($clean) {
     git commit -a -m "Update packages to latest patch version"
-    dotnet outdated .\ -vl major -u
+    dotnet outdated .\ -vl major -u -exc CodeAnalysis
 } else {
-    dotnet outdated .\ -vl major
+    dotnet outdated .\ -vl major -exc CodeAnalysis
 }
 
 dotnet tool update --all
 
 dotnet list package --deprecated
 dotnet list package --vulnerable --include-transitive
-dotnet outdated .\
+dotnet outdated .\ -exc CodeAnalysis