Keep FetchProductsResultAll as it exists in Types.kt

Author: hyochan

openiap/src/main/java/dev/hyo/openiap/OpenIapModule.kt

@@ -58,7 +58,6 @@ import dev.hyo.openiap.utils.BillingConverters.toPurchase
 import dev.hyo.openiap.utils.BillingConverters.toSubscriptionProduct
 import dev.hyo.openiap.utils.fromBillingState
 import dev.hyo.openiap.utils.toActiveSubscription
-import dev.hyo.openiap.utils.toProduct
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext

openiap/src/main/java/dev/hyo/openiap/Types.kt

@@ -562,8 +562,6 @@ public data class FetchProductsResultProducts(val value: List<Product>?) : Fetch
 
 public data class FetchProductsResultSubscriptions(val value: List<ProductSubscription>?) : FetchProductsResult
 
-public data class FetchProductsResultAll(val products: List<Product>?, val subscriptions: List<ProductSubscription>?) : FetchProductsResult
-
 public data class PricingPhaseAndroid(
     val billingCycleCount: Int,
     val billingPeriod: String,
@@ -2065,6 +2063,10 @@ public interface QueryResolver {
      * Get base64-encoded receipt data for validation
      */
     suspend fun getReceiptDataIOS(): String?
+    /**
+     * Get the current storefront country code
+     */
+    suspend fun getStorefront(): String
     /**
      * Get the current App Store storefront country code
      */
@@ -2165,6 +2167,7 @@ public typealias QueryGetAvailablePurchasesHandler = suspend (options: PurchaseO
 public typealias QueryGetPendingTransactionsIOSHandler = suspend () -> List<PurchaseIOS>
 public typealias QueryGetPromotedProductIOSHandler = suspend () -> ProductIOS?
 public typealias QueryGetReceiptDataIOSHandler = suspend () -> String?
+public typealias QueryGetStorefrontHandler = suspend () -> String
 public typealias QueryGetStorefrontIOSHandler = suspend () -> String
 public typealias QueryGetTransactionJwsIOSHandler = suspend (sku: String) -> String?
 public typealias QueryHasActiveSubscriptionsHandler = suspend (subscriptionIds: List<String>?) -> Boolean
@@ -2183,6 +2186,7 @@ public data class QueryHandlers(
     val getPendingTransactionsIOS: QueryGetPendingTransactionsIOSHandler? = null,
     val getPromotedProductIOS: QueryGetPromotedProductIOSHandler? = null,
     val getReceiptDataIOS: QueryGetReceiptDataIOSHandler? = null,
+    val getStorefront: QueryGetStorefrontHandler? = null,
     val getStorefrontIOS: QueryGetStorefrontIOSHandler? = null,
     val getTransactionJwsIOS: QueryGetTransactionJwsIOSHandler? = null,
     val hasActiveSubscriptions: QueryHasActiveSubscriptionsHandler? = null,

openiap/src/main/java/dev/hyo/openiap/store/OpenIapStore.kt

@@ -172,7 +172,7 @@ class OpenIapStore(private val module: OpenIapModule) {
             val result = module.fetchProducts(ProductRequest(skus = skus, type = type))
             when (result) {
                 is FetchProductsResultProducts -> {
-                    // Merge new in-app products with existing ones
+                    // Merge new products with existing ones
                     val newProducts = result.value.orEmpty()
                     val existingProductIds = _products.value.map { it.id }.toSet()
                     val productsToAdd = newProducts.filter { it.id !in existingProductIds }
@@ -194,7 +194,7 @@ class OpenIapStore(private val module: OpenIapModule) {
                     _products.value = _products.value + productsToAdd
                 }
                 is FetchProductsResultAll -> {
-                    // Replace all with the combined result
+                    // For All type, replace with combined results
                     _products.value = result.products.orEmpty()
                     _subscriptions.value = result.subscriptions.orEmpty()
                 }

scripts/generate-types.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-VERSION="1.0.8"
+VERSION=""
 SKIP_DOWNLOAD=false
 
 while [[ $# -gt 0 ]]; do
@@ -47,7 +47,14 @@ REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 TARGET_DIR="${REPO_ROOT}/openiap/src/main/java/dev/hyo/openiap"
 TARGET_FILE="${TARGET_DIR}/Types.kt"
 VERSION_FILE="${REPO_ROOT}/VERSION"
+VERSIONS_JSON="${REPO_ROOT}/openiap-versions.json"
 
+# Try to get version from openiap-versions.json first
+if [[ -z "$VERSION" ]] && [[ -f "$VERSIONS_JSON" ]]; then
+  VERSION="$(python3 -c "import json; print(json.load(open('$VERSIONS_JSON'))['gql'])" 2>/dev/null || true)"
+fi
+
+# Fall back to VERSION file if not found
 if [[ -z "$VERSION" ]] && [[ -f "$VERSION_FILE" ]]; then
   VERSION="$(head -n1 "$VERSION_FILE" | tr -d ' \r')"
 fi