expo-iap 3.0.7 → 3.0.8

package/CLAUDE.md

@@ -8,6 +8,11 @@
 - Subject must be imperative, lowercase, without a trailing period, and roughly 50 characters
 - Wrap commit body lines near 72 characters and include footers such as `BREAKING CHANGE:` or `Closes #123` when needed
 
+## Tooling & Package Management
+
+- **Use Bun exclusively.** Run installs with `bun install`, scripts with `bun run <script>`, add deps via `bun add` / `bun add -d`.
+- Do **not** suggest or create `package-lock.json` or `yarn.lock`; `bun.lock` is the single source of truth.
+
 ## Expo-Specific Guidelines
 
 ### iOS Pod Configuration
@@ -38,6 +43,11 @@ Before committing any changes:
 
 ### Platform-Specific Naming Conventions
 
+#### Function Naming
+
+- Functions that only operate on one platform must carry the suffix: `nameIOS` or `nameAndroid` (e.g. `getStorefrontIOS`, `deepLinkToSubscriptionsAndroid`).
+- Cross-platform helpers should expose a single name and branch internally via `Platform.select` or equivalent.
+
 #### Field Naming
 
 - **iOS-related fields**: Use `IOS` suffix (e.g., `displayNameIOS`, `discountsIOS`, `introductoryPriceIOS`)
@@ -72,6 +82,8 @@ The library follows the OpenIAP type specifications with platform-specific exten
 
 > **Important:** `src/types.ts` is generated from the OpenIAP schema. Never edit this file manually or commit hand-written changes. After updating any `*.graphql` schema, run `bun run generate:types` (or the equivalent script in your package manager) to refresh the file.
 
+- Whenever you need Request/Params/Result types in the JS API surface (`src/index.ts`, hooks, modules, examples), import them directly from the generated `src/types.ts` (e.g., `MutationRequestPurchaseArgs`, `QueryFetchProductsArgs`). Bind exported functions with the generated `QueryField` / `MutationField` helpers so their signatures stay in lockstep with `types.ts` instead of redefining ad-hoc unions like `ProductTypeInput`.
+
 ### React/JSX Conventions
 
 - **Conditional Rendering**: Use ternary operator with null instead of logical AND

package/android/build.gradle

@@ -58,6 +58,6 @@ dependencies {
       implementation project(":openiap-google")
     } else {
       // Fallback to published artifact when local project isn't linked
-      implementation "io.github.hyochan.openiap:openiap-google:1.1.11"
+      implementation "io.github.hyochan.openiap:openiap-google:1.1.12"
     }
 }

package/build/index.d.ts

@@ -1,4 +1,4 @@
-import { Product, Purchase, RequestPurchaseProps, RequestPurchasePropsByPlatforms, RequestSubscriptionPropsByPlatforms, ProductSubscription, VoidResult, ReceiptValidationResult } from './types';
+import type { MutationField, Product, ProductQueryType, Purchase, QueryField } from './types';
 import { PurchaseError } from './purchase-error';
 export * from './types';
 export { ErrorCodeUtils, ErrorCodeMapping } from './purchase-error';
@@ -28,24 +28,7 @@ export declare const emitter: ExpoIapEmitter;
 /**
  * TODO(v3.1.0): Remove legacy 'inapp' alias once downstream apps migrate to 'in-app'.
  */
-export type ProductTypeInput = 'inapp' | 'in-app' | 'subs';
-export type InAppTypeInput = Exclude<ProductTypeInput, 'subs'>;
-type PurchaseRequestInApp = {
-    request: RequestPurchasePropsByPlatforms;
-    type?: InAppTypeInput;
-};
-type PurchaseRequestSubscription = {
-    request: RequestSubscriptionPropsByPlatforms;
-    type: 'subs';
-};
-export type PurchaseRequestInput = PurchaseRequestInApp | PurchaseRequestSubscription;
-export type PurchaseRequest = {
-    request: RequestPurchaseProps;
-    type?: InAppTypeInput;
-} | {
-    request: RequestSubscriptionPropsByPlatforms;
-    type: 'subs';
-};
+export type ProductTypeInput = ProductQueryType | 'inapp';
 export declare const purchaseUpdatedListener: (listener: (event: Purchase) => void) => {
     remove: () => void;
 };
