@drawbridge/drawbridge-utils 0.0.93 → 0.0.95

package/dist/plans.cjs

@@ -31,7 +31,8 @@ var plans_exports = {};
 __export(plans_exports, {
   conversionRate: () => conversionRate,
   free: () => free,
-  plans: () => plans
+  plans: () => plans,
+  resolvePlan: () => resolvePlan
 });
 module.exports = __toCommonJS(plans_exports);
 
@@ -420,70 +421,33 @@ var plans = {
     overages: { actions: "1.5" },
     title: "Elite",
     conversion: 0.5
-  },
-  // Negotiated tier. Unlike the four sellable plans it has NO catalog price:
-  // each enterprise subscription bills from its own Stripe price, minted
-  // under STRIPE_PRODUCT_ENTERPRISE and recorded on items.plan.price.
-  //
-  // That absent price is the whole marker — this entry carries no flag of its
-  // own, deliberately. A plan with no stripePriceId cannot be sold self-serve
-  // because subscribe and change would hand Stripe `price : undefined`, so
-  // "is it selectable" reads straight off the thing that makes it true. Two
-  // flags were considered and dropped: `status : drafted | published` (it
-  // collides with subscription.status and organization.status, which extend.js
-  // attaches to the same payload) and `type : default | custom` (its one real
-  // job — catching a sellable plan whose STRIPE_PRICE_* env went missing — is
-  // already done by assertEnv at api boot). Negotiated-ness is recorded where
-  // it actually varies: subscription.type on the document, set by the admin.
-  //
-  // Every value below is a FALLBACK, not the deal. Real allowances come from
-  // subscription.overrides per customer. They deliberately mirror Elite
-  // rather than being infinite or zero: a half-configured enterprise
-  // subscription then degrades to the best sellable tier — a known-good,
-  // billable state — instead of billing nothing or granting everything.
-  //
-  // Placed LAST so the array-position direction logic in drawbridge-api
-  // (organization-subscription.js `plans.findIndex`) reads a move onto
-  // enterprise as an upgrade and a move off it as a downgrade.
-  DBENTERPRISE: {
-    features: all.features([
-      organization.advertisements.key,
-      organization.analytics.key,
-      organization.members.key,
-      organization.subdomain.key,
-      page.slug.key
-    ]),
-    limits: all.limits({ actions: 1e5, members: infinite, storage: gigabyte * 100 }),
-    marketing: {
-      description: "Negotiated terms tailored to your organization.",
-      features: [
-        "Analytics",
-        "Custom subdomain / URLs",
-        "Confirmation page ads",
-        "Negotiated pricing and limits"
-      ],
-      limits: [
-        ["Actions per month", "Custom"],
-        ["Affiliates", "Unlimited"],
-        ["Brands", "Unlimited"],
-        ["Campaigns", "Unlimited"],
-        ["Pages", "Unlimited"],
-        ["Members", "Custom"],
-        ["Storage", "Custom"]
-      ]
-    },
-    overages: { actions: "1.5" },
-    title: "Enterprise",
-    conversion: 0.5
   }
 };
-var conversionRate = (subscription) => {
+var resolvePlan = (subscription) => {
   var _a, _b;
-  return ((_a = subscription == null ? void 0 : subscription.overrides) == null ? void 0 : _a.conversion) ?? (subscription == null ? void 0 : subscription.conversion) ?? ((_b = plans[subscription == null ? void 0 : subscription.plan]) == null ? void 0 : _b.conversion) ?? free.conversion;
+  const custom = subscription == null ? void 0 : subscription.custom;
+  if (!custom) return plans[subscription == null ? void 0 : subscription.plan] ?? free;
+  return {
+    // Reusing all.features / all.limits is what keeps a custom plan the same
+    // SHAPE as a catalog one: the base feature grants every plan carries, the
+    // campaign limits that are always infinite, and members defaulting to
+    // infinite when a deal does not name it.
+    conversion: custom.conversion ?? free.conversion,
+    custom: true,
+    features: all.features(((_a = custom.features) == null ? void 0 : _a.granted) || []),
+    limits: all.limits(((_b = custom.limits) == null ? void 0 : _b.organization) || {}),
+    overages: { actions: custom.overages },
+    title: custom.title || "Custom"
+  };
+};
+var conversionRate = (subscription) => {
+  var _a;
+  return ((_a = resolvePlan(subscription)) == null ? void 0 : _a.conversion) ?? free.conversion;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   conversionRate,
   free,
-  plans
+  plans,
+  resolvePlan
 });

package/dist/plans.d.cts

@@ -194,73 +194,51 @@ const plans = {
 		conversion : 0.5
 	},
 
