2.9.0

Author: nathantannar4

.github/workflows/swift.yml

@@ -33,9 +33,9 @@ jobs:
     - name: Build for visionOS
       run: xcodebuild -scheme Engine -destination 'generic/platform=visionOS Simulator' build
     - name: Test for macOS
-      run: xcodebuild -scheme EngineTests -destination 'platform=macOS' test
+      run: xcodebuild -scheme Engine-Package -destination 'platform=macOS' -skip-testing EngineTestsBenchmarks test
     - name: Test for iOS
-      run: xcodebuild -scheme EngineTests -destination 'platform=iOS Simulator,name=iPhone 16' test
+      run: xcodebuild -scheme Engine-Package -destination 'platform=iOS Simulator,name=iPhone 16' -skip-testing EngineTestsBenchmarks test
   build-26:
     runs-on: macos-latest
     steps:
@@ -59,6 +59,6 @@ jobs:
     - name: Build for visionOS
       run: xcodebuild -scheme Engine -destination 'generic/platform=visionOS Simulator' build
     - name: Test for macOS
-      run: xcodebuild -scheme EngineTests -destination 'platform=macOS' test
+      run: xcodebuild -scheme Engine-Package -destination 'platform=macOS' -skip-testing EngineTestsBenchmarks test
     - name: Test for iOS
-      run: xcodebuild -scheme EngineTests -destination 'platform=iOS Simulator,name=iPhone 17' test
+      run: xcodebuild -scheme Engine-Package -destination 'platform=iOS Simulator,name=iPhone 17' -skip-testing EngineTestsBenchmarks test

Sources/Engine/Sources/IsNilTransform.swift

@@ -30,6 +30,24 @@ extension Optional {
     }
 }
 
