Add more complex selector inside has node

symfony · franckranaivo · Feb 15, 2023 · Feb 15, 2023 · Feb 20, 2023 · Feb 20, 2023
commit 9358c39071ca98ed89498ea2e0444ef94778f08b
diff --git a/src/Symfony/Component/CssSelector/Node/RelationNode.php b/src/Symfony/Component/CssSelector/Node/RelationNode.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\CssSelector\Node;
 
+use Symfony\Component\CssSelector\Parser\Token;
+
 /**
- * Represents a "<selector>:has(<identifier>)" node.
+ * Represents a "<selector>:has(<arguments>)" node.
  *
  * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
@@ -24,31 +26,33 @@
 class RelationNode extends AbstractNode
 {
     private NodeInterface $selector;
-    private NodeInterface $subSelector;
+    private array $arguments;
 
-    public function __construct(NodeInterface $selector, NodeInterface $subSelector)
+    public function __construct(NodeInterface $selector, array $arguments)
     {
         $this->selector = $selector;
-        $this->subSelector = $subSelector;
+        $this->arguments = $arguments;
     }
 
     public function getSelector(): NodeInterface
     {
         return $this->selector;
     }
 
-    public function getSubSelector(): NodeInterface
+    public function getArguments(): array
     {
-        return $this->subSelector;
+        return $this->arguments;
     }
 
     public function getSpecificity(): Specificity
     {
-        return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
+        return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
     }
 
     public function __toString(): string
     {
-        return sprintf('%s[%s:has(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
+        $arguments = implode(', ', array_map(fn (Token $token) => "'".$token->getValue()."'", $this->arguments));
+
+        return sprintf('%s[%s:has(%s)]', $this->getNodeName(), $this->selector, $arguments ? '['.$arguments.']' : '');
     }
 }
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\CssSelector\XPath\Extension;
 
+use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
 use Symfony\Component\CssSelector\Node;
+use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\XPath\Translator;
 use Symfony\Component\CssSelector\XPath\XPathExpr;
 
@@ -71,7 +73,7 @@ public function getNodeTranslators(): array
             'Class' => $this->translateClass(...),
             'Hash' => $this->translateHash(...),
             'Element' => $this->translateElement(...),
-            'Relation' => $this->translateRelation(...)
+            'Relation' => $this->translateRelation(...),
         ];
     }
 
@@ -213,11 +215,20 @@ public function translateElement(Node\ElementNode $node): XPathExpr
     public function translateRelation(Node\RelationNode $node, Translator $translator): XPathExpr
     {
         $xpath = $translator->nodeToXPath($node->getSelector());
-        $subXpath = $translator->nodeToXPath($node->getSubSelector());
-        $subXpath->addNameTest();
+        $selectors = $node->getArguments();
 
-        if ($subXpath->getCondition()) {
-            return $xpath->addCondition(sprintf('count(descendant-or-self::*[%s]) > 0', $subXpath->getCondition()));
+        foreach ($selectors as $index => $selector) {
+            if (null !== $selector->getPseudoElement()) {
+                throw new ExpressionErrorException('Pseudo-elements are not supported.');
+            }
+
+            $selectors[$index] = $translator->selectorToXPath($selector);
+        }
+
+        $subSelectors =  implode(' | ', $selectors);
+
+        if ($subSelectors) {
+            return $xpath->addCondition(sprintf('count(%s) > 0', $subSelectors));
         }
 
         return $xpath->addCondition('0');