Fix Input value building into directives

railt · Jan 16, 2018 · 44caa07 · 44caa07
1 parent d8df098
commit 44caa07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/SDL/Reflection/Builder/DocumentBuilder.php b/src/SDL/Reflection/Builder/DocumentBuilder.php
@@ -14,6 +14,7 @@
 use Railt\Reflection\Base\BaseDocument;
 use Railt\Reflection\Contracts\Definitions\Definition;
 use Railt\Reflection\Contracts\Definitions\TypeDefinition;
+use Railt\Reflection\Contracts\Invocations\Invocable;
 use Railt\Reflection\Support;
 use Railt\SDL\Exceptions\BuildingException;
 use Railt\SDL\Exceptions\CompilerException;
@@ -100,12 +101,12 @@ public function future(Compilable $type): self
     }
 
     /**
-     * @return iterable
+     * @return iterable|Invocable[]|Compilable[]
      */
     public function getInvocableTypes(): iterable
     {
-        if ($this->future && $this->future->count()) {
-            yield from $this->future;
+        while ($this->future->count() > 0) {
+            yield $this->future->pop();
         }
     }
 

diff --git a/src/SDL/Reflection/Builder/Invocations/DirectiveInvocationBuilder.php b/src/SDL/Reflection/Builder/Invocations/DirectiveInvocationBuilder.php
@@ -12,6 +12,7 @@
 use Railt\Compiler\Ast\NodeInterface;
 use Railt\Compiler\Ast\RuleInterface;
 use Railt\Reflection\Base\Invocations\BaseDirectiveInvocation;
+use Railt\Reflection\Contracts\Definitions\DirectiveDefinition;
 use Railt\Reflection\Contracts\Definitions\TypeDefinition;
 use Railt\Reflection\Contracts\Document;
 use Railt\SDL\Reflection\Builder\DocumentBuilder;
@@ -48,7 +49,14 @@ protected function onCompile(NodeInterface $ast): bool
         if ($ast->is('#Argument')) {
             [$name, $value] = $this->parseArgumentValue($ast);
 
-            $this->arguments[$name] = $this->parseValue($value, $this->getName());
+            /** @var DirectiveDefinition $type */
+            $type = $this->getTypeDefinition();
+
+            $this->arguments[$name] = $this->parseValue($value, $type
+                ->getArgument($name)
+                ->getTypeDefinition()
+                ->getName()
+            );
 
             return true;
         }