fix: more linting issues

AdonisCodes · AdonisCodes · commit 4a209c93a487 · 2025-04-08T08:33:00.000-06:00
diff --git a/.swiftformat b/.swiftformat
@@ -3,3 +3,5 @@
 --indent 4
 --trimwhitespace always
 --header "{file}\nCopyright (c) {year} GetAutomaApp\nAll source code and related assets are the property of GetAutomaApp.\nAll rights reserved.\n\nThis package is freely distributable under the MIT license.\nThis Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver."
+--disable redundantInternal
+--enable prioritizeKeepingFunctionOutputTogether
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -5,10 +5,12 @@ disabled_rules:
   - trailing_whitespace
   - trailing_comma
   - nesting
+  - opening_brace
 
 opt_in_rules:
   - empty_count
   - force_unwrapping
+  - missing_docs
   - file_name
   - fallthrough
   - identical_operands
@@ -31,9 +33,9 @@ opt_in_rules:
   - direct_return
   - discouraged_none_name
   - explicit_acl
-  - explicit_enum_raw_value
   - explicit_init
   - explicit_top_level_acl
+  - local_doc_comment
   - modifier_order
   - multiline_arguments
   - multiline_arguments_brackets
@@ -61,6 +63,7 @@ opt_in_rules:
   - unused_parameter
 
 excluded:
+  - '**/Package.swift'
   - '**/.build/**'             # Exclude all .build directories, including nested ones
   - '**/Carthage/**'           # Exclude Carthage build directory (recursive)
   - '**/Pods/**'               # Exclude Pods directory (recursive)
@@ -80,4 +83,8 @@ identifier_name:
 cyclomatic_complexity:
   ignores_case_statements: true
 
+type_body_length:
+  warning: 1000
+  error: 1000
+
 reporter: github-actions-logging
