feat: simple and attributegroup parsing

Sources/PugiSwiftDemo/main.swift

@@ -8,11 +8,6 @@
 import Foundation
 import PugiSwift
 
-@Node struct Records {
-    @Attribute let value: String
-    @Element(childrenCodingKey: "record") let records: [Record]
-}
-
 @Restriction struct ExampleIntType: NumericRestrictions {
 
     static let maxExclusive = 5
@@ -48,7 +43,7 @@ import PugiSwift
     let color: Colours
 }
 
-@Node struct OptionalRecord {
+@Node struct Records {
     @Attribute let value: String?
     @Element(childrenCodingKey: "record") let records: [Record]?
 }
@@ -58,7 +53,6 @@ import PugiSwift
     case red = "red"
     case green = "green"
     case blue = "blue"
-
 }
 
 let str =
@@ -83,7 +77,7 @@ let str =
 """
 
 do {
-    let records = try OptionalRecord(from: str)
+    let records = try Records(from: str)
     print(records)
 } catch {
     print("Error: \(error.localizedDescription)")

Sources/PugiSwiftMacros/NodeMacro.swift

@@ -110,7 +110,7 @@ public struct NodeMacro: ExtensionMacro {
                     guard let wrappedArry = ArrayTypeSyntax(optionalArrayType._baseSyntax.wrappedType) else {
                         throw MacroError("\(propertyName) must be an array")
                     }
-                    let elementType = wrappedArry.elementType.description
+                    let elementType = wrappedArry.element.description
                     let code = CodeBlockItemSyntax(
                     """
                     var _\(raw: nodeHelperName) = [\(raw: elementType)]()
@@ -196,22 +196,22 @@ public struct NodeMacro: ExtensionMacro {
         guard let rawType = enumDecl.inheritedTypes.first?.normalizedDescription else {
             throw MacroError("Enum must have a raw type.")
         }
-
-        var functionDecl = Self.createFunction(with: enumDecl.accessLevel,
-                                               name: "node",
-                                               type: "PugiSwift.XMLNode")
-        let syntax = CodeBlockItemSyntax(
+        var functionDeclAttr = Self.createFunction(with: enumDecl.accessLevel,
+                                                   name: "attribute",
+                                                   type: "(any AttributeProtocol)?")
+        let syntaxAttribute = CodeBlockItemSyntax(
         """
-        let rawValue = try \(raw: rawType).init(from: node)
+        let rawValue = try \(raw: rawType).init(from: attribute)
         guard let enumType = \(raw: enumDecl.identifier).init(rawValue: rawValue) else {
             throw .invalidCase
         }
         self = enumType
         """
         )
-        functionDecl.body = CodeBlockSyntax(statements: CodeBlockItemListSyntax([syntax]))
-        let memberBlockItemSyntax = MemberBlockItemSyntax(decl: functionDecl)
-        extensionDecl.memberBlock.members.append(memberBlockItemSyntax)
+        functionDeclAttr.body = CodeBlockSyntax(statements: CodeBlockItemListSyntax([syntaxAttribute]))
+        let memberBlockItemSyntaxAttr = MemberBlockItemSyntax(decl: functionDeclAttr)
+        extensionDecl.memberBlock.members.append(memberBlockItemSyntaxAttr)
+
         return [extensionDecl]
     }
 

Sources/swiftxsd/Types/Annotation.swift

@@ -0,0 +1,14 @@
+//
+//  Annotation.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+import Foundation
+import PugiSwift
+
+@Node public struct Annotation {
+
+    @Element(codingKey: "xs:documentation") public let documentation: String?
+
+}

Sources/swiftxsd/Types/Attribute.swift

@@ -0,0 +1,22 @@
+//
+//  Attribute.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public struct Attribute {
+
+    @Attribute public let name: String
+
+    @Attribute public let type: String
+
+    @Attribute public let use: String?
+
+    @Element(codingKey: "xs:annotation") public let annotation: Annotation?
+
+}
+

