FEATURE: Node copying Version 3 (as a Neos service)

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php

@@ -49,6 +49,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
 use Neos\ContentRepository\Core\Projection\ContentGraph\References;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Subtrees;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
@@ -304,7 +305,7 @@ public function findSubtree(NodeAggregateId $entryNodeAggregateId, FindSubtreeFi
                 $this->dimensionSpacePoint,
                 $this->visibilityConstraints
             );
-            $subtree = new Subtree((int)$nodeData['level'], $node, array_key_exists($nodeAggregateId, $subtreesByParentNodeId) ? array_reverse($subtreesByParentNodeId[$nodeAggregateId]) : []);
+            $subtree = Subtree::create((int)$nodeData['level'], $node, Subtrees::fromArray(array_key_exists($nodeAggregateId, $subtreesByParentNodeId) ? array_reverse($subtreesByParentNodeId[$nodeAggregateId]) : []));
             if ($subtree->level === 0) {
                 return $subtree;
             }

Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php

@@ -33,6 +33,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Reference;
 use Neos\ContentRepository\Core\Projection\ContentGraph\References;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Subtrees;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Timestamps;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
@@ -154,7 +155,7 @@ public function mapNodeRowsToSubtree(
             $nodeAggregateId = $nodeRow['nodeaggregateid'];
             $parentNodeAggregateId = $nodeRow['parentnodeaggregateid'];
             $node = $this->mapNodeRowToNode($nodeRow, $visibilityConstraints);
-            $subtree = new Subtree((int)$nodeRow['level'], $node, array_key_exists($nodeAggregateId, $subtreesByParentNodeId) ? array_reverse($subtreesByParentNodeId[$nodeAggregateId]) : []);
+            $subtree = Subtree::create((int)$nodeRow['level'], $node, Subtrees::fromArray(array_key_exists($nodeAggregateId, $subtreesByParentNodeId) ? array_reverse($subtreesByParentNodeId[$nodeAggregateId]) : []));
             if ($subtree->level === 0) {
                 return $subtree;
             }

Neos.ContentRepository.Core/Classes/CommandHandler/Commands.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\ContentRepository\Core\CommandHandler;
+
+/**
+ * @api can be used as collection of commands to be individually handled:
+ *
+ *     foreach ($commands as $command) {
+ *         $contentRepository->handle($command);
+ *     }
+ *
+ * @implements \IteratorAggregate<CommandInterface>
+ */
+final readonly class Commands implements \IteratorAggregate, \Countable
+{
+    /** @var array<int,CommandInterface> */
+    private array $items;
+
+    private function __construct(
+        CommandInterface ...$items
+    ) {
+        $this->items = array_values($items);
+    }
+
+    public static function create(CommandInterface ...$items): self
+    {
+        return new self(...$items);
+    }
+
+    public static function createEmpty(): self
+    {
+        return new self();
+    }
+
+    /** @param array<CommandInterface> $array */
+    public static function fromArray(array $array): self
+    {
+        return new self(...$array);
+    }
+
+    public function append(CommandInterface $command): self
+    {
+        return new self(...[...$this->items, $command]);
+    }
+
+    public function merge(self $other): self
+    {
+        return new self(...$this->items, ...$other->items);
+    }
+
+    public function getIterator(): \Traversable
+    {
+        yield from $this->items;
+    }
+
+    public function count(): int
+    {
+        return count($this->items);
+    }
+}

Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Command/CopyNodesRecursively.php

@@ -14,19 +14,17 @@
 
 namespace Neos\ContentRepository\Core\Feature\NodeDuplication\Command;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
 use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdToPublishOrDiscardInterface;
 use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherWorkspaceInterface;
-use Neos\ContentRepository\Core\Feature\NodeDuplication\Dto\NodeAggregateIdMapping;
 use Neos\ContentRepository\Core\Feature\NodeDuplication\Dto\NodeSubtreeSnapshot;
 use Neos\ContentRepository\Core\Feature\WorkspacePublication\Dto\NodeIdToPublishOrDiscard;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
-use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+use Neos\Neos\Domain\Service\NodeDuplication\NodeAggregateIdMapping;
 
 /**
  * CopyNodesRecursively command
@@ -35,10 +33,10 @@
  * The node will be appended as child node of the given `parentNodeId` which must cover the given
  * `dimensionSpacePoint`.
  *
- * @api commands are the write-API of the ContentRepository
+ * @internal
+ * @deprecated with Neos 9 Beta 16, please use Neos's {@see \Neos\Neos\Domain\Service\NodeDuplicationService} instead.
  */
 final readonly class CopyNodesRecursively implements
-    CommandInterface,
     \JsonSerializable,
     MatchableWithNodeIdToPublishOrDiscardInterface,
     RebasableToOtherWorkspaceInterface

Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/NodeDuplicationCommandHandler.php

@@ -170,7 +170,7 @@ private function handleCopyNodesRecursively(
 
     private function requireNewNodeAggregateIdsToNotExist(
         ContentGraphInterface $contentGraph,
-        Dto\NodeAggregateIdMapping $nodeAggregateIdMapping
+        \Neos\Neos\Domain\Service\NodeDuplication\NodeAggregateIdMapping $nodeAggregateIdMapping
     ): void {
         foreach ($nodeAggregateIdMapping->getAllNewNodeAggregateIds() as $nodeAggregateId) {
             $this->requireProjectedNodeAggregateToNotExist(
@@ -191,7 +191,7 @@ private function createEventsForNodeToInsert(
         ?NodeAggregateId $targetSucceedingSiblingNodeAggregateId,
         ?NodeName $targetNodeName,
         NodeSubtreeSnapshot $nodeToInsert,
-        Dto\NodeAggregateIdMapping $nodeAggregateIdMapping,
+        \Neos\Neos\Domain\Service\NodeDuplication\NodeAggregateIdMapping $nodeAggregateIdMapping,
         array &$events,
     ): void {
         $events[] = new NodeAggregateWithNodeWasCreated(

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtree.php

@@ -5,17 +5,25 @@
 namespace Neos\ContentRepository\Core\Projection\ContentGraph;
 
 /**
- * @api returned by {@see ContentSubgraphInterface}
+ * @api returned by {@see ContentSubgraphInterface::findSubtree()}
  */
 final readonly class Subtree
 {
-    /**
-     * @param array<int,Subtree> $children
-     */
-    public function __construct(
+    private function __construct(
         public int $level,
         public Node $node,
-        public array $children
+        public Subtrees $children
     ) {
     }
+
+    /**
+     * @internal
+     */
+    public static function create(
+        int $level,
+        Node $node,
+        Subtrees $children
+    ): self {
+        return new self($level, $node, $children);
+    }
 }

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtrees.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\ContentRepository\Core\Projection\ContentGraph;
+
+/**
+ * @api part of {@see Subtree}
+ * @implements \IteratorAggregate<Subtree>
+ */
+final readonly class Subtrees implements \IteratorAggregate, \Countable
+{
+    /** @var array<Subtree> */
+    private array $items;
+
+    private function __construct(
+        Subtree ...$items
+    ) {
+        $this->items = $items;
+    }
+
+    /**
+     * @internal
+     */
+    public static function create(Subtree ...$items): self
+    {
+        return new self(...$items);
+    }
+
+    /**
+     * @internal
+     * @param array<Subtree> $items
+     */
+    public static function fromArray(array $items): self
+    {
+        return new self(...$items);
+    }
+
+    public function getIterator(): \Traversable
+    {
+        yield from $this->items;
+    }
+
+    public function count(): int
+    {
+        return count($this->items);
+    }
+}

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php

@@ -61,7 +61,6 @@ trait CRTestSuiteTrait
     use ContentStreamClosing;
 
     use NodeCreation;
-    use NodeCopying;
     use SubtreeTagging;
     use NodeModification;
     use NodeMove;

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php

@@ -29,7 +29,6 @@
 use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNode;
 use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate;
 use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\EnableNodeAggregate;
-use Neos\ContentRepository\Core\Feature\NodeDuplication\Command\CopyNodesRecursively;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetNodeProperties;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
 use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate;
@@ -191,7 +190,9 @@ protected function addDefaultCommandArgumentValues(string $commandClassName, arr
             }
         }
         if ($commandClassName === CreateNodeAggregateWithNode::class || $commandClassName === SetNodeReferences::class) {
-            if (is_array($commandArguments['references'] ?? null)) {
+            if (is_string($commandArguments['references'] ?? null)) {
+                $commandArguments['references'] = iterator_to_array($this->mapRawNodeReferencesToNodeReferencesToWrite(json_decode($commandArguments['references'], true, 512, JSON_THROW_ON_ERROR)));
+            } elseif (is_array($commandArguments['references'] ?? null)) {
                 $commandArguments['references'] = iterator_to_array($this->mapRawNodeReferencesToNodeReferencesToWrite($commandArguments['references']));
             }
         }
@@ -243,7 +244,6 @@ protected static function resolveShortCommandName(string $shortCommandName): str
             ChangeBaseWorkspace::class,
             ChangeNodeAggregateName::class,
             ChangeNodeAggregateType::class,
-            CopyNodesRecursively::class,
             CreateNodeAggregateWithNode::class,
             CreateNodeVariant::class,
             CreateRootNodeAggregateWithNode::class,