@hyperscale0/hsx 1.0.128 → 1.0.130

package/src/compile.ts

@@ -1039,6 +1039,29 @@ export function compile(
         (!!attachmentInfo &&
           subjectPartyRoles.includes(name as SubjectPartyRole));
       const resolvedParties = new Set<string>();
+      // A party of a sibling attachment this one references, such as the
+      // borrower of `self.plan`, binds here the way it binds there.
+      const reachedParty = (
+        name: string,
+      ): AttachmentPartyBinding | undefined => {
+        if (!attachmentInfo) return;
+        const targets = fields.flatMap((field) =>
+          field.type === "ref" && field.targetKind === "instrument"
+            ? [field.target].flat()
+            : [],
+        );
+        const bindings = attachmentInfo.attachments.flatMap((attachment) =>
+          targets.some(
+            (target) =>
+              target === attachment.instrument ||
+              target.startsWith(`${attachment.instrument}_`),
+          ) && attachment.parties[name]
+            ? [attachment.parties[name]]
+            : [],
+        );
+        const distinct = new Set(bindings.map((item) => JSON.stringify(item)));
+        return distinct.size === 1 ? bindings[0] : undefined;
+      };
       const resolve = (
         expr: Expr,
         seen = new Set<string>(),
@@ -1098,6 +1121,18 @@ export function compile(
               attachmentSubjects.has(name)
                 ? name.slice(attachmentInfo.subjectKindId.length + 1)
                 : `${name} (program)`;
+            const elsewhere = [...assignments.values()]
+              .filter(
+                (assignment) =>
+                  assignment.target === type &&
+                  attachmentSubjects.has(assignment.name) &&
+                  attachmentSubjects.get(assignment.name) !==
+                    attachmentInfo.subjectKindId,
+              )
+              .map((assignment) => {
+                const subject = attachmentSubjects.get(assignment.name)!;
+                return `\`${subject}.${assignment.name.slice(subject.length + 1)}\``;
+              });
             const target = templates.get(type);
             const required =
               target?.parameters
@@ -1116,7 +1151,7 @@ export function compile(
               }`,
               matches.length
                 ? `Bind \`${parameter}\` explicitly to one of: ${matches.map(local).join(", ")}.`
-                : `Declare a ${parameter} attachment and bind \`${parameter}: allowance\`. Choose ${required.map((name) => (name.startsWith("per_") ? `its ${name.slice(4).replaceAll("_", " ")} limit` : `\`${name}\``)).join(", ") || "its required bindings"} explicitly.`,
+                : `Attach \`${type}\` to \`${attachmentInfo.subjectKindId}\` and bind \`${parameter}\` to that attachment's name. Choose ${required.map((name) => (name.startsWith("per_") ? `its ${name.slice(4).replaceAll("_", " ")} limit` : `\`${name}\``)).join(", ") || "its required bindings"} explicitly.${elsewhere.length ? ` ${elsewhere.join(", ")} ${elsewhere.length === 1 ? "is" : "are"} on another object, which this binding cannot reach.` : ""}`,
             );
           }
           if (expr.name !== "all" && matches.length !== 1)
@@ -1555,6 +1590,28 @@ export function compile(
             value: `${id}_${key}`,
             span: origin,
           });
+      // A subject role only has money here when this attachment binds it.
+      const moneyPath = (expr: Expr): string => {
+        const lowered = path(expr);
+        const role = lowered.slice("party.".length) as SubjectPartyRole;
+        if (
+          attachmentInfo &&
+          lowered.startsWith("party.") &&
+          subjectPartyRoles.includes(role) &&
+          !Object.values(attachmentInfo.parties).some(
+            (binding) => "role" in binding && binding.role === role,
+          )
+        )
+          failWithCode(
+            expr,
+            "subject_party_unbound",
+            `\`${role}\` has no money account in \`${decl.name}\``,
+            role === "operator"
+              ? "Use `programOperator` for the company's own account."
+              : `Add a party parameter to \`${decl.name}\` and bind it to \`${role}\` where you attach it.`,
+          );
+        return lowered;
+      };
       const fields: UdlField[] = [];
       const calculations: UdlCalculation[] = [];
       let currentAction: UdlAction | undefined;