@@ -75,38 +58,17 @@ export declare const purchaseErrorListener: (listener: (error: PurchaseError) =>
 export declare const promotedProductListenerIOS: (listener: (product: Product) => void) => {
     remove: () => void;
 };
-export declare function initConnection(): Promise<boolean>;
-export declare function endConnection(): Promise<boolean>;
+export declare const initConnection: MutationField<'initConnection'>;
+export declare const endConnection: MutationField<'endConnection'>;
 /**
  * Fetch products with unified API (v2.7.0+)
  *
- * @param params - Product fetch configuration
- * @param params.skus - Array of product SKUs to fetch
- * @param params.type - Type of products: 'in-app' for regular products (default) or 'subs' for subscriptions
- *
- * @example
- * ```typescript
- * // Regular products
- * const products = await fetchProducts({
- *   skus: ['product1', 'product2'],
- *   type: 'in-app'
- * });
- *
- * // Subscriptions
- * const subscriptions = await fetchProducts({
- *   skus: ['sub1', 'sub2'],
- *   type: 'subs'
- * });
- * ```
+ * @param request - Product fetch configuration
+ * @param request.skus - Array of product SKUs to fetch
+ * @param request.type - Product query type: 'in-app', 'subs', or 'all'
  */
-export declare const fetchProducts: ({ skus, type, }: {
-    skus: string[];
-    type?: ProductTypeInput;
-}) => Promise<Product[] | ProductSubscription[]>;
-export declare const getAvailablePurchases: ({ alsoPublishToEventListenerIOS, onlyIncludeActiveItemsIOS, }?: {
-    alsoPublishToEventListenerIOS?: boolean;
-    onlyIncludeActiveItemsIOS?: boolean;
-}) => Promise<Purchase[]>;
+export declare const fetchProducts: QueryField<'fetchProducts'>;
+export declare const getAvailablePurchases: QueryField<'getAvailablePurchases'>;
 /**
  * Restore completed transactions (cross-platform behavior)
  *
@@ -120,10 +82,7 @@ export declare const getAvailablePurchases: ({ alsoPublishToEventListenerIOS, on
  * @param options.onlyIncludeActiveItemsIOS - iOS only: whether to only include active items
  * @returns Promise resolving to the list of available/restored purchases
  */
-export declare const restorePurchases: (options?: {
-    alsoPublishToEventListenerIOS?: boolean;
-    onlyIncludeActiveItemsIOS?: boolean;
-}) => Promise<Purchase[]>;
+export declare const restorePurchases: MutationField<'restorePurchases'>;
 /**
  * Request a purchase for products or subscriptions.
  *
@@ -155,11 +114,8 @@ export declare const restorePurchases: (options?: {
  * });
  * ```
  */
-export declare const requestPurchase: (requestObj: PurchaseRequestInput) => Promise<Purchase | Purchase[] | void>;
-export declare const finishTransaction: ({ purchase, isConsumable, }: {
-    purchase: Purchase;
-    isConsumable?: boolean;
-}) => Promise<VoidResult | boolean>;
+export declare const requestPurchase: MutationField<'requestPurchase'>;
+export declare const finishTransaction: MutationField<'finishTransaction'>;
 /**
  * Retrieves the current storefront information from iOS App Store
  *
@@ -191,12 +147,7 @@ export declare const getStorefront: () => Promise<string>;
  * - iOS: Send receipt data to Apple's verification endpoint from your server
  * - Android: Use Google Play Developer API with service account credentials
  */
-export declare const validateReceipt: (sku: string, androidOptions?: {
-    packageName: string;
-    productToken: string;
-    accessToken: string;
-    isSub?: boolean;
-}) => Promise<ReceiptValidationResult>;
+export declare const validateReceipt: MutationField<'validateReceipt'>;
 /**
  * Deeplinks to native interface that allows users to manage their subscriptions
  * @param options.skuAndroid - Required for Android to locate specific subscription (ignored on iOS)
@@ -215,10 +166,7 @@ export declare const validateReceipt: (sku: string, androidOptions?: {
  *   packageNameAndroid: 'com.example.app'
  * });
  */
-export declare const deepLinkToSubscriptions: (options: {
-    skuAndroid?: string;
-    packageNameAndroid?: string;
-}) => Promise<void>;
+export declare const deepLinkToSubscriptions: MutationField<'deepLinkToSubscriptions'>;
 export * from './useIAP';
 export * from './utils/errorMapping';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAIV,aAAa,EAEb,OAAO,EAGP,gBAAgB,EAEhB,QAAQ,EAGR,UAAU,EAQX,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAI/C,cAAc,SAAS,CAAC;AACxB,OAAO,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClE,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAG9B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,EAAE,KAAmB,CAAC;AAEnC,oBAAY,YAAY;IACtB,eAAe,qBAAqB;IACpC,aAAa,mBAAmB;IAChC,kBAAkB,yBAAyB;CAC5C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,OAE1C;AAED,KAAK,oBAAoB,GAAG;IAC1B,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC;IACzC,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC5C,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC5C,CAAC;AAEF,KAAK,oBAAoB,CAAC,CAAC,SAAS,YAAY,IAAI,CAClD,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,KAC7B,IAAI,CAAC;AAEV,KAAK,cAAc,GAAG;IACpB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChC,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAChC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAAC,CAAC;IACxB,cAAc,CAAC,CAAC,SAAS,YAAY,EACnC,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAChC,IAAI,CAAC;CACT,CAAC;AAGF,eAAO,MAAM,OAAO,EACa,cAAc,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,OAAO,CAAC;AA8B1D,eAAO,MAAM,uBAAuB,GAClC,UAAU,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI;YA7CvB,MAAM,IAAI;CA2DvB,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,UAAU,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;YA9D5B,MAAM,IAAI;CA2EvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,0BAA0B,GACrC,UAAU,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI;YAlGxB,MAAM,IAAI;CA2GvB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,aAAa,CAAC,gBAAgB,CAC3B,CAAC;AAEjC,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,eAAe,CAC1B,CAAC;AAEhC;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,EAAE,UAAU,CAAC,eAAe,CA4DrD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAC5C,uBAAuB,CAoBxB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,kBAAkB,CAS9D,CAAC;AA4CF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAuH5D,CAAC;AAgBF,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,mBAAmB,CAqChE,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB,QAAO,OAAO,CAAC,MAAM,CAMjD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,QAAO,OAAO,CAAC,MAAM,CAS9C,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,iBAAiB,CA8B5D,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,uBAAuB,EAAE,aAAa,CACjD,yBAAyB,CAa1B,CAAC;AAEF,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC"}

package/build/index.js

@@ -5,9 +5,9 @@ import { Platform } from 'react-native';
 import ExpoIapModule from './ExpoIapModule';
 import { isProductIOS, validateReceiptIOS, deepLinkToSubscriptionsIOS, syncIOS, } from './modules/ios';
 import { isProductAndroid, validateReceiptAndroid, deepLinkToSubscriptionsAndroid, } from './modules/android';
-// Types
-import { ErrorCode, } from './types';
+import { ErrorCode } from './types';
 import { PurchaseError } from './purchase-error';
+import { normalizePurchaseId, normalizePurchaseList } from './utils/purchase';
 // Export all types
 export * from './types';
 export { ErrorCodeUtils, ErrorCodeMapping } from './purchase-error';
@@ -45,13 +45,20 @@ const normalizeProductType = (type) => {
             native: 'subs',
         };
     }