-	// Negotiated tier. Unlike the four sellable plans it has NO catalog price:
-	// each enterprise subscription bills from its own Stripe price, minted
-	// under STRIPE_PRODUCT_ENTERPRISE and recorded on items.plan.price.
-	//
-	// That absent price is the whole marker — this entry carries no flag of its
-	// own, deliberately. A plan with no stripePriceId cannot be sold self-serve
-	// because subscribe and change would hand Stripe `price : undefined`, so
-	// "is it selectable" reads straight off the thing that makes it true. Two
-	// flags were considered and dropped: `status : drafted | published` (it
-	// collides with subscription.status and organization.status, which extend.js
-	// attaches to the same payload) and `type : default | custom` (its one real
-	// job — catching a sellable plan whose STRIPE_PRICE_* env went missing — is
-	// already done by assertEnv at api boot). Negotiated-ness is recorded where
-	// it actually varies: subscription.type on the document, set by the admin.
-	//
-	// Every value below is a FALLBACK, not the deal. Real allowances come from
-	// subscription.overrides per customer. They deliberately mirror Elite
-	// rather than being infinite or zero: a half-configured enterprise
-	// subscription then degrades to the best sellable tier — a known-good,
-	// billable state — instead of billing nothing or granting everything.
-	//
-	// Placed LAST so the array-position direction logic in drawbridge-api
-	// (organization-subscription.js `plans.findIndex`) reads a move onto
-	// enterprise as an upgrade and a move off it as a downgrade.
-	DBENTERPRISE : {
-		features : all.features([
-			organization.advertisements.key,
-			organization.analytics.key,
-			organization.members.key,
-			organization.subdomain.key,
-			page.slug.key
-		]),
-		limits : all.limits({ actions : 100000, members : infinite, storage : gigabyte * 100 }),
-		marketing : {
-			description : 'Negotiated terms tailored to your organization.',
-			features : [
-				'Analytics',
-				'Custom subdomain / URLs',
-				'Confirmation page ads',
-				'Negotiated pricing and limits'
-			],
-			limits : [
-				[ 'Actions per month', 'Custom' ],
-				[ 'Affiliates', 'Unlimited' ],
-				[ 'Brands', 'Unlimited' ],
-				[ 'Campaigns', 'Unlimited' ],
-				[ 'Pages', 'Unlimited' ],
-				[ 'Members', 'Custom' ],
-				[ 'Storage', 'Custom' ]
-			]
-		},
-		overages : { actions : '1.5' },
-		title : 'Enterprise',
-		conversion : 0.5
-	}
+};
+
+// The effective plan for a subscription.
+//
+// A CUSTOM plan is not in this catalog and never will be: it belongs to one
+// organization, so it is stored on that organization's subscription and is
+// self-describing. Everything a plan needs is built here from what it carries,
+// which is why `subscription.plan` is empty for one.
+//
+// This is the single resolver. drawbridge-api mirrors it as an aggregation
+// expression for the organization payload, and drawbridge-sync calls it
+// directly on raw documents — sync never touches extend, so without this it
+// would resolve `plans[ null ]`, bill every custom-plan cycle at $0 and charge
+// the free 3% conversion rate. A parity test pins the two expressions together.
+const resolvePlan = ( subscription ) => {
+
+	const custom = subscription?.custom;
+
+	if( ! custom ) return plans[ subscription?.plan ] ?? free;
+
+	return {
+		// Reusing all.features / all.limits is what keeps a custom plan the same
+		// SHAPE as a catalog one: the base feature grants every plan carries, the
+		// campaign limits that are always infinite, and members defaulting to
+		// infinite when a deal does not name it.
+		conversion : custom.conversion ?? free.conversion,
+		custom : true,
+		features : all.features( custom.features?.granted || [] ),
+		limits : all.limits( custom.limits?.organization || {} ),
+		overages : { actions : custom.overages },
+		title : custom.title || 'Custom'
+	};
+
 };
 
 // Resolve the conversion-fee percentage for an order's owning org.
-// Precedence: explicit per-subscription override (admin/negotiated) in
-// subscription.overrides → the legacy top-level field (pre-migration docs;
-// remove after the overrides cleanup release) → the plan's catalog default →
-// the free-org rate. `??` throughout — a stored 0 is a valid 0% override.
-// `subscription` is null for free orgs (they have no subscription doc).
+//
+// The plan is the only source. A negotiated rate is not a per-subscription
+// override any more — it is a custom plan, and `resolvePlan` reads that from
+// `subscription.custom.conversion`. The catalog answers for everyone else.
+//
+// `??` not `||`, because a plan's 0 is a valid 0% rate. `subscription` is null
+// for free orgs (they have no subscription document).
 const conversionRate = ( subscription ) =>
-	subscription?.overrides?.conversion
-	?? subscription?.conversion
-	?? plans[ subscription?.plan ]?.conversion
+	resolvePlan( subscription )?.conversion
 	?? free.conversion;
 
