[#1] Fixed missing pseudo selectors / proper media query selection

Author: JanDC

src/Css/Processor.php

@@ -14,8 +14,10 @@ class Processor
      * @param array  $existingRules
      * @return Rule[]
      */
-    public function getRules($css, $existingRules = array())
+    public function getRules($css, $existingRules = [])
     {
+
+
         $css = $this->doCleanup($css);
         $rulesProcessor = new RuleProcessor();
         $rulesByMediaQuery = $rulesProcessor->splitIntoSeparateMediaQueries($css);

src/Css/Rule/Processor.php

@@ -2,6 +2,8 @@
 
 namespace PageSpecificCss\Css\Rule;
 
+use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Parser;
 use Symfony\Component\CssSelector\Node\Specificity;
 use \PageSpecificCss\Css\Property\Processor as PropertyProcessor;
 
@@ -15,26 +17,52 @@ class Processor
      */
     public function splitIntoSeparateMediaQueries($rulesString)
     {
-        $rulesString = $this->cleanup($rulesString);
+        //  $rulesString = $this->cleanup($rulesString);
 
         // Intelligently break up rules, preserving mediaquery context and such
-        $queryParts = explode('@media', $rulesString);
+
+        $mediaQuerySelector = '/@media[^{]+\{([\s\S]+?\})\s*\}/';
+        $mediaQueryMatches = [];
+        preg_match_all($mediaQuerySelector, $rulesString, $mediaQueryMatches);
+
+        $remainingRuleset = $rulesString;
+
+        $queryParts = [];
+        foreach (reset($mediaQueryMatches) as $mediaQueryMatch) {
+            $tokenisedRules = explode($mediaQueryMatch, $remainingRuleset);
+
+            $queryParts[] = reset($tokenisedRules);
+            $queryParts[] = $mediaQueryMatch;
+
+            if (count($tokenisedRules) === 2) {
+                $remainingRuleset = end($tokenisedRules);
+            }
+        }
+
 
         $indexedRules = [];
 
         foreach ($queryParts as $part) {
-            if (strpos($part,' ') !== 0) {
+
+            if (strpos($part, '@media') === FALSE) {
                 $indexedRules[][''] = (array)explode('}', $part);
                 continue;
             }
 
-            $mediaQueryString = "@media".substr($part, 0, strpos($part, '{'));
+            $mediaQueryString = substr($part, 0, strpos($part, '{'));
+
+            // No need for print css
+            if (trim($mediaQueryString) === '@media print') {
+                continue;
+            }
+
             $mediaQueryRules = substr($part, strpos($part, '{') + 1);
+
             $mediaQueryRules = substr($mediaQueryRules, 0, -1);
 
-            $indexedRules[][$mediaQueryString] = (array)explode('}', $mediaQueryRules)  ;
-        }
 
+            $indexedRules[][$mediaQueryString] = (array)explode('}', $mediaQueryRules);
+        }
 
         return $indexedRules;
     }

src/CssStore.php

@@ -14,6 +14,7 @@ public function addCssStyles($cssRules)
     {
         $this->styles = array_merge($this->styles, $cssRules);
 
+
         return $this;
     }
 
@@ -39,6 +40,7 @@ public function compileStyles()
         $styles = $this->prepareStylesForProcessing();
 
 
+
         return join(
             '',
             array_map(
@@ -81,7 +83,7 @@ function ($rule) {
         return "$media { ".join(
                 '',
                 array_map(
-                    function ($rule, $selector) {
+                    function ($rule) {
                         /** @var Rule $rule */
                         return $this->parsePropertiesToString($rule->getSelector(), $rule->getProperties());
                     },

src/PageSpecificCss.php

@@ -2,11 +2,13 @@
 
 namespace PageSpecificCss;
 
+use Exception;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\CssSelector\Exception\ExceptionInterface;
 use PageSpecificCss\Css\Processor;
 use PageSpecificCss\Css\Rule\Processor as RuleProcessor;
 use PageSpecificCss\Css\Rule\Rule;
+use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
 
 class PageSpecificCss
 {
@@ -102,23 +104,43 @@ public function extractCss($html)
 
         $xPath = new \DOMXPath($document);
 
-
-        $applicable_rules = array_filter($this->rules, function (Rule $rule) use ($xPath) {
-            try {
-                $expression = $this->cssConverter->toXPath($rule->getSelector());
-
-            } catch (ExceptionInterface $e) {
-                return false;
-            }
-
-            $elements = $xPath->query($expression);
-
-            if ($elements === false || $elements->length == 0) {
-                return false;
+        $applicable_rules = array_filter(
+            $this->rules,
+            function (Rule $rule) use ($xPath) {
+                try {
+                    if ($rule->getSelector() === "u-color-orange-base") {
+                        error_log("hola!!!");
+                    }
+
+                    $expression = $this->cssConverter->toXPath($rule->getSelector());
+                } catch (ExpressionErrorException $expressionErrorException) {
+
+                    // Allow for pseudo selectors
+                    // TODO: Find a way to validate this exception without checking strings
+                    if ($expressionErrorException->getMessage() !== 'Pseudo-elements are not supported.') {
+                        return false;
+                    }
+
+                    try {
+                        $tokens = explode(':', $rule->getSelector());
+                        $expression = $this->cssConverter->toXPath((string)reset($tokens));
+                    } catch (Exception $e) {
+                        return false;
+                    }
+
+                } catch (ExceptionInterface $e) {
+                    return false;
+                }
+
+                $elements = $xPath->query($expression);
+
+                if ($elements === false || $elements->length == 0) {
+                    return false;
+                }
+
+                return true;
             }
-
-            return true;
-        });
+        );
 
 
         return $applicable_rules;