expo-iap 2.8.1 → 2.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ExpoIap.types.ts

@@ -1,11 +1,11 @@
 import {
   ProductAndroid,
-  ProductPurchaseAndroid,
+  PurchaseAndroid,
   ProductSubscriptionAndroid,
 } from './types/ExpoIapAndroid.types';
 import {
   ProductIOS,
-  ProductPurchaseIOS,
+  PurchaseIOS,
   ProductSubscriptionIOS,
 } from './types/ExpoIapIOS.types';
 import {NATIVE_ERROR_CODES} from './ExpoIapModule';
@@ -63,29 +63,28 @@ export type SubscriptionProduct =
 
 // Re-export platform-specific types
 export type {
-  ProductPurchaseAndroid,
   PurchaseAndroid,
   ProductSubscriptionAndroid,
-  SubscriptionProductAndroid, // Legacy
 } from './types/ExpoIapAndroid.types';
 export type {
-  ProductPurchaseIOS,
   PurchaseIOS,
   ProductSubscriptionIOS,
-  SubscriptionProductIOS, // Legacy
 } from './types/ExpoIapIOS.types';
 
-// Union type for platform-specific purchase types
-export type ProductPurchase =
-  | (ProductPurchaseAndroid & AndroidPlatform)
-  | (ProductPurchaseIOS & IosPlatform);
+// Unified purchase type for both products and subscriptions
+export type Purchase =
+  | (PurchaseAndroid & AndroidPlatform)
+  | (PurchaseIOS & IosPlatform);
 
-// Union type for platform-specific subscription purchase types
-export type SubscriptionPurchase =
-  | (ProductPurchaseAndroid & AndroidPlatform & {autoRenewingAndroid: boolean})
-  | (ProductPurchaseIOS & IosPlatform);
-
-export type Purchase = ProductPurchase | SubscriptionPurchase;
+// Legacy type aliases - deprecated, use Purchase instead
+/**
+ * @deprecated Use `Purchase` instead. This type alias will be removed in v2.9.0.
+ */
+export type ProductPurchase = Purchase;
+/**
+ * @deprecated Use `Purchase` instead. This type alias will be removed in v2.9.0.
+ */
+export type SubscriptionPurchase = Purchase;
 
 export type PurchaseResult = {
   responseCode?: number;

package/src/index.ts

@@ -18,16 +18,14 @@ import {
 // Types
 import {
   Product,
-  ProductPurchase,
   Purchase,
   PurchaseError,
   PurchaseResult,
   RequestSubscriptionProps,
   RequestPurchaseProps,
   SubscriptionProduct,
-  SubscriptionPurchase,
 } from './ExpoIap.types';
-import {ProductPurchaseAndroid} from './types/ExpoIapAndroid.types';
+import {PurchaseAndroid} from './types/ExpoIapAndroid.types';
 import {PaymentDiscount} from './types/ExpoIapIOS.types';
 
 // Export all types
@@ -281,7 +279,7 @@ export const getPurchaseHistory = ({
 }: {
   alsoPublishToEventListener?: boolean;
   onlyIncludeActiveItems?: boolean;
-} = {}): Promise<ProductPurchase[]> => {
+} = {}): Promise<Purchase[]> => {
   console.warn(
     '`getPurchaseHistory` is deprecated. Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.',
   );
@@ -297,7 +295,7 @@ export const getPurchaseHistories = ({
 }: {
   alsoPublishToEventListener?: boolean;
   onlyIncludeActiveItems?: boolean;
-} = {}): Promise<ProductPurchase[]> =>
+} = {}): Promise<Purchase[]> =>
   (
     Platform.select({
       ios: async () => {
@@ -323,7 +321,7 @@ export const getAvailablePurchases = ({
 }: {
   alsoPublishToEventListener?: boolean;
   onlyIncludeActiveItems?: boolean;
-} = {}): Promise<ProductPurchase[]> =>
+} = {}): Promise<Purchase[]> =>
   (
     Platform.select({
       ios: () =>
@@ -409,13 +407,7 @@ const normalizeRequestProps = (
  */
 export const requestPurchase = (
   requestObj: PurchaseRequest,
-): Promise<
-  | ProductPurchase
-  | SubscriptionPurchase
-  | ProductPurchase[]
-  | SubscriptionPurchase[]
-  | void
-> => {
+): Promise<Purchase | Purchase[] | void> => {
   const {request, type = 'inapp'} = requestObj;
 
   if (Platform.OS === 'ios') {
@@ -445,9 +437,7 @@ export const requestPurchase = (
         offer,
       );
 
-      return type === 'inapp'
-        ? (purchase as ProductPurchase)
-        : (purchase as SubscriptionPurchase);
+      return type === 'inapp' ? (purchase as Purchase) : (purchase as Purchase);
     })();
   }
 
@@ -478,7 +468,7 @@ export const requestPurchase = (
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
           offerTokenArr: [],
           isOfferPersonalized: isOfferPersonalized ?? false,
-        }) as Promise<ProductPurchase[]>;
+        }) as Promise<Purchase[]>;
       })();
     }
 
