@umituz/react-native-subscription 2.27.67 → 2.27.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.67",
+  "version": "2.27.69",
   "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/application/CreditLimitCalculator.ts

@@ -1,6 +1,6 @@
-import type { CreditsConfig } from "../../domain/entities/Credits";
-import { detectPackageType } from "../../utils/packageTypeDetector";
-import { getCreditAllocation } from "../../utils/creditMapper";
+import type { CreditsConfig } from "../core/Credits";
+import { detectPackageType } from "../../../utils/packageTypeDetector";
+import { getCreditAllocation } from "../../../utils/creditMapper";
 
 export class CreditLimitCalculator {
   static calculate(productId: string | undefined, config: CreditsConfig): number {

package/src/domains/credits/application/CreditsInitializer.ts

@@ -33,7 +33,7 @@ export async function initializeCreditsTransaction(
         }
 
         const creditLimit = CreditLimitCalculator.calculate(metadata?.productId, config);
-        const { purchaseType, purchaseHistory } = PurchaseMetadataGenerator.generate({
+        const { purchaseHistory } = PurchaseMetadataGenerator.generate({
           productId: metadata?.productId,
           source: metadata?.source,
           type: metadata?.type,
@@ -51,19 +51,22 @@ export async function initializeCreditsTransaction(
         // Resolve credits using Strategy Pattern
         const isStatusSync = purchaseId?.startsWith("status_sync_") ?? false;
         const isSubscriptionActive = isPremium && !isExpired;
+        const productId = metadata?.productId;
 
         const newCredits = creditAllocationContext.allocate({
             status,
             isStatusSync,
             existingData,
             creditLimit,
-            isSubscriptionActive
+            isSubscriptionActive,
+            productId,
         });
 
         const creditsData: Record<string, any> = {
             isPremium, status, credits: newCredits, creditLimit, 
             lastUpdatedAt: now, 
-            processedPurchases: (purchaseId ? [...(existingData?.processedPurchases || []), purchaseId].slice(-10) : existingData?.processedPurchases) || [],
+            // Increase history window to 50 for better idempotency
+            processedPurchases: (purchaseId ? [...(existingData?.processedPurchases || []), purchaseId].slice(-50) : existingData?.processedPurchases) || [],
             purchaseHistory: purchaseHistory.length ? purchaseHistory : undefined
         };
 

package/src/domains/credits/application/DeductCreditsCommand.ts

@@ -1,7 +1,7 @@
 import { runTransaction, serverTimestamp, type Firestore, type Transaction, type DocumentReference } from "firebase/firestore";
 import { getFirestore } from "@umituz/react-native-firebase";
-import type { DeductCreditsResult } from "../../../domain/entities/Credits";
-import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../SubscriptionEventBus";
+import type { DeductCreditsResult } from "../core/Credits";
+import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 
 export interface IDeductCreditsCommand {
   execute(userId: string, cost: number): Promise<DeductCreditsResult>;

package/src/domains/credits/application/credit-strategies/ICreditStrategy.ts

@@ -1,5 +1,5 @@
-import type { SubscriptionStatusType } from "../../domain/entities/SubscriptionStatus";
-import type { UserCreditsDocumentRead } from "../models/UserCreditsDocument";
+import type { SubscriptionStatusType } from "../../../subscription/core/SubscriptionStatus";
+import type { UserCreditsDocumentRead } from "../../core/UserCreditsDocument";
 
 export interface CreditStrategyParams {
     status: SubscriptionStatusType;
@@ -7,6 +7,7 @@ export interface CreditStrategyParams {
     existingData: UserCreditsDocumentRead | null;
     creditLimit: number;
     isSubscriptionActive: boolean;
+    productId?: string;
 }
 
 export interface ICreditStrategy {

package/src/domains/credits/application/credit-strategies/StandardPurchaseCreditStrategy.ts

@@ -1,8 +1,9 @@
 import { ICreditStrategy, type CreditAllocationParams } from "./ICreditStrategy";
+import { isCreditPackage } from "../../../../utils/packageTypeDetector";
 
 /**
  * Default strategy for new purchases, renewals, or upgrades.
- * Resets credits to the calculated credit limit.
+ * Resets credits for subscriptions, but ADDS credits for consumable packages.
  */
 export class StandardPurchaseCreditStrategy implements ICreditStrategy {
     canHandle(_params: CreditAllocationParams): boolean {
@@ -11,6 +12,13 @@ export class StandardPurchaseCreditStrategy implements ICreditStrategy {
     }
 
     execute(params: CreditAllocationParams): number {
+        // If it's a credit package (consumable), we add to existing balance
+        if (params.productId && isCreditPackage(params.productId)) {
+            const existing = params.existingData?.credits ?? 0;
+            return existing + params.creditLimit;
+        }
+
+        // Standard subscription behavior: Reset to the calculated limit (e.g. 100/mo)
         return params.creditLimit;
     }
 }

package/src/domains/credits/application/credit-strategies/TrialCreditStrategy.ts

@@ -1,6 +1,6 @@
 import { ICreditStrategy, type CreditAllocationParams } from "./ICreditStrategy";
-import { SUBSCRIPTION_STATUS } from "../../../domain/entities/SubscriptionStatus";
-import { TRIAL_CONFIG } from "../TrialService";
+import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionConstants";
+import { TRIAL_CONFIG } from "../../../trial/core/TrialTypes";
 
 /**
  * Strategy for Trial and Trial Canceled users.

package/src/domains/subscription/application/SubscriptionSyncService.ts

@@ -15,7 +15,11 @@ export class SubscriptionSyncService {
   async handlePurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource) {
     try {
       const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
-      await getCreditsRepository().initializeCredits(userId, `purchase_${productId}_${Date.now()}`, productId, source, revenueCatData);
+      const purchaseId = revenueCatData.originalTransactionId 
+        ? `purchase_${revenueCatData.originalTransactionId}`
+        : `purchase_${productId}_${Date.now()}`;
+
+      await getCreditsRepository().initializeCredits(userId, purchaseId, productId, source, revenueCatData);
       
       // Notify listeners via Event Bus
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
@@ -29,7 +33,11 @@ export class SubscriptionSyncService {
     try {
       const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
       revenueCatData.expirationDate = newExpirationDate || revenueCatData.expirationDate;
-      await getCreditsRepository().initializeCredits(userId, `renewal_${productId}_${Date.now()}`, productId, "renewal", revenueCatData);
+      const purchaseId = revenueCatData.originalTransactionId 
+        ? `renewal_${revenueCatData.originalTransactionId}_${newExpirationDate}`
+        : `renewal_${productId}_${Date.now()}`;
+
+      await getCreditsRepository().initializeCredits(userId, purchaseId, productId, "renewal", revenueCatData);
       
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.RENEWAL_DETECTED, { userId, productId });

package/src/domains/subscription/application/SubscriptionSyncUtils.ts

@@ -1,6 +1,6 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatData } from "../../domain/types/RevenueCatData";
-import { type PeriodType } from "../../domain/entities/SubscriptionConstants";
+import type { RevenueCatData } from "../core/RevenueCatData";
+import { type PeriodType } from "../core/SubscriptionStatus";
 
 /** Extract RevenueCat data from CustomerInfo (Single Source of Truth) */
 export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId: string): RevenueCatData => {
@@ -10,7 +10,9 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
   return {
     expirationDate: entitlement?.expirationDate ?? customerInfo.latestExpirationDate ?? null,
     willRenew: entitlement?.willRenew ?? false,
-    originalTransactionId: entitlement?.originalPurchaseDate ?? undefined,
+    // Use latestPurchaseDate if originalPurchaseDate is missing, or a combine id
+    originalTransactionId: entitlement?.originalPurchaseDate || customerInfo.firstSeen, 
     periodType: entitlement?.periodType as PeriodType | undefined,
+    isPremium: !!customerInfo.entitlements.active[entitlementId],
   };
 };

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

@@ -4,7 +4,7 @@
  */
 
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
-import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
+import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
 import { PurchaseStatusResolver, type PremiumStatus } from "./PurchaseStatusResolver";
 

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

@@ -6,7 +6,7 @@
 import { useState, useCallback } from "react";
 import type { PurchasesOffering, PurchasesPackage } from "react-native-purchases";
 import { getRevenueCatService } from '../../infrastructure/services/RevenueCatService';
-import type { PurchaseResult, RestoreResult } from '../../application/ports/IRevenueCatService';
+import type { PurchaseResult, RestoreResult } from '../../../../shared/application/ports/IRevenueCatService';
 
 export interface UseRevenueCatResult {
   /** Current offering */

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

@@ -1,5 +1,5 @@
 import Purchases, { type PurchasesPackage } from "react-native-purchases";
-import type { PurchaseResult } from "../../application/ports/IRevenueCatService";
+import type { PurchaseResult } from "../../../../shared/application/ports/IRevenueCatService";
 import { RevenueCatPurchaseError, RevenueCatInitializationError } from "../../domain/errors/RevenueCatError";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import { isUserCancelledError, getErrorMessage } from "../../domain/types/RevenueCatTypes";

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

@@ -1,5 +1,5 @@
 import Purchases from "react-native-purchases";
-import type { RestoreResult } from "../../application/ports/IRevenueCatService";
+import type { RestoreResult } from "../../../../shared/application/ports/IRevenueCatService";
 import { RevenueCatRestoreError, RevenueCatInitializationError } from "../../domain/errors/RevenueCatError";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import { getErrorMessage } from "../../domain/types/RevenueCatTypes";

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

@@ -1,5 +1,5 @@
 import Purchases, { LOG_LEVEL, type CustomerInfo, type PurchasesOfferings } from "react-native-purchases";
-import type { InitializeResult } from "../../application/ports/IRevenueCatService";
+import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import { resolveApiKey } from "../utils/ApiKeyResolver";
 

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

@@ -14,8 +14,8 @@ import type {
     InitializeResult,
     PurchaseResult,
     RestoreResult,
-} from "../../application/ports/IRevenueCatService";
-import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
+} from "../../../../shared/application/ports/IRevenueCatService";
+import type { RevenueCatConfig } from "../../core/RevenueCatConfig";
 import { resolveApiKey } from "../utils/ApiKeyResolver";
 import { initializeSDK } from "./RevenueCatInitializer";
 import { fetchOfferings } from "./OfferingsFetcher";

package/src/domains/trial/application/TrialService.ts

@@ -7,6 +7,7 @@ import { PersistentDeviceIdService } from "@umituz/react-native-design-system";
 import { DeviceTrialRepository } from "../infrastructure/DeviceTrialRepository";
 import { TrialEligibilityService } from "./TrialEligibilityService";
 import type { TrialEligibilityResult } from "../core/TrialTypes";
+export type { TrialEligibilityResult };
 
 const repository = new DeviceTrialRepository();
 

package/src/index.ts

@@ -2,22 +2,20 @@
  * React Native Subscription - Public API
  */
 
-export * from "./domains/wallet";
-export * from "./domains/paywall";
-export * from "./domains/config";
-
-// Domain Layer - Constants & Types
-export * from "./domain/entities/SubscriptionConstants";
+// Domain Layer - Constants & Types (Now in domains/subscription/core)
+export * from "./domains/subscription/core/SubscriptionConstants";
 export {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
   resolveSubscriptionStatus,
-} 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";
+} from "./domains/subscription/core/SubscriptionStatus";
+export type { SubscriptionStatus, StatusResolverInput } from "./domains/subscription/core/SubscriptionStatus";
+
+// Application Layer - Ports
+export type { ISubscriptionRepository } from "./shared/application/ports/ISubscriptionRepository";
+export type { IRevenueCatService } from "./shared/application/ports/IRevenueCatService";
 
-// Result Pattern (Functional Error Handling)
+// Result Pattern (Now in shared/utils)
 export {
   success,
   failure,
@@ -30,39 +28,29 @@ export {
   tryCatch,
   tryCatchSync,
   combine,
-} from "./domain/value-objects/Result";
-export type { Result, Success, Failure } from "./domain/value-objects/Result";
+} from "./shared/utils/Result";
+export type { Result, Success, Failure } from "./shared/utils/Result";
 
-// Infrastructure Layer
-export { SubscriptionService, initializeSubscriptionService } from "./infrastructure/services/SubscriptionService";
-export {
-  submitFeedback,
-  submitPaywallFeedback,
-  submitSettingsFeedback,
-  type FeedbackData,
-  type FeedbackSubmitResult,
-} from "./infrastructure/services/FeedbackService";
-export { initializeSubscription, type SubscriptionInitConfig, type CreditPackageConfig } from "./infrastructure/services/SubscriptionInitializer";
-export {
+// Infrastructure Layer (Services & Repositories)
+export { initializeSubscription, type SubscriptionInitConfig, type CreditPackageConfig } from "./domains/subscription/application/SubscriptionInitializer";
+export { 
   getDeviceId,
   checkTrialEligibility,
   recordTrialStart,
   recordTrialEnd,
   recordTrialConversion,
-  TRIAL_CONFIG,
-  type DeviceTrialRecord,
-  type TrialEligibilityResult,
-} from "./infrastructure/services/TrialService";
-export { CreditsRepository, createCreditsRepository } from "./infrastructure/repositories/CreditsRepository";
-export { configureCreditsRepository, getCreditsRepository, getCreditsConfig, resetCreditsRepository, isCreditsRepositoryConfigured } from "./infrastructure/repositories/CreditsRepositoryProvider";
-export {
-  getSavedPurchase,
-  clearSavedPurchase,
-  configureAuthProvider,
-  type PurchaseAuthProvider,
-} from "./presentation/hooks/useAuthAwarePurchase";
+  type TrialEligibilityResult 
+} from "./domains/trial/application/TrialService";
+
+export { CreditsRepository } from "./domains/credits/infrastructure/CreditsRepository";
+export { 
+  configureCreditsRepository, 
+  getCreditsRepository, 
+  getCreditsConfig, 
+  isCreditsRepositoryConfigured 
+} from "./domains/credits/infrastructure/CreditsRepositoryProvider";
 
-// Presentation Layer - Hooks
+// Presentation Layer - Hooks (Point to the bridge)
 export * from "./presentation/hooks";
 
 // Presentation Layer - Components
@@ -70,12 +58,7 @@ export * from "./presentation/components/details/PremiumDetailsCard";
 export * from "./presentation/components/details/PremiumStatusBadge";
 export * from "./presentation/components/sections/SubscriptionSection";
 export * from "./presentation/components/feedback/PaywallFeedbackModal";
-export * from "./presentation/components/overlay";
 export * from "./presentation/screens/SubscriptionDetailScreen";
-export * from "./presentation/types/SubscriptionDetailTypes";
-
-// Presentation Layer - Stores
-export * from "./presentation/stores";
 
 export type {
   CreditType,
@@ -83,27 +66,13 @@ export type {
   CreditsConfig,
   CreditsResult,
   DeductCreditsResult,
-  CreditAllocation,
-  PackageAllocationMap,
-} from "./domain/entities/Credits";
-export { DEFAULT_CREDITS_CONFIG } from "./domain/entities/Credits";
-export { InsufficientCreditsError } from "./domain/errors/InsufficientCreditsError";
+} from "./domains/credits/core/Credits";
+
+export { DEFAULT_CREDITS_CONFIG } from "./domains/credits/core/Credits";
 
 // Utils
 export * from "./utils";
 
-// RevenueCat
-export * from "./revenuecat";
-
-// App Service Helpers (for configureAppServices)
-export {
-  createCreditService,
-  createPaywallService,
-  type CreditServiceConfig,
-  type ICreditService,
-  type IPaywallService,
-} from "./infrastructure/services/app-service-helpers";
-
 // Init Module Factory
 export {
   createSubscriptionInitModule,

package/src/init/createSubscriptionInitModule.ts

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

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

@@ -9,9 +9,7 @@ import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-syst
 import { 
   SUBSCRIPTION_STATUS, 
   type SubscriptionStatusType 
-} from "../../../domain/entities/SubscriptionConstants";
-
-export type { SubscriptionStatusType };
+} from "../../../domains/subscription/core/SubscriptionConstants";
 
 export interface PremiumStatusBadgeProps {
   status: SubscriptionStatusType;

package/src/presentation/hooks/feedback/useFeedbackSubmit.ts

@@ -8,7 +8,7 @@ import { useAuth } from "@umituz/react-native-auth";
 import {
   submitPaywallFeedback,
   submitSettingsFeedback,
-} from "../../../infrastructure/services/FeedbackService";
+} from "../../../shared/application/FeedbackService";
 
 export interface UsePaywallFeedbackSubmitOptions {
   onSuccess?: () => void;

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

@@ -0,0 +1,32 @@
+import type {
+    PurchasesOffering,
+    PurchasesPackage,
+    CustomerInfo,
+} from "react-native-purchases";
+
+export interface InitializeResult {
+    success: boolean;
+    offering: PurchasesOffering | null;
+    isPremium: boolean;
+}
+
+export interface PurchaseResult {
+    success: boolean;
+    productId: string | null;
+}
+
+export interface RestoreResult {
+    success: boolean;
+    productId: string | null;
+}
+
+export interface IRevenueCatService {
+    initialize(userId: string, apiKey?: string): Promise<InitializeResult>;
+    fetchOfferings(): Promise<PurchasesOffering | null>;
+    purchasePackage(pkg: PurchasesPackage, userId: string): Promise<PurchaseResult>;
+    restorePurchases(userId: string): Promise<RestoreResult>;
+    isInitialized(): boolean;
+    getCurrentUserId(): string | null;
+    getCustomerInfo(): Promise<CustomerInfo | null>;
+    reset(): Promise<void>;
+}

package/src/utils/packageTypeDetector.ts

@@ -3,7 +3,7 @@
  * Detects subscription package type from RevenueCat package identifier
  */
 
-import { PACKAGE_TYPE, type PackageType } from "../domain/entities/SubscriptionConstants";
+import { PACKAGE_TYPE, type PackageType } from "../domains/subscription/core/SubscriptionConstants";
 
 export type SubscriptionPackageType = PackageType;
 
@@ -15,7 +15,7 @@ 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
  */
-function isCreditPackage(identifier: string): boolean {
+export function isCreditPackage(identifier: string): boolean {
   // Matches "credit" as a word or part of a common naming pattern
   return /\bcredit\b|_credit_|-credit-/i.test(identifier) || identifier.toLowerCase().includes("credit");
 }

package/src/domain/README.md

@@ -1,54 +0,0 @@
-# Domain Layer
-
-Abonelik sisteminin temel domain logic'ini, entity'lerini ve value object'lerini içeren katman.
-
-## Location
-
-`src/domain/`
-
-## Strategy
-
-Temel iş kavramlarını, iş kurallarını ve domain logic'ini encapsulate eden katman. Framework-agnostic ve tamamen iş mantığına odaklı.
-
-## Restrictions
-
-### REQUIRED
-
-- MUST be framework-agnostic (no React, React Native dependencies)
-- MUST encapsulate business rules within entities
-- MUST validate all invariants on entity creation
-- MUST use immutable objects
-- MUST implement type guards for type safety
-- MUST define domain-specific error types
-
-### PROHIBITED
-
-- MUST NOT contain any framework or UI code
-- MUST NOT have direct dependencies on infrastructure
-- MUST NOT expose mutable state
-- MUST NOT use generic error types
-
-### CRITICAL
-
-- Keep entities pure and framework-independent
-- Validate all business rules on entity creation
-- Make all objects immutable
-- Encapsulate business logic within entities
-- Use strong typing throughout
-
-## AI Agent Guidelines
-
-When working with domain layer:
-1. Immutable Objects - entity'leri immutable olarak tasarlayın
-2. Validation - entity creation'da validation yapın
-3. Encapsulation - business logic'i entity içinde tutun
-4. Type Safety - strong typing kullanın
-5. Domain Events - önemli domain olaylarını event olarak yayınlayın
-6. Error Handling - domain-specific hatalar tanımlayın
-
-## Related Documentation
-
-- [Domain Entities](./entities/README.md)
-- [Value Objects](./value-objects/README.md)
-- [Domain Errors](./errors/README.md)
-- [Application Layer](../application/README.md)