Improve value object factory - Close #21

Author: sandrokeil

README.md

@@ -64,7 +64,6 @@ Assume you have the following JSON schema
 
 Then you can use the `ValueObjectFactory` to generate PHP code for the following classes:
 - `Order`
-- `BillingAddress`
 - `ShippingAddresses`
 - `Address`
 - `StreetAddress`
@@ -118,7 +117,7 @@ $classBuilder = ClassBuilder::fromScratch('Order', 'YourNamespaceFromComposer')-
 
 $valueObjectFactory->generateClasses($classBuilder, $fileCollection, $typeSet, $srcFolder);
 
-// $fileCollection contains 7 classes
+// $fileCollection contains 6 classes
 
 // now let's add constants and getter methods of properties for non value objects
 $valueObjectFactory->addGetterMethodsForProperties($fileCollection, true);

composer.json

@@ -33,7 +33,7 @@
     },
     "require": {
         "php": "^7.4 || ^8.0",
-        "open-code-modeling/json-schema-to-php": "^0.2.0 || 0.3.x-dev",
+        "open-code-modeling/json-schema-to-php": "^0.3.0 || 0.4.x-dev",
         "open-code-modeling/php-code-ast": "^0.11.0 || 0.12.x-dev"
     },
     "require-dev": {

composer.lock

@@ -19,8 +19,6 @@
 use OpenCodeModeling\JsonSchemaToPhp\Type\ArrayType;
 use OpenCodeModeling\JsonSchemaToPhp\Type\ReferenceType;
 use OpenCodeModeling\JsonSchemaToPhp\Type\ScalarType;
-use OpenCodeModeling\JsonSchemaToPhp\Type\StringType;
-use OpenCodeModeling\JsonSchemaToPhp\Type\TypeDefinition;
 use OpenCodeModeling\JsonSchemaToPhp\Type\TypeSet;
 use OpenCodeModeling\JsonSchemaToPhpAst\Common\IteratorFactory;
 use PhpParser\NodeVisitor;
@@ -201,7 +199,7 @@ public function classBuilder(ArrayType $typeDefinition): ClassBuilder
         return $this->classBuilderFromNative($name, ...$typeDefinition->items());
     }
 
