Fix name collision with empty const/enum (#39)

Author: vearutop

.github/workflows/cloc.yml

@@ -0,0 +1,35 @@
+name: cloc
+on:
+  pull_request:
+jobs:
+  cloc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          path: pr
+      - name: Checkout base code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.base.sha }}
+          path: base
+      - name: Count Lines Of Code
+        id: loc
+        run: |
+          curl -OL https://github.com/vearutop/sccdiff/releases/download/v1.0.1/linux_amd64.tar.gz && tar xf linux_amd64.tar.gz
+          OUTPUT=$(cd pr && ../sccdiff -basedir ../base)
+          OUTPUT="${OUTPUT//'%'/'%25'}"
+          OUTPUT="${OUTPUT//$'\n'/'%0A'}"
+          OUTPUT="${OUTPUT//$'\r'/'%0D'}"
+          echo "::set-output name=diff::$OUTPUT"
+
+      - name: Comment Code Lines
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          header: LOC
+          message: |
+            ### Lines Of Code
+
+            ${{ steps.loc.outputs.diff }}

.github/workflows/lint.yml

@@ -0,0 +1,37 @@
+name: lint
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest' ]
+        php-versions: [ '7.4' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v2
+        with:
+          path: |
+            vendor
+          key: vendor-${{ hashFiles('composer.lock') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          ini-values: post_max_size=256M, max_execution_time=180
+          tools: composer
+
+      - name: Populate vendor
+        run: '[ -e vendor ] || composer install'
+
+      - name: Lint
+        run: make lint

.github/workflows/test-unit-cov.yml

@@ -0,0 +1,38 @@
+name: test-unit-cov
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest' ]
+        php-versions: [ '7.4' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v2
+        with:
+          path: |
+            vendor
+          key: vendor-${{ hashFiles('composer.lock') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          ini-values: post_max_size=256M, max_execution_time=180
+          coverage: xdebug
+          tools: composer
+
+      - name: Populate vendor
+        run: '[ -e vendor ] || composer install'
+
+      - name: Run Tests With Coverage
+        run: make test-coverage && bash <(curl -s https://codecov.io/bash)

.github/workflows/test-unit.yml

@@ -0,0 +1,37 @@
+name: test-unit
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest' ]
+        php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '8.0' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v2
+        with:
+          path: |
+            vendor
+          key: vendor-${{ hashFiles('composer.lock') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          ini-values: post_max_size=256M, max_execution_time=180
+          tools: composer
+
+      - name: Populate vendor
+        run: '[ -e vendor ] || composer install'
+
+      - name: Run Tests
+        run: make test

.travis.yml

@@ -4,6 +4,11 @@ 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.45] - 2021-07-16
+
+### Fixed
+- Enum and const collision with type name.
+
 ## [0.4.44] - 2021-04-20
 
 ### Fixed
@@ -262,6 +267,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Removed unnecessary regexp dependency, #7.
 
+[0.4.45]: https://github.com/swaggest/go-code-builder/compare/v0.4.44...v0.4.45
 [0.4.44]: https://github.com/swaggest/go-code-builder/compare/v0.4.43...v0.4.44
 [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

CHANGELOG.md

@@ -559,8 +559,17 @@ private function processConst()
 GO
             );
 
+            $constName = $this->goBuilder->codeBuilder->exportableName($typeName . '_' . $this->schema->const);
+            if ($constName === $typeName) {
+                $constName .= 'Empty';
+            }
+
+            if (isset($this->goBuilder->options->renames[$constName])) {
+                $constName = $this->goBuilder->options->renames[$constName];
+            }
+
             $typeConstBlock->addValue(
-                $this->goBuilder->codeBuilder->exportableName($typeName . '_' . $this->schema->const),
+                $constName,
                 $this->schema->const
             );
 
@@ -675,6 +684,11 @@ private function processEnum(NamedType $baseType)
 
             foreach ($enum as $index => $item) {
                 $itemName = $this->goBuilder->codeBuilder->exportableName($typeName . '_' . $item);
+
+                if ($itemName === $typeName) {
+                    $itemName .= 'Empty';
+                }
+
                 $comment = null;
                 if (isset($enumSchemas[$index])) {
                     $schema = $enumSchemas[$index];

src/JsonSchema/TypeBuilder.php

@@ -346,7 +346,8 @@ public function testEscape()
     "title": "Escape Issue",
     "enum": [
         "Doesn't Generate Correctly",
-        "Does Generate"
+        "Does Generate",
+        ""
     ]
 }
 JSON;
@@ -366,13 +367,15 @@ public function testEscape()
 const (
 	EscapeIssueDoesnTGenerateCorrectly = EscapeIssue("Doesn't Generate Correctly")
 	EscapeIssueDoesGenerate = EscapeIssue("Does Generate")
+	EscapeIssueEmpty = EscapeIssue("")
 )
 
 // MarshalJSON encodes JSON.
 func (i EscapeIssue) MarshalJSON() ([]byte, error) {
 	switch i {
 	case EscapeIssueDoesnTGenerateCorrectly:
 	case EscapeIssueDoesGenerate:
+	case EscapeIssueEmpty:
 
 	default:
 		return nil, fmt.Errorf("unexpected EscapeIssue value: %v", i)
@@ -395,6 +398,7 @@ public function testEscape()
 	switch v {
 	case EscapeIssueDoesnTGenerateCorrectly:
 	case EscapeIssueDoesGenerate:
+	case EscapeIssueEmpty:
 
 	default:
 		return fmt.Errorf("unexpected EscapeIssue value: %v", v)