Fix invalid escaping of single quot, fix type naming with schema title (#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.4.43] - 2021-04-20
+
+### Fixed
+- Invalid escaping of single quot.
+- Type naming with schema title.
+
 ## [0.4.42] - 2020-12-12
 
 ### Fixed
@@ -251,6 +257,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Removed unnecessary regexp dependency, #7.
 
+[0.4.43]: https://github.com/swaggest/go-code-builder/compare/v0.4.42...v0.4.43
 [0.4.42]: https://github.com/swaggest/go-code-builder/compare/v0.4.41...v0.4.42
 [0.4.41]: https://github.com/swaggest/go-code-builder/compare/v0.4.40...v0.4.41
 [0.4.40]: https://github.com/swaggest/go-code-builder/compare/v0.4.39...v0.4.40

src/JsonSchema/GoBuilder.php

@@ -51,6 +51,12 @@ class GoBuilder
     /** @var Type[] */
     public $pathTypesDefined = [];
 
+    /** @var string[] */
+    public $pathByTypeName = [];
+
+    /** @var string[] */
+    private $typeNameByPath = [];
+
     public function __construct()
     {
         $this->code = new Code();
@@ -160,22 +166,12 @@ private function makeStruct(Schema $schema, $path)
         $this->generatedStructsBySchema->attach($schema, $generatedStruct);
         $generatedStruct->schema = $schema;
 
-        $structName = '';
-        if ($schema->title) {
-            $structName = $this->codeBuilder->exportableName($schema->title);
-        }
-
-        if (empty($structName)) {
-            if ($path === '#') {
-                $structName = 'Untitled' . ++$this->untitledIndex;
-            } else {
-                $structName = $this->codeBuilder->exportableName($this->pathToName($path));
-            }
+        $pathToName = $this->pathToName($path);
+        if ($path === '#' && empty($schema->title)) {
+            $pathToName = 'Untitled' . ++$this->untitledIndex;
         }
 
-        if (isset($this->options->renames[$structName])) {
-            $structName = $this->options->renames[$structName];
-        }
+        $structName = $this->typeName($schema, $pathToName);
 
         if (isset($this->namesGenerated[$structName]) && $schema->getMeta(TypeBuilder::CONDITIONAL_META)) {
             $structName = $structName . 'Conditional';
@@ -433,4 +429,46 @@ public function isNullable(Schema $schema)
 
         return false;
     }
+
+    /**
+     * @param Schema $schema
+     * @param string $path
+     * @param StructDef|null $parentStruct
+     */
+    public function typeName($schema, $path, $parentStruct = null)
+    {
+        if (isset($this->typeNameByPath[$path])) {
+            return $this->typeNameByPath[$path];
+        }
+
+        if (!empty($schema->title)) {
+            $typeName = $this->codeBuilder->exportableName($schema->title, true);
+        }
+
+        if (empty($typeName) || (isset($this->pathByTypeName[$typeName]) && $this->pathByTypeName[$typeName] !== $path)) {
+            $typeName = $this->codeBuilder->exportableName($path);
+        }
+
+        if ($parentStruct && false !== $pos = strrpos($path, '->')) {
+            $propertyName = substr($path, $pos);
+            $typeName = $this->codeBuilder->exportableName($parentStruct->getName() . $propertyName);
+        }
+
+        if (isset($this->options->renames[$typeName])) {
+            $typeName = $this->options->renames[$typeName];
+        }
+
+        $tn = $typeName;
+        $i = 2;
+
+        while (isset($this->pathByTypeName[$typeName]) && $this->pathByTypeName[$typeName] !== $path) {
+            $typeName = $tn . 'Type' . $i;
+            $i++;
+        }
+
+        $this->pathByTypeName[$typeName] = $path;
+        $this->typeNameByPath[$path] = $typeName;
+
+        return $typeName;
+    }
 }

src/JsonSchema/TypeBuilder.php

@@ -525,7 +525,7 @@ private function processConst()
     {
         if ($this->schema->const !== null) { // todo properly process null const
             $path = $this->goBuilder->pathToName($this->path);
-            $typeName = $this->goBuilder->codeBuilder->exportableName($path);
+            $typeName = $this->goBuilder->typeName($this->schema, $path, $this->parentStruct);
             if ($this->parentStruct && false !== $pos = strrpos($path, '->')) {
                 $propertyName = substr($path, $pos);
                 $typeName = $this->goBuilder->codeBuilder->exportableName($this->parentStruct->getName() . $propertyName);
@@ -659,16 +659,7 @@ private function processEnum(NamedType $baseType)
             }
             $path = $this->goBuilder->pathToName($this->path);
 
-            $typeName = $this->goBuilder->codeBuilder->exportableName($path);
-            if ($this->parentStruct && false !== $pos = strrpos($path, '->')) {
-                $propertyName = substr($path, $pos);
-                $typeName = $this->goBuilder->codeBuilder->exportableName($this->parentStruct->getName() . $propertyName);
-            }
-
-            if (isset($this->goBuilder->options->renames[$typeName])) {
-                $typeName = $this->goBuilder->options->renames[$typeName];
-            }
-
+            $typeName = $this->goBuilder->typeName($this->schema, $path, $this->parentStruct);
             $type = new GoType($typeName);
             $this->goBuilder->pathTypesDefined[$this->path] = $type;
 
@@ -682,7 +673,6 @@ private function processEnum(NamedType $baseType)
 GO
             );
 
-
             foreach ($enum as $index => $item) {
                 $itemName = $this->goBuilder->codeBuilder->exportableName($typeName . '_' . $item);
                 $comment = null;

src/Templates/GoTemplate.php

@@ -88,9 +88,9 @@ public function escapeValue($value)
     {
         if (is_string($value)) {
             if (strpos($value, '"') === false && strpos($value, '\\') === false) {
-                $value = '"' . addslashes($value) . '"';
+                $value = '"' . str_replace(["\n", "\t", "\r", '"'], ['\n', '\t', '\r', '\"'], $value) . '"';
             } elseif (strpos($value, '`')) {
-                $value = '"' . addslashes($value) . '"';
+                $value = '"' . str_replace(["\n", "\t", "\r", '"'], ['\n', '\t', '\r', '\"'], $value) . '"';
             } else {
                 $value = '`' . $value . '`';
             }