@@ -2472,9 +2529,18 @@ export function compile(
                     `unknown economic purpose ${purposeName}`,
                     "choose a declared economic purpose",
                   );
-                const sourcePartyName = sourceParty
+                let sourcePartyName = sourceParty
                   ? String(data(sourceParty))
                   : undefined;
+                const reached =
+                  sourcePartyName && !isParty(sourcePartyName)
+                    ? reachedParty(sourcePartyName)
+                    : undefined;
+                if (reached) {
+                  attachmentInfo!.parties[sourcePartyName!] = reached;
+                  sourcePartyName =
+                    "role" in reached ? reached.role : reached.party;
+                }
                 if (sourcePartyName && !isParty(sourcePartyName))
                   fail(
                     sourceParty!,
@@ -2608,7 +2674,7 @@ export function compile(
                       operation: "internal_transfer.create",
                       ...(economics ? { economics } : {}),
                       amount: piece,
-                      from: path(from),
+                      from: moneyPath(from),
                       to: `party.${recipient.value}`,
                     });
                   }
@@ -2636,8 +2702,8 @@ export function compile(
                     ? { capture: String(data(parts.get("capture")!)) }
                     : {}),
                   amount: val(amount!),
-                  from: path(from!),
-                  to: path(to!),
+                  from: moneyPath(from!),
+                  to: moneyPath(to!),
                 };
                 const fee = parts.get("fee");
                 if (!fee)
@@ -2909,6 +2975,26 @@ export function compile(
             message: `${id}.${name}.subject.${requirement.field.name}`,
           });
         }
+        // A parent actor over an empty all() names no instrument that could
+        // invoke the action. A std action then does not exist in this program;
+        // in user code the all() is a mistake.
+        if (
+          typeof a.actor === "object" &&
+          "parent" in a.actor &&
+          Array.isArray(a.actor.parent) &&
+          !a.actor.parent.length
+        ) {
+          if ((declarationSources.get(decl) ?? "program") === "program") {
+            const parent = entries(asBlock(slots.get("actor"))).get("parent");
+            fail(
+              parent ?? row,
+              `${parent?.kind === "call" ? `${parent.name}(${text(parent.args[0]!)})` : `the parent actor of ${name}`} matches no instrument`,
+              "name an instrument this program declares or attaches",
+            );
+          }
+          delete lifecycle.transitions[name];
+          continue;
+        }
         inst.actions[name] = a;
         inst.actionOrder.push(name);
       }
