fix: add @loop method

leafsphp · Feb 18, 2023 · 70477d9 · 70477d9
1 parent 473b042
commit 70477d9
Showing 1 changed file with 37 additions and 7 deletions.
diff --git a/src/UI/Core.php b/src/UI/Core.php
@@ -57,9 +57,9 @@ public static function render($component)
 
         if ($componentData['responseType'] === 'json') {
             unset($componentData['responseType']);
-            (new \Leaf\Http\Response)->json($componentData);
+            (new \Leaf\Http\Response())->json($componentData);
         } else {
-            (new \Leaf\Http\Response)->markup($componentData['html']);
+            (new \Leaf\Http\Response())->markup($componentData['html']);
         }
     }
 
@@ -215,15 +215,25 @@ public static function compileTemplate(string $rawText, array $state = []): stri
             preg_match('/@if\((.*?)\)/', $compiledWithParsedConditions, $condition);
 
             if (eval("return $condition[1];") === true) {
-                preg_match('/@if\([\s\S]*?\)\s*[\s\S]*?(?:\s*@elseif\([\s\S]*?\)\s*[\s\S]*?|\s*@else\s*[\s\S]*?|\s*@endif\s*)/', $compiledWithParsedConditions, $ifConditionMatches);
+                preg_match(
+                    '/@if\([\s\S]*?\)\s*[\s\S]*?(?:\s*@elseif\([\s\S]*?\)\s*[\s\S]*?|\s*@else\s*[\s\S]*?|\s*@endif\s*)/',
+                    $compiledWithParsedConditions,
+                    $ifConditionMatches
+                );
+
                 $renderedData = preg_replace('/@if\([\s\S]*?\)\s*[\s\S]*?/', '', $ifConditionMatches[0]);
                 $renderedData = preg_replace('/\s*@elseif\([\s\S]*?\)\s*[\s\S]*?/', '', $renderedData);
             } else {
                 if (strpos($compiledWithParsedConditions, '@elseif') !== false) {
                     preg_match('/@elseif\((.*?)\)/', $compiledWithParsedConditions, $elseifCondition);
 
                     if (eval("return $elseifCondition[1];") === true) {
-                        preg_match('/@elseif\([\s\S]*?\)\s*[\s\S]*?(?:\s*@elseif\([\s\S]*?\)\s*[\s\S]*?|\s*@else\s*[\s\S]*?|\s*@endif\s*)/', $compiledWithParsedConditions, $elseifConditionMatches);
+                        preg_match(
+                            '/@elseif\([\s\S]*?\)\s*[\s\S]*?(?:\s*@elseif\([\s\S]*?\)\s*[\s\S]*?|\s*@else\s*[\s\S]*?|\s*@endif\s*)/',
+                            $compiledWithParsedConditions,
+                            $elseifConditionMatches
+                        );
+
                         $renderedData = preg_replace('/@elseif\([\s\S]*?\)\s*[\s\S]*?/', '', $elseifConditionMatches[0]);
                         $renderedData = preg_replace('/\s*@else\s*[\s\S]*?/', '', $renderedData);
                     } else if (strpos($compiledWithParsedConditions, '@else') !== false) {
@@ -254,7 +264,23 @@ public static function compileTemplate(string $rawText, array $state = []): stri
         }, $compiled);
 
         $compiled = preg_replace_callback('/@loop\([\s\S]*?\)\s*[\s\S]*@endloop\s*/', function ($matches) {
-            return $matches[0];
+            $rendered = '';
+            $loopMatches = null;
+
+            preg_match('/@loop\((.*?)\)/', $matches[0], $loopMatches);
+
+            static::loop(eval("return $loopMatches[1];"), function ($key, $value) use ($matches, &$rendered) {
+                $regex = '/@loop\((.*?)\)([\s\S]*?)@endloop/';
+                preg_match($regex, $matches[0], $regexLoopMatches);
+
+                $rendered .= str_replace(
+                    ['@key', '@value'],
+                    [$key, $value],
+                    $regexLoopMatches[2]
+                );
+            });
+
+            return $rendered;
         }, $compiled);
 
         $compiled = preg_replace_callback('/@case\((.*?)\)/', function ($matches) {
@@ -387,13 +413,17 @@ public static function createStyles(array $styles, array $props = [])
     /**
      * Loop over an array of items
      * 
-     * @param array $array The array to loop through
+     * @param array|string|int $array The array to loop through
      * @param callable $handler Call back function to run per iteration
      */
-    public static function loop(array $array, callable $handler)
+    public static function loop($array, callable $handler)
     {
         $element = "";
 
+        if (!is_array($array)) {
+            $array = explode(',', str_repeat(',', (int) $array - 1));
+        }
+
         if (is_callable($handler)) {
             foreach ($array as $key => $value) {
                 $element .= call_user_func($handler, $value, $key);