@hyperscale0/hsx 4.0.1 → 4.1.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# HSX 4.1.1
+
+`examples/serviced.hsx` is a second worked programme: a financed sale with a late charge, payment reminders, an early payoff rebate and a write-off. The car financing spec compiles it from the file. No grammar or standard library change.
+
+# HSX 4.1.0
+
+Second-person approval is deleted from the grammar and the standard library. `financing.portfolio_limit` is a top-level instrument, a plan's `funds` hold is optional, and `insurance.cover` and `financing.credit_line` name their provider with `adapter: text` instead of a party. A car financing programme compiles from the standard library and is covered by its own spec.
+
 # HSX 4.0.1
 
 The compiler resolves list targets in field blocks and child record export paths, refuses duplicate child export path suffixes naming both candidates, and no longer restricts aggregate limit bounds at compile time; `<= self.<field>` bounds resolve at runtime. No grammar change.

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

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/compile.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAcL,KAAK,WAAW,EAOjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAIL,KAAK,UAAU,EAKf,KAAK,IAAI,EACV,MAAM,UAAU,CAAC;AAClB,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;CACpC;AACD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C;AACD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,eAAe,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC;CAClE;AACD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,SAAS,CAAC,EAAE;QACV,QAAQ,EAAE,WAAW,CAAC;QACtB,YAAY,EAAE,eAAe,CAAC;QAC9B,SAAS,EAAE,qBAAqB,EAAE,CAAC;KACpC,CAAC;CACH;AA2TD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,cAAmB,GAC3B,aAAa,CAspFf"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/compile.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAcL,KAAK,WAAW,EAOjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAIL,KAAK,UAAU,EAKf,KAAK,IAAI,EACV,MAAM,UAAU,CAAC;AAClB,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;CACpC;AACD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C;AACD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,eAAe,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC;CAClE;AACD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,SAAS,CAAC,EAAE;QACV,QAAQ,EAAE,WAAW,CAAC;QACtB,YAAY,EAAE,eAAe,CAAC;QAC9B,SAAS,EAAE,qBAAqB,EAAE,CAAC;KACpC,CAAC;CACH;AA2TD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,cAAmB,GAC3B,aAAa,CAs+Ef"}

package/dist/src/compile.js

@@ -368,8 +368,6 @@ export function compile(source, options = {}) {
             }
         }
         const origins = [];
