@odla-ai/chapter 0.29.0 → 0.31.0

package/dist/index.js

@@ -64,6 +64,8 @@ var applications = {
     phone: attr("string", { optional: true }),
     state: attr("string", { optional: true }),
     groupId: attr("string", { indexed: true, optional: true }),
+    // The tier this application joined on. Absent on rows that predate tiers.
+    tierId: attr("string", { indexed: true, optional: true }),
     stripeCustomerId: attr("string", { indexed: true, optional: true }),
     stripeSubscriptionId: attr("string", { indexed: true, optional: true }),
     renewalAt: attr("number", { optional: true }),
@@ -95,6 +97,19 @@ var groups = {
     createdAt: attr("number", { indexed: true })
   }
 };
+var tiers = {
+  attrs: {
+    id: id(),
+    groupId: attr("string", { indexed: true }),
+    name: attr("string"),
+    priceCents: attr("number"),
+    stripePriceId: attr("string", { optional: true }),
+    blurb: attr("string", { optional: true }),
+    sortOrder: attr("number", { indexed: true }),
+    active: attr("boolean", { indexed: true }),
+    createdAt: attr("number", { indexed: true })
+  }
+};
 var meetings = {
   attrs: {
     id: id(),
@@ -136,6 +151,7 @@ function chapterDb(mode, auth, includeNetworkNotes = false) {
   if (mode === "chapter") {
     entities.applications = applications;
     entities.groups = groups;
+    entities.tiers = tiers;
     entities.meetings = meetings;
     entities.emailLog = emailLog;
   }
@@ -396,6 +412,9 @@ function canApprove(status, p) {
   return p.approvableFrom.includes(status);
 }
 
+// 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) {
@@ -424,9 +443,21 @@ function resolveApplication(a) {
   if (a?.crmFields !== void 0 && (!Array.isArray(a.crmFields) || !a.crmFields.every((f) => typeof f === "string" && f !== ""))) {
     throw new Error("defineChapter.application.crmFields: must be an array of field-name strings");
   }
+  const conditions = a?.conditions ?? {};
+  for (const [field, declared] of Object.entries(conditions)) {
+    for (const key of ["visibleWhen", "requiredWhen"]) {
+      const expression = declared?.[key];
+      if (expression === void 0) continue;
+      if (typeof expression !== "string" || !expression.trim()) {
+        throw new Error(`defineChapter.application.conditions.${field}.${key}: must be a non-empty CEL condition`);
+      }
+      assertFieldCondition(expression, `defineChapter.application.conditions.${field}.${key}`);
+    }
+  }
   return {
     required,
     optional,
+    conditions,
     maxLen: a?.maxLen ?? {},
     defaultMaxLen: a?.defaultMaxLen ?? 2e3,
     bodyCap: a?.bodyCap ?? 32768,
@@ -463,7 +494,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` };
   }
@@ -482,10 +515,17 @@ async function submitApplication(db, chapter, fields, opts) {
   const id2 = opts.submissionId ? await applicationIdForSubmission(opts.submissionId) : opts.newId();
   const row = { id: id2, 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: id2, attrs: row }],
@@ -493,12 +533,15 @@ async function submitApplication(db, chapter, fields, opts) {
   );
   return { ok: true, id: id2, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
 }
-function joinConfig(group, paymentsReady2) {
+function joinConfig(group, paymentsReady2, tiers2 = [], conditions = {}) {
   return {
     id: group.id,
     name: group.name,
     standardPriceCents: group.standardPriceCents ?? 0,
     foundingDiscountCents: group.foundingDiscountCents ?? 0,
+    tiers: [...tiers2],
+    // The browser evaluates the same conditions the server enforces.
+    conditions,
     disclaimerText: group.disclaimerText ?? "",
     refundPolicyText: group.refundPolicyText ?? "",
     trustCopy: group.trustCopy ?? "",
@@ -1293,6 +1336,62 @@ function leaderCrmConfig(options = {}) {
 
 // src/descriptor.ts
 import { createCrmIntegration } from "@odla-ai/crm";
+
+// src/tiers.ts
+function buildTierSeeds(groupId, configured = [], now = 0) {
+  return configured.map((tier, index) => ({
+    id: tier.id,
+    groupId,
+    name: tier.name,
+    priceCents: tier.priceCents,
+    ...tier.stripePriceId ? { stripePriceId: tier.stripePriceId } : {},
+    ...tier.blurb ? { blurb: tier.blurb } : {},
+    sortOrder: tier.sortOrder ?? index,
+    active: tier.active !== false,
+    createdAt: now
+  }));
+}
+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, rows = []) {
+  const stored = rows.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(tiers2, group, hasSecretKey) {
+  return tiers2.filter((tier) => tier.active && tierPayable(tier, group, hasSecretKey));
+}
+function findTier(tiers2, tierId) {
+  if (!tierId) return tiers2.length === 1 ? tiers2[0] : null;
+  return tiers2.find((tier) => tier.id === tierId) ?? null;
+}
+function joinConfigTiers(tiers2) {
+  return tiers2.map((tier) => ({
+    id: tier.id,
+    name: tier.name,
+    priceCents: tier.priceCents,
+    blurb: tier.blurb ?? "",
+    free: tierIsFree(tier)
+  }));
+}
+
+// src/descriptor.ts
 function createChapterIntegration(chapter, options = {}) {
   const basePath = options.basePath ?? "/api/crm";
   const now = options.now ?? Date.now();
@@ -1308,6 +1407,14 @@ function createChapterIntegration(chapter, options = {}) {
   const group = chapter.groupSeed();
   if (group) {
     seeds.push({ id: "group", ns: "groups", key: { attr: "id", value: chapter.id }, attrs: { ...group, createdAt: now } });
+    for (const tier of buildTierSeeds(chapter.id, chapter.config.tiers, now)) {
+      seeds.push({
+        id: `tier:${String(tier.id)}`,
+        ns: "tiers",
+        key: { attr: "id", value: String(tier.id) },
+        attrs: tier
+      });
+    }
   }
   const isLeader = (chapter.config.network?.targets?.length ?? 0) > 0;
   const runbooks = isLeader ? {
@@ -2051,18 +2158,22 @@ var clerkIntegration = {
   ],
   secrets: [
     {
-      key: "CLERK_WEBHOOK_SECRET",
+      // odla-db reads this exact name (CLERK_WEBHOOK_SECRET_NAME in the
+      // platform's clerk-webhook.ts); it is also what `odla-ai secrets set`
+      // writes. It read "CLERK_WEBHOOK_SECRET" until 0.30.0, which sent
+      // adopters to store the value under a name nothing looks up.
+      name: "clerk_webhook_secret",
       description: "Svix signing secret for Clerk user webhooks \u2014 verifies $users sync events.",
       pattern: "whsec_",
       mode: "full",
-      vault: true
+      required: false
     },
     {
-      key: "clerk_secret_key",
+      name: "clerk_secret_key",
       description: "Clerk backend key (sk_*) \u2014 powers account creation, the public role claim, and backend-only private profile signals; it also lets odla-db resolve user email/name via the Clerk API.",
       pattern: "sk_",
       mode: "full",
-      vault: true
+      required: false
     }
   ],
   syncs: [
@@ -2380,6 +2491,38 @@ function applicationBookingUpdate(currentStatus, startAt, htmlLink) {
     ...currentStatus !== "call_scheduled" ? { status: "call_scheduled" } : {}
   };
 }
+
+// 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 rows;
+  try {
+    rows = (await db.query({
+      tiers: { $: { where: { groupId }, order: { sortOrder: "asc" }, limit: 100 } }
+    })).tiers;
+  } catch {
+    rows = void 0;
+  }
+  const list = Array.isArray(rows) ? rows.map((row) => rowToTier(row, groupId)) : [];
+  return resolveTiers(group, list);
+}
+async function loadOfferableTiers(db, group, hasSecretKey) {
+  return offerableTiers(await loadTiers(db, group), group, hasSecretKey);
+}
 export {
   DEFAULT_CHAPTER_COPY,
   DEFAULT_SHARE_FIELDS,
@@ -2392,6 +2535,7 @@ export {
   brandTokens,
   bucketSeries,
   buildGroupSeed,
+  buildTierSeeds,
   canApprove,
   canBook,
   canChangeRole,
@@ -2416,6 +2560,7 @@ export {
   emailGroupFrom,
   endForSlot,
   findApplicationRef,
+  findTier,
   firstPaymentPatch,
   formatChapterCopy,
   formationFields,
@@ -2428,7 +2573,10 @@ export {
   isSlotAvailable,
   isValidEmail,
   joinConfig,
+  joinConfigTiers,
   leaderCrmConfig,
+  loadOfferableTiers,
+  loadTiers,
   meetingCreateRow,
   meetingRescheduleUpdate,
   memberApplication,
@@ -2436,6 +2584,7 @@ export {
   networkSourceTag,
   normalizeSharedRecord,
   normalizeWebhookEvent,
+  offerableTiers,
   paymentsReady,
   personInputFromApp,
   planDelivery,
@@ -2453,6 +2602,7 @@ export {
   resolveLeaderFormation,
   resolvePipeline,
   resolveScheduling,
+  resolveTiers,
   roleFromClaim,
   sendTemplated,
   sharedPersonInput,
@@ -2465,6 +2615,8 @@ export {
   submitApplication,
   subscriptionIdempotencyKey,
   syncApplicationToCrm,
+  tierIsFree,
+  tierPayable,
   updateClerkUserMetadata,
   updateClerkUserMetadataByEmail,
   validateScheduling,