@saasicat/nest 1.0.0-rc.21 → 1.0.0-rc.22

package/dist/{chunk-G6EZWECL.js → chunk-B4YP7REK.js}

@@ -46,6 +46,10 @@ function filterActiveSubscriptionBundles(bundles, now) {
   return bundles.filter((b) => b.canceledEffectiveAt === null || b.canceledEffectiveAt > now);
 }
 __name(filterActiveSubscriptionBundles, "filterActiveSubscriptionBundles");
+function isCancellationDeclared(booking) {
+  return booking.canceledEffectiveAt !== null;
+}
+__name(isCancellationDeclared, "isCancellationDeclared");
 function aggregateSubscriptionBundleQuotas(bundles) {
   const sums = {};
   for (const bundle of bundles) {
@@ -112,6 +116,10 @@ function contractBundleVersionIds(contract) {
       ids.add(item.sourceVersionId);
     }
   }
+  const leftOut = contract.entitlementSnapshot?.leftOutBundleVersionIds;
+  if (Array.isArray(leftOut)) {
+    for (const id of leftOut) ids.delete(id);
+  }
   return ids;
 }
 __name(contractBundleVersionIds, "contractBundleVersionIds");
@@ -390,20 +398,34 @@ var EntitlementService = class {
       const cached = this.readCache(tenantId, now.getTime());
       if (cached) return cached;
     }
-    const sub = await this.subscriptions.findByTenantId(tenantId);
-    if (!sub) {
-      throw new NotFoundException({
-        code: BILLING_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,
-        message: `No subscription for tenant ${tenantId}`,
-        params: {
-          tenantId
-        }
-      });
-    }
-    if (catalog) return this.limitsFor(sub, now, catalog);
-    const limits = await this.limitsFor(sub, now, await this.catalogs.current());
-    this.writeCache(tenantId, limits, now.getTime(), cancellationLandsAt(sub));
-    return limits;
+    const sub = await this.requireSubscription(tenantId);
+    if (catalog) return (await this.answerFor(sub, now, catalog)).limits;
+    const answer = await this.answerFor(sub, now, await this.catalogs.current());
+    this.writeCache(tenantId, answer.limits, now.getTime(), firstAfter(now, [
+      cancellationLandsAt(sub),
+      answer.nextBookingEnd
+    ]));
+    return answer.limits;
+  }
+  /**
+   * What a contract frozen at `now` records as its entitlements: what
+   * `computeLimits` grants, less the add-ons whose cancellation is declared.
+   *
+   * Those are granted until their effective date by the booking rather than
+   * by the contract (`mergeSubscriptionBundlesIntoLimits`), so their end
+   * needs nobody to write the contract again. Frozen into the snapshot, they
+   * would be granted for as long as the contract runs. Never cached, like
+   * `computeLimits` with a catalogue.
+   */
+  async computeContractLimits(tenantId, now, catalog) {
+    const sub = await this.requireSubscription(tenantId);
+    const { limits, leftOutBundleVersionIds } = await this.answerFor(sub, now, catalog, void 0, {
+      leaveOutCancelled: true
+    });
+    return {
+      limits,
+      leftOutBundleVersionIds
+    };
   }
   /**
    * Clears a tenant's cache entry. MUST be called as soon as a mutation
@@ -423,7 +445,20 @@ var EntitlementService = class {
    * have a `SubscriptionRecord` (e.g. within a transaction).
    */
   async deriveLimits(sub, now, tx) {
-    return this.limitsFor(sub, now, await this.catalogs.current(), tx);
+    return (await this.answerFor(sub, now, await this.catalogs.current(), tx)).limits;
+  }
+  async requireSubscription(tenantId) {
+    const sub = await this.subscriptions.findByTenantId(tenantId);
+    if (!sub) {
+      throw new NotFoundException({
+        code: BILLING_ERROR_CODES.SUBSCRIPTION_NOT_FOUND,
+        message: `No subscription for tenant ${tenantId}`,
+        params: {
+          tenantId
+        }
+      });
+    }
+    return sub;
   }
   /**
    * `deriveLimits` against a catalogue already read. The catalogue decides
@@ -431,38 +466,61 @@ var EntitlementService = class {
    * a caller holds, so that checking a limit does not wait for a second
    * connection while the subscription row is locked.
    */
