@hyperscale0/hsx 2.1.1 → 2.2.1

package/dist/src/std-bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"std-bundle.js","sourceRoot":"","sources":["../../src/std-bundle.ts"],"names":[],"mappings":"AAAA,oEAAoE;AAEpE,MAAM,CAAC,MAAM,iBAAiB,GAAgC,IAAI,GAAG,CAGnE;IACA;QACE,cAAc;QACd,s/RAAs/R;KACv/R;IACD;QACE,yBAAyB;QACzB,muTAAmuT;KACpuT;IACD;QACE,qCAAqC;QACrC,20TAA20T;KAC50T;IACD;QACE,kCAAkC;QAClC,sgeAAsge;KACvge;IACD;QACE,0CAA0C;QAC1C,+tSAA+tS;KAChuS;IACD;QACE,iCAAiC;QACjC,uwRAAuwR;KACxwR;IACD;QACE,8BAA8B;QAC9B,0yyEAA0yyE;KAC3yyE;IACD;QACE,uBAAuB;QACvB,oGAAoG;KACrG;IACD;QACE,kCAAkC;QAClC,kvfAAkvf;KACnvf;IACD;QACE,yBAAyB;QACzB,w8IAAw8I;KACz8I;IACD;QACE,8BAA8B;QAC9B,y9NAAy9N;KAC19N;IACD;QACE,iCAAiC;QACjC,2ocAA2oc;KAC5oc;IACD;QACE,mCAAmC;QACnC,m6RAAm6R;KACp6R;IACD;QACE,sCAAsC;QACtC,yrGAAyrG;KAC1rG;IACD;QACE,+BAA+B;QAC/B,6nvBAA6nvB;KAC9nvB;IACD;QACE,2BAA2B;QAC3B,63kCAA63kC;KAC93kC;IACD;QACE,kCAAkC;QAClC,wteAAwte;KACzte;IACD;QACE,kCAAkC;QAClC,modAAmod;KACpod;IACD;QACE,sBAAsB;QACtB,8qtCAA8qtC;KAC/qtC;IACD;QACE,gCAAgC;QAChC,ytjBAAytjB;KAC1tjB;IACD;QACE,uCAAuC;QACvC,y7aAAy7a;KAC17a;CACF,CAAC,CAAC"}
+{"version":3,"file":"std-bundle.js","sourceRoot":"","sources":["../../src/std-bundle.ts"],"names":[],"mappings":"AAAA,oEAAoE;AAEpE,MAAM,CAAC,MAAM,iBAAiB,GAAgC,IAAI,GAAG,CAAiB;IACpF,CAAC,cAAc,EAAE,26SAA26S,CAAC;IAC77S,CAAC,yBAAyB,EAAE,usWAAusW,CAAC;IACpuW,CAAC,qCAAqC,EAAE,y1/BAAy1/B,CAAC;IACl4/B,CAAC,kCAAkC,EAAE,4pdAA4pd,CAAC;IAClsd,CAAC,0CAA0C,EAAE,shSAAshS,CAAC;IACpkS,CAAC,iCAAiC,EAAE,s8QAAs8Q,CAAC;IAC3+Q,CAAC,8BAA8B,EAAE,g73EAAg73E,CAAC;IACl93E,CAAC,uBAAuB,EAAE,8JAA8J,CAAC;IACzL,CAAC,kCAAkC,EAAE,k7fAAk7f,CAAC;IACx9f,CAAC,yBAAyB,EAAE,siIAAsiI,CAAC;IACnkI,CAAC,8BAA8B,EAAE,slOAAslO,CAAC;IACxnO,CAAC,iCAAiC,EAAE,wucAAwuc,CAAC;IAC7wc,CAAC,mCAAmC,EAAE,4hSAA4hS,CAAC;IACnkS,CAAC,+BAA+B,EAAE,ohwBAAohwB,CAAC;IACvjwB,CAAC,2BAA2B,EAAE,gu2BAAgu2B,CAAC;IAC/v2B,CAAC,kCAAkC,EAAE,+0eAA+0e,CAAC;IACr3e,CAAC,kCAAkC,EAAE,s2dAAs2d,CAAC;IAC54d,CAAC,sBAAsB,EAAE,kxuCAAkxuC,CAAC;IAC5yuC,CAAC,gCAAgC,EAAE,ktpBAAktpB,CAAC;IACtvpB,CAAC,uCAAuC,EAAE,mtgBAAmtgB,CAAC;CAC/vgB,CAAC,CAAC"}

