Swift 6

.github/workflows/macos.yml

@@ -0,0 +1,27 @@
+name: macOS Swift
+
+
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    name: Swift on ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-15]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Print Swift version
+      run: swift --version
+    - uses: actions/checkout@v4
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v

.github/workflows/swift.yml → .github/workflows/ubuntu.yml

@@ -1,4 +1,4 @@
-name: Swift
+name: Ubuntu Swift
 
 
 
@@ -13,15 +13,15 @@ jobs:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-latest]
-        swift: ["5", "5.9"]
+        os: [ubuntu-22.04]
+        swift: ["6.1", "6.0"]
 
     runs-on: ${{ matrix.os }}
 
+    container: 
+      image: swift:${{ matrix.swift }}
+
     steps:
-    - uses: swift-actions/setup-swift@v2.3.0
-      with:
-        swift-version: ${{ matrix.swift }}
     - uses: actions/checkout@v4
     - name: Build
       run: swift build -v

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 

Sources/Attributes.swift

@@ -21,7 +21,7 @@ import Foundation
  *
  */
 open class Attributes: NSCopying {
-    public static var dataPrefix: [UInt8] = "data-".utf8Array
+    public static let dataPrefix: [UInt8] = "data-".utf8Array
 
     // Stored by lowercased key, but key case is checked against the copy inside
     // the Attribute on retrieval.

Sources/Comment.swift

@@ -10,7 +10,7 @@ import Foundation
 /**
  A comment node.
  */
-public class Comment: Node {
+public class Comment: Node, @unchecked Sendable {
     private static let COMMENT_KEY: [UInt8] = UTF8Arrays.comment
 
     /**

Sources/DataNode.swift

@@ -10,7 +10,7 @@ import Foundation
 /**
  A data node, for contents of style, script tags etc, where contents should not show in text().
  */
-open class DataNode: Node {
+open class DataNode: Node, @unchecked Sendable {
     private static let DATA_KEY  = "data".utf8Array
 
     /**

Sources/Document.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-open class Document: Element {
+open class Document: Element, @unchecked Sendable {
     public enum QuirksMode {
         case noQuirks, quirks, limitedQuirks
     }

Sources/DocumentType.swift

@@ -10,7 +10,7 @@ import Foundation
 /**
  * A {@code <!DOCTYPE>} node.
  */
-public class DocumentType: Node {
+public class DocumentType: Node, @unchecked Sendable {
     static let PUBLIC_KEY = "PUBLIC".utf8Array
     static let SYSTEM_KEY = "SYSTEM".utf8Array
     private static let NAME = "name".utf8Array

Sources/Element.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-open class Element: Node {
+open class Element: Node, @unchecked Sendable {
     var _tag: Tag
 
     private static let classString = "class".utf8Array

Sources/Entities.swift

@@ -26,7 +26,7 @@ public class Entities {
 
     private static let spaceString: [UInt8] = [0x20]
 
-    public class EscapeMode: Equatable {
+    public class EscapeMode: Equatable, @unchecked Sendable {
 
         /** Restricted entities suitable for XHTML output: lt, gt, amp, and quot only. */
         public static let xhtml: EscapeMode = EscapeMode(string: Entities.xhtml, size: 4, id: 0)
@@ -146,9 +146,20 @@ public class Entities {
         }
     }
 
-    private static var multipoints: [ArraySlice<UInt8>: [UnicodeScalar]] = [:] // name -> multiple character references
-    private static var multipointsLock = MutexLock()
-
+    // Singleton for thread-safe multipoints
+    private final class MultipointsRegistry: @unchecked Sendable {
+        static let shared = MultipointsRegistry()
+        let multipointsLock = MutexLock()
+        var multipoints: [ArraySlice<UInt8>: [UnicodeScalar]] = [:]
+        private init() {}
+    }
+
+    private static var multipointsLock: MutexLock { MultipointsRegistry.shared.multipointsLock }
+    private static var multipoints: [ArraySlice<UInt8>: [UnicodeScalar]] {
+        get { MultipointsRegistry.shared.multipoints }
+        set { MultipointsRegistry.shared.multipoints = newValue }
+    }
+
     /**
      * Check if the input is a known named entity
      * @param name the possible entity name (e.g. "lt" or "amp")
@@ -183,7 +194,7 @@ public class Entities {
         }
         return nil
     }
-    
+
     public static func codepointsForName(_ name: ArraySlice<UInt8>) -> [UnicodeScalar]? {
         multipointsLock.lock()
         if let scalars = multipoints[name] {

Sources/Exception.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum ExceptionType {
+public enum ExceptionType: Sendable {
     case IllegalArgumentException
     case IOException
     case XmlDeclaration

Sources/FormElement.swift

@@ -11,7 +11,7 @@ import Foundation
  * A HTML Form Element provides ready access to the form fields/controls that are associated with it. It also allows a
  * form to easily be submitted.
  */
-public class FormElement: Element {
+public class FormElement: Element, @unchecked Sendable {
     private let _elements: Elements = Elements()
 
     /**

Sources/Node.swift

@@ -20,7 +20,7 @@ internal final class Weak<T: AnyObject> {
     }
 }
 
-open class Node: Equatable, Hashable {
+open class Node: Equatable, Hashable, @unchecked Sendable {
     var baseUri: [UInt8]?
     var attributes: Attributes?
 

Sources/ParseSettings.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-open class ParseSettings {
+open class ParseSettings: @unchecked Sendable {
     /**
      * HTML default settings: both tag and attribute names are lower-cased during parsing.
      */

Sources/ParsingStrings.swift

@@ -34,7 +34,8 @@ final class TrieNode {
     var isTerminal: Bool = false
 }
 
-public struct ParsingStrings: Hashable, Equatable {
+public struct ParsingStrings: Hashable, Equatable, @unchecked Sendable {
+    // root is not Sendable, so we must mark it as @unchecked Sendable
     let multiByteChars: [[UInt8]]
     let multiByteCharLengths: [Int]
     public let multiByteByteLookups: [(UInt64, UInt64, UInt64, UInt64)]

Sources/Pattern.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Pattern {
+public struct Pattern: Sendable {
     public static let CASE_INSENSITIVE: Int = 0x02
     let pattern: String
 

Sources/Tag.swift

@@ -7,16 +7,28 @@
 
 import Foundation
 
-open class Tag: Hashable {
-    // map of known tags
-    static var tags: Dictionary<[UInt8], Tag> = {
-        do {
-            return try Tag.initializeMaps()
-        } catch {
-            preconditionFailure("This method must be overridden")
+open class Tag: Hashable, @unchecked Sendable {
+    // Removed duplicate == and hash(into:) to fix redeclaration errors
+    // Singleton for thread-safe tag map
+    private final class TagRegistry: @unchecked Sendable {
+        static let shared = TagRegistry()
+        let tagsLock = NSLock()
+        var tags: Dictionary<[UInt8], Tag>
+        private init() {
+            do {
+                self.tags = try Tag.initializeMaps()
+            } catch {
+                preconditionFailure("This method must be overridden")
+            }
         }
-        return Dictionary<[UInt8], Tag>()
-    }()
+    }
+
+    // Helper to access the singleton
+    private static var tagsLock: NSLock { TagRegistry.shared.tagsLock }
+    private static var tags: Dictionary<[UInt8], Tag> {
+        get { TagRegistry.shared.tags }
+        set { TagRegistry.shared.tags = newValue }
+    }
 
     fileprivate var _tagName: [UInt8]
     fileprivate var _tagNameNormal: [UInt8]
@@ -73,12 +85,17 @@ open class Tag: Hashable {
 
     public static func valueOf(_ tagName: [UInt8], _ settings: ParseSettings) throws -> Tag {
         var tagName = tagName
-        var tag: Tag? = Tag.tags[tagName]
+        var tag: Tag?
+        Tag.tagsLock.lock()
+        tag = Tag.tags[tagName]
+        Tag.tagsLock.unlock()
 
         if (tag == nil) {
             tagName = settings.normalizeTag(tagName)
             try Validate.notEmpty(string: tagName)
+            Tag.tagsLock.lock()
             tag = Tag.tags[tagName]
+            Tag.tagsLock.unlock()
 
             if (tag == nil) {
                 // not defined: create default; go anywhere, do anything! (incl be inside a <p>)
@@ -186,7 +203,10 @@ open class Tag: Hashable {
      */
     @inline(__always)
     open func isKnownTag() -> Bool {
-        return Tag.tags[_tagName] != nil
+        Tag.tagsLock.lock()
+        let result = Tag.tags[_tagName] != nil
+        Tag.tagsLock.unlock()
+        return result
     }
 
     /**
@@ -197,7 +217,10 @@ open class Tag: Hashable {
      */
     @inline(__always)
     public static func isKnownTag(_ tagName: [UInt8]) -> Bool {
-        return Tag.tags[tagName] != nil
+        Tag.tagsLock.lock()
+        let result2 = Tag.tags[tagName] != nil
+        Tag.tagsLock.unlock()
+        return result2
     }
 
     /**

Sources/TextNode.swift

@@ -10,7 +10,7 @@ import Foundation
 /**
  A text node.
  */
-open class TextNode: Node {
+open class TextNode: Node, @unchecked Sendable {
     /*
      TextNode is a node, and so by default comes with attributes and children. The attributes are seldom used, but use
      memory, and the child nodes are never used. So we don't have them, and override accessors to attributes to create

Sources/Token.swift

@@ -363,7 +363,7 @@ open class Token {
         @inline(__always)
         public override func toString() throws -> String {
             try Validate.notNull(obj: data)
-            return String(decoding: getData()!, as: UTF8.self) ?? ""
+            return String(decoding: getData()!, as: UTF8.self)
         }
     }
 

Sources/XmlDeclaration.swift

@@ -10,7 +10,7 @@ import Foundation
 /**
  An XML Declaration.
   */
-public class XmlDeclaration: Node {
+public class XmlDeclaration: Node, @unchecked Sendable {
     private let _name: [UInt8]
     private let isProcessingInstruction: Bool // <! if true, <? if false, declaration (and last data char should be ?)
 

Tests/SwiftSoupTests/AttributeParseTest.swift

@@ -12,16 +12,6 @@ import XCTest
 import SwiftSoup
 
 class AttributeParseTest: XCTestCase {
-
-    func testLinuxTestSuiteIncludesAllTests() {
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-            let thisClass = type(of: self)
-            let linuxCount = thisClass.allTests.count
-            let darwinCount = Int(thisClass.defaultTestSuite.testCaseCount)
-            XCTAssertEqual(linuxCount, darwinCount, "\(darwinCount - linuxCount) tests are missing from allTests")
-        #endif
-    }
-
 	func testparsesRoughAttributeString() throws {
 		let html: String = "<a id=\"123\" class=\"baz = 'bar'\" style = 'border: 2px'qux zim foo = 12 mux=18 />"
 		// should be: <id=123>, <class=baz = 'bar'>, <qux=>, <zim=>, <foo=12>, <mux.=18>
@@ -103,19 +93,4 @@ class AttributeParseTest: XCTestCase {
 		doc = try SwiftSoup.parse(html, "", Parser.xmlParser())
 		XCTAssertEqual("<img onerror=\"doMyJob\" />", try doc.html())
 	}
-
-	static var allTests = {
-		return [
-            ("testLinuxTestSuiteIncludesAllTests", testLinuxTestSuiteIncludesAllTests),
-            ("testparsesRoughAttributeString", testparsesRoughAttributeString),
-			("testhandlesNewLinesAndReturns", testhandlesNewLinesAndReturns),
-			("testparsesEmptyString", testparsesEmptyString),
-			("testcanStartWithEq", testcanStartWithEq),
-			("teststrictAttributeUnescapes", teststrictAttributeUnescapes),
-			("testmoreAttributeUnescapes", testmoreAttributeUnescapes),
-			("testparsesBooleanAttributes", testparsesBooleanAttributes),
-			("testretainsSlashFromAttributeName", testretainsSlashFromAttributeName)
-		]
-	}()
-
 }