Add join JSON

Author: intitni

Core/Tests/ServiceTests/Environment.swift

@@ -14,6 +14,10 @@ func completion(text: String, range: CursorRange, uuid: String = "") -> CodeSugg
 }
 
 class MockSuggestionService: GitHubCopilotSuggestionServiceType {
+    func cancelOngoingTask(workDoneToken: String) async {
+        fatalError()
+    }
+    
     func notifyChangeTextDocument(fileURL: URL, content: String, version: Int) async throws {
         fatalError()
     }

TestPlan.xctestplan

@@ -24,135 +24,135 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "ServiceTests",
-        "name" : "ServiceTests"
+        "containerPath" : "container:Tool",
+        "identifier" : "OpenAIServiceTests",
+        "name" : "OpenAIServiceTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Core",
-        "identifier" : "SuggestionWidgetTests",
-        "name" : "SuggestionWidgetTests"
+        "identifier" : "KeyBindingManagerTests",
+        "name" : "KeyBindingManagerTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "PromptToCodeServiceTests",
-        "name" : "PromptToCodeServiceTests"
+        "containerPath" : "container:Tool",
+        "identifier" : "SuggestionInjectorTests",
+        "name" : "SuggestionInjectorTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "LangChainTests",
-        "name" : "LangChainTests"
+        "identifier" : "SharedUIComponentsTests",
+        "name" : "SharedUIComponentsTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "OpenAIServiceTests",
-        "name" : "OpenAIServiceTests"
+        "identifier" : "SuggestionBasicTests",
+        "name" : "SuggestionBasicTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Core",
-        "identifier" : "ChatServiceTests",
-        "name" : "ChatServiceTests"
+        "identifier" : "PromptToCodeServiceTests",
+        "name" : "PromptToCodeServiceTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "TokenEncoderTests",
-        "name" : "TokenEncoderTests"
+        "identifier" : "JoinJSONTests",
+        "name" : "JoinJSONTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "SharedUIComponentsTests",
-        "name" : "SharedUIComponentsTests"
+        "identifier" : "FocusedCodeFinderTests",
+        "name" : "FocusedCodeFinderTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "ASTParserTests",
-        "name" : "ASTParserTests"
+        "identifier" : "ActiveDocumentChatContextCollectorTests",
+        "name" : "ActiveDocumentChatContextCollectorTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "ServiceUpdateMigrationTests",
-        "name" : "ServiceUpdateMigrationTests"
+        "containerPath" : "container:Tool",
+        "identifier" : "XcodeInspectorTests",
+        "name" : "XcodeInspectorTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "KeychainTests",
-        "name" : "KeychainTests"
+        "identifier" : "GitHubCopilotServiceTests",
+        "name" : "GitHubCopilotServiceTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:Tool",
-        "identifier" : "ActiveDocumentChatContextCollectorTests",
-        "name" : "ActiveDocumentChatContextCollectorTests"
+        "containerPath" : "container:Core",
+        "identifier" : "SuggestionWidgetTests",
+        "name" : "SuggestionWidgetTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "GitHubCopilotServiceTests",
-        "name" : "GitHubCopilotServiceTests"
+        "identifier" : "TokenEncoderTests",
+        "name" : "TokenEncoderTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:Tool",
-        "identifier" : "FocusedCodeFinderTests",
-        "name" : "FocusedCodeFinderTests"
+        "containerPath" : "container:Core",
+        "identifier" : "ChatServiceTests",
+        "name" : "ChatServiceTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "XcodeInspectorTests",
-        "name" : "XcodeInspectorTests"
+        "identifier" : "LangChainTests",
+        "name" : "LangChainTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "SuggestionProviderTests",
-        "name" : "SuggestionProviderTests"
+        "identifier" : "KeychainTests",
+        "name" : "KeychainTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Core",
-        "identifier" : "KeyBindingManagerTests",
-        "name" : "KeyBindingManagerTests"
+        "identifier" : "ServiceTests",
+        "name" : "ServiceTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "SuggestionBasicTests",
-        "name" : "SuggestionBasicTests"
+        "identifier" : "ASTParserTests",
+        "name" : "ASTParserTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Tool",
-        "identifier" : "SuggestionInjectorTests",
-        "name" : "SuggestionInjectorTests"
+        "identifier" : "SuggestionProviderTests",
+        "name" : "SuggestionProviderTests"
       }
     },
     {
@@ -161,6 +161,13 @@
         "identifier" : "CodeDiffTests",
         "name" : "CodeDiffTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Core",
+        "identifier" : "ServiceUpdateMigrationTests",
+        "name" : "ServiceUpdateMigrationTests"
+      }
     }
   ],
   "version" : 1

