react-native-iap 14.0.1 → 14.1.1-rc.1

package/src/utils/type-bridge.ts

@@ -7,9 +7,10 @@
  * Purpose: Prevent type fragmentation between native (Nitro) and TypeScript sides
  */
 
-import type { NitroProduct, NitroPurchase } from '../specs/RnIap.nitro'
-import type { Product, Purchase, SubscriptionProduct } from '../types'
-import { Platform } from 'react-native'
+import type {NitroProduct, NitroPurchase} from '../specs/RnIap.nitro';
+import type {Product, Purchase, SubscriptionProduct} from '../types';
+import {PurchaseState, ProductTypeIOS} from '../types';
+import {Platform} from 'react-native';
 
 // ============================================================================
 // PRODUCT CONVERSION
@@ -20,7 +21,7 @@ import { Platform } from 'react-native'
  * This ensures all fields are properly mapped and accessible
  */
 export function convertNitroProductToProduct(
-  nitroProduct: NitroProduct
+  nitroProduct: NitroProduct,
 ): Product {
   // Create base product with common fields, handling platform casting
   const product: any = {
@@ -33,62 +34,92 @@ export function convertNitroProductToProduct(
     currency: nitroProduct.currency || '',
     price: nitroProduct.price,
     platform: nitroProduct.platform as 'ios' | 'android',
-  }
+  };
 
   // Add platform-specific fields based on current platform
   if (Platform.OS === 'ios') {
     // Map iOS fields from Nitro to TypeScript types
-    const iosProduct = product as any // Temporarily cast to access iOS fields
-    iosProduct.isFamilyShareable = nitroProduct.isFamilyShareable
-    iosProduct.jsonRepresentation = nitroProduct.jsonRepresentation
+    const iosProduct = product as any; // Temporarily cast to access iOS fields
+    iosProduct.isFamilyShareable = (nitroProduct as any).isFamilyShareableIOS;
+    iosProduct.jsonRepresentation = (nitroProduct as any).jsonRepresentationIOS;
+    // Detailed iOS product type - directly from the native field
+    const typeIOSValue: string | undefined = (nitroProduct as any).typeIOS;
+
+    switch (typeIOSValue) {
+      case 'consumable':
+        iosProduct.typeIOS = ProductTypeIOS.consumable;
+        break;
+      case 'nonConsumable':
+        iosProduct.typeIOS = ProductTypeIOS.nonConsumable;
+        break;
+      case 'autoRenewableSubscription':
+        iosProduct.typeIOS = ProductTypeIOS.autoRenewableSubscription;
+        break;
+      case 'nonRenewingSubscription':
+        iosProduct.typeIOS = ProductTypeIOS.nonRenewingSubscription;
+        break;
+      default:
+        iosProduct.typeIOS = undefined;
+    }
     iosProduct.subscriptionPeriodUnitIOS =
-      nitroProduct.subscriptionPeriodUnitIOS
+      nitroProduct.subscriptionPeriodUnitIOS;
     iosProduct.subscriptionPeriodNumberIOS =
-      nitroProduct.subscriptionPeriodNumberIOS
-    iosProduct.introductoryPriceIOS = nitroProduct.introductoryPriceIOS
+      nitroProduct.subscriptionPeriodNumberIOS;
+    iosProduct.introductoryPriceIOS = nitroProduct.introductoryPriceIOS;
     iosProduct.introductoryPriceAsAmountIOS =
-      nitroProduct.introductoryPriceAsAmountIOS
+      nitroProduct.introductoryPriceAsAmountIOS;
     iosProduct.introductoryPricePaymentModeIOS =
-      nitroProduct.introductoryPricePaymentModeIOS
+      nitroProduct.introductoryPricePaymentModeIOS;
     iosProduct.introductoryPriceNumberOfPeriodsIOS =
-      nitroProduct.introductoryPriceNumberOfPeriodsIOS
+      nitroProduct.introductoryPriceNumberOfPeriodsIOS;
     iosProduct.introductoryPriceSubscriptionPeriodIOS =
-      nitroProduct.introductoryPriceSubscriptionPeriodIOS
+      nitroProduct.introductoryPriceSubscriptionPeriodIOS;
   } else if (Platform.OS === 'android') {
     // Map Android fields from Nitro to TypeScript types
-    const androidProduct = product as any // Temporarily cast to access Android fields
-    androidProduct.originalPrice = nitroProduct.originalPrice
-    androidProduct.originalPriceAmountMicros =
-      nitroProduct.originalPriceAmountMicros
-    androidProduct.introductoryPriceValue = nitroProduct.introductoryPriceValue
-    androidProduct.introductoryPriceCycles =
-      nitroProduct.introductoryPriceCycles
-    androidProduct.introductoryPricePeriod =
-      nitroProduct.introductoryPricePeriod
-    androidProduct.subscriptionPeriod = nitroProduct.subscriptionPeriod
-    androidProduct.freeTrialPeriod = nitroProduct.freeTrialPeriod
+    const androidProduct = product as any; // Temporarily cast to access Android fields
+    androidProduct.originalPrice = (nitroProduct as any).originalPriceAndroid;
+    androidProduct.originalPriceAmountMicros = (
+      nitroProduct as any
+    ).originalPriceAmountMicrosAndroid;
+    androidProduct.introductoryPriceValue = (
+      nitroProduct as any
+    ).introductoryPriceValueAndroid;
+    androidProduct.introductoryPriceCycles = (
+      nitroProduct as any
+    ).introductoryPriceCyclesAndroid;
+    androidProduct.introductoryPricePeriod = (
+      nitroProduct as any
+    ).introductoryPricePeriodAndroid;
+    androidProduct.subscriptionPeriod = (
+      nitroProduct as any
+    ).subscriptionPeriodAndroid;
+    androidProduct.freeTrialPeriod = (
+      nitroProduct as any
+    ).freeTrialPeriodAndroid;
 
     // Map subscription offer details (parse from JSON string)
     if (nitroProduct.subscriptionOfferDetailsAndroid) {
       try {
         androidProduct.subscriptionOfferDetailsAndroid = JSON.parse(
-          nitroProduct.subscriptionOfferDetailsAndroid
-        )
+          nitroProduct.subscriptionOfferDetailsAndroid,
+        );
       } catch (e) {
-        console.warn('Failed to parse subscription offer details:', e)
-        androidProduct.subscriptionOfferDetailsAndroid = null
+        console.warn('Failed to parse subscription offer details:', e);
+        androidProduct.subscriptionOfferDetailsAndroid = null;
       }
     }
 
     // Create flattened offer fields for easier access in example code
     androidProduct.oneTimePurchaseOfferFormattedPrice =
-      nitroProduct.displayPrice
-    androidProduct.oneTimePurchaseOfferPriceAmountMicros =
-      nitroProduct.originalPriceAmountMicros
-    androidProduct.oneTimePurchaseOfferPriceCurrencyCode = nitroProduct.currency
+      nitroProduct.displayPrice;
+    androidProduct.oneTimePurchaseOfferPriceAmountMicros = (
+      nitroProduct as any
+    ).originalPriceAmountMicrosAndroid;
+    androidProduct.oneTimePurchaseOfferPriceCurrencyCode =
+      nitroProduct.currency;
   }
 
