make deepchildren include the root node for asterisk to work toplevel

ix · ix · commit e2c1753ada8a · 2025-06-21T23:41:22.000+01:00
diff --git a/yesod-test/Yesod/Test/CssQuery.hs b/yesod-test/Yesod/Test/CssQuery.hs
@@ -54,7 +54,7 @@ data Selector
   | ByAttrContains Text Text
   | ByAttrStarts Text Text
   | ByAttrEnds Text Text
-  | Asterisk  -- TODO: This needs to be deep.
+  | Asterisk
   deriving (Show, Eq)
 
 
@@ -78,14 +78,14 @@ parseQuery = parseOnly cssQuery
 
 -- Below this line is the Parsec parser for css queries.
 cssQuery :: Parser [[SelectorGroup]]
-cssQuery = many (char ' ') >> sepBy rules (char ',' >> many (char ' '))
+cssQuery = (many (char ' ') >> sepBy rules (char ',' >> many (char ' ')))
 
 rules :: Parser [SelectorGroup]
 rules = many $ directChildren <|> deepChildren
 
 directChildren :: Parser SelectorGroup
 directChildren =
-    string "> " >> (many (char ' ')) >> DirectChildren <$> pOptionalTrailingSpace parseSelectorTypes
+    string "> " >> many (char ' ') >> DirectChildren <$> pOptionalTrailingSpace parseSelectorTypes
 
 deepChildren :: Parser SelectorGroup
 deepChildren = pOptionalTrailingSpace $ DeepChildren <$> parseSelectorTypes
diff --git a/yesod-test/Yesod/Test/TransversingCSS.hs b/yesod-test/Yesod/Test/TransversingCSS.hs
@@ -89,7 +89,7 @@ runQuery html query = concatMap (runGroup html) query
 runGroup :: Cursor -> [SelectorGroup] -> [Cursor]
 runGroup c [] = [c]
 runGroup c (DirectChildren s:gs) = concatMap (flip runGroup gs) $ c $/ selectors s
-runGroup c (DeepChildren s:gs) = concatMap (flip runGroup gs) $ c $// selectors s
+runGroup c (DeepChildren s:gs) = concatMap (flip runGroup gs) $ c $.// selectors s
 
 selectors :: [SelectorType] -> Cursor -> [Cursor]
 selectors cs c
@@ -125,7 +125,9 @@ selector c (ByAttrEnds n v) =
     case attribute (Name n Nothing Nothing) c of
         t:_ -> v `T.isSuffixOf` t
         [] -> False
-selector _ Asterisk = True
+selector c Asterisk = case node c of
+  NodeElement _ -> True
+  _ -> False
 
 pseudoselector :: Cursor -> Selector -> PseudoSelector -> Bool
 pseudoselector c _ FirstChild = null $ precedingSibling c
diff --git a/yesod-test/test/main.hs b/yesod-test/test/main.hs
@@ -130,6 +130,8 @@ main = hspec $ do
             findBySelector_ html "p:nth-child(-n-1)" @?= []
             findBySelector_ html "p:nth-child(-n-0)" @?= []
             findBySelector_ html "p:nth-child(-n+3)" @?= ["<p>1</p>", "<p>2</p>", "<p>3</p>"]
+            let ps = ["<p>" <> show n <> "</p>" | n <- [1..10]] in
+              findBySelector_ html "*" @?= ["<html>" <> concat ps <> "</html>"] <> ps
         
     describe "HTML parsing" $ do
         it "XHTML" $
diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal
@@ -1,5 +1,5 @@
 name:               yesod-test
-version:            1.6.23.1
+version:            1.6.24
 license:            MIT
 license-file:       LICENSE
 author:             Nubis <nubis@woobiz.com.ar>