-export { conversionRate, free, plans };
+export { conversionRate, free, plans, resolvePlan };

package/dist/plans.d.ts

@@ -194,73 +194,51 @@ const plans = {
 		conversion : 0.5
 	},
 
-	// Negotiated tier. Unlike the four sellable plans it has NO catalog price:
-	// each enterprise subscription bills from its own Stripe price, minted
-	// under STRIPE_PRODUCT_ENTERPRISE and recorded on items.plan.price.
-	//
-	// That absent price is the whole marker — this entry carries no flag of its
-	// own, deliberately. A plan with no stripePriceId cannot be sold self-serve
-	// because subscribe and change would hand Stripe `price : undefined`, so
-	// "is it selectable" reads straight off the thing that makes it true. Two
-	// flags were considered and dropped: `status : drafted | published` (it
-	// collides with subscription.status and organization.status, which extend.js
-	// attaches to the same payload) and `type : default | custom` (its one real
-	// job — catching a sellable plan whose STRIPE_PRICE_* env went missing — is
-	// already done by assertEnv at api boot). Negotiated-ness is recorded where
-	// it actually varies: subscription.type on the document, set by the admin.
-	//
-	// Every value below is a FALLBACK, not the deal. Real allowances come from
-	// subscription.overrides per customer. They deliberately mirror Elite
-	// rather than being infinite or zero: a half-configured enterprise
-	// subscription then degrades to the best sellable tier — a known-good,
-	// billable state — instead of billing nothing or granting everything.
-	//
-	// Placed LAST so the array-position direction logic in drawbridge-api
-	// (organization-subscription.js `plans.findIndex`) reads a move onto
-	// enterprise as an upgrade and a move off it as a downgrade.
-	DBENTERPRISE : {
-		features : all.features([
-			organization.advertisements.key,
-			organization.analytics.key,
-			organization.members.key,
-			organization.subdomain.key,
-			page.slug.key
-		]),
-		limits : all.limits({ actions : 100000, members : infinite, storage : gigabyte * 100 }),
-		marketing : {
-			description : 'Negotiated terms tailored to your organization.',
-			features : [
-				'Analytics',
-				'Custom subdomain / URLs',
-				'Confirmation page ads',
-				'Negotiated pricing and limits'
-			],
-			limits : [
-				[ 'Actions per month', 'Custom' ],
-				[ 'Affiliates', 'Unlimited' ],
-				[ 'Brands', 'Unlimited' ],
-				[ 'Campaigns', 'Unlimited' ],
-				[ 'Pages', 'Unlimited' ],
-				[ 'Members', 'Custom' ],
-				[ 'Storage', 'Custom' ]
-			]
-		},
-		overages : { actions : '1.5' },
-		title : 'Enterprise',
-		conversion : 0.5
-	}
+};
+
+// The effective plan for a subscription.
+//
+// A CUSTOM plan is not in this catalog and never will be: it belongs to one
+// organization, so it is stored on that organization's subscription and is
+// self-describing. Everything a plan needs is built here from what it carries,
+// which is why `subscription.plan` is empty for one.
+//
+// This is the single resolver. drawbridge-api mirrors it as an aggregation
+// expression for the organization payload, and drawbridge-sync calls it
+// directly on raw documents — sync never touches extend, so without this it
+// would resolve `plans[ null ]`, bill every custom-plan cycle at $0 and charge
+// the free 3% conversion rate. A parity test pins the two expressions together.
+const resolvePlan = ( subscription ) => {
+
+	const custom = subscription?.custom;
+
+	if( ! custom ) return plans[ subscription?.plan ] ?? free;
+
+	return {
+		// Reusing all.features / all.limits is what keeps a custom plan the same
+		// SHAPE as a catalog one: the base feature grants every plan carries, the
+		// campaign limits that are always infinite, and members defaulting to
+		// infinite when a deal does not name it.
+		conversion : custom.conversion ?? free.conversion,
+		custom : true,
+		features : all.features( custom.features?.granted || [] ),
+		limits : all.limits( custom.limits?.organization || {} ),
+		overages : { actions : custom.overages },
+		title : custom.title || 'Custom'
+	};
+
 };
 
 // Resolve the conversion-fee percentage for an order's owning org.
-// Precedence: explicit per-subscription override (admin/negotiated) in
-// subscription.overrides → the legacy top-level field (pre-migration docs;
-// remove after the overrides cleanup release) → the plan's catalog default →
-// the free-org rate. `??` throughout — a stored 0 is a valid 0% override.
-// `subscription` is null for free orgs (they have no subscription doc).
+//
+// The plan is the only source. A negotiated rate is not a per-subscription
+// override any more — it is a custom plan, and `resolvePlan` reads that from
+// `subscription.custom.conversion`. The catalog answers for everyone else.
+//
+// `??` not `||`, because a plan's 0 is a valid 0% rate. `subscription` is null
+// for free orgs (they have no subscription document).
 const conversionRate = ( subscription ) =>
