LatteEngine update

Author: joepdooper

src/Shared/Core/App.php

@@ -138,12 +138,10 @@ public function run(): void
         LanguageManager::init();
 
         $engine = match ($_ENV['VIEW_ENGINE'] ?? 'latte') {
-            'blade' => new BladeEngine(),
-            default => new LatteEngine(),
+            'blade' => new BladeEngine($auth, $request),
+            default => new LatteEngine($auth, $request),
         };
 
-        $engine->setAuth($auth);
-
         View::setEngine($engine);
 
         $this->initPlugins($auth);

src/Template/Infrastructure/Renderer/ButtonRenderer.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Ivy\Template\Infrastructure\Renderer;
+
+use Latte\Engine;
+use Ivy\Template\Infrastructure\Manager\TemplateManager;
+
+final class ButtonRenderer
+{
+    private array $templateCache = [];
+
+    public function __construct(
+        private Engine $latte,
+        private TemplateManager $templates
+    ) {}
+
+    public function render(array $args): string
+    {
+        $type = $args['type'] ?? null;
+
+        if (!$type) {
+            throw new \InvalidArgumentException('Button type missing');
+        }
+
+        $file = $this->templateCache[$type]
+            ??= $this->templates->file("buttons/button.$type.latte");
+
+        if (!$file) {
+            throw new \RuntimeException("Button '{$type}' not found");
+        }
+
+        return $this->latte->renderToString($file, $args);
+    }
+}

src/Template/Presentation/Tag/ButtonNode.php

@@ -22,7 +22,17 @@ public static function create(Tag $tag): self
     public function print(PrintContext $context): string
     {
         return $context->format(
-            'echo ($this->global->customButtonRender)(%node);',
+            <<<'PHP'
+$args = %node;
+
+$file = \Ivy\Template\Infrastructure\Manager\TemplateManager::file(
+    'buttons/button.' . ($args['type'] ?? 'default') . '.latte'
+);
+
+if ($file) {
+    $this->createTemplate($file, $args, 'include')->render();
+}
+PHP,
             $this->args
         );
     }

src/Template/Presentation/View/Engine/LatteEngine.php

@@ -21,21 +21,19 @@
 use Ivy\Shared\Core\Path;
 use Ivy\Plugin\Infrastructure\Registry\PluginRegistry;
 use Ivy\Template\Presentation\Tag\ButtonTag;
