Swift 6 compatibility and naming convention fixes

- Update to Swift 6.0 tools version
- Add Sendable conformance to property wrappers
- BREAKING: Rename property wrapper types to follow Swift conventions:
  - @Embedded.json → @Embedded.JSON
  - @Embedded.yaml → @Embedded.YAML
  - @Embedded.text → @Embedded.Text
- Fix static methods to work without property wrappers
- Add SwiftLint configuration
- Fix all linting issues

Author: sdfsdhgjkbmnmxc

.swiftlint.yml

@@ -0,0 +1,2 @@
+excluded:
+  - .build

Makefile

@@ -16,13 +16,11 @@ clean:
 build:
 	swift build
 
-# Format code
-format:
-	swift-format . -i -r
-
-# Lint code
 lint:
-	swift-format lint . -r
+	swiftlint
+
+lint-fix:
+	swiftlint --fix
 
 # Create a new release
 release:

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -14,7 +14,7 @@ let package = Package(
     products: [
         .library(
             name: "SwiftEmbed",
-            targets: ["SwiftEmbed"]),
+            targets: ["SwiftEmbed"])
     ],
     dependencies: [
         .package(url: "https://github.com/jpsim/Yams.git", from: "6.1.0")
@@ -30,6 +30,6 @@ let package = Package(
             resources: [
                 .copy("TestData")
             ]
-        ),
+        )
     ]
 )

README.md

@@ -29,7 +29,7 @@ dependencies: [
 ## Usage
 
 SwiftEmbed provides two ways to load resources:
-- **Property wrappers** (`@Embedded.json` / `@Embedded.yaml` / `@Embedded.text`) - for class/struct properties
+- **Property wrappers** (`@Embedded.JSON` / `@Embedded.YAML` / `@Embedded.Text`) - for class/struct properties
 - **Direct loading** (`Embedded.getJSON` / `Embedded.getYAML` / `Embedded.getText`) - for immediate use
 
 ### Property Wrappers
@@ -49,13 +49,13 @@ struct User: Decodable {
 }
 
 struct MyApp {
-    @Embedded.json(Bundle.main, path: "Resources/users.json")
+    @Embedded.JSON(Bundle.main, path: "Resources/users.json")
     var users: [User]
 
-    @Embedded.yaml(Bundle.main, path: "Config/settings.yaml")
+    @Embedded.YAML(Bundle.main, path: "Config/settings.yaml")
     var config: Config
 
-    @Embedded.text(Bundle.main, path: "Resources/template.html")
+    @Embedded.Text(Bundle.main, path: "Resources/template.html")
     var htmlTemplate: String
 
     func printInfo() {

Sources/SwiftEmbed/Embedded.swift

@@ -5,36 +5,50 @@ import Yams
 public enum Embedded {
     /// Load JSON resource and decode it to the specified type
     public static func getJSON<T: Decodable>(_ bundle: Bundle, path: String, as type: T.Type = T.self) -> T {
-        @json(bundle, path: path)
-        var value: T
-        return value
+        let data = loadData(path: path, bundle: bundle)
+
+        do {
+            let decoder = JSONDecoder()
+            return try decoder.decode(T.self, from: data)
+        } catch {
+            fatalError("Failed to decode JSON from '\(path)': \(error)")
+        }
     }
-    
+
     /// Load YAML resource and decode it to the specified type
     public static func getYAML<T: Decodable>(_ bundle: Bundle, path: String, as type: T.Type = T.self) -> T {
-        @yaml(bundle, path: path)
-        var value: T
-        return value
+        let data = loadData(path: path, bundle: bundle)
+
+        do {
+            let decoder = YAMLDecoder()
+            return try decoder.decode(T.self, from: data)
+        } catch {
+            fatalError("Failed to decode YAML from '\(path)': \(error)")
+        }
     }
-    
+
     /// Load text resource as String
     public static func getText(_ bundle: Bundle, path: String) -> String {
-        @text(bundle, path: path)
-        var value: String
-        return value
+        let data = loadData(path: path, bundle: bundle)
+
+        guard let string = String(data: data, encoding: .utf8) else {
+            fatalError("Failed to decode text from '\(path)': not valid UTF-8")
+        }
+
+        return string
     }
-    
+
     @propertyWrapper
-    public struct json<T: Decodable> {
+    public struct JSON<T: Decodable>: Sendable where T: Sendable {
         private let value: T
-        
+
         public var wrappedValue: T {
             value
         }
-        
+
         public init(_ bundle: Bundle, path: String) {
             let data = Self.loadData(path: path, bundle: bundle)
-            
+
             do {
                 let decoder = JSONDecoder()
                 self.value = try decoder.decode(T.self, from: data)
@@ -43,18 +57,18 @@ public enum Embedded {
             }
         }
     }
-    
+
     @propertyWrapper
-    public struct yaml<T: Decodable> {
+    public struct YAML<T: Decodable>: Sendable where T: Sendable {
         private let value: T
-        
+
         public var wrappedValue: T {
             value
         }
-        
+
         public init(_ bundle: Bundle, path: String) {
             let data = Self.loadData(path: path, bundle: bundle)
-            
+
             do {
                 let decoder = YAMLDecoder()
                 self.value = try decoder.decode(T.self, from: data)
@@ -63,22 +77,22 @@ public enum Embedded {
             }
         }
     }
-    
+
     @propertyWrapper
-    public struct text {
+    public struct Text: Sendable {
         private let value: String
-        
+
         public var wrappedValue: String {
             value
         }
-        
+
         public init(_ bundle: Bundle, path: String) {
             let data = Self.loadData(path: path, bundle: bundle)
-            
+
             guard let string = String(data: data, encoding: .utf8) else {
                 fatalError("Failed to decode text from '\(path)': not valid UTF-8")
             }
-            
+
             self.value = string
         }
     }
@@ -89,26 +103,26 @@ private extension Embedded {
     static func loadData(path: String, bundle: Bundle) -> Data {
         // Split path into components
         let pathComponents = path.split(separator: "/").map(String.init)
-        
+
         // Extract filename and extension from last component
         let filename = pathComponents.last ?? path
         let url = URL(fileURLWithPath: filename)
         let nameWithoutExtension = url.deletingPathExtension().lastPathComponent
         let fileExtension = url.pathExtension
-        
+
         // Get subdirectory if path has multiple components
-        let subdirectory: String? = pathComponents.count > 1 
+        let subdirectory: String? = pathComponents.count > 1
             ? pathComponents.dropLast().joined(separator: "/")
             : nil
-        
+
         guard let resourceURL = bundle.url(
             forResource: nameWithoutExtension,
             withExtension: fileExtension,
             subdirectory: subdirectory
         ) else {
             fatalError("Resource not found: '\(path)' in bundle: \(bundle.bundlePath)")
         }
-        
+
         do {
             return try Data(contentsOf: resourceURL)
         } catch {
@@ -117,20 +131,20 @@ private extension Embedded {
     }
 }
 
-private extension Embedded.json {
+private extension Embedded.JSON {
     static func loadData(path: String, bundle: Bundle) -> Data {
         Embedded.loadData(path: path, bundle: bundle)
     }
 }
 
-private extension Embedded.yaml {
+private extension Embedded.YAML {
     static func loadData(path: String, bundle: Bundle) -> Data {
         Embedded.loadData(path: path, bundle: bundle)
     }
 }
 
-private extension Embedded.text {
+private extension Embedded.Text {
     static func loadData(path: String, bundle: Bundle) -> Data {
         Embedded.loadData(path: path, bundle: bundle)
     }
-}
+}