Merge pull request #28 from pug-php/feature/support-back-ticks

Support back ticks and interpolation

Author: kylekatarnls

examples/interpolation.js

@@ -0,0 +1,3 @@
+name = 'Bob';
+
+return `Hello ${name}, \${not} can you ${(function (verb) { return verb; })('tell')}?`;

examples/interpolation.return

@@ -0,0 +1 @@
+Hello Bob, ${not} can you tell?

examples/typeof-return.js

@@ -0,0 +1 @@
+return typeof 'foobar'

examples/typeof-return.return

@@ -0,0 +1 @@
+string

src/JsPhpize/Compiler/Compiler.php

@@ -21,6 +21,7 @@
 class Compiler
 {
     use DyiadeTrait;
+    use InterpolationTrait;
 
     /**
      * @const string
@@ -42,9 +43,15 @@ class Compiler
      */
     protected $arrayShortSyntax;
 
-    public function __construct(JsPhpize $engine)
+    /**
+     * @var string
+     */
+    protected $filename;
+
+    public function __construct(JsPhpize $engine, $filename = null)
     {
         $this->engine = $engine;
+        $this->filename = $filename;
         $this->setPrefixes($engine->getVarPrefix(), $engine->getConstPrefix());
         $this->arrayShortSyntax = $engine->getOption('arrayShortSyntax', false);
     }
@@ -138,12 +145,25 @@ function ($pair) use ($visitNode, $indent) {
     protected function visitConstant(Constant $constant)
     {
         $value = $constant->value;
-        if ($constant->type === 'string' && mb_substr($constant->value, 0, 1) === '"') {
-            $value = str_replace('$', '\\$', $value);
+
+        if ($constant->type === 'string') {
+            if (substr($value, 0, 1) === '`') {
+                return implode(
+                    ' . ',
+                    iterator_to_array($this->readInterpolation(substr($value, 1, -1)))
+                );
+            }
+
+            if (mb_substr($constant->value, 0, 1) === '"') {
+                return str_replace('$', '\\$', $value);
+            }
         }
+
         if ($constant->type === 'regexp') {
-            $regExp = $this->engine->getHelperName('regExp');
-            $value = $this->helperWrap($regExp, [var_export($value, true)]);
+            return $this->helperWrap(
+                $this->engine->getHelperName('regExp'),
+                [var_export($value, true)]
+            );
         }
 
         return $value;
@@ -217,6 +237,7 @@ protected function visitFunctionCall(FunctionCall $functionCall, $indent)
             $staticCall = $name . '(' . $arguments . ')';
 
             $functions = str_replace(["\n", "\t", "\r", ' '], '', static::STATIC_CALL_FUNCTIONS);
+
             if ($applicant === 'new' || in_array($name, explode(',', $functions))) {
                 return $staticCall;
             }
@@ -270,6 +291,7 @@ public function visitNode(Node $node, $indent)
             get_class($node)
         );
         $php = method_exists($this, $method) ? $this->$method($node, $indent) : '';
+
         if ($node instanceof Value) {
             $php = $node->getBefore() . $php . $node->getAfter();
         }

src/JsPhpize/Compiler/InterpolationTrait.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace JsPhpize\Compiler;
+
+use JsPhpize\Parser\Parser;
+
+trait InterpolationTrait
+{
+    protected function readInterpolation($value)
+    {
+        while (strlen($value)) {
+            preg_match('/^(.*)(?:(\\\\|\\${).*)?$/U', $value, $match);
+
+            yield var_export($match[1], true);
+
+            $value = mb_substr($value, mb_strlen($match[1]));
+
+            if (isset($match[2])) {
+                if ($match[2] === '\\') {
+                    yield var_export(mb_substr($value, 1, 1), true);
+
+                    $value = mb_substr($value, 2);
+
+                    continue;
+                }
+
+                $value = mb_substr($value, 2);
+
+                $parser = new Parser($this->engine, $value, $this->filename);
+
+                yield rtrim($this->visitInstruction($parser->parse()->instructions[0], ''), ";\t\n\r\0\x0B ");
+
+                $value = $parser->rest();
+            }
+        }
+    }
+}

src/JsPhpize/JsPhpize.php

@@ -52,12 +52,13 @@ public function compile($input, $filename = null)
 
         $start = '';
         $end = '';
+
         if (preg_match('/^([)}\]\s]*)(.*?)([({\[\s]*)$/', trim($input), $match)) {
             list(, $start, $input, $end) = $match;
         }
 
         $parser = new Parser($this, $input, $filename);
-        $compiler = new Compiler($this);
+        $compiler = new Compiler($this, $filename);
         $block = $parser->parse();
         $php = $compiler->compile($block);
 
@@ -70,6 +71,7 @@ public function compile($input, $filename = null)
         }
 
         $dependencies = $compiler->getDependencies();
+
         if ($this->getOption('catchDependencies')) {
             $this->dependencies = array_unique(array_merge($this->dependencies, $dependencies));
             $dependencies = [];

src/JsPhpize/JsPhpizeOptions.php

@@ -50,7 +50,7 @@ public function __construct($options = [])
             $this->options['patterns'] = [
                 new Pattern(10, 'newline', '\n'),
                 new Pattern(20, 'comment', '\/\/.*?\n|\/\*[\s\S]*?\*\/'),
-                new Pattern(30, 'string', '"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\''),
+                new Pattern(30, 'string', '"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'|`(?:\\\\.|[^`\\\\])*`'),
                 new Pattern(40, 'number', '0[bB][01]+|0[oO][0-7]+|0[xX][0-9a-fA-F]+|(\d+(\.\d*)?|\.\d+)([eE]-?\d+)?'),
                 new Pattern(50, 'lambda', '=>'),
                 new Pattern(60, 'operator', ['delete', 'typeof', 'void'], true),

src/JsPhpize/Lexer/Lexer.php

@@ -61,6 +61,11 @@ public function exceptionInfos()
             ' near from ' . trim($this->consumed);
     }
 
+    public function rest()
+    {
+        return $this->input;
+    }
+
     protected function consume($consumed)
     {
         $consumed = is_int($consumed) ? mb_substr($this->input, 0, $consumed) : $consumed;

src/JsPhpize/Nodes/Constant.php

@@ -35,6 +35,7 @@ public function __construct($type, $value)
         if (!in_array($type, ['constant', 'number', 'string', 'regexp'])) {
             throw new Exception("The given type [$type] is not a valid constant type.", 23);
         }
+
         $this->type = $type;
         $this->value = $value;
     }
@@ -44,9 +45,11 @@ public function getNonAssignableReason()
         if ($this->type !== 'constant') {
             return "{$this->type} is not assignable.";
         }
+
         if (in_array($this->value, ['NAN', 'INF'])) {
             return "{$this->value} is not assignable.";
         }
+
         if (mb_substr($this->value, 0, 2) === 'M_') {
             return "'M_' prefix is reserved to mathematical constants.";
         }