Fix used helper context

Author: theodorejb

src/Handlebars.php

@@ -2,6 +2,8 @@
 
 namespace DevTheorem\Handlebars;
 
+use DevTheorem\HandlebarsParser\ParserFactory;
+
 final class Handlebars
 {
     protected static Context $lastContext;
@@ -17,6 +19,15 @@ public static function compile(string $template, Options $options = new Options(
         return self::template(self::precompile($template, $options));
     }
 
+    /**
+     * Compiles a template so it can be executed immediately.
+     * @return \Closure(mixed=, array<mixed>=):string
+     */
+    public static function compile_new(string $template, Options $options = new Options()): \Closure
+    {
+        return self::template(self::precompile_new($template, $options));
+    }
+
     /**
      * Precompiles a handlebars template into PHP code which can be executed later.
      */
@@ -31,6 +42,17 @@ public static function precompile(string $template, Options $options = new Optio
         return Compiler::composePHPRender($context, $code);
     }
 
+    public static function precompile_new(string $template, Options $options = new Options()): string
+    {
+        $context = new Context($options);
+        $parser = (new ParserFactory())->create();
+        $program = $parser->parse($template);
+        $code = (new NewCompiler())->compile($program, $context);
+
+        // return full PHP render code as string
+        return Compiler::composePHPRender($context, $code);
+    }
+
     /**
      * Sets up a template that was precompiled with precompile().
      */

src/NewCompiler.php

@@ -9,6 +9,7 @@
 use DevTheorem\HandlebarsParser\Ast\Decorator;
 use DevTheorem\HandlebarsParser\Ast\Expression as AstExpression;
 use DevTheorem\HandlebarsParser\Ast\Hash;
+use DevTheorem\HandlebarsParser\Ast\Literal;
 use DevTheorem\HandlebarsParser\Ast\MustacheStatement;
 use DevTheorem\HandlebarsParser\Ast\Node;
 use DevTheorem\HandlebarsParser\Ast\NullLiteral;
@@ -27,22 +28,21 @@
 final class NewCompiler
 {
     private int $partialBlockId = 0;
+    private Context $context;
+    private Options $options;
 
     /**
      * @param list<array<string>> $blockParamValues
-     * @param list<Node> $sourceNode
      */
     public function __construct(
         private array $blockParamValues = [],
-        private array $sourceNode = [],
-        private Options $options = new Options(),
     ) {}
 
-    public function compile(Program $program, Options $options): string
+    public function compile(Program $program, Context $context): string
     {
         $this->blockParamValues = [];
-        $this->sourceNode = [];
-        $this->options = $options;
+        $this->context = $context;
+        $this->options = $context->options;
         $this->partialBlockId = 0;
 
         array_unshift($this->blockParamValues, $program->blockParams);
@@ -241,6 +241,7 @@ private function compileBlockHelper(BlockStatement $block, string $helperName):
         }
 
         $params = $this->compileParams($block->params, $block->hash, $bp ?: null);
+        $this->context->usedHelpers[$helperName] = true;
 
         if ($inverted) {
             $body = $block->inverse ? $this->compileProgram($block->inverse) : "''";
@@ -257,7 +258,12 @@ private function compileBlockHelper(BlockStatement $block, string $helperName):
 
     private function DecoratorBlock(): string
     {
-        return '';
+        return ''; // todo: throw?
+    }
+
+    private function Decorator(Decorator $decorator): string
+    {
+        return ''; // todo: throw?
     }
 
     private function PartialStatement(PartialStatement $statement): string
@@ -312,6 +318,7 @@ private function MustacheStatement(MustacheStatement $mustache): string
 
             // Registered helper
             if ($helperName !== null && isset($this->options->helpers[$helperName])) {
+                $this->context->usedHelpers[$helperName] = true;
                 $params = $this->compileParams($mustache->params, $mustache->hash);
                 $call = "LR::hbch(\$cx, '$helperName', $params, \$in)";
                 return "'." . $this->getFuncName($fn, $call) . ").'";
@@ -337,11 +344,6 @@ private function MustacheStatement(MustacheStatement $mustache): string
         return "'." . $this->getFuncName($fn, $val) . ").'";
     }
 
-    private function Decorator(Decorator $decorator): string
-    {
-        return '';
-    }
-
     private function ContentStatement(ContentStatement $statement): string
     {
         return addcslashes($statement->value, "'\\");
@@ -365,6 +367,7 @@ private function SubExpression(SubExpression $expression): string
 
         // Registered helper
         if ($helperName !== null && isset($this->options->helpers[$helperName])) {
+            $this->context->usedHelpers[$helperName] = true;
             $params = $this->compileParams($expression->params, $expression->hash);
             return "LR::hbch(\$cx, '$helperName', $params, \$in)";
         }
@@ -376,6 +379,7 @@ private function SubExpression(SubExpression $expression): string
 
         // Non-registered helper — still try as helper call
         if ($helperName !== null) {
+            $this->context->usedHelpers[$helperName] = true;
             $params = $this->compileParams($expression->params, $expression->hash);
             return "LR::hbch(\$cx, '$helperName', $params, \$in)";
         }
@@ -530,7 +534,7 @@ private function compilePartialParams(array $params, ?Hash $hash): string
     /**
      * Extract simple helper name from a path if it's a single-segment, non-data, depth-0 path.
      */
-    private function getSimpleHelperName(PathExpression|\DevTheorem\HandlebarsParser\Ast\Literal $path): ?string
+    private function getSimpleHelperName(PathExpression|Literal $path): ?string
     {
         if (!$path instanceof PathExpression) {
             return null;

test_compare.php

@@ -29,10 +29,11 @@
 
 $pass = 0;
 $fail = 0;
+$newCompiler = new NewCompiler();
 
 foreach ($tests as $t) {
     $program = $parser->parse($t);
-    $new = (new NewCompiler())->compile($program, $opts);
+    $new = $newCompiler->compile($program, $opts);
 
     $ctx = new Context($opts);
     $old = Compiler::compileTemplate($ctx, $t);

tests/ErrorTest.php

@@ -13,18 +13,9 @@
  */
 class ErrorTest extends TestCase
 {
-    public function testException(): void
-    {
-        try {
-            $php = Handlebars::precompile('{{{foo}}');
-        } catch (\Exception $E) {
-            $this->assertEquals('Bad token {{{foo}} ! Do you mean {{foo}} or {{{foo}}}?', $E->getMessage());
-        }
-    }
-
     public function testLog(): void
     {
-        $template = Handlebars::compile('{{log foo}}');
+        $template = Handlebars::compile_new('{{log foo}}');
 
         date_default_timezone_set('GMT');
         $tmpDir = sys_get_temp_dir();
@@ -49,13 +40,13 @@ public function testLog(): void
     #[DataProvider("renderErrorProvider")]
     public function testRenderingException(array $test): void
     {
-        $php = Handlebars::precompile($test['template'], $test['options'] ?? new Options());
+        $php = Handlebars::precompile_new($test['template'], $test['options'] ?? new Options());
         $renderer = Handlebars::template($php);
         try {
             $renderer(null);
             $this->fail("Expected to throw exception: {$test['expected']}. CODE: $php");
-        } catch (\Exception $E) {
-            $this->assertEquals($test['expected'], $E->getMessage());
+        } catch (\Exception $e) {
+            $this->assertEquals($test['expected'], $e->getMessage(), $php);
         }
     }
 
@@ -82,17 +73,17 @@ public static function renderErrorProvider(): array
             [
                 'template' => '{{foo}}',
                 'options' => new Options(strict: true),
-                'expected' => 'Runtime: [foo] does not exist',
+                'expected' => 'Runtime: foo does not exist',
             ],
             [
                 'template' => '{{#foo}}OK{{/foo}}',
                 'options' => new Options(strict: true),
-                'expected' => 'Runtime: [foo] does not exist',
+                'expected' => 'Runtime: foo does not exist',
             ],
             [
                 'template' => '{{{foo}}}',
                 'options' => new Options(strict: true),
-                'expected' => 'Runtime: [foo] does not exist',
+                'expected' => 'Runtime: foo does not exist',
             ],
             [
                 'template' => '{{foo}}',