php-api-clients · WyriHaximus · Dec 18, 2023 · Oct 21, 2023
@@ -21,6 +21,7 @@
         "jawira/case-converter": "^3.5",
         "kwn/number-to-words": "^2.6",
         "league/openapi-psr7-validator": "^0.21",
+        "league/uri": "^6.8 || ^7.3",
         "nikic/php-parser": "^4.15",
         "nunomaduro/termwind": "^1.15",
         "ondram/ci-detector": "^4.1",
@@ -55,10 +56,10 @@
     ],
     "config": {
         "allow-plugins": {
-            "wyrihaximus/composer-update-bin-autoload-path": true,
-            "infection/extension-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "infection/extension-installer": true,
+            "wyrihaximus/composer-update-bin-autoload-path": true
         },
         "platform": {
             "php": "8.2.13"

@@ -20,6 +20,7 @@
     "devizzent/cebe-php-openapi": "^1",
     "eventsauce/object-hydrator": "^1.1",
     "league/openapi-psr7-validator": "^0.21",
+    "league/uri": "^7.3 || ^6.8",
     "psr/http-message": "^1.0",
     "react/http": "^1.8",
     "react/async": "^4.0",

@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApiClients\Tools\OpenApiClientGenerator\Gatherer;
+
+use ApiClients\Tools\OpenApiClientGenerator\ClassString;
+use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\CompositSchema as CompositSchemaRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Representation\Schema;
+use ApiClients\Tools\OpenApiClientGenerator\Utils;
+use cebe\openapi\spec\Schema as baseSchema;
+
+use function array_key_exists;
+use function in_array;
+use function is_array;
+use function property_exists;
+
+final class CompositSchema
+{
+    public static function gather(
+        Namespace_ $baseNamespace,
+        string $className,
+        baseSchema $schema,
+        SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
+        CompositSchemaRegistry $compositSchemaRegistry,
+    ): Schema {
+        $className  = Utils::className($className);
+        $isArray    = $schema->type === 'array';
+        $properties = [];
+        $example    = [];
+
+        if ($isArray) {
+            $schema = $schema->items;
+        }
+
+        foreach ($schema->properties as $propertyName => $property) {
+            $gatheredProperty = Property::gather(
+                $baseNamespace,
+                $className,
+                (string) $propertyName,
+                in_array(
+                    (string) $propertyName,
+                    $schema->required ?? [],
+                    false,
+                ),
+                $property,
+                $schemaRegistry,
+                $contractRegistry,
+                $compositSchemaRegistry,
+            );
+            $properties[]     = $gatheredProperty;
+
+            $example[$gatheredProperty->sourceName] = $gatheredProperty->example->raw;
+
+            foreach (['examples', 'example'] as $examplePropertyName) {
+                if (array_key_exists($gatheredProperty->sourceName, $example)) {
+                    break;
+                }
+
+                if (! property_exists($schema, $examplePropertyName) || ! is_array($schema->$examplePropertyName) || ! array_key_exists($gatheredProperty->sourceName, $schema->$examplePropertyName)) {
+                    continue;
+                }
+
+                $example[$gatheredProperty->sourceName] = $schema->$examplePropertyName[$gatheredProperty->sourceName];
+            }
+
+            foreach ($property->enum ?? [] as $value) {
+                $example[$gatheredProperty->sourceName] = $value;
+                break;
+            }
+
+            if ($example[$gatheredProperty->sourceName] !== null || $schema->required) {
+                continue;
+            }
+
+            unset($example[$gatheredProperty->sourceName]);
+        }
+
+        return new Schema(
+            ClassString::factory($baseNamespace, 'Schema\\' . $className),
+            ClassString::factory($baseNamespace, 'Contract\\' . $className),
+            ClassString::factory($baseNamespace, 'Error\\' . $className),
+            ClassString::factory($baseNamespace, 'ErrorSchemas\\' . $className),
+            $schema->title ?? '',
+            $schema->description ?? '',
+            $example,
+            $properties,
+            $schema,
+            $isArray,
+            ($schema->type === null ? ['object'] : (is_array($schema->type) ? $schema->type : [$schema->type])),
+        );
+    }
+}
@@ -14,18 +14,24 @@
 use ReverseRegex\Lexer;
 use ReverseRegex\Parser;
 
+use function explode;
 use function gettype;
 use function is_array;
 use function is_string;
 use function Safe\date;
 use function Safe\json_encode;
 use function strlen;
+use function strpos;
 
 final class ExampleData
 {
     public static function gather(mixed $exampleData, PropertyType $type, string $propertyName): Representation\ExampleData
     {
-        if ($type->type === 'array') {
+        if ($exampleData instanceof Representation\ExampleData) {
+            return $exampleData;
+        }
+
+        if ($type->type === 'array' || $type->type === 'union') {
             if ($type->payload instanceof Schema) {
                 $exampleData = ArrayMerger::doMerge(
                     $type->payload->example,
@@ -90,6 +96,12 @@ public static function determiteType(mixed $exampleData): Representation\Example
     /** @phpstan-ignore-next-line */
     public static function scalarData(int $seed, string $type, string|null $format, string|null $pattern = null): Representation\ExampleData
     {
+        if (strpos($type, '|') !== false) {
+            [$firstType] = explode('|', $type);
+
+            return self::scalarData($seed, $firstType, $format, $pattern);
+        }
+
         if ($type === 'int' || $type === '?int') {
             return new Representation\ExampleData($seed, new Node\Scalar\LNumber($seed));
         }
@@ -149,6 +161,23 @@ public static function scalarData(int $seed, string $type, string|null $format,
             return new Representation\ExampleData('generated', new Node\Scalar\String_('generated'));
         }
 
+        if ($type === 'array' || $type === '?array') {
+            $string = self::scalarData($seed, 'string', $format, $pattern);
+
+            return new Representation\ExampleData(
+                [
+                    $string->raw,
+                ],
+                new Node\Expr\Array_(
+                    [
+                        new Node\Expr\ArrayItem(
+                            $string->node,
+                        ),
+                    ],
+                ),
+            );
+        }
+
         return new Representation\ExampleData(
             null,
             new Node\Expr\ConstFetch(

@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApiClients\Tools\OpenApiClientGenerator\Gatherer;
+
+use ApiClients\Tools\OpenApiClientGenerator\ClassString;
+use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\CompositSchema as CompositSchemaRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Representation\Contract;
+use ApiClients\Tools\OpenApiClientGenerator\Representation\Schema;
+use ApiClients\Tools\OpenApiClientGenerator\Utils;
+use cebe\openapi\spec\Schema as baseSchema;
+
+use function array_key_exists;
+use function in_array;
+use function is_array;
+use function property_exists;
+
+final class IntersectionSchema
+{
+    public static function gather(
+        Namespace_ $baseNamespace,
+        string $className,
+        baseSchema $baseProperty,
+        SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
+        CompositSchemaRegistry $compositSchemaRegistry,
+    ): Schema {
+        $className  = Utils::className($className);
+        $contracts  = [];
+        $properties = [];
+        $example    = [];
+
+        foreach ($baseProperty->allOf as $schema) {
+            $gatheredProperties = [];
+            foreach ($schema->properties as $propertyName => $property) {
+                $gatheredProperty = $gatheredProperties[(string) $propertyName]                            = Property::gather(
+                    $baseNamespace,
+                    $className,
+                    (string) $propertyName,
+                    in_array(
+                        (string) $propertyName,
+                        $schema->required ?? [],
+                        false,
+                    ),
+                    $property,
+                    $schemaRegistry,
+                    $contractRegistry,
+                    $compositSchemaRegistry,
+                );
+
+                $example[$gatheredProperty->sourceName] = $gatheredProperty->example->raw;
+
+                foreach (['examples', 'example'] as $examplePropertyName) {
+                    if (array_key_exists($gatheredProperty->sourceName, $example)) {
+                        break;
+                    }
+
+                    if (! property_exists($schema, $examplePropertyName) || ! is_array($schema->$examplePropertyName) || ! array_key_exists($gatheredProperty->sourceName, $schema->$examplePropertyName)) {
+                        continue;
+                    }
+
+                    $example[$gatheredProperty->sourceName] = $schema->$examplePropertyName[$gatheredProperty->sourceName];
+                }
+
+                foreach ($property->enum ?? [] as $value) {
+                    $example[$gatheredProperty->sourceName] = $value;
+                    break;
+                }
+
+                if ($example[$gatheredProperty->sourceName] !== null || $property->required || $baseProperty->required) {
+                    continue;
+                }
+
+                unset($example[$gatheredProperty->sourceName]);
+            }
+
+            $contracts[] = new Contract(
+                ClassString::factory(
+                    $baseNamespace,
+                    $contractRegistry->get($schema, 'Contract\\' . $className . '\\' . $schema->title),
+                ),
+                $gatheredProperties,
+            );
+
+            $properties = [...$properties, ...$gatheredProperties];
+        }
+
+        return new Schema(
+            ClassString::factory($baseNamespace, 'Schema\\' . $className),
+            $contracts,
+            ClassString::factory($baseNamespace, 'Error\\' . $className),
+            ClassString::factory($baseNamespace, 'ErrorSchemas\\' . $className),
+            $baseProperty->title ?? '',
+            $baseProperty->description ?? '',
+            $example,
+            $properties,
+            $baseProperty,
+            false,
+            ($baseProperty->type === null ? ['object'] : (is_array($baseProperty->type) ? $baseProperty->type : [$baseProperty->type])),
+        );
+    }
+}
@@ -6,6 +6,8 @@
 
 use ApiClients\Tools\OpenApiClientGenerator\ClassString;
 use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\CompositSchema as CompositSchemaRegistry;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\ThrowableSchema;
 use ApiClients\Tools\OpenApiClientGenerator\Representation\Header;
@@ -45,11 +47,21 @@ public static function gather(
         openAPIOperation $operation,
         ThrowableSchema $throwableSchemaRegistry,
         SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
+        CompositSchemaRegistry $compositSchemaRegistry,
     ): \ApiClients\Tools\OpenApiClientGenerator\Representation\Operation {
         $returnType = [];
         $parameters = [];
         $empties    = [];
         foreach ($operation->parameters as $parameter) {
+            $types = is_array($parameter->schema->type) ? $parameter->schema->type : [$parameter->schema->type];
+            if (count($parameter->schema->oneOf ?? []) > 0) {
+                $types = [];
+                foreach ($parameter->schema->oneOf as $oneOfSchema) {
+                    $types[] = $oneOfSchema->type;
+                }
+            }
+
             $parameterType = str_replace([
                 'integer',
                 'any',
@@ -58,7 +70,7 @@ public static function gather(
                 'int',
                 'string|object',
                 'bool',
-            ], implode('|', is_array($parameter->schema->type) ? $parameter->schema->type : [$parameter->schema->type]));
+            ], implode('|', $types));
 
             $parameters[] = new Parameter(
                 (new Convert($parameter->name))->toCamel(),
@@ -82,7 +94,7 @@ public static function gather(
                 );
                 $requestBody[]        = new OperationRequestBody(
                     $contentType,
-                    Schema::gather($baseNamespace, $requestBodyClassname, $requestBodyDetails->schema, $schemaRegistry),
+                    Schema::gather($baseNamespace, $requestBodyClassname, $requestBodyDetails->schema, $schemaRegistry, $contractRegistry, $compositSchemaRegistry),
                 );
             }
         }
@@ -115,6 +127,8 @@ public static function gather(
                         $contentTypeMediaType->schema,
                         true,
                         $schemaRegistry,
+                        $contractRegistry,
+                        $compositSchemaRegistry,
                     ),
                 );
                 if ($isError) {
@@ -139,6 +153,8 @@ public static function gather(
                     ),
                     $headerSpec->schema,
                     $schemaRegistry,
+                    $contractRegistry,
+                    $compositSchemaRegistry,
                 ), ExampleData::determiteType($headerSpec->example));
             }