@hyperscale0/hsx 3.3.0 → 4.0.1

package/examples/cost-table.json

@@ -3,24 +3,13 @@
     "currency": "SAR",
     "declaredMeters": [
       "account.active_month",
-      "collection.pay_in.count",
-      "collection.pay_in.volume_sar",
-      "deposit.attributed.count",
-      "deposit.attributed.volume_sar",
-      "financial_address.active_month",
-      "financial_address.issued.count",
       "instrument.event.count",
       "kyb.application.review",
-      "payout.external.count",
-      "payout.external.volume_sar",
       "transfer.internal.count",
       "transfer.internal.volume_sar",
-      "verification.kyb.count",
-      "verification.kyc.basic.count",
-      "verification.kyc.investment.count",
-      "verification.kyc.standard.count"
+      "verification.kyb.count"
     ],
-    "effectiveTableDigest": "92a2b90130954fe1ff685dde716b295ce0f5ad4ee9769a10aa04f3807fc64dc9",
+    "effectiveTableDigest": "dae11d13d84dc4c66ae4f3ec61e26259fb45b25bd29f96a14e0378662e485da0",
     "fixed": {
       "activationBaseMinor": "500000",
       "activationPerPointMinor": "100000",
@@ -33,7 +22,6 @@
         "instrument": 3,
         "move": 3,
         "provider_decision": 5,
-        "subject_kind": 2,
         "timer": 1,
         "unwind": 4
       }
@@ -71,30 +59,6 @@
         "settlement": "invoice",
         "signature": "decides.kyb"
       },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.basic.count",
-        "payer": "product",
-        "perEventMinor": "2500",
-        "settlement": "invoice",
-        "signature": "decides.kyc.basic"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.investment.count",
-        "payer": "product",
-        "perEventMinor": "7500",
-        "settlement": "invoice",
-        "signature": "decides.kyc.investment"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.standard.count",
-        "payer": "product",
-        "perEventMinor": "4000",
-        "settlement": "invoice",
-        "signature": "decides.kyc.standard"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -127,22 +91,6 @@
         "settlement": "invoice",
         "signature": "meters.billing.invoice.settlement"
       },
-      {
-        "bps": 0,
-        "meter": "financial_address.active_month",
-        "payer": "product",
-        "perEventMinor": "800",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.active_month"
-      },
-      {
-        "bps": 0,
-        "meter": "financial_address.issued.count",
-        "payer": "product",
-        "perEventMinor": "2000",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.issued.count"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -159,33 +107,6 @@
         "settlement": "invoice",
         "signature": "meters.kyb.application.review"
       },
-      {
-        "bps": 8,
-        "meter": "collection.pay_in.count",
-        "payer": "end_customer",
-        "perEventMinor": "250",
-        "settlement": "per_event",
-        "signature": "moves.collection.pay_in",
-        "volumeMeter": "collection.pay_in.volume_sar"
-      },
-      {
-        "bps": 3,
-        "meter": "deposit.attributed.count",
-        "payer": "end_customer",
-        "perEventMinor": "150",
-        "settlement": "per_event",
-        "signature": "moves.deposit.attributed",
-        "volumeMeter": "deposit.attributed.volume_sar"
-      },
-      {
-        "bps": 5,
-        "meter": "payout.external.count",
-        "payer": "product",
-        "perEventMinor": "400",
-        "settlement": "per_event",
-        "signature": "moves.payout.external",
-        "volumeMeter": "payout.external.volume_sar"
-      },
       {
         "bps": 6,
         "meter": "transfer.internal.count",
@@ -274,24 +195,13 @@
     "currency": "USD",
     "declaredMeters": [
       "account.active_month",
-      "collection.pay_in.count",
-      "collection.pay_in.volume_usd",
-      "deposit.attributed.count",
-      "deposit.attributed.volume_usd",
-      "financial_address.active_month",
-      "financial_address.issued.count",
       "instrument.event.count",
       "kyb.application.review",
-      "payout.external.count",
-      "payout.external.volume_usd",
       "transfer.internal.count",
       "transfer.internal.volume_usd",
-      "verification.kyb.count",
-      "verification.kyc.basic.count",
-      "verification.kyc.investment.count",
-      "verification.kyc.standard.count"
+      "verification.kyb.count"
     ],
-    "effectiveTableDigest": "b9b790c53a6f993c11b27dc06d9373ed5e865846343ab4893fd39ea2945dc520",
+    "effectiveTableDigest": "6c96c3fb4174551132edfbab439b1ca709fa2d75a029d7a6da7e584726cb7ba3",
     "fixed": {
       "activationBaseMinor": "133300",
       "activationPerPointMinor": "26700",
@@ -304,7 +214,6 @@
         "instrument": 3,
         "move": 3,
         "provider_decision": 5,
-        "subject_kind": 2,
         "timer": 1,
         "unwind": 4
       }
@@ -342,30 +251,6 @@
         "settlement": "invoice",
         "signature": "decides.kyb"
       },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.basic.count",
