wip

Author: davdroman

Sources/Introspect.swift

@@ -41,7 +41,7 @@ extension View {
     /// ```
     public func introspect<SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity>(
         _ viewType: SwiftUIViewType,
-        on platforms: (PlatformViewVersions<SwiftUIViewType, PlatformSpecificEntity>)...,
+        on platforms: (PlatformViewVersionGroup<SwiftUIViewType, PlatformSpecificEntity>)...,
         scope: IntrospectionScope? = nil,
         customize: @escaping (PlatformSpecificEntity) -> Void
     ) -> some View {
@@ -57,12 +57,12 @@ struct IntrospectModifier<SwiftUIViewType: IntrospectableViewType, PlatformSpeci
 
     init(
         _ viewType: SwiftUIViewType,
-        platforms: [PlatformViewVersions<SwiftUIViewType, PlatformSpecificEntity>],
+        platforms: [PlatformViewVersionGroup<SwiftUIViewType, PlatformSpecificEntity>],
         scope: IntrospectionScope?,
         customize: @escaping (PlatformSpecificEntity) -> Void
     ) {
         self.scope = scope ?? viewType.scope
-        if let platform = platforms.first(where: \.isCurrent) {
+        if let platform = platforms.first(where: \.containsCurrent) {
             self.selector = platform.selector ?? .default
         } else {
             self.selector = nil

Sources/IntrospectionSelector.swift

@@ -1,4 +1,3 @@
-@_spi(Internals)
 public struct IntrospectionSelector<Target: PlatformEntity> {
     @_spi(Internals)
     public static var `default`: Self { .from(Target.self, selector: { $0 }) }

Sources/PlatformViewVersion.swift

@@ -1,17 +1,17 @@
 import SwiftUI
 
-public struct PlatformViewVersions<SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> {
-    let isCurrent: Bool
+public struct PlatformViewVersionGroup<SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> {
+    let containsCurrent: Bool
     let selector: IntrospectionSelector<PlatformSpecificEntity>?
 
     private init<Version: PlatformVersion>(
         _ versions: [PlatformViewVersion<Version, SwiftUIViewType, PlatformSpecificEntity>]
     ) {
         if let currentVersion = versions.first(where: \.isCurrent) {
-            self.isCurrent = true
+            self.containsCurrent = true
             self.selector = currentVersion.selector
         } else {
-            self.isCurrent = false
+            self.containsCurrent = false
             self.selector = nil
         }
     }
@@ -36,14 +36,41 @@ public typealias tvOSViewVersion<SwiftUIViewType: IntrospectableViewType, Platfo
 public typealias macOSViewVersion<SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> =
     PlatformViewVersion<macOSVersion, SwiftUIViewType, PlatformSpecificEntity>
 
-public struct PlatformViewVersion<Version: PlatformVersion, SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> {
-    let isCurrent: Bool
-    let selector: IntrospectionSelector<PlatformSpecificEntity>?
+public enum PlatformViewVersion<Version: PlatformVersion, SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> {
+    case available(Version, IntrospectionSelector<PlatformSpecificEntity>?)
+    case unavailable
+
+    var isCurrent: Bool {
+        switch self {
+        case .available(let version, _):
+            return version.isCurrent
+        case .unavailable:
+            return false
+        }
+    }
+
+    var isCurrentOrPast: Bool {
+        switch self {
+        case .available(let version, _):
+            return version.isCurrentOrPast
+        case .unavailable:
+            return false
+        }
+    }
+
+    var selector: IntrospectionSelector<PlatformSpecificEntity>? {
+        switch self {
+        case .available(_, let selector):
+            return selector
+        case .unavailable:
+            return nil
+        }
+    }
 }
 
 extension PlatformViewVersion {
     @_spi(Internals) public init(for version: Version, selector: IntrospectionSelector<PlatformSpecificEntity>? = nil) {
-        self.init(isCurrent: version.isCurrent, selector: selector)
+        self = .available(version, selector)
     }
 
     @_spi(Internals) public static func unavailable(file: StaticString = #file, line: UInt = #line) -> Self {
@@ -60,6 +87,6 @@ extension PlatformViewVersion {
             https://github.com/siteline/swiftui-introspect/issues/new?title=`\(fileName):\(line)`+should+be+marked+unavailable
             """
         )
-        return Self(isCurrent: false, selector: nil)
+        return .unavailable
     }
 }