Merge pull request #143 from gdeswardt/feature/change-selector-access

Feature/change selector accessors

Author: TylerBrinks

src/ExCSS.Tests/ExCSS.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>ExCSS.Tests</AssemblyName>
     <PackageId>ExCSS.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -30,4 +30,8 @@
     <Folder Include="Properties\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="bootstrap.css" />
+  </ItemGroup>
+
 </Project>

src/ExCSS.Tests/Selectors.cs

@@ -0,0 +1,67 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace ExCSS.Tests;
+
+public class SelectorsTests
+{
+    [Fact]
+    public async Task FindAllStyleRulesForAnElement()
+    {
+        // Arrange
+        var sheet = await ParseBootstrapAsync();
+
+        // Act
+        var list = sheet.StyleRules
+            .Where(r =>
+                r.Selector is SimpleSelector { Text: "input" }
+                || (r.Selector is CompoundSelector selector && selector.First() is SimpleSelector { Text: "input" })
+            );
+
+        // Assert
+        Assert.Equal(6, list.Count());
+    }
+
+    [Fact]
+    public async Task FindAllStyleRulesElementsWithMoreThanTwoCompoundSelectors()
+    {
+        // Arrange
+        var sheet = await ParseBootstrapAsync();
+
+        // Act
+        var list = sheet.StyleRules
+            .Where(r => (r.Selector as CompoundSelector)?.Length > 2);
+
+        // Assert
+        Assert.Equal(2, list.Count());
+    }
+
+    [Fact]
+    public async Task FindAllStyleRulesWithCompoundSelector()
+    {
+        // Arrange
+        var sheet = await ParseBootstrapAsync();
+
+        // Act
+        var list = sheet.StyleRules
+            .Where(r => r.Selector is CompoundSelector selector && selector.Last().Text.StartsWith("["));
+
+        // Assert
+        Assert.Equal(7, list.Count());
+    }
+
+    private async Task<Stylesheet> ParseBootstrapAsync()
+    {
+        await using var stream = GetStream("bootstrap.css");
+        var parser = new StylesheetParser();
+        return await parser.ParseAsync(stream);
+    }
+
+    private Stream GetStream(string fileName)
+    {
+        var fullyQualifiedName = $"{GetType().Namespace}.{fileName}";
+        return GetType().Assembly.GetManifestResourceStream(fullyQualifiedName);
+    }
+}

src/ExCSS.Tests/Sheet.cs

@@ -1,4 +1,6 @@
-namespace ExCSS.Tests
+using System;
+
+namespace ExCSS.Tests
 {
     using ExCSS;
     using Xunit;
@@ -981,7 +983,7 @@ public void CssParseMsViewPortWithUnknownRules()
             var css = "@-ms-viewport{width:device-width} .dsip { display: block; }";
             var doc = ParseStyleSheet(css, true, true, true, true);
             var result = doc.ToCss();
-            Assert.Equal("@-ms-viewport{width:device-width}\r\n.dsip { display: block }", result);
+            Assert.Equal($"@-ms-viewport{{width:device-width}}{Environment.NewLine}.dsip {{ display: block }}", result);
         }
 
         [Fact]
@@ -990,7 +992,7 @@ public void CssParseMediaAndMsViewPortWithoutOptions()
             var css = "@media screen and (max-width: 400px) {  @-ms-viewport { width: 320px; }  }  .dsip { display: block; }";
             var doc = ParseStyleSheet(css);
             var result = doc.ToCss();
-            Assert.Equal("@media screen and (max-width: 400px) { }\r\n.dsip { display: block }", result);
+            Assert.Equal($"@media screen and (max-width: 400px) {{ }}{Environment.NewLine}.dsip {{ display: block }}", result);
         }
 
         [Fact]
@@ -999,7 +1001,7 @@ public void CssParseMediaAndMsViewPortWithUnknownRules()
             var css = "@media screen and (max-width: 400px) {  @-ms-viewport { width: 320px; }  }  .dsip { display: block; }";
             var doc = ParseStyleSheet(css, true, true, true, true);
             var result = doc.ToCss();
-            Assert.Equal("@media screen and (max-width: 400px) { @-ms-viewport { width: 320px; } }\r\n.dsip { display: block }", result);
+            Assert.Equal($"@media screen and (max-width: 400px) {{ @-ms-viewport {{ width: 320px; }} }}{Environment.NewLine}.dsip {{ display: block }}", result);
         }
 
         [Fact]

src/ExCSS/ExCSS.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<LangVersion>9.0</LangVersion>
-		<TargetFrameworks>net5.0;netstandard2.0;netcoreapp3.1;net452</TargetFrameworks>
+		<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0;netcoreapp3.1;net452</TargetFrameworks>
 		<AssemblyName>ExCSS</AssemblyName>
 		<PackageId>ExCSS</PackageId>
 		<Title>ExCSS .NET Stylesheet Parser</Title>

src/ExCSS/Model/Combinator.cs

@@ -1,6 +1,6 @@
 namespace ExCSS
 {
-    internal abstract class Combinator
+    public abstract class Combinator
     {
         public static readonly Combinator Child = new ChildCombinator();
         public static readonly Combinator Deep = new DeepCombinator();

src/ExCSS/Selectors/ChildSelector.cs

@@ -2,7 +2,7 @@
 
 namespace ExCSS
 {
-    internal abstract class ChildSelector : StylesheetNode, ISelector
+    public abstract class ChildSelector : StylesheetNode, ISelector
     {
         private readonly string _name;
         protected int Step;

src/ExCSS/Selectors/ComplexSelector.cs

@@ -3,7 +3,7 @@
 
 namespace ExCSS
 {
-    internal sealed class ComplexSelector : StylesheetNode, ISelector
+    public sealed class ComplexSelector : StylesheetNode, ISelector
     {
         private readonly List<CombinatorSelector> _selectors;
 
@@ -18,7 +18,6 @@ private struct CombinatorSelector
             public ISelector Selector;
         }
 
-
         public string Text => this.ToCss();
         public int Length => _selectors.Count;
         public bool IsReady { get; private set; }

src/ExCSS/Selectors/CompoundSelector.cs

@@ -2,7 +2,7 @@
 
 namespace ExCSS
 {
-    internal sealed class CompoundSelector : Selectors, ISelector
+    public sealed class CompoundSelector : Selectors, ISelector
     {
         public override void ToCss(TextWriter writer, IStyleFormatter formatter)
         {

src/ExCSS/Selectors/FirstChildSelector.cs

@@ -1,7 +1,7 @@
 namespace ExCSS
 
 {
-    internal sealed class FirstChildSelector : ChildSelector
+    public sealed class FirstChildSelector : ChildSelector
     {
         public FirstChildSelector()
             : base(PseudoClassNames.NthChild)

src/ExCSS/Selectors/FirstColumnSelector.cs

@@ -1,6 +1,6 @@
 namespace ExCSS
 {
-    internal sealed class FirstColumnSelector : ChildSelector
+    public sealed class FirstColumnSelector : ChildSelector
     {
         public FirstColumnSelector()
             : base(PseudoClassNames.NthColumn)