Swift stuff

Author: jkmassel

ios/Sources/GutenbergKit/Sources/Model/EditorSettings.swift

@@ -25,18 +25,15 @@ public struct EditorSettings: Sendable, Codable, Equatable, Hashable {
     /// be cached.
     ///
     /// - Parameter data: The raw JSON data from the block editor settings endpoint.
-    init(data: Data) {
-        let json = try? JSON(data)
+    init(data: Data) throws {
+        let json = try JSON(data)
         self.jsonValue = json
 
-        let encodedJSON = try? JSONEncoder().encode(json)
-        self.stringValue = String(decoding: encodedJSON ?? Data(), as: UTF8.self)
+        let encodedJSON = try JSONEncoder().encode(json)
+        self.stringValue = String(decoding: encodedJSON, as: UTF8.self)
 
-        if let settings = try? JSONDecoder().decode(InternalEditorSettings.self, from: data) {
-            self.themeStyles = settings.styles.compactMap { $0.css }.joined(separator: "\n")
-        } else {
-            self.themeStyles = ""
-        }
+        let settings = try JSONDecoder().decode(InternalEditorSettings.self, from: data)
+        self.themeStyles = settings.styles.compactMap { $0.css }.joined(separator: "\n")
     }
 
     private init(

ios/Sources/GutenbergKit/Sources/RESTAPIRepository.swift

@@ -72,7 +72,7 @@ public struct RESTAPIRepository: Sendable {
         let request = URLRequest(method: .GET, url: editorSettingsUrl)
         let response = try await self.httpClient.perform(request)
 
-        let editorSettings = EditorSettings(data: response.0)
+        let editorSettings = try EditorSettings(data: response.0)
 
         let urlResponse = EditorURLResponse((try JSONEncoder().encode(editorSettings), response.1))
         try self.cache.store(urlResponse, for: editorSettingsUrl, httpMethod: .GET)

ios/Tests/GutenbergKitTests/Model/EditorSettingsTests.swift

@@ -9,59 +9,59 @@ struct EditorSettingsTests {
   // MARK: - themeStyles Tests
 
   @Test("themeStyles is empty when styles array is empty")
-  func themeStylesEmptyWhenNoStyles() {
+  func themeStylesEmptyWhenNoStyles() throws {
     let json = #"{"styles": []}"#
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles.isEmpty)
   }
 
   @Test("themeStyles extracts single css value")
-  func themeStylesExtractsSingleCSS() {
+  func themeStylesExtractsSingleCSS() throws{
     let json = #"{"styles": [{"css": "body { color: red; }", "isGlobalStyles": true}]}"#
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles == "body { color: red; }")
   }
 
   @Test("themeStyles joins multiple css values with newlines")
-  func themeStylesJoinsMultipleCSS() {
+  func themeStylesJoinsMultipleCSS() throws{
     let json = """
       {"styles": [{"css": "body { color: red; }", "isGlobalStyles": true}, {"css": "h1 { font-size: 2em; }", "isGlobalStyles": false}]}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles == "body { color: red; }\nh1 { font-size: 2em; }")
   }
 
   @Test("themeStyles skips styles with null css")
-  func themeStylesSkipsNullCSS() {
+  func themeStylesSkipsNullCSS() throws{
     let json = """
       {"styles": [{"css": null, "isGlobalStyles": true}, {"css": "h1 { font-size: 2em; }", "isGlobalStyles": false}]}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles == "h1 { font-size: 2em; }")
   }
 
   @Test("themeStyles skips styles without css key")
-  func themeStylesSkipsMissingCSS() {
+  func themeStylesSkipsMissingCSS() throws{
     let json = """
       {"styles": [{"isGlobalStyles": true}, {"css": "h1 { font-size: 2em; }", "isGlobalStyles": false}]}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles == "h1 { font-size: 2em; }")
   }
 
   @Test("themeStyles is empty when JSON is invalid")
-  func themeStylesEmptyForInvalidJSON() {
+  func themeStylesEmptyForInvalidJSON() throws{
     let invalidJSON = "not valid json"
-    let settings = EditorSettings(data: Data(invalidJSON.utf8))
+    let settings = try EditorSettings(data: Data(invalidJSON.utf8))
     #expect(settings.themeStyles.isEmpty)
   }
 
   @Test("themeStyles is empty when styles key is missing")
-  func themeStylesEmptyWhenStylesKeyMissing() {
+  func themeStylesEmptyWhenStylesKeyMissing() throws{
     let json = """
       {"otherKey": "value"}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles.isEmpty)
   }
 
@@ -72,7 +72,7 @@ struct EditorSettingsTests {
     let json = """
       {"styles": [{"css": "body { color: red; }", "isGlobalStyles": true}]}
       """
-    let original = EditorSettings(data: Data(json.utf8))
+    let original = try EditorSettings(data: Data(json.utf8))
 
     let encoded = try JSONEncoder().encode(original)
     let decoded = try JSONDecoder().decode(EditorSettings.self, from: encoded)
@@ -86,7 +86,7 @@ struct EditorSettingsTests {
     let json = """
       {"styles": [{"css": ".theme-class { background: blue; }", "isGlobalStyles": true}, {"css": ".another { margin: 10px; }", "isGlobalStyles": false}]}
       """
-    let original = EditorSettings(data: Data(json.utf8))
+    let original = try EditorSettings(data: Data(json.utf8))
 
     let encoded = try JSONEncoder().encode(original)
     let decoded = try JSONDecoder().decode(EditorSettings.self, from: encoded)
@@ -97,29 +97,29 @@ struct EditorSettingsTests {
   // MARK: - Edge Cases
 
   @Test("themeStyles handles empty css string")
-  func themeStylesHandlesEmptyCSS() {
+  func themeStylesHandlesEmptyCSS() throws {
     let json = """
       {"styles": [{"css": "", "isGlobalStyles": true}]}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles == "")
   }
 
   @Test("themeStyles handles css with special characters")
-  func themeStylesHandlesSpecialCharacters() {
+  func themeStylesHandlesSpecialCharacters() throws {
     let json = """
       {"styles": [{"css": ".class::before { content: '\\u003C'; }", "isGlobalStyles": true}]}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles.contains("::before"))
   }
 
   @Test("themeStyles handles multiline css")
-  func themeStylesHandlesMultilineCSS() {
+  func themeStylesHandlesMultilineCSS() throws {
     let json = """
       {"styles": [{"css": "body {\\n  color: red;\\n  background: blue;\\n}", "isGlobalStyles": true}]}
       """
-    let settings = EditorSettings(data: Data(json.utf8))
+    let settings = try EditorSettings(data: Data(json.utf8))
     #expect(settings.themeStyles.contains("color: red"))
     #expect(settings.themeStyles.contains("background: blue"))
   }