@drawbridge/drawbridge-utils 0.0.94 → 0.0.96

package/dist/plans.cjs

@@ -284,7 +284,16 @@ var all = {
     page.shortcode.key,
     ...array
   ]),
-  limits: ({ actions, members = infinite, storage }) => ({
+  // `members` and `storage` default to infinite so an unnamed term on a custom
+  // plan reads as UNLIMITED rather than absent. Storage used to have no
+  // default, so a deal that did not name it resolved to undefined and the
+  // organization's usage card simply omitted the row — the same blank field
+  // that showed "Unlimited" for members showed nothing at all for storage.
+  // Every catalog plan names both, so the defaults only ever apply to a
+  // custom plan. `actions` has no default on purpose: an unnamed allowance
+  // bills nothing, which is why the availability switch refuses to flip
+  // without one.
+  limits: ({ actions, members = infinite, storage = infinite }) => ({
     campaign: {
       advertisements: infinite,
       links: infinite,
@@ -441,8 +450,8 @@ var resolvePlan = (subscription) => {
   };
 };
 var conversionRate = (subscription) => {
-  var _a, _b;
-  return ((_a = subscription == null ? void 0 : subscription.overrides) == null ? void 0 : _a.conversion) ?? (subscription == null ? void 0 : subscription.conversion) ?? ((_b = resolvePlan(subscription)) == null ? void 0 : _b.conversion) ?? free.conversion;
+  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 = {

package/dist/plans.d.cts

@@ -53,7 +53,16 @@ const all = {
 		page.shortcode.key,
 		...array
 	]),
-	limits : ({ actions, members = infinite, storage }) => ({
+	// `members` and `storage` default to infinite so an unnamed term on a custom
+	// plan reads as UNLIMITED rather than absent. Storage used to have no
+	// default, so a deal that did not name it resolved to undefined and the
+	// organization's usage card simply omitted the row — the same blank field
+	// that showed "Unlimited" for members showed nothing at all for storage.
+	// Every catalog plan names both, so the defaults only ever apply to a
+	// custom plan. `actions` has no default on purpose: an unnamed allowance
+	// bills nothing, which is why the availability switch refuses to flip
+	// without one.
+	limits : ({ actions, members = infinite, storage = infinite }) => ({
 		campaign : {
 			advertisements : infinite,
 			links : infinite,
@@ -230,15 +239,15 @@ const resolvePlan = ( subscription ) => {
 };
 
 // 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
-	?? resolvePlan( subscription )?.conversion
+	resolvePlan( subscription )?.conversion
 	?? free.conversion;
 
 export { conversionRate, free, plans, resolvePlan };

package/dist/plans.d.ts

@@ -53,7 +53,16 @@ const all = {
 		page.shortcode.key,
 		...array
 	]),
-	limits : ({ actions, members = infinite, storage }) => ({
+	// `members` and `storage` default to infinite so an unnamed term on a custom
+	// plan reads as UNLIMITED rather than absent. Storage used to have no
+	// default, so a deal that did not name it resolved to undefined and the
+	// organization's usage card simply omitted the row — the same blank field
+	// that showed "Unlimited" for members showed nothing at all for storage.
+	// Every catalog plan names both, so the defaults only ever apply to a
+	// custom plan. `actions` has no default on purpose: an unnamed allowance
+	// bills nothing, which is why the availability switch refuses to flip
+	// without one.
+	limits : ({ actions, members = infinite, storage = infinite }) => ({
 		campaign : {
 			advertisements : infinite,
 			links : infinite,
@@ -230,15 +239,15 @@ const resolvePlan = ( subscription ) => {
 };
 
 // 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
-	?? resolvePlan( subscription )?.conversion
+	resolvePlan( subscription )?.conversion
 	?? free.conversion;
 
 export { conversionRate, free, plans, resolvePlan };

package/dist/plans.js

@@ -246,7 +246,16 @@ var all = {
     page.shortcode.key,
     ...array
   ]),
-  limits: ({ actions, members = infinite, storage }) => ({
+  // `members` and `storage` default to infinite so an unnamed term on a custom
+  // plan reads as UNLIMITED rather than absent. Storage used to have no
+  // default, so a deal that did not name it resolved to undefined and the
+  // organization's usage card simply omitted the row — the same blank field
+  // that showed "Unlimited" for members showed nothing at all for storage.
+  // Every catalog plan names both, so the defaults only ever apply to a
+  // custom plan. `actions` has no default on purpose: an unnamed allowance
+  // bills nothing, which is why the availability switch refuses to flip
+  // without one.
+  limits: ({ actions, members = infinite, storage = infinite }) => ({
     campaign: {
       advertisements: infinite,
       links: infinite,
@@ -403,8 +412,8 @@ var resolvePlan = (subscription) => {
   };
 };
 var conversionRate = (subscription) => {
-  var _a, _b;
-  return ((_a = subscription == null ? void 0 : subscription.overrides) == null ? void 0 : _a.conversion) ?? (subscription == null ? void 0 : subscription.conversion) ?? ((_b = resolvePlan(subscription)) == null ? void 0 : _b.conversion) ?? free.conversion;
+  var _a;
+  return ((_a = resolvePlan(subscription)) == null ? void 0 : _a.conversion) ?? free.conversion;
 };
 export {
   conversionRate,

package/package.json

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