@hyperscale0/hsx 1.0.337 → 1.0.339

package/src/catalog-program.ts

@@ -24,7 +24,7 @@ object item "Item" {
  attach transfer = money.transfer { payer: actor, payee: owner, amount: 750 SAR }
  attach hold = money.hold { payer: actor, payee: owner, amount: 750 SAR }
  attach split = money.split { payer: actor, amount: 750 SAR }
- attach schedule = money.schedule { payer: actor, payee: owner, amount: 750 SAR, count: 3 }
+ attach schedule = money.schedule { payer: owner, payee: operator, amount: 250 SAR, every: 1 month }
  attach pool = money.pool { payer: actor, payee: owner, target: 1000 SAR, closes: 2027-01-01 }
  attach swap = money.swap { first: actor, second: owner, first_amount: 100 SAR, second_amount: 200 SAR, expires: 2027-01-01 }
  attach payout = money.payout { payer: actor, payee: owner, adapter: "conformance_boundary" }

package/src/compile.ts

@@ -43,6 +43,8 @@ import { parseProgram } from "./parse.ts";
 import {
   applyAttachmentEconomics,
   purposeWarnings,
+  samePartyMoves,
+  unboundEconomicSources,
 } from "./attachment-economics.ts";
 import { parseHeader } from "./header-source.ts";
 import {
@@ -331,6 +333,24 @@ function decimal(raw: string, scale: number, expr: Expr): string {
     BigInt(fraction.padEnd(scale, "0") || "0")
   ).toString();
 }
+/**
+ * A calendar period as ISO-8601 text: `1 month`, `2 weeks`, `7d` or `P1M`.
+ * Days, weeks, months and years only, the units Stripe and Shopify bill in.
+ */
+function periodText(expr: Expr): string | undefined {
+  if (!["duration", "text", "name"].includes(expr.kind)) return undefined;
+  const value = (expr as { value: string }).value.trim();
+  const units: Record<string, string> = { d: "D", w: "W", m: "M", y: "Y" };
+  const words = /^([1-9]\d{0,3}) ?(day|week|month|year)s?$/.exec(value);
+  const short = /^([1-9]\d{0,3})(d|w)$/.exec(value);
+  const iso =
+    /^P(?!$)(?:[1-9]\d{0,3}Y)?(?:[1-9]\d{0,3}M)?(?:[1-9]\d{0,3}W)?(?:[1-9]\d{0,3}D)?$/.exec(
+      value,
+    );
+  if (words) return `P${words[1]}${units[words[2]![0]!]}`;
+  if (short) return `P${short[1]}${units[short[2]!]}`;
+  return iso ? value : undefined;
+}
 function literal(expr: Expr, expectedType?: string): string | number | boolean {
   if (expr.kind === "text" && expectedType === "duration")
     return literal({ ...expr, kind: "duration" });
@@ -778,6 +798,8 @@ export function compile(
         revision?: number | undefined;
       },
       standardOrigin?: NonNullable<CompileOriginMapEntry["standardBlock"]>,
+      /** Declared tunables, true where the author bound them. */
+      inheritedTunables = new Map<string, boolean>(),
     ) => {
       const resolveFamilyInstruments = (
         family: UdlFamily,
@@ -970,6 +992,9 @@ export function compile(
         suppliedEntries.set(entry.key, entry);
       }
       const environment = new Map<string, Expr>(inherited);
+      // `when every is set` asks whether the author bound a tunable; a
+      // default leaves it unset.
+      const tunables = new Map(inheritedTunables);
       const parameterErrors: Diagnostic[] = [];
       for (const param of decl.parameters) {
         const type =
@@ -979,7 +1004,8 @@ export function compile(
         const typeName =
           type.kind === "type" || type.kind === "call" ? type.name : text(type);
         const partyParameter = attachmentInfo && typeName === "party";
-        const optional = type.kind === "type" && type.optional;
+        const optional =
+          (type.kind === "type" || type.kind === "call") && !!type.optional;
         // An optional party stays unset unless the attachment binds it, so a
         // program party that shares its name does not switch it on.
         const byName: Expr | undefined =
@@ -989,6 +1015,7 @@ export function compile(
             document.parties[param.key])
             ? { kind: "name", value: param.key, span: origin }
             : undefined;
+        tunables.set(param.key, supplied.has(param.key) || !!byName);
         const actual =
           supplied.get(param.key) ??
           byName ??
@@ -1036,11 +1063,10 @@ export function compile(
       }
       for (const dependency of dependencies) {
         const selected = environment.get(dependency.when);
-        if (
-          selected?.kind === "name" &&
-          selected.value === dependency.is &&
-          !environment.has(dependency.binding)
-        ) {
+        const holds = enums.has(dependency.when)
+          ? selected?.kind === "name" && selected.value === dependency.is
+          : tunables.get(dependency.when) === (dependency.is === "set");
+        if (holds && !environment.has(dependency.binding)) {
           throw new CompileFailure({
             code: "HSX1001",
             message: dependency.message.replaceAll(
@@ -1221,7 +1247,10 @@ export function compile(
                 .filter(
                   (p) =>
                     p.value.kind !== "default" &&
-                    !(p.value.kind === "type" && p.value.optional),
+                    !(
+                      (p.value.kind === "type" || p.value.kind === "call") &&
+                      p.value.optional
+                    ),
                 )
                 .map((p) => p.key) ?? [];
             fail(
@@ -1331,6 +1360,9 @@ export function compile(
             /^P/.test(v.value)
           )
             v = { ...v, kind: "duration" };
+          // A period lowers as ISO text, so `after` steps calendar months.
+          const period = type === "period" ? periodText(v) : undefined;
+          if (period) v = { kind: "text", value: period, span: v.span };
           environment.set(param.key, v);
           if (type === "enum" && t.kind === "call") {
             if (v.kind !== "name" || !t.args.some((a) => text(a) === v.value))
@@ -1453,6 +1485,13 @@ export function compile(
                 items: [v],
                 span: v.span,
               });
+          } else if (type === "period") {
+            if (!period)
+              fail(
+                v,
+                `${param.key} needs a calendar period`,
+                `write ${param.key}: 1 month, 2 weeks, 1 year or 7 days`,
+              );
           } else if (type === "fee" || type === "split" || type === "policy") {
             if (v.kind !== "block")
               fail(
@@ -1571,6 +1610,41 @@ export function compile(
         throw new CompileFailure(parameterErrors[0]!);
       }
       const body = entries(decl.body);
+      // A ceiling caps a tunable by the value of an enum tunable, such as the
+      // longest term per loan kind. An unset tunable takes the ceiling; a
+      // supplied one may lower it, never raise it.
+      for (const ceiling of asBlock(body.get("ceilings")).entries) {
+        const table = entries(asBlock(ceiling.value));
+        const by = table.get("by");
+        const selected = by && environment.get(text(by));
+        if (!by || selected?.kind !== "name")
+          fail(
+            ceiling,
+            `ceiling ${ceiling.key} needs by: an enum tunable`,
+            "write by: kind and one maximum per enum value",
+          );
+        const maximum = table.get(selected.value);
+        if (maximum?.kind !== "number")
+          fail(
+            ceiling,
+            `ceiling ${ceiling.key} has no maximum for ${selected.value}`,
+            `add ${selected.value}: number to the ceiling`,
+          );
+        if (!tunables.get(ceiling.key)) {
+          environment.set(ceiling.key, { ...maximum, span: origin });
+          continue;
+        }
+        const supplied = environment.get(ceiling.key)!;
+        if (
+          supplied.kind !== "number" ||
+          BigInt(supplied.value) > BigInt(maximum.value)
+        )
+          fail(
+            supplied,
+            `${ceiling.key} for ${selected.value} is at most ${maximum.value}`,
+            `choose ${ceiling.key} of ${maximum.value} or less, or omit it`,
+          );
+      }
       for (const constraint of asBlock(body.get("constraints")).entries) {
         const rule = constraint.value;
         if (
@@ -1591,6 +1665,13 @@ export function compile(
             "constraint needs two declared tunables",
             "name the compared tunables",
           );
+        // A runtime value is checked when the agreement is created.
+        if (
+          [left, right].some(
+            (expr) => expr.kind === "name" && expr.value === "runtime",
+          )
+        )
+          continue;
         const numericKind = (expr: Expr) =>
           expr.kind === "name" && /^P(?:\d|T)/.test(expr.value)
             ? "duration"
@@ -1631,6 +1712,7 @@ export function compile(
             "summary",
             "invariants",
             "constraints",
+            "ceilings",
             "dependencies",
             "parameterDiagnostics",
             "reports",
@@ -1873,9 +1955,71 @@ export function compile(
             : value.value;
         return literal(value);
       };
+      const branchMatches = (entry: Entry): boolean => {
+        const [, tunable, relation, choice] = entry.key.split(" ");
+        // `when every is set` holds when the author bound the tunable, so an
+        // optional tunable and a defaulted one both read as unset.
+        if (
+          relation === "is" &&
+          (choice === "set" || choice === "unset") &&
+          tunables.has(tunable!) &&
+          !enums.has(tunable!)
+        )
+          return tunables.get(tunable!) === (choice === "set");
+        const binding = environment.get(tunable!);
+        if (!binding)
+          fail(
+            entry,
+            `unknown branch tunable ${tunable}`,
+            "name an enum, reference or optional tunable declared by this header",
+          );
+        if (relation === "has") {
+          // Inspect declarations, not lowering order: a bound object may
+          // appear after the instrument that asks about its fields.
+          const bound = resolve(binding!);
+          const [root, ...children] = text(bound).split(".");
+          const assignment = assignments.get(root!);
+          let target = assignment
+            ? templates.get(assignment.target)?.body
+            : program.decls
+                .filter(
+                  (decl): decl is InstrumentDecl => decl.kind === "instrument",
+                )
+                .find((decl) => decl.name === root)?.body;
+          for (const child of children) {
+            const record = target
+              ? entries(asBlock(entries(target).get("records"))).get(child)
+              : undefined;
+            target = record ? asBlock(record) : undefined;
+          }
+          if (!target)
+            fail(
+              entry,
+              "field branch needs a declared object",
+              "bind a reference to a declared object",
+            );
+          return entries(asBlock(entries(target!).get("fields"))).has(choice!);
+        }
+        if (!enums.get(tunable!)?.includes(choice!))
+          fail(
+            entry,
+            `unknown enum branch ${choice}`,
+            "use a declared enum value, or set or unset",
+          );
+        return text(binding!) === choice;
+      };
+      // Fields and inputs take `when` branches too; a branch holds field rows.
+      const branchRows = (block: BlockExpr): Entry[] =>
+        block.entries.flatMap((row) =>
+          row.key.startsWith("when ")
+            ? branchMatches(row)
+              ? branchRows(asBlock(row.value))
+              : []
+            : [row],
+        );
       const lowerFields = (block: BlockExpr): UdlField[] => {
         const result: UdlField[] = [];
-        for (const row of block.entries) {
+        for (const row of branchRows(block)) {
           const { type: t } = fieldType(row);
           const constant =
             row.value.kind === "default" ? resolve(row.value.value) : undefined;
@@ -2086,6 +2230,15 @@ export function compile(
                   milliseconds: args[1]!,
                   direction: constant.name as "before" | "after",
                 });
+              // after(start, 1 month, 3) steps calendar periods from start.
+              else if (constant.name === "after" && args.length === 3)
+                calculations.push({
+                  target,
+                  op: "step",
+                  date: args[0]!,
+                  period: args[1]!,
+                  times: args[2]!,
+                });
               else
                 fail(
                   constant,
@@ -2179,53 +2332,7 @@ export function compile(
           ...block,
           entries: block.entries.flatMap((entry) => {
             if (!entry.key.startsWith("when ")) return [entry];
-            const [, tunable, relation, choice] = entry.key.split(" ");
-            const binding = environment.get(tunable!);
-            if (!binding)
-              fail(
-                entry,
-                `unknown branch tunable ${tunable}`,
-                "name an enum or reference tunable declared by this header",
-              );
-            let matches: boolean;
-            if (relation === "has") {
-              // Inspect declarations, not lowering order: a bound object may
-              // appear after the instrument that asks about its fields.
-              const bound = resolve(binding!);
-              const [root, ...children] = text(bound).split(".");
-              const assignment = assignments.get(root!);
-              let target = assignment
-                ? templates.get(assignment.target)?.body
-                : program.decls
-                    .filter(
-                      (decl): decl is InstrumentDecl =>
-                        decl.kind === "instrument",
-                    )
-                    .find((decl) => decl.name === root)?.body;
-              for (const child of children) {
-                const record = target
-                  ? entries(asBlock(entries(target).get("records"))).get(child)
-                  : undefined;
-                target = record ? asBlock(record) : undefined;
-              }
-              if (!target)
-                fail(
-                  entry,
-                  "field branch needs a declared object",
-                  "bind a reference to a declared object",
-                );
-              matches = entries(asBlock(entries(target!).get("fields"))).has(
-                choice!,
-              );
-            } else {
-              if (!enums.get(tunable!)?.includes(choice!))
-                fail(
-                  entry,
-                  `unknown enum branch ${choice}`,
-                  "use a declared enum value",
-                );
-              matches = text(binding!) === choice;
-            }
+            const matches = branchMatches(entry);
             const body = asBlock(entry.value);
             for (const clause of body.entries)
               if (
@@ -3397,6 +3504,7 @@ export function compile(
                   .join("."),
               }
             : undefined,
+          tunables,
         );
       }
     };
@@ -4710,12 +4818,31 @@ export function compile(
           );
         }),
       };
+    const sameParty = samePartyMoves(
+      document,
+      attachedSelectors,
+      attachEntries,
+    );
+    const unbound = unboundEconomicSources(
+      document,
+      attachedSelectors,
+      attachEntries,
+    );
+    if (sameParty.errors.length || unbound.length)
+      return {
+        verdict: "invalid",
+        warnings: [],
+        diagnostics: [...sameParty.errors, ...unbound].map((d) =>
+          diagnostic(d, "check"),
+        ),
+      };
     return {
       verdict: "valid",
       diagnostics: [],
-      warnings: purposeWarnings(document, attachedSelectors, attachEntries).map(
-        (d) => ({ ...diagnostic(d, "check"), severity: "warning" }),
-      ),
+      warnings: [
+        ...sameParty.warnings,
+        ...purposeWarnings(document, attachedSelectors, attachEntries),
+      ].map((d) => ({ ...diagnostic(d, "check"), severity: "warning" })),
       artifacts: {
         document: validated.value,
         costManifest: buildUdlCostManifest(validated.value),

package/src/examples-bundle.ts

@@ -1,7 +1,7 @@
 // Generated by open/hsx/scripts/bundle-examples.ts. Do not edit by hand.
 import type { HsxExample } from "./examples.ts";
 export const examples: HsxExample[] = [
-  {"id":"camera-rental","title":"Camera rentals","summary":"Riyadh camera shop holds a 1,000 SAR deposit on each rental and charges 50 SAR for each day a camera comes back late, after one day of grace, up to 300 SAR.","headers":["money"],"source":"// Riyadh camera shop holds a 1,000 SAR deposit on each rental and charges 50 SAR\n// for each day a camera comes back late, after one day of grace, up to 300 SAR.\nprogram camera_rentals \"Camera rentals\"\nuse money\n\n// The customer owns the rental and pays both the deposit and any late fee.\n// The shop is payee, so its own session keeps a damaged camera's deposit with\n// keep_deposit; released_by stays on the default payee. Late fees are earnings.\nobject rental \"Camera rental\" {\n  fields { camera: text, returnBy: date }\n  columns: [camera, returnBy]\n  attach deposit = money.hold {\n    payer: owner, payee: operator, amount: 1000 SAR\n    expose create as agree_deposit\n    expose fund as pay_deposit\n    expose release as keep_deposit\n    expose refund as return_deposit\n  }\n  attach late = money.late_fee {\n    payer: owner, payee: operator, amount: 50 SAR, cap: 300 SAR, period: 1d, grace: 1d\n    rename { dueAt: returnBy }\n    expose create as agree_late_fees\n    expose stop as record_return\n  }\n}\n"},
+  {"id":"camera-rental","title":"Camera rentals","summary":"Riyadh camera shop holds a 1,000 SAR deposit on each rental and charges 50 SAR for each day a camera comes back late, after one day of grace, up to 300 SAR.","headers":["money"],"source":"// Riyadh camera shop holds a 1,000 SAR deposit on each rental and charges 50 SAR\n// for each day a camera comes back late, after one day of grace, up to 300 SAR.\nprogram camera_rentals \"Camera rentals\"\nuse money\n\n// The customer owns the rental and pays both the deposit and any late fee.\n// The shop is payee, so its own session keeps a damaged camera's deposit with\n// keep_deposit; released_by stays on the default payee. Late fees are earnings.\n// A return keeps the fees owed so far; waive_late_fees forgives the ones a\n// customer never funds. The shop starts the fees, and change_return moves the\n// unpaid ones to a later returnBy.\nobject rental \"Camera rental\" {\n  fields { camera: text, returnBy: date }\n  columns: [camera, returnBy]\n  attach deposit = money.hold {\n    payer: owner, payee: operator, amount: 1000 SAR\n    expose create as agree_deposit\n    expose fund as pay_deposit\n    expose release as keep_deposit\n    expose refund as return_deposit\n  }\n  attach late = money.late_fee {\n    payer: owner, payee: operator, amount: 50 SAR, cap: 300 SAR, period: 1d, grace: 1d\n    rename { dueAt: returnBy }\n    expose create as start_late_fees\n    expose stop as record_return\n    expose waive as waive_late_fees\n    expose reschedule as change_return\n  }\n}\n"},
   {"id":"cards","title":"Boston catering cards","summary":"Boston catering cards lets staff reserve supplier purchases up to 5,000 SAR each. Supplier cancellation releases the reservation; captured purchases support a full refund or a reviewed dispute.","headers":["cards"],"source":"// Boston catering cards lets staff reserve supplier purchases up to 5,000 SAR each.\n// Supplier cancellation releases the reservation; captured purchases support a full refund or a reviewed dispute.\nprogram team_expense_cards \"Boston catering cards\"\nuse cards\nparty supplier: business\n\n// Bind supplier to the food wholesaler. Staff customers own their card records.\n// Card fee: 0%, tax: 0% on card access because the caterer charges staff nothing.\n// A supplier invoice might be 2,000 SAR plus 15% VAT, paid as one 2,300 SAR\n// authorization. cards does not calculate or remit the supplier's invoice VAT.\nobject employee \"Catering expense card\" {\n  fields { employeeName: text, department: text }\n  columns: [employeeName, department]\n  attach holder = cards.cardholder {\n    holder: owner\n    expose create as enrol_employee\n    expose activate as activate_employee\n    expose suspend as suspend_employee\n    expose resume as restore_employee\n    expose close as close_employee_access\n    expose operator_close as remove_employee_access\n  }\n  attach card = cards.card {\n    holder: holder, person: owner, issuer: operator, spend_limit: 5000 SAR\n    expose create as issue_card\n    expose activate as activate_card\n    expose freeze as freeze_lost_card\n    expose unfreeze as restore_found_card\n    expose issuer_freeze as block_card\n    expose issuer_unfreeze as unblock_card\n    expose cancel as cancel_card\n    expose issuer_cancel as retire_employee_card\n  }\n  // Supply the gross invoice amount and expiresAt, such as 24 hours after\n  // ordering. Pending and approved authorizations expire without capture.\n  attach payment = cards.authorization {\n    card: card, merchant: supplier, issuer: operator\n    expose create as request_supplier_payment\n    expose approve as approve_payment\n    expose decline as decline_payment\n    expose capture as capture_delivered_order\n    expose reverse as cancel_supplier_reservation\n  }\n  attach receipt = cards.transaction {\n    authorization: payment\n    expose create as record_captured_purchase\n    expose refund as refund_supplier_purchase\n  }\n  attach complaint = cards.dispute {\n    transaction: receipt, issuer: operator, within: 30d\n    expose create as dispute_supplier_purchase\n    expose review as review_purchase_dispute\n    expose win as uphold_dispute_and_refund\n  }\n  // A dispute unresolved after 30 days becomes lost. A refund always needs\n  // the supplier's funds; the card header does not prove card-network settlement.\n}\n"},
   {"id":"collections","title":"Portland cafe equipment finance","summary":"Portland cafe equipment finance lends 24,000 SAR over 12 months and refers debt seven days overdue. Its agency earns 10% of each recovery from the lender, with at most four contacts per 30 days.","headers":["collections","financing"],"source":"// Portland cafe equipment finance lends 24,000 SAR over 12 months and refers debt seven days overdue.\n// Its agency earns 10% of each recovery from the lender, with at most four contacts per 30 days.\nprogram business_collections \"Portland cafe equipment finance\"\nuse collections\nuse financing\nparty agency: business\n\n// Bind agency to the collector. The cafe owns the facility. Set price to\n// 24,000 SAR: 6% flat profit is 1,440 SAR, repaid in twelve 2,120 SAR payments.\n// Loan fee: 0%, tax: 0% on principal. The agency invoices 15% VAT on its\n// recovery service outside collections.case, which posts only the 10% fee.\nobject facility \"Cafe equipment facility\" {\n  fields { businessName: text, purpose: text, price: money }\n  columns: [businessName, purpose, price]\n  attach allowance = financing.limits {\n    borrower: owner, per_borrower: 100000 SAR\n    expose create as request_borrower_limit\n    expose approve as approve_borrower\n  }\n  attach budget = financing.portfolio_limit {\n    limit: 2000000 SAR\n    expose create as create_lending_budget\n    expose approve as approve_budget\n  }\n  // Approve both limits and provide twelve future due dates before disbursement.\n  attach loan = financing.installments {\n    borrower: owner, capital: operator, share: 0%\n    months: 12, pricing: flat_total, profit_rate: 6%, disburse_to: borrower\n    payoff_rebate: 100%, refund_within: 30d, write_off_after: 90d\n    limits: allowance, portfolio: budget\n    expose create as quote_equipment_loan\n    expose sign as sign_loan\n    expose disburse as release_loan\n    expose cancel as decline_loan_quote\n    expose void as cancel_unfunded_loan\n    expose payoff as repay_early\n    expose complete as close_repaid_loan\n  }\n  // Select matching plan, overdue slice and pending payment when opening.\n  // Recovery pays that payment, not necessarily the whole remaining debt.\n  attach recovery = collections.case {\n    on: loan, agency: agency, capital: operator, overdue: 7d, fee: 10%\n    expose create as refer_overdue_instalment\n    expose assign as assign_agency\n    expose recover as collect_referred_payment\n    expose recall as recall_collection_case\n    expose return_uncollected as return_uncollected_case\n  }\n  attach contact = collections.contact {\n    case: recovery, agency: agency\n    max_contacts: 4, window: 30d, contact_from: 9, contact_until: 18\n    timezone: \"Asia/Riyadh\"\n    expose create as record_collection_contact\n  }\n}\n\nexpose facility.contact.outcome.create as record_contact_outcome\nexpose facility.loan.payment.create as record_repayment\nexpose facility.loan.payment.pay as pay_instalment\nexpose facility.loan.payment.refund as refund_mistaken_repayment\nexpose facility.loan.payoff_quote.create as request_payoff_quote\n// A disputed contact can be recorded, then capital can recall the case.\n// Uncollectible principal needs a separate capital decision after 90 days.\nexpose facility.loan.write_off_request.create as request_overdue_write_off\nexpose facility.loan.write_off_request.apply as approve_overdue_write_off\nexpose facility.loan.write_off_request.cancel as cancel_write_off_request\n"},
   {"id":"escrow","title":"Seattle used laptops","summary":"Seattle used laptops holds a buyer's 2,300 SAR until the laptop arrives and passes inspection. Delivery has seven days; the buyer has 48 hours to accept or dispute before the operator reviews the sale.","headers":["escrow"],"source":"// Seattle used laptops holds a buyer's 2,300 SAR until the laptop arrives and passes inspection.\n// Delivery has seven days; the buyer has 48 hours to accept or dispute before the operator reviews the sale.\nprogram used_device_sales \"Seattle used laptops\"\nuse escrow\nparty seller: business\n\n// Bind seller to the refurbisher. Set price to the agreed gross invoice, for\n// example 2,300 SAR. The company keeps 5%, 115 SAR, plus 15% VAT on that fee.\n// Seller receives 2,167.75 SAR. Any VAT on the laptop is on the seller's invoice.\nobject device \"Laptop purchase\" {\n  fields { model: text, condition: text, serialNumber: text, price: money }\n  columns: [model, condition, serialNumber, price]\n  attach sale = escrow.hold {\n    payer: owner, payee: seller\n    fee: { seller: 5%, tax: 15% }\n    deliver_within: 7d, accept_within: 48h\n    dispute: { refund_after: return_verified }\n    expose create as agree_purchase\n    expose fund as pay_for_laptop\n    expose deliver as confirm_delivery\n    expose accept as accept_laptop\n    expose dispute as report_problem\n    expose verify_return as verify_returned_laptop\n    expose refund as refund_buyer\n    expose refund_undelivered as refund_missing_delivery\n    expose settle_release as resolve_in_seller_favour\n    expose settle_return as resolve_in_buyer_favour\n    expose settle_refund as finish_buyer_refund\n    expose cancel as cancel_unpaid_purchase\n  }\n}\n"},

package/src/headers.ts

@@ -83,7 +83,12 @@ export function headerManifest(
                   ? { values: type.args.map(spelling) }
                   : {}),
                 ...tunableBounds(type),
-                required: !fallback && !(type.kind === "type" && type.optional),
+                required:
+                  !fallback &&
+                  !(
+                    (type.kind === "type" || type.kind === "call") &&
+                    type.optional
+                  ),
                 ...(fallback ? { default: spelling(fallback) } : {}),
               };
             });

package/src/language.ts

@@ -50,6 +50,7 @@ const types = new Set([
   "ref",
   "date",
   "duration",
+  "period",
   "text",
   "integer",
   "percent",

package/src/parse.ts

@@ -255,6 +255,13 @@ class Parser {
       }
       if (this.eat("expose")) {
         const action = this.identifier();
+        // r340: the Architect wrote expose occurrence.pay seven times against
+        // a bare "expected a name" and never found the program-level form.
+        if (this.at("."))
+          this.fail(
+            `expose inside an attachment takes one of its own actions, not ${action}.<action>`,
+            `delete this line, or expose a caller action of ${action} at program level: expose <object>.<attachment>.${action}.<action> as <name>`,
+          );
         let publicName = action;
         if (this.eat("as")) {
           publicName = this.identifier();
@@ -557,7 +564,15 @@ class Parser {
         args.push(this.expression());
         this.separators();
       }
-      return { kind: "call", name, args, span: this.span(start) };
+      // `integer(1, 366)?` keeps its bounds and may stay unset.
+      const optional = this.eat("?");
+      return {
+        kind: "call",
+        name,
+        args,
+        ...(optional ? { optional } : {}),
+        span: this.span(start),
+      };
     }
     let target: string | undefined;
     let owner: string | undefined;