@@ -3746,7 +3832,7 @@ export function compile(
     // A family member drops an optional reference field its binding left
     // unset (a borrower-funded plan has no `funds`), so it cannot match and
     // leaves the selection. The header must still declare the field.
-    const matchable = (selection: UdlSelection) => {
+    const declaredMembers = (selection: UdlSelection) => {
       const members = [selection.instrument].flat();
       const header = selection.family
         ? templates.get(
@@ -3764,13 +3850,52 @@ export function compile(
         resolveField(document, byId.get(id)!, `self.${selection.reference}`),
       );
     };
+    // A member whose reference points at another attachment of the anchor's
+    // own template (the plan funding another object's escrow) cannot match
+    // either, so each object only selects what can reference it.
+    const kin = (a: string, b: string) => {
+      const left = byId.get(a);
+      const right = byId.get(b);
+      return (
+        !!left && !!right && declarations.get(left) === declarations.get(right)
+      );
+    };
+    const matchable = (
+      selection: UdlSelection,
+      inst: UdlInstrument,
+      action?: UdlAction,
+    ) =>
+      declaredMembers(selection).filter((id) => {
+        const member = byId.get(id);
+        if (!member) return true;
+        const anchor = resolveField(
+          document,
+          inst,
+          selection.anchor,
+          action?.input,
+          action,
+        );
+        const reference = resolveField(
+          document,
+          member,
+          `self.${selection.reference}`,
+        );
+        if (anchor?.type !== "ref" || reference?.type !== "ref") return true;
+        const targets = [anchor.target].flat();
+        const candidates = [reference.target].flat();
+        return !candidates.every(
+          (candidate) =>
+            !targets.includes(candidate) &&
+            targets.some((target) => kin(target, candidate)),
+        );
+      });
     // A count over no matchable member is zero.
     for (const inst of document.instruments)
       for (const action of Object.values(inst.actions))
         action.requires = action.requires.map((requirement) =>
           requirement.kind === "aggregate" &&
           requirement.measure === "count" &&
-          !matchable(requirement.selection).length
+          !matchable(requirement.selection, inst, action).length
             ? {
                 kind: "compare",
                 left: { literal: 0 },
@@ -3784,9 +3909,15 @@ export function compile(
       at: Located,
       scope: Scope,
     ) => {
+      walk(
+        selection.overlaps,
+        "overlaps",
+        site(selection, "overlaps", at),
+        scope,
+      );
       walk(selection.anchor, "anchor", site(selection, "anchor", at), scope);
       walk(selection.where, "where", site(selection, "where", at), scope);
-      const members = matchable(selection);
+      const members = matchable(selection, scope.inst, scope.action);
       if (
         members.length &&
         members.length < [selection.instrument].flat().length
@@ -3807,6 +3938,9 @@ export function compile(
         selection.order?.forEach((key, index) =>
           member(key, site(selection.order!, index, at)),
         );
+        if (selection.overlaps)
+          for (const key of ["start", "end"] as const)
+            member(selection.overlaps[key], site(selection.overlaps, key, at));
         if (selection.window)
           member(selection.window.field, site(selection.window, "field", at));
       }
@@ -4112,13 +4246,15 @@ export function compile(
                       ),
                   ),
               );
+            const reaching = stranded.actions.at(-1);
+            const drain = `move ${stranded.accounts.map((account) => `\`self.${account}.balance\``).join(" and ")} out in ${reaching ? `\`${reaching}\`` : "the action that reaches it"}, or add an action from \`${stranded.state}\` that does`;
             return diagnostic(
               {
                 code: i.code,
                 message: `\`${attachment?.name ?? instrument.id}\` can reach \`${stranded.state}\` with money in ${stranded.accounts.map((account) => `\`${account}\``).join(", ")}, but no action leaves that state and disposes of the balance.`,
                 fix: binding
-                  ? `Restore \`${binding.parameter}: ${stranded.state}\`, or author a complete refund path for every reachable funded state.`
-                  : "Author a complete refund path for every reachable funded state.",
+                  ? `Restore \`${binding.parameter}: ${stranded.state}\`, or ${drain}.`
+                  : `${drain[0]!.toUpperCase()}${drain.slice(1)}.`,
                 span: binding?.span ?? origin?.span ?? program.span,
                 related: stranded.accounts.map((account) => ({
                   source: "program",

package/src/examples-bundle.ts

@@ -1,11 +1,11 @@
 // Generated by open/hsx/scripts/bundle-examples.ts. Do not edit by hand.
 import type { HsxExample } from "./examples.ts";
 export const examples: HsxExample[] = [
-  {"id":"cards","title":"Team expense cards","summary":"A company issues expense cards to employees and reserves each supplier payment before capture.","headers":["cards"],"source":"// A company issues expense cards to employees and reserves each supplier payment before capture.\nprogram team_expense_cards \"Team expense cards\"\nuse cards\nparty supplier: business\n\nobject employee \"Employee card\" {\n  fields { employeeName: text, department: text }\n  columns: [employeeName, department]\n  attach holder = cards.cardholder {\n    expose create as create_holder\n    holder: owner\n    expose activate as activate_employee\n    expose suspend as suspend_employee\n  }\n  attach card = cards.card {\n    expose create as create_card\n    holder: holder, spend_limit: 5000 SAR\n    expose activate as activate_card\n    expose freeze as freeze_card\n    expose unfreeze as unfreeze_card\n  }\n  attach payment = cards.authorization {\n    expose create as create_payment\n    card: card, merchant: supplier\n    expose approve as approve_payment\n    expose capture as capture_payment\n    expose reverse as reverse_payment\n  }\n  attach receipt = cards.transaction {\n    expose create as create_receipt\n    authorization: payment\n    expose refund as refund_payment\n  }\n}\n"},
-  {"id":"collections","title":"Small business collections","summary":"A business lender refers overdue instalments to an agency with limits on collection contacts.","headers":["collections","financing"],"source":"// A business lender refers overdue instalments to an agency with limits on collection contacts.\nprogram business_collections \"Small business collections\"\nuse collections\nuse financing\nparty agency: business\n\nobject facility \"Business loan\" {\n  fields { businessName: text, purpose: text, price: money }\n  columns: [businessName, purpose, price]\n  attach allowance = financing.limits { expose create as create_allowance, expose approve as approve_borrower, borrower: owner, per_borrower: 100000 SAR }\n  attach budget = financing.portfolio_limit { expose create as create_budget, expose approve as approve_budget, limit: 2000000 SAR }\n  attach loan = financing.installments {\n    expose create as create_loan\n    borrower: owner, capital: operator\n    months: 12, pricing: amortizing, profit_rate: 6%, disburse_to: borrower\n    limits: allowance, portfolio: budget\n    expose sign as sign_loan\n    expose disburse as release_loan\n    expose payoff as repay_early\n  }\n  attach recovery = collections.case {\n    expose create as create_recovery\n    on: loan, agency: agency\n    expose assign as assign_case\n    expose recover as recover_payment\n    expose recall as recall_case\n  }\n  attach contact = collections.contact {\n    expose create as create_contact\n    case: recovery, agency: agency\n  }\n}\n\nexpose facility.loan.payment.create as create_payment\nexpose facility.loan.payment.pay as pay_instalment\nexpose facility.loan.payment.refund as refund_payment\nexpose facility.loan.payoff_quote.create as request_payoff_quote\n"},
+  {"id":"cards","title":"Team expense cards","summary":"A company issues expense cards to employees and reserves each supplier payment before capture.","headers":["cards"],"source":"// A company issues expense cards to employees and reserves each supplier payment before capture.\nprogram team_expense_cards \"Team expense cards\"\nuse cards\n// supplier is a business this program declares, so plan needs {\"partyBindings\":{\"supplier\":\"<partyId>\"}}.\n// That partyId is an organization customer's: create the Product from this source without the payment\n// and receipt attachments, add the customer with customer.create, activate its access, open its\n// customer_balance account, then compose this source with the binding.\nparty supplier: business\n\nobject employee \"Employee card\" {\n  fields { employeeName: text, department: text }\n  columns: [employeeName, department]\n  attach holder = cards.cardholder {\n    expose create as create_holder\n    holder: owner\n    expose activate as activate_employee\n    expose suspend as suspend_employee\n  }\n  attach card = cards.card {\n    expose create as create_card\n    holder: holder, spend_limit: 5000 SAR\n    expose activate as activate_card\n    expose freeze as freeze_card\n    expose unfreeze as unfreeze_card\n  }\n  attach payment = cards.authorization {\n    expose create as create_payment\n    card: card, merchant: supplier\n    expose approve as approve_payment\n    expose capture as capture_payment\n    expose reverse as reverse_payment\n  }\n  attach receipt = cards.transaction {\n    expose create as create_receipt\n    authorization: payment\n    expose refund as refund_payment\n  }\n}\n"},
+  {"id":"collections","title":"Small business collections","summary":"A business lender refers overdue instalments to an agency with limits on collection contacts.","headers":["collections","financing"],"source":"// A business lender refers overdue instalments to an agency with limits on collection contacts.\nprogram business_collections \"Small business collections\"\nuse collections\nuse financing\n// agency is a business this program declares, so plan needs {\"partyBindings\":{\"agency\":\"<partyId>\"}}.\n// That partyId is an organization customer's: create the Product from this source without the recovery\n// and contact attachments, add the customer with customer.create, activate its access, open its\n// customer_balance account, then compose this source with the binding.\nparty agency: business\n\nobject facility \"Business loan\" {\n  fields { businessName: text, purpose: text, price: money }\n  columns: [businessName, purpose, price]\n  attach allowance = financing.limits { expose create as create_allowance, expose approve as approve_borrower, borrower: owner, per_borrower: 100000 SAR }\n  attach budget = financing.portfolio_limit { expose create as create_budget, expose approve as approve_budget, limit: 2000000 SAR }\n  attach loan = financing.installments {\n    expose create as create_loan\n    borrower: owner, capital: operator\n    months: 12, pricing: amortizing, profit_rate: 6%, disburse_to: borrower\n    limits: allowance, portfolio: budget\n    expose sign as sign_loan\n    expose disburse as release_loan\n    expose payoff as repay_early\n  }\n  attach recovery = collections.case {\n    expose create as create_recovery\n    on: loan, agency: agency\n    expose assign as assign_case\n    expose recover as recover_payment\n    expose recall as recall_case\n  }\n  attach contact = collections.contact {\n    expose create as create_contact\n    case: recovery, agency: agency\n  }\n}\n\nexpose facility.loan.payment.create as create_payment\nexpose facility.loan.payment.pay as pay_instalment\nexpose facility.loan.payment.refund as refund_payment\nexpose facility.loan.payoff_quote.create as request_payoff_quote\n"},
   {"id":"escrow","title":"Used device sales","summary":"Buyers fund a used device purchase, then accept delivery or raise a dispute before release.","headers":["escrow"],"source":"// Buyers fund a used device purchase, then accept delivery or raise a dispute before release.\nprogram used_device_sales \"Used device sales\"\nuse escrow\n\nobject device \"Device\" {\n  fields {\n    model: text\n    condition: text\n    serialNumber: text\n    price: money\n  }\n  columns: [model, condition, price]\n  attach sale = escrow.hold {\n    expose create as create_sale\n    payer: actor, payee: owner\n    expose fund as pay_for_device\n    expose deliver as confirm_delivery\n    expose accept as accept_device\n    expose dispute as report_problem\n    expose verify_return as verify_return\n    expose refund as refund_buyer\n    expose cancel as cancel_sale\n  }\n}\n"},
   {"id":"financing","title":"Tuition instalments","summary":"A tuition lender funds a student's fees over three interest-free instalments with borrowing limits.","headers":["financing"],"source":"// A tuition lender funds a student's fees over three interest-free instalments with borrowing limits.\nprogram tuition_instalments \"Tuition instalments\"\nuse financing\n\nobject enrolment \"Enrolment\" {\n  fields { student: text, course: text, price: money }\n  columns: [student, course, price]\n  attach allowance = financing.limits {\n    expose create as create_allowance\n    borrower: owner, per_borrower: 12000 SAR\n    expose approve as approve_student\n  }\n  attach budget = financing.portfolio_limit {\n    expose create as create_budget\n    limit: 500000 SAR\n    expose approve as approve_budget\n  }\n  attach tuition = financing.installments {\n    expose create as create_tuition\n    borrower: owner, capital: operator\n    months: 3, pricing: flat_total, profit_rate: 0%, disburse_to: borrower\n    limits: allowance, portfolio: budget\n    expose sign as sign_tuition_plan\n    expose disburse as fund_tuition\n    expose payoff as repay_early\n  }\n}\n\nexpose enrolment.tuition.payment.create as create_payment\nexpose enrolment.tuition.payment.pay as pay_instalment\nexpose enrolment.tuition.payment.refund as refund_payment\nexpose enrolment.tuition.payoff_quote.create as request_payoff_quote\n"},
-  {"id":"insurance","title":"Device insurance","summary":"A device retailer collects the purchase price and attaches cover with a claim review process.","headers":["insurance","money"],"source":"// A device retailer collects the purchase price and attaches cover with a claim review process.\nprogram device_insurance \"Device insurance\"\nuse insurance\nuse money\n\nobject device \"Insured device\" {\n  fields { model: text, serialNumber: text, purchaseDate: date }\n  columns: [model, serialNumber, purchaseDate]\n  attach purchase = money.transfer {\n    expose create as create_purchase\n    payer: owner, payee: operator\n    economics pay { purpose: earning, sourceParty: owner }\n    expose pay as pay_for_device\n  }\n  // conformance_boundary is the sandbox insurer adapter; swap in the insurer's registered adapter to go live.\n  // Premiums net of commission go to its account. claim_limit is the sum insured, set per cover at creation.\n  attach protection = insurance.cover {\n    expose create as create_protection\n    holder: owner, adapter: \"conformance_boundary\", commission: 10%, covers: purchase\n    expose activate as activate_cover\n    expose cancel as cancel_cover\n  }\n  attach claim = insurance.claim {\n    expose create as create_claim\n    cover: protection, inspector: operator\n    expose approve as approve_claim\n    expose deny as deny_claim\n    expose pay as pay_claim\n  }\n}\n"},
+  {"id":"insurance","title":"Device insurance","summary":"A device retailer collects the purchase price and attaches cover with a claim review process.","headers":["insurance","money"],"source":"// A device retailer collects the purchase price and attaches cover with a claim review process.\nprogram device_insurance \"Device insurance\"\nuse insurance\nuse money\n\nobject device \"Insured device\" {\n  fields { model: text, serialNumber: text, purchaseDate: date }\n  columns: [model, serialNumber, purchaseDate]\n  attach purchase = money.transfer {\n    expose create as create_purchase\n    payer: owner, payee: operator\n    economics pay { purpose: earning, sourceParty: owner }\n    expose pay as pay_for_device\n  }\n  // conformance_boundary is the sandbox insurer adapter; swap in the insurer's registered adapter to go live.\n  // Premiums net of commission go to its account. The default broker is the retailer, which keeps the commission.\n  // claim_limit is the sum insured, set per cover at creation.\n  attach protection = insurance.cover {\n    expose create as create_protection\n    holder: owner, adapter: \"conformance_boundary\", commission: 10%, covers: purchase\n    expose activate as activate_cover\n    expose cancel as cancel_cover\n  }\n  attach claim = insurance.claim {\n    expose create as create_claim\n    cover: protection, inspector: operator\n    expose approve as approve_claim\n    expose deny as deny_claim\n    expose pay as pay_claim\n  }\n}\n"},
   {"id":"lending","title":"Community business lending","summary":"A lending composition with limit approvals, wallet commitments and cash distribution transitions.","headers":["lending","financing","wallet"],"source":"// A lending composition with limit approvals, wallet commitments and cash distribution transitions.\nprogram community_business_lending \"Community business lending\"\nuse lending\nuse financing\nuse wallet\n\nobject business \"Business funding\" {\n  fields { businessName: text, purpose: text, price: money }\n  columns: [businessName, purpose, price]\n  attach allowance = financing.limits {\n    expose create as create_allowance\n    borrower: owner, per_borrower: 100000 SAR\n    expose approve as approve_borrower\n  }\n  attach budget = financing.portfolio_limit {\n    expose create as create_budget\n    limit: 2000000 SAR\n    expose approve as approve_budget\n  }\n  attach loan = financing.installments {\n    expose create as create_loan\n    borrower: owner, capital: operator\n    months: 12, pricing: amortizing, profit_rate: 6%, disburse_to: borrower\n    limits: allowance, portfolio: budget\n    expose sign as sign_loan\n    expose disburse as release_loan\n    expose payoff as repay_early\n  }\n  attach investor_balance = wallet.balance {\n    expose create as create_investor_balance\n    holder: actor\n    expose activate as open_wallet\n    expose topup as add_funds\n  }\n  attach funding = lending.round {\n    borrower: owner, plan: loan\n    expose create as open_funding\n    expose close as close_funding\n  }\n  attach investment = lending.commitment {\n    round: funding, wallet: investor_balance, investor: actor\n    expose create as invest\n    expose withdraw as withdraw_investment\n  }\n  attach returns = lending.distribution {\n    expose create as create_returns\n    round: funding, receipt: loan.settlement\n    expose prepare_cash as prepare_returns\n    expose distribute_cash as distribute_returns\n  }\n}\n\nexpose business.loan.payment.create as create_payment\nexpose business.loan.payment.pay as pay_instalment\nexpose business.loan.payment.refund as refund_payment\nexpose business.loan.payoff_quote.create as request_payoff_quote\nexpose business.returns.share.create as create_return_share\n"},
   {"id":"library","title":"Financed car sales","summary":"A minimal financed car sale connects escrow to a three-instalment plan and lending limits.","headers":["escrow","financing"],"source":"// A minimal financed car sale connects escrow to a three-instalment plan and lending limits.\nprogram cars \"Financed car sales\"\nuse escrow\nuse financing\nobject car \"Cars\" {\n fields { make: text, model: text, year: integer }\n attach sale = escrow.hold { expose create as create_sale, payer: actor, payee: owner, expose fund as sell }\n attach limits = financing.limits { expose create as create_limits, borrower: actor, per_borrower: 60000 SAR }\n attach ceiling = financing.portfolio_limit { expose create as create_ceiling, limit: 1500000 SAR }\n attach plan = financing.installments {\n  borrower: actor, capital: operator, share: 25%\n  months: 3, pricing: flat_total, profit_rate: 2.5%, funds: sale, limits: limits, portfolio: ceiling\n  expose create as finance\n }\n}\n"},
   {"id":"marketplace","title":"Freelance marketplace","summary":"Freelancers publish offers and clients place orders with funds held until work is accepted.","headers":["marketplace","escrow"],"source":"// Freelancers publish offers and clients place orders with funds held until work is accepted.\nprogram freelance_marketplace \"Freelance marketplace\"\nuse marketplace\nuse escrow\n\nobject project \"Project\" {\n  fields { brief: text, deliverable: text, price: money }\n  columns: [brief, deliverable, price]\n  attach offer = marketplace.listing {\n    expose create as create_offer\n    seller: owner\n    expose publish as publish_offer\n    expose withdraw as withdraw_offer\n  }\n  attach order = marketplace.order {\n    expose create as create_order\n    listing: offer, buyer: actor\n    expose commit as place_order\n    expose fulfill as finish_order\n  }\n  attach payment = escrow.hold {\n    expose create as create_payment\n    payer: actor, payee: owner\n    expose fund as fund_project\n    expose deliver as submit_work\n    expose accept as accept_work\n    expose dispute as dispute_work\n    expose verify_return as verify_return\n    expose refund as refund_client\n    expose cancel as cancel_payment\n  }\n}\n"},

package/src/parse.ts

@@ -471,13 +471,16 @@ class Parser {
       this.fail("expression nesting exceeds 32", "reduce nested values");
     const start = this.peek().span.start;
     let value = this.atom();
-    if (this.eat("cap"))
+    // `cap:` starts the next entry, so a field may still be named cap.
+    if (this.at("cap") && this.tokens[this.index + 1]?.text !== ":") {
+      this.take();
       value = {
         kind: "capped",
         rate: value,
         cap: this.atom(),
         span: this.span(start),
       };
+    }
     if (this.eat("="))
       value = {
         kind: "default",