-        "payer": "product",
-        "perEventMinor": "667",
-        "settlement": "invoice",
-        "signature": "decides.kyc.basic"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.investment.count",
-        "payer": "product",
-        "perEventMinor": "2000",
-        "settlement": "invoice",
-        "signature": "decides.kyc.investment"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.standard.count",
-        "payer": "product",
-        "perEventMinor": "1067",
-        "settlement": "invoice",
-        "signature": "decides.kyc.standard"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -398,22 +283,6 @@
         "settlement": "invoice",
         "signature": "meters.billing.invoice.settlement"
       },
-      {
-        "bps": 0,
-        "meter": "financial_address.active_month",
-        "payer": "product",
-        "perEventMinor": "213",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.active_month"
-      },
-      {
-        "bps": 0,
-        "meter": "financial_address.issued.count",
-        "payer": "product",
-        "perEventMinor": "533",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.issued.count"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -430,33 +299,6 @@
         "settlement": "invoice",
         "signature": "meters.kyb.application.review"
       },
-      {
-        "bps": 8,
-        "meter": "collection.pay_in.count",
-        "payer": "end_customer",
-        "perEventMinor": "67",
-        "settlement": "per_event",
-        "signature": "moves.collection.pay_in",
-        "volumeMeter": "collection.pay_in.volume_usd"
-      },
-      {
-        "bps": 3,
-        "meter": "deposit.attributed.count",
-        "payer": "end_customer",
-        "perEventMinor": "40",
-        "settlement": "per_event",
-        "signature": "moves.deposit.attributed",
-        "volumeMeter": "deposit.attributed.volume_usd"
-      },
-      {
-        "bps": 5,
-        "meter": "payout.external.count",
-        "payer": "product",
-        "perEventMinor": "107",
-        "settlement": "per_event",
-        "signature": "moves.payout.external",
-        "volumeMeter": "payout.external.volume_usd"
-      },
       {
         "bps": 6,
         "meter": "transfer.internal.count",
@@ -545,24 +387,13 @@
     "currency": "EUR",
     "declaredMeters": [
       "account.active_month",
-      "collection.pay_in.count",
-      "collection.pay_in.volume_eur",
-      "deposit.attributed.count",
-      "deposit.attributed.volume_eur",
-      "financial_address.active_month",
-      "financial_address.issued.count",
       "instrument.event.count",
       "kyb.application.review",
-      "payout.external.count",
-      "payout.external.volume_eur",
       "transfer.internal.count",
       "transfer.internal.volume_eur",
-      "verification.kyb.count",
-      "verification.kyc.basic.count",
-      "verification.kyc.investment.count",
-      "verification.kyc.standard.count"
+      "verification.kyb.count"
     ],
-    "effectiveTableDigest": "83ea8337ea1d8a9301156fec28df5ba941388cba1d83599b878f1f41d67d7af4",
+    "effectiveTableDigest": "302de8af1672e643a0e173c4e1fedbcc90fd59b120897ab41b29daf123ee619b",
     "fixed": {
       "activationBaseMinor": "125000",
       "activationPerPointMinor": "25000",
@@ -575,7 +406,6 @@
         "instrument": 3,
         "move": 3,
         "provider_decision": 5,
-        "subject_kind": 2,
         "timer": 1,
         "unwind": 4
       }
@@ -613,30 +443,6 @@
         "settlement": "invoice",
         "signature": "decides.kyb"
       },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.basic.count",
-        "payer": "product",
-        "perEventMinor": "625",
-        "settlement": "invoice",
-        "signature": "decides.kyc.basic"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.investment.count",
-        "payer": "product",
-        "perEventMinor": "1875",
-        "settlement": "invoice",
-        "signature": "decides.kyc.investment"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.standard.count",
-        "payer": "product",
-        "perEventMinor": "1000",
-        "settlement": "invoice",
-        "signature": "decides.kyc.standard"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -669,22 +475,6 @@
         "settlement": "invoice",
         "signature": "meters.billing.invoice.settlement"
       },
