From 18bf9aaadecbc7f2102ea2d4479290d41adba633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sat, 27 Jun 2020 02:25:54 +0200
Subject: [PATCH 1/4] MAPG-180 declare CSS and JS files

---
 src/View/Linker.php            | 24 +++++++++++++++++++++--
 src/View/ParsedFragment.php    | 18 ++++++++++++++++-
 src/View/Parser.php            | 35 ++++++++++++++++++++++++++++++++--
 views/admin/map_editor.php     | 25 +++++++++---------------
 views/game.php                 | 15 ++++-----------
 views/login/google_signup.php  |  8 +-------
 views/login/signup.php         |  8 +-------
 views/maps.php                 | 17 ++++-------------
 views/templates/mapguesser.php |  2 ++
 9 files changed, 93 insertions(+), 59 deletions(-)

diff --git a/src/View/Linker.php b/src/View/Linker.php
index 360d69c..d426bc1 100644
--- a/src/View/Linker.php
+++ b/src/View/Linker.php
@@ -14,6 +14,8 @@ class Linker
         $input = ROOT . '/views/' . $this->view . '.php';
 
         $temporaryFiles = [];
+        $css = [];
+        $js = [];
         $sections = [];
         $extra = ['', ''];
 
@@ -23,12 +25,14 @@ class Linker
 
             $extends = $fragment->getExtends();
 
