Check for unique type schemas in Markdown rendering (#52)

Author: vearutop

composer.json

@@ -15,7 +15,7 @@
   "require": {
     "ext-json": "*",
     "swaggest/json-schema": "^0.12.33",
-    "swaggest/code-builder": "^0.3.4",
+    "swaggest/code-builder": "^0.3.8",
     "php": ">=5.6.0"
   },
   "require-dev": {

composer.lock

@@ -2,7 +2,6 @@
 
 namespace Swaggest\PhpCodeBuilder\Markdown;
 
-use Swaggest\CodeBuilder\CodeBuilder;
 use Swaggest\CodeBuilder\TableRenderer;
 use Swaggest\JsonSchema\Schema;
 use Swaggest\PhpCodeBuilder\PhpCode;
@@ -27,6 +26,8 @@ class TypeBuilder
      */
     public $types = [];
 
+    public $uniqueTypeSchemas = [];
+
     public $file = '';
 
     public function __construct()
@@ -315,14 +316,10 @@ private function hasConstraints($schema)
         return false;
     }
 
-    private function makeTypeDef(Schema $schema, $path)
+    public function renderTypeDef(Schema $schema, $typeName, $path)
     {
-        $tn = $this->typeName($schema, $path, true);
-        $typeName = $this->typeName($schema, $path);
-        $this->processed->attach($schema, $typeName);
-
         $head = '';
-        if (!empty($schema->title) && $schema->title != $tn) {
+        if (!empty($schema->title) && $schema->title != $typeName) {
             $head .= $schema->title . "\n";
         }
 
@@ -353,12 +350,12 @@ private function makeTypeDef(Schema $schema, $path)
             }
         }
 
-        $tnl = strtolower($tn);
+        $tnl = strtolower($typeName);
 
         $res = <<<MD
 
 
-### <a id="$tnl"></a>$tn
+### <a id="$tnl"></a>$typeName
 $head
 
 MD;
@@ -384,6 +381,7 @@ private function makeTypeDef(Schema $schema, $path)
             ->setColDelimiter('|')
             ->setHeadRowDelimiter('-')
             ->setOutlineVertical(true)
+            ->multilineCellDelimiter('<br>')
             ->setShowHeader();
 
         $res .= "\n\n";
@@ -419,6 +417,7 @@ private function makeTypeDef(Schema $schema, $path)
                 ->setColDelimiter('|')
                 ->setHeadRowDelimiter('-')
                 ->setOutlineVertical(true)
+                ->multilineCellDelimiter('<br>')
                 ->setShowHeader();
 
         }
@@ -427,7 +426,23 @@ private function makeTypeDef(Schema $schema, $path)
 
 MD;
 
+        return $res;
+    }
+
+    private function makeTypeDef(Schema $schema, $path)
+    {
+        $tn = $this->typeName($schema, $path, true);
+        $typeName = $this->typeName($schema, $path);
+        $this->processed->attach($schema, $typeName);
+
+        $res = $this->renderTypeDef($schema, $tn, $path);
+
+        if (isset($this->uniqueTypeSchemas[$res])) {
+            return $this->uniqueTypeSchemas[$res];
+        }
+
         $this->types[$typeName] = $res;
+        $this->uniqueTypeSchemas[$res] = $typeName;
         $this->file .= $res;
 
         return $typeName;