@@ -504,7 +494,7 @@ export const requestPurchase = (
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
           offerTokenArr: subscriptionOffers.map((so: any) => so.offerToken),
           isOfferPersonalized: isOfferPersonalized ?? false,
-        }) as Promise<SubscriptionPurchase[]>;
+        }) as Promise<Purchase[]>;
       })();
     }
 
@@ -543,13 +533,13 @@ export const requestPurchase = (
  */
 export const requestSubscription = async (
   request: RequestSubscriptionProps,
-): Promise<SubscriptionPurchase | SubscriptionPurchase[] | null | void> => {
+): Promise<Purchase | Purchase[] | null | void> => {
   console.warn(
     "`requestSubscription` is deprecated and will be removed in version 3.0.0. Use `requestPurchase({ request, type: 'subs' })` instead.",
   );
   return (await requestPurchase({request, type: 'subs'})) as
-    | SubscriptionPurchase
-    | SubscriptionPurchase[]
+    | Purchase
+    | Purchase[]
     | null
     | void;
 };
@@ -574,7 +564,7 @@ export const finishTransaction = ({
         return Promise.resolve(true);
       },
       android: async () => {
-        const androidPurchase = purchase as ProductPurchaseAndroid;
+        const androidPurchase = purchase as PurchaseAndroid;
 
         if (isConsumable) {
           return ExpoIapModule.consumeProduct(androidPurchase.purchaseToken);

package/src/modules/ios.ts

@@ -5,12 +5,7 @@ import {purchaseUpdatedListener} from '..';
 import ExpoIapModule from '../ExpoIapModule';
 
 // Types
-import {
-  ProductPurchase,
-  PurchaseError,
-  Purchase,
-  SubscriptionPurchase,
-} from '../ExpoIap.types';
+import {Purchase, PurchaseError} from '../ExpoIap.types';
 import type {
   ProductStatusIOS,
   AppTransactionIOS,
@@ -18,7 +13,7 @@ import type {
 import {Linking} from 'react-native';
 
 export type TransactionEvent = {
-  transaction?: ProductPurchase;
+  transaction?: Purchase;
   error?: PurchaseError;
 };
 
@@ -39,7 +34,7 @@ export type TransactionEvent = {
 export const transactionUpdatedIOS = (
   listener: (event: TransactionEvent) => void,
 ) => {
-  const isProductPurchase = (item: unknown): item is ProductPurchase => {
+  const isPurchase = (item: unknown): item is Purchase => {
     return (
       item != null &&
       typeof item === 'object' &&
@@ -51,18 +46,18 @@ export const transactionUpdatedIOS = (
 
   // Helper function to safely convert Purchase to TransactionEvent
   const mapPurchaseToTransactionEvent = (
-    purchase: Purchase | SubscriptionPurchase,
+    purchase: Purchase,
   ): TransactionEvent => {
     // Validate the purchase object before casting
-    if (isProductPurchase(purchase)) {
+    if (isPurchase(purchase)) {
       return {
-        transaction: purchase as ProductPurchase,
+        transaction: purchase as Purchase,
       };
     }
 
     // Fallback: create a basic TransactionEvent structure
     return {
-      transaction: purchase as ProductPurchase,
+      transaction: purchase as Purchase,
     };
   };
 
@@ -138,9 +133,7 @@ export const subscriptionStatusIOS = (
  *
  * @platform iOS
  */
-export const currentEntitlementIOS = (
-  sku: string,
-): Promise<ProductPurchase> => {
+export const currentEntitlementIOS = (sku: string): Promise<Purchase> => {
   return ExpoIapModule.currentEntitlement(sku);
 };
 
@@ -153,7 +146,7 @@ export const currentEntitlementIOS = (
  *
  * @platform iOS
  */
-export const latestTransactionIOS = (sku: string): Promise<ProductPurchase> => {
+export const latestTransactionIOS = (sku: string): Promise<Purchase> => {
   return ExpoIapModule.latestTransaction(sku);
 };
 
@@ -241,7 +234,7 @@ export const getTransactionJwsIOS = (sku: string): Promise<string> => {
  *   isValid: boolean;
  *   receiptData: string;
  *   jwsRepresentation: string;
- *   latestTransaction?: ProductPurchase;
+ *   latestTransaction?: Purchase;
  * }>}
  */
 export const validateReceiptIOS = async (
@@ -250,7 +243,7 @@ export const validateReceiptIOS = async (
   isValid: boolean;
   receiptData: string;
   jwsRepresentation: string;
-  latestTransaction?: ProductPurchase;
+  latestTransaction?: Purchase;
 }> => {
   const result = await ExpoIapModule.validateReceiptIOS(sku);
   return result;
@@ -362,7 +355,7 @@ export const subscriptionStatus = (
 /**
  * @deprecated Use `currentEntitlementIOS` instead. This function will be removed in version 3.0.0.
  */
-export const currentEntitlement = (sku: string): Promise<ProductPurchase> => {
+export const currentEntitlement = (sku: string): Promise<Purchase> => {
   console.warn(
     '`currentEntitlement` is deprecated. Use `currentEntitlementIOS` instead. This function will be removed in version 3.0.0.',
   );
@@ -372,7 +365,7 @@ export const currentEntitlement = (sku: string): Promise<ProductPurchase> => {
 /**
  * @deprecated Use `latestTransactionIOS` instead. This function will be removed in version 3.0.0.
  */
-export const latestTransaction = (sku: string): Promise<ProductPurchase> => {
+export const latestTransaction = (sku: string): Promise<Purchase> => {
   console.warn(
     '`latestTransaction` is deprecated. Use `latestTransactionIOS` instead. This function will be removed in version 3.0.0.',
   );

package/src/useIAP.ts

@@ -29,12 +29,10 @@ import {
 // Types
 import {
   Product,
-  ProductPurchase,
   Purchase,
   PurchaseError,
   PurchaseResult,
   SubscriptionProduct,
-  SubscriptionPurchase,
   RequestPurchaseProps,
   RequestSubscriptionProps,
 } from './ExpoIap.types';
@@ -42,12 +40,12 @@ import {
 type UseIap = {
   connected: boolean;
   products: Product[];
-  promotedProductsIOS: ProductPurchase[];
+  promotedProductsIOS: Purchase[];
   promotedProductIdIOS?: string;
   subscriptions: SubscriptionProduct[];
-  purchaseHistories: ProductPurchase[];
-  availablePurchases: ProductPurchase[];
-  currentPurchase?: ProductPurchase;
+  purchaseHistories: Purchase[];
+  availablePurchases: Purchase[];
+  currentPurchase?: Purchase;
   currentPurchaseError?: PurchaseError;
   promotedProductIOS?: Product;
   activeSubscriptions: ActiveSubscription[];
@@ -99,9 +97,7 @@ type UseIap = {
 };
 
 export interface UseIAPOptions {
-  onPurchaseSuccess?: (
-    purchase: ProductPurchase | SubscriptionPurchase,
-  ) => void;
+  onPurchaseSuccess?: (purchase: Purchase) => void;
   onPurchaseError?: (error: PurchaseError) => void;
   onSyncError?: (error: Error) => void;
   shouldAutoSyncPurchases?: boolean; // New option to control auto-syncing
@@ -111,15 +107,11 @@ export interface UseIAPOptions {
 export function useIAP(options?: UseIAPOptions): UseIap {
   const [connected, setConnected] = useState<boolean>(false);
   const [products, setProducts] = useState<Product[]>([]);
-  const [promotedProductsIOS] = useState<ProductPurchase[]>([]);
+  const [promotedProductsIOS] = useState<Purchase[]>([]);
   const [subscriptions, setSubscriptions] = useState<SubscriptionProduct[]>([]);
-  const [purchaseHistories, setPurchaseHistories] = useState<ProductPurchase[]>(
-    [],
-  );
-  const [availablePurchases, setAvailablePurchases] = useState<
-    ProductPurchase[]
-  >([]);
-  const [currentPurchase, setCurrentPurchase] = useState<ProductPurchase>();
+  const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>([]);
+  const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>([]);
+  const [currentPurchase, setCurrentPurchase] = useState<Purchase>();
   const [promotedProductIOS, setPromotedProductIOS] = useState<Product>();
   const [currentPurchaseError, setCurrentPurchaseError] =
     useState<PurchaseError>();
@@ -289,7 +281,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       purchase,
       isConsumable,
     }: {
-      purchase: ProductPurchase;
+      purchase: Purchase;
       isConsumable?: boolean;
     }): Promise<PurchaseResult | boolean> => {
       try {
@@ -382,7 +374,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
 
     if (result) {
       subscriptionsRef.current.purchaseUpdate = purchaseUpdatedListener(
-        async (purchase: Purchase | SubscriptionPurchase) => {
+        async (purchase: Purchase) => {
           setCurrentPurchaseError(undefined);
           setCurrentPurchase(purchase);