Risma 0.2.0

Author: nabeghe

README.md

@@ -16,7 +16,7 @@ Includes the following helpers:
 - [Mem](https://github.com/nabeghe/mem-php) <small>v1.2.0</small>
 - [ProcessFinger](https://github.com/nabeghe/process-finger-php) <small>v0.1.2</small>
 - [Reflecty](https://github.com/nabeghe/reflecty-php) <small>v0.5.2</small>
-- [Risma](https://github.com/nabeghe/risma-php) <small>v0.1.0</small>
+- [Risma](https://github.com/nabeghe/risma-php) <small>v0.2.0</small>
 - [Servery](https://github.com/nabeghe/servery-php) <small>v0.3.0</small>
 - [Shortnum](https://github.com/nabeghe/shortnum-php) <small>v1.0.0</small>
 - [SimpleCipher](https://github.com/nabeghe/simple-cipher-php) <small>v1.0.0</small>

src/Risma/Risma.php

@@ -6,7 +6,7 @@
 /**
  * Risma
  *  A lightweight and flexible string processing engine for PHP.
- *  eveloped by https://github.com/nabeghe.
+ *  developed by [https://github.com/nabeghe](https://github.com/nabeghe).
  */
 class Risma
 {
@@ -20,6 +20,16 @@ class Risma
      */
     protected array $classes = [];
 
+    /**
+     * @var int Maximum recursion depth to prevent infinite loops.
+     */
+    protected int $maxDepth = 10;
+
+    /**
+     * @var int Current recursion depth tracker.
+     */
+    protected int $currentDepth = 0;
+
     public function __construct()
     {
         $this->defineDefaultFuncs();
@@ -37,11 +47,19 @@ protected function defineDefaultFuncs(): void
         $this->funcs['ok'] ??= function ($value) {
             return $value ? '1' : '0';
         };
+
+        $this->funcs['prepend'] ??= function ($input, $prefix) {
+            return $prefix.$input;
+        };
+
+        $this->funcs['append'] ??= function ($input, $suffix) {
+            return $input.$suffix;
+        };
     }
 
     /**
      * Register a custom function.
-     * * @param  string  $name  The name used in the template.
+     * @param  string  $name  The name used in the template.
      * @param  callable  $callback  The logic to execute.
      */
     public function addFunc(string $name, callable $callback): void
@@ -51,7 +69,7 @@ public function addFunc(string $name, callable $callback): void
 
     /**
      * Register a class to expose its methods to the engine.
-     * * @param  string  $className  Full namespace of the class.
+     * @param  string  $className  Full namespace of the class.
      */
     public function addClass(string $className): void
     {
@@ -62,15 +80,21 @@ public function addClass(string $className): void
 
     /**
      * Renders the template string by replacing placeholders.
-     * * @param  string  $text  The raw string with placeholders like {var.func}.
+     * Uses recursive regex to match nested braces correctly.
+     * @param  string  $text  The raw string with placeholders like {var.func}.
      * @param  array  $vars  Key-value pairs of data.
      * @param  bool  $default  If true, returns empty string for missing variables.
      * @return string The processed text.
      * @throws Exception
      */
     public function render(string $text, array $vars, bool $default = true): string
     {
-        $pattern = '/(!?)\{\s*(.*?)\s*\}/s';
+        // Reset depth counter at the start of render
+        $this->currentDepth = 0;
+
+        // Use recursive regex pattern to match balanced curly braces
+        // (?1) refers to the first capturing group recursively
+        $pattern = '/(!?)\{\s*((?:[^{}]|(?R))*)\s*\}/';
 
         return preg_replace_callback($pattern, function ($matches) use ($vars, $default) {
             $isEscaped = !empty($matches[1]);
@@ -80,9 +104,25 @@ public function render(string $text, array $vars, bool $default = true): string
                 return '{'.$content.'}';
             }
 
+            // Check recursion depth
+            $this->currentDepth++;
+            if ($this->currentDepth > $this->maxDepth) {
+                $this->currentDepth--;
+                throw new Exception("Maximum recursion depth exceeded.");
+            }
+
             try {
-                return $this->processExpression($content, $vars, $default);
+                // First recursively render any nested placeholders
+                $renderedContent = $this->render($content, $vars, $default);
+
+                // Then process the expression itself
+                $result = $this->processExpression($renderedContent, $vars, $default);
+
+                $this->currentDepth--;
+                return $result;
             } catch (Throwable $e) {
+                $this->currentDepth--;
+
                 // Modified logic: If default is false, re-throw the exception for PHPUnit
                 if (!$default) {
                     throw $e;
@@ -94,7 +134,7 @@ public function render(string $text, array $vars, bool $default = true): string
 
     /**
      * Processes the content inside a single {} block.
-     * * @throws Exception
+     * @throws Exception
      */
     protected function processExpression(string $expression, array $vars, bool $default): string
     {
@@ -135,7 +175,7 @@ protected function processExpression(string $expression, array $vars, bool $defa
 
     /**
      * Executes a single function within the chain.
-     * * @param  string  $token  The function part, e.g., "func1" or "func('arg')".
+     * @param  string  $token  The function part, e.g., "func1" or "func('arg')".
      * @param  mixed  $prevValue  The value from the previous step in the chain.
      * @param  bool  $isFirstCall  Whether this is the start of a direct @ call.
      * @throws Exception
@@ -179,7 +219,7 @@ protected function executeFunction(string $token, $prevValue, bool $isFirstCall)
 
     /**
      * Resolves the function name to a callable (Custom -> Class -> Global).
-     * * @throws Exception
+     * @throws Exception
      */
     protected function resolveCallback(string $name): callable
     {