atmn 2.0.132 → 2.0.133

package/dist/bin.js

@@ -4782,6 +4782,25 @@ var LINT_RULES = {
         parentIdField: "planId",
         parentLabel: "plan",
         because: "An archived feature should not gain new customers through a live plan."
+      },
+      {
+        kind: "targetForbids",
+        field: "featureId",
+        in: "features",
+        matching: "featureId",
+        target: "consumable",
+        equals: false,
+        whenEquals: {
+          "price.tierBehavior": "volume",
+          "price.billingMethod": "usage_based"
+        },
+        whenStated: [],
+        whenAnyStated: [
+          "price.tiers.0.flatAmount",
+          "price.tiers.0.additionalCurrencies.*.flatAmount"
+        ],
+        whenUnstated: [],
+        because: "A volume-tiered allocated item can't have a first-tier flatAmount: Stripe would charge it even with no seats over included. Move the fee to a later tier."
       }
     ]
   },
@@ -4959,12 +4978,14 @@ var LINT_RULES = {
     },
     rules: [
       {
-        kind: "valueWhen",
-        when: "tierBehavior",
-        equals: "volume",
-        field: "billingMethod",
-        mustBe: "prepaid",
-        because: "Volume tiers are prepaid-only."
+        kind: "refusedWhen",
+        whenEquals: {
+          tierBehavior: "volume",
+          billingMethod: "usage_based"
+        },
+        whenStated: [],
+        whenUnstated: ["tiers.1"],
+        because: "Volume-based pricing on a usage-based item needs at least two tiers. Add a tier, or use graduated pricing for a single rate."
       }
     ]
   },
