neos · ahaeslich · Nov 3, 2023 · Sep 22, 2023 · Oct 26, 2023 · Nov 2, 2023
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php
@@ -61,8 +61,8 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraintsWithSubNodeTypes;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\ExpandedNodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\References;
 use Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
@@ -301,8 +301,8 @@ public function findSubtree(NodeAggregateId $entryNodeAggregateId, FindSubtreeFi
         if ($filter->maximumLevels !== null) {
             $queryBuilderRecursive->andWhere('p.level < :maximumLevels')->setParameter('maximumLevels', $filter->maximumLevels);
         }
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilderRecursive, $filter->nodeTypeConstraints, 'c');
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilderRecursive, $filter->nodeTypes, 'c');
         }
         $this->addRestrictionRelationConstraints($queryBuilderRecursive, 'c');
 
@@ -399,8 +399,8 @@ public function findClosestNode(NodeAggregateId $entryNodeAggregateId, FindClose
             ->setParameter('contentStreamId', $this->contentStreamId->value)
             ->setParameter('dimensionSpacePointHash', $this->dimensionSpacePoint->hash)
             ->setParameter('entryNodeAggregateId', $entryNodeAggregateId->value);
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilderCte, $filter->nodeTypeConstraints, 'p');
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilderCte, $filter->nodeTypes, 'p');
         }
         $nodeRows = $this->fetchCteResults(
             $queryBuilderInitial,
@@ -509,10 +509,10 @@ private function addRestrictionRelationConstraints(QueryBuilder $queryBuilder, s
         );
     }
 
-    private function addNodeTypeConstraints(QueryBuilder $queryBuilder, NodeTypeConstraints $nodeTypeConstraints, string $nodeTableAlias = 'n'): void
+    private function addNodeTypeCriteria(QueryBuilder $queryBuilder, NodeTypeCriteria $nodeTypeCriteria, string $nodeTableAlias = 'n'): void
     {
         $nodeTablePrefix = $nodeTableAlias === '' ? '' : $nodeTableAlias . '.';
-        $constraintsWithSubNodeTypes = NodeTypeConstraintsWithSubNodeTypes::create($nodeTypeConstraints, $this->nodeTypeManager);
+        $constraintsWithSubNodeTypes = ExpandedNodeTypeCriteria::create($nodeTypeCriteria, $this->nodeTypeManager);
         $allowanceQueryPart = '';
         if (!$constraintsWithSubNodeTypes->explicitlyAllowedNodeTypeNames->isEmpty()) {
             $allowanceQueryPart = $queryBuilder->expr()->in($nodeTablePrefix . 'nodetypename', ':explicitlyAllowedNodeTypeNames');
@@ -611,8 +611,8 @@ private function buildChildNodesQuery(NodeAggregateId $parentNodeAggregateId, Fi
             ->where('pn.nodeaggregateid = :parentNodeAggregateId')->setParameter('parentNodeAggregateId', $parentNodeAggregateId->value)
             ->andWhere('h.contentstreamid = :contentStreamId')->setParameter('contentStreamId', $this->contentStreamId->value)
             ->andWhere('h.dimensionspacepointhash = :dimensionSpacePointHash')->setParameter('dimensionSpacePointHash', $this->dimensionSpacePoint->hash);
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilder, $filter->nodeTypeConstraints);
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilder, $filter->nodeTypes);
         }
         if ($filter->searchTerm !== null) {
             $this->addSearchTermConstraints($queryBuilder, $filter->searchTerm);
@@ -642,8 +642,8 @@ private function buildReferencesQuery(bool $backReferences, NodeAggregateId $nod
             ->andWhere('sh.contentstreamid = :contentStreamId');
         $this->addRestrictionRelationConstraints($queryBuilder, 'dn', 'dh');
         $this->addRestrictionRelationConstraints($queryBuilder, 'sn', 'sh');
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilder, $filter->nodeTypeConstraints, "{$destinationTablePrefix}n");
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilder, $filter->nodeTypes, "{$destinationTablePrefix}n");
         }
         if ($filter->nodeSearchTerm !== null) {
             $this->addSearchTermConstraints($queryBuilder, $filter->nodeSearchTerm, "{$destinationTablePrefix}n");
@@ -708,8 +708,8 @@ private function buildSiblingsQuery(bool $preceding, NodeAggregateId $siblingNod
             ->orderBy('h.position', $preceding ? 'DESC' : 'ASC');
 
         $this->addRestrictionRelationConstraints($queryBuilder);
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilder, $filter->nodeTypeConstraints);
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilder, $filter->nodeTypes);
         }
         if ($filter->searchTerm !== null) {
             $this->addSearchTermConstraints($queryBuilder, $filter->searchTerm);
@@ -758,8 +758,8 @@ private function buildAncestorNodesQueries(NodeAggregateId $entryNodeAggregateId
             ->setParameter('contentStreamId', $this->contentStreamId->value)
             ->setParameter('dimensionSpacePointHash', $this->dimensionSpacePoint->hash)
             ->setParameter('entryNodeAggregateId', $entryNodeAggregateId->value);
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilderCte, $filter->nodeTypeConstraints, 'p');
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilderCte, $filter->nodeTypes, 'p');
         }
         return compact('queryBuilderInitial', 'queryBuilderRecursive', 'queryBuilderCte');
     }