+    if (type === 'all') {
+        return {
+            canonical: 'all',
+            native: 'all',
+        };
+    }
     throw new Error(`Unsupported product type: ${type}`);
 };
 export const purchaseUpdatedListener = (listener) => {
     console.log('[JS] Registering purchaseUpdatedListener');
     const wrappedListener = (event) => {
-        console.log('[JS] purchaseUpdatedListener fired:', event);
-        listener(event);
+        const normalized = normalizePurchaseId(event);
+        console.log('[JS] purchaseUpdatedListener fired:', normalized);
+        listener(normalized);
     };
     const emitterSubscription = emitter.addListener(OpenIapEvent.PurchaseUpdated, wrappedListener);
     console.log('[JS] purchaseUpdatedListener registered successfully');
@@ -94,81 +101,70 @@ export const promotedProductListenerIOS = (listener) => {
     }
     return emitter.addListener(OpenIapEvent.PromotedProductIOS, listener);
 };
-export function initConnection() {
-    const result = ExpoIapModule.initConnection();
-    return Promise.resolve(result);
-}
-export async function endConnection() {
-    return ExpoIapModule.endConnection();
-}
+export const initConnection = async () => ExpoIapModule.initConnection();
+export const endConnection = async () => ExpoIapModule.endConnection();
 /**
  * Fetch products with unified API (v2.7.0+)
  *
- * @param params - Product fetch configuration
- * @param params.skus - Array of product SKUs to fetch
- * @param params.type - Type of products: 'in-app' for regular products (default) or 'subs' for subscriptions
- *
- * @example
- * ```typescript
- * // Regular products
- * const products = await fetchProducts({
- *   skus: ['product1', 'product2'],
- *   type: 'in-app'
- * });
- *
- * // Subscriptions
- * const subscriptions = await fetchProducts({
- *   skus: ['sub1', 'sub2'],
- *   type: 'subs'
- * });
- * ```
+ * @param request - Product fetch configuration
+ * @param request.skus - Array of product SKUs to fetch
+ * @param request.type - Product query type: 'in-app', 'subs', or 'all'
  */