-  async limitsFor(sub, now, catalog, tx) {
+  async answerFor(sub, now, catalog, tx, options = {}) {
     if (cancellationHasLanded(sub, now)) {
       const floor = this.resolutionConfig?.canceledEntitlementPlan;
       if (floor === void 0) {
         return {
-          plan: sub.plan,
-          quotas: {},
-          features: /* @__PURE__ */ new Set()
+          limits: {
+            plan: sub.plan,
+            quotas: {},
+            features: /* @__PURE__ */ new Set()
+          },
+          nextBookingEnd: null,
+          leftOutBundleVersionIds: []
         };
       }
       const floorVersion = await this.findActivePlanVersionOrFallback(floor, now, tx);
-      return this.asGrantable(catalog, aggregateLimits({
+      const limits2 = this.asGrantable(catalog, aggregateLimits({
         plan: floor,
         planVersion: floorVersion,
         subscriptionBundles: [],
         customLimits: null
       }, catalog, now));
+      return {
+        limits: limits2,
+        nextBookingEnd: null,
+        leftOutBundleVersionIds: []
+      };
     }
+    const bundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
+    const leftOut = options.leaveOutCancelled ? bundles.filter(isCancellationDeclared) : [];
+    const counted = bundles.filter((booking) => !leftOut.includes(booking));
+    const leftOutBundleVersionIds = leftOut.map((booking) => booking.bundleVersionId);
+    const nextBookingEnd = firstAfter(now, counted.map((booking) => booking.canceledEffectiveAt));
     const contract = await this.findActiveContract(sub.tenantId, now, tx);
     if (contract) {
-      const bundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
-      return this.asGrantable(catalog, mergeSubscriptionBundlesIntoLimits(contractLimits(contract), bundles, contractBundleVersionIds(contract), catalog, now));
+      const covered = contractBundleVersionIds(contract);
+      const limits2 = this.asGrantable(catalog, mergeSubscriptionBundlesIntoLimits(contractLimits(contract), counted, covered, catalog, now));
+      return {
+        limits: limits2,
+        nextBookingEnd,
+        leftOutBundleVersionIds: leftOutBundleVersionIds.filter((id) => !covered.has(id))
+      };
     }
     const effectivePlan = resolveEntitlementPlan(sub, this.resolutionConfig ?? {}, now);
     const planVersion = effectivePlan === sub.plan ? sub.planVersion : await this.findActivePlanVersionOrFallback(effectivePlan, now, tx);
-    const subscriptionBundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
-    return this.asGrantable(catalog, aggregateLimits({
+    const limits = this.asGrantable(catalog, aggregateLimits({
       plan: effectivePlan,
       planVersion,
-      subscriptionBundles,
+      subscriptionBundles: counted,
       customLimits: sub.customLimits ?? null
     }, catalog, now));
+    return {
+      limits,
+      nextBookingEnd,
+      leftOutBundleVersionIds
+    };
   }
   /**
    * The last thing every path does, so that no path can skip it.
@@ -551,7 +609,7 @@ var EntitlementService = class {
           }
         });
       }
-      const limits = await this.limitsFor(sub, now, catalog, tx);
+      const { limits } = await this.answerFor(sub, now, catalog, tx);
       const max = limits.quotas[input.dimension];
       if (max === void 0) {
         throw new InternalServerErrorException(codedError(BILLING_ERROR_CODES.QUOTA_DIMENSION_UNKNOWN, {
@@ -644,6 +702,15 @@ EntitlementService = _ts_decorate([
     Object
   ])
 ], EntitlementService);
+function firstAfter(now, dates) {
+  let first = null;
+  for (const date of dates) {
+    if (date === null || date <= now) continue;
+    if (first === null || date < first) first = date;
+  }
+  return first;
+}
+__name(firstAfter, "firstAfter");
 
 export {
   SUBSCRIPTION_BUNDLE_REPOSITORY_TOKEN,
@@ -651,6 +718,7 @@ export {
   cancellationHasLanded,
   cancellationLandsAt,
   filterActiveSubscriptionBundles,
+  isCancellationDeclared,
   aggregateSubscriptionBundleQuotas,
   collectSubscriptionBundleFeatures,
   aggregateContractLineItemEntitlements,

package/dist/{chunk-QPVDCKYS.js → chunk-ESEWSAOV.js}

@@ -5,8 +5,9 @@ import {
   PaymentCallbackService,
   PaymentGatewayRegistry,
   SUBSCRIBER_PAYMENT_METHOD_REPOSITORY_TOKEN,
+  openGatewayForm,
   refuseForeignReturnUrls
-} from "./chunk-7NJKVC5X.js";
+} from "./chunk-WQNOCOI2.js";
 import {
   BillingPermissionGuard,
   ComposedTenantAuthGuard
@@ -175,7 +176,7 @@ var SubscriberPaymentMethodService = class _SubscriberPaymentMethodService {
       throw new ConflictException(codedError(PAYMENT_ERROR_CODES2.PAYMENTS_NOT_CONFIGURED));
     }
     const inUse = await this.methods.findActive(subscriber.id);
-    const session = await account.gateway.startPaymentMethodSetup({
+    const session = await openGatewayForm(account, {
       subject: {
         kind: "subscriber",
         subscriberId: subscriber.id
@@ -184,7 +185,7 @@ var SubscriberPaymentMethodService = class _SubscriberPaymentMethodService {
       methods: account.methods,
       successUrl: input.successUrl,
       cancelUrl: input.cancelUrl
-    });
+    }, this.logger);
     await this.methods.recordSetup({
       subscriberId: subscriber.id,
       gatewayAccount: account.name,

package/dist/{chunk-NDLC5GYK.js → chunk-EU4N5LET.js}

@@ -38,7 +38,7 @@ function linesWithDiscount(input) {
   }
   return [
     ...lineItemsWithoutGeneratedDiscount,
-    createDiscountLineItem(input, discountNet)
+    generatedDiscountLine(input, discountNet)
   ];
 }
 __name(linesWithDiscount, "linesWithDiscount");
@@ -74,7 +74,7 @@ function withGrossShares(lines, vatRate) {
   });
 }
 __name(withGrossShares, "withGrossShares");
-function createDiscountLineItem(input, discountNet) {
+function generatedDiscountLine(input, discountNet) {
   const promoCode = input.promoCodeSnapshot ?? null;
   const firstPromotion = input.promotionSnapshots?.[0] ?? null;
   return {
@@ -98,7 +98,7 @@ function createDiscountLineItem(input, discountNet) {
     }
   };
 }
-__name(createDiscountLineItem, "createDiscountLineItem");
+__name(generatedDiscountLine, "generatedDiscountLine");
 function roundMoney(value) {
   return Math.round((value + Number.EPSILON) * 100) / 100;
 }
@@ -516,6 +516,7 @@ __name(lineItemKindPriority, "lineItemKindPriority");
 
 export {
   appendImplicitDiscountLineItem,
+  generatedDiscountLine,
   SubscriptionContractService,
   contractLineItemToInvoiceLineItem,
   subscriptionContractToInvoiceSnapshot,

package/dist/{chunk-LLYVYRGJ.js → chunk-F2PF4IXB.js}

@@ -1,5 +1,4 @@
 import {
-  EnforceMfa,
   MfaGuard,
   MfaService
 } from "./chunk-34XVPR6P.js";
@@ -998,275 +997,6 @@ AdminStatsModule = _ts_decorate9([
   Module3({})
 ], AdminStatsModule);
 
-// src/admin/admin-resources.module.ts
-import { Body, Controller as Controller4, Get as Get4, Inject as Inject7, Injectable as Injectable5, Module as Module4, NotFoundException, Param, Post as Post2, Query, Req, UseGuards as UseGuards3 } from "@nestjs/common";
-import { IsOptional, IsString, MaxLength } from "class-validator";
-import { BILLING_ERROR_CODES } from "@saasicat/core";
-function _ts_decorate10(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate10, "_ts_decorate");
-function _ts_metadata7(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-}
-__name(_ts_metadata7, "_ts_metadata");
-function _ts_param7(paramIndex, decorator) {
-  return function(target, key) {
-    decorator(target, key, paramIndex);
-  };
-}
-__name(_ts_param7, "_ts_param");
-var ADMIN_RESOURCES_PORT_TOKEN = /* @__PURE__ */ Symbol.for("saasicat/nest/AdminResourcesPort");
-var SuspendTenantDto = class {
-  static {
-    __name(this, "SuspendTenantDto");
-  }
-  reason;
-};
-_ts_decorate10([
-  IsOptional(),
-  IsString(),
-  MaxLength(500),
-  _ts_metadata7("design:type", String)
-], SuspendTenantDto.prototype, "reason", void 0);
-var AdminResourcesService = class {
-  static {
-    __name(this, "AdminResourcesService");
-  }
-  resources;
-  audit;
-  constructor(resources, audit) {
-    this.resources = resources;
-    this.audit = audit;
-  }
-  listTenants(filter) {
-    return this.resources.listTenants(filter);
-  }
-  async getTenantDetail(slug) {
-    const tenant = await this.resources.getTenantDetail(slug);
-    if (!tenant) {
-      throw new NotFoundException({
-        code: BILLING_ERROR_CODES.TENANT_NOT_FOUND,
-        message: `Tenant ${slug} not found`,
-        params: {
-          slug
-        }
-      });
-    }
-    return tenant;
-  }
-  listUsers(filter) {
-    return this.resources.listUsers(filter);
-  }
-  listAudit(filter) {
-    return this.resources.listAudit(filter);
-  }
-  listSubscriptions() {
-    return this.resources.listSubscriptions();
-  }
-  suspendTenant(slug, reason, actor) {
-    return this.setTenantActive(slug, false, "PAST_DUE", actor, {
-      action: "TENANT_SUSPEND",
-      reason: reason ?? ""
-    });
-  }
-  reactivateTenant(slug, actor) {
-    return this.setTenantActive(slug, true, "ACTIVE", actor, {
-      action: "TENANT_REACTIVATE",
-      reason: ""
-    });
-  }
-  async setTenantActive(slug, active, subscriptionStatus, actor, audit) {
-    const result = await this.resources.setTenantActive(slug, active, subscriptionStatus);
-    if (!result) {
-      throw new NotFoundException({
-        code: BILLING_ERROR_CODES.TENANT_NOT_FOUND,
-        message: `Tenant ${slug} not found`,
-        params: {
-          slug
-        }
-      });
-    }
-    await this.audit.log({
-      actor,
-      entity: "Tenant",
-      entityId: result.id,
-      action: audit.action,
-      changes: {
-        slug,
-        reason: audit.reason
-      }
-    });
-    return result;
-  }
-};
-AdminResourcesService = _ts_decorate10([
-  Injectable5(),
-  _ts_param7(0, Inject7(ADMIN_RESOURCES_PORT_TOKEN)),
-  _ts_param7(1, Inject7(AdminAuditService)),
-  _ts_metadata7("design:type", Function),
-  _ts_metadata7("design:paramtypes", [
-    typeof AdminResourcesPort === "undefined" ? Object : AdminResourcesPort,
-    typeof AdminAuditService === "undefined" ? Object : AdminAuditService
-  ])
-], AdminResourcesService);
-function actorFromRequest(request) {
-  const userId = request.user?.id ?? request.user?.userId ?? "unknown";
-  return {
-    userId,
-    email: request.user?.email ?? `${userId}@unknown`,
-    source: "web",
-    context: request.user?.sessionId ?? "unknown"
-  };
-}
-__name(actorFromRequest, "actorFromRequest");
-function buildAdminResourcesController(guards) {
-  let GeneratedAdminResourcesController = class GeneratedAdminResourcesController {
-    static {
-      __name(this, "GeneratedAdminResourcesController");
-    }
-    resources;
-    constructor(resources) {
-      this.resources = resources;
-    }
-    listTenants(query) {
-      return this.resources.listTenants(query);
-    }
-    getTenant(slug) {
-      return this.resources.getTenantDetail(slug);
-    }
-    suspendTenant(request, slug, dto) {
-      return this.resources.suspendTenant(slug, dto.reason, actorFromRequest(request));
-    }
-    reactivateTenant(request, slug) {
-      return this.resources.reactivateTenant(slug, actorFromRequest(request));
-    }
-    listUsers(query) {
-      return this.resources.listUsers(query);
-    }
-    listAudit(query) {
-      return this.resources.listAudit({
-        actor: query.actor,
-        action: query.action,
-        entity: query.entity,
-        since: query.since,
-        limit: query.limit ? Number.parseInt(query.limit, 10) : void 0
-      });
-    }
-    listSubscriptions() {
-      return this.resources.listSubscriptions();
-    }
-  };
-  _ts_decorate10([
-    Get4("tenants"),
-    _ts_param7(0, Query()),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      Object
-    ]),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "listTenants", null);
-  _ts_decorate10([
-    Get4("tenants/:slug"),
-    _ts_param7(0, Param("slug")),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      String
-    ]),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "getTenant", null);
-  _ts_decorate10([
-    Post2("tenants/:slug/suspend"),
-    EnforceMfa(),
-    _ts_param7(0, Req()),
-    _ts_param7(1, Param("slug")),
-    _ts_param7(2, Body()),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      typeof AdminRequest === "undefined" ? Object : AdminRequest,
-      String,
-      typeof SuspendTenantDto === "undefined" ? Object : SuspendTenantDto
-    ]),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "suspendTenant", null);
-  _ts_decorate10([
-    Post2("tenants/:slug/reactivate"),
-    EnforceMfa(),
-    _ts_param7(0, Req()),
-    _ts_param7(1, Param("slug")),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      typeof AdminRequest === "undefined" ? Object : AdminRequest,
-      String
-    ]),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "reactivateTenant", null);
-  _ts_decorate10([
-    Get4("users"),
-    _ts_param7(0, Query()),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      Object
-    ]),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "listUsers", null);
-  _ts_decorate10([
-    Get4("audit"),
-    _ts_param7(0, Query()),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      Object
-    ]),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "listAudit", null);
-  _ts_decorate10([
-    Get4("subscriptions"),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", []),
-    _ts_metadata7("design:returntype", typeof Promise === "undefined" ? Object : Promise)
-  ], GeneratedAdminResourcesController.prototype, "listSubscriptions", null);
-  GeneratedAdminResourcesController = _ts_decorate10([
-    Controller4("admin"),
-    UseGuards3(...guards),
-    _ts_param7(0, Inject7(AdminResourcesService)),
-    _ts_metadata7("design:type", Function),
-    _ts_metadata7("design:paramtypes", [
-      typeof AdminResourcesService === "undefined" ? Object : AdminResourcesService
-    ])
-  ], GeneratedAdminResourcesController);
-  return GeneratedAdminResourcesController;
-}
-__name(buildAdminResourcesController, "buildAdminResourcesController");
-var AdminResourcesModule = class _AdminResourcesModule {
-  static {
-    __name(this, "AdminResourcesModule");
-  }
-  static forRoot(options) {
-    return {
-      module: _AdminResourcesModule,
-      global: options.global ?? false,
-      imports: options.imports ?? [],
-      controllers: [
-        buildAdminResourcesController(options.guards)
-      ],
-      providers: [
-        asProvider(ADMIN_RESOURCES_PORT_TOKEN, options.resources),
-        AdminResourcesService
-      ],
-      exports: [
-        ADMIN_RESOURCES_PORT_TOKEN,
-        AdminResourcesService
-      ]
-    };
-  }
-};
-AdminResourcesModule = _ts_decorate10([
-  Module4({})
-], AdminResourcesModule);
-
 export {
   SuperAdminGuard,
   AdminBypassRlsInterceptor,
@@ -1284,9 +1014,5 @@ export {
   AdminStatsService,
   AdminStatsController,
   buildAdminStatsController,
-  AdminStatsModule,
-  ADMIN_RESOURCES_PORT_TOKEN,
-  SuspendTenantDto,
-  AdminResourcesService,
-  AdminResourcesModule
+  AdminStatsModule
 };