@umituz/react-native-subscription 2.27.64 → 2.27.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.64",
+  "version": "2.27.66",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -55,7 +55,9 @@
     "@tanstack/query-async-storage-persister": "^5.66.7",
     "@tanstack/react-query": "^5.0.0",
     "@tanstack/react-query-persist-client": "^5.66.7",
+    "@types/jest": "^30.0.0",
     "@types/react": "~19.1.10",
+    "@types/react-native": "^0.72.8",
     "@typescript-eslint/eslint-plugin": "^8.50.1",
     "@typescript-eslint/parser": "^8.50.1",
     "@umituz/react-native-auth": "^3.6.14",

package/src/domain/entities/Credits.ts

@@ -6,21 +6,17 @@
  */
 
 import type { SubscriptionPackageType } from "../../utils/packageTypeDetector";
-import type { SubscriptionStatusType, PeriodType } from "./SubscriptionStatus";
+import type { 
+  SubscriptionStatusType, 
+  PeriodType, 
+  PackageType, 
+  Platform, 
+  PurchaseSource, 
+  PurchaseType 
+} from "./SubscriptionConstants";
 
 export type CreditType = "text" | "image";
 
-export type PurchaseSource =
-  | "onboarding"
-  | "settings"
-  | "upgrade_prompt"
-  | "home_screen"
-  | "feature_gate"
-  | "credits_exhausted"
-  | "renewal";
-
-export type PurchaseType = "initial" | "renewal" | "upgrade" | "downgrade";
-
 /** Single Source of Truth for user subscription + credits data */
 export interface UserCredits {
   // Core subscription
@@ -35,7 +31,7 @@ export interface UserCredits {
   // RevenueCat subscription details
   willRenew: boolean;
   productId?: string;
-  packageType?: "weekly" | "monthly" | "yearly" | "lifetime";
+  packageType?: PackageType;
   originalTransactionId?: string;
 
   // Trial fields
@@ -53,7 +49,7 @@ export interface UserCredits {
   // Metadata
   purchaseSource?: PurchaseSource;
   purchaseType?: PurchaseType;
-  platform?: "ios" | "android";
+  platform?: Platform;
   appVersion?: string;
 }
 

package/src/domain/entities/SubscriptionConstants.ts

@@ -0,0 +1,67 @@
+/**
+ * Subscription Constants and Types
+ * Centralized source of truth for subscription-related enums and types.
+ */
+
+/** Subscription status constants */
+export const SUBSCRIPTION_STATUS = {
+  ACTIVE: 'active',
+  TRIAL: 'trial',
+  TRIAL_CANCELED: 'trial_canceled',
+  EXPIRED: 'expired',
+  CANCELED: 'canceled',
+  NONE: 'none',
+} as const;
+
+export type SubscriptionStatusType = (typeof SUBSCRIPTION_STATUS)[keyof typeof SUBSCRIPTION_STATUS];
+
+/** RevenueCat period type constants */
+export const PERIOD_TYPE = {
+  NORMAL: 'NORMAL',
+  INTRO: 'INTRO',
+  TRIAL: 'TRIAL',
+} as const;
+
+export type PeriodType = (typeof PERIOD_TYPE)[keyof typeof PERIOD_TYPE];
+
+/** Subscription package type constants */
+export const PACKAGE_TYPE = {
+  WEEKLY: 'weekly',
+  MONTHLY: 'monthly',
+  YEARLY: 'yearly',
+  LIFETIME: 'lifetime',
+  UNKNOWN: 'unknown',
+} as const;
+
+export type PackageType = (typeof PACKAGE_TYPE)[keyof typeof PACKAGE_TYPE];
+
+/** Platform constants */
+export const PLATFORM = {
+  IOS: 'ios',
+  ANDROID: 'android',
+} as const;
+
+export type Platform = (typeof PLATFORM)[keyof typeof PLATFORM];
+
+/** Purchase source constants */
+export const PURCHASE_SOURCE = {
+  ONBOARDING: 'onboarding',
+  SETTINGS: 'settings',
+  UPGRADE_PROMPT: 'upgrade_prompt',
+  HOME_SCREEN: 'home_screen',
+  FEATURE_GATE: 'feature_gate',
+  CREDITS_EXHAUSTED: 'credits_exhausted',
+  RENEWAL: 'renewal',
+} as const;
+
+export type PurchaseSource = (typeof PURCHASE_SOURCE)[keyof typeof PURCHASE_SOURCE];
+
+/** Purchase type constants */
+export const PURCHASE_TYPE = {
+  INITIAL: 'initial',
+  RENEWAL: 'renewal',
+  UPGRADE: 'upgrade',
+  DOWNGRADE: 'downgrade',
+} as const;
+
+export type PurchaseType = (typeof PURCHASE_TYPE)[keyof typeof PURCHASE_TYPE];

package/src/domain/entities/SubscriptionStatus.test.ts

@@ -1,7 +1,11 @@
+import { 
+  SUBSCRIPTION_STATUS,
+} from './SubscriptionConstants';
 import {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
   calculateDaysRemaining,
+  resolveSubscriptionStatus,
 } from './SubscriptionStatus';
 
 describe('SubscriptionStatus', () => {
@@ -16,7 +20,7 @@ describe('SubscriptionStatus', () => {
         purchasedAt: null,
         customerId: null,
         syncedAt: null,
-        status: 'none',
+        status: SUBSCRIPTION_STATUS.NONE,
       });
     });
   });
