@umituz/react-native-subscription 2.27.150 → 2.27.154

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.150",
+  "version": "2.27.154",
   "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/creditOperationUtils.ts

@@ -1,8 +1,9 @@
-import { Timestamp, serverTimestamp } from "firebase/firestore";
+import { serverTimestamp } from "firebase/firestore";
 import { resolveSubscriptionStatus } from "../../subscription/core/SubscriptionStatus";
 import { creditAllocationOrchestrator } from "./credit-strategies/CreditAllocationOrchestrator";
 import { isPast } from "../../../utils/dateUtils";
 import { isCreditPackage } from "../../../utils/packageTypeDetector";
+import { toTimestamp } from "../../../shared/utils/dateConverter";
 import { 
   CalculateCreditsParams, 
   BuildCreditsDataParams 
@@ -61,7 +62,9 @@ export function buildCreditsData({
     platform,
     ...(purchaseHistory.length > 0 && { purchaseHistory }),
     ...(isPurchaseOrRenewal && { lastPurchaseAt: serverTimestamp() }),
-    ...(metadata.expirationDate && { expirationDate: Timestamp.fromDate(new Date(metadata.expirationDate)) }),
+    ...(metadata.expirationDate && {
+      expirationDate: toTimestamp(metadata.expirationDate)
+    }),
     ...(metadata.willRenew !== undefined && { willRenew: metadata.willRenew }),
     ...(metadata.originalTransactionId && { originalTransactionId: metadata.originalTransactionId }),
   };

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

@@ -7,7 +7,7 @@ import { useCallback } from "react";
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
 import type { UserCredits } from "../core/Credits";
 import { getCreditsRepository } from "../infrastructure/CreditsRepositoryManager";
-import { creditsQueryKeys } from "./useCredits";
+import { creditsQueryKeys } from "./creditsQueryKeys";
 import { calculateRemaining } from "../../../shared/utils/numberUtils";
 
 import { timezoneService } from "@umituz/react-native-design-system";

package/src/domains/credits/utils/creditValidation.ts

@@ -1,4 +1,4 @@
-import { isDefined, isValidNumber, isNonNegative } from "../../../shared/utils/typeGuards";
+import { isValidNumber, isNonNegative } from "../../../shared/utils/typeGuards";
 
 export const isValidBalance = (balance: number | null | undefined): balance is number => {
   return isValidNumber(balance) && isNonNegative(balance);

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

@@ -1,5 +1,6 @@
 import type { CustomerInfo } from "react-native-purchases";
 import { getPremiumEntitlement } from "../../core/RevenueCatTypes";
+import { toDate } from "../../../../shared/utils/dateConverter";
 
 export interface PremiumStatus {
   isPremium: boolean;
@@ -13,9 +14,7 @@ export class PurchaseStatusResolver {
     if (entitlement) {
       return {
         isPremium: true,
-        expirationDate: entitlement.expirationDate
-          ? new Date(entitlement.expirationDate)
-          : null,
+        expirationDate: toDate(entitlement.expirationDate),
       };
     }
 

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

@@ -15,7 +15,7 @@ import {
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
-import { creditsQueryKeys } from "../../../credits/presentation/useCredits";
+import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
 
 /** Purchase mutation result - simplified for presentation layer */
 export interface PurchaseMutationResult {

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

@@ -13,7 +13,7 @@ import {
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
-import { creditsQueryKeys } from "../../../credits/presentation/useCredits";
+import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
 
 interface RestoreResult {
   success: boolean;

package/src/index.ts

@@ -88,6 +88,7 @@ export * from "./utils/types";
 export * from "./utils/validation";
 export * from "./utils/dateUtils";
 export * from "./utils/appUtils";
+export * from "./shared/utils/dateConverter";
 
 // Init Module Factory
 export {

package/src/shared/utils/dateConverter.ts

@@ -0,0 +1,121 @@
+/**
+ * Date Converter Utilities
+ * Centralized date conversion and validation logic
+ * Handles Date objects, ISO strings, timestamps, and null values safely
+ */
+
+/**
+ * Safely converts any date-like value to a Date object or null
+ * Handles: Date objects, ISO strings, timestamps, null, undefined, invalid values
+ */
+export function toDate(value: Date | string | number | null | undefined): Date | null {
+  if (value === null || value === undefined) {
+    return null;
+  }
+
+  if (value instanceof Date) {
+    return isValidDate(value) ? value : null;
+  }
+
+  if (typeof value === 'string' || typeof value === 'number') {
+    const parsed = new Date(value);
+    return isValidDate(parsed) ? parsed : null;
+  }
+
+  return null;
+}
+
+/**
+ * Safely converts any date-like value to an ISO string or null
+ * Handles: Date objects, ISO strings, timestamps, null, undefined, invalid values
+ */
+export function toISOString(value: Date | string | number | null | undefined): string | null {
+  if (value === null || value === undefined) {
+    return null;
+  }
+
+  // If already a string, validate it
+  if (typeof value === 'string') {
+    const parsed = new Date(value);
+    return isValidDate(parsed) ? value : null;
+  }
+
+  // Convert to Date and then to ISO string
+  const date = toDate(value);
+  return date ? date.toISOString() : null;
+}
+
+/**
+ * Checks if a Date object is valid (not Invalid Date)
+ * @internal - Use for internal validation only
+ */
+function isValidDate(date: Date): boolean {
+  return date instanceof Date && !isNaN(date.getTime());
+}
+
+/**
+ * Safely converts a Date or string to a Firestore Timestamp
+ * Returns null if the value is invalid
+ */
+export function toTimestamp(value: Date | string | number | null | undefined): any {
+  const date = toDate(value);
+  if (!date) return null;
+
+  // Lazy import to avoid circular dependencies
+  const { Timestamp } = require('firebase/firestore');
+  return Timestamp.fromDate(date);
+}
+
+/**
+ * Gets current date as ISO string
+ */
+export function getCurrentISOString(): string {
+  return new Date().toISOString();
+}
+
+/**
+ * Gets current date as Date object
+ */
+export function getCurrentDate(): Date {
+  return new Date();
+}
+
+/**
+ * Compares two dates and returns if first is before second
+ */
+export function isBefore(date1: Date | string | null | undefined, date2: Date | string | null | undefined): boolean {
+  const d1 = toDate(date1);
+  const d2 = toDate(date2);
+
+  if (!d1 || !d2) return false;
+  return d1.getTime() < d2.getTime();
+}
+
+/**
+ * Compares two dates and returns if first is after second
+ */
+export function isAfter(date1: Date | string | null | undefined, date2: Date | string | null | undefined): boolean {
+  const d1 = toDate(date1);
+  const d2 = toDate(date2);
+
+  if (!d1 || !d2) return false;
+  return d1.getTime() > d2.getTime();
+}
+
+/**
+ * Checks if a date is in the past
+ */
+export function isInPast(date: Date | string | null | undefined): boolean {
+  const d = toDate(date);
+  if (!d) return false;
+  return d.getTime() < Date.now();
+}
+
+/**
+ * Checks if a date is in the future
+ */
+export function isInFuture(date: Date | string | null | undefined): boolean {
+  const d = toDate(date);
+  if (!d) return false;
+  return d.getTime() > Date.now();
+}