-      {
-        "bps": 0,
-        "meter": "financial_address.active_month",
-        "payer": "product",
-        "perEventMinor": "200",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.active_month"
-      },
-      {
-        "bps": 0,
-        "meter": "financial_address.issued.count",
-        "payer": "product",
-        "perEventMinor": "500",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.issued.count"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -701,33 +491,6 @@
         "settlement": "invoice",
         "signature": "meters.kyb.application.review"
       },
-      {
-        "bps": 8,
-        "meter": "collection.pay_in.count",
-        "payer": "end_customer",
-        "perEventMinor": "63",
-        "settlement": "per_event",
-        "signature": "moves.collection.pay_in",
-        "volumeMeter": "collection.pay_in.volume_eur"
-      },
-      {
-        "bps": 3,
-        "meter": "deposit.attributed.count",
-        "payer": "end_customer",
-        "perEventMinor": "38",
-        "settlement": "per_event",
-        "signature": "moves.deposit.attributed",
-        "volumeMeter": "deposit.attributed.volume_eur"
-      },
-      {
-        "bps": 5,
-        "meter": "payout.external.count",
-        "payer": "product",
-        "perEventMinor": "100",
-        "settlement": "per_event",
-        "signature": "moves.payout.external",
-        "volumeMeter": "payout.external.volume_eur"
-      },
       {
         "bps": 6,
         "meter": "transfer.internal.count",
@@ -816,24 +579,13 @@
     "currency": "GBP",
     "declaredMeters": [
       "account.active_month",
-      "collection.pay_in.count",
-      "collection.pay_in.volume_gbp",
-      "deposit.attributed.count",
-      "deposit.attributed.volume_gbp",
-      "financial_address.active_month",
-      "financial_address.issued.count",
       "instrument.event.count",
       "kyb.application.review",
-      "payout.external.count",
-      "payout.external.volume_gbp",
       "transfer.internal.count",
       "transfer.internal.volume_gbp",
-      "verification.kyb.count",
-      "verification.kyc.basic.count",
-      "verification.kyc.investment.count",
-      "verification.kyc.standard.count"
+      "verification.kyb.count"
     ],
-    "effectiveTableDigest": "5f24fe864b81b4d801353549381e7b17a73210ece0323db2328f0f794b554152",
+    "effectiveTableDigest": "1620e8016c6dcd451d220e024ef66852528ce6aef20038810bcfdb10a03ea70e",
     "fixed": {
       "activationBaseMinor": "104200",
       "activationPerPointMinor": "20800",
@@ -846,7 +598,6 @@
         "instrument": 3,
         "move": 3,
         "provider_decision": 5,
-        "subject_kind": 2,
         "timer": 1,
         "unwind": 4
       }
@@ -884,30 +635,6 @@
         "settlement": "invoice",
         "signature": "decides.kyb"
       },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.basic.count",
-        "payer": "product",
-        "perEventMinor": "521",
-        "settlement": "invoice",
-        "signature": "decides.kyc.basic"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.investment.count",
-        "payer": "product",
-        "perEventMinor": "1563",
-        "settlement": "invoice",
-        "signature": "decides.kyc.investment"
-      },
-      {
-        "bps": 0,
-        "meter": "verification.kyc.standard.count",
-        "payer": "product",
-        "perEventMinor": "833",
-        "settlement": "invoice",
-        "signature": "decides.kyc.standard"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -940,22 +667,6 @@
         "settlement": "invoice",
         "signature": "meters.billing.invoice.settlement"
       },
-      {
-        "bps": 0,
-        "meter": "financial_address.active_month",
-        "payer": "product",
-        "perEventMinor": "167",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.active_month"
-      },
-      {
-        "bps": 0,
-        "meter": "financial_address.issued.count",
-        "payer": "product",
-        "perEventMinor": "417",
-        "settlement": "invoice",
-        "signature": "meters.financial_address.issued.count"
-      },
       {
         "bps": 0,
         "meter": "instrument.event.count",
@@ -972,33 +683,6 @@
         "settlement": "invoice",
         "signature": "meters.kyb.application.review"
       },
