Reworked rules / document walking and more...

Author: JanDC

src/CssStore.php

@@ -2,14 +2,16 @@
 
 namespace PageSpecificCss;
 
+use TijsVerkoyen\CssToInlineStyles\Css\Property\Property;
+
 class CssStore
 {
-    /** @var string[] */
+    /** @var array Property objects, grouped by selector */
     private $styles = [];
 
-    public function addCssStyle($cssRules)
+    public function addCssStyles($cssRules)
     {
-        $this->styles[] = $cssRules;
+        $this->styles = array_merge($this->styles, $cssRules);
         return $this;
     }
 
@@ -18,11 +20,6 @@ public function getStyles()
         return $this->styles;
     }
 
-    public function compileStyles()
-    {
-        return join(';', $this->styles);
-    }
-
     /**
      * @param string $path
      *
@@ -33,5 +30,27 @@ public function dumpStyles($path)
         return file_put_contents($path, $this->compileStyles()) === false;
     }
 
+    public function compileStyles()
+    {
+        return join('', array_map(function ($properties,$key) {
+            return $this->parsePropertiesToString($key, $properties);
+        }, $this->styles, array_keys($this->styles)));
+    }
+
+    /**
+     * @param string $selector
+     * @param array $properties
+     *
+     * @return string
+     */
+    private function parsePropertiesToString($selector, array $properties)
+    {
+        return "$selector { " .
+        join('', array_map(function (Property $property) {
+                return $property->getName() . ': ' . $property->getValue() . ';';
+            }, $properties)
+        ) .
+        "}";
+    }
 
 }

src/PageSpecificCss.php

@@ -2,35 +2,53 @@
 
 namespace PageSpecificCss;
 
+use Symfony\Component\CssSelector\CssSelectorConverter;
+use Symfony\Component\CssSelector\Exception\ExceptionInterface;
 use TijsVerkoyen\CssToInlineStyles\Css\Processor;
+use TijsVerkoyen\CssToInlineStyles\Css\Rule\Processor as RuleProcessor;
+use TijsVerkoyen\CssToInlineStyles\Css\Rule\Rule;
 use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
 
 class PageSpecificCss extends CssToInlineStyles
 {
 
+    /** @var  CssSelectorConverter */
+    protected $cssConverter;
+
     /** @var CssStore */
     private $cssStore;
 
     /** @var Processor */
     private $processor;
 
+    /** @var Rule[] */
+    private $rules;
+
     /**
      * PageSpecificCss constructor.
+     * @param string $sourceCss path to the source css
      */
-    public function __construct()
+    public function __construct($sourceCss)
     {
         parent::__construct();
 
         $this->cssStore = new CssStore();
-        $this->processor = new Processor(true);
+        $this->processor = new Processor();
+        $this->rules = $this->processor->getRules(file_get_contents($sourceCss));
+        $this->cssConverter = new CssSelectorConverter();
+
+    }
+
+    public function getStore(){
+        return $this->cssStore;
     }
 
     /**
      * @param string $html the raw html
      */
     public function processHtmlToStore($html)
     {
-        $this->cssStore->addCssStyle($this->extractCss($html));
+        $this->cssStore->addCssStyles($this->extractCss($html));
     }
 
     /**
@@ -40,6 +58,52 @@ public function processHtmlToStore($html)
      */
     public function extractCss($html)
     {
-        return $this->processor->getCssFromStyleTags($html);
+        $document = $this->createDomDocumentFromHtml($html);
+
+        $xPath = new \DOMXPath($document);
+
+        usort($this->rules, [RuleProcessor::class, 'sortOnSpecificity']);
+
+        $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;
+            }
+
+            return true;
+        });
+
+        $applicable_rules = $this->groupRulesBySelector($applicable_rules);
+        return $applicable_rules;
+
+
+    }
+
+    /**
+     * @param Rule[] $applicable_rules
+     *
+     * @return  array
+     */
+    private function groupRulesBySelector($applicable_rules)
+    {
+        $grouped = [];
+
+        foreach ($applicable_rules as $applicable_rule) {
+            /** @var Rule $applicable_rule */
+            if (isset($grouped[$applicable_rule->getSelector()])) {
+                $grouped[$applicable_rule->getSelector()] = array_merge($grouped[$applicable_rule->getSelector()], $applicable_rule->getProperties());
+            } else {
+                $grouped[$applicable_rule->getSelector()] = $applicable_rule->getProperties();
+            }
+        }
+
+        return $grouped;
     }
 }

src/Twig/Extension.php

@@ -2,18 +2,42 @@
 
 namespace PageSpecificCss\Twig;
 
+use PageSpecificCss\PageSpecificCss;
 use PageSpecificCss\Twig\TokenParsers\FoldTokenParser;
 use Twig_Extension;
 use Twig_ExtensionInterface;
 
 class Extension extends Twig_Extension implements Twig_ExtensionInterface
 {
 
+    /** @var PageSpecificCss */
+    private $pageSpecificCssService;
+
+    /**
+     * Extension constructor.
+     *
+     * @param string $sourceCss
+     */
+    public function __construct($sourceCss)
+    {
+        $this->pageSpecificCssService = new PageSpecificCss($sourceCss);
+    }
+
     public function getTokenParsers()
     {
         return [
             new FoldTokenParser(),
         ];
     }
 
+    public function addCssToExtract($rawHtml)
+    {
+        $this->pageSpecificCssService->processHtmlToStore($rawHtml);
+        return $rawHtml;
+    }
+
+    public function getCriticalCss()
+    {
+        return $this->pageSpecificCssService->getStore()->compileStyles();
+    }
 }

src/Twig/TokenParsers/FoldNode.php

@@ -2,6 +2,7 @@
 
 namespace PageSpecificCss\Twig\TokenParsers;
 
+use PageSpecificCss\Twig\Extension;
 use Twig_Compiler;
 use Twig_Node;
 
@@ -15,6 +16,12 @@ public function __construct(Twig_Node $body, array $attributes, $lineno, $tag)
 
     public function compile(Twig_Compiler $compiler)
     {
-        file_put_contents('test', $this->getNode('body'));
+        $compiler
+            ->addDebugInfo($this)
+            ->write("ob_start();\n")
+            ->subcompile($this->getNode('body'))
+            ->write("echo \$this->env->getExtension('".Extension::class."')->addCssToExtract(")
+            ->raw('trim(ob_get_clean())')
+            ->raw(");\n");
     }
 }