Support nullable

Author: sandrokeil

src/ClassGenerator.php

@@ -16,6 +16,7 @@
 use OpenCodeModeling\CodeAst\Builder\ClassMethodBuilder;
 use OpenCodeModeling\CodeAst\Builder\ClassPropertyBuilder;
 use OpenCodeModeling\CodeAst\Code\ClassConstGenerator;
+use OpenCodeModeling\CodeAst\Package\ClassInfo;
 use OpenCodeModeling\CodeAst\Package\ClassInfoList;
 use OpenCodeModeling\JsonSchemaToPhp\Type\ArrayType;
 use OpenCodeModeling\JsonSchemaToPhp\Type\ObjectType;
@@ -59,7 +60,7 @@ public function __construct(
      * @param ClassBuilderCollection $classBuilderCollection Collection for other classes
      * @param TypeSet $typeSet
      * @param string $srcFolder Source folder for namespace imports
-     * @param string|null $className Class name of other classes
+     * @param string|null $className Class name is used from $classBuilder if not set
      * @return void
      */
     public function generateClasses(
@@ -79,6 +80,7 @@ public function generateClasses(
         ) {
             $type = $refType->first();
         }
+        $className = $className ?: $classBuilder->getName();
 
         switch (true) {
             case $type instanceof ObjectType:
@@ -117,7 +119,12 @@ public function generateClasses(
                                 $propertyClassName
                             );
                             $classBuilder->addNamespaceImport($classNamespace . '\\' . $propertyClassName);
-                            $classBuilder->addProperty(ClassPropertyBuilder::fromScratch($propertyPropertyName, $propertyClassName));
+                            $classBuilder->addProperty(
+                                ClassPropertyBuilder::fromScratch(
+                                    $propertyPropertyName,
+                                    $propertyType->isNullable() ? ('?' . $propertyClassName) : $propertyClassName
+                                )
+                            );
                             break;
                         case $propertyType instanceof ReferenceType:
                             if ($propertyRefType = $propertyType->resolvedType()) {
@@ -132,7 +139,10 @@ public function generateClasses(
                                 $classBuilder->addNamespaceImport($classNamespace . '\\' . $propertyClassName);
                             }
                             $classBuilder->addProperty(
-                                ClassPropertyBuilder::fromScratch($propertyPropertyName, $propertyClassName)
+                                ClassPropertyBuilder::fromScratch(
+                                    $propertyPropertyName,
+                                    $propertyType->isNullable() ? ('?' . $propertyClassName) : $propertyClassName
+                                )
                             );
                             break;
                         case $propertyType instanceof ScalarType:
@@ -143,7 +153,7 @@ public function generateClasses(
                             $classBuilder->addProperty(
                                 ClassPropertyBuilder::fromScratch(
                                     $propertyPropertyName,
-                                    $propertyClassName
+                                    $propertyType->isNullable() ? ('?' . $propertyClassName) : $propertyClassName
                                 )
                             );
                             break;
@@ -246,15 +256,23 @@ public function generateValueObject(string $className, string $classNamespace, T
      * @param ClassBuilderCollection $classBuilderCollection
      * @param Parser $parser
      * @param PrettyPrinterAbstract $printer
+     * @param callable|null $currentFileAst Callable to return current file AST, if null, file will be overwritten
      * @return array<string, string> List of filename => code
      */
     public function generateFiles(
         ClassBuilderCollection $classBuilderCollection,
         Parser $parser,
-        PrettyPrinterAbstract $printer
+        PrettyPrinterAbstract $printer,
+        callable $currentFileAst = null
     ): array {
         $files = [];
 
+        if ($currentFileAst === null) {
+            $currentFileAst = static function (ClassBuilder $classBuilder, ClassInfo $classInfo) {
+                return [];
+            };
+        }
+
         $previousNamespace = '__invalid//namespace__';
 
         foreach ($classBuilderCollection as $classBuilder) {
@@ -269,7 +287,10 @@ public function generateFiles(
             $nodeTraverser = new NodeTraverser();
             $classBuilder->injectVisitors($nodeTraverser, $parser);
 
-            $files[$filename] = $printer->prettyPrintFile($nodeTraverser->traverse([]));
+            $files[$filename] = $printer->prettyPrintFile(
+                // @phpstan-ignore-next-line
+                $nodeTraverser->traverse($currentFileAst($classBuilder, $classInfo))
+            );
         }
 
         return $files;

tests/ClassGeneratorTest.php

@@ -185,6 +185,10 @@ private function assertBillingAddress(ClassBuilder $classBuilder): void
         $this->assertArrayHasKey('federalState', $properties);
         $this->assertArrayHasKey('streetAddress', $properties);
 
+        $this->assertSame('?City', $properties['city']->getType());
+        $this->assertSame('State', $properties['federalState']->getType());
+        $this->assertSame('StreetAddress', $properties['streetAddress']->getType());
+
         $this->assertCount(3, $classBuilder->getNamespaceImports());
         $this->assertSame(
             ['Acme\\StreetAddress' => 'Acme\\StreetAddress', 'Acme\\City' => 'Acme\\City', 'Acme\\State' => 'Acme\\State'],
@@ -230,6 +234,10 @@ private function assertAddress(ClassBuilder $classBuilder): void
         $this->assertArrayHasKey('federalState', $properties);
         $this->assertArrayHasKey('streetAddress', $properties);
 
+        $this->assertSame('?City', $properties['city']->getType());
+        $this->assertSame('State', $properties['federalState']->getType());
+        $this->assertSame('StreetAddress', $properties['streetAddress']->getType());
+
         $this->assertCount(3, $classBuilder->getNamespaceImports());
         $this->assertSame(
             ['Acme\\StreetAddress' => 'Acme\\StreetAddress', 'Acme\\City' => 'Acme\\City', 'Acme\\State' => 'Acme\\State'],
@@ -477,13 +485,13 @@ final class Address
     public const CITY = 'city';
     public const FEDERAL_STATE = 'federal_state';
     private StreetAddress $streetAddress;
-    private City $city;
+    private ?City $city;
     private State $federalState;
     public function streetAddress() : StreetAddress
     {
         return $this->streetAddress;
     }
-    public function city() : City
+    public function city() : ?City
     {
         return $this->city;
     }
@@ -513,13 +521,13 @@ final class BillingAddress
     public const CITY = 'city';
     public const FEDERAL_STATE = 'federal_state';
     private StreetAddress $streetAddress;
-    private City $city;
+    private ?City $city;
     private State $federalState;
     public function streetAddress() : StreetAddress
     {
         return $this->streetAddress;
     }
-    public function city() : City
+    public function city() : ?City
     {
         return $this->city;
     }

tests/_files/schema_with_objects.json

@@ -8,7 +8,7 @@
                     "type": "string"
                 },
                 "city": {
-                    "type": "string"
+                    "type": ["string", "null"]
                 },
                 "federal_state": {
                     "$ref": "#/definitions/state"