@odla-ai/chapter 0.30.0 → 0.31.0

package/dist/worker/index.d.cts

@@ -1,6 +1,24 @@
-import { CrmConfig, Crm } from '@odla-ai/crm';
+import { CrmConfig, Crm, FieldConditions } from '@odla-ai/crm';
 import { initAdmin } from '@odla-ai/db';
 
+/**
+ * A tier as declared in `defineChapter`, before it becomes a row.
+ *
+ * `groupId` is absent here because the chapter owns exactly one group at seed
+ * time; the seeder fills it in.
+ */
+interface ChapterTierConfig {
+    id: string;
+    name: string;
+    priceCents: number;
+    stripePriceId?: string;
+    blurb?: string;
+    /** Defaults to declaration order when omitted. */
+    sortOrder?: number;
+    /** Defaults to true; set false to retire a tier without deleting it. */
+    active?: boolean;
+}
+
 type TextFields$1<Key extends string> = {
     [Field in Key]: string;
 };
@@ -147,6 +165,30 @@ interface ResolvedNetwork {
     readers: readonly ResolvedNetworkReader[];
 }
 
+/**
+ * Membership pricing for the group row (chapter mode).
+ *
+ * This is the single-price model that predates tiers. It still seeds the group
+ * row and remains the fallback a chapter reads when it declares no tiers, so
+ * existing chapters keep working; new work should prefer `tiers`.
+ */
+interface ChapterPrices {
+    standardCents: number;
+    foundingDiscountCents?: number;
+    /** ISO currency, default "usd". */
+    currency?: string;
+    /** Billing interval, default "year". */
+    interval?: "year" | "month";
+}
+/** Membership policy + compliance copy stored on the group row. */
+interface ChapterPolicy {
+    disclaimerText?: string;
+    refundPolicyText?: string;
+    trustCopy?: string;
+    commitmentText?: string;
+    normsText?: string;
+}
+
 /** Which feature profile a site runs. `chapter` is the full public member site
  * (join, Stripe membership, booking, member area, admin, CRM); `hub` is
  * admin-only and CRM-focused (a directory/registry over the same CRM). */
@@ -252,23 +294,7 @@ interface ChapterBrand {
     }>>;
     logos?: string;
 }