Sources/swiftxsd/Types/AttributeGroup.swift

@@ -0,0 +1,20 @@
+//
+//  AttributeGroup.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public struct AttributeGroup {
+
+    @Attribute public let name: String
+
+    @Element(childrenCodingKey: "xs:attribute") public let attributes: [Attribute]?
+
+    @Element(codingKey: "xs:annotation") public let annotation: Annotation?
+
+}
+

Sources/swiftxsd/Types/BaseType.swift

@@ -0,0 +1,62 @@
+//
+//  BaseTypes.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public enum BaseType: String {
+
+    case string = "xs:string"
+
+    case integer = "xs:integer"
+
+    case unsignedInt = "xs:unsignedInt"
+
+    case unsignedShort = "xs:unsignedShort"
+
+    case short = "xs:short"
+
+    case decimal = "xs:decimal"
+
+    case boolean = "xs:boolean"
+
+    case date = "xs:date"
+
+    case time = "xs:time"
+
+    case dateTime = "xs:dateTime"
+
+    case anyURI = "xs:anyURI"
+
+    public var rawType: XMLDecodable.Type {
+        switch self {
+        case .string:
+            return String.self
+        case .integer:
+            return Int.self
+        case .unsignedInt:
+            return UInt32.self
+        case .unsignedShort:
+            return UInt16.self
+        case .short:
+            return Int16.self
+        case .decimal:
+            return Double.self
+        case .boolean:
+            return Bool.self
+        case .date:
+            return String.self
+        case .time:
+            return String.self
+        case .dateTime:
+            return String.self
+        case .anyURI:
+            return URL.self
+        }
+    }
+
+}

Sources/swiftxsd/Types/Enumeration.swift

@@ -0,0 +1,15 @@
+//
+//  Enumeration.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public struct BasicType {
+
+    @Attribute public let value: String
+
+}

Sources/swiftxsd/Types/Restriction.swift

@@ -0,0 +1,35 @@
+//
+//  Restriction.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public struct Restriction {
+
+    @Attribute public var base: BaseType
+
+    @Element(childrenCodingKey: "xs:enumeration") public let enumeration: [BasicType]?
+
+    @Element(codingKey: "xs:length") public let length: BasicType?
+
+    @Element(codingKey: "xs:maxExclusive") public let maxExclusive: BasicType?
+
+    @Element(codingKey: "xs:maxInclusive") public let maxInclusive: BasicType?
+
+    @Element(codingKey: "xs:maxLength") public let maxLength: BasicType?
+
+    @Element(codingKey: "xs:minExclusive") public let minExclusive: BasicType?
+
+    @Element(codingKey: "xs:minInclusive") public let minInclusive: BasicType?
+
+    @Element(codingKey: "xs:minLength") public let minLength: BasicType?
+
+    @Element(codingKey: "xs:pattern") public let pattern: BasicType?
+
+    @Element(codingKey: "xs:totalDigits") public let totalDigits: BasicType?
+
+}

Sources/swiftxsd/Types/Schema.swift

@@ -0,0 +1,18 @@
+//
+//  Schema.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public struct Schema {
+
+    @Element(childrenCodingKey: "xs:simpleType") public let simpleTypes: [SimpleType]
+
+    @Element(childrenCodingKey: "xs:attributeGroup") public let attributeGroups: [AttributeGroup]
+
+
+}

Sources/swiftxsd/Types/SimpleType.swift

@@ -0,0 +1,19 @@
+//
+//  SimpleType.swift
+//  PugiSwift
+//
+//  Created by Amy on 01/11/2024.
+//
+
+import Foundation
+import PugiSwift
+
+@Node public struct SimpleType {
+
+    @Attribute public let name: String
+
+    @Element(codingKey: "xs:annotation") public let annotation: Annotation?
+
+    @Element(codingKey: "xs:restriction") public let restriction: Restriction
+
+}