@nehorai/credits 2.1.0 → 3.0.0

package/dist/service/index.d.cts

@@ -1,5 +1,5 @@
-import { c as PortableUserCredits, g as CreditCheckResult, C as CreditOperationType, a as PortableReservation, d as PortableUsageLog, D as DeductCreditsResult, S as SubscriptionTier, j as UsageHistoryResponse, f as PortableJournalEntry } from '../types-Dzc443vy.cjs';
-import { I as ICreditRepository, n as ReserveOutcome, l as ReservationTransitionOptions, C as CommitOutcome, R as ReleaseOutcome, A as AddCreditsAtomicOptions, a as AddCreditsOutcome, J as JournalEntryQuery } from '../types-wtksMa4n.cjs';
+import { c as PortableUserCredits, g as CreditCheckResult, C as CreditOperationType, a as PortableReservation, d as PortableUsageLog, D as DeductCreditsResult, S as SubscriptionTier, j as UsageHistoryResponse, f as PortableJournalEntry } from '../types-C3sxDvNb.cjs';
+import { I as ICreditRepository, o as ReserveOutcome, m as ReservationTransitionOptions, C as CommitOutcome, R as ReleaseOutcome, A as AddCreditsAtomicOptions, a as AddCreditsOutcome, J as JournalEntryQuery } from '../types-DOjguhEX.cjs';
 
 /**
  * Notification callback type for low balance notifications

package/dist/service/index.d.ts

@@ -1,5 +1,5 @@
-import { c as PortableUserCredits, g as CreditCheckResult, C as CreditOperationType, a as PortableReservation, d as PortableUsageLog, D as DeductCreditsResult, S as SubscriptionTier, j as UsageHistoryResponse, f as PortableJournalEntry } from '../types-Dzc443vy.js';
-import { I as ICreditRepository, n as ReserveOutcome, l as ReservationTransitionOptions, C as CommitOutcome, R as ReleaseOutcome, A as AddCreditsAtomicOptions, a as AddCreditsOutcome, J as JournalEntryQuery } from '../types-BhCdep_t.js';
+import { c as PortableUserCredits, g as CreditCheckResult, C as CreditOperationType, a as PortableReservation, d as PortableUsageLog, D as DeductCreditsResult, S as SubscriptionTier, j as UsageHistoryResponse, f as PortableJournalEntry } from '../types-C3sxDvNb.js';
+import { I as ICreditRepository, o as ReserveOutcome, m as ReservationTransitionOptions, C as CommitOutcome, R as ReleaseOutcome, A as AddCreditsAtomicOptions, a as AddCreditsOutcome, J as JournalEntryQuery } from '../types-CY-oHIMA.js';
 
 /**
  * Notification callback type for low balance notifications

package/dist/service/index.js

@@ -130,6 +130,7 @@ function floatSum(values) {
   for (const value of values) total += value;
   return total;
 }
+var FLOAT_NOISE_RELATIVE = 64 * Number.EPSILON;
 function isValidCreditAmount(value) {
   if (typeof value !== "number") return false;
   const cents = toCents(value);
@@ -227,9 +228,9 @@ var creditSystemConfigSchema = z.object({
    */
   reservationExpiryMs: z.number().positive().default(5 * 60 * 1e3),
   /**
-   * Default credits for new users (free tier)
+   * Default credits for new users (free tier). 0 means no signup grant.
    */
-  defaultFreeCredits: z.number().positive().default(25),
+  defaultFreeCredits: z.number().min(0).default(25),
   /**
    * Grace period in days after subscription expires before downgrade
    */
@@ -498,6 +499,8 @@ function toClientUserCredits(credits) {
     monthlyUsed: credits.monthlyUsed,
     monthlyResetAt: toISOString(credits.monthlyResetAt),
     subscriptionExpiresAt: credits.subscriptionExpiresAt ? toISOString(credits.subscriptionExpiresAt) : null,
+    ...credits.expiredHoldBacking !== void 0 ? { expiredHoldBacking: credits.expiredHoldBacking } : {},
+    ...credits.signupGrant !== void 0 ? { signupGrant: credits.signupGrant } : {},
     createdAt: toISOString(credits.createdAt),
     updatedAt: toISOString(credits.updatedAt)
   };
@@ -695,6 +698,7 @@ var CreditsService = class {
           entryType: "debit",
           amount: 0,
           // No credits deducted, just tier change
+          balanceBefore: sumAmounts(data.balance, data.bonusCredits),
           // The ledger balance, matching every other journal writer: the V2
           // transitions and add/deduct all record `balance + bonusCredits`, so
           // recording `balance` alone made the audit trail disagree with itself
@@ -738,6 +742,7 @@ var CreditsService = class {
             userId,
             entryType: balanceChange > 0 ? "credit" : "debit",
             amount: Math.abs(balanceChange),
+            balanceBefore: sumAmounts(data.balance, data.bonusCredits),
             balanceAfter: sumAmounts(
               resetResult.credits.balance,
               resetResult.credits.bonusCredits
@@ -745,9 +750,11 @@ var CreditsService = class {
             source: "monthly_reset",
             referenceId: `reset-${Date.now()}`,
             referenceType: "reset",
-            description: `Monthly credit reset for ${data.tier} tier.`,
+            // The tier the reset ran on, which a concurrent downgrade may have
+            // changed since `data` was read.
+            description: `Monthly credit reset for ${resetResult.credits.tier} tier.`,
             metadata: {
-              tier: data.tier,
+              tier: resetResult.credits.tier,
               previousBalance: data.balance,
               newBalance: resetResult.credits.balance
             }
@@ -970,9 +977,18 @@ var CreditsService = class {
    */
   async deductCredits(userId, amount, options) {
     assertValidCreditAmount(amount, { userId, operation: "deductCredits" });
+    const operationType = options?.operationType;
+    const journal = {
+      referenceId: options?.requestId ?? `deduct-${Date.now()}`,
+      description: operationType ? `Deducted ${amount} credits for ${getOperationLabel(operationType)}` : `Deducted ${amount} credits`,
+      metadata: {
+        ...options?.metadata,
+        ...operationType && { operationType }
+      }
+    };
     let deduction;
     try {
-      deduction = await this.repository.deductCreditsAtomic(userId, amount);
+      deduction = await this.repository.deductCreditsAtomic(userId, amount, journal);
     } catch (error) {
       if (isCreditError(error) && error.code === CreditErrorCode.INVALID_AMOUNT) throw error;
       const credits = await this.repository.getUserCredits(userId);
@@ -988,21 +1004,18 @@ var CreditsService = class {
         shortfall: sumAmounts(amount, -available)
       };
     }
-    const operationType = options?.operationType;
-    await this.repository.createJournalEntry({
-      userId,
-      entryType: "debit",
-      amount,
-      balanceAfter: deduction.newBalance,
-      source: "operation_commit",
-      referenceId: options?.requestId ?? `deduct-${Date.now()}`,
-      referenceType: "adjustment",
-      description: operationType ? `Deducted ${amount} credits for ${getOperationLabel(operationType)}` : `Deducted ${amount} credits`,
-      metadata: {
-        ...options?.metadata,
-        ...operationType && { operationType }
-      }
-    });
+    if (deduction.journalEntryId === void 0) {
+      await this.repository.createJournalEntry({
+        userId,
+        entryType: "debit",
+        amount,
+        balanceBefore: deduction.previousBalance,
+        balanceAfter: deduction.newBalance,
+        source: "operation_commit",
+        referenceType: "adjustment",
+        ...journal
+      });
+    }
     if (operationType) {
       await this.logUsage({
         userId,