expo-iap 2.8.0 → 2.8.2

package/src/types/ExpoIapIOS.types.ts

@@ -1,4 +1,4 @@
-import {PurchaseBase, ProductBase} from '../ExpoIap.types';
+import {PurchaseCommon, ProductCommon} from '../ExpoIap.types';
 
 type SubscriptionIosPeriod = 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | '';
 type PaymentMode = '' | 'FREETRIAL' | 'PAYASYOUGO' | 'PAYUPFRONT';
@@ -26,10 +26,27 @@ type SubscriptionInfo = {
   };
 };
 
-export type ProductIOS = ProductBase & {
-  displayName: string;
-  isFamilyShareable: boolean;
-  jsonRepresentation: string;
+export type ProductIOS = ProductCommon & {
+  displayNameIOS: string;
+  isFamilyShareableIOS: boolean;
+  jsonRepresentationIOS: string;
+  platform: 'ios';
+  subscriptionInfoIOS?: SubscriptionInfo;
+  /**
+   * @deprecated Use `displayNameIOS` instead. This field will be removed in v2.9.0.
+   */
+  displayName?: string;
+  /**
+   * @deprecated Use `isFamilyShareableIOS` instead. This field will be removed in v2.9.0.
+   */
+  isFamilyShareable?: boolean;
+  /**
+   * @deprecated Use `jsonRepresentationIOS` instead. This field will be removed in v2.9.0.
+   */
+  jsonRepresentation?: string;
+  /**
+   * @deprecated Use `subscriptionInfoIOS` instead. This field will be removed in v2.9.0.
+   */
   subscription?: SubscriptionInfo;
   introductoryPriceNumberOfPeriodsIOS?: string;
   introductoryPriceSubscriptionPeriodIOS?: SubscriptionIosPeriod;
@@ -45,17 +62,29 @@ export type Discount = {
   subscriptionPeriod: string;
 };
 
-export type SubscriptionProductIOS = ProductIOS & {
-  discounts?: Discount[];
-  introductoryPrice?: string;
+export type ProductSubscriptionIOS = ProductIOS & {
+  discountsIOS?: Discount[];
+  introductoryPriceIOS?: string;
   introductoryPriceAsAmountIOS?: string;
   introductoryPricePaymentModeIOS?: PaymentMode;
   introductoryPriceNumberOfPeriodsIOS?: string;
   introductoryPriceSubscriptionPeriodIOS?: SubscriptionIosPeriod;
+  platform: 'ios';
   subscriptionPeriodNumberIOS?: string;
   subscriptionPeriodUnitIOS?: SubscriptionIosPeriod;
+  /**
+   * @deprecated Use `discountsIOS` instead. This field will be removed in v2.9.0.
+   */
+  discounts?: Discount[];
+  /**
+   * @deprecated Use `introductoryPriceIOS` instead. This field will be removed in v2.9.0.
+   */
+  introductoryPrice?: string;
 };
 
+// Legacy naming for backward compatibility
+export type SubscriptionProductIOS = ProductSubscriptionIOS;
+
 export type PaymentDiscount = {
   /**
    * A string used to uniquely identify a discount offer for a product.
@@ -79,9 +108,9 @@ export type PaymentDiscount = {
   timestamp: number;
 };
 
-export type RequestPurchaseIOSProps = {
+export type RequestPurchaseIosProps = {
   sku: string;
-  andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
+  andDangerouslyFinishTransactionAutomatically?: boolean;
   /**
    * UUID representing user account
    */
@@ -90,18 +119,6 @@ export type RequestPurchaseIOSProps = {
   withOffer?: PaymentDiscount;
 };
 
-export type RequestSubscriptionIOSProps = RequestPurchaseIOSProps;
-
-/**
- * @deprecated Use RequestPurchaseIOSProps instead. This alias will be removed in v3.0.0.
- */
-export type RequestPurchaseIosProps = RequestPurchaseIOSProps;
-
-/**
- * @deprecated Use RequestSubscriptionIOSProps instead. This alias will be removed in v3.0.0.
- */
-export type RequestSubscriptionIosProps = RequestSubscriptionIOSProps;
-
 type SubscriptionStatus =
   | 'expired'
   | 'inBillingRetryPeriod'
@@ -120,8 +137,10 @@ export type ProductStatusIOS = {
   renewalInfo?: RenewalInfo;
 };
 
-export type ProductPurchaseIOS = PurchaseBase & {
+// Legacy naming for backward compatibility
+export type ProductPurchaseIOS = PurchaseCommon & {
   // iOS basic fields
+  platform: 'ios';
   quantityIOS?: number;
   originalTransactionDateIOS?: number;
   originalTransactionIdentifierIOS?: string;
@@ -146,8 +165,10 @@ export type ProductPurchaseIOS = PurchaseBase & {
     type: string;
     paymentMode: string;
   };
-  priceIOS?: number;
-  currencyIOS?: string;
+  // Price locale fields
+  currencyCodeIOS?: string;
+  currencySymbolIOS?: string;
+  countryCodeIOS?: string;
   /**
    * @deprecated Use `purchaseToken` instead. This field will be removed in a future version.
    * iOS 15+ JWS representation is now available through the `purchaseToken` field.
@@ -155,6 +176,9 @@ export type ProductPurchaseIOS = PurchaseBase & {
   jwsRepresentationIOS?: string;
 };
 
+// Preferred naming
+export type PurchaseIOS = ProductPurchaseIOS;
+
 export type AppTransactionIOS = {
   appTransactionId?: string; // Only available in iOS 18.4+
   originalPlatform?: string; // Only available in iOS 18.4+

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);