@umituz/react-native-subscription 2.39.9 → 2.39.11

package/src/domains/subscription/core/SubscriptionStatusHandlers.ts

@@ -13,10 +13,6 @@ abstract class BaseStatusHandler {
     }
 
     abstract handle(input: StatusResolverInput): SubscriptionStatusType;
-
-    protected nextOrFallback(input: StatusResolverInput, fallback: SubscriptionStatusType): SubscriptionStatusType {
-        return this.next ? this.next.handle(input) : fallback;
-    }
 }
 
 export class InactiveStatusHandler extends BaseStatusHandler {
@@ -26,7 +22,7 @@ export class InactiveStatusHandler extends BaseStatusHandler {
         if (!input.isPremium || isExpired) {
             return isExpired ? SUBSCRIPTION_STATUS.EXPIRED : SUBSCRIPTION_STATUS.NONE;
         }
-        return this.nextOrFallback(input, SUBSCRIPTION_STATUS.NONE);
+        return this.next ? this.next.handle(input) : SUBSCRIPTION_STATUS.NONE;
     }
 }
 

package/src/domains/subscription/infrastructure/handlers/PackageHandler.ts

@@ -1,12 +1,10 @@
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import { PurchaseStatusResolver, type PremiumStatus } from "./PurchaseStatusResolver";
-import {
-  fetchPackages,
-  executePurchase,
-  restorePurchases,
-  type RestoreResultInfo,
-} from "./package-operations";
+import { fetchPackages } from "./package-operations/PackageFetcher";
+import { executePurchase } from "./package-operations/PackagePurchaser";
+import { restorePurchases } from "./package-operations/PackageRestorer";
+import type { RestoreResultInfo } from "./package-operations/types";
 
 export class PackageHandler {
   constructor(

package/src/domains/subscription/infrastructure/handlers/PurchaseStatusResolver.ts

@@ -1,8 +1,8 @@
 import type { CustomerInfo } from "react-native-purchases";
-import { getPremiumEntitlement } from "../../../revenuecat/core/types";
+import { getPremiumEntitlement } from "../../../revenuecat/core/types/RevenueCatTypes";
 import { toDate } from "../../../../shared/utils/dateConverter";
 import { detectPackageType } from "../../../../utils/packageTypeDetector";
-import type { PremiumStatus } from "../../core/types";
+import type { PremiumStatus } from "../../core/types/PremiumStatus";
 
 export type { PremiumStatus };
 

package/src/domains/subscription/infrastructure/handlers/package-operations/PackageRestorer.ts

@@ -1,5 +1,5 @@
 import type { IRevenueCatService } from "../../../../../shared/application/ports/IRevenueCatService";
-import { getPremiumEntitlement } from "../../../../revenuecat/core/types";
+import { getPremiumEntitlement } from "../../../../revenuecat/core/types/RevenueCatTypes";
 import type { RestoreResultInfo } from "./types";
 
 export async function restorePurchases(

package/src/domains/subscription/infrastructure/hooks/usePurchasePackage.ts

@@ -9,7 +9,7 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
-import { getErrorMessage } from "../../../revenuecat/core/errors";
+import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface PurchaseMutationResult {
   success: boolean;

package/src/domains/subscription/infrastructure/hooks/useRestorePurchase.ts

@@ -8,7 +8,7 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
-import { getErrorMessage } from "../../../revenuecat/core/errors";
+import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface RestoreResult {
   success: boolean;

package/src/domains/subscription/infrastructure/managers/SubscriptionManager.types.ts

@@ -1,5 +1,5 @@
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
-import type { PremiumStatus } from "../../core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
+import type { PremiumStatus } from "../../core/types/PremiumStatus";
 import type { RestoreResultInfo } from "../handlers/package-operations/types";
 
 export interface SubscriptionManagerConfig {

package/src/domains/subscription/infrastructure/managers/initializationHandler.ts

@@ -1,7 +1,7 @@
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import { initializeRevenueCatService, getRevenueCatService } from "../services/revenueCatServiceInstance";
 import { ensureServiceAvailable } from "./subscriptionManagerUtils";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 
 export const performServiceInitialization = async (config: RevenueCatConfig, userId: string): Promise<{ service: IRevenueCatService; success: boolean }> => {
   await initializeRevenueCatService(config);

package/src/domains/subscription/infrastructure/services/CustomerInfoListenerManager.ts

@@ -1,5 +1,5 @@
 import Purchases, { type CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import { ListenerState } from "./listeners/ListenerState";
 import { processCustomerInfo } from "./listeners/CustomerInfoHandler";
 

package/src/domains/subscription/infrastructure/services/PurchaseHandler.ts

@@ -1,7 +1,7 @@
 import type { PurchasesPackage } from "react-native-purchases";
 import type { PurchaseResult } from "../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
-import { isUserCancelledError, isAlreadyPurchasedError } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
+import { isUserCancelledError, isAlreadyPurchasedError } from "../../../revenuecat/core/types/RevenueCatTypes";
 import { validatePurchaseReady, isConsumableProduct } from "./purchase/PurchaseValidator";
 import { executePurchase } from "./purchase/PurchaseExecutor";
 import { handleAlreadyPurchasedError, handlePurchaseError } from "./purchase/PurchaseErrorHandler";

package/src/domains/subscription/infrastructure/services/RestoreHandler.ts

@@ -4,14 +4,14 @@ import {
   RevenueCatRestoreError,
   RevenueCatInitializationError,
   RevenueCatNetworkError,
-} from "../../../revenuecat/core/errors";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+} from "../../../revenuecat/core/errors/RevenueCatError";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import {
   getRawErrorMessage,
   getErrorCode,
   isNetworkError,
   isInvalidCredentialsError,
-} from "../../../revenuecat/core/types";
+} from "../../../revenuecat/core/types/RevenueCatTypes";
 import { notifyRestoreCompleted } from "../utils/PremiumStatusSyncer";
 
 interface RestoreHandlerDeps {
@@ -50,7 +50,7 @@ export async function handleRestore(deps: RestoreHandlerDeps, userId: string): P
 
     // Generic error with code
     const errorCode = getErrorCode(error);
-    const errorMessage = getRawErrorMessage(error, "Restore failed");
+    const errorMessage = getRawErrorMessage(error);
     const enhancedMessage = errorCode
       ? `${errorMessage} (Code: ${errorCode})`
       : errorMessage;

package/src/domains/subscription/infrastructure/services/RevenueCatService.types.ts

@@ -1,7 +1,7 @@
 import Purchases from "react-native-purchases";
 import type { PurchasesOffering, PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService, InitializeResult, PurchaseResult, RestoreResult } from "../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import { initializeSDK } from "../../../revenuecat/infrastructure/services/RevenueCatInitializer";
 import { fetchOfferings } from "./OfferingsFetcher";
 import { handlePurchase } from "./PurchaseHandler";

package/src/domains/subscription/infrastructure/services/ServiceStateManager.ts

@@ -1,4 +1,4 @@
-import type { RevenueCatConfig } from '../../../revenuecat/core/types';
+import type { RevenueCatConfig } from '../../../revenuecat/core/types/RevenueCatConfig';
 
 export class ServiceStateManager {
   private isInitializedFlag = false;

package/src/domains/subscription/infrastructure/services/listeners/CustomerInfoHandler.ts

@@ -1,7 +1,9 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../../revenuecat/core/types/RevenueCatConfig";
 import { syncPremiumStatus } from "../../utils/PremiumStatusSyncer";
-import { detectRenewal, updateRenewalState, type RenewalState } from "../../utils/renewal";
+import { detectRenewal } from "../../utils/renewal/RenewalDetector";
+import { updateRenewalState } from "../../utils/renewal/RenewalStateUpdater";
+import type { RenewalState } from "../../utils/renewal/types";
 
 async function handleRenewal(
   userId: string,

package/src/domains/subscription/infrastructure/services/listeners/ListenerState.ts

@@ -1,5 +1,5 @@
 import type { CustomerInfoUpdateListener } from "react-native-purchases";
-import type { RenewalState } from "../../utils/renewal";
+import type { RenewalState } from "../../utils/renewal/types";
 
 export class ListenerState {
   listener: CustomerInfoUpdateListener | null = null;

package/src/domains/subscription/infrastructure/services/purchase/PurchaseErrorHandler.ts

@@ -3,14 +3,14 @@ import type { PurchaseResult } from "../../../../../shared/application/ports/IRe
 import {
   RevenueCatPurchaseError,
   RevenueCatNetworkError,
-} from "../../../../revenuecat/core/errors";
+} from "../../../../revenuecat/core/errors/RevenueCatError";
 import {
   isUserCancelledError,
   isNetworkError,
   isInvalidCredentialsError,
   getRawErrorMessage,
   getErrorCode,
-} from "../../../../revenuecat/core/types";
+} from "../../../../revenuecat/core/types/RevenueCatTypes";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/useAuthAwarePurchase";
 import { notifyPurchaseCompleted } from "../../utils/PremiumStatusSyncer";
 import { handleRestore } from "../RestoreHandler";
@@ -80,7 +80,7 @@ export function handlePurchaseError(
   }
 
   const errorCode = getErrorCode(error);
-  const errorMessage = getRawErrorMessage(error, "Purchase failed");
+  const errorMessage = getRawErrorMessage(error);
   const enhancedMessage = errorCode
     ? `${errorMessage} (Code: ${errorCode})`
     : errorMessage;

package/src/domains/subscription/infrastructure/services/purchase/PurchaseExecutor.ts

@@ -1,6 +1,7 @@
 import Purchases, { type PurchasesPackage, type CustomerInfo } from "react-native-purchases";
 import type { PurchaseResult } from "../../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig, PackageType } from "../../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../../revenuecat/core/types/RevenueCatConfig";
+import type { PackageType } from "../../../../revenuecat/core/types/RevenueCatTypes";
 import { notifyPurchaseCompleted, syncPremiumStatus } from "../../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/useAuthAwarePurchase";
 

package/src/domains/subscription/infrastructure/services/purchase/PurchaseValidator.ts

@@ -1,5 +1,5 @@
 import type { PurchasesPackage } from "react-native-purchases";
-import { RevenueCatInitializationError } from "../../../../revenuecat/core/errors";
+import { RevenueCatInitializationError } from "../../../../revenuecat/core/errors/RevenueCatError";
 
 export function validatePurchaseReady(isInitialized: boolean): void {
   if (!isInitialized) {

package/src/domains/subscription/infrastructure/services/revenueCatServiceInstance.ts

@@ -1,5 +1,5 @@
 import { RevenueCatService } from "./RevenueCatService.types";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 
 let revenueCatServiceInstance: RevenueCatService | null = null;
 

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

@@ -1,71 +1,64 @@
+interface CacheEntry {
+    promise: Promise<boolean>;
+    resolvedUserId: string | null;
+    completed: boolean;
+}
+
 export class InitializationCache {
-    private initPromise: Promise<boolean> | null = null;
-    private cacheKey: string | null = null;
-    private promiseCacheKey: string | null = null;
-    private resolvedUserId: string | null = null;
-    private promiseCompleted = true;
-    private pendingQueue: Map<string, Promise<boolean>> = new Map();
+    private entries: Map<string, CacheEntry> = new Map();
 
     tryAcquireInitialization(cacheKey: string): { shouldInit: boolean; existingPromise: Promise<boolean> | null } {
-        const queuedPromise = this.pendingQueue.get(cacheKey);
-        if (queuedPromise) {
-            return { shouldInit: false, existingPromise: queuedPromise };
-        }
-
-        if (
-            this.initPromise &&
-            this.cacheKey === cacheKey &&
-            this.promiseCompleted &&
-            this.promiseCacheKey === cacheKey
-        ) {
-            return { shouldInit: false, existingPromise: this.initPromise };
+        const entry = this.entries.get(cacheKey);
+        if (entry) {
+            return { shouldInit: false, existingPromise: entry.promise };
         }
 
         return { shouldInit: true, existingPromise: null };
     }
 
     setPromise(promise: Promise<boolean>, cacheKey: string, realUserId: string | null): void {
-        this.promiseCacheKey = cacheKey;
-        this.promiseCompleted = false;
+        const entry: CacheEntry = {
+            promise: null as any, // Placeholder to be assigned immediately
+            resolvedUserId: realUserId,
+            completed: false,
+        };
 
         const chain: Promise<boolean> = promise
             .then((result) => {
-                if (result && this.promiseCacheKey === cacheKey) {
-                    this.cacheKey = cacheKey;
-                    this.resolvedUserId = realUserId;
+                const currentEntry = this.entries.get(cacheKey);
+                if (currentEntry === entry) {
+                    currentEntry.completed = true;
+                    if (!result) {
+                        this.entries.delete(cacheKey);
+                    }
                 }
-                this.promiseCompleted = true;
                 return result;
             })
             .catch((error) => {
-                if (this.promiseCacheKey === cacheKey) {
-                    this.initPromise = null;
-                    this.promiseCacheKey = null;
-                    this.cacheKey = null;
-                    this.resolvedUserId = null;
+                if (this.entries.get(cacheKey) === entry) {
+                    this.entries.delete(cacheKey);
                 }
-                this.promiseCompleted = true;
                 console.error('[InitializationCache] Initialization failed', { cacheKey, error });
                 return false;
-            })
-            .finally(() => {
-                this.pendingQueue.delete(cacheKey);
             });
 
-        this.initPromise = chain;
-        this.pendingQueue.set(cacheKey, chain);
+        entry.promise = chain;
+        this.entries.set(cacheKey, entry);
     }
 
     getCurrentUserId(): string | null {
-        return this.resolvedUserId;
+        // Find the first completed entry. This assumes we usually only have one active at a time,
+        // but it's much safer than shared state variables. 
+        // In reality, SubscriptionManager.reset() clears this map on user switch.
+        for (const entry of this.entries.values()) {
+            if (entry.completed) {
+                return entry.resolvedUserId;
+            }
+        }
+        return null;
     }
 
     reset(): void {
-        this.initPromise = null;
-        this.cacheKey = null;
-        this.promiseCacheKey = null;
-        this.resolvedUserId = null;
-        this.promiseCompleted = true;
-        this.pendingQueue.clear();
+        this.entries.clear();
     }
 }

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

@@ -1,8 +1,8 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig } from "../../../revenuecat/core/types/RevenueCatConfig";
 import type { PurchaseSource } from "../../core/SubscriptionConstants";
-import type { PackageType } from "../../../revenuecat/core/types";
-import { getPremiumEntitlement } from "../../../revenuecat/core/types";
+import type { PackageType } from "../../../revenuecat/core/types/RevenueCatTypes";
+import { getPremiumEntitlement } from "../../../revenuecat/core/types/RevenueCatTypes";
 
 export async function syncPremiumStatus(
     config: RevenueCatConfig,

package/src/domains/subscription/presentation/components/details/PremiumDetailsCardTypes.ts

@@ -1,5 +1,5 @@
 import type { SubscriptionStatusType } from "./PremiumStatusBadge.types";
-import type { CreditInfo } from "../../../core/types";
+import type { CreditInfo } from "../../../core/types/CreditInfo";
 
 export type { CreditInfo };
 

package/src/domains/subscription/presentation/components/sections/SubscriptionSection.types.ts

@@ -1,6 +1,6 @@
 import type { StyleProp, ViewStyle } from "react-native";
 import type { SubscriptionStatusType } from "../../../core/SubscriptionConstants";
-import type { CreditInfo } from "../../../core/types";
+import type { CreditInfo } from "../../../core/types/CreditInfo";
 import type { PremiumDetailsTranslations } from "../details/PremiumDetailsCardTypes";
 
 export interface SubscriptionSectionConfig {

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.tsx

@@ -5,7 +5,7 @@ import { AtomicIcon, AtomicText } from "@umituz/react-native-design-system/atoms
 import { NavigationHeader } from "@umituz/react-native-design-system/molecules";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
-import { ScreenLayout } from "../../../../shared/presentation";
+import { ScreenLayout } from "../../../../shared/presentation/layouts/ScreenLayout";
 import { getCreditsRepository } from "../../../credits/infrastructure/CreditsRepositoryManager";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../../shared/infrastructure/SubscriptionEventBus";
 import { SubscriptionHeader } from "./components/SubscriptionHeader";

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.types.ts

@@ -1,5 +1,5 @@
 import type { SubscriptionStatusType } from "../../core/SubscriptionConstants";
-import type { CreditInfo } from "../../core/types";
+import type { CreditInfo } from "../../core/types/CreditInfo";
 
 export type { CreditInfo };
 

package/src/domains/subscription/presentation/useSubscriptionStatus.types.ts

@@ -1,4 +1,4 @@
-import type { PremiumStatus } from "../core/types";
+import type { PremiumStatus } from "../core/types/PremiumStatus";
 
 export interface SubscriptionStatusResult extends PremiumStatus {
   isLoading: boolean;

package/src/domains/subscription/utils/featureGateUtils.ts

@@ -0,0 +1,37 @@
+export const DEFAULT_REQUIRED_CREDITS = 1;
+
+/**
+ * Checks if an action that requires auth-based credits can be executed.
+ */
+export function canExecuteAuthAction(
+  isWaitingForAuthCredits: boolean,
+  isCreditsLoaded: boolean,
+  hasPendingAction: boolean,
+  hasSubscription: boolean,
+  creditBalance: number,
+  requiredCredits: number
+): boolean {
+  if (!isWaitingForAuthCredits || !isCreditsLoaded || !hasPendingAction) {
+    return false;
+  }
+  return hasSubscription || creditBalance >= requiredCredits;
+}
+
+/**
+ * Checks if a purchase action can be executed, typically after a purchase flow.
+ */
+export function canExecutePurchaseAction(
+  isWaitingForPurchase: boolean,
+  creditBalance: number,
+  prevBalance: number,
+  hasSubscription: boolean,
+  prevHasSubscription: boolean,
+  hasPendingAction: boolean
+): boolean {
+  if (!isWaitingForPurchase || !hasPendingAction) {
+    return false;
+  }
+  const creditsIncreased = creditBalance > prevBalance;
+  const subscriptionAcquired = hasSubscription && !prevHasSubscription;
+  return creditsIncreased || subscriptionAcquired;
+}

package/src/domains/subscription/utils/packageTypeFormatter.ts

@@ -1,4 +1,4 @@
-import type { PackageType } from "../../revenuecat/core/types";
+import type { PackageType } from "../../revenuecat/core/types/RevenueCatTypes";
 
 export function formatPackageTypeForDisplay(packageType: PackageType | string | null | undefined): string {
   if (!packageType) {

package/src/domains/wallet/infrastructure/repositories/transaction/CollectionBuilder.ts

@@ -1,4 +1,4 @@
-import { buildCollectionRef, type CollectionConfig } from "../../../../../shared/infrastructure/firestore";
+import { buildCollectionRef, type CollectionConfig } from "../../../../../shared/infrastructure/firestore/collectionUtils";
 import type { Firestore } from "@umituz/react-native-firebase";
 import type { TransactionRepositoryConfig } from "../../../domain/types/transaction.types";
 

package/src/domains/wallet/infrastructure/repositories/transaction/TransactionFetcher.ts

@@ -13,7 +13,8 @@ import type {
   TransactionResult,
 } from "../../../domain/types/transaction.types";
 import { TransactionMapper } from "../../../domain/mappers/TransactionMapper";
-import { requireFirestore, mapErrorToResult } from "../../../../../shared/infrastructure/firestore";
+import { requireFirestore } from "../../../../../shared/infrastructure/firestore/collectionUtils";
+import { mapErrorToResult } from "../../../../../shared/infrastructure/firestore/resultUtils";
 import { getCollectionRef } from "./CollectionBuilder";
 
 export async function fetchTransactions(

package/src/domains/wallet/infrastructure/repositories/transaction/TransactionWriter.ts

@@ -7,7 +7,8 @@ import type {
   TransactionReason,
 } from "../../../domain/types/transaction.types";
 import { TransactionMapper } from "../../../domain/mappers/TransactionMapper";
-import { requireFirestore, mapErrorToResult } from "../../../../../shared/infrastructure/firestore";
+import { requireFirestore } from "../../../../../shared/infrastructure/firestore/collectionUtils";
+import { mapErrorToResult } from "../../../../../shared/infrastructure/firestore/resultUtils";
 import { getCollectionRef } from "./CollectionBuilder";
 
 export async function addTransaction(

package/src/domains/wallet/presentation/screens/WalletScreen.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { View, StyleSheet, TouchableOpacity } from "react-native";
 import { AtomicText, AtomicIcon, AtomicSpinner } from "@umituz/react-native-design-system/atoms";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
-import { ScreenLayout } from "../../../../shared/presentation";
+import { ScreenLayout } from "../../../../shared/presentation/layouts/ScreenLayout";
 import { useNavigation } from "@react-navigation/native";
 import { useWallet } from "../hooks/useWallet";
 import { getWalletConfig } from "../../infrastructure/config/walletConfig";

package/src/index.ts

@@ -1,6 +1,8 @@
 // Domain Layer - Constants & Types
 export * from "./domains/subscription/core/SubscriptionConstants";
-export type { SubscriptionMetadata, PremiumStatus, CreditInfo } from "./domains/subscription/core/types";
+export type { SubscriptionMetadata } from "./domains/subscription/core/types/SubscriptionMetadata";
+export type { PremiumStatus } from "./domains/subscription/core/types/PremiumStatus";
+export type { CreditInfo } from "./domains/subscription/core/types/CreditInfo";
 export {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
@@ -25,7 +27,8 @@ export {
 export type { Result, Success, Failure } from "./shared/utils/Result";
 
 // Infrastructure Layer (Services & Repositories)
-export { initializeSubscription, type SubscriptionInitConfig, type CreditPackageConfig } from "./domains/subscription/application/initializer";
+export { initializeSubscription } from "./domains/subscription/application/initializer/SubscriptionInitializer";
+export type { SubscriptionInitConfig, CreditPackageConfig } from "./domains/subscription/application/SubscriptionInitializerTypes";
 
 export { CreditsRepository } from "./domains/credits/infrastructure/CreditsRepository";
 export { 

package/src/init/createSubscriptionInitModule.ts

@@ -1,5 +1,6 @@
 import type { InitModule } from '@umituz/react-native-design-system/init';
-import { initializeSubscription, type SubscriptionInitConfig } from '../domains/subscription/application/initializer';
+import { initializeSubscription } from "../domains/subscription/application/initializer/SubscriptionInitializer";
+import type { SubscriptionInitConfig } from "../domains/subscription/application/SubscriptionInitializerTypes";
 
 export interface SubscriptionInitModuleConfig extends Omit<SubscriptionInitConfig, 'apiKey'> {
   getApiKey: () => string | undefined;

package/src/domains/revenuecat/core/errors/index.ts

@@ -1,3 +0,0 @@
-export * from "./RevenueCatError";
-export * from "./RevenueCatErrorMessages";
-export * from "./RevenueCatErrorHandler";

package/src/domains/revenuecat/core/types/index.ts

@@ -1,3 +0,0 @@
-export * from "./RevenueCatTypes";
-export * from "./RevenueCatConfig";
-export * from "./RevenueCatData";

package/src/domains/subscription/application/initializer/index.ts

@@ -1,2 +0,0 @@
-export { initializeSubscription } from "./SubscriptionInitializer";
-export type { CreditPackageConfig, SubscriptionInitConfig } from "../SubscriptionInitializerTypes";

package/src/domains/subscription/core/types/index.ts

@@ -1,3 +0,0 @@
-export type { SubscriptionMetadata } from "./SubscriptionMetadata";
-export type { PremiumStatus } from "./PremiumStatus";
-export type { CreditInfo } from "./CreditInfo";

package/src/domains/subscription/infrastructure/handlers/package-operations/index.ts

@@ -1,4 +0,0 @@
-export type { RestoreResultInfo } from "./types";
-export { fetchPackages } from "./PackageFetcher";
-export { executePurchase } from "./PackagePurchaser";
-export { restorePurchases } from "./PackageRestorer";

package/src/domains/subscription/infrastructure/utils/renewal/index.ts

@@ -1,3 +0,0 @@
-export type { RenewalState } from "./types";
-export { detectRenewal } from "./RenewalDetector";
-export { updateRenewalState } from "./RenewalStateUpdater";

package/src/shared/infrastructure/firestore/index.ts

@@ -1,2 +0,0 @@
-export * from "./collectionUtils";
-export * from "./resultUtils";

package/src/shared/presentation/index.ts

@@ -1 +0,0 @@
-export * from "./layouts/ScreenLayout";