-/** Membership pricing for the group row (chapter mode). */
-interface ChapterPrices {
-    standardCents: number;
-    foundingDiscountCents?: number;
-    /** ISO currency, default "usd". */
-    currency?: string;
-    /** Billing interval, default "year". */
-    interval?: "year" | "month";
-}
-/** Membership policy + compliance copy stored on the group row. */
-interface ChapterPolicy {
-    disclaimerText?: string;
-    refundPolicyText?: string;
-    trustCopy?: string;
-    commitmentText?: string;
-    normsText?: string;
-}
+
 /** One owner-editable transactional email template. */
 interface EmailTemplate {
     subject: string;
@@ -350,6 +376,11 @@ interface ResolvedPipeline {
 interface ChapterApplication {
     required?: readonly string[];
     optional?: readonly string[];
+    /** Per-field CEL conditions — show a field, or demand it, based on the
+     *  answers so far. Enforced server-side as well as rendered, so a hidden
+     *  field is never demanded and a conditionally-required one cannot be
+     *  skipped by posting directly. Validated when the chapter is defined. */
+    conditions?: Record<string, FieldConditions>;
     /** Per-field character cap. Fields not listed use `defaultMaxLen`. */
     maxLen?: Record<string, number>;
     defaultMaxLen?: number;
@@ -390,6 +421,8 @@ interface ResolvedApplication {
     crmFields: readonly string[];
     maxArrayLen: number;
     validateEmail: boolean;
+    /** Resolved per-field conditions. Empty means every field is unconditional. */
+    conditions: Record<string, FieldConditions>;
 }
 /** The `defineChapter()` config a site fills in. */
 interface ChapterConfig {
@@ -411,8 +444,10 @@ interface ChapterConfig {
     /** Enable a public, host-rendered formation application workflow. */
     formation?: LeaderFormationConfig;
     thesis?: unknown;
-    /** Required in `chapter` mode. */
+    /** Required in `chapter` mode, and the fallback when `tiers` is empty. */
     prices?: ChapterPrices;
+    /** Membership tiers. A tier priced at 0 is free and never touches Stripe. */
+    tiers?: ChapterTierConfig[];
     policy?: ChapterPolicy;
     /** `notificationEmail` required in `chapter` mode. */
     emails?: ChapterEmails;

package/dist/worker/index.d.ts

@@ -1,6 +1,24 @@
-import { CrmConfig, Crm } from '@odla-ai/crm';
+import { CrmConfig, Crm, FieldConditions } from '@odla-ai/crm';
 import { initAdmin } from '@odla-ai/db';
 
+/**
+ * A tier as declared in `defineChapter`, before it becomes a row.
+ *
+ * `groupId` is absent here because the chapter owns exactly one group at seed
+ * time; the seeder fills it in.
+ */
+interface ChapterTierConfig {
+    id: string;
+    name: string;
+    priceCents: number;
+    stripePriceId?: string;
+    blurb?: string;
+    /** Defaults to declaration order when omitted. */
+    sortOrder?: number;
+    /** Defaults to true; set false to retire a tier without deleting it. */
+    active?: boolean;
+}
+
 type TextFields$1<Key extends string> = {
     [Field in Key]: string;
 };
@@ -147,6 +165,30 @@ interface ResolvedNetwork {
     readers: readonly ResolvedNetworkReader[];
 }
 
+/**
+ * Membership pricing for the group row (chapter mode).
+ *
+ * This is the single-price model that predates tiers. It still seeds the group
+ * row and remains the fallback a chapter reads when it declares no tiers, so
+ * existing chapters keep working; new work should prefer `tiers`.
+ */
+interface ChapterPrices {
+    standardCents: number;
+    foundingDiscountCents?: number;
+    /** ISO currency, default "usd". */
+    currency?: string;
+    /** Billing interval, default "year". */
+    interval?: "year" | "month";
+}
+/** Membership policy + compliance copy stored on the group row. */
+interface ChapterPolicy {
+    disclaimerText?: string;
+    refundPolicyText?: string;
+    trustCopy?: string;
+    commitmentText?: string;
+    normsText?: string;
+}
+
 /** Which feature profile a site runs. `chapter` is the full public member site
  * (join, Stripe membership, booking, member area, admin, CRM); `hub` is
  * admin-only and CRM-focused (a directory/registry over the same CRM). */
@@ -252,23 +294,7 @@ interface ChapterBrand {
     }>>;
     logos?: string;
 }
-/** Membership pricing for the group row (chapter mode). */
-interface ChapterPrices {
-    standardCents: number;
-    foundingDiscountCents?: number;
-    /** ISO currency, default "usd". */
-    currency?: string;
-    /** Billing interval, default "year". */
-    interval?: "year" | "month";
-}
-/** Membership policy + compliance copy stored on the group row. */
-interface ChapterPolicy {
-    disclaimerText?: string;
-    refundPolicyText?: string;
-    trustCopy?: string;
-    commitmentText?: string;
-    normsText?: string;
-}
+
 /** One owner-editable transactional email template. */
 interface EmailTemplate {
     subject: string;
@@ -350,6 +376,11 @@ interface ResolvedPipeline {
 interface ChapterApplication {
     required?: readonly string[];
     optional?: readonly string[];
+    /** Per-field CEL conditions — show a field, or demand it, based on the
+     *  answers so far. Enforced server-side as well as rendered, so a hidden
+     *  field is never demanded and a conditionally-required one cannot be
+     *  skipped by posting directly. Validated when the chapter is defined. */
+    conditions?: Record<string, FieldConditions>;
     /** Per-field character cap. Fields not listed use `defaultMaxLen`. */
     maxLen?: Record<string, number>;
     defaultMaxLen?: number;
@@ -390,6 +421,8 @@ interface ResolvedApplication {
     crmFields: readonly string[];
     maxArrayLen: number;
     validateEmail: boolean;
+    /** Resolved per-field conditions. Empty means every field is unconditional. */
+    conditions: Record<string, FieldConditions>;
 }
 /** The `defineChapter()` config a site fills in. */
 interface ChapterConfig {
@@ -411,8 +444,10 @@ interface ChapterConfig {
     /** Enable a public, host-rendered formation application workflow. */
     formation?: LeaderFormationConfig;
     thesis?: unknown;
-    /** Required in `chapter` mode. */
+    /** Required in `chapter` mode, and the fallback when `tiers` is empty. */
     prices?: ChapterPrices;
+    /** Membership tiers. A tier priced at 0 is free and never touches Stripe. */
+    tiers?: ChapterTierConfig[];
     policy?: ChapterPolicy;
     /** `notificationEmail` required in `chapter` mode. */
     emails?: ChapterEmails;

package/dist/worker/index.js

@@ -153,6 +153,9 @@ async function authorizeCrmDiscussionReference(req, env, fetcher = fetch) {
   }
 }
 
+// src/member.ts
+import { assertFieldCondition, resolveFieldStates } from "@odla-ai/crm";
+
 // src/application-id.ts
 var APPLICATION_ID_DOMAIN = "odla-ai/chapter/application/v1:";
 async function applicationIdForSubmission(submissionId) {
@@ -191,7 +194,9 @@ function applicantProfile(chapter, fields) {
 }
 async function submitApplication(db, chapter, fields, opts) {
   const app = chapter.application;
-  for (const f of app.required) {
+  const fieldStates = resolveFieldStates(app.conditions ?? {}, fields, app.required);
+  for (const [f, state] of Object.entries(fieldStates)) {
+    if (!state.required) continue;
     const v = fields[f];
     if (typeof v !== "string" || v.trim() === "") return { ok: false, error: `${f} is required` };
   }
@@ -210,10 +215,17 @@ async function submitApplication(db, chapter, fields, opts) {
   const id = opts.submissionId ? await applicationIdForSubmission(opts.submissionId) : opts.newId();
   const row = { id, status: chapter.pipeline.initial, createdAt: opts.now };
   for (const f of [...app.required, ...app.optional]) {
+    if (fieldStates[f]?.visible === false) continue;
     if (typeof fields[f] === "string") row[f] = fields[f].trim();
   }
   if (fields.focus !== void 0) row.focus = clampArray(fields.focus, app.maxArrayLen);
   if (opts.groupId) row.groupId = opts.groupId;
+  if (typeof fields.tierId === "string" && fields.tierId) {
+    if (opts.tierIds && !opts.tierIds.includes(fields.tierId)) {
+      return { ok: false, error: "tierId is not an offered tier" };
+    }
+    row.tierId = fields.tierId;
+  }
   if (acked) row.disclaimerAckAt = opts.now;
   const { duplicate } = await db.transact(
     [{ t: "update", ns: "applications", id, attrs: row }],
@@ -221,12 +233,15 @@ async function submitApplication(db, chapter, fields, opts) {
   );
   return { ok: true, id, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
 }
-function joinConfig(group, paymentsReady) {
+function joinConfig(group, paymentsReady, tiers = [], conditions = {}) {
   return {
     id: group.id,
     name: group.name,
     standardPriceCents: group.standardPriceCents ?? 0,
     foundingDiscountCents: group.foundingDiscountCents ?? 0,
+    tiers: [...tiers],
+    // The browser evaluates the same conditions the server enforces.
+    conditions,
     disclaimerText: group.disclaimerText ?? "",
     refundPolicyText: group.refundPolicyText ?? "",
     trustCopy: group.trustCopy ?? "",
@@ -236,6 +251,79 @@ function joinConfig(group, paymentsReady) {
   };
 }
 
+// src/tiers.ts
+function tierIsFree(tier) {
+  return !(tier.priceCents > 0) && !tier.stripePriceId;
+}
+function tierPayable(tier, group, hasSecretKey) {
+  if (tierIsFree(tier)) return true;
+  return Boolean(group.stripePublishableKey && tier.stripePriceId && hasSecretKey);
+}
+function byOrder(a, b) {
+  return a.sortOrder - b.sortOrder || a.id.localeCompare(b.id);
+}
+function resolveTiers(group, rows2 = []) {
+  const stored = rows2.filter((tier) => tier.active);
+  if (stored.length) return [...stored].sort(byOrder);
+  return [{
+    id: "standard",
+    groupId: String(group.id ?? ""),
+    name: "Membership",
+    priceCents: group.standardPriceCents ?? 0,
+    ...group.stripePriceId ? { stripePriceId: group.stripePriceId } : {},
+    sortOrder: 0,
+    active: true
+  }];
+}
+function offerableTiers(tiers, group, hasSecretKey) {
+  return tiers.filter((tier) => tier.active && tierPayable(tier, group, hasSecretKey));
+}
+function findTier(tiers, tierId) {
+  if (!tierId) return tiers.length === 1 ? tiers[0] : null;
+  return tiers.find((tier) => tier.id === tierId) ?? null;
+}
+function joinConfigTiers(tiers) {
+  return tiers.map((tier) => ({
+    id: tier.id,
+    name: tier.name,
+    priceCents: tier.priceCents,
+    blurb: tier.blurb ?? "",
+    free: tierIsFree(tier)
+  }));
+}
+
+// src/tiers-store.ts
+function rowToTier(row, groupId) {
+  return {
+    id: String(row.id ?? ""),
+    groupId: String(row.groupId ?? groupId),
+    name: String(row.name ?? ""),
+    priceCents: typeof row.priceCents === "number" ? row.priceCents : 0,
+    ...typeof row.stripePriceId === "string" && row.stripePriceId ? { stripePriceId: row.stripePriceId } : {},
+    ...typeof row.blurb === "string" ? { blurb: row.blurb } : {},
+    sortOrder: typeof row.sortOrder === "number" ? row.sortOrder : 0,
+    // A row that never set `active` is offered; only an explicit false retires
+    // a tier, so a half-seeded row cannot silently hide a membership.
+    active: row.active !== false
+  };
+}
+async function loadTiers(db, group) {
+  const groupId = String(group.id ?? "");
+  let rows2;
+  try {
+    rows2 = (await db.query({
+      tiers: { $: { where: { groupId }, order: { sortOrder: "asc" }, limit: 100 } }
+    })).tiers;
+  } catch {
+    rows2 = void 0;
+  }
+  const list = Array.isArray(rows2) ? rows2.map((row) => rowToTier(row, groupId)) : [];
+  return resolveTiers(group, list);
+}
+async function loadOfferableTiers(db, group, hasSecretKey) {
+  return offerableTiers(await loadTiers(db, group), group, hasSecretKey);
+}
+
 // src/scheduling.ts
 var SCHEDULING_DEFAULTS = {
   slotMinutes: 45,
@@ -990,7 +1078,15 @@ var handleMember = async (req, url, env, ctx) => {
     if (!group) return json({ error: "not found" }, 404);
     const stripeKey = await getVaultSecret(db, "stripe_secret_key");
     const paymentsReady = Boolean(group.stripePublishableKey && group.stripePriceId && stripeKey);
-    return json({ ...joinConfig(group, paymentsReady), copy: chapter.copy.join });
+    const offered = await loadOfferableTiers(
+      db,
+      group,
+      Boolean(stripeKey)
+    );
+    return json({
+      ...joinConfig(group, paymentsReady, joinConfigTiers(offered), chapter.application.conditions),
+      copy: chapter.copy.join
+    });
   }
   if (req.method === "GET" && url.pathname === "/api/join/resume") {
     const applicationId = url.searchParams.get("application") ?? "";
@@ -1029,9 +1125,11 @@ var handleMember = async (req, url, env, ctx) => {
     const group = Array.isArray(groups) ? groups[0] : void 0;
     if (!group) return json({ error: "not found" }, 404);
     const stripeKey = await getVaultSecret(db, "stripe_secret_key");
-    const paymentsReady = Boolean(group.stripePublishableKey && group.stripePriceId && stripeKey);
     const status = String(app.status ?? "");
-    if (!paymentsReady) return json({ state: "booking", applicationId });
+    const offered = await loadOfferableTiers(db, group, Boolean(stripeKey));
+    const tier = findTier(offered, typeof app.tierId === "string" ? app.tierId : null);
+    const payable = Boolean(tier) && !tierIsFree(tier) && tierPayable(tier, group, Boolean(stripeKey));
+    if (!payable) return json({ state: "booking", applicationId });
     if (status === chapter.pipeline.initial && app.stripeSubscriptionId) {
       return json({ state: "paymentPending", applicationId });
     }
@@ -1050,11 +1148,13 @@ var handleMember = async (req, url, env, ctx) => {
     }
     const submissionId = typeof parsed.submissionId === "string" ? parsed.submissionId : void 0;
     const db = ctx.makeDb(env);
+    const offeredTierIds = typeof parsed.tierId === "string" && parsed.tierId ? (await loadTiers(db, { id: chapter.id })).map((tier) => tier.id) : void 0;
     const result = await submitApplication(db, chapter, parsed, {
       submissionId,
       groupId: chapter.id,
       now: Date.now(),
-      newId: () => crypto.randomUUID()
+      newId: () => crypto.randomUUID(),
+      ...offeredTierIds ? { tierIds: offeredTierIds } : {}
     });
     if (!result.ok) return json({ error: result.error }, 400);
     if (!result.duplicate) {
@@ -1638,9 +1738,16 @@ async function startSubscription(req, env, ctx) {
   if (!app) return json({ error: "not found" }, 404);
   if (app.status !== "submitted") return json({ error: "already processed" }, 409);
   const group = await firstRow2(db, "groups", { where: { id: String(app.groupId ?? ctx.chapter.id) }, limit: 1 });
-  const priceId = group?.stripePriceId;
   const secretKey = await getVaultSecret(db, "stripe_secret_key");
-  if (!group || !priceId || !secretKey) return json({ error: "payments not configured" }, 503);
+  if (!group || !secretKey) return json({ error: "payments not configured" }, 503);
+  const tier = findTier(
+    await loadTiers(db, group),
+    typeof app.tierId === "string" ? app.tierId : null
+  );
+  if (!tier) return json({ error: "tier not found", code: "tier_unresolved" }, 400);
+  if (tierIsFree(tier)) return json({ error: "tier is free", code: "tier_not_payable" }, 409);
+  const priceId = tier.stripePriceId;
+  if (!priceId) return json({ error: "payments not configured" }, 503);
   const provider = createStripeProvider({ secretKey });
   let result;
   try {