Generate pure HTML document as part of Razor code generation (dotnet/…

…razor#1624) * Generate pure HTML document as part of Razor code generation * feedback \n\nCommit migrated from dotnet/razor@478e2ce Commit migrated from dotnet/aspnetcore@b84fc9b3b654
dougbu · Feb 25, 2020 · b47587e · b47587e
1 parent 9204abf
commit b47587e
Show file tree

Hide file tree

Showing 84 changed files with 1,426 additions and 8 deletions.
diff --git a/...ft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/...ft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -540,6 +540,7 @@ public void UsingDirectives_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -559,6 +560,7 @@ public void InvalidNamespaceAtEOF_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -584,6 +586,7 @@ public class MyService<TModel>
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -620,6 +623,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -655,6 +659,7 @@ public class MyModel
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -674,6 +679,7 @@ @using System
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -693,6 +699,7 @@ public void MalformedPageDirective_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -712,6 +719,7 @@ public void Basic_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -728,6 +736,7 @@ public void BasicComponent_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -753,6 +762,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -769,6 +779,7 @@ public void _ViewImports_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -792,6 +803,7 @@ public class MyApp
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -824,6 +836,7 @@ public class MyApp
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -857,6 +870,7 @@ public class MyService<TModel>
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -873,6 +887,7 @@ public void Model_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -895,6 +910,7 @@ public class ThisShouldBeGenerated
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -923,6 +939,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -946,6 +963,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -962,6 +980,7 @@ public void RazorPagesWithRouteTemplate_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -985,6 +1004,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1001,6 +1021,7 @@ public void PageWithNamespace_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1017,6 +1038,7 @@ public void ViewWithNamespace_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1049,6 +1071,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@@ -1065,6 +1088,7 @@ public void RazorPageWithNoLeadingPageDirective_DesignTime()
 
             // Assert
             AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
             AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
             AssertLinePragmas(compiled.CodeDocument, designTime: true);
             AssertSourceMappingsMatchBaseline(compiled.CodeDocument);

diff --git a/...s/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html b/...s/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
@@ -0,0 +1 @@
+
diff --git a/...les/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html b/...les/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
@@ -0,0 +1,9 @@
+
+<div class="                ">
+    Hello world
+
+</div>
+
+
+
+
diff --git a/...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html b/...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
@@ -0,0 +1,8 @@
+<div class="                ">
+    Hello world
+
+</div>
+
+
+
+<p class="                         " />
diff --git a/...tegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/...tegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -0,0 +1,15 @@
+
+
+
+
+      "
+
+
+
+
+
+
+
+
+
+
diff --git a/.../IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html b/.../IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
@@ -0,0 +1,2 @@
+
+
diff --git a/...rationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html b/...rationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
@@ -0,0 +1,2 @@
+
+
diff --git a/...es/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html b/...es/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/...ntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html b/...ntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/...t/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html b/...t/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
@@ -0,0 +1 @@
+
diff --git a/...egrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html b/...egrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
@@ -0,0 +1 @@
+           Test.
diff --git a/...grationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html b/...grationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+      "foo
+
+<h1>About Us</h1>
+<p>We are awesome.</p>
diff --git a/...ationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html b/...ationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
@@ -0,0 +1,6 @@
+
+
+
+
+<input-test for="    " />
+<input-test for="      " />
diff --git a/...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html b/...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
@@ -0,0 +1 @@
+
diff --git a/...les/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html b/...les/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
@@ -0,0 +1,2 @@
+
+
diff --git a/.../IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html b/.../IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
@@ -0,0 +1,3 @@
+
+
+<h1>Hi There!</h1>
diff --git a/...CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html b/...CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
@@ -0,0 +1,2 @@
+<div>Some text here.</div>
+
diff --git a/...onTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html b/...onTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+<h1>New Customer            </h1>
diff --git a/...grationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html b/...grationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h1>New Customer</h1>
+<form method="post" class="form-horizontal">
+    <div class="text-danger"></div>
+    <div class="form-group">
+        <label class="col-md-2 control-label">     </label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/...stFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html b/...stFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h1>New Customer</h1>
+<form method="post" class="form-horizontal" >
+    <div class="text-danger"></div>
+    <div class="form-group">
+        <label class="col-md-2 control-label">           </label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/...TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/...TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+<div>Some body</div>
+
+
+    <div>This is in Section 1</div>
+    <input-test for="    " />
+
diff --git a/...es/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html b/...es/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/...grationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html b/...grationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
@@ -0,0 +1,6 @@
+
+
+
+
+
+<vc:test first-name="    " bar=" World"></vc:test>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,6 @@





		<vc:test first-name=" " bar=" World"></vc:test>