@odla-ai/chapter 0.31.2 → 0.31.4

package/README.md

@@ -841,6 +841,14 @@ worker to 6 lines and deleted ~2,500 lines. The order that worked:
 
 These bite silently — a smoke test won't catch them:
 
+- **Application fields generate the application schema.** The resolved
+  `application.required` and `application.optional` lists now control both
+  submit validation and the `applications` entity emitted by
+  `defineChapter()`. Built-in fields retain their types and indexes;
+  site-defined fields become string attrs. A field removed from the reference
+  form no longer remains accidentally required at `db.transact`, and a field
+  listed in both arrays is rejected at definition time. Keep package-owned
+  operational attrs such as `status` out of both lists.
 - **Per-field caps.** `application.defaultMaxLen` is 2000. If your form accepts
   longer input, pass `maxLen` explicitly or the default starts rejecting it.
 - **`services` default** is `["db","calendar","o11y"]`; `smoke` compares config

package/dist/{copy-context-HAhNTZdl.d.ts → copy-context-BXBEdp4p.d.ts}

@@ -371,9 +371,9 @@ interface ResolvedPipeline {
 }
 /** The application (join form) validation surface — which string fields are
  *  required vs accepted, their max lengths, and the request body cap. Drives
- *  submit validation + the CRM slot projection; defaults to the reference form.
- *  The `applications` schema attrs stay fixed; this is
- *  validation config, not schema generation. */
+ *  submit validation, the generated `applications` schema, and the CRM slot
+ *  projection; defaults to the reference form. Built-in fields retain their
+ *  declared schema types/indexes, and site-defined fields become string attrs. */
 interface ChapterApplication {
     required?: readonly string[];
     optional?: readonly string[];

package/dist/index.cjs

@@ -106,7 +106,7 @@ __export(index_exports, {
   slotWindow: () => slotWindow,
   stageIndex: () => stageIndex,
   stripeCall: () => stripeCall,
-  stripeForm: () => stripeForm,
+  stripeForm: () => import_stripe.stripeForm,
   subAnnualCents: () => subAnnualCents,
   submitApplication: () => submitApplication,
   subscriptionIdempotencyKey: () => subscriptionIdempotencyKey,
@@ -116,7 +116,7 @@ __export(index_exports, {
   updateClerkUserMetadata: () => updateClerkUserMetadata,
   updateClerkUserMetadataByEmail: () => updateClerkUserMetadataByEmail,
   validateScheduling: () => validateScheduling,
-  verifyStripeSignature: () => verifyStripeSignature,
+  verifyStripeSignature: () => import_stripe.verifyStripeSignature,
   webhookMutationId: () => webhookMutationId
 });
 module.exports = __toCommonJS(index_exports);
@@ -124,6 +124,154 @@ module.exports = __toCommonJS(index_exports);
 // src/config.ts
 var import_crm2 = require("@odla-ai/crm");
 
+// src/member.ts
+var import_crm = require("@odla-ai/crm");
+
+// src/application-id.ts
+var APPLICATION_ID_DOMAIN = "odla-ai/chapter/application/v1:";
+async function applicationIdForSubmission(submissionId) {
+  const input = new TextEncoder().encode(`${APPLICATION_ID_DOMAIN}${submissionId}`);
+  const bytes = new Uint8Array(await crypto.subtle.digest("SHA-256", input)).slice(0, 16);
+  bytes[6] = bytes[6] & 15 | 128;
+  bytes[8] = bytes[8] & 63 | 128;
+  const hex = [...bytes].map((byte) => byte.toString(16).padStart(2, "0")).join("");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+
+// src/member.ts
+var DEFAULT_REQUIRED = ["firstName", "lastName", "email", "referral", "whoYouAre", "message"];
+var DEFAULT_OPTIONAL = ["referralName", "linkedin", "phone", "state"];
+var SCHEMA_FIELD = /^[A-Za-z_][A-Za-z0-9_-]*$/;
+function resolveApplication(a) {
+  const required = a?.required ?? DEFAULT_REQUIRED;
+  const optional = a?.optional ?? DEFAULT_OPTIONAL;
+  for (const [name, arr] of [["required", required], ["optional", optional]]) {
+    if (!Array.isArray(arr) || !arr.every((f) => typeof f === "string" && f !== "")) {
+      throw new Error(`defineChapter.application.${name}: must be an array of field-name strings`);
+    }
+    const unsafe = arr.find((field) => !SCHEMA_FIELD.test(field));
+    if (unsafe) {
+      throw new Error(`defineChapter.application.${name}: field "${unsafe}" must match ${SCHEMA_FIELD.source}`);
+    }
+  }
+  const duplicate = [...required, ...optional].find((field, index, fields) => fields.indexOf(field) !== index);
+  if (duplicate) {
+    throw new Error(`defineChapter.application: duplicate field "${duplicate}" across required/optional lists`);
+  }
+  if (a?.profileFields !== void 0 && (!Array.isArray(a.profileFields) || !a.profileFields.every((f) => typeof f === "string" && f !== ""))) {
+    throw new Error("defineChapter.application.profileFields: must be an array of field-name strings");
+  }
+  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`);
+      }
+      (0, import_crm.assertFieldCondition)(expression, `defineChapter.application.conditions.${field}.${key}`);
+    }
+  }
+  return {
+    required,
+    optional,
+    conditions,
+    maxLen: a?.maxLen ?? {},
+    defaultMaxLen: a?.defaultMaxLen ?? 2e3,
+    bodyCap: a?.bodyCap ?? 32768,
+    requireDisclaimerAck: a?.requireDisclaimerAck ?? true,
+    profileFields: a?.profileFields ?? [],
+    crmFields: a?.crmFields ?? [],
+    maxArrayLen: a?.maxArrayLen ?? 100,
+    validateEmail: a?.validateEmail ?? true
+  };
+}
+var EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+function isValidEmail(value) {
+  return typeof value === "string" && EMAIL_RE.test(value);
+}
+function clampArray(value, max) {
+  if (!Array.isArray(value)) return value;
+  return value.filter((x) => typeof x === "string" || typeof x === "number" || typeof x === "boolean").slice(0, max);
+}
+function hasDisclaimerAck(fields) {
+  return fields.disclaimerAck === true || fields.disclaimerAck === "true";
+}
+var IDENTITY_FIELDS = /* @__PURE__ */ new Set(["email", "firstName", "lastName"]);
+function applicantProfile(chapter, fields) {
+  const app = chapter.application;
+  const allowed = (f) => app.profileFields.includes(f);
+  const profile = {};
+  for (const f of [...app.required, ...app.optional]) {
+    if (IDENTITY_FIELDS.has(f) || !allowed(f)) continue;
+    const v = fields[f];
+    if (typeof v === "string" && v.trim() !== "") profile[f] = v.trim();
+  }
+  if (fields.focus !== void 0 && allowed("focus")) profile.focus = clampArray(fields.focus, app.maxArrayLen);
+  return Object.keys(profile).length > 0 ? profile : void 0;
+}
+async function submitApplication(db, chapter, fields, opts) {
+  const app = chapter.application;
+  const fieldStates = (0, import_crm.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` };
+  }
+  for (const f of [...app.required, ...app.optional]) {
+    const v = fields[f];
+    const cap = app.maxLen[f] ?? app.defaultMaxLen;
+    if (typeof v === "string" && v.length > cap) return { ok: false, error: `${f} exceeds ${cap} characters` };
+  }
+  if (app.validateEmail && typeof fields.email === "string" && !isValidEmail(fields.email)) {
+    return { ok: false, error: "email must be a valid email address" };
+  }
+  const acked = hasDisclaimerAck(fields);
+  if (app.requireDisclaimerAck && !acked) {
+    return { ok: false, error: "disclaimerAck is required" };
+  }
+  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 }],
+    opts.submissionId ? { mutationId: `join:${opts.submissionId}` } : void 0
+  );
+  return { ok: true, id: id2, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
+}
+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 ?? "",
+    commitmentText: group.commitmentText ?? "",
+    normsText: group.normsText ?? "",
+    paymentsReady: paymentsReady2
+  };
+}
+
 // src/schema.ts
 function attr(type, flags = {}) {
   return {
@@ -198,6 +346,47 @@ var applications = {
     canceled: attr("boolean", { optional: true })
   }
 };
+var APPLICATION_INPUT_FIELDS = /* @__PURE__ */ new Set([
+  "firstName",
+  "lastName",
+  "email",
+  "referral",
+  "referralName",
+  "whoYouAre",
+  "focus",
+  "linkedin",
+  "message",
+  "phone",
+  "state"
+]);
+function applicationsFor(application) {
+  const attrs = {};
+  for (const [name, spec] of Object.entries(applications.attrs)) {
+    attrs[name] = {
+      ...spec,
+      optional: APPLICATION_INPUT_FIELDS.has(name) ? true : spec.optional
+    };
+  }
+  const apply = (field, optional) => {
+    const existing = Object.hasOwn(attrs, field) ? attrs[field] : void 0;
+    if (existing && !APPLICATION_INPUT_FIELDS.has(field)) {
+      throw new Error(`defineChapter.application: field "${field}" is reserved by the applications schema`);
+    }
+    if (existing && existing.type !== "string") {
+      throw new Error(`defineChapter.application: field "${field}" is not a configurable string field`);
+    }
+    const spec = existing ? { ...existing, optional } : attr("string", { optional });
+    Object.defineProperty(attrs, field, {
+      value: spec,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  };
+  for (const field of application.required) apply(field, false);
+  for (const field of application.optional) apply(field, true);
+  return { attrs };
+}
 var groups = {
   attrs: {
     id: id(),
@@ -269,10 +458,10 @@ var emailLog = {
     sentAt: attr("number", { indexed: true })
   }
 };
-function chapterDb(mode, auth, includeNetworkNotes = false) {
+function chapterDb(mode, auth, includeNetworkNotes = false, application = resolveApplication(void 0)) {
   const entities = {};
   if (mode === "chapter") {
-    entities.applications = applications;
+    entities.applications = applicationsFor(application);
     entities.groups = groups;
     entities.tiers = tiers;
     entities.meetings = meetings;
@@ -535,145 +724,6 @@ function canApprove(status, p) {
   return p.approvableFrom.includes(status);
 }
 
-// src/member.ts
-var import_crm = require("@odla-ai/crm");
-
-// src/application-id.ts
-var APPLICATION_ID_DOMAIN = "odla-ai/chapter/application/v1:";
-async function applicationIdForSubmission(submissionId) {
-  const input = new TextEncoder().encode(`${APPLICATION_ID_DOMAIN}${submissionId}`);
-  const bytes = new Uint8Array(await crypto.subtle.digest("SHA-256", input)).slice(0, 16);
-  bytes[6] = bytes[6] & 15 | 128;
-  bytes[8] = bytes[8] & 63 | 128;
-  const hex = [...bytes].map((byte) => byte.toString(16).padStart(2, "0")).join("");
-  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
-}
-
-// src/member.ts
-var DEFAULT_REQUIRED = ["firstName", "lastName", "email", "referral", "whoYouAre", "message"];
-var DEFAULT_OPTIONAL = ["referralName", "linkedin", "phone", "state"];
-function resolveApplication(a) {
-  const required = a?.required ?? DEFAULT_REQUIRED;
-  const optional = a?.optional ?? DEFAULT_OPTIONAL;
-  for (const [name, arr] of [["required", required], ["optional", optional]]) {
-    if (!Array.isArray(arr) || !arr.every((f) => typeof f === "string" && f !== "")) {
-      throw new Error(`defineChapter.application.${name}: must be an array of field-name strings`);
-    }
-  }
-  if (a?.profileFields !== void 0 && (!Array.isArray(a.profileFields) || !a.profileFields.every((f) => typeof f === "string" && f !== ""))) {
-    throw new Error("defineChapter.application.profileFields: must be an array of field-name strings");
-  }
-  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`);
-      }
-      (0, import_crm.assertFieldCondition)(expression, `defineChapter.application.conditions.${field}.${key}`);
-    }
-  }
-  return {
-    required,
-    optional,
-    conditions,
-    maxLen: a?.maxLen ?? {},
-    defaultMaxLen: a?.defaultMaxLen ?? 2e3,
-    bodyCap: a?.bodyCap ?? 32768,
-    requireDisclaimerAck: a?.requireDisclaimerAck ?? true,
-    profileFields: a?.profileFields ?? [],
-    crmFields: a?.crmFields ?? [],
-    maxArrayLen: a?.maxArrayLen ?? 100,
-    validateEmail: a?.validateEmail ?? true
-  };
-}
-var EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-function isValidEmail(value) {
-  return typeof value === "string" && EMAIL_RE.test(value);
-}
-function clampArray(value, max) {
-  if (!Array.isArray(value)) return value;
-  return value.filter((x) => typeof x === "string" || typeof x === "number" || typeof x === "boolean").slice(0, max);
-}
-function hasDisclaimerAck(fields) {
-  return fields.disclaimerAck === true || fields.disclaimerAck === "true";
-}
-var IDENTITY_FIELDS = /* @__PURE__ */ new Set(["email", "firstName", "lastName"]);
-function applicantProfile(chapter, fields) {
-  const app = chapter.application;
-  const allowed = (f) => app.profileFields.includes(f);
-  const profile = {};
-  for (const f of [...app.required, ...app.optional]) {
-    if (IDENTITY_FIELDS.has(f) || !allowed(f)) continue;
-    const v = fields[f];
-    if (typeof v === "string" && v.trim() !== "") profile[f] = v.trim();
-  }
-  if (fields.focus !== void 0 && allowed("focus")) profile.focus = clampArray(fields.focus, app.maxArrayLen);
-  return Object.keys(profile).length > 0 ? profile : void 0;
-}
-async function submitApplication(db, chapter, fields, opts) {
-  const app = chapter.application;
-  const fieldStates = (0, import_crm.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` };
-  }
-  for (const f of [...app.required, ...app.optional]) {
-    const v = fields[f];
-    const cap = app.maxLen[f] ?? app.defaultMaxLen;
-    if (typeof v === "string" && v.length > cap) return { ok: false, error: `${f} exceeds ${cap} characters` };
-  }
-  if (app.validateEmail && typeof fields.email === "string" && !isValidEmail(fields.email)) {
-    return { ok: false, error: "email must be a valid email address" };
-  }
-  const acked = hasDisclaimerAck(fields);
-  if (app.requireDisclaimerAck && !acked) {
-    return { ok: false, error: "disclaimerAck is required" };
-  }
-  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 }],
-    opts.submissionId ? { mutationId: `join:${opts.submissionId}` } : void 0
-  );
-  return { ok: true, id: id2, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
-}
-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 ?? "",
-    commitmentText: group.commitmentText ?? "",
-    normsText: group.normsText ?? "",
-    paymentsReady: paymentsReady2
-  };
-}
-
 // src/copy-defaults-admin.ts
 var DEFAULT_ADMIN_COPY = {
   auth: {
@@ -1222,7 +1272,7 @@ function defineChapter(config) {
   const copy = resolveChapterCopy(config.copy);
   const network = resolveNetwork(config, crm);
   const formation = resolveLeaderFormation(config.formation, crm);
-  const { schema, rules } = chapterDb(mode, auth, network.targets.length > 0);
+  const { schema, rules } = chapterDb(mode, auth, network.targets.length > 0, application);
   const services = config.services ?? ["db", "calendar", "o11y"];
   const account = config.account ?? "none";
   if (account !== "invite" && account !== "create" && account !== "none") {
@@ -1680,53 +1730,10 @@ function emailGroupFrom(row) {
 }
 
 // src/payments.ts
-function parseSigHeader(header) {
-  const parts = {};
-  for (const p of header.split(",")) {
-    const [k, v] = p.split("=", 2);
-    if (k && v !== void 0) parts[k] = v;
-  }
-  return { t: parts.t, v1: parts.v1 };
-}
-function toHex(buf) {
-  return [...new Uint8Array(buf)].map((b) => b.toString(16).padStart(2, "0")).join("");
-}
-function timingSafeEqual(a, b) {
-  if (a.length !== b.length) return false;
-  let diff = 0;
-  for (let i = 0; i < a.length; i++) diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
-  return diff === 0;
-}
-async function verifyStripeSignature(payload, header, secret, opts = {}) {
-  const { t, v1 } = parseSigHeader(header);
-  if (!t || !v1) return false;
-  const ts = Number(t);
-  if (!Number.isFinite(ts)) return false;
-  const nowSec = (opts.now ?? Date.now()) / 1e3;
-  const tolerance = opts.toleranceSec ?? 300;
-  if (Math.abs(nowSec - ts) > tolerance) return false;
-  const enc = new TextEncoder();
-  const key = await crypto.subtle.importKey("raw", enc.encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
-  const mac = await crypto.subtle.sign("HMAC", key, enc.encode(`${t}.${payload}`));
-  return timingSafeEqual(toHex(mac), v1);
-}
+var import_stripe = require("@odla-ai/stripe");
 function paymentsReady(group, hasSecretKey) {
   return Boolean(group.stripePublishableKey && group.stripePriceId && hasSecretKey);
 }
-function stripeForm(params) {
-  const out = new URLSearchParams();
-  for (const [k, v] of Object.entries(params)) {
-    if (v === void 0 || v === null) continue;
-    if (typeof v === "object") {
-      for (const [k2, v2] of Object.entries(v)) {
-        if (v2 !== void 0 && v2 !== null) out.append(`${k}[${k2}]`, String(v2));
-      }
-    } else {
-      out.append(k, String(v));
-    }
-  }
-  return out.toString();
-}
 function subscriptionIdempotencyKey(applicationId) {
   return `sub:${applicationId}`;
 }
@@ -2110,18 +2117,15 @@ function subAnnualCents(sub) {
 }
 
 // src/payments-stripe.ts
+var import_stripe2 = require("@odla-ai/stripe");
 async function stripeCall(sk, method, path, params, idempotencyKey) {
-  const qs = method === "GET" && params ? `?${stripeForm(params)}` : "";
-  const headers = { authorization: `Bearer ${sk}` };
-  if (idempotencyKey) headers["idempotency-key"] = idempotencyKey;
-  const init = { method, headers };
-  if (method === "POST" && params) {
-    headers["content-type"] = "application/x-www-form-urlencoded";
-    init.body = stripeForm(params);
-  }
-  const res = await fetch(`https://api.stripe.com${path}${qs}`, init);
-  const body = await res.json().catch(() => ({}));
-  return { ok: res.ok, status: res.status, body };
+  return (0, import_stripe2.stripeRequest)(
+    { secretKey: sk },
+    method,
+    path,
+    params,
+    idempotencyKey ? { idempotencyKey } : {}
+  );
 }
 
 // src/clerk.ts