@@ -102,4 +106,44 @@ describe('SubscriptionStatus', () => {
       expect(calculateDaysRemaining(pastDate.toISOString())).toBe(0);
     });
   });
+
+  describe('resolveSubscriptionStatus', () => {
+    it('should return NONE when not premium', () => {
+      expect(resolveSubscriptionStatus({ isPremium: false })).toBe(SUBSCRIPTION_STATUS.NONE);
+    });
+
+    it('should return EXPIRED when expired', () => {
+      expect(resolveSubscriptionStatus({ isPremium: true, isExpired: true })).toBe(SUBSCRIPTION_STATUS.EXPIRED);
+    });
+
+    it('should return TRIAL when trialing and set to renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        periodType: 'TRIAL',
+        willRenew: true
+      })).toBe(SUBSCRIPTION_STATUS.TRIAL);
+    });
+
+    it('should return TRIAL_CANCELED when trialing and will not renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        periodType: 'TRIAL',
+        willRenew: false
+      })).toBe(SUBSCRIPTION_STATUS.TRIAL_CANCELED);
+    });
+
+    it('should return ACTIVE when premium, not expired, not trial, and set to renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        willRenew: true
+      })).toBe(SUBSCRIPTION_STATUS.ACTIVE);
+    });
+
+    it('should return CANCELED when premium, not expired, not trial, and will not renew', () => {
+      expect(resolveSubscriptionStatus({
+        isPremium: true,
+        willRenew: false
+      })).toBe(SUBSCRIPTION_STATUS.CANCELED);
+    });
+  });
 });

package/src/domain/entities/SubscriptionStatus.ts

@@ -1,24 +1,17 @@
 import { timezoneService } from "@umituz/react-native-design-system";
+import { 
+  SUBSCRIPTION_STATUS, 
+  PERIOD_TYPE, 
+  type PeriodType, 
+  type SubscriptionStatusType 
+} from "./SubscriptionConstants";
 