+use Symfony\Component\HttpFoundation\Request;
 
 class LatteEngine implements ViewEngineInterface
 {
     private Engine $latte;
     private AuthService $auth;
+    private Request $request;
 
-
-    public function __construct()
+    public function __construct(AuthService $auth, Request $request)
     {
         $this->latte = new Engine();
-    }
-
-    public function setAuth(AuthService $auth): void
-    {
         $this->auth = $auth;
+        $this->request = $request;
     }
 
     public function boot(): void
@@ -71,7 +69,7 @@ public function getEngine(): Engine
     private function registerFunctions(): void
     {
         $this->latte->addFunction('icon', fn ($icon) =>
-        file_get_contents(Path::get('MEDIA_PATH') . 'icons/' . $icon)
+            file_get_contents(Path::get('MEDIA_PATH') . 'icons/' . $icon)
         );
 
         $this->latte->addFunction('text', fn ($key, $vars = null) =>
@@ -89,11 +87,7 @@ private function registerFunctions(): void
         );
 
         $this->latte->addFunction('file', fn ($key) =>
-        TemplateManager::file($key)
-        );
-
-        $this->latte->addFunction('render', fn ($key, $vars = []) =>
-        View::render($key, $vars)
+            TemplateManager::file($key)
         );
 
         $this->latte->addFunction('info', fn ($key) =>
@@ -109,75 +103,99 @@ private function registerFunctions(): void
         );
 
         $this->latte->addFunction('isPluginActive', fn (string $key): bool =>
-        PluginRegistry::isActive($key)
+            PluginRegistry::isActive($key)
         );
 
         $this->latte->addFunction('csrf', fn () =>
-        new Html('<input type="hidden" name="csrf_token" value="' . CsrfManager::token() . '">')
+            new Html('<input type="hidden" name="csrf_token" value="' . CsrfManager::token() . '">')
         );
 
         $this->latte->addFunction('canEditAsEditor', fn () =>
-        $this->auth->canEditAsEditor()
+            $this->auth->canEditAsEditor()
         );
 
         $this->latte->addFunction('canEditAsAdmin', fn () =>
-        $this->auth->canEditAsAdmin()
+            $this->auth->canEditAsAdmin()
         );
 
         $this->latte->addFunction('canEditAsSuperAdmin', fn () =>
-        $this->auth->canEditAsSuperAdmin()
+            $this->auth->canEditAsSuperAdmin()
         );
 
         $this->latte->addFunction('doesUserHaveRole', fn ($user, $role) =>
-        $this->auth->auth()->admin()->doesUserHaveRole($user, $role)
+            $this->auth->auth()->admin()->doesUserHaveRole($user, $role)
         );
 
         $this->latte->addFunction('authRoles', fn () =>
-        $this->auth->auth()->getRoles()
+            $this->auth->auth()->getRoles()
         );
 
         $this->latte->addFunction('authUser', fn () =>
-        $this->auth->authUser()
+            $this->auth->authUser()
         );
 
         $this->latte->addFunction('authProfile', fn () =>
-        $this->auth->authProfile()
+            $this->auth->authProfile()
         );
 
         $this->latte->addFunction('isLoggedIn', fn () =>
-        $this->auth->isLoggedIn()
+            $this->auth->isLoggedIn()
         );
 
         $this->latte->addFunction('can', fn ($action, $model) =>
-        (bool) $this->auth->can($action, $model)
+            (bool) $this->auth->can($action, $model)
         );
 
         $this->latte->addFunction('hook', fn ($key) =>
-        HookManager::do($key)
+            HookManager::do($key)
         );
 
         $this->latte->addFunction('csp', fn () =>
-        SecurityManager::getNonce()
+            SecurityManager::getNonce()
         );
 
         $this->latte->addFunction('cssFiles', fn () =>
-        AssetManager::getCSS()
+            AssetManager::getCSS()
         );
 
         $this->latte->addFunction('jsFiles', fn () =>
-        AssetManager::getJS()
+            AssetManager::getJS()
         );
 
         $this->latte->addFunction('moduleFiles', fn () =>
-        AssetManager::getModules()
+            AssetManager::getModules()
         );
 
-        $this->latte->addFunction('datetime', fn () =>
-        Carbon::class
+        $this->latte->addFunction('now', fn () => Carbon::now());
+
+        $this->latte->addFunction('parseDate', fn ($v) => Carbon::parse($v));
+
+        $this->latte->addFunction('monthName', fn ($i) =>
+            Carbon::create()->month($i)->format('F')
         );
 
-        $this->latte->addFunction('value', fn ($key, $default = null) => $key ?? $default
+        $this->latte->addFunction('value', fn ($key, $default = null) =>
+            $key ?? $default
         );
+
+        $this->latte->addFunction('sortUrl', function (string $column) {
+
+            $query = $this->request->query->all();
+
+            $currentSort = $query['sort'] ?? null;
+            $currentDirection = $query['direction'] ?? 'asc';
+
+            $query['sort'] = $column;
+
+            $query['direction'] =
+                ($currentSort === $column && $currentDirection === 'asc')
+                    ? 'desc'
+                    : 'asc';
+
+            unset($query['page']);
+
+            return '?' . http_build_query($query);
+        });
     }
 
     private function registerExtensions(): void
@@ -187,13 +205,6 @@ private function registerExtensions(): void
 
     private function registerProviders(): void
     {
-        $this->latte->addProvider('customButtonRender', function ($args) {
-            if ($file = TemplateManager::file('buttons/button.' . $args['type'] . '.latte')) {
-                $this->latte->render($file, $args);
-                return;
-            }
-
-            throw new \Exception("Button template for type '{$args['type']}' not found.");
-        });
+        
     }
 }