+            $css = array_merge($css, $fragment->getCss());
+            $js = array_merge($js, $fragment->getJs());
             $sections = array_merge($sections, $fragment->getSections()); //TODO: detect if section defined multiple times
             $extra[0] = $fragment->getExtra()[0] . $extra[0];
             $extra[1] = $extra[1] . $fragment->getExtra()[1];
 
             if ($extends === null) {
-                $this->writeFinal($extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
+                $this->writeFinal($css, $js, $extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
                 break;
             }
 
@@ -74,7 +78,7 @@ class Linker
         fclose($outputFileHandle);
     }
 
-    private function writeFinal(array $extra, string $file, string $output): void
+    private function writeFinal(array $css, array $js, array $extra, string $file, string $output): void
     {
         $dirname = pathinfo($output, PATHINFO_DIRNAME);
         if (!is_dir($dirname)) {
@@ -91,6 +95,22 @@ class Linker
             throw new \Exception('Cannot open file ' . $output . 'for writing.');
         }
 
+        if (count($css) > 0) {
+            fwrite($outputFileHandle, '<?php' . PHP_EOL . '$cssFiles = [];' . PHP_EOL);
+            foreach ($css as $cssFile) {
+                fwrite($outputFileHandle, '$cssFiles[] = ' . $cssFile . ';' . PHP_EOL);
+            }
+            fwrite($outputFileHandle, '?>' . PHP_EOL);
+        }
+
+        if (count($js) > 0) {
+            fwrite($outputFileHandle, '<?php' . PHP_EOL . '$jsFiles = [];' . PHP_EOL);
+            foreach ($js as $jsFile) {
+                fwrite($outputFileHandle, '$jsFiles[] = ' . $jsFile . ';' . PHP_EOL);
+            }
+            fwrite($outputFileHandle, '?>' . PHP_EOL);
+        }
+
         fwrite($outputFileHandle, $extra[0]);
         while (($line = fgets($inputFileHandle)) !== false) {
             fwrite($outputFileHandle, $line);
diff --git a/src/View/ParsedFragment.php b/src/View/ParsedFragment.php
index 52bbb5b..a270a32 100644
--- a/src/View/ParsedFragment.php
+++ b/src/View/ParsedFragment.php
@@ -4,13 +4,19 @@ class ParsedFragment
 {
     private ?string $extends;
 
+    private array $css;
+
+    private array $js;
+
     private array $sections;
 
     private array $extra;
 
-    public function __construct(?string $extends, array $sections, array $extra)
+    public function __construct(?string $extends, array $css, array $js, array $sections, array $extra)
     {
         $this->extends = $extends;
+        $this->css = $css;
+        $this->js = $js;
         $this->sections = $sections;
         $this->extra = $extra;
     }
@@ -20,6 +26,16 @@ class ParsedFragment
         return $this->extends;
     }
 
+    public function getCss(): array
+    {
+        return $this->css;
+    }
+
+    public function getJs(): array
+    {
+        return $this->js;
+    }
+
     public function getSections(): array
     {
         return $this->sections;
diff --git a/src/View/Parser.php b/src/View/Parser.php
index 6cbde82..0356027 100644
--- a/src/View/Parser.php
+++ b/src/View/Parser.php
@@ -11,11 +11,12 @@ class Parser
 
     public function parse(): ParsedFragment
     {
-
         $sectionOpen = null;
         $extraOpen = false;
 
         $extends = null;
+        $js = [];
+        $css = [];
         $sections = [];
         $extra = ['', ''];
 
@@ -28,6 +29,18 @@ class Parser
         while (($line = fgets($fileHandle)) !== false) {
             ++$lineNumber;
 
+            if (($cssMatched = $this->matchCss($line)) !== null) {
+                $css[] = $cssMatched;
+
+                continue;
+            }
+
+            if (($jsMatched = $this->matchJs($line)) !== null) {
+                $js[] = $jsMatched;
+
+                continue;
+            }
+
             if (($extendsMatched = $this->matchExtends($line)) !== null) {
                 if ($extends !== null) {
                     throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - There is already an \'@extends\' declared.');
@@ -90,7 +103,25 @@ class Parser
 
         fclose($fileHandle);
 
-        return new ParsedFragment($extends, $sections, $extra);
+        return new ParsedFragment($extends, $css, $js, $sections, $extra);
+    }
+
+    private function matchCss(string $line): ?string
+    {
+        if (preg_match('/^\s*@css\((.*)\)\s*$/', $line, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    private function matchJs(string $line): ?string
+    {
+        if (preg_match('/^\s*@js\((.*)\)\s*$/', $line, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
     }
 
     private function matchExtends(string $line): ?string
diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index 1ca983f..c0d2e5a 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -1,19 +1,12 @@
-@extra
-<?php
-$cssFiles = [
-    'node_modules/leaflet/dist/leaflet.css',
-    'css/map_editor.css',
-    'node_modules/leaflet.markercluster/dist/MarkerCluster.css',
-    'node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css'
-];
-$jsFiles = [
-    'node_modules/leaflet/dist/leaflet.js',
-    'node_modules/leaflet.markercluster/dist/leaflet.markercluster.js',
-    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
-    'js/map_editor.js',
-];
-?>
-@endextra
+@css('node_modules/leaflet/dist/leaflet.css')
+@css('css/map_editor.css')
+@css('node_modules/leaflet.markercluster/dist/MarkerCluster.css')
+@css('node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css')
+
+@js('node_modules/leaflet/dist/leaflet.js')
+@js('node_modules/leaflet.markercluster/dist/leaflet.markercluster.js')
+@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
+@js('js/map_editor.js')
 
 @extends('templates/layout_full')
 
diff --git a/views/game.php b/views/game.php
index bc4c63a..81dfc08 100644
--- a/views/game.php
+++ b/views/game.php
@@ -1,14 +1,7 @@
-@extra
-<?php
-$cssFiles = [
-    'css/game.css'
-];
-$jsFiles = [
-    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
-    'js/game.js',
-];
-?>
-@endextra
+@css('css/game.css')
+
+@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
+@js('js/game.js')
 
 @extends('templates/layout_full')
 
diff --git a/views/login/google_signup.php b/views/login/google_signup.php
index 0f9fe9c..dd7b498 100644
--- a/views/login/google_signup.php
+++ b/views/login/google_signup.php
@@ -1,10 +1,4 @@
-@extra
-<?php
-$jsFiles = [
-    'js/login/google_signup.js',
-];
-?>
-@endextra
+@js('js/login/google_signup.js')
 
 @extends('templates/layout_normal')
 
diff --git a/views/login/signup.php b/views/login/signup.php
index 6912a27..ef63f04 100644
--- a/views/login/signup.php
+++ b/views/login/signup.php
@@ -1,10 +1,4 @@
-@extra
-<?php
-$jsFiles = [
-    'js/login/signup.js',
-];
-?>
-@endextra
+@js('js/login/signup.js')
 
 @extends('templates/layout_normal')
 
diff --git a/views/maps.php b/views/maps.php
index 002d3bb..22ecc11 100644
--- a/views/maps.php
+++ b/views/maps.php
@@ -1,16 +1,7 @@
-@extra
-<?php
-$cssFiles = [
-    'css/maps.css'
-];
-$jsFiles = [
-    'js/maps.js',
-];
-if ($isAdmin) {
-    $jsFiles[] = 'js/maps_admin.js';
-}
-?>
-@endextra
+@css('css/maps.css')
+@js('js/maps.js')
+TODO: condition!
+@js('js/maps_admin.js')
 
 @extends('templates/layout_normal')
 
diff --git a/views/templates/mapguesser.php b/views/templates/mapguesser.php
index 083fbb7..313d332 100644
--- a/views/templates/mapguesser.php
+++ b/views/templates/mapguesser.php
@@ -16,6 +16,7 @@
         <?php endforeach; ?>
     <?php endif; ?>
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;500&display=swap" rel="stylesheet">
+    @yields('inlineCss')
     <link rel="icon" type="image/png" sizes="192x192" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/192x192.png?rev=<?= REVISION ?>">
     <link rel="icon" type="image/png" sizes="96x96" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/96x96.png?rev=<?= REVISION ?>">
     <link rel="icon" type="image/png" sizes="32x32" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/32x32.png?rev=<?= REVISION ?>">
@@ -62,6 +63,7 @@
             <script src="<?= $jsFile ?>"></script>
         <?php endforeach; ?>
     <?php endif; ?>
+    @yields('inlineJs')
     <?php if (!isset($_COOKIE['COOKIES_CONSENT'])): ?>
         <script>
             (function () {

From 825e0744ecd0930bf2564e39a62f7097436b6ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sat, 27 Jun 2020 12:16:50 +0200
Subject: [PATCH 2/4] MAPG-180 rename pagescript to pageScript

---
 views/admin/map_editor.php     | 2 +-
 views/game.php                 | 2 +-
 views/templates/mapguesser.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index c0d2e5a..1f4ca55 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -68,7 +68,7 @@
     </div>
 @endsection
 
-@section('pagescript')
+@section('pageScript')
 <script>
     var tileUrl = '<?= $_ENV['LEAFLET_TILESERVER_URL'] ?>';
     var tileAttribution = '<?= $_ENV['LEAFLET_TILESERVER_ATTRIBUTION'] ?>';
diff --git a/views/game.php b/views/game.php
index 81dfc08..a76554a 100644
--- a/views/game.php
+++ b/views/game.php
@@ -48,7 +48,7 @@
     </div>
 @endsection
 
-@section('pagescript')
+@section('pageScript')
 <script>
     var mapId = <?= $mapId ?>;
     var mapBounds = <?= json_encode($bounds) ?>;
diff --git a/views/templates/mapguesser.php b/views/templates/mapguesser.php
index 313d332..6dfe3b1 100644
--- a/views/templates/mapguesser.php
+++ b/views/templates/mapguesser.php
@@ -51,7 +51,7 @@
             const GOOGLE_ANALITICS_ID = '<?= $_ENV['GOOGLE_ANALITICS_ID'] ?>';
         <?php endif; ?>
     </script>
-    @yields('pagescript')
+    @yields('pageScript')
     <script src="<?= $_ENV['STATIC_ROOT'] ?>/js/mapguesser.js?rev=<?= REVISION ?>"></script>
     <?php if (isset($jsFiles)) : ?>
         <?php foreach ($jsFiles as $jsFile) : ?>

From efdd5c54be501b7fd5d3c0a9220d9e636c2b452d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sat, 27 Jun 2020 12:51:00 +0200
Subject: [PATCH 3/4] MAPG-180 ability to inline CSS and JS assets

---
 src/View/Linker.php            | 78 ++++++++++++++++++++++++----------
 views/templates/mapguesser.php | 22 +---------
 2 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/src/View/Linker.php b/src/View/Linker.php
index d426bc1..817d8ac 100644
--- a/src/View/Linker.php
+++ b/src/View/Linker.php
@@ -2,6 +2,8 @@
 
 class Linker
 {
+    const INLINE_ASSET_LIMIT = 2000;
+
     private string $view;
 
     public function __construct(string $view)
@@ -14,9 +16,7 @@ class Linker
         $input = ROOT . '/views/' . $this->view . '.php';
 
         $temporaryFiles = [];
-        $css = [];
-        $js = [];
-        $sections = [];
+        $sections = ['externalCss' => '', 'inlineCss' => '', 'externalJs' => '', 'inlineJs' => ''];
         $extra = ['', ''];
 
         do {
@@ -25,14 +25,14 @@ class Linker
 
             $extends = $fragment->getExtends();
 
-            $css = array_merge($css, $fragment->getCss());
-            $js = array_merge($js, $fragment->getJs());
+            $this->generateAssets($fragment, $sections);
+
             $sections = array_merge($sections, $fragment->getSections()); //TODO: detect if section defined multiple times
             $extra[0] = $fragment->getExtra()[0] . $extra[0];
             $extra[1] = $extra[1] . $fragment->getExtra()[1];
 
             if ($extends === null) {
-                $this->writeFinal($css, $js, $extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
+                $this->writeFinal($extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
                 break;
             }
 
@@ -78,7 +78,7 @@ class Linker
         fclose($outputFileHandle);
     }
 
-    private function writeFinal(array $css, array $js, array $extra, string $file, string $output): void
+    private function writeFinal(array $extra, string $file, string $output): void
     {
         $dirname = pathinfo($output, PATHINFO_DIRNAME);
         if (!is_dir($dirname)) {
@@ -95,22 +95,6 @@ class Linker
             throw new \Exception('Cannot open file ' . $output . 'for writing.');
         }
 
-        if (count($css) > 0) {
-            fwrite($outputFileHandle, '<?php' . PHP_EOL . '$cssFiles = [];' . PHP_EOL);
-            foreach ($css as $cssFile) {
-                fwrite($outputFileHandle, '$cssFiles[] = ' . $cssFile . ';' . PHP_EOL);
-            }
-            fwrite($outputFileHandle, '?>' . PHP_EOL);
-        }
-
-        if (count($js) > 0) {
-            fwrite($outputFileHandle, '<?php' . PHP_EOL . '$jsFiles = [];' . PHP_EOL);
-            foreach ($js as $jsFile) {
-                fwrite($outputFileHandle, '$jsFiles[] = ' . $jsFile . ';' . PHP_EOL);
-            }
-            fwrite($outputFileHandle, '?>' . PHP_EOL);
-        }
-
         fwrite($outputFileHandle, $extra[0]);
         while (($line = fgets($inputFileHandle)) !== false) {
             fwrite($outputFileHandle, $line);
@@ -120,4 +104,52 @@ class Linker
         fclose($inputFileHandle);
         fclose($outputFileHandle);
     }
+
+    private function generateAssets(ParsedFragment $fragment, array &$sections)
+    {
+        foreach ($fragment->getCss() as $cssFile) {
+            $asset = $this->parseAsset($cssFile, 'css');
+            if (isset($asset['code'])) {
+                $sections['inlineCss'] .= '<style>' . PHP_EOL;
+                $sections['inlineCss'] .= $asset['code'];
+                $sections['inlineCss'] .= '</style>' . PHP_EOL;
+            } elseif (isset($asset['file'])) {
+                $sections['externalCss'] .= '<link href="' . $asset['file'] . '" rel="stylesheet">' . PHP_EOL;
+            }
+        }
+
+        foreach ($fragment->getJs() as $jsFile) {
+            $asset = $this->parseAsset($jsFile, 'js');
+            if (isset($asset['code'])) {
+                $sections['inlineJs'] .= '<script>' . PHP_EOL;
+                $sections['inlineJs'] .= $asset['code'];
+                $sections['inlineJs'] .= '</script>' . PHP_EOL;
+            } elseif (isset($asset['file'])) {
+                $sections['externalJs'] .= '<script src="' . $asset['file'] . '"></script>' . PHP_EOL;
+            }
+        }
+    }
+
+    private function parseAsset(string $asset, string $type): array
+    {
+        $output = [];
+
+        eval('$asset = ' . $asset . ';');
+
+        if (
+            empty($_ENV['DEV']) &&
+            preg_match('/^' . $type . '\/.*/', $asset) &&
+            filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
+        ) {
+            $output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
+        } else {
+            if (!preg_match('/^http(s)?/', $asset)) {
+                $output['file'] = $_ENV['STATIC_ROOT'] .  '/' . $asset . '?rev=' . REVISION;
+            } else {
+                $output['file'] = $asset;
+            }
+        }
+
+        return $output;
+    }
 }
diff --git a/views/templates/mapguesser.php b/views/templates/mapguesser.php
index 6dfe3b1..9f1793f 100644
--- a/views/templates/mapguesser.php
+++ b/views/templates/mapguesser.php
@@ -5,16 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><?= $_ENV['APP_NAME'] ?></title>
     <link href="<?= $_ENV['STATIC_ROOT'] ?>/css/mapguesser.css?rev=<?= REVISION ?>" rel="stylesheet">
-    <?php if (isset($cssFiles)) : ?>
-        <?php foreach ($cssFiles as $cssFile) : ?>
-            <?php
-            if (!preg_match('/^http(s)?/', $cssFile)) {
-                $cssFile = $_ENV['STATIC_ROOT'] .  '/' . $cssFile . '?rev=' . REVISION;
-            }
-            ?>
-            <link href="<?= $cssFile ?>" rel="stylesheet">
-        <?php endforeach; ?>
-    <?php endif; ?>
+    @yields('externalCss')
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;500&display=swap" rel="stylesheet">
     @yields('inlineCss')
     <link rel="icon" type="image/png" sizes="192x192" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/192x192.png?rev=<?= REVISION ?>">
@@ -53,16 +44,7 @@
     </script>
     @yields('pageScript')
     <script src="<?= $_ENV['STATIC_ROOT'] ?>/js/mapguesser.js?rev=<?= REVISION ?>"></script>
-    <?php if (isset($jsFiles)) : ?>
-        <?php foreach ($jsFiles as $jsFile) : ?>
-            <?php
-            if (!preg_match('/^http(s)?/', $jsFile)) {
-                $jsFile = $_ENV['STATIC_ROOT'] .  '/' . $jsFile . '?rev=' . REVISION;
-            }
-            ?>
-            <script src="<?= $jsFile ?>"></script>
-        <?php endforeach; ?>
-    <?php endif; ?>
+    @yields('externalJs')
     @yields('inlineJs')
     <?php if (!isset($_COOKIE['COOKIES_CONSENT'])): ?>
         <script>

From a55ece7dacf4b17ebafb96c3aaaa1116c797a715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sat, 27 Jun 2020 12:56:47 +0200
Subject: [PATCH 4/4] MAPG-180 don't buffer content output to variable

---
 src/Interfaces/Response/IContent.php | 2 +-
 src/Response/ContentBase.php         | 2 +-
 src/Response/HtmlContent.php         | 9 ++-------
 src/Response/JsonContent.php         | 6 ++----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Interfaces/Response/IContent.php b/src/Interfaces/Response/IContent.php
index 446a4ab..fef4842 100644
--- a/src/Interfaces/Response/IContent.php
+++ b/src/Interfaces/Response/IContent.php
@@ -4,7 +4,7 @@ interface IContent
 {
     public function &getData(): array;
 
-    public function &render(): string;
+    public function render(): void;
 
     public function getContentType(): string;
 }
diff --git a/src/Response/ContentBase.php b/src/Response/ContentBase.php
index 359cbdb..31d0053 100644
--- a/src/Response/ContentBase.php
+++ b/src/Response/ContentBase.php
@@ -11,7 +11,7 @@ abstract class ContentBase implements IContent
         return $this->data;
     }
 
-    abstract public function &render(): string;
+    abstract public function render(): void;
 
     abstract public function getContentType(): string;
 }
diff --git a/src/Response/HtmlContent.php b/src/Response/HtmlContent.php
index 2e1b13e..b5c9d6c 100644
--- a/src/Response/HtmlContent.php
+++ b/src/Response/HtmlContent.php
@@ -12,7 +12,7 @@ class HtmlContent extends ContentBase
         $this->data = &$data;
     }
 
-    public function &render(): string
+    public function render(): void
     {
         if (!empty($_ENV['DEV'])) {
             $generator = new Linker($this->view);
@@ -21,14 +21,9 @@ class HtmlContent extends ContentBase
 
         extract($this->data);
 
-        ob_start();
         require ROOT . '/cache/views/' . $this->view . '.php';
-        $content = ob_get_contents();
-        ob_end_clean();
 
-        $content .= '<!-- __debug__runtime: ' . round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1) . ' -->';
-
-        return $content;
+        echo '<!-- __debug__runtime: ' . round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1) . ' -->';
     }
 
     public function getContentType(): string
diff --git a/src/Response/JsonContent.php b/src/Response/JsonContent.php
index d71eab8..c2ecac0 100644
--- a/src/Response/JsonContent.php
+++ b/src/Response/JsonContent.php
@@ -7,13 +7,11 @@ class JsonContent extends ContentBase
         $this->data = &$data;
     }
 
-    public function &render(): string
+    public function render(): void
     {
         $this->data['__debug__runtime'] = round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1);
 
-        $content = json_encode($this->data);
-
-        return $content;
+        echo json_encode($this->data);
     }
 
     public function getContentType(): string