Control JSDoc type names (#37)

Author: vearutop

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.30] - 2021-04-08
+
+### Added
+- Support for const/enum in JSDoc.
+- Control to prefix JSDoc types.
+
 ## [0.2.29] - 2021-04-07
 
 ### Added
@@ -68,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Description trimming bug.
 
+[0.2.30]: https://github.com/swaggest/php-code-builder/compare/v0.2.29...v0.2.30
 [0.2.29]: https://github.com/swaggest/php-code-builder/compare/v0.2.28...v0.2.29
 [0.2.28]: https://github.com/swaggest/php-code-builder/compare/v0.2.27...v0.2.28
 [0.2.27]: https://github.com/swaggest/php-code-builder/compare/v0.2.26...v0.2.27

src/JSDoc/TypeBuilder.php

@@ -15,6 +15,8 @@ class TypeBuilder
         '#/definitions'
     ];
 
+    public $addNamePrefix = '';
+
     public $file = '';
 
     public function __construct()
@@ -38,37 +40,66 @@ public function getTypeString($schema, $path = '')
         $isString = false;
         $isNumber = false;
 
+        if ($schema->const !== null) {
+            return '(' . var_export($schema->const, true) . ')';
+        }
+
+        if (!empty($schema->enum)) {
+            $res = '';
+            foreach ($schema->enum as $value) {
+                $res .= var_export($value, true) . '|';
+            }
+            return '(' . substr($res, 0, -1) . ')';
+        }
+
+        if (!empty($schema->getFromRefs())) {
+            $refs = $schema->getFromRefs();
+            $path = $refs[0];
+        }
+
         $type = $schema->type;
+        if ($type === null) {
+            $type = [];
+
+            if (!empty($schema->properties) || !empty($schema->additionalProperties) || !empty($schema->patternProperties)) {
+                $type[] = Schema::OBJECT;
+            }
+
+            if (!empty($schema->items) || !empty($schema->additionalItems)) {
+                $type[] = Schema::_ARRAY;
+            }
+        }
+
         if (!is_array($type)) {
             $type = [$type];
         }
 
         $or = [];
 
         if ($schema->oneOf !== null) {
-            foreach ($schema->oneOf as $item) {
-                $or[] = $this->getTypeString($item);
+            foreach ($schema->oneOf as $i => $item) {
+                $or[] = $this->getTypeString($item, $path . '/oneOf/' . $i);
             }
         }
 
         if ($schema->anyOf !== null) {
-            foreach ($schema->anyOf as $item) {
-                $or[] = $this->getTypeString($item);
+            foreach ($schema->anyOf as $i => $item) {
+                $or[] = $this->getTypeString($item, $path . '/anyOf/' . $i);
             }
         }
 
         if ($schema->allOf !== null) {
-            foreach ($schema->allOf as $item) {
-                $or[] = $this->getTypeString($item);
+            foreach ($schema->allOf as $i => $item) {
+                $or[] = $this->getTypeString($item, $path . '/allOf/' . $i);
             }
         }
 
         if ($schema->then !== null) {
-            $or[] = $this->getTypeString($schema->then);
+            $or[] = $this->getTypeString($schema->then, $path . '/then');
         }
 
         if ($schema->else !== null) {
-            $or[] = $this->getTypeString($schema->else);
+            $or[] = $this->getTypeString($schema->else, $path . '/else');
         }
 
         foreach ($type as $i => $t) {
@@ -201,7 +232,7 @@ private function typeName(Schema $schema, $path)
             }
         }
 
-        return PhpCode::makePhpName($path, false);
+        return PhpCode::makePhpName($this->addNamePrefix . '_' . $path, false);
     }
 
     private function makeObjectTypeDef(Schema $schema, $path)