-      {
-        "bps": 8,
-        "meter": "collection.pay_in.count",
-        "payer": "end_customer",
-        "perEventMinor": "52",
-        "settlement": "per_event",
-        "signature": "moves.collection.pay_in",
-        "volumeMeter": "collection.pay_in.volume_gbp"
-      },
-      {
-        "bps": 3,
-        "meter": "deposit.attributed.count",
-        "payer": "end_customer",
-        "perEventMinor": "31",
-        "settlement": "per_event",
-        "signature": "moves.deposit.attributed",
-        "volumeMeter": "deposit.attributed.volume_gbp"
-      },
-      {
-        "bps": 5,
-        "meter": "payout.external.count",
-        "payer": "product",
-        "perEventMinor": "83",
-        "settlement": "per_event",
-        "signature": "moves.payout.external",
-        "volumeMeter": "payout.external.volume_gbp"
-      },
       {
         "bps": 6,
         "meter": "transfer.internal.count",

package/examples/library.hsx

@@ -1,66 +1,14 @@
-program library "Standard library"
-use money
-use marketplace
-use vehicles
+program cars "Cars"
 use escrow
-use wallet
 use financing
-use lending
-use insurance
-use approvals
-use collections
-use travel
-use cards
-use savings
-use reporting
-party buyer: person
-party seller: business
-party officer: staff role credit_underwriter
-party carrier: business role insurance_carrier
-party merchant: business
-
-transfer = money.transfer { payer: buyer, payee: seller, amount: 100 SAR }
-hold = money.hold { payer: buyer, payee: seller, amount: 100 SAR }
-split = money.split { payer: buyer, amount: 100 SAR, shares { seller: 70%, merchant: 30% } }
-schedule = money.schedule { payer: buyer, payee: seller, amount: 100 SAR, count: 3 }
-pool = money.pool { payer: buyer, payee: seller, target: 100 SAR, closes: 2030-01-01 }
-swap = money.swap { first: buyer, second: seller, first_amount: 100 SAR, second_amount: 50 SAR, expires: 2030-01-01 }
-deposit = money.deposit { payer: buyer, payee: seller, amount: 100 SAR, expires: 2030-01-01, approval: officer }
-payout = money.payout { payer: seller, payee: buyer, amount: 100 SAR, reconcile_within: 3d }
-metered = money.metered { payer: buyer, payee: seller, unit_price: 10 SAR, units: 2 }
-batch = money.batch { payer: buyer, payee: seller, closes: 2030-01-01, approval: officer }
-listing = marketplace.listing { seller: seller, vehicle_facts: required }
-order = marketplace.order { listing: listing, buyer: buyer }
-sale = escrow.hold { payer: buyer, payee: seller, for: order, fee { seller: 1% cap 750 SAR, tax: 15% }, dispute { refund_after: return_verified } }
-purse = wallet.balance { holder: buyer, spend_limit: 1000 SAR }
-spend = wallet.spend { wallet: purse, payee: seller }
-limits = financing.limits { per_borrower: 10000 SAR, portfolio: 100000 SAR, borrower: buyer }
-plan = financing.installments { months: 3, profit: 3%, funds: sale, approval: officer }
-plan_schedule = financing.installments { months: 6, profit: 3%, funds: sale, approval: officer, disburse_to: borrower, profit_earned: by_schedule, apply: principal_profit, payoff_rebate: 50% }
-plan_upfront = financing.installments { months: 3, profit: 3%, funds: sale, approval: officer, disburse_to: funds, profit_earned: at_disbursement, apply: pro_rata, payoff_rebate: 0% }
-late = financing.late_charge { on: [plan, plan_schedule, plan_upfront], approval: officer, fines_to: seller, costs_to: seller }
-line = financing.credit_line { borrower: buyer, lender: seller, limit: 1000 SAR, expires: 2030-01-01 }
-advance = financing.advance { line: line, amount: 100 SAR }
-round = lending.round { borrower: buyer, capital: seller, plan: plan }
-ticket = lending.commitment { round: round, wallet: purse }
-distribution = lending.distribution { round: round, receipt: plan.settlement, residual_to: seller }
-cover = insurance.cover { holder: buyer, insurer: carrier, covers: sale, commission: 10% }
-claim = insurance.claim { cover: cover, approved_by: carrier }
-decision = approvals.decision { for: transfer, approved_by: officer, action: "pay" }
-case = collections.case { on: [plan, plan_schedule, plan_upfront], agency: seller, fee: 20% }
-contact = collections.contact { case: case, agency: seller }
-reminder = collections.reminder { on: plan }
-package = travel.package { price: 1000 SAR, supplier_cost: 700 SAR, departure: 2030-01-01 }
-booking = travel.booking { package: package, buyer: buyer, supplier: seller, cover: travel_cover }
-cardholder = cards.cardholder { holder: buyer }
-card = cards.card { holder: cardholder, spend_limit: 100 SAR }
-authorization = cards.authorization { card: card, merchant: merchant, approval: officer }
-transaction = cards.transaction { authorization: authorization }
-dispute = cards.dispute { transaction: transaction, approved_by: officer }
-circle = savings.circle { contribution: 100 SAR, members: 3, starts: 2030-01-01 }
-membership = savings.membership { circle: circle, member: buyer }
-travel_cover = insurance.cover { holder: buyer, insurer: carrier, commission: 10%, covers: booking }
-
-reports = reporting.portfolio { on: [plan, plan_schedule, plan_upfront] }
-vehicle = vehicles.vehicle { listing: listing, seller: seller }
-reservation = marketplace.reservation { listing: listing, funds: sale, plans: [plan, plan_schedule, plan_upfront], converters: [sale, plan, plan_schedule, plan_upfront], buyer: buyer, seller: seller }
+party underwriter: staff role credit_underwriter
+object car "Cars" {
+ fields { make: text, model: text, year: integer }
+ attach sale = escrow.hold { payer: actor, payee: owner, expose fund as sell }
+ attach limits = financing.limits { borrower: actor, per_borrower: 60000 SAR, portfolio: 1500000 SAR }
+ attach plan = financing.installments {
+  borrower: actor, capital: operator, share: 25%, approval: underwriter
+  months: 3, profit: 2.5%, funds: sale, limits: limits
+  expose create as finance
+ }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperscale0/hsx",
-  "version": "3.3.0",
+  "version": "4.0.1",
   "description": "The strictly typed HSX language: compile total financial programs into canonical UDL.",
   "keywords": [
     "hsx",
@@ -64,7 +64,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json",
+    "build": "bun run generate && tsc -p tsconfig.build.json && tsc -p playground/tsconfig.json && bun scripts/build-playground.ts",
     "typecheck": "tsc -p tsconfig.json",
     "test": "bun test test",
     "docs:build": "bun scripts/docs.ts",
@@ -73,10 +73,12 @@
     "std:bundle": "bun scripts/bundle-std.ts",
     "generate": "bun run std:bundle && bun run docs:build",
     "prepare": "bun run std:bundle",
-    "check": "bun run generate && bun run typecheck && bun run build && tsc -p playground/tsconfig.json && bun scripts/build-playground.ts && bun test test"
+    "check": "bun run typecheck && tsc -p playground/tsconfig.json && bun test test"
   },
   "dependencies": {
-    "@hyperscale0/udl": "3.2.0"
+    "@hyperscale0/adl": "1.0.0-beta.8",
+    "@hyperscale0/udl": "4.0.0",
+    "fast-sha256": "1.3.0"
   },
   "devDependencies": {
     "bun-types": "1.4.2",
@@ -87,5 +89,5 @@
     "Amir Ayub",
     "Sara AlBakaawi"
   ],
-  "gitHead": "6f9f3c0315ec07edeafca09596d3cf92c53a25fd"
+  "gitHead": "c92dd30d045d931359607fd986c323299dcd61b6"
 }

package/src/ast.ts

@@ -3,6 +3,8 @@ export interface Span {
   end: number;
 }
 export interface Diagnostic {
+  source?: string;
+  related?: readonly { source: string; span: Span; message: string }[];
   code: string;
   message: string;
   fix: string;
@@ -47,15 +49,23 @@ export interface InstrumentDecl {
   body: Extract<Expr, { kind: "block" }>;
   span: Span;
 }
+export interface AssignmentDecl {
+  kind: "assignment";
+  name: string;
+  target: string;
+  body: Extract<Expr, { kind: "block" }>;
+  span: Span;
+}
 export interface ObjectDecl {
   kind: "object";
   name: string;
-  object: string;
+  title: string;
   body: Extract<Expr, { kind: "block" }>;
   span: Span;
 }
 export type Decl =
   | InstrumentDecl
+  | AssignmentDecl
   | ObjectDecl
   | {
       kind: "party";

package/src/cli.ts

@@ -38,7 +38,7 @@ export async function runCli(argv: readonly string[], io: Io): Promise<number> {
     return 0;
   }
   if (command === "--version") {
-    io.out(`${HSX_VERSION} (UDL 3)`);
+    io.out(`${HSX_VERSION} (UDL 4)`);
     return 0;
   }
   if (