-  return product as Product
+  return product as Product;
 }
 
 // Note: Use nitroProducts.map(convertNitroProductToProduct) instead of a separate function
@@ -97,19 +128,19 @@ export function convertNitroProductToProduct(
  * Convert Product to SubscriptionProduct (type-safe casting)
  */
 export function convertProductToSubscriptionProduct(
-  product: Product
+  product: Product,
 ): SubscriptionProduct {
   if (product.type !== 'subs') {
     console.warn(
       'Converting non-subscription product to SubscriptionProduct:',
-      product.id
-    )
+      product.id,
+    );
   }
   // Since SubscriptionProduct is now an intersection type, we need to cast properly
   return {
     ...product,
     type: 'subs' as const,
-  } as SubscriptionProduct
+  } as SubscriptionProduct;
 }
 
 // ============================================================================
@@ -120,7 +151,7 @@ export function convertProductToSubscriptionProduct(
  * Convert NitroPurchase (from native) to TypeScript Purchase (for library consumers)
  */
 export function convertNitroPurchaseToPurchase(
-  nitroPurchase: NitroPurchase
+  nitroPurchase: NitroPurchase,
 ): Purchase {
   // Create base purchase with common fields
   const purchase: any = {
@@ -130,33 +161,59 @@ export function convertNitroPurchaseToPurchase(
     transactionReceipt: '', // Will be set by native layer
     purchaseToken: nitroPurchase.purchaseToken,
     platform: nitroPurchase.platform as 'ios' | 'android',
-  }
+    // Common fields from NitroPurchase
+    quantity: nitroPurchase.quantity || 1,
+    purchaseState: nitroPurchase.purchaseState as PurchaseState || PurchaseState.unknown,
+    isAutoRenewing: nitroPurchase.isAutoRenewing || false,
+  };
 
   // Add platform-specific fields
   if (Platform.OS === 'ios') {
-    const iosPurchase = purchase as any
-    iosPurchase.quantityIOS = nitroPurchase.quantityIOS
+    const iosPurchase = purchase as any;
+    iosPurchase.quantityIOS = nitroPurchase.quantityIOS;
     iosPurchase.originalTransactionDateIOS =
-      nitroPurchase.originalTransactionDateIOS
+      nitroPurchase.originalTransactionDateIOS;
     iosPurchase.originalTransactionIdentifierIOS =
-      nitroPurchase.originalTransactionIdentifierIOS
-    iosPurchase.appAccountToken = nitroPurchase.appAccountToken
+      nitroPurchase.originalTransactionIdentifierIOS;
+    iosPurchase.appAccountToken = nitroPurchase.appAccountToken;
+    // Fill common quantity from iOS-specific quantity when available
+    if (typeof nitroPurchase.quantityIOS === 'number') {
+      purchase.quantity = nitroPurchase.quantityIOS;
+    }
   } else if (Platform.OS === 'android') {
-    const androidPurchase = purchase as any
-    androidPurchase.purchaseTokenAndroid = nitroPurchase.purchaseTokenAndroid
-    androidPurchase.dataAndroid = nitroPurchase.dataAndroid
-    androidPurchase.signatureAndroid = nitroPurchase.signatureAndroid
-    androidPurchase.autoRenewingAndroid = nitroPurchase.autoRenewingAndroid
-    androidPurchase.purchaseStateAndroid = nitroPurchase.purchaseStateAndroid
-    androidPurchase.isAcknowledgedAndroid = nitroPurchase.isAcknowledgedAndroid
-    androidPurchase.packageNameAndroid = nitroPurchase.packageNameAndroid
+    const androidPurchase = purchase as any;
+    androidPurchase.purchaseTokenAndroid = nitroPurchase.purchaseTokenAndroid;
+    androidPurchase.dataAndroid = nitroPurchase.dataAndroid;
+    androidPurchase.signatureAndroid = nitroPurchase.signatureAndroid;
+    // Support both old and new field names for backward compatibility
+    androidPurchase.autoRenewingAndroid = nitroPurchase.autoRenewingAndroid ?? nitroPurchase.isAutoRenewing;
+    // no longer surface purchaseStateAndroid on TS side
+    androidPurchase.isAcknowledgedAndroid = nitroPurchase.isAcknowledgedAndroid;
+    androidPurchase.packageNameAndroid = nitroPurchase.packageNameAndroid;
     androidPurchase.obfuscatedAccountIdAndroid =
-      nitroPurchase.obfuscatedAccountIdAndroid
+      nitroPurchase.obfuscatedAccountIdAndroid;
     androidPurchase.obfuscatedProfileIdAndroid =
-      nitroPurchase.obfuscatedProfileIdAndroid
+      nitroPurchase.obfuscatedProfileIdAndroid;
+
+    // Use the common isAutoRenewing field from NitroPurchase
+    purchase.isAutoRenewing = nitroPurchase.isAutoRenewing;
+
+    // Map numeric Android purchase state to common PurchaseState
+    switch (nitroPurchase.purchaseStateAndroid) {
+      case 1:
+        purchase.purchaseState = PurchaseState.purchased;
+        break;
+      case 2:
+        purchase.purchaseState = PurchaseState.pending;
+        break;
+      case 0:
+      default:
+        purchase.purchaseState = PurchaseState.unknown;
+        break;
+    }
   }
 
-  return purchase as Purchase
+  return purchase as Purchase;
 }
 
 // Note: Use nitroPurchases.map(convertNitroPurchaseToPurchase) instead of a separate function
@@ -169,7 +226,10 @@ export function convertNitroPurchaseToPurchase(
  * Validate that a NitroProduct has all required fields for conversion
  */
 export function validateNitroProduct(nitroProduct: NitroProduct): boolean {
-  const required = ['id', 'title', 'description', 'type', 'platform']
+  if (!nitroProduct || typeof nitroProduct !== 'object') {
+    return false;
+  }
+  const required = ['id', 'title', 'description', 'type', 'platform'];
   for (const field of required) {
     if (
       !(field in nitroProduct) ||
@@ -177,19 +237,22 @@ export function validateNitroProduct(nitroProduct: NitroProduct): boolean {
     ) {
       console.error(
         `NitroProduct missing required field: ${field}`,
-        nitroProduct
-      )
-      return false
+        nitroProduct,
+      );
+      return false;
     }
   }
-  return true
+  return true;
 }
 
 /**
  * Validate that a NitroPurchase has all required fields for conversion
  */
 export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
-  const required = ['id', 'productId', 'transactionDate', 'platform']
+  if (!nitroPurchase || typeof nitroPurchase !== 'object') {
+    return false;
+  }
+  const required = ['id', 'productId', 'transactionDate', 'platform'];
   for (const field of required) {
     if (
       !(field in nitroPurchase) ||
@@ -197,12 +260,12 @@ export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
     ) {
       console.error(
         `NitroPurchase missing required field: ${field}`,
-        nitroPurchase
-      )
-      return false
+        nitroPurchase,
+      );
+      return false;
     }
   }
-  return true
+  return true;
 }
 
 // ============================================================================
@@ -214,10 +277,10 @@ export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
  * This function can be run in development to detect type mismatches
  */
 export function checkTypeSynchronization(): {
-  isSync: boolean
-  issues: string[]
+  isSync: boolean;
+  issues: string[];
 } {
-  const issues: string[] = []
+  const issues: string[] = [];
 
   try {
     // Simple test: can we convert between types?
@@ -229,19 +292,19 @@ export function checkTypeSynchronization(): {
       platform: 'ios',
       displayPrice: '$1.00',
       currency: 'USD',
-    }
+    };
 
-    const converted = convertNitroProductToProduct(testNitroProduct)
+    const converted = convertNitroProductToProduct(testNitroProduct);
 
     if (!converted.id || !converted.title) {
-      issues.push('Type conversion failed')
+      issues.push('Type conversion failed');
     }
   } catch (error) {
-    issues.push(`Type conversion error: ${error}`)
+    issues.push(`Type conversion error: ${error}`);
   }
 
   return {
     isSync: issues.length === 0,
     issues,
-  }
+  };
 }