Merge pull request #15 from mficzel/feature/spreads

!!! FEATURE: Support Spreads in AFX

Author: mficzel

src/Expression/Node.php

@@ -8,27 +8,32 @@ class Node
 {
     public static function parse(Lexer $lexer)
     {
-        while ($lexer->isWhitespace()) {
-            $lexer->consume();
-        }
-
         if ($lexer->isOpeningBracket()) {
             $lexer->consume();
         }
 
         $identifier = Identifier::parse($lexer);
 
         try {
-            $props = [];
+            $attributes = [];
             $children = [];
 
             if ($lexer->isWhitespace()) {
                 while ($lexer->isWhitespace()) {
                     $lexer->consume();
                 }
                 while (!$lexer->isForwardSlash() && !$lexer->isClosingBracket()) {
-                    list($propIdentifier, $value) = Prop::parse($lexer);
-                    $props[$propIdentifier] = $value;
+                    if ($lexer->isOpeningBrace()) {
+                        $attributes[] = [
+                            'type' => 'spread',
+                            'payload' => Spread::parse($lexer)
+                        ];
+                    } else {
+                        $attributes[] = [
+                            'type' => 'prop',
+                            'payload' => Prop::parse($lexer)
+                        ];
+                    }
                     while ($lexer->isWhitespace()) {
                         $lexer->consume();
                     }
@@ -43,7 +48,7 @@ public static function parse(Lexer $lexer)
 
                     return [
                         'identifier' => $identifier,
-                        'props' => $props,
+                        'attributes' => $attributes,
                         'children' => $children,
                         'selfClosing' => true
                     ];
@@ -92,7 +97,7 @@ public static function parse(Lexer $lexer)
                 $lexer->consume();
                 return [
                     'identifier' => $identifier,
-                    'props' => $props,
+                    'attributes' => $attributes,
                     'children' => $children,
                     'selfClosing' => false
                 ];

src/Expression/Prop.php

@@ -8,10 +8,6 @@ class Prop
 {
     public static function parse(Lexer $lexer)
     {
-        while ($lexer->isWhitespace()) {
-            $lexer->consume();
-        }
-
         $identifier = Identifier::parse($lexer);
 
         if ($lexer->isEqualSign()) {
@@ -21,14 +17,16 @@ public static function parse(Lexer $lexer)
                 case $lexer->isDoubleQuote():
                     $value = [
                         'type' => 'string',
-                        'payload' => StringLiteral::parse($lexer)
+                        'payload' => StringLiteral::parse($lexer),
+                        'identifier' => $identifier
                     ];
                     break;
 
                 case $lexer->isOpeningBrace():
                     $value = [
                         'type' => 'expression',
-                        'payload' => Expression::parse($lexer)
+                        'payload' => Expression::parse($lexer),
+                        'identifier' => $identifier
                     ];
                     break;
                 default:
@@ -40,12 +38,13 @@ public static function parse(Lexer $lexer)
         } elseif ($lexer->isWhiteSpace() || $lexer->isForwardSlash() || $lexer->isClosingBracket()) {
             $value = [
                 'type' => 'boolean',
-                'payload' => true
+                'payload' => true,
+                'identifier' => $identifier
             ];
         } else {
             throw new Exception(sprintf('Prop identifier "%s" is neither assignment nor boolean', $identifier));
         }
 
-        return [$identifier, $value];
+        return $value;
     }
 }

src/Expression/Spread.php

@@ -0,0 +1,47 @@
+<?php
+namespace PackageFactory\Afx\Expression;
+
+use PackageFactory\Afx\Exception;
+use PackageFactory\Afx\Lexer;
+
+class Spread
+{
+    public static function parse(Lexer $lexer)
+    {
+        $contents = '';
+        $braceCount = 0;
+
+        if ($lexer->isOpeningBrace() && $lexer->peek(4) === '{...') {
+            $lexer->consume();
+            $lexer->consume();
+            $lexer->consume();
+            $lexer->consume();
+        } else {
+            throw new Exception('Spread without braces');
+        }
+
+        while (true) {
+            if ($lexer->isEnd()) {
+                throw new Exception(sprintf('Unfinished Spread "%s"', $contents));
+            }
+
+            if ($lexer->isOpeningBrace()) {
+                $braceCount++;
+            }
+
+            if ($lexer->isClosingBrace()) {
+                if ($braceCount === 0) {
+                    $lexer->consume();
+                    return [
+                        'type' => 'expression',
+                        'payload' => $contents
+                    ];
+                }
+
+                $braceCount--;
+            }
+
+            $contents .= $lexer->consume();
+        }
+    }
+}

src/Lexer.php

@@ -230,6 +230,21 @@ public function rewind()
         $this->currentCharacter = $this->string{--$this->characterPosition};
     }
 
+    /**
+     * Peek several characters in advance and return the next n characters
+     *
+     * @param int $characterNumber
+     * @return string|null
+     */
+    public function peek($characterNumber = 1)
+    {
+        if ($this->characterPosition < strlen($this->string) - 1) {
+            return substr($this->string, $this->characterPosition, $characterNumber);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Returns the current character and moves one step forward
      *