-export const fetchProducts = async ({ skus, type, }) => {
-    if (!skus?.length) {
+export const fetchProducts = async (request) => {
+    const { skus, type } = request ?? {};
+    if (!Array.isArray(skus) || skus.length === 0) {
         throw new PurchaseError({
             message: 'No SKUs provided',
             code: ErrorCode.EmptySkuList,
         });
     }
     const { canonical, native } = normalizeProductType(type);
+    const skuSet = new Set(skus);
+    const filterIosItems = (items) => items.filter((item) => {
+        if (!isProductIOS(item)) {
+            return false;
+        }
+        const candidate = item;
+        return typeof candidate.id === 'string' && skuSet.has(candidate.id);
+    });
+    const filterAndroidItems = (items) => items.filter((item) => {
+        if (!isProductAndroid(item)) {
+            return false;
+        }
+        const candidate = item;
+        return typeof candidate.id === 'string' && skuSet.has(candidate.id);
+    });
+    const castResult = (items) => {
+        if (canonical === 'in-app') {
+            return items;
+        }
+        if (canonical === 'subs') {
+            return items;
+        }
+        return items;
+    };
     if (Platform.OS === 'ios') {
         const rawItems = await ExpoIapModule.fetchProducts({ skus, type: native });
-        const filteredItems = rawItems.filter((item) => {
-            if (!isProductIOS(item)) {
-                return false;
-            }
-            const isValid = typeof item === 'object' &&
-                item !== null &&
-                'id' in item &&
-                typeof item.id === 'string' &&
-                skus.includes(item.id);
-            return isValid;
-        });
-        return canonical === 'in-app'
-            ? filteredItems
-            : filteredItems;
+        return castResult(filterIosItems(rawItems));
     }
     if (Platform.OS === 'android') {
-        const items = await ExpoIapModule.fetchProducts(native, skus);
-        const filteredItems = items.filter((item) => {
-            if (!isProductAndroid(item))
-                return false;
-            return (typeof item === 'object' &&
-                item !== null &&
-                'id' in item &&
-                typeof item.id === 'string' &&
-                skus.includes(item.id));
-        });
-        return canonical === 'in-app'
-            ? filteredItems
-            : filteredItems;
+        const rawItems = await ExpoIapModule.fetchProducts(native, skus);
+        return castResult(filterAndroidItems(rawItems));
     }
     throw new Error('Unsupported platform');
 };
-export const getAvailablePurchases = ({ alsoPublishToEventListenerIOS = false, onlyIncludeActiveItemsIOS = true, } = {}) => (Platform.select({
-    ios: () => ExpoIapModule.getAvailableItems(alsoPublishToEventListenerIOS, onlyIncludeActiveItemsIOS),
-    android: () => ExpoIapModule.getAvailableItems(),
-}) || (() => Promise.resolve([])))();
+export const getAvailablePurchases = async (options) => {
+    const normalizedOptions = {
+        alsoPublishToEventListenerIOS: options?.alsoPublishToEventListenerIOS ?? false,
+        onlyIncludeActiveItemsIOS: options?.onlyIncludeActiveItemsIOS ?? true,
+    };
+    const resolvePurchases = Platform.select({
+        ios: () => ExpoIapModule.getAvailableItems(normalizedOptions.alsoPublishToEventListenerIOS, normalizedOptions.onlyIncludeActiveItemsIOS),
+        android: () => ExpoIapModule.getAvailableItems(),
+    }) ?? (() => Promise.resolve([]));
+    const purchases = await resolvePurchases();
+    return normalizePurchaseList(purchases);
+};
 /**
  * Restore completed transactions (cross-platform behavior)
  *
@@ -182,17 +178,14 @@ export const getAvailablePurchases = ({ alsoPublishToEventListenerIOS = false, o
  * @param options.onlyIncludeActiveItemsIOS - iOS only: whether to only include active items
  * @returns Promise resolving to the list of available/restored purchases
  */
-export const restorePurchases = async (options = {}) => {
+export const restorePurchases = async () => {
     if (Platform.OS === 'ios') {
-        // Perform best-effort sync on iOS and ignore sync errors to avoid blocking restore flow
         await syncIOS().catch(() => undefined);
     }
-    // Then, fetch available purchases for both platforms
-    const purchases = await getAvailablePurchases({
-        alsoPublishToEventListenerIOS: options.alsoPublishToEventListenerIOS ?? false,
-        onlyIncludeActiveItemsIOS: options.onlyIncludeActiveItemsIOS ?? true,
+    await getAvailablePurchases({
+        alsoPublishToEventListenerIOS: false,
+        onlyIncludeActiveItemsIOS: true,
     });
-    return purchases;
 };
 const offerToRecordIOS = (offer) => {
     if (!offer)
@@ -240,8 +233,8 @@ function normalizeRequestProps(request, platform) {
  * });
  * ```
  */
-export const requestPurchase = (requestObj) => {
-    const { request, type } = requestObj;
+export const requestPurchase = async (args) => {
+    const { request, type } = args;
     const { canonical, native } = normalizeProductType(type);
     const isInAppPurchase = canonical === 'in-app';
     if (Platform.OS === 'ios') {
@@ -250,17 +243,15 @@ export const requestPurchase = (requestObj) => {
             throw new Error('Invalid request for iOS. The `sku` property is required and must be a string.');
         }
         const { sku, andDangerouslyFinishTransactionAutomatically = false, appAccountToken, quantity, withOffer, } = normalizedRequest;
-        return (async () => {
-            const offer = offerToRecordIOS(withOffer ?? undefined);
-            const purchase = await ExpoIapModule.requestPurchase({
-                sku,
-                andDangerouslyFinishTransactionAutomatically,
-                appAccountToken,
-                quantity,
-                withOffer: offer,
-            });
-            return purchase;
-        })();
+        const offer = offerToRecordIOS(withOffer ?? undefined);
+        const purchase = await ExpoIapModule.requestPurchase({
+            sku,
+            andDangerouslyFinishTransactionAutomatically,
+            appAccountToken,
+            quantity,
+            withOffer: offer,
+        });
+        return normalizePurchaseId(purchase);
     }
     if (Platform.OS === 'android') {
         if (isInAppPurchase) {
@@ -269,18 +260,17 @@ export const requestPurchase = (requestObj) => {
                 throw new Error('Invalid request for Android. The `skus` property is required and must be a non-empty array.');
             }
             const { skus, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, isOfferPersonalized, } = normalizedRequest;
-            return (async () => {
-                return ExpoIapModule.requestPurchase({
-                    type: native,
-                    skuArr: skus,
-                    purchaseToken: undefined,
-                    replacementMode: -1,
-                    obfuscatedAccountId: obfuscatedAccountIdAndroid,
-                    obfuscatedProfileId: obfuscatedProfileIdAndroid,
-                    offerTokenArr: [],
-                    isOfferPersonalized: isOfferPersonalized ?? false,
-                });
-            })();
+            const result = (await ExpoIapModule.requestPurchase({
+                type: native,
+                skuArr: skus,
+                purchaseToken: undefined,
+                replacementMode: -1,
+                obfuscatedAccountId: obfuscatedAccountIdAndroid,
+                obfuscatedProfileId: obfuscatedProfileIdAndroid,
+                offerTokenArr: [],
+                isOfferPersonalized: isOfferPersonalized ?? false,
+            }));
+            return normalizePurchaseList(result);
         }
         if (canonical === 'subs') {
             const normalizedRequest = normalizeRequestProps(request, 'android');
@@ -291,52 +281,62 @@ export const requestPurchase = (requestObj) => {
             const normalizedOffers = subscriptionOffers ?? [];
             const replacementMode = replacementModeAndroid ?? -1;
             const purchaseToken = purchaseTokenAndroid ?? undefined;
-            return (async () => {
-                return ExpoIapModule.requestPurchase({
-                    type: native,
-                    skuArr: skus,
-                    purchaseToken,
-                    replacementMode,
-                    obfuscatedAccountId: obfuscatedAccountIdAndroid,
-                    obfuscatedProfileId: obfuscatedProfileIdAndroid,
-                    offerTokenArr: normalizedOffers.map((so) => so.offerToken),
-                    subscriptionOffers: normalizedOffers,
-                    isOfferPersonalized: isOfferPersonalized ?? false,
-                });
-            })();
+            const result = (await ExpoIapModule.requestPurchase({
+                type: native,
+                skuArr: skus,
+                purchaseToken,
+                replacementMode,
+                obfuscatedAccountId: obfuscatedAccountIdAndroid,
+                obfuscatedProfileId: obfuscatedProfileIdAndroid,
+                offerTokenArr: normalizedOffers.map((offer) => offer.offerToken),
+                subscriptionOffers: normalizedOffers,
+                isOfferPersonalized: isOfferPersonalized ?? false,
+            }));
+            return normalizePurchaseList(result);
         }
         throw new Error("Invalid request for Android: Expected a valid request object with 'skus' array.");
     }
-    return Promise.resolve(); // Fallback for unsupported platforms
+    throw new Error('Platform not supported');
 };
-export const finishTransaction = ({ purchase, isConsumable = false, }) => {
-    return (Platform.select({
-        ios: async () => {
-            const transactionId = purchase.id;
-            if (!transactionId) {
-                return Promise.reject(new Error('purchase.id required to finish iOS transaction'));
-            }
-            await ExpoIapModule.finishTransaction(transactionId);
-            return Promise.resolve(true);
-        },
-        android: async () => {
-            const androidPurchase = purchase;
-            // Use purchaseToken if available, fallback to purchaseTokenAndroid for backward compatibility
-            const token = androidPurchase.purchaseToken;
-            if (!token) {
-                return Promise.reject(new PurchaseError({
-                    message: 'Purchase token is required to finish transaction',
-                    code: ErrorCode.DeveloperError,
-                    productId: androidPurchase.productId,
-                    platform: 'android',
-                }));
-            }
-            if (isConsumable) {
-                return ExpoIapModule.consumePurchaseAndroid(token);
-            }
-            return ExpoIapModule.acknowledgePurchaseAndroid(token);
-        },
-    }) || (() => Promise.reject(new Error('Unsupported Platform'))))();
+const toPurchaseInput = (purchase) => ({
+    id: purchase.id,
+    ids: purchase.ids ?? undefined,
+    isAutoRenewing: purchase.isAutoRenewing,
+    platform: purchase.platform,
+    productId: purchase.productId,
+    purchaseState: purchase.purchaseState,
+    purchaseToken: purchase.purchaseToken ?? null,
+    quantity: purchase.quantity,
+    transactionDate: purchase.transactionDate,
+});
+export const finishTransaction = async ({ purchase, isConsumable = false, }) => {
+    const normalizedPurchase = toPurchaseInput(purchase);
+    if (Platform.OS === 'ios') {
+        const transactionId = normalizedPurchase.id;
+        if (!transactionId) {
+            throw new Error('purchase.id required to finish iOS transaction');
+        }
+        await ExpoIapModule.finishTransaction(transactionId);
+        return;
+    }
+    if (Platform.OS === 'android') {
+        const token = normalizedPurchase.purchaseToken ?? undefined;
+        if (!token) {
+            throw new PurchaseError({
+                message: 'Purchase token is required to finish transaction',
+                code: ErrorCode.DeveloperError,
+                productId: normalizedPurchase.productId,
+                platform: 'android',
+            });
+        }
+        if (isConsumable) {
+            await ExpoIapModule.consumePurchaseAndroid(token);
+            return;
+        }
+        await ExpoIapModule.acknowledgePurchaseAndroid(token);
+        return;
+    }
+    throw new Error('Unsupported Platform');
 };
 /**
  * Retrieves the current storefront information from iOS App Store
@@ -384,28 +384,27 @@ export const getStorefront = () => {
  * - iOS: Send receipt data to Apple's verification endpoint from your server
  * - Android: Use Google Play Developer API with service account credentials
  */
-export const validateReceipt = async (sku, androidOptions) => {
+export const validateReceipt = async (options) => {
+    const { sku, androidOptions } = options;
     if (Platform.OS === 'ios') {
-        return await validateReceiptIOS(sku);
+        return validateReceiptIOS({ sku });
     }
-    else if (Platform.OS === 'android') {
+    if (Platform.OS === 'android') {
         if (!androidOptions ||
             !androidOptions.packageName ||
             !androidOptions.productToken ||
             !androidOptions.accessToken) {
             throw new Error('Android validation requires packageName, productToken, and accessToken');
         }
-        return await validateReceiptAndroid({
+        return validateReceiptAndroid({
             packageName: androidOptions.packageName,
             productId: sku,
             productToken: androidOptions.productToken,
             accessToken: androidOptions.accessToken,
-            isSub: androidOptions.isSub,
+            isSub: androidOptions.isSub ?? undefined,
         });
     }
-    else {
-        throw new Error('Platform not supported');
-    }
+    throw new Error('Platform not supported');
 };
 /**
  * Deeplinks to native interface that allows users to manage their subscriptions
@@ -425,17 +424,16 @@ export const validateReceipt = async (sku, androidOptions) => {
  *   packageNameAndroid: 'com.example.app'
  * });
  */
-export const deepLinkToSubscriptions = (options) => {
+export const deepLinkToSubscriptions = async (options) => {
     if (Platform.OS === 'ios') {
-        return deepLinkToSubscriptionsIOS();
+        await deepLinkToSubscriptionsIOS();
+        return;
     }
     if (Platform.OS === 'android') {
-        return deepLinkToSubscriptionsAndroid({
-            sku: options?.skuAndroid,
-            packageName: options?.packageNameAndroid,
-        });
+        await deepLinkToSubscriptionsAndroid(options ?? null);
+        return;
     }
-    return Promise.reject(new Error(`Unsupported platform: ${Platform.OS}`));
+    throw new Error(`Unsupported platform: ${Platform.OS}`);
 };
 export * from './useIAP';
 export * from './utils/errorMapping';