Performance optimizations.

ivopetkov · ivopetkov · commit 441abdfedff3 · 2020-03-06T19:53:29.000+02:00
diff --git a/src/HTMLServerComponentsCompiler.php b/src/HTMLServerComponentsCompiler.php
@@ -155,39 +155,32 @@ public function process($content, array $options = [])
                 }
                 $insertHTMLSources = [];
                 $list = []; // Save the elements into an array because removeChild() messes up the NodeList
-                foreach ($componentElements as $componentElement) {
-                    $isInOtherComponentTag = false;
+                foreach ($componentElements as $index => $componentElement) {
                     $parentNode = $componentElement->parentNode;
+                    $list[$index] = [$componentElement, $parentNode, []]; // The last one will contain the parents tag names
                     while ($parentNode !== null && isset($parentNode->tagName)) {
-                        if (array_search($parentNode->tagName, $tagNames) !== false) {
-                            $isInOtherComponentTag = true;
+                        $tagName = $parentNode->tagName;
+                        $list[$index][2][] = $tagName;
+                        if ($tagName === 'head' || $tagName === 'body') {
                             break;
                         }
                         $parentNode = $parentNode->parentNode;
                     }
-                    if (!$isInOtherComponentTag) {
-                        $list[] = $componentElement;
-                    }
                 }
-                foreach ($list as $i => $componentElement) {
+                foreach ($list as $index => $componentData) {
+                    if (!empty(array_intersect($componentData[2], $tagNames))) {
+                        continue;
+                    }
+                    $componentElement = $componentData[0];
                     $component = $this->makeComponent($componentElement->getAttributes(), $componentElement->innerHTML, $componentElement->tagName);
                     $componentResultHTML = $getComponentResultHTML($component);
-                    $isInBodyTag = false;
-                    $parentNode = $componentElement->parentNode;
-                    while ($parentNode !== null && isset($parentNode->tagName)) {
-                        if ($parentNode->tagName === 'body') {
-                            $isInBodyTag = true;
-                            break;
-                        }
-                        $parentNode = $parentNode->parentNode;
-                    }
-                    if ($isInBodyTag) {
-                        $insertTargetName = 'html-server-components-compiler-insert-target-' . $i;
-                        $componentElement->parentNode->insertBefore($domDocument->createInsertTarget($insertTargetName), $componentElement);
-                        $componentElement->parentNode->removeChild($componentElement); // must be before insertHTML because a duplicate elements IDs can occur.
+                    if (array_search('body', $componentData[2]) !== false) {
+                        $insertTargetName = 'html-server-components-compiler-insert-target-' . $index;
+                        $componentData[1]->insertBefore($domDocument->createInsertTarget($insertTargetName), $componentElement);
+                        $componentData[1]->removeChild($componentElement); // must be before insertHTML because a duplicate elements IDs can occur.
                         $insertHTMLSources[] = ['source' => $componentResultHTML, 'target' => $insertTargetName];
                     } else {
-                        $componentElement->parentNode->removeChild($componentElement);
+                        $componentData[1]->removeChild($componentElement);
                         $insertHTMLSources[] = ['source' => $componentResultHTML];
                     }
                 }
diff --git a/tests/Test.php b/tests/Test.php
@@ -222,4 +222,16 @@ public function testHeadContent()
         $expectedResult = '<!DOCTYPE html>' . "\n" . '<html><head><title>222</title></head><body></body></html>';
         $this->assertTrue($result === $expectedResult);
     }
+
+    /**
+     * 
+     */
+    public function testDifferentComponentLocations()
+    {
+
+        $compiler = new \IvoPetkov\HTMLServerComponentsCompiler();
+        $result = $compiler->process('<html><head><component src="data:base64,' . base64_encode('<body><script>var a1=1;</script><div>1</div></body>') . '" /></head><body><component src="data:base64,' . base64_encode('<script>var a2=2;</script><div>2</div>') . '" /></body></html>');
+        $expectedResult = '<!DOCTYPE html>' . "\n" . '<html><head></head><body><script>var a2=2;</script><div>2</div><script>var a1=1;</script><div>1</div></body></html>';
+        $this->assertTrue($result === $expectedResult);
+    }
 }