-        const materialApprovals = new Set();
-        const implicitDecisions = new Map();
         const resolveFamily = (rawPath, expr, required = true) => {
             const parts = rawPath.split(".");
             if (parts.length < 2) {
@@ -419,7 +417,7 @@ export function compile(source, options = {}) {
             }
             return { module: moduleName, exportPath, revision };
         };
-        const addInstrument = (decl, id, arguments_, origin, inherited = new Map(), inheritedApprovers = new Set(), inheritedEnums = new Map(), attachmentInfo, familyDeclaration) => {
+        const addInstrument = (decl, id, arguments_, origin, inherited = new Map(), inheritedEnums = new Map(), attachmentInfo, familyDeclaration) => {
             const resolveFamilyInstruments = (family, currentInstId, expr) => {
                 const found = new Set();
                 if (currentInstId && familyDeclaration) {
@@ -551,7 +549,6 @@ export function compile(source, options = {}) {
                 if (type.kind === "call" && type.name === "enum")
                     enums.set(parameter.key, type.args.map(text));
             }
-            const approvers = new Set(inheritedApprovers);
             const supplied = new Map();
             for (const entry of arguments_.entries) {
                 if (supplied.has(entry.key))
@@ -563,7 +560,7 @@ export function compile(source, options = {}) {
                 const type = param.value.kind === "default" ? param.value.type : param.value;
                 const fallback = param.value.kind === "default" ? param.value.value : undefined;
                 const typeName = type.kind === "type" || type.kind === "call" ? type.name : text(type);
-                const partyParameter = attachmentInfo && (typeName === "party" || typeName === "approval");
+                const partyParameter = attachmentInfo && typeName === "party";
                 const byName = partyParameter &&
                     (subjectPartyRoles.includes(param.key) ||
                         document.parties[param.key])
@@ -671,7 +668,7 @@ export function compile(source, options = {}) {
                 const type = t.kind === "type" || t.kind === "call" ? t.name : text(t);
                 const v = (supplied.has(param.key) && !attachmentInfo) || type === "enum"
                     ? actual
-                    : resolve(actual, new Set(), !!attachmentInfo && (type === "party" || type === "approval"));
+                    : resolve(actual, new Set(), !!attachmentInfo && type === "party");
                 environment.set(param.key, v);
                 if (type === "enum" && t.kind === "call") {
                     if (v.kind !== "name" || !t.args.some((a) => text(a) === v.value))
@@ -681,24 +678,18 @@ export function compile(source, options = {}) {
                     if (v.kind !== "list")
                         fail(v, `${param.key} needs a list`, "write [value, value]");
                 }
-                else if (type === "party" || type === "approval") {
+                else if (type === "party") {
                     if (v.kind !== "name" || !isParty(v.value))
                         failWithCode(actual, attachmentInfo ? "subject_party_unbound" : "HSX1001", `${param.key} needs a declared party`, "declare a party and use its name here");
                     const party = document.parties[v.value];
-                    if ((type === "approval" && (party?.kind !== "staff" || !party.role)) ||
-                        (type === "party" &&
-                            (party?.kind === "staff" ||
-                                (attachmentInfo && party?.kind === "person"))))
-                        failWithCode(actual, "party_kind_mismatch", `${param.key} cannot bind ${v.value}`, type === "approval"
-                            ? "use a declared staff party with a role"
-                            : "use a subject role or declared business");
+                    if ((party?.kind === "staff" && !party.role) ||
+                        (attachmentInfo && party?.kind === "person"))
+                        failWithCode(actual, "party_kind_mismatch", `${param.key} cannot bind ${v.value}`, "use a subject role, declared business, or staff with a role");
                     resolvedParties.add(param.key);
                     if (attachmentInfo)
                         attachmentInfo.parties[param.key] = subjectPartyRoles.includes(v.value)
                             ? { role: v.value }
                             : { party: v.value };
-                    if (type === "approval")
-                        approvers.add(text(v));
                 }
                 else if (type === "ref") {
                     const values = v.kind === "list" ? v.items : [v];
@@ -725,6 +716,14 @@ export function compile(source, options = {}) {
                             fail(value, "duplicate reference", "list each object once");
                         seen.add(value.value);
                     }
+                    // A many-reference tunable is a list even when one object is bound,
+                    // so report datasets and other value positions never see a bare name.
+                    if (t.kind === "type" && t.many && v.kind !== "list")
+                        environment.set(param.key, {
+                            kind: "list",
+                            items: [v],
+                            span: v.span,
+                        });
                 }
                 else if (type === "fee" || type === "split" || type === "policy") {
                     if (v.kind !== "block")
@@ -1009,6 +1008,12 @@ export function compile(source, options = {}) {
                                 fail(row, "reference needs a target", "write ref<object>");
                             const [root, ...tail] = target.split(".");
                             const resolved = environment.get(root);
+                            // An optional field pointing at an unsupplied optional tunable
+                            // has nothing to point at, so the instrument drops it.
+                            if (!resolved &&
+                                f.optional &&
+                                decl.parameters.some((parameter) => parameter.key === root))
+                                continue;
                             const resolvedTargets = resolved?.kind === "list"
                                 ? resolved.items
                                 : resolved
@@ -1272,9 +1277,14 @@ export function compile(source, options = {}) {
                     const adapterList = [];
                     for (const entry of subjectBlock.entries) {
                         if (entry.key === "adapter") {
+                            // A tunable names the adapter; anything else is the binding itself.
+                            const adapterName = (item) => item.kind === "name" &&
+                                decl.parameters.some((parameter) => parameter.key === item.value)
+                                ? text(resolve(item))
+                                : text(item);
                             const bindingNames = entry.value.kind === "list"
-                                ? entry.value.items.map(text)
-                                : [text(entry.value)];
+                                ? entry.value.items.map(adapterName)
+                                : [adapterName(entry.value)];
                             for (const bindingName of bindingNames) {
                                 const target = options.adapterRegistry?.[bindingName];
                                 if (target) {
@@ -1626,14 +1636,6 @@ export function compile(source, options = {}) {
                                 fail(move, `unknown transfer instruction ${op}`, "choose create, reserve, post, or void from internal_transfer");
                         }
                     }
-                    else if (key === "approval") {
-                        const approval = data(expr);
-                        if (approval && approval.input === "material") {
-                            approval.input = {};
-                            materialApprovals.add(a);
-                        }
-                        a.approval = approval;
-                    }
                     else
                         a[key] = data(expr);
                 }
@@ -1671,26 +1673,6 @@ export function compile(source, options = {}) {
                 checkSubjectPaths(a.invoke, row.span);
                 currentAction = undefined;
                 currentActionName = undefined;
-                for (const requirement of a.requires ?? []) {
-                    if (requirement.kind !== "approval" ||
-                        !approvers.has(requirement.party))
-                        continue;
-                    const action = requirement.action ?? name;
-                    const key = `${id}_${action}_decision`;
-                    const previous = implicitDecisions.get(key);
-                    if (previous &&
-                        (previous.party !== requirement.party ||
-                            previous.protectedRequest !==
-                                (requirement.protectedRequest ?? "self")))
-                        fail({ span: origin }, `action ${action} has conflicting approval parties or protected requests`, "use a separate decision action for each party");
-                    implicitDecisions.set(key, {
-                        target: id,
-                        action,
-                        party: requirement.party,
-                        protectedRequest: requirement.protectedRequest ?? "self",
-                        origin,
-                    });
-                }
                 for (const requirement of a.subject?.requirements ?? []) {
                     const entry = asBlock(subjectExpr).entries.find((entry) => entry.key === requirement.field.name) ??
                         asBlock(subjectExpr).entries.find((entry) => entry.key === "adapter");
@@ -1739,7 +1721,7 @@ export function compile(source, options = {}) {
                 addInstrument(child, `${id}_${key}`, emptyBlock, origin, new Map([
                     ...environment,
                     ["parent", { kind: "name", value: id, span: origin }],
-                ]), approvers, enums, attachmentInfo
+                ]), enums, attachmentInfo
                     ? { ...attachmentInfo, exposed: new Map() }
                     : undefined, childFamily);
             }
@@ -1812,7 +1794,7 @@ export function compile(source, options = {}) {
                     span: entry.value.span,
                 };
                 const templateFamily = resolveFamily(targetTemplate, entry, false);
-                addInstrument(template, instId, tunableBlock, entry.span, new Map(), new Set(), new Map(), {
+                addInstrument(template, instId, tunableBlock, entry.span, new Map(), new Map(), {
                     subjectKindId: decl.name,
                     attachmentName,
                     renames,
@@ -1901,7 +1883,7 @@ export function compile(source, options = {}) {
                 if (!template)
                     fail(decl, `unknown instrument ${decl.target}`, `add use ${decl.target.split(".")[0]} and choose a declared instrument`);
                 const templateFamily = resolveFamily(decl.target, decl, false);
-                addInstrument(template, decl.name, decl.body, decl.span, new Map(), new Set(), new Map(), undefined, templateFamily ? { ...templateFamily } : undefined);
+                addInstrument(template, decl.name, decl.body, decl.span, new Map(), new Map(), undefined, templateFamily ? { ...templateFamily } : undefined);
             }
             if (decl.kind === "object") {
                 compileObject(decl);
@@ -2070,99 +2052,6 @@ export function compile(source, options = {}) {
                             : field.target).some((id) => eliminatedStates.get(id)?.has(state)));
                 }
             }
-        // Approval tunables instantiate the same library record as an explicit decision.
-        if (implicitDecisions.size) {
-            const content = (options.standardLibrary ?? bundledStandardLibrary).source("approvals");
-            const parsed = content ? parseProgram(content) : undefined;
-            const template = parsed?.program.decls.find((decl) => decl.kind === "instrument" && decl.name === "decision");
-            if (!template ||
-                template.kind !== "instrument" ||
-                parsed?.diagnostics.length)
-                fail(program, "implicit decisions need the approvals header", "provide the standard approvals header");
-            for (const [id, decision] of implicitDecisions) {
-                if (!document.instruments.find((inst) => inst.id === decision.target)
-                    ?.actions[decision.action])
-                    continue;
-                const existing = document.instruments.some((inst) => Object.values(inst.actions).some((action) => action.approval?.action === decision.action &&
-                    action.approval.party === decision.party &&
-                    inst.fields.some((field) => {
-                        if (field.type !== "ref" ||
-                            field.target !== decision.target ||
-                            `self.${field.name}` !== action.approval?.target)
-                            return false;
-                        const [root, name, ...tail] = decision.protectedRequest.split(".");
-                        const input = name && action.approval.input[name];
-                        const request = root === "self"
-                            ? [action.approval.target, name, ...tail]
-                                .filter(Boolean)
-                                .join(".")
-                            : root === "input" && name
-                                ? input && "field" in input
-                                    ? [input.field, ...tail].join(".")
-                                    : materialApprovals.has(action)
-                                        ? [`self.material_${name}`, ...tail].join(".")
-                                        : undefined
-                                : undefined;
-                        return (request !== undefined &&
-                            action.approval.protectedRequest === request);
-                    })));
-                if (existing)
-                    continue;
-                if (document.instruments.some((inst) => inst.id === id))
-                    fail({ span: decision.origin }, `implicit decision name ${id} is already used`, "rename the conflicting object");
-                const protectedRequest = decision.protectedRequest === "self"
-                    ? "self.target"
-                    : decision.protectedRequest.startsWith("self.")
-                        ? `self.target.${decision.protectedRequest.slice(5)}`
-                        : fail({ span: decision.origin }, "implicit approval needs a stored protected request", "declare an explicit decision for an input-based protected request");
-                addInstrument(template, id, {
-                    kind: "block",
-                    span: decision.origin,
-                    entries: Object.entries({
-                        for: decision.target,
-                        approved_by: decision.party,
-                        action: decision.action,
-                        protected_request: protectedRequest,
-                    }).map(([key, value]) => ({
-                        key,
-                        value: {
-                            kind: key === "action" || key === "protected_request"
-                                ? "text"
-                                : "name",
-                            value,
-                            span: decision.origin,
-                        },
-                        span: decision.origin,
-                    })),
-                }, decision.origin, new Map(), new Set(), new Map(), document.instruments.find((instrument) => instrument.id === decision.target)?.subject
-                    ? {
-                        subjectKindId: document.instruments.find((instrument) => instrument.id === decision.target).subject,
-                        attachmentName: id,
-                        parties: {},
-                        renames: new Map(),
-                        exposed: new Map(),
-                    }
-                    : undefined);
-            }
-        }
-        // Material approval fields are inferred from the selected action's typed input.
-        for (const inst of document.instruments)
-            for (const action of Object.values(inst.actions)) {
-                if (!materialApprovals.has(action) || !action.approval)
-                    continue;
-                const targetField = inst.fields.find((f) => `self.${f.name}` === action.approval.target);
-                if (targetField?.type !== "ref")
-                    continue;
-                const target = document.instruments.find((i) => i.id === targetField.target)?.actions[action.approval.action];
-                if (!target)
-                    continue;
-                for (const field of target.input) {
-                    const name = `material_${field.name}`;
-                    if (!inst.fields.some((f) => f.name === name))
-                        inst.fields.push({ ...field, name });
-                    action.approval.input[field.name] = { field: `self.${name}` };
-                }
-            }
         const changed = new Set();
         for (const decl of program.decls)
             if (decl.kind === "hide" || decl.kind === "expose") {