-    private function determineType(string $name, TypeSet ...$typeSets): ?TypeDefinition
+    private function determineTypeName(string $name, TypeSet ...$typeSets): ?string
     {
         if (\count($typeSets) !== 1) {
             throw new \RuntimeException('Can only handle one JSON type');
@@ -219,9 +217,7 @@ private function determineType(string $name, TypeSet ...$typeSets): ?TypeDefinit
                 $resolvedTypeSet = $type->resolvedType();
 
                 if ($resolvedTypeSet === null) {
-                    $resolvedTypeSet = new TypeSet(
-                        StringType::fromDefinition(['type' => StringType::type(), 'name' => $type->name()])
-                    );
+                    return $type->extractNameFromReference();
                 }
                 if (\count($resolvedTypeSet) !== 1) {
                     throw new \RuntimeException('Can only handle one JSON type');
@@ -236,7 +232,7 @@ private function determineType(string $name, TypeSet ...$typeSets): ?TypeDefinit
                 );
         }
 
-        return $type;
+        return $type->name();
     }
 
     /**
@@ -246,8 +242,7 @@ private function determineType(string $name, TypeSet ...$typeSets): ?TypeDefinit
      */
     public function nodeVisitorsFromNative(string $name, TypeSet ...$typeSets): array
     {
-        $type = $this->determineType($name, ...$typeSets);
-        $typeName = $type->name();
+        $typeName = $this->determineTypeName($name, ...$typeSets);
 
         $nodeVisitors = $this->iteratorFactory->nodeVisitorsFromNative(
             ($this->propertyNameFilter)($name),
@@ -273,8 +268,7 @@ public function nodeVisitorsFromNative(string $name, TypeSet ...$typeSets): arra
 
     public function classBuilderFromNative(string $name, TypeSet ...$typeSets): ClassBuilder
     {
-        $type = $this->determineType($name, ...$typeSets);
-        $typeName = $type->name();
+        $typeName = $this->determineTypeName($name, ...$typeSets);
 
         $classBuilder = $this->iteratorFactory->classBuilderFromNative(
             ($this->propertyNameFilter)($name),
@@ -322,10 +316,10 @@ public function methodMagicConstruct(
         $method = new MethodGenerator(
             '__construct',
             [
-                (new ParameterGenerator($argumentName, ($this->classNameFilter)($argumentType)))->setVariadic(true),
+                (new ParameterGenerator(($this->propertyNameFilter)($argumentName), ($this->classNameFilter)($argumentType)))->setVariadic(true),
             ],
             MethodGenerator::FLAG_PRIVATE,
-            new BodyGenerator($this->parser, \sprintf('$this->%s = $%s;', $propertyName, $argumentName))
+            new BodyGenerator($this->parser, \sprintf('$this->%s = $%s;', ($this->propertyNameFilter)($propertyName), ($this->propertyNameFilter)($argumentName)))
         );
         $method->setTyped($this->typed);
 
@@ -349,7 +343,14 @@ public function methodAdd(
                 (new ParameterGenerator(($this->propertyNameFilter)($argumentType), ($this->classNameFilter)($argumentType))),
             ],
             MethodGenerator::FLAG_PUBLIC,
-            new BodyGenerator($this->parser, \sprintf($body, $propertyName, ($this->propertyNameFilter)($argumentType)))
+            new BodyGenerator(
+                $this->parser,
+                \sprintf(
+                    $body,
+                    ($this->propertyNameFilter)($propertyName),
+                    ($this->propertyNameFilter)($argumentType)
+                )
+            )
         );
         $method->setTyped($this->typed);
         $method->setReturnType('self');
@@ -378,7 +379,16 @@ static function($v) use ($%s) { return !$v->equals($%s); }
                 (new ParameterGenerator(($this->propertyNameFilter)($argumentType), ($this->classNameFilter)($argumentType))),
             ],
             MethodGenerator::FLAG_PUBLIC,
-            new BodyGenerator($this->parser, \sprintf($body, $propertyName, $propertyName, ($this->propertyNameFilter)($argumentType), ($this->propertyNameFilter)($argumentType)))
+            new BodyGenerator(
+                $this->parser,
+                \sprintf(
+                    $body,
+                    ($this->propertyNameFilter)($propertyName),
+                    ($this->propertyNameFilter)($propertyName),
+                    ($this->propertyNameFilter)($argumentType),
+                    ($this->propertyNameFilter)($argumentType)
+                )
+            )
         );
         $method->setTyped($this->typed);
         $method->setReturnType('self');
@@ -479,7 +489,7 @@ static function($%s) use ($filter) { return $filter($%s); }
                 new ParameterGenerator('filter', 'callable'),
             ],
             MethodGenerator::FLAG_PUBLIC,
-            new BodyGenerator($this->parser, \sprintf($body, $propertyName, 'v', 'v'))
+            new BodyGenerator($this->parser, \sprintf($body, ($this->propertyNameFilter)($propertyName), 'v', 'v'))
         );
         $method->setTyped($this->typed);
         $method->setReturnType('self');
@@ -566,10 +576,10 @@ public function methodFromItems(
         $method = new MethodGenerator(
             'fromItems',
             [
-                (new ParameterGenerator($argumentName, ($this->classNameFilter)($argumentType)))->setVariadic(true),
+                (new ParameterGenerator(($this->propertyNameFilter)($argumentName), ($this->classNameFilter)($argumentType)))->setVariadic(true),
             ],
             MethodGenerator::FLAG_PUBLIC | MethodGenerator::FLAG_STATIC,
-            new BodyGenerator($this->parser, \sprintf('return new self(...$%s);', $argumentName))
+            new BodyGenerator($this->parser, \sprintf('return new self(...$%s);', ($this->propertyNameFilter)($argumentName)))
         );
         $method->setTyped($this->typed);
         $method->setReturnType('self');