TASK: Simplyfy InterfaceName and ObjectNameSpecification

Author: mficzel

Classes/Command/NodeObjectsCommandController.php

@@ -101,7 +101,7 @@ public function buildCommand(string $packageKey, string $crId = 'default'): void
                 $interfaceSpecification->interfaceFilename,
                 $interfaceSpecification->toPhpString()
             );
-            $this->outputLine(' - ' . $interfaceSpecification->interfaceName->nodeTypeName . ' -> <info>' . $interfaceSpecification->interfaceFilename . '</info>');
+            $this->outputLine(' - ' . $interfaceSpecification->interfaceName->nodeTypeName . ' -> <info>' . $interfaceSpecification->interfaceName->getFullyQualifiedClassName() . '</info>');
         }
 
         // loop 2 build objects for all non abstract nodetypes in package
@@ -121,7 +121,7 @@ public function buildCommand(string $packageKey, string $crId = 'default'): void
                 $objectSpecification->classFilename,
                 $objectSpecification->toPhpString()
             );
-            $this->outputLine(' - ' . $objectSpecification->objectName->nodeTypeName . ' -> <info>' . $objectSpecification->objectName->fullyQualifiedClassName . '</info>');
+            $this->outputLine(' - ' . $objectSpecification->objectName->nodeTypeName . ' -> <info>' . $objectSpecification->objectName->getFullyQualifiedClassName() . '</info>');
         }
     }
 

Classes/Domain/NodeInterfaceNameSpecification.php

@@ -14,11 +14,15 @@
     public function __construct(
         public string $nodeTypeName,
         public string $phpNamespace,
-        public string $interfaceName,
-        public string $fullyQualifiedInterfaceName,
+        public string $interfaceName
     ) {
     }
 
+    public function getFullyQualifiedClassName(): string
+    {
+        return $this->phpNamespace . '\\' . $this->interfaceName;
+    }
+
     public static function createFromNodeTypeName(
         NodeTypeName $nodeTypeName
     ): self {
@@ -34,8 +38,7 @@ public static function createFromNodeTypeName(
         return new self(
             $nodeTypeName->value,
             $phpNamespace,
-            $interfaceName,
-            $phpNamespace . '\\' . $interfaceName
+            $interfaceName
         );
     }
 

Classes/Domain/NodeInterfaceNameSpecificationCollection.php

@@ -37,7 +37,7 @@ public static function createFromNodeType(NodeType $nodeType, bool $checkForExis
         ];
         foreach ($nodeType->getDeclaredSuperTypes() as $superType) {
             $interface = NodeInterfaceNameSpecification::createFromNodeType($superType);
-            if ($checkForExistence && interface_exists($interface->fullyQualifiedInterfaceName)) {
+            if ($checkForExistence && interface_exists($interface->getFullyQualifiedClassName())) {
                 $interfaces[] = $interface;
             } else {
                 $interfaces[] = $interface;
@@ -51,7 +51,7 @@ public function asImplementsStatement(): string
         if (empty($this->items)) {
             return '';
         } else {
-            return 'implements ' . implode(', ', array_map(fn(NodeInterfaceNameSpecification $item)=> $item->fullyQualifiedInterfaceName, $this->items));
+            return 'implements ' . implode(', ', array_map(fn(NodeInterfaceNameSpecification $item)=> $item->getFullyQualifiedClassName(), $this->items));
         }
     }
 }

Classes/Domain/NodeObjectNameSpecification.php

@@ -15,10 +15,14 @@ public function __construct(
         public string $nodeTypeName,
         public string $phpNamespace,
         public string $className,
-        public string $fullyQualifiedClassName,
     ) {
     }
 
+    public function getFullyQualifiedClassName(): string
+    {
+        return $this->phpNamespace . '\\' . $this->className;
+    }
+
     public static function createFromNodeTypeName(
         NodeTypeName $nodeTypeName
     ): self {
@@ -35,7 +39,6 @@ public static function createFromNodeTypeName(
             $nodeTypeName->value,
             $phpNamespace,
             $className,
-            $phpNamespace . '\\' . $className
         );
     }
 

Classes/Domain/NodeObjectSpecification.php

@@ -80,7 +80,7 @@ public function toPhpString(): string
         /**
          * AUTOGENERATED CODE ... DO NOT MODIFY !!!
          *
-         * run `./flow nodetypeobjects:build` to regenerate this
+         * run `./flow nodeobjects:build` to regenerate this
          */
         #[Flow\Proxy(false)]
         final readonly class {$this->objectName->className} {$interfaceDeclaration}

Classes/NodeObjectFactory.php

@@ -12,7 +12,7 @@ class NodeObjectFactory
     public static function forNode(Node $node): NodeObjectInterface
     {
         $nodeObjectName = NodeObjectNameSpecification::createFromNodeTypeName($node->nodeTypeName);
-        $nodeObjectClass = $nodeObjectName->fullyQualifiedClassName;
+        $nodeObjectClass = $nodeObjectName->getFullyQualifiedClassName();
         if (class_exists($nodeObjectClass) && is_a($nodeObjectClass, NodeObjectInterface::class, true)) {
             return $nodeObjectClass::fromNode($node);
         } else {
@@ -23,7 +23,7 @@ public static function forNode(Node $node): NodeObjectInterface
     public static function tryForNode(Node $node): ?NodeObjectInterface
     {
         $nodeObjectName = NodeObjectNameSpecification::createFromNodeTypeName($node->nodeTypeName);
-        $nodeObjectClass = $nodeObjectName->fullyQualifiedClassName;
+        $nodeObjectClass = $nodeObjectName->getFullyQualifiedClassName();
         if (class_exists($nodeObjectClass) && is_a($nodeObjectClass, NodeObjectInterface::class, true)) {
             return $nodeObjectClass::fromNode($node);
         } else {

README.md

@@ -6,7 +6,7 @@ Autogenerate php classes and interfaces for NodeTypes with type safe property ac
 
 - NodeObjects are created for each non abstract NodeType in the namespace of the given package.
 - NodeInterfaces are created for each NodeType in the namespace of the given package.
-- NodeObjects and NodeInterfaces are stored in the `NodeTypes` folder using all parts of the NodeTypeName as folders   
+- NodeObjects and NodeInterfaces are stored in the `NodeTypes` folder using all parts of the NodeTypeName as folders
 - The namespace of each NodeTypeObject/NodeInterface is derived from the package-key with added ``NodeTypes`
 - The className of a NodeObject is defined by the last part of the NodeTypeName with postfix `NodeObject`
 - The interfaceName of a NodeInterface is defined by the last part of the NodeTypeName with postfix `NodeInterface`

Tests/Unit/NodeInterfaceNameSpecificationTest.php

@@ -29,7 +29,6 @@ public function detectionOfNamesFromNodeType(): void
                 'Vendor.Example:Foo.Bar',
                 'Vendor\Example\NodeTypes\Foo\Bar',
                 'BarNodeInterface',
-                'Vendor\Example\NodeTypes\Foo\Bar\BarNodeInterface',
             ),
             $specification
         );

Tests/Unit/NodeObjectNameSpecificationTest.php

@@ -28,7 +28,6 @@ public function detectionOfNamesFromNodeType(): void
                 'Vendor.Example:Foo.Bar',
                 'Vendor\Example\NodeTypes\Foo\Bar',
                 'BarNodeObject',
-                'Vendor\Example\NodeTypes\Foo\Bar\BarNodeObject',
             ),
             $specification
         );