diff --git a/Example/Package.swift b/Example/Package.swift
@@ -9,7 +9,7 @@ let package = Package(
         .macOS(.v12),
     ],
     dependencies: [
-        .package(url: "https://github.com/GetAutomaApp/SwiftWebDriver.git", from: "0.2.0")
+        .package(url: "https://github.com/GetAutomaApp/SwiftWebDriver.git", from: "0.2.0"),
     ],
     targets: [
         .executableTarget(
diff --git a/Example/Sources/SeleniumSwiftExample/main.swift b/Example/Sources/SeleniumSwiftExample/main.swift
@@ -8,29 +8,33 @@
 
 import SwiftWebDriver
 
-let chromeOption = ChromeOptions(
-    args: [
-        Args(.headless),
-    ]
-)
+internal struct Main {
+    public static func main() async throws {
+        let chromeOption = ChromeOptions(
+            args: [
+                Args(.headless),
+            ]
+        )
 
-let chromeDriver = try ChromeDriver(
-    driverURLString: "http://localhost:9515",
-    browserObject: chromeOption
-)
+        let chromeDriver = try ChromeDriver(
+            driverURLString: "http://localhost:4444",
+            browserObject: chromeOption
+        )
 
-let driver = WebDriver(
-    driver: chromeDriver
-)
+        let driver = WebDriver(
+            driver: chromeDriver
+        )
 
-Task.detached {
-    do {
-        let status = try await driver.status()
-        print(status)
-        let sessionId = try await driver.start()
-        print(sessionId)
-        try await driver.stop()
-    } catch {
-        print(error)
+        do {
+            let status = try await driver.status()
+            print(status)
+            let sessionId = try await driver.start()
+            print(sessionId)
+            try await driver.stop()
+        } catch {
+            print(error)
+        }
     }
 }
+
+try await Main.main()
diff --git a/Sources/SwiftWebDriver/API/APIClient.swift b/Sources/SwiftWebDriver/API/APIClient.swift
@@ -36,7 +36,8 @@ internal struct APIClient {
             guard response.status == .ok else {
                 if
                     let buffer = response.body,
-                    let error = try? JSONDecoder().decode(SeleniumError.self, from: buffer) {
+                    let error = try? JSONDecoder().decode(SeleniumError.self, from: buffer)
+                {
                     print(error.localizedDescription)
                     return .failure(error)
                 }
diff --git a/Sources/SwiftWebDriver/API/Request/DevTools/DevToolTypes.swift b/Sources/SwiftWebDriver/API/Request/DevTools/DevToolTypes.swift
@@ -6,8 +6,8 @@
 // This package is freely distributable under the MIT license.
 // This Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver.
 
-public struct DevToolTypes {
+public enum DevToolTypes {
     public enum JavascriptExecutionTypes {
-        case sync, async
+        case async, sync
     }
 }
diff --git a/Sources/SwiftWebDriver/API/Request/Elements/ElementsTypes.swift b/Sources/SwiftWebDriver/API/Request/Elements/ElementsTypes.swift
@@ -6,7 +6,7 @@
 // This package is freely distributable under the MIT license.
 // This Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver.
 
-public struct ElementsTypes {
+public enum ElementsTypes {
     public enum SendValueActionKeyTypes: String {
         case ENTER1 = "\u{E007}"
         case RETURN1 = "\u{E006}"
diff --git a/Sources/SwiftWebDriver/API/Request/Navigation/PostNavigationBackRequest.swift b/Sources/SwiftWebDriver/API/Request/Navigation/PostNavigationBackRequest.swift
@@ -1,3 +1,11 @@
+// PostNavigationBackRequest.swift
+// Copyright (c) 2025 GetAutomaApp
+// All source code and related assets are the property of GetAutomaApp.
+// All rights reserved.
+//
+// This package is freely distributable under the MIT license.
+// This Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver.
+
 // PostNavigatioinBackRequest.swift
 // Copyright (c) 2025 GetAutomaApp
 // All source code and related assets are the property of GetAutomaApp.
diff --git a/Sources/SwiftWebDriver/API/Request/Navigation/PostNavigationForwardRequest.swift b/Sources/SwiftWebDriver/API/Request/Navigation/PostNavigationForwardRequest.swift
@@ -1,4 +1,4 @@
-// PostNavigatoinForwardRequest.swift
+// PostNavigationForwardRequest.swift
 // Copyright (c) 2025 GetAutomaApp
 // All source code and related assets are the property of GetAutomaApp.
 // All rights reserved.
diff --git a/Sources/SwiftWebDriver/API/Response/Elements/GetElementNamePropertyResponse.swift b/Sources/SwiftWebDriver/API/Response/Elements/GetElementNamePropertyResponse.swift
@@ -1,4 +1,4 @@
-// GetElementNameProperty.response.swift
+// GetElementNamePropertyResponse.swift
 // Copyright (c) 2025 GetAutomaApp
 // All source code and related assets are the property of GetAutomaApp.
 // All rights reserved.
diff --git a/Sources/SwiftWebDriver/API/Response/Navigation/NavigationResponse.swift b/Sources/SwiftWebDriver/API/Response/Navigation/NavigationResponse.swift
diff --git a/Sources/SwiftWebDriver/API/Response/Navigation/PostNavigationBackResponse.swift b/Sources/SwiftWebDriver/API/Response/Navigation/PostNavigationBackResponse.swift
@@ -1,4 +1,4 @@
-// PostNavigatioinBackResponse.swift
+// PostNavigationBackResponse.swift
 // Copyright (c) 2025 GetAutomaApp
 // All source code and related assets are the property of GetAutomaApp.
 // All rights reserved.
diff --git a/Sources/SwiftWebDriver/WebDrivers/Chrome/ChromeDriver.swift b/Sources/SwiftWebDriver/WebDrivers/Chrome/ChromeDriver.swift
@@ -284,7 +284,7 @@ public class ChromeDriver: Driver {
         args: [String],
         type: DevToolTypes.JavascriptExecutionTypes
     ) async throws -> PostExecuteResponse {
-        return try await type == .sync ?
+        try await type == .sync ?
             executeJavascriptSync(script, args: args) :
             executeJavascriptAsync(
                 script,
diff --git a/Tests/SwiftWebDriverIntegrationTests/ChromeDriver/Element/ChromeDriverElementHandleIntegrationTests.swift b/Tests/SwiftWebDriverIntegrationTests/ChromeDriver/Element/ChromeDriverElementHandleIntegrationTests.swift
@@ -10,7 +10,7 @@
 import Testing
 
 @Suite("Chrome Driver Element Handles", .serialized)
-internal class ChromeDriverElementHandleTests: ChromeDriverTest {
+internal class ChromeDriverElementHandleIntegrationTests: ChromeDriverTest {
     @Test("Click Button")
     public func clickButton() async throws {
         page = "elementHandleTestPage.html"
@@ -80,7 +80,9 @@ internal class ChromeDriverElementHandleTests: ChromeDriverTest {
         do {
             try await element.click()
             #expect(Bool(false))
-        } catch {}
+        } catch {
+            #expect(Bool(true))
+        }
     }
 
     deinit {
diff --git a/Tests/SwiftWebDriverIntegrationTests/ChromeDriver/Element/ChromeDriverFindElementIntegrationTests.swift b/Tests/SwiftWebDriverIntegrationTests/ChromeDriver/Element/ChromeDriverFindElementIntegrationTests.swift
@@ -68,4 +68,8 @@ internal class ChromeDriverFindElementIntegrationTests: ChromeDriverTest {
             .text()
         #expect(text == "this is h1")
     }
+
+    deinit {
+        // no-op
+    }
 }
diff --git a/Tests/SwiftWebDriverIntegrationTests/ChromeDriver/Navigation/ChromeDriverNavigationIntegrationTests.swift b/Tests/SwiftWebDriverIntegrationTests/ChromeDriver/Navigation/ChromeDriverNavigationIntegrationTests.swift
@@ -1,3 +1,11 @@
+// ChromeDriverNavigationIntegrationTests.swift
+// Copyright (c) 2025 GetAutomaApp
+// All source code and related assets are the property of GetAutomaApp.
+// All rights reserved.
+//
+// This package is freely distributable under the MIT license.
+// This Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver.
+
 @testable import SwiftWebDriver
 import Testing
 

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`// This package is freely distributable under the MIT license.`
`7`	`7`	`// This Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver.`
`8`	`8`
`9`		`-public struct DevToolTypes {`
	`9`	`+public enum DevToolTypes {`
`10`	`10`	`public enum JavascriptExecutionTypes {`
`11`		`- case sync, async`
	`11`	`+ case async, sync`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// PostNavigatoinForwardRequest.swift`
	`1`	`+// PostNavigationForwardRequest.swift`
`2`	`2`	`// Copyright (c) 2025 GetAutomaApp`
`3`	`3`	`// All source code and related assets are the property of GetAutomaApp.`
`4`	`4`	`// All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// GetElementNameProperty.response.swift`
	`1`	`+// GetElementNamePropertyResponse.swift`
`2`	`2`	`// Copyright (c) 2025 GetAutomaApp`
`3`	`3`	`// All source code and related assets are the property of GetAutomaApp.`
`4`	`4`	`// All rights reserved.`