@@ -799,8 +799,8 @@ private function buildDescendantNodesQueries(NodeAggregateId $entryNodeAggregate
             ->setParameter('contentStreamId', $this->contentStreamId->value)
             ->setParameter('dimensionSpacePointHash', $this->dimensionSpacePoint->hash)
             ->setParameter('entryNodeAggregateId', $entryNodeAggregateId->value);
-        if ($filter->nodeTypeConstraints !== null) {
-            $this->addNodeTypeConstraints($queryBuilderCte, $filter->nodeTypeConstraints);
+        if ($filter->nodeTypes !== null) {
+            $this->addNodeTypeCriteria($queryBuilderCte, $filter->nodeTypes);
         }
         if ($filter->searchTerm !== null) {
             $this->addSearchTermConstraints($queryBuilderCte, $filter->searchTerm);

diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php
@@ -43,8 +43,8 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraintsWithSubNodeTypes;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\ExpandedNodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\References;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
@@ -139,12 +139,12 @@ public function findChildNodes(
         );
         $query = $query->withDimensionSpacePoint($this->dimensionSpacePoint)
             ->withRestriction($this->visibilityConstraints);
-        if (!is_null($filter->nodeTypeConstraints)) {
-            $nodeTypeConstraintsWithSubNodeTypes = NodeTypeConstraintsWithSubNodeTypes::create(
-                $filter->nodeTypeConstraints,
+        if (!is_null($filter->nodeTypes)) {
+            $expandedNodeTypeCriteria = ExpandedNodeTypeCriteria::create(
+                $filter->nodeTypes,
                 $this->nodeTypeManager
             );
-            $query = $query->withNodeTypeConstraints($nodeTypeConstraintsWithSubNodeTypes, 'cn');
+            $query = $query->withNodeTypeCriteria($expandedNodeTypeCriteria, 'cn');
         }
         if (!is_null($filter->pagination)) {
             $query = $query
@@ -217,12 +217,12 @@ public function findBackReferences(
             ->withSourceRestriction($this->visibilityConstraints)
             ->withTargetRestriction($this->visibilityConstraints);
 
-        if ($filter->nodeTypeConstraints) {
-            $nodeTypeConstraintsWithSubNodeTypes = NodeTypeConstraintsWithSubNodeTypes::create(
-                $filter->nodeTypeConstraints,
+        if ($filter->nodeTypes) {
+            $expandedNodeTypeCriteria = ExpandedNodeTypeCriteria::create(
+                $filter->nodeTypes,
                 $this->nodeTypeManager
             );
-            $query = $query->withNodeTypeConstraints($nodeTypeConstraintsWithSubNodeTypes, 'srcn');
+            $query = $query->withNodeTypeCriteria($expandedNodeTypeCriteria, 'srcn');
         }
         $orderings = [];
         if ($filter->referenceName) {
@@ -316,7 +316,7 @@ public function findSucceedingSiblingNodes(
         return $this->findAnySiblings(
             $siblingNodeAggregateId,
             HypergraphSiblingQueryMode::MODE_ONLY_SUCCEEDING,
-            $filter->nodeTypeConstraints,
+            $filter->nodeTypes,
             $filter->pagination,
         );
     }
@@ -328,15 +328,15 @@ public function findPrecedingSiblingNodes(
         return $this->findAnySiblings(
             $siblingNodeAggregateId,
             HypergraphSiblingQueryMode::MODE_ONLY_PRECEDING,
-            $filter->nodeTypeConstraints,
+            $filter->nodeTypes,
             $filter->pagination,
         );
     }
 
     private function findAnySiblings(
         NodeAggregateId $sibling,
         HypergraphSiblingQueryMode $mode,
-        ?NodeTypeConstraints $nodeTypeConstraints = null,
+        ?NodeTypeCriteria $nodeTypeCriteria = null,
         ?Pagination $pagination = null,
     ): Nodes {
         $query = HypergraphSiblingQuery::create(
@@ -347,12 +347,12 @@ private function findAnySiblings(
             $this->tableNamePrefix
         );
         $query = $query->withRestriction($this->visibilityConstraints);
-        if (!is_null($nodeTypeConstraints)) {
-            $nodeTypeConstraintsWithSubNodeTypes = NodeTypeConstraintsWithSubNodeTypes::create(
-                $nodeTypeConstraints,
+        if (!is_null($nodeTypeCriteria)) {
+            $expandedNodeTypeCriteria = ExpandedNodeTypeCriteria::create(
+                $nodeTypeCriteria,
                 $this->nodeTypeManager
             );
-            $query = $query->withNodeTypeConstraints($nodeTypeConstraintsWithSubNodeTypes, 'sn');
+            $query = $query->withNodeTypeCriteria($expandedNodeTypeCriteria, 'sn');
         }
         $query = $query->withOrdinalityOrdering($mode->isOrderingToBeReversed());
         if (!is_null($pagination)) {
@@ -383,14 +383,14 @@ public function findSubtree(
         ];
 
         $types = [];
-        if ($filter->nodeTypeConstraints !== null) {
-            $nodeTypeConstraintsWithSubNodeTypes = NodeTypeConstraintsWithSubNodeTypes::create(
-                $filter->nodeTypeConstraints,
+        if ($filter->nodeTypes !== null) {
+            $expandedNodeTypeCriteria = ExpandedNodeTypeCriteria::create(
+                $filter->nodeTypes,
                 $this->nodeTypeManager
             );
-            $nodeTypeConstraintsClause = QueryUtility::getNodeTypeConstraintsClause($nodeTypeConstraintsWithSubNodeTypes, 'cn', $parameters, $types);
+            $nodeTypeCriteriaClause = QueryUtility::getNodeTypeCriteriaClause($expandedNodeTypeCriteria, 'cn', $parameters, $types);
         } else {
-            $nodeTypeConstraintsClause = '';
+            $nodeTypeCriteriaClause = '';
         }
 
         $query = /** @lang PostgreSQL */
@@ -438,7 +438,7 @@ public function findSubtree(
 		    AND ch.dimensionspacepointhash = :dimensionSpacePointHash
 		    ' . ($filter->maximumLevels !== null ? 'AND p.level + 1 <= :maximumLevels' : '') . '
             ' . QueryUtility::getRestrictionClause($this->visibilityConstraints, $this->tableNamePrefix, 'c') . '
-		    ' . $nodeTypeConstraintsClause . '
+		    ' . $nodeTypeCriteriaClause . '
     )
     SELECT * FROM subtree
     -- NOTE: it is crucially important that *inside* a single level, we

diff --git a/...ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/CommonGraphQueryOperations.php b/...ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/CommonGraphQueryOperations.php
@@ -17,8 +17,8 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\ForwardCompatibility\Result as QueryResult;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraints;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraintsWithSubNodeTypes;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\ExpandedNodeTypeCriteria;
 
 /**
  * @internal
@@ -52,13 +52,13 @@ final protected function __construct(
         $this->types = $types;
     }
 
-    final public function withNodeTypeConstraints(
-        NodeTypeConstraintsWithSubNodeTypes $nodeTypeConstraints,
+    final public function withNodeTypeCriteria(
+        ExpandedNodeTypeCriteria $nodeTypeCriteria,
         string $prefix
     ): self {
         $parameters = $this->parameters;
         $types = $this->types;
-        $query = $this->query . QueryUtility::getNodeTypeConstraintsClause($nodeTypeConstraints, $prefix, $parameters, $types);
+        $query = $this->query . QueryUtility::getNodeTypeCriteriaClause($nodeTypeCriteria, $prefix, $parameters, $types);
         return new self($query, $parameters, $this->tableNamePrefix, $types);
     }
 

diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/QueryUtility.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/QueryUtility.php
@@ -15,7 +15,7 @@
 namespace Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query;
 
 use Doctrine\DBAL\Connection;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeTypeConstraintsWithSubNodeTypes;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\ExpandedNodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 
 /**
@@ -43,26 +43,26 @@ public static function getRestrictionClause(
     }
 
     /**
-     * @param NodeTypeConstraintsWithSubNodeTypes $nodeTypeConstraints
+     * @param ExpandedNodeTypeCriteria $nodeTypeCriteria
      * @param string $prefix
      * @param array<string,mixed> $parameters
      * @param array<string,int|string> $types
      * @return string
      */
-    public static function getNodeTypeConstraintsClause(
-        NodeTypeConstraintsWithSubNodeTypes $nodeTypeConstraints,
+    public static function getNodeTypeCriteriaClause(
+        ExpandedNodeTypeCriteria $nodeTypeCriteria,
         string $prefix,
         array &$parameters,
         array &$types,
     ): string {
         $query = '';
-        $parameters['allowedNodeTypeNames'] = $nodeTypeConstraints->explicitlyAllowedNodeTypeNames->toStringArray();
-        $parameters['disallowedNodeTypeNames'] = $nodeTypeConstraints->explicitlyDisallowedNodeTypeNames->toStringArray();
+        $parameters['allowedNodeTypeNames'] = $nodeTypeCriteria->explicitlyAllowedNodeTypeNames->toStringArray();
+        $parameters['disallowedNodeTypeNames'] = $nodeTypeCriteria->explicitlyDisallowedNodeTypeNames->toStringArray();
         $types['allowedNodeTypeNames'] = Connection::PARAM_STR_ARRAY;
         $types['disallowedNodeTypeNames'] = Connection::PARAM_STR_ARRAY;
-        if (!$nodeTypeConstraints->explicitlyAllowedNodeTypeNames->isEmpty()) {
-            if (!$nodeTypeConstraints->explicitlyDisallowedNodeTypeNames->isEmpty()) {
-                if ($nodeTypeConstraints->isWildCardAllowed) {
+        if (!$nodeTypeCriteria->explicitlyAllowedNodeTypeNames->isEmpty()) {
+            if (!$nodeTypeCriteria->explicitlyDisallowedNodeTypeNames->isEmpty()) {
+                if ($nodeTypeCriteria->isWildCardAllowed) {
                     $query .= '
             AND ' . $prefix . '.nodetypename NOT IN (:disallowedNodeTypeNames)
             OR ' . $prefix . '.nodetypename IN (:allowedNodeTypeNames)';
@@ -72,12 +72,12 @@ public static function getNodeTypeConstraintsClause(
             AND ' . $prefix . '.nodetypename NOT IN (:disallowedNodeTypeNames)';
                 }
             } else {
-                if (!$nodeTypeConstraints->isWildCardAllowed) {
+                if (!$nodeTypeCriteria->isWildCardAllowed) {
                     $query .= '
             AND ' . $prefix . '.nodetypename IN (:allowedNodeTypeNames)';
                 }
             }
-        } elseif (!$nodeTypeConstraints->explicitlyDisallowedNodeTypeNames->isEmpty()) {
+        } elseif (!$nodeTypeCriteria->explicitlyDisallowedNodeTypeNames->isEmpty()) {
             $query .= '
             AND ' . $prefix . '.nodetypename NOT IN (:disallowedNodeTypeNames)';
         }

diff --git a/...entRepository.BehavioralTests/Tests/Behavior/Features/NodeTraversal/AncestorNodes.feature b/...entRepository.BehavioralTests/Tests/Behavior/Features/NodeTraversal/AncestorNodes.feature
@@ -92,4 +92,4 @@ Feature: Find and count nodes using the findAncestorNodes and countAncestorNodes
 
     # findAncestorNodes queries with results
     When I execute the findAncestorNodes query for entry node aggregate id "a2a2b" I expect the nodes "a2a2,a2a,a2,a,home,lady-eleonode-rootford" to be returned and the total count to be 6
-    When I execute the findAncestorNodes query for entry node aggregate id "a2a2b" and filter '{"nodeTypeConstraints": "Neos.ContentRepository.Testing:Page"}' I expect the nodes "a2a2,a2,a" to be returned and the total count to be 3
+    When I execute the findAncestorNodes query for entry node aggregate id "a2a2b" and filter '{"nodeTypes": "Neos.ContentRepository.Testing:Page"}' I expect the nodes "a2a2,a2,a" to be returned and the total count to be 3