Tool/Package.swift

@@ -81,7 +81,10 @@ let package = Package(
             url: "https://github.com/intitni/generative-ai-swift",
             branch: "support-setting-base-url"
         ),
-        .package(url: "https://github.com/intitni/CopilotForXcodeKit", branch: "feature/custom-chat-tab"),
+        .package(
+            url: "https://github.com/intitni/CopilotForXcodeKit",
+            branch: "feature/custom-chat-tab"
+        ),
 
         // TreeSitter
         .package(url: "https://github.com/intitni/SwiftTreeSitter.git", branch: "main"),
@@ -104,6 +107,9 @@ let package = Package(
 
         .target(name: "ObjectiveCExceptionHandling"),
 
+        .target(name: "JoinJSON"),
+        .testTarget(name: "JoinJSONTests", dependencies: ["JoinJSON"]),
+
         .target(name: "CodeDiff", dependencies: ["SuggestionBasic"]),
         .testTarget(name: "CodeDiffTests", dependencies: ["CodeDiff"]),
 

Tool/Sources/JoinJSON/JoinJSON.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+public struct JoinJSON {
+    public init() {}
+
+    public func join(_ a: String, with b: String) -> Data {
+        return join(a.data(using: .utf8) ?? Data(), with: b.data(using: .utf8) ?? Data())
+    }
+
+    public func join(_ a: Data, with b: String) -> Data {
+        return join(a, with: b.data(using: .utf8) ?? Data())
+    }
+
+    public func join(_ a: Data, with b: Data) -> Data {
+        guard let firstDict = try? JSONSerialization.jsonObject(with: a) as? [String: Any],
+              let secondDict = try? JSONSerialization.jsonObject(with: b) as? [String: Any]
+        else {
+            return a
+        }
+
+        var merged = firstDict
+        for (key, value) in secondDict {
+            merged[key] = value
+        }
+
+        return (try? JSONSerialization.data(withJSONObject: merged)) ?? a
+    }
+}
+

Tool/Tests/JoinJSONTests/JoinJSONTests.swift

@@ -0,0 +1,74 @@
+import Foundation
+
+import XCTest
+@testable import JoinJSON
+
+final class JoinJSONTests: XCTestCase {
+    var sut: JoinJSON!
+    
+    override func setUp() {
+        super.setUp()
+        sut = JoinJSON()
+    }
+    
+    override func tearDown() {
+        sut = nil
+        super.tearDown()
+    }
+    
+    func test_join_two_valid_json_strings() throws {
+        let json1 = """
+        {"name": "John"}
+        """
+        let json2 = """
+        {"age": 30}
+        """
+        
+        let result = sut.join(json1, with: json2)
+        let dict = try JSONSerialization.jsonObject(with: result) as? [String: Any]
+        
+        XCTAssertEqual(dict?["name"] as? String, "John")
+        XCTAssertEqual(dict?["age"] as? Int, 30)
+    }
+    
+    func test_join_with_invalid_json_returns_first_data() {
+        let json1 = """
+        {"name": "John"}
+        """
+        let invalidJSON = "invalid json"
+        
+        let result = sut.join(json1, with: invalidJSON)
+        XCTAssertEqual(result, json1.data(using: .utf8))
+    }
+    
+    func test_join_with_overlapping_keys_prefers_second_value() throws {
+        let json1 = """
+        {"name": "John", "age": 25}
+        """
+        let json2 = """
+        {"age": 30}
+        """
+        
+        let result = sut.join(json1, with: json2)
+        let dict = try JSONSerialization.jsonObject(with: result) as? [String: Any]
+        
+        XCTAssertEqual(dict?["name"] as? String, "John")
+        XCTAssertEqual(dict?["age"] as? Int, 30)
+    }
+    
+    func test_join_with_data_input() throws {
+        let data1 = """
+        {"name": "John"}
+        """.data(using: .utf8)!
+        
+        let data2 = """
+        {"age": 30}
+        """.data(using: .utf8)!
+        
+        let result = sut.join(data1, with: data2)
+        let dict = try JSONSerialization.jsonObject(with: result) as? [String: Any]
+        
+        XCTAssertEqual(dict?["name"] as? String, "John")
+        XCTAssertEqual(dict?["age"] as? Int, 30)
+    }
+}