Move RawRepresentable up

Author: nmdias

Sources/Defaults.swift

@@ -121,6 +121,30 @@ public struct Defaults {
     }
   }
 
+  // MARK: - RawRepresentable
+
+  /// Returns the value associated with the specified key.
+  ///
+  /// - Parameter key: The key.
+  /// - Returns: A `ValueType` or nil if the key was not found.
+  public func get<ValueType: RawRepresentable>(for key: Key<ValueType>) -> ValueType? where ValueType.RawValue: Codable {
+    let convertedKey = Key<ValueType.RawValue>(key._key)
+    if let raw = get(for: convertedKey) {
+      return ValueType(rawValue: raw)
+    }
+    return nil
+  }
+
+  /// Sets a value associated with the specified key.
+  ///
+  /// - Parameters:
+  ///   - some: The value to set.
+  ///   - key: The associated `Key<ValueType>`.
+  public func set<ValueType: RawRepresentable>(_ value: ValueType, for key: Key<ValueType>) where ValueType.RawValue: Codable {
+    let convertedKey = Key<ValueType.RawValue>(key._key)
+    set(value.rawValue, for: convertedKey)
+  }
+
   /// Removes given bundle's persistent domain
   ///
   /// - Parameter type: Bundle.
@@ -156,29 +180,3 @@ public struct Defaults {
     }
   }
 }
-
-// MARK: ValueType with RawRepresentable conformance
-
-extension Defaults {
-  /// Returns the value associated with the specified key.
-  ///
-  /// - Parameter key: The key.
-  /// - Returns: A `ValueType` or nil if the key was not found.
-  public func get<ValueType: RawRepresentable>(for key: Key<ValueType>) -> ValueType? where ValueType.RawValue: Codable {
-    let convertedKey = Key<ValueType.RawValue>(key._key)
-    if let raw = get(for: convertedKey) {
-      return ValueType(rawValue: raw)
-    }
-    return nil
-  }
-
-  /// Sets a value associated with the specified key.
-  ///
-  /// - Parameters:
-  ///   - some: The value to set.
-  ///   - key: The associated `Key<ValueType>`.
-  public func set<ValueType: RawRepresentable>(_ value: ValueType, for key: Key<ValueType>) where ValueType.RawValue: Codable {
-    let convertedKey = Key<ValueType.RawValue>(key._key)
-    set(value.rawValue, for: convertedKey)
-  }
-}

Tests/DefaultsTests.swift

@@ -214,4 +214,3 @@ struct DefaultsKitTests {
     #expect(expected == actual)
   }
 }
-