Added automatic identifier generation

Author: akkermans99

src/Patterns/Node.php

@@ -148,6 +148,14 @@ public function getName(): ?Variable
         return $this->variable;
     }
 
+
+    public function hasName(): bool {
+        if (!isset($this->variable)) {
+            return false;
+        }
+        return ($this->variable !== null);
+    }
+
     /**
      * Returns the string representation of this relationship that can be used directly
      * in a query.
@@ -178,4 +186,6 @@ public function toQuery(): string
 
         return "($nodeInner)";
     }
+
+
 }

src/Query.php

@@ -270,6 +270,20 @@ public function returning($expressions, bool $distinct = false): self
                 throw new TypeError("\$expressions should only consist of AnyType objects");
             }
 
+
+            // check if expression is node, then replace with variable
+            if ($expression instanceof Node) {
+                print_r(["test" => $expression instanceof Node, "hasname" => $expression->hasName() === true, "expression" => $expression]);
+                // check if Node has Name setted
+                if (!($expression->hasName())) {
+                    $expression = $expression->named(uniqid())->getName();
+                } else {
+                    $expression = $expression->getName();
+                }
+                print_r(["test" => $expression instanceof AnyType, "expression" => $expression]);
+            }
+
+
             $alias = is_integer($maybeAlias) ? "" : $maybeAlias;
             $returnClause->addColumn($expression, $alias);
         }
@@ -584,6 +598,15 @@ public function with($expressions): self
                 throw new TypeError("\$expressions should only consist of AnyType objects");
             }
 
+            // check if expression is node, then replace with variable
+            if ($expression instanceof Node) {
+                // check if Node has Name setted
+                if (!$expression->hasName()) {
+                    $expression->named(uniqid());
+                }
+                $expression = $expression->getName();
+            }
+
             $alias = is_integer($maybeAlias) ? "" : $maybeAlias;
             $withClause->addEntry($expression, $alias);
         }

tests/Unit/QueryTest.php

@@ -228,6 +228,15 @@ public function testReturning()
         $this->assertSame("RETURN (m:Movie) AS n", $statement);
     }
 
+    public function testReturningWithNode()
+    {
+        $node = Query::node("(m)");
+
+        $statement = (new Query())->returning($node)->build();
+
+        $this->assertMatchesRegularExpression("/(RETURN [0-Z])\w+/", $statement);
+    }
+
     public function testCreate()
     {
         $m = $this->getQueryConvertableMock(PathType::class, "(m:Movie)->(b)");