fix(models): drop protocol defaults

Author: hyochan

Example/OpenIapExample/Models/IapCompat.swift

@@ -31,9 +31,6 @@ extension PurchaseIOS {
     }
 }
 
-@available(iOS 15.0, *)
-extension PurchaseIOS: Identifiable {}
-
 @available(iOS 15.0, *)
 extension ProductIOS {
     var productIdentifier: String { id }

Example/OpenIapExample/Screens/AvailablePurchasesScreen.swift

@@ -34,8 +34,13 @@ struct AvailablePurchasesScreen: View {
                 .disabled(iapStore.status.loadings.restorePurchases)
             }
         }
-        .sheet(item: $selectedPurchase) { purchase in
-            PurchaseDetailSheet(purchase: purchase)
+        .sheet(isPresented: Binding(
+            get: { selectedPurchase != nil },
+            set: { if !$0 { selectedPurchase = nil } }
+        )) {
+            if let purchase = selectedPurchase {
+                PurchaseDetailSheet(purchase: purchase)
+            }
         }
         .alert("Error", isPresented: $showError) {
             Button("OK") {}

Example/OpenIapExample/Screens/PurchaseFlowScreen.swift

@@ -59,8 +59,13 @@ struct PurchaseFlowScreen: View {
         } message: {
             Text(errorMessage)
         }
-        .sheet(item: $selectedPurchase) { purchase in
-            PurchaseDetailSheet(purchase: purchase)
+        .sheet(isPresented: Binding(
+            get: { selectedPurchase != nil },
+            set: { if !$0 { selectedPurchase = nil } }
+        )) {
+            if let purchase = selectedPurchase {
+                PurchaseDetailSheet(purchase: purchase)
+            }
         }
     }
 

Example/OpenIapExample/Screens/SubscriptionFlowScreen.swift

@@ -179,8 +179,13 @@ struct SubscriptionFlowScreen: View {
             }
             .disabled(iapStore.status.isLoading)
         )
-        .sheet(item: $selectedPurchase) { purchase in
-            PurchaseDetailSheet(purchase: purchase)
+        .sheet(isPresented: Binding(
+            get: { selectedPurchase != nil },
+            set: { if !$0 { selectedPurchase = nil } }
+        )) {
+            if let purchase = selectedPurchase {
+                PurchaseDetailSheet(purchase: purchase)
+            }
         }
         .alert("Error", isPresented: $showError) {
             Button("OK") {}

Sources/Models/Types.swift

@@ -935,11 +935,11 @@ public protocol MutationResolver {
     /// Consume a purchase token so it can be repurchased
     func consumePurchaseAndroid(_ purchaseToken: String) async throws -> Bool
     /// Open the native subscription management surface
-    func deepLinkToSubscriptions(_ options: DeepLinkOptions? = nil) async throws -> Void
+    func deepLinkToSubscriptions(_ options: DeepLinkOptions?) async throws -> Void
     /// Close the platform billing connection
     func endConnection() async throws -> Bool
     /// Finish a transaction after validating receipts
-    func finishTransaction(purchase: PurchaseInput, isConsumable: Bool? = nil) async throws -> Void
+    func finishTransaction(purchase: PurchaseInput, isConsumable: Bool?) async throws -> Void
     /// Establish the platform billing connection
     func initConnection() async throws -> Bool
     /// Present the App Store code redemption sheet
@@ -965,11 +965,11 @@ public protocol QueryResolver {
     /// Retrieve products or subscriptions from the store
     func fetchProducts(_ params: ProductRequest) async throws -> FetchProductsResult
     /// Get active subscriptions (filters by subscriptionIds when provided)
-    func getActiveSubscriptions(_ subscriptionIds: [String]? = nil) async throws -> [ActiveSubscription]
+    func getActiveSubscriptions(_ subscriptionIds: [String]?) async throws -> [ActiveSubscription]
     /// Fetch the current app transaction (iOS 16+)
     func getAppTransactionIOS() async throws -> AppTransaction?
     /// Get all available purchases for the current user
-    func getAvailablePurchases(_ options: PurchaseOptions? = nil) async throws -> [Purchase]
+    func getAvailablePurchases(_ options: PurchaseOptions?) async throws -> [Purchase]
     /// Retrieve all pending transactions in the StoreKit queue
     func getPendingTransactionsIOS() async throws -> [PurchaseIOS]
     /// Get the currently promoted product (iOS 11+)
@@ -981,7 +981,7 @@ public protocol QueryResolver {
     /// Get the transaction JWS (StoreKit 2)
     func getTransactionJwsIOS(_ sku: String) async throws -> String?
     /// Check whether the user has active subscriptions
-    func hasActiveSubscriptions(_ subscriptionIds: [String]? = nil) async throws -> Bool
+    func hasActiveSubscriptions(_ subscriptionIds: [String]?) async throws -> Bool
     /// Check introductory offer eligibility for a subscription group
     func isEligibleForIntroOfferIOS(_ groupID: String) async throws -> Bool
     /// Verify a StoreKit 2 transaction signature

scripts/generate-types.sh

@@ -22,6 +22,40 @@ echo "Downloading Swift types for openiap-gql ${VERSION}..."
 curl -fL "${DOWNLOAD_URL}" -o "${TMP_DIR}/${ZIP_NAME}"
 
 echo "Extracting ${SWIFT_FILE}..."
-unzip -p "${TMP_DIR}/${ZIP_NAME}" "${SWIFT_FILE}" > "${OUTPUT_PATH}"
+# Extract generated file
+TMP_SWIFT="${TMP_DIR}/${SWIFT_FILE}"
+unzip -p "${TMP_DIR}/${ZIP_NAME}" "${SWIFT_FILE}" > "${TMP_SWIFT}"
+export TMP_SWIFT OUTPUT_PATH
+
+# Remove default arguments from protocol requirements (not supported in Swift)
+python3 - <<'PY'
+import os
+import re
+from pathlib import Path
+
+source = Path(os.environ["TMP_SWIFT"])
+dest = Path(os.environ["OUTPUT_PATH"])
+
+text = source.read_text()
+
+defaults = {
+    r"func deepLinkToSubscriptions\(_ options: DeepLinkOptions\? = nil\)":
+        "func deepLinkToSubscriptions(_ options: DeepLinkOptions?)",
+    r"func finishTransaction\(purchase: PurchaseInput, isConsumable: Bool\? = nil\)":
+        "func finishTransaction(purchase: PurchaseInput, isConsumable: Bool?)",
+    r"func getActiveSubscriptions\(_ subscriptionIds: \[String\]\? = nil\)":
+        "func getActiveSubscriptions(_ subscriptionIds: [String]?)",
+    r"func getAvailablePurchases\(_ options: PurchaseOptions\? = nil\)":
+        "func getAvailablePurchases(_ options: PurchaseOptions?)",
+    r"func hasActiveSubscriptions\(_ subscriptionIds: \[String\]\? = nil\)":
+        "func hasActiveSubscriptions(_ subscriptionIds: [String]?)",
+}
+
+for pattern, replacement in defaults.items():
+    text = re.sub(pattern, replacement, text)
+
+source.write_text(text)
+source.replace(dest)
+PY
 
 echo "Wrote ${OUTPUT_PATH}"