@saasicat/nest 0.12.1 → 0.14.0

package/dist/_entries.cjs

@@ -2015,6 +2015,53 @@ function aggregateContractLineItemEntitlements(lineItems, fallbackPlan = "UNKNOW
   };
 }
 __name(aggregateContractLineItemEntitlements, "aggregateContractLineItemEntitlements");
+function contractLimits(contract) {
+  if (contract.entitlementSnapshot) {
+    return {
+      plan: contract.entitlementSnapshot.plan,
+      quotas: {
+        ...contract.entitlementSnapshot.quotas
+      },
+      features: new Set(contract.entitlementSnapshot.features)
+    };
+  }
+  return aggregateContractLineItemEntitlements(contract.lineItems);
+}
+__name(contractLimits, "contractLimits");
+function contractBundleVersionIds(contract) {
+  const ids = new Set(contract.originalBundleVersionIds);
+  for (const item of contract.lineItems) {
+    if (item.kind === "bundle" && item.sourceVersionId) {
+      ids.add(item.sourceVersionId);
+    }
+  }
+  return ids;
+}
+__name(contractBundleVersionIds, "contractBundleVersionIds");
+function mergeSubscriptionBundlesIntoLimits(limits, bundles, coveredBundleVersionIds, catalog, now) {
+  const additional = filterActiveSubscriptionBundles(bundles, now).filter((b) => !coveredBundleVersionIds.has(b.bundleVersionId));
+  if (additional.length === 0) return limits;
+  const quotas = {
+    ...limits.quotas
+  };
+  for (const [key, value] of Object.entries(aggregateSubscriptionBundleQuotas(additional))) {
+    if (quotas[key] === -1 || value === -1) {
+      quotas[key] = -1;
+    } else {
+      quotas[key] = (quotas[key] ?? 0) + value;
+    }
+  }
+  const bundleFeatures = filterPlannedOnlyFeatures(new Set(collectSubscriptionBundleFeatures(additional)), catalog);
+  return {
+    plan: limits.plan,
+    quotas,
+    features: /* @__PURE__ */ new Set([
+      ...limits.features,
+      ...bundleFeatures
+    ])
+  };
+}
+__name(mergeSubscriptionBundlesIntoLimits, "mergeSubscriptionBundlesIntoLimits");
 function filterPlannedOnlyFeatures(features, catalog) {
   const out = /* @__PURE__ */ new Set();
   for (const f of features) {
@@ -2287,11 +2334,14 @@ var EntitlementService = class {
    * have a `SubscriptionRecord` (e.g. within a transaction).
    */
   async deriveLimits(sub, now, tx) {
-    const contractLimits = await this.deriveLimitsFromContract(sub.tenantId, now);
-    if (contractLimits) return this.withReplacedFeatureAliases(contractLimits);
+    const contract = await this.findActiveContract(sub.tenantId, now, tx);
+    if (contract) {
+      const bundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
+      return this.withReplacedFeatureAliases(mergeSubscriptionBundlesIntoLimits(contractLimits(contract), bundles, contractBundleVersionIds(contract), this.catalog, now));
+    }
     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);
+    const subscriptionBundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
     return this.withReplacedFeatureAliases(aggregateLimits({
       plan: effectivePlan,
       planVersion,
@@ -2315,20 +2365,9 @@ var EntitlementService = class {
       features: expandReplacedFeatures(limits.features, this.replacedByIndex)
     };
   }
-  async deriveLimitsFromContract(tenantId, now) {
+  async findActiveContract(tenantId, now, tx) {
     if (!this.subscriptionContracts) return null;
-    const contract = await this.subscriptionContracts.findActiveByTenantId(tenantId, now);
-    if (!contract) return null;
-    if (contract.entitlementSnapshot) {
-      return {
-        plan: contract.entitlementSnapshot.plan,
-        quotas: {
-          ...contract.entitlementSnapshot.quotas
-        },
-        features: new Set(contract.entitlementSnapshot.features)
-      };
-    }
-    return aggregateContractLineItemEntitlements(contract.lineItems);
+    return this.subscriptionContracts.findActiveByTenantId(tenantId, now, tx);
   }
   /**
    * Loads a subscription's active bundle bookings and resolves the
@@ -2337,17 +2376,18 @@ var EntitlementService = class {
    * returns an empty list — apps without a bundle schema stay unchanged
    * (plan-only aggregation).
    */
-  async loadSubscriptionBundleSnapshots(subscriptionId, now) {
+  async loadSubscriptionBundleSnapshots(subscriptionId, now, tx) {
     if (!this.subscriptionBundles || !this.bundles) return [];
-    const active = await this.subscriptionBundles.listActiveBySubscription(subscriptionId, now);
+    const active = await this.subscriptionBundles.listActiveBySubscription(subscriptionId, now, tx);
     if (active.length === 0) return [];
     return Promise.all(active.map(async (booking) => {
-      const bv = await this.bundles.findVersionById(booking.bundleVersionId);
+      const bv = await this.bundles.findVersionById(booking.bundleVersionId, tx);
       if (!bv) {
         throw new Error(`BundleVersion '${booking.bundleVersionId}' aus aktiver SubscriptionBundle nicht gefunden`);
       }
       return {
         bundleKey: bv.bundleKey,
+        bundleVersionId: booking.bundleVersionId,
         features: bv.features,
         quotas: bv.quotas,
         canceledEffectiveAt: booking.canceledEffectiveAt
@@ -3436,12 +3476,15 @@ __export(entitlement_exports, {
   applyCustomLimits: () => applyCustomLimits,
   buildReplacedByIndex: () => buildReplacedByIndex,
   collectSubscriptionBundleFeatures: () => collectSubscriptionBundleFeatures,
+  contractBundleVersionIds: () => contractBundleVersionIds,
+  contractLimits: () => contractLimits,
   expandReplacedFeatures: () => expandReplacedFeatures,
   filterActiveSubscriptionBundles: () => filterActiveSubscriptionBundles,
   filterPlannedOnlyFeatures: () => filterPlannedOnlyFeatures,
   hasAnyFeature: () => hasAnyFeature,
   hasFeature: () => hasFeature,
   isLimitExceededError: () => isLimitExceededError,
+  mergeSubscriptionBundlesIntoLimits: () => mergeSubscriptionBundlesIntoLimits,
   resolveEntitlementPlan: () => resolveEntitlementPlan,
   toEffectiveLimitsSnapshot: () => toEffectiveLimitsSnapshot
 });
@@ -6235,7 +6278,7 @@ function _ts_param26(paramIndex, decorator) {
 }
 __name(_ts_param26, "_ts_param");
 function buildTenantSubscriptionBundlesController(extraGuards = []) {
-  let GeneratedTenantSubscriptionBundlesController = class GeneratedTenantSubscriptionBundlesController {
+  let GeneratedTenantSubscriptionBundlesController = class GeneratedTenantSubscriptionBundlesController2 {
     static {
       __name(this, "GeneratedTenantSubscriptionBundlesController");
     }
@@ -6245,6 +6288,8 @@ function buildTenantSubscriptionBundlesController(extraGuards = []) {
     tenantIdResolver;
     contractFreeze;
     logger = new import_common39.Logger("TenantSubscriptionBundlesController");
+    /** Keeps the "no contractFreeze hook" warning to one line per process. */
+    static warnedAboutMissingFreeze = false;
     constructor(service, previewService, subscriptionUsage, tenantIdResolver, contractFreeze = null) {
       this.service = service;
       this.previewService = previewService;
@@ -6336,7 +6381,13 @@ function buildTenantSubscriptionBundlesController(extraGuards = []) {
      * only if the consumer has wired the ContractFreezePort.
      */
     async refreezeContract(tenantId, sub) {
-      if (!this.contractFreeze) return;
+      if (!this.contractFreeze) {
+        if (!GeneratedTenantSubscriptionBundlesController2.warnedAboutMissingFreeze) {
+          GeneratedTenantSubscriptionBundlesController2.warnedAboutMissingFreeze = true;
+          this.logger.warn("Bundle mutation without a configured contractFreeze hook \u2014 the SubscriptionContract is not re-materialized. Configure `contractFreeze` in TenantBillingModule.forRoot() if this app uses contracts.");
+        }
+        return;
+      }
       try {
         await this.contractFreeze.freezeOnPlanChange(tenantId, sub.planVersion.planId, sub.billingCycle, /* @__PURE__ */ new Date());
       } catch (err) {
@@ -16624,6 +16675,8 @@ __export(src_exports, {
   computeProration: () => computeProration,
   computeRegularStartsAt: () => computeRegularStartsAt,
   computeSnapshotHash: () => computeSnapshotHash,
+  contractBundleVersionIds: () => contractBundleVersionIds,
+  contractLimits: () => contractLimits,
   contractLineItemToInvoiceLineItem: () => contractLineItemToInvoiceLineItem,
   decideRenewal: () => decideRenewal,
   expandReplacedFeatures: () => expandReplacedFeatures,
@@ -16654,6 +16707,7 @@ __export(src_exports, {
   loadDiscoverySnapshotFromFile: () => loadDiscoverySnapshotFromFile,
   loadPlanCatalogFromFile: () => loadPlanCatalogFromFile,
   loadPlanCatalogFromString: () => loadPlanCatalogFromString,
+  mergeSubscriptionBundlesIntoLimits: () => mergeSubscriptionBundlesIntoLimits,
   periodEndAfter: () => periodEndAfter,
   periodEndWithMinLead: () => periodEndWithMinLead,
   preflightExitCode: () => preflightExitCode,

package/dist/{aggregation-CfI0bOsQ.d.cts → aggregation-SKfXu09x.d.cts}

@@ -1,4 +1,4 @@
-import { PlanId, QuotaKey, FeatureKey, PlanCatalog, SubscriptionRepository, PlanVersionRepository, TransactionRunner, SubscriptionBundleRepository, BundleRepository, SubscriptionContractRepository, DiscoverySnapshot, SubscriptionRecord, TransactionContext, ContractLineItemRecord } from '@saasicat/types';
+import { PlanId, QuotaKey, FeatureKey, PlanCatalog, SubscriptionRepository, PlanVersionRepository, TransactionRunner, SubscriptionBundleRepository, BundleRepository, SubscriptionContractRepository, DiscoverySnapshot, SubscriptionRecord, TransactionContext, ContractLineItemRecord, SubscriptionContractRecord } from '@saasicat/types';
 import { E as EntitlementResolutionConfig } from './plan-resolution-CFCoUkrE.cjs';
 
 /**
@@ -27,6 +27,12 @@ interface PlanVersionSnapshot {
  */
 interface SubscriptionBundleSnapshot {
     bundleKey: string;
+    /**
+     * Booked `BundleVersion`. Lets the contract path tell bundles that are
+     * already part of a frozen contract from ones booked afterwards, so their
+     * quotas are not counted twice.
+     */
+    bundleVersionId: string;
     features: FeatureKey[];
     quotas: Record<QuotaKey, number>;
     /**
@@ -140,7 +146,7 @@ declare class EntitlementService {
      * A no-op without a snapshot or without replaces declarations.
      */
     private withReplacedFeatureAliases;
-    private deriveLimitsFromContract;
+    private findActiveContract;
     /**
      * Loads a subscription's active bundle bookings and resolves the
      * `BundleVersion` features/quotas per entry. Without a registered
@@ -186,6 +192,32 @@ declare function collectSubscriptionBundleFeatures(bundles: readonly Subscriptio
  * `quotaEffectsSnapshot` are the contractual truth.
  */
 declare function aggregateContractLineItemEntitlements(lineItems: readonly Pick<ContractLineItemRecord, 'kind' | 'sourceKey' | 'featuresSnapshot' | 'quotaEffectsSnapshot'>[], fallbackPlan?: string): EffectiveLimits;
+/**
+ * Limits as frozen in the contract: the entitlement snapshot when present,
+ * otherwise aggregated from the line items.
+ */
+declare function contractLimits(contract: Pick<SubscriptionContractRecord, 'entitlementSnapshot' | 'lineItems'>): EffectiveLimits;
+/**
+ * `BundleVersion`s the contract already accounts for — from the freeze
+ * (`originalBundleVersionIds`) and from its bundle line items.
+ */
+declare function contractBundleVersionIds(contract: Pick<SubscriptionContractRecord, 'originalBundleVersionIds' | 'lineItems'>): Set<string>;
+/**
+ * Adds bundle bookings on top of limits that came from a contract.
+ *
+ * A contract freezes what was agreed at signing time. Bundles booked *later*
+ * are separate purchases and must take effect immediately — otherwise the
+ * purchase stays without consequence until someone re-freezes the contract.
+ * Bundles that are already part of the contract (`coveredBundleVersionIds`,
+ * i.e. `originalBundleVersionIds` plus the bundle line items) are skipped, so
+ * their quotas are not counted twice.
+ *
+ * Features are a set union, quotas add up with `-1` (unlimited) dominance, and
+ * `plannedOnly` features stay out — same rules as `aggregateLimits`. The
+ * contract's own features are passed through untouched: what was agreed stays
+ * agreed.
+ */
+declare function mergeSubscriptionBundlesIntoLimits(limits: EffectiveLimits, bundles: readonly SubscriptionBundleSnapshot[], coveredBundleVersionIds: ReadonlySet<string>, catalog: PlanCatalog, now: Date): EffectiveLimits;
 /**
  * Consistently filters out `plannedOnly` features — regardless of whether they
  * come from the plan, a bundle or customLimits. `plannedOnly` means: the feature
@@ -225,4 +257,4 @@ declare function hasAnyFeature(limits: EffectiveLimits, features: readonly Featu
  */
 declare function toEffectiveLimitsSnapshot(limits: EffectiveLimits): EffectiveLimitsSnapshot;
 
-export { type CustomLimitsShape as C, type EffectiveLimits as E, type PlanVersionSnapshot as P, type SubscriptionBundleSnapshot as S, type EffectiveLimitsSnapshot as a, type EnforceLimitInput as b, EntitlementService as c, type SubscriptionLimitsInput as d, aggregateContractLineItemEntitlements as e, aggregateLimits as f, aggregateSubscriptionBundleQuotas as g, applyCustomLimits as h, collectSubscriptionBundleFeatures as i, filterActiveSubscriptionBundles as j, filterPlannedOnlyFeatures as k, hasAnyFeature as l, hasFeature as m, toEffectiveLimitsSnapshot as t };
+export { type CustomLimitsShape as C, type EffectiveLimits as E, type PlanVersionSnapshot as P, type SubscriptionBundleSnapshot as S, type EffectiveLimitsSnapshot as a, type EnforceLimitInput as b, EntitlementService as c, type SubscriptionLimitsInput as d, aggregateContractLineItemEntitlements as e, aggregateLimits as f, aggregateSubscriptionBundleQuotas as g, applyCustomLimits as h, collectSubscriptionBundleFeatures as i, contractBundleVersionIds as j, contractLimits as k, filterActiveSubscriptionBundles as l, filterPlannedOnlyFeatures as m, hasAnyFeature as n, hasFeature as o, mergeSubscriptionBundlesIntoLimits as p, toEffectiveLimitsSnapshot as t };

package/dist/{aggregation-BibpEO0t.d.ts → aggregation-o0LMenvl.d.ts}

@@ -1,4 +1,4 @@
-import { PlanId, QuotaKey, FeatureKey, PlanCatalog, SubscriptionRepository, PlanVersionRepository, TransactionRunner, SubscriptionBundleRepository, BundleRepository, SubscriptionContractRepository, DiscoverySnapshot, SubscriptionRecord, TransactionContext, ContractLineItemRecord } from '@saasicat/types';
+import { PlanId, QuotaKey, FeatureKey, PlanCatalog, SubscriptionRepository, PlanVersionRepository, TransactionRunner, SubscriptionBundleRepository, BundleRepository, SubscriptionContractRepository, DiscoverySnapshot, SubscriptionRecord, TransactionContext, ContractLineItemRecord, SubscriptionContractRecord } from '@saasicat/types';
 import { E as EntitlementResolutionConfig } from './plan-resolution-CFCoUkrE.js';
 
 /**
@@ -27,6 +27,12 @@ interface PlanVersionSnapshot {
  */
 interface SubscriptionBundleSnapshot {
     bundleKey: string;
+    /**
+     * Booked `BundleVersion`. Lets the contract path tell bundles that are
+     * already part of a frozen contract from ones booked afterwards, so their
+     * quotas are not counted twice.
+     */
+    bundleVersionId: string;
     features: FeatureKey[];
     quotas: Record<QuotaKey, number>;
     /**
@@ -140,7 +146,7 @@ declare class EntitlementService {
      * A no-op without a snapshot or without replaces declarations.
      */
     private withReplacedFeatureAliases;
-    private deriveLimitsFromContract;
+    private findActiveContract;
     /**
      * Loads a subscription's active bundle bookings and resolves the
      * `BundleVersion` features/quotas per entry. Without a registered
@@ -186,6 +192,32 @@ declare function collectSubscriptionBundleFeatures(bundles: readonly Subscriptio
  * `quotaEffectsSnapshot` are the contractual truth.
  */
 declare function aggregateContractLineItemEntitlements(lineItems: readonly Pick<ContractLineItemRecord, 'kind' | 'sourceKey' | 'featuresSnapshot' | 'quotaEffectsSnapshot'>[], fallbackPlan?: string): EffectiveLimits;
+/**
+ * Limits as frozen in the contract: the entitlement snapshot when present,
+ * otherwise aggregated from the line items.
+ */
+declare function contractLimits(contract: Pick<SubscriptionContractRecord, 'entitlementSnapshot' | 'lineItems'>): EffectiveLimits;
+/**
+ * `BundleVersion`s the contract already accounts for — from the freeze
+ * (`originalBundleVersionIds`) and from its bundle line items.
+ */
+declare function contractBundleVersionIds(contract: Pick<SubscriptionContractRecord, 'originalBundleVersionIds' | 'lineItems'>): Set<string>;
+/**
+ * Adds bundle bookings on top of limits that came from a contract.
+ *
+ * A contract freezes what was agreed at signing time. Bundles booked *later*
+ * are separate purchases and must take effect immediately — otherwise the
+ * purchase stays without consequence until someone re-freezes the contract.
+ * Bundles that are already part of the contract (`coveredBundleVersionIds`,
+ * i.e. `originalBundleVersionIds` plus the bundle line items) are skipped, so
+ * their quotas are not counted twice.
+ *
+ * Features are a set union, quotas add up with `-1` (unlimited) dominance, and
+ * `plannedOnly` features stay out — same rules as `aggregateLimits`. The
+ * contract's own features are passed through untouched: what was agreed stays
+ * agreed.
+ */
+declare function mergeSubscriptionBundlesIntoLimits(limits: EffectiveLimits, bundles: readonly SubscriptionBundleSnapshot[], coveredBundleVersionIds: ReadonlySet<string>, catalog: PlanCatalog, now: Date): EffectiveLimits;
 /**
  * Consistently filters out `plannedOnly` features — regardless of whether they
  * come from the plan, a bundle or customLimits. `plannedOnly` means: the feature
@@ -225,4 +257,4 @@ declare function hasAnyFeature(limits: EffectiveLimits, features: readonly Featu
  */
 declare function toEffectiveLimitsSnapshot(limits: EffectiveLimits): EffectiveLimitsSnapshot;
 
-export { type CustomLimitsShape as C, type EffectiveLimits as E, type PlanVersionSnapshot as P, type SubscriptionBundleSnapshot as S, type EffectiveLimitsSnapshot as a, type EnforceLimitInput as b, EntitlementService as c, type SubscriptionLimitsInput as d, aggregateContractLineItemEntitlements as e, aggregateLimits as f, aggregateSubscriptionBundleQuotas as g, applyCustomLimits as h, collectSubscriptionBundleFeatures as i, filterActiveSubscriptionBundles as j, filterPlannedOnlyFeatures as k, hasAnyFeature as l, hasFeature as m, toEffectiveLimitsSnapshot as t };
+export { type CustomLimitsShape as C, type EffectiveLimits as E, type PlanVersionSnapshot as P, type SubscriptionBundleSnapshot as S, type EffectiveLimitsSnapshot as a, type EnforceLimitInput as b, EntitlementService as c, type SubscriptionLimitsInput as d, aggregateContractLineItemEntitlements as e, aggregateLimits as f, aggregateSubscriptionBundleQuotas as g, applyCustomLimits as h, collectSubscriptionBundleFeatures as i, contractBundleVersionIds as j, contractLimits as k, filterActiveSubscriptionBundles as l, filterPlannedOnlyFeatures as m, hasAnyFeature as n, hasFeature as o, mergeSubscriptionBundlesIntoLimits as p, toEffectiveLimitsSnapshot as t };

package/dist/billing/index.d.cts

@@ -4,11 +4,11 @@ import * as _nestjs_common from '@nestjs/common';
 import { CanActivate, ExecutionContext, ArgumentsHost, Type, DynamicModule, ForwardReference, Provider } from '@nestjs/common';
 export { Type as NestType } from '@nestjs/common';
 import { Reflector, BaseExceptionFilter } from '@nestjs/core';
-import { c as EntitlementService } from '../aggregation-CfI0bOsQ.cjs';
+import { c as EntitlementService } from '../aggregation-SKfXu09x.cjs';
 import { P as ProviderSpec } from '../di-CcNeq9v-.cjs';
 import { f as ContractFreezePort, g as ContractFreezeSourcePort } from '../subscription-bundles.module-DCpV-Pb5.cjs';
 export { A as AUDIT_CONTEXT_RESOLVER_TOKEN, a as AuditContextResolver, b as AuthGuardList, C as CONTRACT_FREEZE_PORT_TOKEN, c as CONTRACT_FREEZE_PROJECT_KEY_TOKEN, d as CONTRACT_FREEZE_SOURCE_PORT_TOKEN, e as ContractFreezeBundleSnapshot, D as DuePendingPlanChange, P as PENDING_PLAN_QUERY_PORT_TOKEN, h as PendingPlanQueryPort, S as SELF_SERVICE_BLOCKED_BUNDLES_TOKEN, i as SELF_SERVICE_BLOCKED_PLANS_TOKEN, j as SUBSCRIPTION_USAGE_PORT_TOKEN, k as SUBSCRIPTION_WRITE_PORT_TOKEN, l as SelfServiceBlockedBundles, m as SelfServiceBlockedPlans, n as SubscriptionBundleControllerOptions, o as SubscriptionBundleModule, p as SubscriptionBundleModuleOptions, T as TENANT_AUTH_GUARDS_TOKEN, q as TENANT_ID_RESOLVER_TOKEN, r as TRIAL_PROJECTION_PORT_TOKEN, s as TenantBillingModule, t as TenantBillingModuleOptions, u as TenantIdResolver, v as TrialProjectionInput, w as TrialProjectionPort, U as USAGE_SNAPSHOT_PORT_TOKEN, x as USER_EMAIL_RESOLVER_TOKEN, y as USER_ID_RESOLVER_TOKEN, z as UserEmailResolver, B as UserIdResolver } from '../subscription-bundles.module-DCpV-Pb5.cjs';
-export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from '../subscription-bundle-preview.service-BkJXHAeP.cjs';
+export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from '../subscription-bundle-preview.service-B4Ye8L2F.cjs';
 import { S as SubscriptionContractService } from '../subscription-contract.service--cm47ZJJ.cjs';
 import '../plan-resolution-CFCoUkrE.cjs';
 import '../service-DX8KbGXl.cjs';

package/dist/billing/index.d.ts

@@ -4,11 +4,11 @@ import * as _nestjs_common from '@nestjs/common';
 import { CanActivate, ExecutionContext, ArgumentsHost, Type, DynamicModule, ForwardReference, Provider } from '@nestjs/common';
 export { Type as NestType } from '@nestjs/common';
 import { Reflector, BaseExceptionFilter } from '@nestjs/core';
-import { c as EntitlementService } from '../aggregation-BibpEO0t.js';
+import { c as EntitlementService } from '../aggregation-o0LMenvl.js';
 import { P as ProviderSpec } from '../di-CcNeq9v-.js';
 import { f as ContractFreezePort, g as ContractFreezeSourcePort } from '../subscription-bundles.module-BQmoozm5.js';
 export { A as AUDIT_CONTEXT_RESOLVER_TOKEN, a as AuditContextResolver, b as AuthGuardList, C as CONTRACT_FREEZE_PORT_TOKEN, c as CONTRACT_FREEZE_PROJECT_KEY_TOKEN, d as CONTRACT_FREEZE_SOURCE_PORT_TOKEN, e as ContractFreezeBundleSnapshot, D as DuePendingPlanChange, P as PENDING_PLAN_QUERY_PORT_TOKEN, h as PendingPlanQueryPort, S as SELF_SERVICE_BLOCKED_BUNDLES_TOKEN, i as SELF_SERVICE_BLOCKED_PLANS_TOKEN, j as SUBSCRIPTION_USAGE_PORT_TOKEN, k as SUBSCRIPTION_WRITE_PORT_TOKEN, l as SelfServiceBlockedBundles, m as SelfServiceBlockedPlans, n as SubscriptionBundleControllerOptions, o as SubscriptionBundleModule, p as SubscriptionBundleModuleOptions, T as TENANT_AUTH_GUARDS_TOKEN, q as TENANT_ID_RESOLVER_TOKEN, r as TRIAL_PROJECTION_PORT_TOKEN, s as TenantBillingModule, t as TenantBillingModuleOptions, u as TenantIdResolver, v as TrialProjectionInput, w as TrialProjectionPort, U as USAGE_SNAPSHOT_PORT_TOKEN, x as USER_EMAIL_RESOLVER_TOKEN, y as USER_ID_RESOLVER_TOKEN, z as UserEmailResolver, B as UserIdResolver } from '../subscription-bundles.module-BQmoozm5.js';
-export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from '../subscription-bundle-preview.service-DBbrE_cw.js';
+export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from '../subscription-bundle-preview.service-BgQ776mv.js';
 import { S as SubscriptionContractService } from '../subscription-contract.service--cm47ZJJ.js';
 import '../plan-resolution-CFCoUkrE.js';
 import '../service-DX8KbGXl.js';

package/dist/billing/index.js

@@ -58,7 +58,7 @@ import {
   periodEndWithMinLead,
   resolveBundleCancelEffectiveAt,
   resolveBundlePriceNet
-} from "../chunk-F3VV6EXG.js";
+} from "../chunk-RKVY775D.js";
 import "../chunk-E7AJ42AB.js";
 import "../chunk-2PNX2QL2.js";
 import {
@@ -80,7 +80,7 @@ import "../chunk-MDIZUVIK.js";
 import {
   SUBSCRIPTION_BUNDLE_CONFIG_TOKEN,
   SUBSCRIPTION_BUNDLE_REPOSITORY_TOKEN
-} from "../chunk-GBDUH6DO.js";
+} from "../chunk-EXOLOJFZ.js";
 import {
   PLAN_CATALOG_READ_SINK_TOKEN,
   PLAN_CATALOG_TOKEN,

package/dist/{chunk-GBDUH6DO.js → chunk-EXOLOJFZ.js}

@@ -76,6 +76,53 @@ function aggregateContractLineItemEntitlements(lineItems, fallbackPlan = "UNKNOW
   };
 }
 __name(aggregateContractLineItemEntitlements, "aggregateContractLineItemEntitlements");
+function contractLimits(contract) {
+  if (contract.entitlementSnapshot) {
+    return {
+      plan: contract.entitlementSnapshot.plan,
+      quotas: {
+        ...contract.entitlementSnapshot.quotas
+      },
+      features: new Set(contract.entitlementSnapshot.features)
+    };
+  }
+  return aggregateContractLineItemEntitlements(contract.lineItems);
+}
+__name(contractLimits, "contractLimits");
+function contractBundleVersionIds(contract) {
+  const ids = new Set(contract.originalBundleVersionIds);
+  for (const item of contract.lineItems) {
+    if (item.kind === "bundle" && item.sourceVersionId) {
+      ids.add(item.sourceVersionId);
+    }
+  }
+  return ids;
+}
+__name(contractBundleVersionIds, "contractBundleVersionIds");
+function mergeSubscriptionBundlesIntoLimits(limits, bundles, coveredBundleVersionIds, catalog, now) {
+  const additional = filterActiveSubscriptionBundles(bundles, now).filter((b) => !coveredBundleVersionIds.has(b.bundleVersionId));
+  if (additional.length === 0) return limits;
+  const quotas = {
+    ...limits.quotas
+  };
+  for (const [key, value] of Object.entries(aggregateSubscriptionBundleQuotas(additional))) {
+    if (quotas[key] === -1 || value === -1) {
+      quotas[key] = -1;
+    } else {
+      quotas[key] = (quotas[key] ?? 0) + value;
+    }
+  }
+  const bundleFeatures = filterPlannedOnlyFeatures(new Set(collectSubscriptionBundleFeatures(additional)), catalog);
+  return {
+    plan: limits.plan,
+    quotas,
+    features: /* @__PURE__ */ new Set([
+      ...limits.features,
+      ...bundleFeatures
+    ])
+  };
+}
+__name(mergeSubscriptionBundlesIntoLimits, "mergeSubscriptionBundlesIntoLimits");
 function filterPlannedOnlyFeatures(features, catalog) {
   const out = /* @__PURE__ */ new Set();
   for (const f of features) {
@@ -348,11 +395,14 @@ var EntitlementService = class {
    * have a `SubscriptionRecord` (e.g. within a transaction).
    */
   async deriveLimits(sub, now, tx) {
-    const contractLimits = await this.deriveLimitsFromContract(sub.tenantId, now);
-    if (contractLimits) return this.withReplacedFeatureAliases(contractLimits);
+    const contract = await this.findActiveContract(sub.tenantId, now, tx);
+    if (contract) {
+      const bundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
+      return this.withReplacedFeatureAliases(mergeSubscriptionBundlesIntoLimits(contractLimits(contract), bundles, contractBundleVersionIds(contract), this.catalog, now));
+    }
     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);
+    const subscriptionBundles = await this.loadSubscriptionBundleSnapshots(sub.id, now, tx);
     return this.withReplacedFeatureAliases(aggregateLimits({
       plan: effectivePlan,
       planVersion,
@@ -376,20 +426,9 @@ var EntitlementService = class {
       features: expandReplacedFeatures(limits.features, this.replacedByIndex)
     };
   }
-  async deriveLimitsFromContract(tenantId, now) {
+  async findActiveContract(tenantId, now, tx) {
     if (!this.subscriptionContracts) return null;
-    const contract = await this.subscriptionContracts.findActiveByTenantId(tenantId, now);
-    if (!contract) return null;
-    if (contract.entitlementSnapshot) {
-      return {
-        plan: contract.entitlementSnapshot.plan,
-        quotas: {
-          ...contract.entitlementSnapshot.quotas
-        },
-        features: new Set(contract.entitlementSnapshot.features)
-      };
-    }
-    return aggregateContractLineItemEntitlements(contract.lineItems);
+    return this.subscriptionContracts.findActiveByTenantId(tenantId, now, tx);
   }
   /**
    * Loads a subscription's active bundle bookings and resolves the
@@ -398,17 +437,18 @@ var EntitlementService = class {
    * returns an empty list — apps without a bundle schema stay unchanged
    * (plan-only aggregation).
    */
-  async loadSubscriptionBundleSnapshots(subscriptionId, now) {
+  async loadSubscriptionBundleSnapshots(subscriptionId, now, tx) {
     if (!this.subscriptionBundles || !this.bundles) return [];
-    const active = await this.subscriptionBundles.listActiveBySubscription(subscriptionId, now);
+    const active = await this.subscriptionBundles.listActiveBySubscription(subscriptionId, now, tx);
     if (active.length === 0) return [];
     return Promise.all(active.map(async (booking) => {
-      const bv = await this.bundles.findVersionById(booking.bundleVersionId);
+      const bv = await this.bundles.findVersionById(booking.bundleVersionId, tx);
       if (!bv) {
         throw new Error(`BundleVersion '${booking.bundleVersionId}' aus aktiver SubscriptionBundle nicht gefunden`);
       }
       return {
         bundleKey: bv.bundleKey,
+        bundleVersionId: booking.bundleVersionId,
         features: bv.features,
         quotas: bv.quotas,
         canceledEffectiveAt: booking.canceledEffectiveAt
@@ -575,6 +615,9 @@ export {
   aggregateSubscriptionBundleQuotas,
   collectSubscriptionBundleFeatures,
   aggregateContractLineItemEntitlements,
+  contractLimits,
+  contractBundleVersionIds,
+  mergeSubscriptionBundlesIntoLimits,
   filterPlannedOnlyFeatures,
   applyCustomLimits,
   aggregateLimits,

package/dist/{chunk-PUXLPUVH.js → chunk-I2EKGQUG.js}

@@ -13,7 +13,7 @@ import {
   REQUIRE_FEATURE_KEY,
   SubscriptionBundleModule,
   TenantBillingModule
-} from "./chunk-F3VV6EXG.js";
+} from "./chunk-RKVY775D.js";
 import {
   CatalogModule
 } from "./chunk-33TP26MR.js";
@@ -23,7 +23,7 @@ import {
 import {
   EntitlementModule,
   LimitExceededError
-} from "./chunk-GBDUH6DO.js";
+} from "./chunk-EXOLOJFZ.js";
 import {
   PLAN_CATALOG_TOKEN,
   PlanCatalogModule

package/dist/{chunk-F3VV6EXG.js → chunk-RKVY775D.js}

@@ -25,7 +25,7 @@ import {
   SUBSCRIPTION_BUNDLE_REPOSITORY_TOKEN,
   isLimitExceededError,
   toEffectiveLimitsSnapshot
-} from "./chunk-GBDUH6DO.js";
+} from "./chunk-EXOLOJFZ.js";
 import {
   PLAN_CATALOG_TOKEN,
   findPlan,
@@ -3005,7 +3005,7 @@ function _ts_param13(paramIndex, decorator) {
 }
 __name(_ts_param13, "_ts_param");
 function buildTenantSubscriptionBundlesController(extraGuards = []) {
-  let GeneratedTenantSubscriptionBundlesController = class GeneratedTenantSubscriptionBundlesController {
+  let GeneratedTenantSubscriptionBundlesController = class GeneratedTenantSubscriptionBundlesController2 {
     static {
       __name(this, "GeneratedTenantSubscriptionBundlesController");
     }
@@ -3015,6 +3015,8 @@ function buildTenantSubscriptionBundlesController(extraGuards = []) {
     tenantIdResolver;
     contractFreeze;
     logger = new Logger5("TenantSubscriptionBundlesController");
+    /** Keeps the "no contractFreeze hook" warning to one line per process. */
+    static warnedAboutMissingFreeze = false;
     constructor(service, previewService, subscriptionUsage, tenantIdResolver, contractFreeze = null) {
       this.service = service;
       this.previewService = previewService;
@@ -3106,7 +3108,13 @@ function buildTenantSubscriptionBundlesController(extraGuards = []) {
      * only if the consumer has wired the ContractFreezePort.
      */
     async refreezeContract(tenantId, sub) {
-      if (!this.contractFreeze) return;
+      if (!this.contractFreeze) {
+        if (!GeneratedTenantSubscriptionBundlesController2.warnedAboutMissingFreeze) {
+          GeneratedTenantSubscriptionBundlesController2.warnedAboutMissingFreeze = true;
+          this.logger.warn("Bundle mutation without a configured contractFreeze hook \u2014 the SubscriptionContract is not re-materialized. Configure `contractFreeze` in TenantBillingModule.forRoot() if this app uses contracts.");
+        }
+        return;
+      }
       try {
         await this.contractFreeze.freezeOnPlanChange(tenantId, sub.planVersion.planId, sub.billingCycle, /* @__PURE__ */ new Date());
       } catch (err) {

package/dist/entitlement/index.d.cts

@@ -1,4 +1,4 @@
-export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as filterActiveSubscriptionBundles, k as filterPlannedOnlyFeatures, l as hasAnyFeature, m as hasFeature, t as toEffectiveLimitsSnapshot } from '../aggregation-CfI0bOsQ.cjs';
+export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as contractBundleVersionIds, k as contractLimits, l as filterActiveSubscriptionBundles, m as filterPlannedOnlyFeatures, n as hasAnyFeature, o as hasFeature, p as mergeSubscriptionBundlesIntoLimits, t as toEffectiveLimitsSnapshot } from '../aggregation-SKfXu09x.cjs';
 import { DiscoveredFeature, SubscriptionRepository, PlanVersionRepository, TransactionRunner, SubscriptionContractRepository, SubscriptionBundleRepository, BundleRepository } from '@saasicat/types';
 import { E as EntitlementResolutionConfig } from '../plan-resolution-CFCoUkrE.cjs';
 export { a as EntitlementResolutionInput, r as resolveEntitlementPlan } from '../plan-resolution-CFCoUkrE.cjs';

package/dist/entitlement/index.d.ts

@@ -1,4 +1,4 @@
-export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as filterActiveSubscriptionBundles, k as filterPlannedOnlyFeatures, l as hasAnyFeature, m as hasFeature, t as toEffectiveLimitsSnapshot } from '../aggregation-BibpEO0t.js';
+export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as contractBundleVersionIds, k as contractLimits, l as filterActiveSubscriptionBundles, m as filterPlannedOnlyFeatures, n as hasAnyFeature, o as hasFeature, p as mergeSubscriptionBundlesIntoLimits, t as toEffectiveLimitsSnapshot } from '../aggregation-o0LMenvl.js';
 import { DiscoveredFeature, SubscriptionRepository, PlanVersionRepository, TransactionRunner, SubscriptionContractRepository, SubscriptionBundleRepository, BundleRepository } from '@saasicat/types';
 import { E as EntitlementResolutionConfig } from '../plan-resolution-CFCoUkrE.js';
 export { a as EntitlementResolutionInput, r as resolveEntitlementPlan } from '../plan-resolution-CFCoUkrE.js';

package/dist/entitlement/index.js

@@ -8,15 +8,18 @@ import {
   applyCustomLimits,
   buildReplacedByIndex,
   collectSubscriptionBundleFeatures,
+  contractBundleVersionIds,
+  contractLimits,
   expandReplacedFeatures,
   filterActiveSubscriptionBundles,
   filterPlannedOnlyFeatures,
   hasAnyFeature,
   hasFeature,
   isLimitExceededError,
+  mergeSubscriptionBundlesIntoLimits,
   resolveEntitlementPlan,
   toEffectiveLimitsSnapshot
-} from "../chunk-GBDUH6DO.js";
+} from "../chunk-EXOLOJFZ.js";
 import "../chunk-R2QOSVAA.js";
 import "../chunk-NYLON2VC.js";
 import {
@@ -45,12 +48,15 @@ export {
   applyCustomLimits,
   buildReplacedByIndex,
   collectSubscriptionBundleFeatures,
+  contractBundleVersionIds,
+  contractLimits,
   expandReplacedFeatures,
   filterActiveSubscriptionBundles,
   filterPlannedOnlyFeatures,
   hasAnyFeature,
   hasFeature,
   isLimitExceededError,
+  mergeSubscriptionBundlesIntoLimits,
   resolveEntitlementPlan,
   toEffectiveLimitsSnapshot
 };

package/dist/index.d.cts

@@ -7,8 +7,8 @@ export { AjvErrorLike, CatalogBundleUpsellResolver, ConfiguratorCatalogBuilder,
 import { SetupStatusResponse, SetupResult, SetupConfirmMfaResponse } from '@saasicat/types';
 export { BundleVersionFields, ChangeDirection, DiffResult, DiscoveredCapability, DiscoveredFeature, DiscoveredQuota, DiscoverySnapshot, PasswordHasher, PlanVersionFields, VersionChange, VersionChangeDirection, classifyBundleVersionDiff, classifyPlanDiff } from '@saasicat/types';
 export { A as AUDIT_CONTEXT_RESOLVER_TOKEN, a as AuditContextResolver, b as AuthGuardList, C as CONTRACT_FREEZE_PORT_TOKEN, c as CONTRACT_FREEZE_PROJECT_KEY_TOKEN, d as CONTRACT_FREEZE_SOURCE_PORT_TOKEN, e as ContractFreezeBundleSnapshot, f as ContractFreezePort, g as ContractFreezeSourcePort, D as DuePendingPlanChange, P as PENDING_PLAN_QUERY_PORT_TOKEN, h as PendingPlanQueryPort, S as SELF_SERVICE_BLOCKED_BUNDLES_TOKEN, i as SELF_SERVICE_BLOCKED_PLANS_TOKEN, j as SUBSCRIPTION_USAGE_PORT_TOKEN, k as SUBSCRIPTION_WRITE_PORT_TOKEN, l as SelfServiceBlockedBundles, m as SelfServiceBlockedPlans, n as SubscriptionBundleControllerOptions, o as SubscriptionBundleModule, p as SubscriptionBundleModuleOptions, T as TENANT_AUTH_GUARDS_TOKEN, q as TENANT_ID_RESOLVER_TOKEN, r as TRIAL_PROJECTION_PORT_TOKEN, s as TenantBillingModule, t as TenantBillingModuleOptions, u as TenantIdResolver, v as TrialProjectionInput, w as TrialProjectionPort, U as USAGE_SNAPSHOT_PORT_TOKEN, x as USER_EMAIL_RESOLVER_TOKEN, y as USER_ID_RESOLVER_TOKEN, z as UserEmailResolver, B as UserIdResolver } from './subscription-bundles.module-DCpV-Pb5.cjs';
-export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from './subscription-bundle-preview.service-BkJXHAeP.cjs';
-export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as filterActiveSubscriptionBundles, k as filterPlannedOnlyFeatures, l as hasAnyFeature, m as hasFeature, t as toEffectiveLimitsSnapshot } from './aggregation-CfI0bOsQ.cjs';
+export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from './subscription-bundle-preview.service-B4Ye8L2F.cjs';
+export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as contractBundleVersionIds, k as contractLimits, l as filterActiveSubscriptionBundles, m as filterPlannedOnlyFeatures, n as hasAnyFeature, o as hasFeature, p as mergeSubscriptionBundlesIntoLimits, t as toEffectiveLimitsSnapshot } from './aggregation-SKfXu09x.cjs';
 export { ENTITLEMENT_RESOLUTION_CONFIG_TOKEN, ENTITLEMENT_SERVICE_TOKEN, EntitlementModule, EntitlementModuleOptions, LimitExceededError, PLAN_VERSION_REPOSITORY_TOKEN, ReplacedByIndex, SUBSCRIPTION_REPOSITORY_TOKEN, TRANSACTION_RUNNER_TOKEN, buildReplacedByIndex, expandReplacedFeatures, isLimitExceededError } from './entitlement/index.cjs';
 export { E as EntitlementResolutionConfig, a as EntitlementResolutionInput, r as resolveEntitlementPlan } from './plan-resolution-CFCoUkrE.cjs';
 export { ADMIN_STATS_AUDIT_WINDOW_DAYS_TOKEN, AUDIT_PORT_TOKEN, AUDIT_STATS_PORT_TOKEN, AdminPublicBootController, AdminStatsController, MFA_PORT_TOKEN, PLATFORM_CORE_MANIFEST_CONTRIBUTION, PROMO_CODE_STATS_PORT_TOKEN, RLS_BYPASS_PORT_TOKEN, SUBSCRIPTION_STATS_PORT_TOKEN } from './admin/index.cjs';

package/dist/index.d.ts

@@ -7,8 +7,8 @@ export { AjvErrorLike, CatalogBundleUpsellResolver, ConfiguratorCatalogBuilder,
 import { SetupStatusResponse, SetupResult, SetupConfirmMfaResponse } from '@saasicat/types';
 export { BundleVersionFields, ChangeDirection, DiffResult, DiscoveredCapability, DiscoveredFeature, DiscoveredQuota, DiscoverySnapshot, PasswordHasher, PlanVersionFields, VersionChange, VersionChangeDirection, classifyBundleVersionDiff, classifyPlanDiff } from '@saasicat/types';
 export { A as AUDIT_CONTEXT_RESOLVER_TOKEN, a as AuditContextResolver, b as AuthGuardList, C as CONTRACT_FREEZE_PORT_TOKEN, c as CONTRACT_FREEZE_PROJECT_KEY_TOKEN, d as CONTRACT_FREEZE_SOURCE_PORT_TOKEN, e as ContractFreezeBundleSnapshot, f as ContractFreezePort, g as ContractFreezeSourcePort, D as DuePendingPlanChange, P as PENDING_PLAN_QUERY_PORT_TOKEN, h as PendingPlanQueryPort, S as SELF_SERVICE_BLOCKED_BUNDLES_TOKEN, i as SELF_SERVICE_BLOCKED_PLANS_TOKEN, j as SUBSCRIPTION_USAGE_PORT_TOKEN, k as SUBSCRIPTION_WRITE_PORT_TOKEN, l as SelfServiceBlockedBundles, m as SelfServiceBlockedPlans, n as SubscriptionBundleControllerOptions, o as SubscriptionBundleModule, p as SubscriptionBundleModuleOptions, T as TENANT_AUTH_GUARDS_TOKEN, q as TENANT_ID_RESOLVER_TOKEN, r as TRIAL_PROJECTION_PORT_TOKEN, s as TenantBillingModule, t as TenantBillingModuleOptions, u as TenantIdResolver, v as TrialProjectionInput, w as TrialProjectionPort, U as USAGE_SNAPSHOT_PORT_TOKEN, x as USER_EMAIL_RESOLVER_TOKEN, y as USER_ID_RESOLVER_TOKEN, z as UserEmailResolver, B as UserIdResolver } from './subscription-bundles.module-BQmoozm5.js';
-export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from './subscription-bundle-preview.service-DBbrE_cw.js';
-export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as filterActiveSubscriptionBundles, k as filterPlannedOnlyFeatures, l as hasAnyFeature, m as hasFeature, t as toEffectiveLimitsSnapshot } from './aggregation-BibpEO0t.js';
+export { A as AddBundleToSubscriptionInput, B as BundlePreviewSnapshot, C as CancelBundleFromSubscriptionInput, a as CancelSubscriptionDto, b as ChangePlanDto, c as CompleteOnboardingSubscriptionDto, d as ComposedTenantAuthGuard, L as LimitsCheckRow, P as PendingPlanMaterializationService, e as PlanChangeContext, f as PlanChangePreviewDto, g as PlanChangePreviewIssue, h as PlanChangePreviewService, i as PlanChangeType, j as PlanSnapshotDto, k as PreviewPlanChangeDto, l as ProrationDto, m as ProrationInput, R as RedundantFeatureHint, S as SubscriptionBundleAddPreviewDto, n as SubscriptionBundleCancelPreviewDto, o as SubscriptionBundleConfig, p as SubscriptionBundlePreviewContext, q as SubscriptionBundlePreviewIssue, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController, U as UsageResponse, u as addMonths, v as computeProration, w as resolveBundleCancelEffectiveAt, x as resolveBundlePriceNet } from './subscription-bundle-preview.service-BgQ776mv.js';
+export { C as CustomLimitsShape, E as EffectiveLimits, a as EffectiveLimitsSnapshot, b as EnforceLimitInput, c as EntitlementService, P as PlanVersionSnapshot, S as SubscriptionBundleSnapshot, d as SubscriptionLimitsInput, e as aggregateContractLineItemEntitlements, f as aggregateLimits, g as aggregateSubscriptionBundleQuotas, h as applyCustomLimits, i as collectSubscriptionBundleFeatures, j as contractBundleVersionIds, k as contractLimits, l as filterActiveSubscriptionBundles, m as filterPlannedOnlyFeatures, n as hasAnyFeature, o as hasFeature, p as mergeSubscriptionBundlesIntoLimits, t as toEffectiveLimitsSnapshot } from './aggregation-o0LMenvl.js';
 export { ENTITLEMENT_RESOLUTION_CONFIG_TOKEN, ENTITLEMENT_SERVICE_TOKEN, EntitlementModule, EntitlementModuleOptions, LimitExceededError, PLAN_VERSION_REPOSITORY_TOKEN, ReplacedByIndex, SUBSCRIPTION_REPOSITORY_TOKEN, TRANSACTION_RUNNER_TOKEN, buildReplacedByIndex, expandReplacedFeatures, isLimitExceededError } from './entitlement/index.js';
 export { E as EntitlementResolutionConfig, a as EntitlementResolutionInput, r as resolveEntitlementPlan } from './plan-resolution-CFCoUkrE.js';
 export { ADMIN_STATS_AUDIT_WINDOW_DAYS_TOKEN, AUDIT_PORT_TOKEN, AUDIT_STATS_PORT_TOKEN, AdminPublicBootController, AdminStatsController, MFA_PORT_TOKEN, PLATFORM_CORE_MANIFEST_CONTRIBUTION, PROMO_CODE_STATS_PORT_TOKEN, RLS_BYPASS_PORT_TOKEN, SUBSCRIPTION_STATS_PORT_TOKEN } from './admin/index.js';

package/dist/index.js

@@ -167,7 +167,7 @@ import {
   periodEndWithMinLead,
   resolveBundleCancelEffectiveAt,
   resolveBundlePriceNet
-} from "./chunk-F3VV6EXG.js";
+} from "./chunk-RKVY775D.js";
 import {
   PROMO_CODE_REDEMPTION_REPOSITORY_TOKEN,
   PROMO_CODE_REPOSITORY_TOKEN,
@@ -291,15 +291,18 @@ import {
   applyCustomLimits,
   buildReplacedByIndex,
   collectSubscriptionBundleFeatures,
+  contractBundleVersionIds,
+  contractLimits,
   expandReplacedFeatures,
   filterActiveSubscriptionBundles,
   filterPlannedOnlyFeatures,
   hasAnyFeature,
   hasFeature,
   isLimitExceededError,
+  mergeSubscriptionBundlesIntoLimits,
   resolveEntitlementPlan,
   toEffectiveLimitsSnapshot
-} from "./chunk-GBDUH6DO.js";
+} from "./chunk-EXOLOJFZ.js";
 import {
   PLAN_CATALOG_READ_SINK_TOKEN,
   PLAN_CATALOG_TOKEN,
@@ -595,6 +598,8 @@ export {
   computeProration,
   computeRegularStartsAt,
   computeSnapshotHash,
+  contractBundleVersionIds,
+  contractLimits,
   contractLineItemToInvoiceLineItem,
   decideRenewal,
   expandReplacedFeatures,
@@ -625,6 +630,7 @@ export {
   loadDiscoverySnapshotFromFile,
   loadPlanCatalogFromFile,
   loadPlanCatalogFromString,
+  mergeSubscriptionBundlesIntoLimits,
   periodEndAfter,
   periodEndWithMinLead,
   preflightExitCode,

package/dist/platform/index.d.cts

@@ -4,8 +4,8 @@ import { SubscriptionRepository, UsageSnapshotPort, QuotaProvider } from '@saasi
 export { A as AdminBypassRlsInterceptor, a as AdminManifestModule, b as AdminManifestModuleOptions, c as AdminManifestService, d as AdminModule, e as AdminModuleOptions, f as AdminStatsModule, g as AdminStatsModuleOptions, h as AdminStatsService, M as MfaGuard, j as MfaService, S as SuperAdminGuard } from '../admin-stats.module-v4SVvWzj.cjs';
 export { A as AdminAuditService } from '../admin-audit.service-9IqXMlZm.cjs';
 export { e as AdminResourcesService } from '../admin-resources.module-BZN_yBFj.cjs';
-export { c as EntitlementService } from '../aggregation-CfI0bOsQ.cjs';
-export { d as ComposedTenantAuthGuard, P as PendingPlanMaterializationService, h as PlanChangePreviewService, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController } from '../subscription-bundle-preview.service-BkJXHAeP.cjs';
+export { c as EntitlementService } from '../aggregation-SKfXu09x.cjs';
+export { d as ComposedTenantAuthGuard, P as PendingPlanMaterializationService, h as PlanChangePreviewService, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController } from '../subscription-bundle-preview.service-B4Ye8L2F.cjs';
 export { B as BundlesService, C as CatalogEntriesService, M as MarketingProjectionsService, b as MarketingSettingsService, P as PlanVersionsService, c as PlansService, d as PromotionsService, e as PublicMarketingCatalogService } from '../plan-versions.service-CUR2Whyr.cjs';
 export { c as DiscoveryScanner } from '../discovery.scanner-DLgEvuoy.cjs';
 export { P as PromoCodeRateLimitGuard } from '../rate-limit.guard-dntqAlfZ.cjs';

package/dist/platform/index.d.ts

@@ -4,8 +4,8 @@ import { SubscriptionRepository, UsageSnapshotPort, QuotaProvider } from '@saasi
 export { A as AdminBypassRlsInterceptor, a as AdminManifestModule, b as AdminManifestModuleOptions, c as AdminManifestService, d as AdminModule, e as AdminModuleOptions, f as AdminStatsModule, g as AdminStatsModuleOptions, h as AdminStatsService, M as MfaGuard, j as MfaService, S as SuperAdminGuard } from '../admin-stats.module-15ac5KY3.js';
 export { A as AdminAuditService } from '../admin-audit.service-9IqXMlZm.js';
 export { e as AdminResourcesService } from '../admin-resources.module-Cms8MY6h.js';
-export { c as EntitlementService } from '../aggregation-BibpEO0t.js';
-export { d as ComposedTenantAuthGuard, P as PendingPlanMaterializationService, h as PlanChangePreviewService, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController } from '../subscription-bundle-preview.service-DBbrE_cw.js';
+export { c as EntitlementService } from '../aggregation-o0LMenvl.js';
+export { d as ComposedTenantAuthGuard, P as PendingPlanMaterializationService, h as PlanChangePreviewService, r as SubscriptionBundlePreviewService, s as SubscriptionBundlesService, T as TenantAdminGuard, t as TenantBillingController } from '../subscription-bundle-preview.service-BgQ776mv.js';
 export { B as BundlesService, C as CatalogEntriesService, M as MarketingProjectionsService, b as MarketingSettingsService, P as PlanVersionsService, c as PlansService, d as PromotionsService, e as PublicMarketingCatalogService } from '../plan-versions.service-BB36Q1bg.js';
 export { c as DiscoveryScanner } from '../discovery.scanner-DLgEvuoy.js';
 export { P as PromoCodeRateLimitGuard } from '../rate-limit.guard-dntqAlfZ.js';

package/dist/platform/index.js

@@ -11,7 +11,7 @@ import {
   SubscriptionPlanResolver,
   TenantManifestService,
   buildTenantManifestController
-} from "../chunk-PUXLPUVH.js";
+} from "../chunk-I2EKGQUG.js";
 import {
   SetupModule,
   SetupService
@@ -41,7 +41,7 @@ import {
   SubscriptionBundlesService,
   TenantAdminGuard,
   TenantBillingController
-} from "../chunk-F3VV6EXG.js";
+} from "../chunk-RKVY775D.js";
 import {
   PromoCodesService
 } from "../chunk-E7AJ42AB.js";
@@ -74,7 +74,7 @@ import {
 } from "../chunk-Z3FWN3HJ.js";
 import {
   EntitlementService
-} from "../chunk-GBDUH6DO.js";
+} from "../chunk-EXOLOJFZ.js";
 import "../chunk-R2QOSVAA.js";
 import "../chunk-NYLON2VC.js";
 import "../chunk-WKVBNTYC.js";

package/dist/{subscription-bundle-preview.service-BkJXHAeP.d.cts → subscription-bundle-preview.service-B4Ye8L2F.d.cts}

@@ -1,7 +1,7 @@
 import { CanActivate, ExecutionContext } from '@nestjs/common';
 import { b as AuthGuardList, m as SelfServiceBlockedPlans, w as TrialProjectionPort, h as PendingPlanQueryPort, f as ContractFreezePort, l as SelfServiceBlockedBundles, u as TenantIdResolver, B as UserIdResolver, z as UserEmailResolver, a as AuditContextResolver } from './subscription-bundles.module-DCpV-Pb5.cjs';
 import { PlanCatalog, SubscriptionUsagePort, UsageSnapshotPort, TenantSubscriptionWritePort, SubscriptionBundleRepository, BundleRepository, SubscriptionBundleView, SubscriptionBundleRecord, SubscriptionUsageRecord, OnboardingSelectionResponse, PlanRepository, CatalogEntryRepository, BundleVersionRow } from '@saasicat/types';
-import { c as EntitlementService, a as EffectiveLimitsSnapshot, t as toEffectiveLimitsSnapshot } from './aggregation-CfI0bOsQ.cjs';
+import { c as EntitlementService, a as EffectiveLimitsSnapshot, t as toEffectiveLimitsSnapshot } from './aggregation-SKfXu09x.cjs';
 import { f as PromoCodesService } from './service-DX8KbGXl.cjs';
 import { A as AdminAuditService } from './admin-audit.service-9IqXMlZm.cjs';
 

package/dist/{subscription-bundle-preview.service-DBbrE_cw.d.ts → subscription-bundle-preview.service-BgQ776mv.d.ts}

@@ -1,7 +1,7 @@
 import { CanActivate, ExecutionContext } from '@nestjs/common';
 import { b as AuthGuardList, m as SelfServiceBlockedPlans, w as TrialProjectionPort, h as PendingPlanQueryPort, f as ContractFreezePort, l as SelfServiceBlockedBundles, u as TenantIdResolver, B as UserIdResolver, z as UserEmailResolver, a as AuditContextResolver } from './subscription-bundles.module-BQmoozm5.js';
 import { PlanCatalog, SubscriptionUsagePort, UsageSnapshotPort, TenantSubscriptionWritePort, SubscriptionBundleRepository, BundleRepository, SubscriptionBundleView, SubscriptionBundleRecord, SubscriptionUsageRecord, OnboardingSelectionResponse, PlanRepository, CatalogEntryRepository, BundleVersionRow } from '@saasicat/types';
-import { c as EntitlementService, a as EffectiveLimitsSnapshot, t as toEffectiveLimitsSnapshot } from './aggregation-BibpEO0t.js';
+import { c as EntitlementService, a as EffectiveLimitsSnapshot, t as toEffectiveLimitsSnapshot } from './aggregation-o0LMenvl.js';
 import { f as PromoCodesService } from './service-DX8KbGXl.js';
 import { A as AdminAuditService } from './admin-audit.service-9IqXMlZm.js';
 

package/dist/testing/index.js

@@ -5,10 +5,10 @@ import {
   StaticEntitlementService,
   StaticFeatureGuard,
   StaticPlanResolver
-} from "../chunk-PUXLPUVH.js";
+} from "../chunk-I2EKGQUG.js";
 import "../chunk-IRWZC3GC.js";
 import "../chunk-FVT7KTUI.js";
-import "../chunk-F3VV6EXG.js";
+import "../chunk-RKVY775D.js";
 import "../chunk-E7AJ42AB.js";
 import "../chunk-2PNX2QL2.js";
 import "../chunk-33TP26MR.js";
@@ -17,7 +17,7 @@ import "../chunk-E56W4U2P.js";
 import "../chunk-MDIZUVIK.js";
 import "../chunk-V34AA7C7.js";
 import "../chunk-Z3FWN3HJ.js";
-import "../chunk-GBDUH6DO.js";
+import "../chunk-EXOLOJFZ.js";
 import "../chunk-R2QOSVAA.js";
 import "../chunk-NYLON2VC.js";
 import "../chunk-WKVBNTYC.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasicat/nest",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "NestJS implementation of SaaSiCat: capability discovery, catalog packaging, contracts, entitlement enforcement, billing and admin APIs.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -137,8 +137,8 @@
     "js-yaml": "^4.1.0",
     "otplib": "^13.4.1",
     "qrcode": "^1.5.4",
-    "@saasicat/spec": "^0.12.1",
-    "@saasicat/types": "^0.12.1"
+    "@saasicat/spec": "^0.14.0",
+    "@saasicat/types": "^0.14.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",