@@ -6654,6 +6675,10 @@ var valueAtPath = ({
 }) => {
   let current = entry;
   for (const segment of path.split(".")) {
+    if (Array.isArray(current)) {
+      current = current[Number(segment)];
+      continue;
+    }
     if (!isEntry(current))
       return;
     current = current[segment];
@@ -6795,6 +6820,21 @@ var COMPARE = {
   ">": { holds: (a, b) => a > b, words: "greater than" },
   ">=": { holds: (a, b) => a >= b, words: "at least" }
 };
+var entryMatchesWhen = ({
+  entry,
+  rule
+}) => {
+  const isStatedValue = (value) => value !== undefined && value !== null && value !== 0 && value !== false;
+  const isStated = (path) => {
+    const [head, tail] = path.split(".*.");
+    if (tail === undefined)
+      return isStatedValue(valueAtPath({ entry, path }));
+    const list = valueAtPath({ entry, path: head });
+    return Array.isArray(list) && list.some((element) => isEntry(element) && isStatedValue(element[tail]));
+  };
+  const anyStated = "whenAnyStated" in rule && rule.whenAnyStated ? rule.whenAnyStated.some(isStated) : true;
+  return Object.entries(rule.whenEquals).every(([path, value]) => valueAtPath({ entry, path }) === value) && rule.whenStated.every(isStated) && anyStated && !rule.whenUnstated.some(isStated);
+};
 var entryRuleFailures = ({
   entry,
   rule,
@@ -6914,6 +6954,21 @@ var entryRuleFailures = ({
         `${rule.label} ${show(entry[rule.field])} is ${rule.target}. Unarchive it, or archive ${rule.parentLabel} ${show(parent?.[rule.parentIdField])}. ${rule.because}`
       ];
     }
+    case "refusedWhen":
+      return entryMatchesWhen({ entry, rule }) ? [rule.because] : [];
+    case "targetForbids": {
+      if (!entryMatchesWhen({ entry, rule }))
+        return [];
+      const target = document[rule.in];
+      if (!Array.isArray(target))
+        return [];
+      const row = target.find((candidate) => isEntry(candidate) && candidate[rule.matching] === entry[rule.field]);
+      if (!row || row[rule.target] !== rule.equals)
+        return [];
+      return [
+        `${rule.in} ${show(entry[rule.field])} has ${rule.target} ${show(rule.equals)}, so this is refused. ${rule.because}`
+      ];
+    }
     case "unique":
     case "linkedOnce":
     case "exactlyOneActive":
@@ -7641,7 +7696,7 @@ var createClient = (options) => ({
 });
 
 // src/version.ts
-var version = "2.0.132";
+var version = "2.0.133";
 
 // src/http/autumnFetch.ts
 var runtime = typeof Bun !== "undefined" ? `bun ${Bun.version}` : `node ${process.versions.node}`;
@@ -10305,7 +10360,7 @@ Billing controls follow the same rule: \`·\` lines under the item they guard, i
 - A prepaid quantity **includes** the included amount, and so does each tier's \`to\` — the first tier's \`to\` must exceed \`included\`.
 - \`billingUnits\` rounds usage **up** when billing.
 - Set explicitly, never lean on defaults: \`billingMethod\` and \`interval\` on every item price, \`tierBehavior\` on tiered prices, and every trial field (\`durationLength\`, \`durationType\`, \`cardRequired\`, \`onEnd\`). Explicit defaults cause no spurious diffs.
-- Volume tiers charge the flat amount of the reached tier and are prepaid-only; graduated (the default) sums across brackets.
+- Volume tiers on usage-based items bill only usage past the included amount, at the rate of the tier total usage reaches, plus its flat fee. On prepaid items they charge every unit (included ones too) at the reached tier's rate and flat amount. Graduated (the default) sums across brackets. Volume can't be combined with threshold billing, and allocated volume can't have a tier-1 flat amount.
 - Rollover needs a resetting allowance; \`max\` and \`maxPercentage\` are mutually exclusive; \`expiryDurationType\` is required.
 - \`billingControls\` is a plain object on the plan with camelCase fields like the rest of the config (\`featureId\`, \`overageLimit\`); each control list replaces wholesale on update.
 - Plan \`config\` (\`ignorePastDue\`, \`anchorToMonthStart\`) is unmanaged when omitted. Once stated it is the whole set: a flag left out is off, so \`config: {}\` turns every flag off.
@@ -10879,7 +10934,9 @@ Autumn:
 2. Finds the tier the total falls into
 3. Charges the flat amount for that tier
 
-Volume tiers are prepaid-only.
+Volume tiers work on prepaid and usage-based (pay-per-use or allocated) items. On usage-based items, volume bills only usage past the included amount, at the rate of the tier total usage reaches, plus its flat fee; at or below the included amount nothing is charged. On prepaid items, every unit (the included ones too) is charged at the rate of the tier the total lands in, plus its flat amount. Allocated items can't have a flat amount on the first tier. A plan with volume-priced allocated seats can't yet be attached to more than one entity on the same customer, because their seats would share one Stripe price.
+
+Volume tiers can't be combined with threshold billing.
 
 | Total volume | Matching tier | Charge |
 |-------------|---------------|--------|
@@ -23426,8 +23483,10 @@ var formatInterval = (interval, count) => {
 var formatPrice = (price) => {
   if (price === null || price === undefined)
     return "Free";
-  if (price.tiers !== undefined && price.tiers.length > 0)
-    return `${price.tiers.length} tiers ${formatInterval(price.interval, price.intervalCount)}`;
+  if (price.tiers !== undefined && price.tiers.length > 0) {
+    const behavior = price.tierBehavior ? `${price.tierBehavior} ` : "";
+    return `${price.tiers.length} ${behavior}tiers ${formatInterval(price.interval, price.intervalCount)}`;
+  }
   return `${formatMoney(price.amount ?? 0)} ${formatInterval(price.interval, price.intervalCount)}`;
 };
 var formatItem = (item) => {

package/dist/index.js

@@ -451,6 +451,25 @@ var LINT_RULES = {
         parentIdField: "planId",
         parentLabel: "plan",
         because: "An archived feature should not gain new customers through a live plan."
+      },
+      {
+        kind: "targetForbids",
+        field: "featureId",
+        in: "features",
+        matching: "featureId",
+        target: "consumable",
+        equals: false,
+        whenEquals: {
+          "price.tierBehavior": "volume",
+          "price.billingMethod": "usage_based"
+        },
+        whenStated: [],
+        whenAnyStated: [
+          "price.tiers.0.flatAmount",
+          "price.tiers.0.additionalCurrencies.*.flatAmount"
+        ],
+        whenUnstated: [],
+        because: "A volume-tiered allocated item can't have a first-tier flatAmount: Stripe would charge it even with no seats over included. Move the fee to a later tier."
       }
     ]
   },
@@ -628,12 +647,14 @@ var LINT_RULES = {
     },
     rules: [
       {
-        kind: "valueWhen",
-        when: "tierBehavior",
-        equals: "volume",
-        field: "billingMethod",
-        mustBe: "prepaid",
-        because: "Volume tiers are prepaid-only."
+        kind: "refusedWhen",
+        whenEquals: {
+          tierBehavior: "volume",
+          billingMethod: "usage_based"
+        },
+        whenStated: [],
+        whenUnstated: ["tiers.1"],
+        because: "Volume-based pricing on a usage-based item needs at least two tiers. Add a tier, or use graduated pricing for a single rate."
       }
     ]
   },
@@ -2323,6 +2344,10 @@ var valueAtPath = ({
 }) => {
   let current = entry;
   for (const segment of path.split(".")) {
+    if (Array.isArray(current)) {
+      current = current[Number(segment)];
+      continue;
+    }
     if (!isEntry(current))
       return;
     current = current[segment];
@@ -2464,6 +2489,21 @@ var COMPARE = {
   ">": { holds: (a, b) => a > b, words: "greater than" },
   ">=": { holds: (a, b) => a >= b, words: "at least" }
 };
+var entryMatchesWhen = ({
+  entry,
+  rule
+}) => {
+  const isStatedValue = (value) => value !== undefined && value !== null && value !== 0 && value !== false;
+  const isStated = (path) => {
+    const [head, tail] = path.split(".*.");
+    if (tail === undefined)
+      return isStatedValue(valueAtPath({ entry, path }));
+    const list = valueAtPath({ entry, path: head });
+    return Array.isArray(list) && list.some((element) => isEntry(element) && isStatedValue(element[tail]));
+  };
+  const anyStated = "whenAnyStated" in rule && rule.whenAnyStated ? rule.whenAnyStated.some(isStated) : true;
+  return Object.entries(rule.whenEquals).every(([path, value]) => valueAtPath({ entry, path }) === value) && rule.whenStated.every(isStated) && anyStated && !rule.whenUnstated.some(isStated);
+};
 var entryRuleFailures = ({
   entry,
   rule,
@@ -2583,6 +2623,21 @@ var entryRuleFailures = ({
         `${rule.label} ${show(entry[rule.field])} is ${rule.target}. Unarchive it, or archive ${rule.parentLabel} ${show(parent?.[rule.parentIdField])}. ${rule.because}`
       ];
     }
+    case "refusedWhen":
+      return entryMatchesWhen({ entry, rule }) ? [rule.because] : [];
+    case "targetForbids": {
+      if (!entryMatchesWhen({ entry, rule }))
+        return [];
+      const target = document[rule.in];
+      if (!Array.isArray(target))
+        return [];
+      const row = target.find((candidate) => isEntry(candidate) && candidate[rule.matching] === entry[rule.field]);
+      if (!row || row[rule.target] !== rule.equals)
+        return [];
+      return [
+        `${rule.in} ${show(entry[rule.field])} has ${rule.target} ${show(rule.equals)}, so this is refused. ${rule.because}`
+      ];
+    }
     case "unique":
     case "linkedOnce":
     case "exactlyOneActive":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmn",
-  "version": "2.0.132",
+  "version": "2.0.133",
   "license": "MIT",
   "description": "The CLI for Autumn — define your pricing in code, sync it to Autumn, and keep everything in version control.",
   "bin": {
@@ -49,5 +49,5 @@
     "open": "10.2.0",
     "yaml": "2.9.0"
   },
-  "gitHead": "8076bc8446a24f08aed613ec1010d22cb044e543"
+  "gitHead": "18bcf1751d169fd7dae4c28638db67093a6c0687"
 }