Add directory exclusions for "expectedArguments" and "expectedReturnValues" generators

Author: SerafimArts

src/PhpStormMetadataGenerator.php

@@ -38,19 +38,27 @@ public function __construct(
         private readonly NamingStrategyInterface $naming = new SimpleNamingStrategy(),
     ) {
         $this->phpstormMetadataVisitors[] = new GenerateEnumArgumentsSet(
-            $this->naming,
-            $argumentSetPrefix,
-            $ignoreDirectories,
+            naming: $this->naming,
+            argumentSetPrefix: $argumentSetPrefix,
+            excludes: $ignoreDirectories,
+        );
+        $this->phpstormMetadataVisitors[] = new GenerateEnumExpectedArguments(
+            naming: $this->naming,
+            argumentSetPrefix: $argumentSetPrefix,
+            excludes: $ignoreDirectories,
+        );
+        $this->phpstormMetadataVisitors[] = new GenerateEnumExpectedReturnValues(
+            naming: $this->naming,
+            argumentSetPrefix: $argumentSetPrefix,
+            excludes: $ignoreDirectories,
         );
-        $this->phpstormMetadataVisitors[] = new GenerateEnumExpectedArguments($this->naming, $argumentSetPrefix);
-        $this->phpstormMetadataVisitors[] = new GenerateEnumExpectedReturnValues($this->naming, $argumentSetPrefix);
         $this->phpstormMetadataVisitors[] = new GenerateStructOverrides(
             naming: $this->naming,
             argumentSetPrefix: $argumentSetPrefix,
-            ignoreDirectories: $ignoreDirectories,
+            excludes: $ignoreDirectories,
         );
-        $this->phpstormMetadataVisitors[] = new GenerateStructures($this->naming, $ignoreDirectories);
 
+        $this->phpstormMetadataVisitors[] = new GenerateStructures($this->naming, $ignoreDirectories);
         $this->entrypointMetadataVisitors[] = new GenerateExportFunctions($this->naming, $ignoreDirectories);
     }
 

src/PhpStormMetadataGenerator/GenerateEnumExpectedArguments.php

@@ -22,15 +22,21 @@
  */
 final class GenerateEnumExpectedArguments extends Visitor
 {
+    /**
+     * @param list<non-empty-string> $excludes
+     */
     public function __construct(
         private readonly NamingStrategyInterface $naming,
         private readonly string $argumentSetPrefix,
+        private readonly array $excludes = [],
     ) {
     }
 
     public function enter(NamespaceNode $ctx, TypeDefinitionNode|FunctionNode $node): iterable
     {
-        if (!$node instanceof FunctionNode || $node->name === null) {
+        if (!$node instanceof FunctionNode
+            || $node->name === null
+            || $node->location->matches($this->excludes)) {
             return;
         }
 

src/PhpStormMetadataGenerator/GenerateEnumExpectedReturnValues.php

@@ -24,9 +24,13 @@
  */
 final class GenerateEnumExpectedReturnValues extends Visitor
 {
+    /**
+     * @param list<non-empty-string> $excludes
+     */
     public function __construct(
         private readonly NamingStrategyInterface $naming,
         private readonly string $argumentSetPrefix,
+        private readonly array $excludes = [],
     ) {
     }
 
@@ -36,7 +40,7 @@ public function enter(NamespaceNode $ctx, TypeDefinitionNode|FunctionNode $node)
             || $node->name === null
             || !$node->returns instanceof TypeDefinitionNode
             || !$node->returns->type instanceof EnumTypeNode
-        ) {
+            || $node->location->matches($this->excludes)) {
             return;
         }
 

src/PhpStormMetadataGenerator/GenerateStructOverrides.php

@@ -84,13 +84,13 @@ final class GenerateStructOverrides extends Visitor
     private array $names = self::BUILTIN_TYPES;
 
     /**
-     * @param list<non-empty-string> $ignoreDirectories
+     * @param list<non-empty-string> $excludes
      */
     public function __construct(
         private readonly NamingStrategyInterface $naming,
         private readonly string $argumentSetPrefix,
         private readonly string $globalArgumentSetSuffix = 'types_list',
-        private readonly array $ignoreDirectories = [],
+        private readonly array $excludes = [],
     ) {
     }
 
@@ -100,7 +100,7 @@ public function __construct(
     private function getTypeAliases(TypeInterface $type): ?array
     {
         if ($type instanceof RecordTypeNode && $type->name !== null) {
-            if ($type->location->matches($this->ignoreDirectories)) {
+            if ($type->location->matches($this->excludes)) {
                 return null;
             }