Fix invalid expression compilation and migrate View engine namespace to Core\View

README.md

@@ -30,7 +30,7 @@
 <?php
 require_once 'autoload.php';
 
-use Beobles\Core\View\Engine;
+use Core\View\Engine;
 
 $engine = new Engine([
     'templates_dir' => __DIR__ . '/templates',

autoload.php

@@ -6,17 +6,30 @@
  */
 
 spl_autoload_register(function ($class) {
-    $prefix = 'Beobles\\Core\\View\\';
+    $prefixes = ['Core\\View\\', 'Beobles\\Core\\View\\'];
     $baseDir = __DIR__ . '/src/Core/View/';
 
-    if (strpos($class, $prefix) !== 0) {
-        return;
-    }
+    foreach ($prefixes as $prefix) {
+        if (strpos($class, $prefix) !== 0) {
+            continue;
+        }
+
+        $relativeClass = substr($class, strlen($prefix));
+        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
 
-    $relativeClass = substr($class, strlen($prefix));
-    $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+        if (!file_exists($file)) {
+            return;
+        }
 
-    if (file_exists($file)) {
         require $file;
+
+        if ($prefix === 'Beobles\\Core\\View\\') {
+            $newClass = 'Core\\View\\' . $relativeClass;
+            if (class_exists($newClass, false) && !class_exists($class, false)) {
+                class_alias($newClass, $class);
+            }
+        }
+
+        return;
     }
 });

examples/index.php

@@ -2,7 +2,7 @@
 
 require_once __DIR__ . '/../autoload.php';
 
-use Beobles\Core\View\Engine;
+use Core\View\Engine;
 
 // Criar engine
 $engine = new Engine([

src/Core/View/Abstract/AbstractDirective.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Abstract;
+namespace Core\View\Abstract;
 
 abstract class AbstractDirective
 {

src/Core/View/Abstract/AbstractFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Abstract;
+namespace Core\View\Abstract;
 
 abstract class AbstractFilter
 {

src/Core/View/Abstract/AbstractMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Abstract;
+namespace Core\View\Abstract;
 
 abstract class AbstractMiddleware
 {

src/Core/View/Abstract/AbstractNode.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Beobles\Core\View\Abstract;
+namespace Core\View\Abstract;
 
-use Beobles\Core\View\Compiler;
-use Beobles\Core\View\Nodes\NodeInterface;
+use Core\View\Compiler;
+use Core\View\Nodes\NodeInterface;
 
 abstract class AbstractNode implements NodeInterface
 {

src/Core/View/Cache/CacheInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Cache;
+namespace Core\View\Cache;
 
 /**
  * Interface para adaptadores de cache

src/Core/View/Cache/CacheKey.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Cache;
+namespace Core\View\Cache;
 
 class CacheKey
 {

src/Core/View/Cache/CacheManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Cache;
+namespace Core\View\Cache;
 
 /**
  * Gerenciador de cache

src/Core/View/Cache/FileCacheAdapter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Cache;
+namespace Core\View\Cache;
 
 /**
  * Adaptador de cache em arquivo

src/Core/View/Cache/FileWatcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Cache;
+namespace Core\View\Cache;
 
 class FileWatcher
 {

src/Core/View/Compiler.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace Beobles\Core\View;
-
-use Beobles\Core\View\Nodes\BlockNode;
-use Beobles\Core\View\Nodes\ComponentNode;
-use Beobles\Core\View\Nodes\ExpressionNode;
-use Beobles\Core\View\Nodes\ForeachNode;
-use Beobles\Core\View\Nodes\IfNode;
-use Beobles\Core\View\Nodes\IncludeNode;
-use Beobles\Core\View\Nodes\NodeInterface;
-use Beobles\Core\View\Nodes\RawNode;
-use Beobles\Core\View\Nodes\SetNode;
-use Beobles\Core\View\Nodes\TextNode;
+namespace Core\View;
+
+use Core\View\Nodes\BlockNode;
+use Core\View\Nodes\ComponentNode;
+use Core\View\Nodes\ExpressionNode;
+use Core\View\Nodes\ForeachNode;
+use Core\View\Nodes\IfNode;
+use Core\View\Nodes\IncludeNode;
+use Core\View\Nodes\NodeInterface;
+use Core\View\Nodes\RawNode;
+use Core\View\Nodes\SetNode;
+use Core\View\Nodes\TextNode;
 
 class Compiler
 {
@@ -138,12 +138,7 @@ private function compileExpression(string $expression): string
     {
         $parts = preg_split('/\|/', $expression) ?: [];
         $base = trim(array_shift($parts) ?? 'null');
-
-        if (preg_match('/^[A-Za-z_][A-Za-z0-9_]*$/', $base) === 1) {
-            $compiled = '$__engine->resolveValue(' . var_export($base, true) . ', get_defined_vars())';
-        } else {
-            $compiled = $this->transformDotNotation($base);
-        }
+        $compiled = $this->transformExpression($base);
 
         foreach ($parts as $part) {
             $part = trim($part);
@@ -164,15 +159,154 @@ private function compileExpression(string $expression): string
         return $compiled;
     }
 
-    private function transformDotNotation(string $expression): string
+    private function transformExpression(string $expression): string
+    {
+        $expression = trim($expression);
+        if ($expression === '') {
+            return 'null';
+        }
+
+        $expression = $this->transformMemberNotation($expression);
+        return $this->prefixBareIdentifiers($expression);
+    }
+
+    private function transformMemberNotation(string $expression): string
     {
+        $expression = preg_replace(
+            '/\b([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)\s*\(/',
+            '\$$1->$2(',
+            $expression
+        ) ?? $expression;
+
         return preg_replace_callback(
-            '/\b([A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)+)\b/',
-            fn(array $matches): string => '$__engine->resolveValue(' . var_export($matches[1], true) . ', get_defined_vars())',
+            '/\b(\$?[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)+)\b/',
+            static function (array $matches): string {
+                $path = $matches[1];
+                $segments = explode('.', ltrim($path, '$'));
+                $result = '$' . array_shift($segments);
+
+                foreach ($segments as $segment) {
+                    $result .= "['{$segment}']";
+                }
+
+                return $result;
+            },
             $expression
         ) ?? $expression;
     }
 
+    private function prefixBareIdentifiers(string $expression): string
+    {
+        $tokens = token_get_all('<?php ' . $expression . ';');
+        $compiled = '';
+
+        $count = count($tokens);
+        for ($i = 1; $i < $count - 1; $i++) {
+            $token = $tokens[$i];
+            if (is_string($token)) {
+                $compiled .= $token;
+                continue;
+            }
+
+            [$id, $text] = $token;
+            if ($id !== T_STRING || !$this->shouldPrefixIdentifier($text, $tokens, $i)) {
+                $compiled .= $text;
+                continue;
+            }
+
+            $compiled .= '$' . $text;
+        }
+
+        return trim($compiled);
+    }
+
+    /** @param array<int, mixed> $tokens */
+    private function shouldPrefixIdentifier(string $text, array $tokens, int $index): bool
+    {
+        $lower = strtolower($text);
+        if (in_array($lower, [
+            'true',
+            'false',
+            'null',
+            'and',
+            'or',
+            'xor',
+            'instanceof',
+            'new',
+            'clone',
+            'default',
+            'match',
+            'fn',
+            'self',
+            'static',
+            'parent',
+        ], true)) {
+            return false;
+        }
+
+        if (preg_match('/^[A-Z_][A-Z0-9_]*$/', $text) === 1) {
+            return false;
+        }
+
+        $prev = $this->previousSignificantToken($tokens, $index);
+        $next = $this->nextSignificantToken($tokens, $index);
+
+        if (($prev['text'] ?? null) === '->' || ($prev['text'] ?? null) === '::' || ($prev['id'] ?? null) === T_VARIABLE) {
+            return false;
+        }
+
+        if (($next['text'] ?? null) === '(') {
+            return false;
+        }
+
+        return true;
+    }
+
+    /** @param array<int, mixed> $tokens
+     *  @return array{id:int|null,text:string|null}
+     */
+    private function previousSignificantToken(array $tokens, int $index): array
+    {
+        for ($i = $index - 1; $i >= 0; $i--) {
+            $token = $tokens[$i];
+            if (is_string($token)) {
+                if (trim($token) !== '') {
+                    return ['id' => null, 'text' => $token];
+                }
+                continue;
+            }
+
+            if ($token[0] !== T_WHITESPACE) {
+                return ['id' => $token[0], 'text' => $token[1]];
+            }
+        }
+
+        return ['id' => null, 'text' => null];
+    }
+
+    /** @param array<int, mixed> $tokens
+     *  @return array{id:int|null,text:string|null}
+     */
+    private function nextSignificantToken(array $tokens, int $index): array
+    {
+        $count = count($tokens);
+        for ($i = $index + 1; $i < $count; $i++) {
+            $token = $tokens[$i];
+            if (is_string($token)) {
+                if (trim($token) !== '') {
+                    return ['id' => null, 'text' => $token];
+                }
+                continue;
+            }
+
+            if ($token[0] !== T_WHITESPACE) {
+                return ['id' => $token[0], 'text' => $token[1]];
+            }
+        }
+
+        return ['id' => null, 'text' => null];
+    }
+
     /** @param array<int, NodeInterface> $nodes */
     private function compileChildren(array $nodes): string
     {

src/Core/View/Components/ComponentRegistry.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Beobles\Core\View\Components;
+namespace Core\View\Components;
 
-use Beobles\Core\View\Exceptions\ViewException;
+use Core\View\Exceptions\ViewException;
 
 /**
  * Registro de componentes

src/Core/View/Debug/ErrorFormatter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Debug;
+namespace Core\View\Debug;
 
 class ErrorFormatter
 {

src/Core/View/Debug/RuntimeContext.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Debug;
+namespace Core\View\Debug;
 
 class RuntimeContext
 {

src/Core/View/Debug/SourceMap.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Debug;
+namespace Core\View\Debug;
 
 class SourceMap
 {

src/Core/View/Debug/TemplateDebugger.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Beobles\Core\View\Debug;
+namespace Core\View\Debug;
 
 class TemplateDebugger
 {

src/Core/View/Directives/BlockDirective.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Beobles\Core\View\Directives;
+namespace Core\View\Directives;
 
-use Beobles\Core\View\Abstract\AbstractDirective;
+use Core\View\Abstract\AbstractDirective;
 
 class BlockDirective extends AbstractDirective
 {

src/Core/View/Directives/DirectiveRegistry.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Beobles\Core\View\Directives;
+namespace Core\View\Directives;
 
-use Beobles\Core\View\Abstract\AbstractDirective;
+use Core\View\Abstract\AbstractDirective;
 
 class DirectiveRegistry
 {