-export const SUBSCRIPTION_STATUS = {
-  ACTIVE: 'active',
-  TRIAL: 'trial',
-  TRIAL_CANCELED: 'trial_canceled',
-  EXPIRED: 'expired',
-  CANCELED: 'canceled',
-  NONE: 'none',
-} as const;
-
-/** RevenueCat period type constants */
-export const PERIOD_TYPE = {
-  NORMAL: 'NORMAL',
-  INTRO: 'INTRO',
-  TRIAL: 'TRIAL',
-} as const;
-
-export type PeriodType = (typeof PERIOD_TYPE)[keyof typeof PERIOD_TYPE];
-
-export type SubscriptionStatusType = (typeof SUBSCRIPTION_STATUS)[keyof typeof SUBSCRIPTION_STATUS];
+export { 
+  SUBSCRIPTION_STATUS, 
+  PERIOD_TYPE, 
+  type PeriodType, 
+  type SubscriptionStatusType 
+};
 
 export interface SubscriptionStatus {
     isPremium: boolean;

package/src/index.ts

@@ -6,15 +6,14 @@ export * from "./domains/wallet";
 export * from "./domains/paywall";
 export * from "./domains/config";
 
-// Domain Layer
+// Domain Layer - Constants & Types
+export * from "./domain/entities/SubscriptionConstants";
 export {
-  SUBSCRIPTION_STATUS,
-  PERIOD_TYPE,
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
   resolveSubscriptionStatus,
 } from "./domain/entities/SubscriptionStatus";
-export type { SubscriptionStatus, SubscriptionStatusType, PeriodType, StatusResolverInput } from "./domain/entities/SubscriptionStatus";
+export type { SubscriptionStatus, StatusResolverInput } from "./domain/entities/SubscriptionStatus";
 export type { SubscriptionConfig } from "./domain/value-objects/SubscriptionConfig";
 export type { ISubscriptionRepository } from "./application/ports/ISubscriptionRepository";
 
@@ -78,15 +77,12 @@ export * from "./presentation/types/SubscriptionDetailTypes";
 // Presentation Layer - Stores
 export * from "./presentation/stores";
 
-// Credits Domain
 export type {
   CreditType,
   UserCredits,
   CreditsConfig,
   CreditsResult,
   DeductCreditsResult,
-  PurchaseSource,
-  PurchaseType,
   CreditAllocation,
   PackageAllocationMap,
 } from "./domain/entities/Credits";

package/src/infrastructure/mappers/CreditsMapper.ts

@@ -1,5 +1,6 @@
 import type { UserCredits } from "../../domain/entities/Credits";
-import { resolveSubscriptionStatus, type PeriodType, type SubscriptionStatusType } from "../../domain/entities/SubscriptionStatus";
+import { resolveSubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
+import type { PeriodType, SubscriptionStatusType } from "../../domain/entities/SubscriptionConstants";
 import type { UserCreditsDocumentRead } from "../models/UserCreditsDocument";
 
 /** Maps Firestore document to domain entity with expiration validation */

package/src/infrastructure/models/UserCreditsDocument.ts

@@ -1,8 +1,18 @@
-import type { PurchaseSource, PurchaseType } from "../../domain/entities/Credits";
-import type { SubscriptionStatusType, PeriodType } from "../../domain/entities/SubscriptionStatus";
+import type { 
+  PurchaseSource, 
+  PurchaseType, 
+  SubscriptionStatusType, 
+  PeriodType,
+  PackageType,
+  Platform
+} from "../../domain/entities/SubscriptionConstants";
 
-export type { PurchaseSource, PurchaseType } from "../../domain/entities/Credits";
-export type { SubscriptionStatusType, PeriodType } from "../../domain/entities/SubscriptionStatus";
+export type { 
+  PurchaseSource, 
+  PurchaseType, 
+  SubscriptionStatusType, 
+  PeriodType 
+};
 
 export interface FirestoreTimestamp {
     toDate: () => Date;
@@ -10,11 +20,11 @@ export interface FirestoreTimestamp {
 
 export interface PurchaseMetadata {
   productId: string;
-  packageType: "weekly" | "monthly" | "yearly" | "lifetime";
+  packageType: PackageType;
   creditLimit: number;
   source: PurchaseSource;
   type: PurchaseType;
-  platform: "ios" | "android";
+  platform: Platform;
   appVersion?: string;
   timestamp: FirestoreTimestamp;
 }
@@ -34,7 +44,7 @@ export interface UserCreditsDocumentRead {
     // RevenueCat subscription details
     willRenew?: boolean;
     productId?: string;
-    packageType?: "weekly" | "monthly" | "yearly" | "lifetime";
+    packageType?: PackageType;
     originalTransactionId?: string;
 
     // Trial fields
@@ -52,7 +62,7 @@ export interface UserCreditsDocumentRead {
     // Metadata
     purchaseSource?: PurchaseSource;
     purchaseType?: PurchaseType;
-    platform?: "ios" | "android";
+    platform?: Platform;
     appVersion?: string;
     processedPurchases?: string[];
     purchaseHistory?: PurchaseMetadata[];

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -13,8 +13,8 @@ import { configureCreditsRepository, getCreditsRepository } from "../repositorie
 import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
 import { configureAuthProvider } from "../../presentation/hooks/useAuthAwarePurchase";
 import type { RevenueCatData } from "../../domain/types/RevenueCatData";
+import { type PeriodType, type PurchaseSource } from "../../domain/entities/SubscriptionConstants";
 import type { SubscriptionInitConfig, FirebaseAuthLike } from "./SubscriptionInitializerTypes";
-import type { PurchaseSource } from "../../domain/entities/Credits";
 
 export type { FirebaseAuthLike, CreditPackageConfig, SubscriptionInitConfig } from "./SubscriptionInitializerTypes";
 
@@ -53,8 +53,7 @@ const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId: string
     expirationDate: entitlement?.expirationDate ?? customerInfo.latestExpirationDate ?? null,
     willRenew: entitlement?.willRenew ?? false,
     originalTransactionId: entitlement?.originalPurchaseDate ?? undefined,
-    isPremium: Object.keys(customerInfo.entitlements.active).length > 0,
-    periodType: entitlement?.periodType as "NORMAL" | "INTRO" | "TRIAL" | undefined,
+    periodType: entitlement?.periodType as PeriodType | undefined,
   };
 };
 
@@ -95,7 +94,7 @@ export const initializeSubscription = async (config: SubscriptionInitConfig): Pr
 
   const onPremiumStatusChanged = async (
     userId: string, isPremium: boolean, productId?: string,
-    expiresAt?: string, willRenew?: boolean, periodType?: "NORMAL" | "INTRO" | "TRIAL"
+    expiresAt?: string, willRenew?: boolean, periodType?: PeriodType
   ) => {
     if (__DEV__) console.log('[SubscriptionInitializer] onPremiumStatusChanged:', { userId, isPremium, productId, willRenew, periodType });
     try {

package/src/presentation/components/details/PremiumStatusBadge.tsx

@@ -6,7 +6,10 @@
 import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import type { SubscriptionStatusType } from "../../../domain/entities/SubscriptionStatus";
+import { 
+  SUBSCRIPTION_STATUS, 
+  type SubscriptionStatusType 
+} from "../../../domain/entities/SubscriptionConstants";
 
 export type { SubscriptionStatusType };
 
@@ -30,23 +33,23 @@ export const PremiumStatusBadge: React.FC<PremiumStatusBadgeProps> = ({
 }) => {
   const tokens = useAppDesignTokens();
 
-  const labels: Record<SubscriptionStatusType, string> = {
-    active: activeLabel,
-    trial: activeLabel,
-    trial_canceled: trialCanceledLabel ?? canceledLabel,
-    expired: expiredLabel,
-    none: noneLabel,
-    canceled: canceledLabel,
-  };
+  const labels: Record<SubscriptionStatusType, string> = useMemo(() => ({
+    [SUBSCRIPTION_STATUS.ACTIVE]: activeLabel,
+    [SUBSCRIPTION_STATUS.TRIAL]: activeLabel,
+    [SUBSCRIPTION_STATUS.TRIAL_CANCELED]: trialCanceledLabel ?? canceledLabel,
+    [SUBSCRIPTION_STATUS.EXPIRED]: expiredLabel,
+    [SUBSCRIPTION_STATUS.NONE]: noneLabel,
+    [SUBSCRIPTION_STATUS.CANCELED]: canceledLabel,
+  }), [activeLabel, trialCanceledLabel, canceledLabel, expiredLabel, noneLabel]);
 
   const backgroundColor = useMemo(() => {
     const colors: Record<SubscriptionStatusType, string> = {
-      active: tokens.colors.success,
-      trial: tokens.colors.primary, // Blue/purple for trial
-      trial_canceled: tokens.colors.warning, // Orange for trial canceled
-      expired: tokens.colors.error,
-      none: tokens.colors.textTertiary,
-      canceled: tokens.colors.warning,
+      [SUBSCRIPTION_STATUS.ACTIVE]: tokens.colors.success,
+      [SUBSCRIPTION_STATUS.TRIAL]: tokens.colors.primary, // Blue/purple for trial
+      [SUBSCRIPTION_STATUS.TRIAL_CANCELED]: tokens.colors.warning, // Orange for trial canceled
+      [SUBSCRIPTION_STATUS.EXPIRED]: tokens.colors.error,
+      [SUBSCRIPTION_STATUS.NONE]: tokens.colors.textTertiary,
+      [SUBSCRIPTION_STATUS.CANCELED]: tokens.colors.warning,
     };
     return colors[status];
   }, [status, tokens.colors]);

package/src/utils/packageTypeDetector.ts

@@ -3,36 +3,37 @@
  * Detects subscription package type from RevenueCat package identifier
  */
 
-export type SubscriptionPackageType = "weekly" | "monthly" | "yearly" | "unknown";
+import { PACKAGE_TYPE, type PackageType } from "../domain/entities/SubscriptionConstants";
 
+export type SubscriptionPackageType = PackageType;
+
+/**
+ * Check if identifier is a credit package (consumable purchase)
+ * Credit packages use a different system and don't need type detection
+ */
 /**
  * Check if identifier is a credit package (consumable purchase)
  * Credit packages use a different system and don't need type detection
  */
 function isCreditPackage(identifier: string): boolean {
-  return identifier.includes("credit");
+  // Matches "credit" as a word or part of a common naming pattern
+  return /\bcredit\b|_credit_|-credit-/i.test(identifier) || identifier.toLowerCase().includes("credit");
 }
 
 /**
  * Detect package type from product identifier
- * Supports common RevenueCat naming patterns:
- * - premium_weekly, weekly_premium, premium-weekly
- * - premium_monthly, monthly_premium, premium-monthly
- * - premium_yearly, yearly_premium, premium-yearly, premium_annual, annual_premium
- * - preview-product-id (Preview API mode in Expo Go)
- *
- * Note: Credit packages (consumable purchases) are skipped silently
+ * Supports common RevenueCat naming patterns with regex for better accuracy
  */
 export function detectPackageType(productIdentifier: string): SubscriptionPackageType {
   if (!productIdentifier) {
-    return "unknown";
+    return PACKAGE_TYPE.UNKNOWN;
   }
 
   const normalized = productIdentifier.toLowerCase();
 
   // Skip credit packages silently - they use creditPackageConfig instead
   if (isCreditPackage(normalized)) {
-    return "unknown";
+    return PACKAGE_TYPE.UNKNOWN;
   }
 
   // Preview API mode (Expo Go testing)
@@ -40,40 +41,36 @@ export function detectPackageType(productIdentifier: string): SubscriptionPackag
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: PREVIEW (monthly)");
     }
-    return "monthly";
+    return PACKAGE_TYPE.MONTHLY;
   }
 
-  // Weekly detection
-  if (normalized.includes("weekly") || normalized.includes("week")) {
+  // Weekly detection: matches "weekly" or "week" as distinct parts of the ID
+  if (/\bweekly?\b|_week_|-week-|\.week\./i.test(normalized)) {
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: WEEKLY");
     }
-    return "weekly";
+    return PACKAGE_TYPE.WEEKLY;
   }
 
-  // Monthly detection
-  if (normalized.includes("monthly") || normalized.includes("month")) {
+  // Monthly detection: matches "monthly" or "month"
+  if (/\bmonthly?\b|_month_|-month-|\.month\./i.test(normalized)) {
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: MONTHLY");
     }
-    return "monthly";
+    return PACKAGE_TYPE.MONTHLY;
   }
 
-  // Yearly detection (includes annual)
-  if (
-    normalized.includes("yearly") ||
-    normalized.includes("year") ||
-    normalized.includes("annual")
-  ) {
+  // Yearly detection: matches "yearly", "year", or "annual"
+  if (/\byearly?\b|_year_|-year-|\.year\.|annual/i.test(normalized)) {
     if (__DEV__) {
       console.log("[PackageTypeDetector] Detected: YEARLY");
     }
-    return "yearly";
+    return PACKAGE_TYPE.YEARLY;
   }
 
   if (__DEV__) {
     console.warn("[PackageTypeDetector] Unknown package type for:", productIdentifier);
   }
 
-  return "unknown";
+  return PACKAGE_TYPE.UNKNOWN;
 }

package/src/domain/constants/README.md

@@ -1,24 +0,0 @@
-# Domain Constants
-
-Constants used throughout the domain layer.
-
-## Overview
-
-This directory contains constant definitions for subscription tiers, package periods, error codes, and other domain values.
-
-## Constants
-
-### Subscription Tiers
-
-### Package Periods
-
-### Error Codes
-
-### Credit Limits
-
-### Time Periods
-
-## Related
-
-- [Domain README](../README.md)
-- [Entities](../entities/README.md)