package/dist/src/typecheck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typecheck.d.ts","sourceRoot":"","sources":["../../src/typecheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAaV,OAAO,EAKR,MAAM,UAAU,CAAC;AASlB,OAAO,KAAK,EACV,kBAAkB,EASnB,MAAM,SAAS,CAAC;AAWjB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC;CACzC;AAkCD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,kBAAkB,CAibpB"}
+{"version":3,"file":"typecheck.d.ts","sourceRoot":"","sources":["../../src/typecheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAaV,OAAO,EAKR,MAAM,UAAU,CAAC;AASlB,OAAO,KAAK,EACV,kBAAkB,EASnB,MAAM,SAAS,CAAC;AAWjB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC;CACzC;AAkCD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,kBAAkB,CA4cpB"}

package/dist/src/typecheck.js

@@ -1,4 +1,4 @@
-import { deriveUdlActionEffects, resolveUdlActionPlans, udlDocumentSchema, udlClauseVocabulary, } from "@hyperscale0/udl";
+import { fixedIsoDurationMs, referencedUdlInstrumentIds, deriveUdlActionEffects, resolveUdlActionPlans, udlDocumentSchema, udlClauseVocabulary, } from "@hyperscale0/udl";
 import { requiredFields, generalInstrumentValue, hasActionPlanClauses, lowerGeneralProgram, } from "./emit.js";
 import { hsxClauseDiagnosticCode } from "./diagnostics.js";
 import { HSX_LIMITS } from "./limits.js";
@@ -250,6 +250,24 @@ export function checkGeneralProgram(program, options = {}) {
     if (options.publishedCatalog) {
         checkPortCaptureTypes(allocated, options.publishedCatalog, aliases, diagnostics);
     }
+    const prefixByInstrument = new Map();
+    if (options.publishedCatalog) {
+        for (const inst of options.publishedCatalog.instruments) {
+            if (inst.idPrefix) {
+                prefixByInstrument.set(inst.id, inst.idPrefix);
+            }
+        }
+    }
+    for (const [name, decl] of templates) {
+        const prefix = stringSlot(decl.body, "idPrefix", "id_prefix") ?? prefixFor(name);
+        prefixByInstrument.set(name, prefix);
+    }
+    for (const candidate of allocated) {
+        const prefix = stringSlot(candidate.body, "idPrefix", "id_prefix") ??
+            prefixFor(candidate.name.name);
+        prefixByInstrument.set(candidate.name.name, prefix);
+    }
+    const resolvePrefix = (target) => prefixByInstrument.get(target);
     const instruments = [];
     const ids = new Set();
     for (const candidate of allocated) {
@@ -263,14 +281,14 @@ export function checkGeneralProgram(program, options = {}) {
             continue;
         }
         const expandedBody = expandComprehensions(candidate.body, diagnostics);
-        const checked = checkInstrument(candidate.name, expandedBody, candidate.parties, candidate.ports, candidate.aliases, diagnostics);
+        const checked = checkInstrument(candidate.name, expandedBody, candidate.parties, candidate.ports, candidate.aliases, diagnostics, resolvePrefix);
         if (checked)
             instruments.push(checked);
     }
     if (options.publishedCatalog) {
         return checkPublishedProgram(program, options.publishedCatalog, header, subjects, instruments, diagnostics, report);
     }
-    crossInstrumentReferenceDiagnostics(instruments, diagnostics);
+    crossInstrumentReferenceDiagnostics(instruments, diagnostics, new Set(templates.keys()));
     if (header &&
         instruments.length === 0 &&
         !diagnostics.some((diagnostic) => diagnostic.severity === "error")) {
@@ -343,6 +361,10 @@ function checkPublishedProgram(program, catalog, header, authoredSubjects, autho
             report("HSX1021", exposure.span, `${target} is not an action on an explicitly used published instrument or authored instrument`, "add the matching use declaration and choose one of that instrument's actions");
             continue;
         }
+        if (action?.engineOwned || authoredAction?.slots.engineOwned === true) {
+            report("HSX1021", exposure.span, `${target} is engine-owned`, "expose a caller action instead");
+            continue;
+        }
         if (!CAMEL_CASE.test(exposure.publicName.name)) {
             report("HSX1020", exposure.publicName.span, `public action name ${exposure.publicName.name} is not camelCase`, "write a lowercase camelCase public action name");
             continue;
@@ -466,23 +488,7 @@ function publishedInstrumentClosure(uses, catalogById) {
     return selected;
 }
 function publishedInstrumentDependencies(instrument, idByPrefix) {
-    const found = new Set();
-    const visit = (value) => {
-        if (Array.isArray(value)) {
-            value.forEach(visit);
-            return;
-        }
-        if (!value || typeof value !== "object")
-            return;
-        for (const [key, child] of Object.entries(value)) {
-            if ((key === "instrumentId" || key === "childInstrumentId") &&
-                typeof child === "string") {
-                found.add(child);
-            }
-            visit(child);
-        }
-    };
-    visit(instrument);
+    const found = new Set(referencedUdlInstrumentIds(instrument));
     for (const field of Object.values(instrument.fields)) {
         const prefix = typeof field.pattern === "string"
             ? /^\^([a-z]{2,8})_\(sandbox\|live\)_/.exec(field.pattern)?.[1]
@@ -673,7 +679,6 @@ const applicationMetadataKeys = new Set([
     "action",
     "agent_description",
     "description",
-    "journeys",
     "nav",
     "navigation",
     "summary",
@@ -934,7 +939,11 @@ function allocateGeneratedPrefixes(candidates) {
 }
 function inferSettlementTypeArgument(template, rows, typeParameter) {
     for (const parameter of template.parameters) {
-        const parameterType = parameter.type;
+        const declaredType = parameter.type;
+        const parameterType = declaredType.kind === "type_apply" &&
+            declaredType.callee.name === "optional"
+            ? (declaredType.args[0] ?? declaredType)
+            : declaredType;
         if (parameterType.kind !== "type_apply" ||
             parameterType.callee.name !== "money" ||
             parameterType.args[0]?.kind !== "ident" ||
@@ -1177,9 +1186,53 @@ function instantiate(template, application, diagnostics, instrumentName, ports,
     if (diagnostics.length > dependencyDiagnosticStart)
         return undefined;
     const body = expandComprehensions(selected, diagnostics, values, portDependencies);
+    const binding = {
+        key: { kind: "ident", name: "template_binding", span: application.span },
+        qualifiers: [],
+        span: application.span,
+        value: {
+            kind: "block",
+            span: application.span,
+            entries: [
+                {
+                    key: { kind: "ident", name: "id", span: application.span },
+                    qualifiers: [],
+                    span: application.span,
+                    value: {
+                        kind: "string",
+                        value: template.name.name,
+                        span: application.span,
+                    },
+                },
+                {
+                    key: { kind: "ident", name: "parameters", span: application.span },
+                    qualifiers: [],
+                    span: application.span,
+                    value: {
+                        kind: "block",
+                        span: application.span,
+                        entries: resolvedArgs.flatMap(({ parameter }) => {
+                            const value = values.get(parameter.name.name);
+                            return value &&
+                                ["string", "number", "boolean"].includes(value.kind)
+                                ? [
+                                    {
+                                        key: parameter.name,
+                                        qualifiers: [],
+                                        span: parameter.span,
+                                        value,
+                                    },
+                                ]
+                                : [];
+                        }),
+                    },
+                },
+            ],
+        },
+    };
     return {
         ...body,
-        entries: body.entries.map((row) => {
+        entries: [...body.entries, binding].map((row) => {
             if (row.key.name !== "fields" || row.value.kind !== "block")
                 return row;
             return {
@@ -1663,9 +1716,14 @@ function substituteExpr(expr, values) {
                         }
                         : {}),
                     key: substituteName(entry.key, nestedValues),
-                    qualifiers: entry.qualifiers.map((qualifier, index) => {
+                    qualifiers: entry.qualifiers.flatMap((qualifier, index) => {
                         const value = nestedValues.get(qualifier.name);
                         const fixed = fixedQualifier(entry.key.name, qualifier.name, index);
+                        if (entry.key.name === "on" &&
+                            !fixed &&
+                            index > 0 &&
+                            value?.kind === "list")
+                            return value.items.map((item) => nameFromValue(qualifier, item));
                         return !fixed && value
                             ? nameFromValue(qualifier, value)
                             : substituteName(qualifier, nestedValues);
@@ -2094,6 +2152,17 @@ function evaluateCompileTimeCall(expr, resolveMissing = true) {
                 : undefined;
         case "basis_points":
             return first?.kind === "percent" ? numeric(first.bps) : undefined;
+        case "shift_date": {
+            const instant = first ? Date.parse(nameText(first)) : NaN;
+            const offset = second ? fixedIsoDurationMs(nameText(second)) : null;
+            if (!Number.isFinite(instant) || offset === null)
+                return text(NONE_SENTINEL);
+            const direction = third && nameText(third) === "before" ? -1 : 1;
+            const shifted = new Date(instant + direction * offset);
+            return Number.isFinite(shifted.getTime())
+                ? text(shifted.toISOString())
+                : text(NONE_SENTINEL);
+        }
         case "names": {
             const count = number(second);
             if (!first || count === undefined || count < 0 || !third)
@@ -2112,6 +2181,13 @@ function evaluateCompileTimeCall(expr, resolveMissing = true) {
                     span: expr.span,
                 }
                 : undefined;
+        case "without":
+            return first?.kind === "list" && second
+                ? {
+                    ...first,
+                    items: first.items.filter((item) => nameText(item) !== nameText(second)),
+                }
+                : undefined;
         case "concat_lists":
             return expr.args.every((arg) => arg.kind === "list")
                 ? {
@@ -2254,9 +2330,14 @@ function expandComprehensions(block, diagnostics, values = new Map(), dependenci
                 const substituted = {
                     ...row,
                     key: substituteName(row.key, locals),
-                    qualifiers: row.qualifiers.map((qualifier, index) => {
+                    qualifiers: row.qualifiers.flatMap((qualifier, index) => {
                         const value = locals.get(qualifier.name);
                         const fixed = fixedQualifier(row.key.name, qualifier.name, index);
+                        if (row.key.name === "on" &&
+                            !fixed &&
+                            index > 0 &&
+                            value?.kind === "list")
+                            return value.items.map((item) => nameFromValue(qualifier, item));
                         return !fixed && value
                             ? nameFromValue(qualifier, value)
                             : substituteName(qualifier, locals);
@@ -2327,7 +2408,7 @@ function finiteIterationValues(bound) {
         span: bound.span,
     }));
 }
-function checkInstrument(name, body, parties, ports, aliases, diagnostics) {
+function checkInstrument(name, body, parties, ports, aliases, diagnostics, resolvePrefix) {
     if (!SNAKE_CASE.test(name.name)) {
         diagnostics.push({
             code: "HSX1003",
@@ -2339,7 +2420,7 @@ function checkInstrument(name, body, parties, ports, aliases, diagnostics) {
     }
     const fieldsEntry = entry(body, "fields");
     const fields = fieldsEntry?.value.kind === "block"
-        ? checkFields(fieldsEntry.value, aliases, diagnostics)
+        ? checkFields(fieldsEntry.value, aliases, diagnostics, resolvePrefix)
         : [];
     if (!fieldsEntry) {
         diagnostics.push({
@@ -2749,7 +2830,7 @@ function checkRequiredFields(value, fields, span, diagnostics) {
     }
     return valid ? value : undefined;
 }
-function checkFields(block, aliases, diagnostics) {
+function checkFields(block, aliases, diagnostics, resolvePrefix) {
     const result = [];
     const names = new Set();
     for (const row of block.entries) {
@@ -2774,11 +2855,11 @@ function checkFields(block, aliases, diagnostics) {
             continue;
         }
         names.add(name);
-        result.push(lowerField(row, aliases, diagnostics));
+        result.push(lowerField(row, aliases, diagnostics, resolvePrefix));
     }
     return result;
 }
-function lowerField(row, aliases, diagnostics) {
+function lowerField(row, aliases, diagnostics, resolvePrefix) {
     const name = camel(row.key.name);
     let typeExpr = row.value;
     let description;
@@ -2830,6 +2911,23 @@ function lowerField(row, aliases, diagnostics) {
             span: declaredSpan,
         });
     }
+    else if (type.kind === "ref" && type.target) {
+        const prefix = resolvePrefix?.(type.target);
+        if (!extra.pattern) {
+            if (prefix) {
+                extra.pattern = `^${prefix}_(sandbox|live)_[a-z0-9]{8,64}$`;
+            }
+            else if (resolvePrefix !== undefined) {
+                diagnostics.push({
+                    code: "HSX1007",
+                    fix: "reference an instrument declared in this program, imported from std, or published in the catalogue",
+                    message: `field ${name} references unknown instrument ${type.target}`,
+                    severity: "error",
+                    span: declaredSpan,
+                });
+            }
+        }
+    }
     const structuralType = Object.hasOwn(extra, "items")
         ? "array"
         : Object.hasOwn(extra, "properties") ||
@@ -3212,8 +3310,32 @@ function pinFixedCurrencyBindings(action, fields, diagnostics) {
 function bindFieldReferences(slots, fields, action, diagnostics) {
     const externalFieldSlot = (path) => {
         const key = path.at(-1);
-        return ((path.includes("requiresAggregate") && key === "refField") ||
-            (path.includes("requiresAggregate") && key === "amountField") ||
+        const input = slots.input !== undefined && isJsonObject(slots.input)
+            ? slots.input
+            : undefined;
+        const allocation = slots.allocate !== undefined && isJsonObject(slots.allocate)
+            ? slots.allocate
+            : undefined;
+        const allocationOperand = path.includes("allocate") &&
+            ["amountField", "sourceAccountField", "paymentIdentityField"].includes(key ?? "");
+        return ((allocationOperand &&
+            Array.isArray(input?.required) &&
+            allocation !== undefined &&
+            input.required.includes(allocation[key])) ||
+            (path.includes("funding") &&
+                [
+                    "ticketRefField",
+                    "ticketAmountField",
+                    "ticketInvestorField",
+                    "ticketAccountField",
+                ].includes(key ?? "")) ||
+            (path.includes("requiresExposure") && key === "minimumField") ||
+            (path.includes("requiresAggregate") && key === "refField") ||
+            (path.includes("requiresAggregate") &&
+                ["amountField", "dateField", "positionField"].includes(key ?? "")) ||
+            (path.includes("requiresAggregate") &&
+                path.includes("dueBefore") &&
+                key === "field") ||
             (path.includes("signedSum") && key === "refField") ||
             (path.includes("signedSum") && key === "amountField") ||
             (path.includes("remainder") && key === "refField") ||
@@ -3248,7 +3370,7 @@ function bindFieldReferences(slots, fields, action, diagnostics) {
     };
     visit(slots);
 }
-function crossInstrumentReferenceDiagnostics(instruments, diagnostics) {
+function crossInstrumentReferenceDiagnostics(instruments, diagnostics, knownTargets) {
     const byId = new Map(instruments.map((instrument) => [instrument.id, instrument]));
     const report = (owner, span, message, fix) => {
         diagnostics.push({
@@ -3270,7 +3392,8 @@ function crossInstrumentReferenceDiagnostics(instruments, diagnostics) {
         for (const field of owner.fields) {
             if (field.type.kind !== "ref" || !field.type.target)
                 continue;
-            if (!byId.has(field.type.target)) {
+            if (!byId.has(field.type.target) &&
+                !knownTargets?.has(field.type.target)) {
                 report(owner, field.origin, `field ${field.name} has ref<${field.type.target}>, but that instrument does not exist`, `declare instrument ${field.type.target} or correct the ref target`);
             }
         }
@@ -3333,14 +3456,22 @@ function crossInstrumentReferenceDiagnostics(instruments, diagnostics) {
                 return;
             }
             const refField = relation.refField;
+            const anchorName = relation.anchorField ??
+                (relation.over === "siblings" ? refField : undefined);
+            const anchor = typeof anchorName === "string" ? fieldIn(owner, anchorName) : undefined;
+            const expectedTarget = anchor?.type.kind === "ref" ? anchor.type.target : owner.id;
+            if (typeof anchorName === "string" &&
+                (!anchor || anchor.type.kind !== "ref"))
+                report(owner, action.origin, `aggregate anchor ${anchorName} is not a reference`, "declare the anchor as a typed parent reference");
             if (typeof refField === "string") {
                 const field = fieldIn(target, refField);
                 if (!field) {
-                    report(owner, action.origin, `${targetId}.${refField} does not exist`, `declare ${refField} on ${targetId} as ref<${owner.id}> or correct the clause`);
+                    report(owner, action.origin, `${targetId}.${refField} does not exist`, `declare ${refField} on ${targetId} as ref<${expectedTarget}> or correct the clause`);
                 }
                 else if (field.type.kind !== "ref" ||
-                    (field.type.target !== undefined && field.type.target !== owner.id)) {
-                    report(owner, action.origin, `${targetId}.${refField} has ${typeWords(field.type)}; this relation needs ref<${owner.id}>`, `change ${targetId}.${refField} to ref<${owner.id}>`);
+                    (field.type.target !== undefined &&
+                        field.type.target !== expectedTarget)) {
+                    report(owner, action.origin, `${targetId}.${refField} has ${typeWords(field.type)}; this relation needs ref<${expectedTarget}>`, `change ${targetId}.${refField} to ref<${expectedTarget}>`);
                 }
             }
             const check = jsonObject(relation.check);
@@ -3355,8 +3486,9 @@ function crossInstrumentReferenceDiagnostics(instruments, diagnostics) {
             }
             const targetField = check?.targetField;
             if (typeof targetField === "string" &&
-                fieldIn(owner, targetField)?.type.kind !== "money") {
-                report(owner, action.origin, `${owner.id}.${targetField} is not declared money`, `declare ${owner.id}.${targetField} as money<C> or correct the aggregate target`);
+                fieldIn(owner, targetField)?.type.kind !==
+                    (check?.kind === "count_at_least" ? "integer" : "money")) {
+                report(owner, action.origin, `${owner.id}.${targetField} is not declared ${check?.kind === "count_at_least" ? "integer" : "money"}`, `declare ${owner.id}.${targetField} as money<C> or correct the aggregate target`);
             }
             const statuses = relation.statuses;
             if (Array.isArray(statuses)) {