+extension Optional where Wrapped == String {
+
+    @usableFromInline
+    var value: String {
+        get {
+            switch self {
+            case .none:
+                return ""
+            case .some(let wrapped):
+                return wrapped
+            }
+        }
+        set {
+            self = newValue.isEmpty ? .none : .some(newValue)
+        }
+    }
+}
+
 extension Hashable {
 
     @usableFromInline

Sources/Engine/Sources/IsNotNilTransform.swift

@@ -0,0 +1,111 @@
+//
+// Copyright (c) Nathan Tannar
+//
+
+import SwiftUI
+
+extension Binding {
+
+    /// A ``BindingTransform`` that transforms the value to `true` when `nil`
+    @inlinable
+    public func isNil<Wrapped>() -> Binding<Bool> where Optional<Wrapped> == Value {
+        self[keyPath: \.isNone]
+    }
+
+    /// A ``BindingTransform`` that transforms the value to `true` when `.some`
+    @inlinable
+    public func isNotNil<Wrapped>() -> Binding<Bool> where Optional<Wrapped> == Value {
+        self[keyPath: \.isNotNone]
+    }
+}
+
+extension Binding where Value == Optional<String> {
+
+    /// A ``BindingTransform`` that transforms a `nil` `String` to an empty string, and an empty `String` to `nil`
+    @inlinable
+    public func value() -> Binding<String> {
+        self[keyPath: \.value]
+    }
+}
+
+// MARK: - Previews
+
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
+struct OptionalTransform_Previews: PreviewProvider {
+    static var previews: some View {
+        IsNilPreview()
+        IsNotNilPreview()
+    }
+
+    struct IsNilPreview: View {
+        @State var value: String?
+        @State var update = 0
+
+        var body: some View {
+            VStack {
+                ToggleView(isNil: $value.isNil())
+
+                if let value {
+                    Text(value)
+                }
+
+                Button {
+                    value = "Hello, World"
+                } label: {
+                    Text("Add Text")
+                }
+
+                Button {
+                    update += 1
+                } label: {
+                    Text("Render Update \(update)")
+                }
+            }
+        }
+
+        struct ToggleView: View {
+            @Binding var isNil: Bool
+            var body: some View {
+                Self._printChanges()
+                return Toggle(isOn: $isNil) { EmptyView() }
+                    .labelsHidden()
+            }
+        }
+    }
+
+    struct IsNotNilPreview: View {
+        @State var value: String?
+        @State var update = 0
+
+        var body: some View {
+            VStack {
+                ToggleView(isNotNil: $value.isNotNil())
+
+                if let value {
+                    Text(value)
+                }
+
+                Button {
+                    value = "Hello, World"
+                } label: {
+                    Text("Add Text")
+                }
+
+                Button {
+                    update += 1
+                } label: {
+                    Text("Render Update \(update)")
+                }
+            }
+        }
+
+        struct ToggleView: View {
+            @Binding var isNotNil: Bool
+            var body: some View {
+                Self._printChanges()
+                return Toggle(isOn: $isNotNil) { EmptyView() }
+                    .labelsHidden()
+            }
+        }
+    }
+}

Sources/Engine/Sources/Optional+Extensions.swift

@@ -10,15 +10,14 @@ import SwiftUI
 @available(tvOS, introduced: 13.0, deprecated: 100000.0, message: "Please use the built in UnevenRoundedRectangle")
 @available(watchOS, introduced: 6.0, deprecated: 100000.0, message: "Please use the built in UnevenRoundedRectangle")
 @available(visionOS, introduced: 1.0, deprecated: 100000.0, message: "Please use the built in UnevenRoundedRectangle")
-public struct UnevenRoundedRectangle: Shape {
+public struct RoundedCornersRectangle: Shape {
 
     public var topLeadingRadius: CGFloat
     public var bottomLeadingRadius: CGFloat
     public var topTrailingRadius: CGFloat
     public var bottomTrailingRadius: CGFloat
     public var style: RoundedCornerStyle
 
-    @_disfavoredOverload
     @inlinable
     public init(
         topLeadingRadius: CGFloat = 0,
@@ -92,15 +91,15 @@ public struct UnevenRoundedRectangle: Shape {
 
 // MARK: - Previews
 
-struct UnevenRoundedRectangle_Previews: PreviewProvider {
+struct RoundedCornersRectangle_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
-            UnevenRoundedRectangle(topLeadingRadius: 12, bottomLeadingRadius: 0, bottomTrailingRadius: 12, topTrailingRadius: 0)
+            RoundedCornersRectangle(topLeadingRadius: 12, bottomLeadingRadius: 0, bottomTrailingRadius: 12, topTrailingRadius: 0)
                 .fill(Color.blue)
                 .frame(height: 50)
 
             if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *) {
-                SwiftUI.UnevenRoundedRectangle(topLeadingRadius: 12, bottomLeadingRadius: 0, bottomTrailingRadius: 12, topTrailingRadius: 0)
+                UnevenRoundedRectangle(topLeadingRadius: 12, bottomLeadingRadius: 0, bottomTrailingRadius: 12, topTrailingRadius: 0)
                     .fill(Color.blue)
                     .frame(height: 50)
             }

Sources/Engine/Sources/OptionalTransform.swift

@@ -0,0 +1,8 @@
+//
+// Copyright (c) Nathan Tannar
+//
+
+import Foundation
+
+@attached(member, names: arbitrary)
+public macro EnumKeyPaths() = #externalMacro(module: "EngineMacrosCore", type: "EnumKeyPathMacro")

…ces/Engine/Sources/UnevenRectangle.swift …ne/Sources/RoundedCornersRectangle.swiftSources/Engine/Sources/UnevenRectangle.swift renamed to Sources/Engine/Sources/RoundedCornersRectangle.swift Sources/Engine/Sources/UnevenRectangle.swift renamed to Sources/Engine/Sources/RoundedCornersRectangle.swift

@@ -8,6 +8,7 @@ import SwiftSyntaxMacros
 @main
 struct EngineMacrosCore: CompilerPlugin {
     let providingMacros: [Macro.Type] = [
-        StyledViewMacro.self
+        StyledViewMacro.self,
+        EnumKeyPathsMacro.self,
     ]
 }