@umituz/react-native-subscription 2.27.72 → 2.27.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.72",
+  "version": "2.27.74",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/credits/core/Credits.ts

@@ -5,7 +5,7 @@
  * Designed to be used across hundreds of apps with configurable limits.
  */
 
-import type { SubscriptionPackageType } from "../../utils/packageTypeDetector";
+import type { SubscriptionPackageType } from "../../../utils/packageTypeDetector";
 import type { 
   SubscriptionStatusType, 
   PeriodType, 
@@ -13,7 +13,16 @@ import type {
   Platform, 
   PurchaseSource, 
   PurchaseType 
-} from "./SubscriptionConstants";
+} from "../../subscription/core/SubscriptionConstants";
+
+export type { 
+  SubscriptionStatusType, 
+  PeriodType, 
+  PackageType, 
+  Platform, 
+  PurchaseSource, 
+  PurchaseType 
+};
 
 export type CreditType = "text" | "image";
 
@@ -91,7 +100,3 @@ export interface DeductCreditsResult {
   };
 }
 
-export const DEFAULT_CREDITS_CONFIG: CreditsConfig = {
-  collectionName: "user_credits",
-  creditLimit: 0,
-};

package/src/domains/credits/core/UserCreditsDocument.ts

@@ -5,7 +5,7 @@ import type {
   PeriodType,
   PackageType,
   Platform
-} from "../../domain/entities/SubscriptionConstants";
+} from "../../subscription/core/SubscriptionConstants";
 
 export type { 
   PurchaseSource, 

package/src/domains/credits/infrastructure/CreditsRepositoryProvider.ts

@@ -4,23 +4,19 @@
  * Replaces Context API with a simpler, testable approach
  */
 
-import type { CreditsConfig } from "../../domain/entities/Credits";
-import { DEFAULT_CREDITS_CONFIG } from "../../domain/entities/Credits";
+import type { CreditsConfig } from "../core/Credits";
 import type { CreditsRepository } from "./CreditsRepository";
 import { createCreditsRepository } from "./CreditsRepository";
 
 let globalRepository: CreditsRepository | null = null;
-let globalConfig: CreditsConfig = DEFAULT_CREDITS_CONFIG;
+let globalConfig: CreditsConfig | null = null;
 
 /**
  * Configure credits repository for the application
  * Must be called once during app initialization
  */
-export function configureCreditsRepository(config: Partial<CreditsConfig>): void {
-  globalConfig = {
-    ...DEFAULT_CREDITS_CONFIG,
-    ...config,
-  };
+export function configureCreditsRepository(config: CreditsConfig): void {
+  globalConfig = config;
   globalRepository = createCreditsRepository(globalConfig);
 }
 
@@ -48,13 +44,11 @@ export function getCreditsRepository(): CreditsRepository {
  * Get the current credits configuration
  */
 export function getCreditsConfig(): CreditsConfig {
+  if (!globalConfig) {
+    throw new Error(
+      "CreditsConfig not configured. Call configureCreditsRepository() first."
+    );
+  }
   return globalConfig;
 }
 
-/**
- * Reset repository (for testing)
- */
-export function resetCreditsRepository(): void {
-  globalRepository = null;
-  globalConfig = DEFAULT_CREDITS_CONFIG;
-}

package/src/domains/credits/presentation/useDeductCredit.ts

@@ -5,8 +5,8 @@
 
 import { useCallback } from "react";
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
-import type { UserCredits } from "../../domain/entities/Credits";
-import { getCreditsRepository } from "../../infrastructure/repositories/CreditsRepositoryProvider";
+import type { UserCredits } from "../core/Credits";
+import { getCreditsRepository } from "../infrastructure/CreditsRepositoryProvider";
 import { creditsQueryKeys } from "./useCredits";
 
 import { timezoneService } from "@umituz/react-native-design-system";

package/src/domains/paywall/components/PaywallContainer.types.ts

@@ -5,7 +5,7 @@
 
 import type { ImageSourcePropType } from "react-native";
 import type { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities/types";
-import type { PurchaseSource, PackageAllocationMap } from "../../../domain/entities/Credits";
+import type { PurchaseSource, PackageAllocationMap } from "../../credits/core/Credits";
 
 /**
  * Trial display configuration

package/src/domains/paywall/hooks/usePaywallActions.ts

@@ -2,7 +2,7 @@ import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { useRestorePurchase } from "../../../revenuecat/presentation/hooks/useRestorePurchase";
 import { useAuthAwarePurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
-import type { PurchaseSource } from "../../../domain/entities/Credits";
+import type { PurchaseSource } from "../../credits/core/Credits";
 
 interface UsePaywallActionsProps {
   source?: PurchaseSource;

package/src/domains/subscription/infrastructure/utils/PremiumStatusSyncer.ts

@@ -4,9 +4,9 @@
  */
 
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
-import type { PurchaseSource } from "../../../domain/entities/Credits";
-import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
+import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
+import type { PurchaseSource } from "../../../credits/core/Credits";
+import { getPremiumEntitlement } from "../../core/RevenueCatTypes";
 
 export async function syncPremiumStatus(
     config: RevenueCatConfig,

package/src/domains/subscription/presentation/useAuthAwarePurchase.ts

@@ -6,7 +6,7 @@
 import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { usePremium } from "./usePremium";
-import type { PurchaseSource } from "../../domain/entities/Credits";
+import type { PurchaseSource } from "../../credits/core/Credits";
 
 export interface PurchaseAuthProvider {
   isAuthenticated: () => boolean;

package/src/domains/subscription/presentation/useFeatureGate.ts

@@ -113,20 +113,22 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
   useEffect(() => {
     const prevBalance = prevCreditBalanceRef.current ?? 0;
     const creditsIncreased = creditBalance > prevBalance;
+    const subscriptionAcquired = hasSubscription && !hasSubscriptionRef.current;
 
-    if (isWaitingForPurchaseRef.current && creditsIncreased && pendingActionRef.current) {
+    if (isWaitingForPurchaseRef.current && (creditsIncreased || subscriptionAcquired) && pendingActionRef.current) {
       const action = pendingActionRef.current;
       pendingActionRef.current = null;
       isWaitingForPurchaseRef.current = false;
 
       if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useFeatureGate] Credits increased, executing pending action");
+        console.log("[useFeatureGate] Access acquired (credits or subscription), executing pending action");
       }
       action();
     }
 
     prevCreditBalanceRef.current = creditBalance;
-  }, [creditBalance]);
+    hasSubscriptionRef.current = hasSubscription;
+  }, [creditBalance, hasSubscription]);
 
   const requireFeature = useCallback(
     (action: () => void | Promise<void>) => {

package/src/domains/subscription/presentation/usePaywallVisibility.ts

@@ -5,7 +5,7 @@
  */
 
 import { useCallback, useSyncExternalStore } from "react";
-import type { PurchaseSource } from "../../domain/entities/Credits";
+import type { PurchaseSource } from "../../credits/core/Credits";
 
 type Listener = () => void;
 

package/src/domains/subscription/presentation/useSubscriptionSettingsConfig.ts

@@ -4,24 +4,24 @@
  */
 
 import { useMemo, useCallback } from "react";
-import { useCredits } from "./useCredits";
+import { useCredits } from "../../credits/presentation/useCredits";
 import { usePaywallVisibility } from "./usePaywallVisibility";
-import { calculateDaysRemaining } from "../../domain/entities/SubscriptionStatus";
-import { formatDate } from "../utils/subscriptionDateUtils";
+import { calculateDaysRemaining } from "../core/SubscriptionStatus";
+import { formatDate } from "../../../presentation/utils/subscriptionDateUtils";
 import { useCreditsArray, getSubscriptionStatusType } from "./useSubscriptionSettingsConfig.utils";
-import { getCreditsConfig } from "../../infrastructure/repositories/CreditsRepositoryProvider";
+import { getCreditsConfig } from "../../credits/infrastructure/CreditsRepositoryProvider";
 import type {
   SubscriptionSettingsConfig,
   SubscriptionStatusType,
   UseSubscriptionSettingsConfigParams,
-} from "../types/SubscriptionSettingsTypes";
+} from "../../../presentation/types/SubscriptionSettingsTypes";
 
 export type {
   SubscriptionSettingsConfig,
   SubscriptionSettingsItemConfig,
   SubscriptionSettingsTranslations,
   UseSubscriptionSettingsConfigParams,
-} from "../types/SubscriptionSettingsTypes";
+} from "../../../presentation/types/SubscriptionSettingsTypes";
 
 export const useSubscriptionSettingsConfig = (
   params: Omit<UseSubscriptionSettingsConfigParams, 'userId'>

package/src/domains/subscription/presentation/useSubscriptionSettingsConfig.utils.ts

@@ -4,8 +4,8 @@
  */
 
 import { useMemo } from "react";
-import type { UserCredits } from "../../domain/entities/Credits";
-import { resolveSubscriptionStatus, type PeriodType, type SubscriptionStatusType } from "../../domain/entities/SubscriptionStatus";
+import type { UserCredits } from "../../credits/core/Credits";
+import { resolveSubscriptionStatus, type PeriodType, type SubscriptionStatusType } from "../core/SubscriptionStatus";
 import type { SubscriptionSettingsTranslations } from "../types/SubscriptionSettingsTypes";
 
 export interface CreditsInfo {

package/src/index.ts

@@ -68,7 +68,6 @@ export type {
   DeductCreditsResult,
 } from "./domains/credits/core/Credits";
 
-export { DEFAULT_CREDITS_CONFIG } from "./domains/credits/core/Credits";
 
 // Utils
 export * from "./utils";

package/src/presentation/types/SubscriptionDetailTypes.ts

@@ -3,7 +3,7 @@
  * Type definitions for subscription detail screen and components
  */
 
-import type { SubscriptionStatusType } from "../../domain/entities/SubscriptionStatus";
+import type { SubscriptionStatusType } from "../../domains/subscription/core/SubscriptionStatus";
 import type { CreditInfo } from "../components/details/PremiumDetailsCardTypes";
 
 export type { SubscriptionStatusType, CreditInfo };

package/src/presentation/types/SubscriptionSettingsTypes.ts

@@ -3,7 +3,7 @@
  * Type definitions for subscription settings configuration
  */
 
-import type { SubscriptionStatusType } from "../../domain/entities/SubscriptionStatus";
+import type { SubscriptionStatusType } from "../../domains/subscription/core/SubscriptionConstants";
 import type {
   SubscriptionDetailConfig,
   UpgradePromptConfig,

package/src/shared/application/ActivationHandler.ts

@@ -1,7 +1,7 @@
 import { timezoneService } from "@umituz/react-native-design-system";
-import type { ISubscriptionRepository } from "../../application/ports/ISubscriptionRepository";
-import type { SubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
-import { SubscriptionRepositoryError } from "../../domain/errors/SubscriptionError";
+import type { ISubscriptionRepository } from "../application/ports/ISubscriptionRepository";
+import type { SubscriptionStatus } from "../../domains/subscription/core/SubscriptionStatus";
+import { SubscriptionRepositoryError } from "../utils/SubscriptionError";
 
 export interface ActivationHandlerConfig {
   repository: ISubscriptionRepository;

package/src/shared/application/ports/ISubscriptionRepository.ts

@@ -2,7 +2,7 @@
  * ISubscriptionRepository Interface
  */
 
-import { SubscriptionStatus } from '../../domain/entities/SubscriptionStatus';
+import { SubscriptionStatus } from '../../../domains/subscription/core/SubscriptionStatus';
 
 export interface ISubscriptionRepository {
     getSubscriptionStatus(userId: string): Promise<SubscriptionStatus | null>;

package/src/shared/application/ports/ISubscriptionService.ts

@@ -3,7 +3,7 @@
  * Defines the contract for subscription service operations
  */
 
-import type { SubscriptionStatus } from '../../domain/entities/SubscriptionStatus';
+import type { SubscriptionStatus } from '../../../domains/subscription/core/SubscriptionStatus';
 
 export interface ISubscriptionService {
     /**

package/src/shared/utils/SubscriptionConfig.ts

@@ -2,8 +2,8 @@
  * Subscription Config Value Object
  */
 
-import { ISubscriptionRepository } from "../../application/ports/ISubscriptionRepository";
-import { SubscriptionStatus } from "../entities/SubscriptionStatus";
+import { ISubscriptionRepository } from "../application/ports/ISubscriptionRepository";
+import { SubscriptionStatus } from "../../domains/subscription/core/SubscriptionStatus";
 
 export interface SubscriptionConfig {
     repository: ISubscriptionRepository;

package/src/utils/aiCreditHelpers.ts

@@ -14,7 +14,7 @@
  *   });
  */
 
-import type { CreditsRepository } from "../infrastructure/repositories/CreditsRepository";
+import type { CreditsRepository } from "../domains/credits/infrastructure/CreditsRepository";
 import { createCreditChecker } from "./creditChecker";
 
 export interface AICreditHelpersConfig {

package/src/utils/creditChecker.ts

@@ -5,7 +5,7 @@
  * Generic - works with any generation type mapping.
  */
 
-import type { CreditsRepository } from "../infrastructure/repositories/CreditsRepository";
+import type { CreditsRepository } from "../domains/credits/infrastructure/CreditsRepository";
 
 export interface CreditCheckResult {
   success: boolean;

package/src/utils/creditMapper.ts

@@ -1,5 +1,5 @@
 import { detectPackageType, type SubscriptionPackageType } from "./packageTypeDetector";
-import type { PackageAllocationMap } from "../domain/entities/Credits";
+import type { PackageAllocationMap } from "../domains/credits/core/Credits";
 
 /**
  * Get credit allocation for a package type from provided allocations map