Fix single-quoted string parsing and compiling

Author: theodorejb

src/Compiler.php

@@ -23,8 +23,6 @@ public static function compileTemplate(Context $context, string $template): stri
             return '';
         }
 
-        Token::setDelimiter($context);
-
         $context->compile = true;
 
         // Handle dynamic partials
@@ -36,7 +34,7 @@ public static function compileTemplate(Context $context, string $template): stri
             if (is_array($info)) {
                 $code .= "'" . static::compileToken($context, $info) . "'";
             } else {
-                $code .= $info;
+                $code .= addcslashes($info, "'");
             }
         }
 
@@ -120,7 +118,7 @@ protected static function getVariableNames(Context $context, array $vn, array $b
             }
             $exps[] = $V[1];
         }
-        $bp = $blockParams ? (',[' . Expression::listString($blockParams) . ']') : '';
+        $bp = $blockParams ? ',' . Expression::listString($blockParams) : '';
         return ['[[' . implode(',', $vars[0]) . '],[' . implode(',', $vars[1]) . "]$bp]", $exps];
     }
 
@@ -253,7 +251,7 @@ protected static function compileToken(Context $context, array $info): string
      *
      * @param array<mixed> $vars parsed arguments list
      */
-    public static function partial(Context $context, array $vars): string
+    public static function partial(Context $context, array &$vars): string
     {
         Parser::getBlockParams($vars);
         $pid = Parser::getPartialBlock($vars);
@@ -266,7 +264,7 @@ public static function partial(Context $context, array $vars): string
         if (Parser::isSubExp($p)) {
             [$p] = static::compileSubExpression($context, $p[1]);
         } else {
-            $p = "'$p[0]'";
+            $p = Expression::quoteString($p[0]);
         }
         $sp = "(\$sp ?? '') . '{$context->partialIndent}'";
         return $context->separator .
@@ -400,7 +398,7 @@ protected static function section(Context $context, array $vars, bool $isEach =
         $be = '';
         if ($isEach) {
             $bp = Parser::getBlockParams($vars);
-            $bs = $bp ? ('array(' . Expression::listString($bp) . ')') : 'null';
+            $bs = $bp ? Expression::listString($bp) : 'null';
             $be = $bp ? (' as |' . implode(' ', $bp) . '|') : '';
             array_shift($vars);
         }
@@ -421,7 +419,7 @@ protected static function with(Context $context, array $vars)
     {
         $v = isset($vars[1]) ? static::getVariableNameOrSubExpression($context, $vars[1]) : [null, []];
         $bp = Parser::getBlockParams($vars);
-        $bs = $bp ? ('[' . Expression::listString($bp) . ']') : 'null';
+        $bs = $bp ? Expression::listString($bp) : 'null';
         $be = $bp ? " as |$bp[0]|" : '';
         return $context->separator . static::getFuncName($context, 'wi', 'with ' . $v[1] . $be)
             . "\$cx, {$v[0]}, $bs, \$in, function(\$cx, \$in) {{$context->fStart}";

src/Expression.php

@@ -14,7 +14,7 @@ final class Expression
      */
     public static function listString(array $list): string
     {
-        return implode(',', array_map(static fn($v) => "'$v'", $list));
+        return '[' . implode(',', array_map(static fn($v) => "'$v'", $list)) . ']';
     }
 
     /**
@@ -24,7 +24,12 @@ public static function listString(array $list): string
      */
     public static function arrayString(array $list): string
     {
-        return implode('', array_map(static fn($v) => "['$v']", $list));
+        return implode('', array_map(static fn($v) => "[" . self::quoteString($v) . "]", $list));
+    }
+
+    public static function quoteString(string $string): string
+    {
+        return "'" . addcslashes($string, "'") . "'";
     }
 
     /**

src/Parser.php

@@ -55,7 +55,7 @@ public static function getBlockParams(array &$vars): array
      */
     protected static function getLiteral(string $name, bool $asis, bool $quote = false): array
     {
-        return $asis ? [$name] : [static::LITERAL, $quote ? "'$name'" : $name];
+        return $asis ? [$name] : [static::LITERAL, $quote ? Expression::quoteString($name) : $name];
     }
 
     /**
@@ -81,8 +81,9 @@ protected static function getExpression(string $v, Context $context, int|string
         }
 
         // handle single quoted string
-        if (preg_match('/^\\\\\'(.*)\\\\\'$/', $v, $matched)) {
-            return static::getLiteral($matched[1], $asis, true);
+        if (preg_match("/^'(.*)'$/", $v, $matched)) {
+            $literal = str_replace("\\\\'", "'", $matched[1]);
+            return static::getLiteral($literal, $asis, true);
         }
 
         // handle bool, null and undefined
@@ -250,7 +251,7 @@ protected static function advancedVariable(array $vars, Context $context, string
                 }
             }
 
-            if (!preg_match("/^(\"|\\\\')(.*)(\"|\\\\')$/", $var)) {
+            if (!preg_match("/^([\"'])(.*)([\"'])$/", $var)) {
                 // foo]  Rule 1: no starting [ or [ not start from head
                 if (preg_match('/^[^\\[.]+[\\[\\]]/', $var)
                     // [bar  Rule 2: no ending ] or ] not in the end

src/Partial.php

@@ -71,7 +71,7 @@ public static function compileDynamic(Context $context, string $name): ?string
         $func = static::compile($context, $context->usedPartial[$name], $name);
 
         if (!isset($context->partialCode[$name]) && $func) {
-            $context->partialCode[$name] = "'$name' => $func";
+            $context->partialCode[$name] = Expression::quoteString($name) . " => $func";
         }
 
         return $func;

src/SafeString.php

@@ -39,6 +39,6 @@ public static function stripExtendedComments(string $template): string
      */
     public static function escapeTemplate(string $template): string
     {
-        return addcslashes(addcslashes($template, '\\'), "'");
+        return addcslashes($template, '\\');
     }
 }

src/Validator.php

@@ -713,16 +713,17 @@ protected static function inline(Context $context, array $vars)
     /**
      * validate partial
      *
-     * @param array<bool|int|string|array<mixed>> $vars parsed arguments list
+     * @param array<array<mixed>> $vars parsed arguments list
      *
      * @return int|bool Return 1 or larger number for runtime partial, return true for other case
      */
-    protected static function partial(Context $context, array $vars)
+    protected static function partial(Context $context, array &$vars)
     {
         if (Parser::isSubExp($vars[0])) {
             return $context->usedDynPartial++;
         } else {
             if ($context->currentToken[Token::POS_OP] !== '#>') {
+                $vars[0][0] = preg_replace("/^'(.*)'$/", '$1', $vars[0][0]);
                 Partial::read($context, $vars[0][0]);
             }
         }

tests/ExpressionTest.php

@@ -9,9 +9,9 @@ class ExpressionTest extends TestCase
 {
     public function testListString(): void
     {
-        $this->assertSame('', Expression::listString([]));
-        $this->assertSame("'a'", Expression::listString(['a']));
-        $this->assertSame("'a','b','c'", Expression::listString(['a', 'b', 'c']));
+        $this->assertSame('[]', Expression::listString([]));
+        $this->assertSame("['a']", Expression::listString(['a']));
+        $this->assertSame("['a','b','c']", Expression::listString(['a', 'b', 'c']));
     }
 
     public function testArrayString(): void

tests/RegressionTest.php

@@ -1345,6 +1345,17 @@ public static function issueProvider(): array
                 ),
                 'expected' => '""" """',
             ],
+            [
+                'template' => "{{test '\'\'\'' prop='\'\'\''}}",
+                'options' => new Options(
+                    helpers: [
+                        'test' => function ($arg1, HelperOptions $options) {
+                            return "{$arg1} {$options->hash['prop']}";
+                        },
+                    ],
+                ),
+                'expected' => '''' '''',
+            ],
 
             [
                 'id' => 302,

tests/SafeStringTest.php

@@ -13,11 +13,4 @@ public function testStripExtendedComments(): void
         $this->assertSame('abc{{!}}cde', SafeString::stripExtendedComments('abc{{!}}cde'));
         $this->assertSame('abc{{! }}cde', SafeString::stripExtendedComments('abc{{!----}}cde'));
     }
-
-    public function testEscapeTemplate(): void
-    {
-        $this->assertSame('abc', SafeString::escapeTemplate('abc'));
-        $this->assertSame('a\\\\bc', SafeString::escapeTemplate('a\bc'));
-        $this->assertSame('a\\\'bc', SafeString::escapeTemplate('a\'bc'));
-    }
 }