Bug fixes, aria, cross platform support.

Plugins/BindingPlugin/source.swift

@@ -54,7 +54,6 @@ extension BindingPlugin: BuildToolPlugin {
 #if canImport(XcodeProjectPlugin)
 
     import XcodeProjectPlugin
-import System
 
     // The entry point for Xcode project builds.
     extension BindingPlugin: XcodeBuildToolPlugin {
@@ -150,14 +149,21 @@ struct BindingPlugin {
             let withoutExt = String(fileName[fileName.startIndex..<extIndex])
             let targetFileName = "\(withoutExt.uppercaseFirstLetter()).swift"
 
-            let rootFP = FilePath(rootPath.path)
-            var inputFP = FilePath(eachFile.path)
-            let outputDirFP = FilePath(outputDir.path)
+            let rootPathP = Path(rootPath.path)
+            let fileDirP = Path(eachFile.deletingLastPathComponent().path)
+            let relativeDir: String
+            let baseDir = rootPathP.string.hasSuffix("/") ? rootPathP.string : rootPathP.string + "/"
+            if fileDirP.string == rootPathP.string {
+                relativeDir = ""
+            } else if fileDirP.string.hasPrefix(baseDir) {
+                relativeDir = String(fileDirP.string.dropFirst(baseDir.count))
+            } else {
+                relativeDir = ""
+            }
 
-            let _ = inputFP.removePrefix(rootFP)
-            inputFP.removeLastComponent()
-            //let idk = outputDirFP.pushing(inputFP)
-            let outputFileA = outputDir.appendingPathComponent(inputFP.string)
+            let outputFileA = relativeDir.isEmpty
+                ? outputDir
+                : outputDir.appendingPathComponent(relativeDir)
             let outputFile = outputFileA.appendingPathComponent(targetFileName)
             print("Expected path: \(outputFile.path)")
 

Sources/BindingGenerator/BaseComponents.swift

@@ -12,6 +12,7 @@ public protocol IGlobalContainer {
     var globalAttributes:Dictionary<GlobalAttributeKey, String> { get set }
     var globalEvents:Dictionary<GlobalEventKey, String> { get set }
     var dataAttributes:Dictionary<String, String> { get set }
+    var ariaAttributes:Dictionary<String, String> { get set }
 }
 
 extension IGlobalContainer {
@@ -29,6 +30,10 @@ extension IGlobalContainer {
                 dataAttributes[key] = value
                 return true
             }
+            if key[..<key.index(key.startIndex, offsetBy: 5)] == "aria-" {
+                ariaAttributes[key] = value
+                return true
+            }
         }
         return false
     }
@@ -53,23 +58,27 @@ public struct GlobalAttributesBuilder : IGlobalContainer{
     public var globalAttributes:Dictionary<GlobalAttributeKey, String> = [:]
     public var globalEvents:Dictionary<GlobalEventKey, String> = [:]
     public var dataAttributes:Dictionary<String, String> = [:]
+    public var ariaAttributes:Dictionary<String, String> = [:]
     
-    public init(globalAttributes: Dictionary<GlobalAttributeKey, String>, globalEvents: Dictionary<GlobalEventKey, String>, dataAttributes: Dictionary<String, String>) {
+    public init(globalAttributes: Dictionary<GlobalAttributeKey, String>, globalEvents: Dictionary<GlobalEventKey, String>, dataAttributes: Dictionary<String, String>, ariaAttributes: Dictionary<String, String> = [:]) {
         self.globalAttributes = globalAttributes
         self.globalEvents = globalEvents
         self.dataAttributes = dataAttributes
+        self.ariaAttributes = ariaAttributes
     }
     
     public init() {
         self.globalAttributes = [:]
         self.globalEvents = [:]
         self.dataAttributes = [:]
+        self.ariaAttributes = [:]
     }
     
     public init(_ attributes: [String: String]) throws {
         self.globalAttributes = [:]
         self.globalEvents = [:]
         self.dataAttributes = [:]
+        self.ariaAttributes = [:]
         for (key, value) in attributes {
             if self.trySetGlobalAttribute(key, value) {
                 continue
@@ -101,6 +110,7 @@ public class HTMLNode : XMLNode, IGlobalContainer {
     
     public var globalAttributes:Dictionary<GlobalAttributeKey, String> = [:]
     public var globalEvents:Dictionary<GlobalEventKey, String> = [:]
+    public var ariaAttributes:Dictionary<String, String> = [:]
     
     public var children:[HTMLNode] = []
     
@@ -115,23 +125,31 @@ public class HTMLNode : XMLNode, IGlobalContainer {
                 globalEvents[attr] = value
                 continue
             }
+            if key.count >= 5 {
                 if key[..<key.index(key.startIndex, offsetBy: 5)] == "data-" {
                     dataAttributes[key] = value
                     continue
                 }
+                if key[..<key.index(key.startIndex, offsetBy: 5)] == "aria-" {
+                    ariaAttributes[key] = value
+                    continue
+                }
+            }
             continue
         }
     }
     
-    public init(globalAttributes:Dictionary<GlobalAttributeKey, String>, globalEvents:Dictionary<GlobalEventKey, String>, dataAttributes:Dictionary<String, String>) {
+    public init(globalAttributes:Dictionary<GlobalAttributeKey, String>, globalEvents:Dictionary<GlobalEventKey, String>, dataAttributes:Dictionary<String, String>, ariaAttributes:Dictionary<String, String> = [:]) {
         self.globalAttributes = globalAttributes
         self.globalEvents = globalEvents
+        self.ariaAttributes = ariaAttributes
         super.init(dataAttributes: dataAttributes)
     }
     
     public init(_ builder:GlobalAttributesBuilder, _ children:[HTMLNode] = []) {
         self.globalAttributes = builder.globalAttributes
         self.globalEvents = builder.globalEvents
+        self.ariaAttributes = builder.ariaAttributes
         self.children = children
         super.init(dataAttributes: builder.dataAttributes)
     }
@@ -214,6 +232,18 @@ public class HTMLNode : XMLNode, IGlobalContainer {
             }
         }
 
+        for eachAttr in ariaAttributes {
+            if (!first) {
+                result += " "
+            }
+            first = false
+            if (eachAttr.value.count > 0) {
+                result += "\(eachAttr.key)='\(eachAttr.value)'"
+            } else {
+                result += "\(eachAttr.key)"
+            }
+        }
+        
         return result
     }
     
@@ -369,9 +399,14 @@ func isGlobalHTMLAttribute(_ key:String) -> Bool {
     if let _ = GlobalEventKey(rawValue: key.asSubstring()) {
         return true
     }
+    if key.count >= 5 {
         if key[..<key.index(key.startIndex, offsetBy: 5)] == "data-" {
             return true
         }
+        if key[..<key.index(key.startIndex, offsetBy: 5)] == "aria-" {
+            return true
+        }
+    }
     return false
 }
 

Sources/HRW/BaseComponents.swift

@@ -15,6 +15,7 @@ public protocol IGlobalContainer {
     var globalAttributes:Dictionary<GlobalAttributeKey, String> { get set }
     var globalEvents:Dictionary<GlobalEventKey, String> { get set }
     var dataAttributes:Dictionary<String, String> { get set }
+    var ariaAttributes:Dictionary<String, String> { get set }
 }
 
 extension IGlobalContainer {
@@ -27,10 +28,16 @@ extension IGlobalContainer {
             globalEvents[attr] = value
             return true
         }
+        if key.count >= 5 {
             if key[..<key.index(key.startIndex, offsetBy: 5)] == "data-" {
                 dataAttributes[key] = value
                 return true
             }
+            if key[..<key.index(key.startIndex, offsetBy: 5)] == "aria-" {
+                ariaAttributes[key] = value
+                return true
+            }
+        }
         return false
     }
 }
@@ -54,23 +61,27 @@ public struct GlobalAttributesBuilder : IGlobalContainer{
     public var globalAttributes:Dictionary<GlobalAttributeKey, String> = [:]
     public var globalEvents:Dictionary<GlobalEventKey, String> = [:]
     public var dataAttributes:Dictionary<String, String> = [:]
+    public var ariaAttributes:Dictionary<String, String> = [:]
     
-    public init(globalAttributes: Dictionary<GlobalAttributeKey, String>, globalEvents: Dictionary<GlobalEventKey, String>, dataAttributes: Dictionary<String, String>) {
+    public init(globalAttributes: Dictionary<GlobalAttributeKey, String>, globalEvents: Dictionary<GlobalEventKey, String>, dataAttributes: Dictionary<String, String>, ariaAttributes: Dictionary<String, String> = [:]) {
         self.globalAttributes = globalAttributes
         self.globalEvents = globalEvents
         self.dataAttributes = dataAttributes
+        self.ariaAttributes = ariaAttributes
     }
     
     public init() {
         self.globalAttributes = [:]
         self.globalEvents = [:]
         self.dataAttributes = [:]
+        self.ariaAttributes = [:]
     }
     
     public init(_ attributes: [String: String]) throws {
         self.globalAttributes = [:]
         self.globalEvents = [:]
         self.dataAttributes = [:]
+        self.ariaAttributes = [:]
         for (key, value) in attributes {
             if self.trySetGlobalAttribute(key, value) {
                 continue
@@ -136,6 +147,7 @@ public class HTMLNode : XMLNode, IGlobalContainer {
     
     public var globalAttributes:Dictionary<GlobalAttributeKey, String> = [:]
     public var globalEvents:Dictionary<GlobalEventKey, String> = [:]
+    public var ariaAttributes:Dictionary<String, String> = [:]
     
     public var children:[HTMLNode] = []
     
@@ -150,23 +162,31 @@ public class HTMLNode : XMLNode, IGlobalContainer {
                 globalEvents[attr] = value
                 continue
             }
+            if key.count >= 5 {
                 if key[..<key.index(key.startIndex, offsetBy: 5)] == "data-" {
                     dataAttributes[key] = value
                     continue
                 }
+                if key[..<key.index(key.startIndex, offsetBy: 5)] == "aria-" {
+                    ariaAttributes[key] = value
+                    continue
+                }
+            }
             throw AppError("Unexpected attribute: \(key)")
         }
     }
     
-    public init(globalAttributes:Dictionary<GlobalAttributeKey, String>, globalEvents:Dictionary<GlobalEventKey, String>, dataAttributes:Dictionary<String, String>) {
+    public init(globalAttributes:Dictionary<GlobalAttributeKey, String>, globalEvents:Dictionary<GlobalEventKey, String>, dataAttributes:Dictionary<String, String>, ariaAttributes:Dictionary<String, String> = [:]) {
         self.globalAttributes = globalAttributes
         self.globalEvents = globalEvents
+        self.ariaAttributes = ariaAttributes
         super.init(dataAttributes: dataAttributes)
     }
     
     public init(_ builder:GlobalAttributesBuilder, _ children:[HTMLNode] = []) {
         self.globalAttributes = builder.globalAttributes
         self.globalEvents = builder.globalEvents
+        self.ariaAttributes = builder.ariaAttributes
         self.children = children
         super.init(dataAttributes: builder.dataAttributes)
     }
@@ -229,9 +249,9 @@ public class HTMLNode : XMLNode, IGlobalContainer {
             }
             first = false
             if (eachAttr.value.count > 0) {
-                result += "\(eachAttr.key)='\(eachAttr.value)'"
+                result += "\(eachAttr.key.rawValue)='\(eachAttr.value)'"
             } else {
-                result += "\(eachAttr.key)"
+                result += "\(eachAttr.key.rawValue)"
             }
         }
 
@@ -241,7 +261,19 @@ public class HTMLNode : XMLNode, IGlobalContainer {
             }
             first = false
             if (eachAttr.value.count > 0) {
-                result += "\(eachAttr.key) = \(eachAttr.value)"
+                result += "\(eachAttr.key.rawValue) = \(eachAttr.value)"
+            } else {
+                result += "\(eachAttr.key.rawValue)"
+            }
+        }
+
+        for eachAttr in ariaAttributes {
+            if (!first) {
+                result += " "
+            }
+            first = false
+            if (eachAttr.value.count > 0) {
+                result += "\(eachAttr.key)='\(eachAttr.value)'"
             } else {
                 result += "\(eachAttr.key)"
             }
@@ -402,9 +434,14 @@ func isGlobalHTMLAttribute(_ key:String) -> Bool {
     if let _ = GlobalEventKey(rawValue: key.asSubstring()) {
         return true
     }
+    if key.count >= 5 {
         if key[..<key.index(key.startIndex, offsetBy: 5)] == "data-" {
             return true
         }
+        if key[..<key.index(key.startIndex, offsetBy: 5)] == "aria-" {
+            return true
+        }
+    }
     return false
 }
 
@@ -428,4 +465,3 @@ public class NHTMLParent : NHTMLRenderable {
         return nil
     }
 }*/
-

Tests/HRWTests/Test.swift

@@ -82,6 +82,15 @@ final class HRWTests: XCTestCase {
         print(htmlRoot.toString())
     }
 
+    func testAriaAttributesAreGlobal() throws {
+        guard let xmlReader = XMLParser(str: #"<span aria-hidden="true">Hidden</span>"#) else { throw EmptyStringError() }
+        let rootNodes = try xmlReader.readObjects()
+        let span = rootNodes[0] as! Span
+
+        XCTAssertEqual(span.ariaAttributes["aria-hidden"], "true")
+        XCTAssertTrue(span.renderAttributes().contains("aria-hidden='true'"))
+    }
+    
     func testBindingGenerator() throws {
         IHtmlNodeContainerUtility.sharedInstance.defaultBaseDir = "/Users/isaacpaul/Projects/swift-projects/HRW/Tests/HRWTests"
         let idk = try Example()