fix: operations when source tree is not set to '<group>'

Author: wojciech-kulik

Sources/Tests/InputPathTests.swift

@@ -33,6 +33,20 @@ struct InputPathTests {
         #expect(path.lastComponent == "file.swift")
     }
 
+    @Test
+    func inputPath_lastComponent_shouldReturnSameValue_whenContainsOnlyFileName() {
+        let path = InputPath("file.swift", projectRoot: projectRoot)
+
+        #expect(path.lastComponent == "file.swift")
+    }
+
+    @Test
+    func inputPath_lastComponent_shouldReturnSameValue_whenContainsOnlyGroupName() {
+        let path = InputPath("GroupXYZ", projectRoot: projectRoot)
+
+        #expect(path.lastComponent == "GroupXYZ")
+    }
+
     @Test
     func inputPath_firstRelativeComponent_shouldReturnCorrectValue() {
         let path = InputPath(filePath, projectRoot: projectRoot)

Sources/XcodeProjectCLI/Core/ProjectFiles.swift

@@ -109,9 +109,9 @@ final class ProjectFiles {
 
         // Rename if needed
         if filePath.lastComponent != newPath.lastComponent {
-            fileRef.sourceTree = .group
-            fileRef.name = newPath.lastComponent
+            fileRef.name = nil
             fileRef.path = newPath.lastComponent
+            fileRef.setGroupSourceTree()
         }
 
         return targets.map(\.name)
@@ -122,8 +122,8 @@ final class ProjectFiles {
             throw CLIError.fileNotFoundInProject(filePath)
         }
 
-        file.sourceTree = .group
-        file.name = newName
+        file.name = nil
         file.path = newName
+        file.setGroupSourceTree()
     }
 }

Sources/XcodeProjectCLI/Core/ProjectGroups.swift

@@ -48,9 +48,9 @@ final class ProjectGroups {
             throw CLIError.groupNotFoundInProject(groupPath)
         }
 
-        group.sourceTree = .group
-        group.name = newName
+        group.name = nil
         group.path = newName
+        group.setGroupSourceTree()
     }
 
     func deleteGroup(_ groupPath: InputPath) throws {
@@ -80,6 +80,7 @@ final class ProjectGroups {
             try mergeGroups(from: group, into: existingGroup)
             project.pbxproj.delete(object: group)
         } else {
+            group.setGroupSourceTree()
             destinationGroup.children.append(group)
         }
     }
@@ -95,6 +96,7 @@ final class ProjectGroups {
                     project.pbxproj.delete(object: sourceChildGroup)
                 } else {
                     sourceChildGroup.parent = target
+                    sourceChildGroup.setGroupSourceTree()
                     target.children.append(sourceChildGroup)
                 }
 
@@ -111,6 +113,7 @@ final class ProjectGroups {
                     try projectFiles.removeFile(fileRef.fullPath!)
                 } else {
                     fileRef.parent = target
+                    fileRef.setGroupSourceTree()
                     target.children.append(fileRef)
                 }
 

Sources/XcodeProjectCLI/Extensions/PBXFileElement.swift

@@ -8,4 +8,18 @@ extension PBXFileElement {
 
         return try? fullPath(sourceRoot: Project.projectRoot)?.asInputPath
     }
+
+    func setGroupSourceTree() {
+        if sourceTree != .group {
+            sourceTree = .group
+            name = nil
+            path = path?.asInputPath.lastComponent
+        }
+
+        if let group = self as? PBXGroup {
+            for child in group.children {
+                child.setGroupSourceTree()
+            }
+        }
+    }
 }