-	subscription?.overrides?.conversion
-	?? subscription?.conversion
-	?? plans[ subscription?.plan ]?.conversion
+	resolvePlan( subscription )?.conversion
 	?? free.conversion;
 
-export { conversionRate, free, plans };
+export { conversionRate, free, plans, resolvePlan };

package/dist/plans.js

@@ -383,69 +383,32 @@ var plans = {
     overages: { actions: "1.5" },
     title: "Elite",
     conversion: 0.5
-  },
-  // Negotiated tier. Unlike the four sellable plans it has NO catalog price:
-  // each enterprise subscription bills from its own Stripe price, minted
-  // under STRIPE_PRODUCT_ENTERPRISE and recorded on items.plan.price.
-  //
-  // That absent price is the whole marker — this entry carries no flag of its
-  // own, deliberately. A plan with no stripePriceId cannot be sold self-serve
-  // because subscribe and change would hand Stripe `price : undefined`, so
-  // "is it selectable" reads straight off the thing that makes it true. Two
-  // flags were considered and dropped: `status : drafted | published` (it
-  // collides with subscription.status and organization.status, which extend.js
-  // attaches to the same payload) and `type : default | custom` (its one real
-  // job — catching a sellable plan whose STRIPE_PRICE_* env went missing — is
-  // already done by assertEnv at api boot). Negotiated-ness is recorded where
-  // it actually varies: subscription.type on the document, set by the admin.
-  //
-  // Every value below is a FALLBACK, not the deal. Real allowances come from
-  // subscription.overrides per customer. They deliberately mirror Elite
-  // rather than being infinite or zero: a half-configured enterprise
-  // subscription then degrades to the best sellable tier — a known-good,
-  // billable state — instead of billing nothing or granting everything.
-  //
-  // Placed LAST so the array-position direction logic in drawbridge-api
-  // (organization-subscription.js `plans.findIndex`) reads a move onto
-  // enterprise as an upgrade and a move off it as a downgrade.
-  DBENTERPRISE: {
-    features: all.features([
-      organization.advertisements.key,
-      organization.analytics.key,
-      organization.members.key,
-      organization.subdomain.key,
-      page.slug.key
-    ]),
-    limits: all.limits({ actions: 1e5, members: infinite, storage: gigabyte * 100 }),
-    marketing: {
-      description: "Negotiated terms tailored to your organization.",
-      features: [
-        "Analytics",
-        "Custom subdomain / URLs",
-        "Confirmation page ads",
-        "Negotiated pricing and limits"
-      ],
-      limits: [
-        ["Actions per month", "Custom"],
-        ["Affiliates", "Unlimited"],
-        ["Brands", "Unlimited"],
-        ["Campaigns", "Unlimited"],
-        ["Pages", "Unlimited"],
-        ["Members", "Custom"],
-        ["Storage", "Custom"]
-      ]
-    },
-    overages: { actions: "1.5" },
-    title: "Enterprise",
-    conversion: 0.5
   }
 };
-var conversionRate = (subscription) => {
+var resolvePlan = (subscription) => {
   var _a, _b;
-  return ((_a = subscription == null ? void 0 : subscription.overrides) == null ? void 0 : _a.conversion) ?? (subscription == null ? void 0 : subscription.conversion) ?? ((_b = plans[subscription == null ? void 0 : subscription.plan]) == null ? void 0 : _b.conversion) ?? free.conversion;
+  const custom = subscription == null ? void 0 : subscription.custom;
+  if (!custom) return plans[subscription == null ? void 0 : subscription.plan] ?? free;
+  return {
+    // Reusing all.features / all.limits is what keeps a custom plan the same
+    // SHAPE as a catalog one: the base feature grants every plan carries, the
+    // campaign limits that are always infinite, and members defaulting to
+    // infinite when a deal does not name it.
+    conversion: custom.conversion ?? free.conversion,
+    custom: true,
+    features: all.features(((_a = custom.features) == null ? void 0 : _a.granted) || []),
+    limits: all.limits(((_b = custom.limits) == null ? void 0 : _b.organization) || {}),
+    overages: { actions: custom.overages },
+    title: custom.title || "Custom"
+  };
+};
+var conversionRate = (subscription) => {
+  var _a;
+  return ((_a = resolvePlan(subscription)) == null ? void 0 : _a.conversion) ?? free.conversion;
 };
 export {
   conversionRate,
   free,
-  plans
+  plans,
+  resolvePlan
 };

package/package.json

@@ -169,5 +169,5 @@
     "test": ". \"$HOME/.nvm/nvm.sh\" && nvm use && node --test"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.93"
+  "version": "0.0.95"
 }