Merge pull request #74 from raptorxcz/bugfix/name_space

Fix stuct stubs name space collisions
raptorxcz · Oct 18, 2024 · 99d383d · 99d383d
2 parents 78ad731 + 0bf927f
commit 99d383d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Sources/Rubicon/Generator/StructStubGenerator.swift b/Sources/Rubicon/Generator/StructStubGenerator.swift
@@ -36,7 +36,7 @@ final class StructStubGeneratorImpl: StructStubGenerator {
             isThrowing: false,
             isAsync: false,
             isStatic: true,
-            returnType: TypeDeclaration(name: structType.name, prefix: [], composedType: .plain)
+            returnType: TypeDeclaration(name: "Self", prefix: [], composedType: .plain)
         )
         return functionGenerator.makeCode(
             from: functionDeclaration,
@@ -49,11 +49,11 @@ final class StructStubGeneratorImpl: StructStubGenerator {
         let variables = structType.variables.enumerated().map{ makeAssigment(of: $1, isLast: $0 == structType.variables.endIndex - 1) }
 
         guard !variables.isEmpty else {
-            return ["return \(structType.name)()"]
+            return ["return .init()"]
         }
 
         return [
-            "return \(structType.name)("
+            "return .init("
         ] + variables.map(indentationGenerator.indenting) + [
             ")"
         ]

diff --git a/Tests/RubiconTests/Generator/StructStubGeneratorTests.swift b/Tests/RubiconTests/Generator/StructStubGeneratorTests.swift
@@ -36,9 +36,9 @@ final class StructStubGeneratorTests: XCTestCase {
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.isAsync, false)
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.isStatic, true)
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.arguments.count, 0)
-        XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.returnType, .makeStub(name: "StructName"))
+        XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.returnType, .makeStub(name: "Self"))
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.content, [
-            "return StructName()"
+            "return .init()"
         ])
     }
 
@@ -56,7 +56,7 @@ final class StructStubGeneratorTests: XCTestCase {
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.arguments.first?.type, .makeStub())
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.declaration.arguments.first?.defaultValue, "default")
         XCTAssertEqual(functionGeneratorSpy.makeCode.first?.content, [
-            "return StructName(",
+            "return .init(",
             "-identifier: identifier,",
             "-identifier: identifier",
             ")"

diff --git a/Tests/RubiconTests/Integration/StructStubIntegrationTests.swift b/Tests/RubiconTests/Integration/StructStubIntegrationTests.swift
@@ -26,8 +26,8 @@ final class StructStubIntegrationTests: XCTestCase {
             "--seats: [Seat] = [],",
             "--driver: Driver = Carl,",
             "--trunk: Trunk = .makeStub()",
-            "-) -> Car {",
-            "--return Car(",
+            "-) -> Self {",
+            "--return .init(",
             "---lenght: lenght,",
             "---name: name,",
             "---isRed: isRed,",