Skip to content

Commit 35038bd

Browse files
MsNataliMsNatali
committed
Merge remote-tracking branch 'origin/master' into task-93471
# Conflicts: # src/Generators/BaseGenerator.php # tests/GenerateServerTest.php # tests/resources/schemas/resources.yaml
2 parents 900e0e5 + 9e52685 commit 35038bd

27 files changed

+955
-32
lines changed

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Controller class IS meant to be modified after generation.
6767

6868
Generates Laravel Form Requests for DELETE, PATCH, POST, PUT paths
6969
Destination must be configured with array as namespace instead of string.
70-
E.g
70+
E.g.
7171

7272
```php
7373
'requests' => [
@@ -82,6 +82,11 @@ If the file already exists it IS NOT overriden with each generation.
8282
Form Request class name is `ucFirst(operationId)`. You can override it with `x-lg-request-class-name`
8383
You can skip generating form request for a give route with `x-lg-skip-request-generation: true` directive.
8484

85+
When generating a request, the Laravel Validation rules for request fields are automatically generated.
86+
Validation rules generate based on the field type and required field.
87+
For fields whose values should only take the values of some enum, you must specify the `x-lg-enum-class option`.
88+
E.g.: `x-lg-enum-class: 'CustomerGenderEnum'`.
89+
8590
### 'enums' => EnumsGenerator::class
8691

8792
Generates Enum class only for enums listed in `oas3->components->schemas`.

‎composer.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
"autoload": {
1717
"psr-4": {
1818
"Ensi\\LaravelOpenApiServerGenerator\\": "src/"
19-
}
19+
},
20+
"files": [
21+
"src/helpers.php"
22+
]
2023
},
2124
"autoload-dev": {
2225
"psr-4": {

‎config/openapi-server-generator.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@
1212
* You can use as many yaml/json openapi entrypoints as you want.
1313
* Key = openapi entrypoint file with path.
1414
* Value = list of entities and their generator params.
15+
*
16+
* All values from 'params' will be available inside any template.
17+
* apiVersion = {{ apiVersion}} in template.
1518
*/
1619
'api_docs_mappings' => [
1720
public_path('api-docs/v1/index.yaml') => [
21+
'params' => [
22+
'apiVersion' => 1,
23+
],
1824
'controllers' => [],
1925
'enums' => [
2026
'namespace' => "App\\Http\\ApiV1\\OpenApiGenerated\\Enums\\",
@@ -29,7 +35,7 @@
2935
'namespace' => ["Controllers" => "Tests"],
3036
],
3137
'resources' => [
32-
'response_key' => 'data'
38+
'response_key' => 'data',
3339
],
3440
],
3541
],

‎src/Commands/GenerateServer.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use cebe\openapi\Reader;
66
use cebe\openapi\SpecObjectInterface;
7+
use Ensi\LaravelOpenApiServerGenerator\Exceptions\EnumsNamespaceMissingException;
78
use Illuminate\Console\Command;
89
use LogicException;
910

@@ -66,7 +67,14 @@ public function handleMapping(string $sourcePath, array $optionsPerEntity)
6667
}
6768

6869
$this->infoIfVerbose("Generating files for entity \"$entity\" using generator \"$generatorClass\"");
69-
resolve($generatorClass)->setOptions($optionsPerEntity[$entity])->generate($specObject);
70+
71+
try {
72+
resolve($generatorClass)->setOptions($optionsPerEntity)->generate($specObject);
73+
} catch (EnumsNamespaceMissingException) {
74+
$this->error("Option \"enums_namespace\" for entity \"$entity\" are not set in \"api_docs_mappings\" config for source \"$sourcePath\"");
75+
76+
return self::FAILURE;
77+
}
7078
}
7179

7280
return self::SUCCESS;

‎src/Data/OpenApi3/OpenApi3Object.php‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?php
2+
3+
namespace Ensi\LaravelOpenApiServerGenerator\Data\OpenApi3;
4+
5+
use Ensi\LaravelOpenApiServerGenerator\Enums\OpenApi3PropertyTypeEnum;
6+
use Ensi\LaravelOpenApiServerGenerator\Exceptions\EnumsNamespaceMissingException;
7+
use Illuminate\Support\Collection;
8+
use stdClass;
9+
10+
class OpenApi3Object
11+
{
12+
/** @var Collection|OpenApi3ObjectProperty[] */
13+
public Collection $properties;
14+
15+
public function __construct()
16+
{
17+
$this->properties = collect();
18+
}
19+
20+
public function fillFromStdObject(stdClass $object): void
21+
{
22+
if (std_object_has($object, 'properties')) {
23+
foreach (get_object_vars($object->properties) as $propertyName => $property) {
24+
/** @var OpenApi3ObjectProperty $objectProperty */
25+
$objectProperty = $this->properties->get($propertyName);
26+
if (!$objectProperty) {
27+
do_with_all_of($property, function (stdClass $p) use (&$objectProperty, $propertyName) {
28+
if (!$objectProperty && std_object_has($p, 'type')) {
29+
$objectProperty = new OpenApi3ObjectProperty(type: $p->type, name: $propertyName);
30+
}
31+
});
32+
if (!$objectProperty) {
33+
continue;
34+
}
35+
$this->properties->put($propertyName, $objectProperty);
36+
}
37+
do_with_all_of($property, function (stdClass $p) use ($objectProperty, $propertyName) {
38+
$objectProperty->fillFromStdProperty($propertyName, $p);
39+
});
40+
}
41+
}
42+
if (std_object_has($object, 'required') && is_array($object->required)) {
43+
foreach ($object->required as $requiredProperty) {
44+
$objectProperty = $this->properties->get($requiredProperty);
45+
if (!$objectProperty) {
46+
$objectProperty = new OpenApi3ObjectProperty(
47+
type: OpenApi3PropertyTypeEnum::OBJECT->value,
48+
name: $requiredProperty,
49+
);
50+
$this->properties->put($requiredProperty, $objectProperty);
51+
}
52+
53+
$objectProperty->required = true;
54+
}
55+
}
56+
}
57+
58+
public function toLaravelValidationRules(array $options): array
59+
{
60+
$validations = [];
61+
$enums = [];
62+
foreach ($this->properties as $property) {
63+
[$propertyValidations, $propertyEnums] = $property->getLaravelValidationsAndEnums($options);
64+
65+
$validations = array_merge($propertyValidations, $validations);
66+
$enums = array_merge($propertyEnums, $enums);
67+
}
68+
69+
if ($validations) {
70+
$validationStrings = [];
71+
foreach ($validations as $propertyName => $validation) {
72+
$validationString = implode(', ', $validation);
73+
$validationStrings[] = "'{$propertyName}' => [{$validationString}],";
74+
}
75+
$validationsString = implode("\n ", $validationStrings);
76+
} else {
77+
$validationsString = '';
78+
}
79+
80+
if ($enums) {
81+
throw_unless(isset($options['enums']['namespace']), EnumsNamespaceMissingException::class);
82+
83+
$enumStrings = [];
84+
foreach ($enums as $enumClass => $value) {
85+
$enumStrings[] = 'use ' . $options['enums']['namespace'] . "{$enumClass};";
86+
}
87+
if ($enumStrings) {
88+
$enumStrings[] = 'use Illuminate\Validation\Rules\Enum;';
89+
}
90+
sort($enumStrings);
91+
$enumsString = implode("\n", $enumStrings);
92+
} else {
93+
$enumsString = '';
94+
}
95+
96+
return [$validationsString, $enumsString];
97+
}
98+
}

‎src/Data/OpenApi3/OpenApi3ObjectProperty.php‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?php
2+
3+
namespace Ensi\LaravelOpenApiServerGenerator\Data\OpenApi3;
4+
5+
use Ensi\LaravelOpenApiServerGenerator\Enums\LaravelValidationRuleEnum;
6+
use Ensi\LaravelOpenApiServerGenerator\Enums\OpenApi3PropertyFormatEnum;
7+
use Ensi\LaravelOpenApiServerGenerator\Enums\OpenApi3PropertyTypeEnum;
8+
use stdClass;
9+
10+
class OpenApi3ObjectProperty
11+
{
12+
public function __construct(
13+
public string $type,
14+
public ?string $name = null,
15+
public ?string $format = null,
16+
public bool $required = false,
17+
public bool $nullable = false,
18+
public ?string $enumClass = null,
19+
public ?OpenApi3Object $object = null,
20+
public ?OpenApi3ObjectProperty $items = null,
21+
) {
22+
//
23+
}
24+
25+
public function fillFromStdProperty(string $propertyName, stdClass $stdProperty): void
26+
{
27+
if (std_object_has($stdProperty, 'nullable')) {
28+
$this->nullable = true;
29+
}
30+
if (std_object_has($stdProperty, 'format')) {
31+
$this->format = $stdProperty->format;
32+
}
33+
if (std_object_has($stdProperty, 'x-lg-enum-class')) {
34+
$this->enumClass = $stdProperty->{'x-lg-enum-class'};
35+
}
36+
37+
if (std_object_has($stdProperty, 'type')) {
38+
switch (OpenApi3PropertyTypeEnum::from($stdProperty->type)) {
39+
case OpenApi3PropertyTypeEnum::OBJECT:
40+
$this->object = new OpenApi3Object();
41+
$this->object->fillFromStdObject($stdProperty);
42+
43+
break;
44+
case OpenApi3PropertyTypeEnum::ARRAY:
45+
if (std_object_has($stdProperty, 'items')) {
46+
do_with_all_of($stdProperty->items, function (stdClass $p) use ($propertyName) {
47+
if (!$this->items && std_object_has($p, 'type')) {
48+
$this->items = new OpenApi3ObjectProperty(type: $p->type);
49+
}
50+
$this->items?->fillFromStdProperty("{$propertyName}.*", $p);
51+
});
52+
}
53+
54+
break;
55+
default:
56+
}
57+
}
58+
}
59+
60+
public function getLaravelValidationsAndEnums(array $options, array &$validations = [], array &$enums = [], string $namePrefix = null): array
61+
{
62+
$name = "{$namePrefix}{$this->name}";
63+
64+
if ($this->required) {
65+
$validations[$name][] = "'required'";
66+
}
67+
if ($this->nullable) {
68+
$validations[$name][] = "'nullable'";
69+
}
70+
if ($this->enumClass) {
71+
$validations[$name][] = "new Enum({$this->enumClass}::class)";
72+
$enums[$this->enumClass] = true;
73+
} else {
74+
[$currentValidations, $currentEnums] = $this->getValidationsAndEnumsByTypeAndFormat($options, $validations, $enums, $name);
75+
$validations = array_merge($validations, $currentValidations);
76+
$enums = array_merge($enums, $currentEnums);
77+
}
78+
79+
return [$validations, $enums];
80+
}
81+
82+
protected function getValidationsAndEnumsByTypeAndFormat(array $options, array &$validations, array &$enums, string $name): array
83+
{
84+
$type = OpenApi3PropertyTypeEnum::from($this->type);
85+
$format = OpenApi3PropertyFormatEnum::tryFrom($this->format);
86+
switch ($type) {
87+
case OpenApi3PropertyTypeEnum::INTEGER:
88+
case OpenApi3PropertyTypeEnum::BOOLEAN:
89+
case OpenApi3PropertyTypeEnum::NUMBER:
90+
$validations[$name][] = "'{$type->toLaravelValidationRule()->value}'";
91+
92+
break;
93+
case OpenApi3PropertyTypeEnum::STRING:
94+
switch ($format) {
95+
case OpenApi3PropertyFormatEnum::DATE:
96+
case OpenApi3PropertyFormatEnum::DATE_TIME:
97+
case OpenApi3PropertyFormatEnum::PASSWORD:
98+
case OpenApi3PropertyFormatEnum::EMAIL:
99+
case OpenApi3PropertyFormatEnum::IPV4:
100+
case OpenApi3PropertyFormatEnum::IPV6:
101+
case OpenApi3PropertyFormatEnum::TIMEZONE:
102+
case OpenApi3PropertyFormatEnum::PHONE:
103+
case OpenApi3PropertyFormatEnum::URL:
104+
case OpenApi3PropertyFormatEnum::UUID:
105+
$validations[$name][] = "'{$format->toLaravelValidationRule()->value}'";
106+
107+
break;
108+
case OpenApi3PropertyFormatEnum::BINARY:
109+
$validations[$name][] = "'". LaravelValidationRuleEnum::FILE->value . "'";
110+
111+
break;
112+
default:
113+
$validations[$name][] = "'{$type->toLaravelValidationRule()->value}'";
114+
115+
break;
116+
}
117+
118+
break;
119+
case OpenApi3PropertyTypeEnum::OBJECT:
120+
foreach ($this->object->properties ?? [] as $property) {
121+
[$currentValidations, $currentEnums] = $property->getLaravelValidationsAndEnums($options, $validations, $enums, "{$name}.");
122+
$validations = array_merge($validations, $currentValidations);
123+
$enums = array_merge($enums, $currentEnums);
124+
}
125+
126+
break;
127+
case OpenApi3PropertyTypeEnum::ARRAY:
128+
$validations[$name][] = "'{$type->toLaravelValidationRule()->value}'";
129+
[$currentValidations, $currentEnums] = $this->items->getLaravelValidationsAndEnums($options, $validations, $enums, "{$name}.*");
130+
$validations = array_merge($validations, $currentValidations);
131+
$enums = array_merge($enums, $currentEnums);
132+
}
133+
134+
return [$validations, $enums];
135+
}
136+
}

‎src/Data/OpenApi3/OpenApi3Schema.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
namespace Ensi\LaravelOpenApiServerGenerator\Data\OpenApi3;
4+
5+
use Ensi\LaravelOpenApiServerGenerator\Enums\OpenApi3ContentTypeEnum;
6+
use stdClass;
7+
8+
class OpenApi3Schema
9+
{
10+
public OpenApi3ContentTypeEnum $contentType;
11+
public OpenApi3Object $object;
12+
13+
public function __construct()
14+
{
15+
$this->object = new OpenApi3Object();
16+
}
17+
18+
public function fillFromStdRequestBody(OpenApi3ContentTypeEnum $contentType, stdClass $requestBody): void
19+
{
20+
switch ($contentType) {
21+
case OpenApi3ContentTypeEnum::APPLICATION_JSON:
22+
$schema = $requestBody->content->{OpenApi3ContentTypeEnum::APPLICATION_JSON->value}->schema;
23+
do_with_all_of($schema, function (stdClass $p) {
24+
$this->object->fillFromStdObject($p);
25+
});
26+
27+
break;
28+
case OpenApi3ContentTypeEnum::MULTIPART_FROM_DATA:
29+
$this->object->fillFromStdObject(
30+
$requestBody->content
31+
->{OpenApi3ContentTypeEnum::MULTIPART_FROM_DATA->value}
32+
->schema
33+
);
34+
35+
break;
36+
}
37+
}
38+
}

‎src/Enums/LaravelValidationRuleEnum.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
namespace Ensi\LaravelOpenApiServerGenerator\Enums;
4+
5+
enum LaravelValidationRuleEnum: string
6+
{
7+
// types
8+
case INTEGER = 'integer';
9+
case STRING = 'string';
10+
case BOOLEAN = 'boolean';
11+
case NUMERIC = 'numeric';
12+
case ARRAY = 'array';
13+
case FILE = 'file';
14+
15+
// formats
16+
case DATE = 'date';
17+
case DATE_TIME = 'date_format:Y-m-d\TH:i:s.u\Z';
18+
case PASSWORD = 'password';
19+
case EMAIL = 'email';
20+
case IPV4 = 'ipv4';
21+
case IPV6 = 'ipv6';
22+
case TIMEZONE = 'timezone';
23+
case PHONE = 'regex:/^\+7\d{10}$/';
24+
case URL = 'url';
25+
case UUID = 'uuid';
26+
}

‎src/Enums/OpenApi3ContentTypeEnum.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
namespace Ensi\LaravelOpenApiServerGenerator\Enums;
4+
5+
enum OpenApi3ContentTypeEnum: string
6+
{
7+
case APPLICATION_JSON = 'application/json';
8+
case MULTIPART_FROM_DATA = 'multipart/form-data';
9+
}

0 commit comments

Comments
 (0)