Move UUID generation to Node class

Author: marijnvanwezel

src/Patterns/Node.php

@@ -25,7 +25,6 @@
 use WikibaseSolutions\CypherDSL\Property;
 use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
-use WikibaseSolutions\CypherDSL\Traits\IdentifierGenerationTrait;
 use WikibaseSolutions\CypherDSL\Traits\NodeTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\MapType;
@@ -41,7 +40,6 @@ class Node implements NodeType
 {
     use EscapeTrait;
     use NodeTypeTrait;
-    use IdentifierGenerationTrait;
 
     /**
      * @var string[]
@@ -142,12 +140,17 @@ public function labeled(string $label): self
     }
 
     /**
-     * Returns the name of this node.
+     * Returns the name of this node. This function automatically generates a name if the node does not have a
+     * name yet.
      *
      * @return Variable|null The name of this node, or NULL if this node does not have a name
      */
     public function getName(): ?Variable
     {
+        if (!isset($this->variable)) {
+            $this->named($this->generateUUID());
+        }
+
         return $this->variable;
     }
 
@@ -177,12 +180,14 @@ public function hasName(): bool
      * Returns the property of the given name for this expression. For instance, if this expression is the
      * variable "foo", a function call like $expression->property("bar") would yield "foo.bar".
      *
+     * TODO: Maybe move this function to the NodeType trait and add it to the interface?
+     *
      * @param string $property
      * @return Property
      */
     public function property(string $property): Property
     {
-        return new Property($this->variableIfNode($this), $property);
+        return new Property($this->getName(), $property);
     }
 
     /**
@@ -215,4 +220,18 @@ public function toQuery(): string
 
         return "($nodeInner)";
     }
+
+    /**
+     * Generates a unique random identifier.
+     *
+     * @note It is not entirely guaranteed that this function gives a truly unique identifier. However, because the
+     * number of possible IDs is so huge, it should not be a problem.
+     *
+     * @param int $length
+     * @return string
+     */
+    private function generateUUID(int $length = 32): string
+    {
+        return substr(bin2hex(openssl_random_pseudo_bytes(ceil($length / 2))), 0, $length);
+    }
 }

src/Query.php

@@ -62,7 +62,6 @@
 class Query implements QueryConvertable
 {
     use EscapeTrait;
-    use IdentifierGenerationTrait;
 
     // A reference to the Literal class
     const literal = Literal::class;
@@ -272,8 +271,12 @@ public function returning($expressions, bool $distinct = false): self
                 throw new TypeError("\$expressions should only consist of AnyType objects");
             }
 
+            if ($expression instanceof Node) {
+                $expression = $expression->getName();
+            }
+
             $alias = is_integer($maybeAlias) ? "" : $maybeAlias;
-            $returnClause->addColumn($this->variableIfNode($expression), $alias);
+            $returnClause->addColumn($expression, $alias);
         }
 
         $returnClause->setDistinct($distinct);
@@ -586,8 +589,12 @@ public function with($expressions): self
                 throw new TypeError("\$expressions should only consist of AnyType objects");
             }
 
+            if ($expression instanceof Node) {
+                $expression = $expression->getName();
+            }
+
             $alias = is_integer($maybeAlias) ? "" : $maybeAlias;
-            $withClause->addEntry($this->variableIfNode($expression), $alias);
+            $withClause->addEntry($expression, $alias);
         }
 
         $this->clauses[] = $withClause;