aontu 0.52.0 → 0.53.0

package/dist/val/ReferFuncVal.js

@@ -0,0 +1,303 @@
+"use strict";
+/* Copyright (c) 2025 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReferVal = exports.ReferFuncVal = void 0;
+exports.parseAddress = parseAddress;
+exports.findEntity = findEntity;
+const type_1 = require("../type");
+const err_1 = require("../err");
+const FuncBaseVal_1 = require("./FuncBaseVal");
+const FeatureVal_1 = require("./FeatureVal");
+const StringVal_1 = require("./StringVal");
+const unify_1 = require("../unify");
+const top_1 = require("./top");
+const utility_1 = require("../utility");
+// A segment of the path INSIDE an entity. The entity name's own
+// grammar (no dots) is what makes the split unambiguous: everything
+// before the first dot names the entity, everything after walks its
+// value.
+const ADDR_SEGMENT = /^[A-Za-z0-9_-]+$/;
+const ADDR_NAME = /^[A-Za-z0-9_/-]+$/;
+// The address a string spells, or undefined when it does not spell
+// one. `svc/auth` is the entity; `svc/auth.ports.http` is a node
+// inside it — the two addressing schemes reconciled: `$.a.b` answers
+// WHERE, an address answers WHAT, and beneath entity granularity the
+// tree is authoritative again.
+function parseAddress(s) {
+    const parts = s.split('.');
+    if (!ADDR_NAME.test(parts[0])) {
+        return undefined;
+    }
+    for (const seg of parts.slice(1)) {
+        if (!ADDR_SEGMENT.test(seg)) {
+            return undefined;
+        }
+    }
+    return { name: parts[0], path: parts.slice(1) };
+}
+// The value an address names, or undefined when the evaluation does
+// not (yet) have one. Pending is not failure: an entity may be
+// declared by a later conjunct, include or spread, so `refer`
+// residuates exactly as a forward reference does.
+function findEntity(reg, addr) {
+    const rep = reg?.get(addr.name);
+    if (null == rep) {
+        return undefined;
+    }
+    let parent = undefined;
+    let key = undefined;
+    let val = rep;
+    for (const seg of addr.path) {
+        if (true !== val?.isMap && true !== val?.isList) {
+            return undefined;
+        }
+        const next = val.peg[seg];
+        if (null == next) {
+            return undefined;
+        }
+        parent = val;
+        key = seg;
+        val = next;
+    }
+    return { parent, key, val };
+}
+// concreteFlow is `t` as it enters the target: a copy with the
+// type/hide marks cleared at every depth. The clone matters as much as
+// the clearing — `t` is shared by every position that refers to the
+// same thing, and clearing in place would unmark the schema itself.
+function concreteFlow(ctx, t) {
+    let marked = false;
+    (0, utility_1.walk)(t, (_key, v) => {
+        marked = marked || v.mark.type || v.mark.hide;
+        return v;
+    });
+    // An unmarked flow type is passed THROUGH: cloning one anyway would
+    // move the site an error names, and a conflict has to point at what
+    // the author wrote.
+    if (!marked) {
+        return t;
+    }
+    const out = t.clone(ctx);
+    (0, utility_1.walk)(out, (_key, v) => {
+        v.mark.type = false;
+        v.mark.hide = false;
+        return v;
+    });
+    return out;
+}
+// ReferVal is what `refer(t)` RESOLVES to: the residual constraint,
+// carrying the type to flow and — once it has met a string — the
+// address to flow it into. A separate value from the function for the
+// reason every residual is: the function is written once and the
+// constraint is met many times, and only the constraint has state
+// worth carrying.
+class ReferVal extends FeatureVal_1.FeatureVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isRefer = true;
+        this.isGenable = true;
+        this.tval = spec.tval ?? (0, top_1.top)();
+        this.addr = spec.addr;
+        this.addrsrc = spec.addrsrc;
+        this.held = spec.held;
+        this.dc = 0;
+    }
+    // The residual's own state — the type to flow, the address it has
+    // met, the constraints it holds — TRAVELS with the clone. A spread
+    // template holds the FUNCTION, so a template never needs this; a
+    // REFERENCE to a value that already contains a resolved link does
+    // (`z: id(a) & {u: refer() & "a"}` then `s: $.z`). Without it the
+    // clone came back as a bare `refer()` — the address silently
+    // dropped, and the copied link resolving to nothing.
+    //
+    // No path-dependence hook, though: a residual is minted at its
+    // destination, so `key()` inside a template resolves there already.
+    clone(ctx, spec) {
+        const out = super.clone(ctx, spec);
+        out.tval = this.tval;
+        out.addr = this.addr;
+        out.addrsrc = this.addrsrc;
+        out.held = this.held;
+        return out;
+    }
+    unify(peer, ctx) {
+        const p = peer;
+        // Another `refer` at the same position: one constraint, both
+        // types. `refer(A) & refer(B)` is a target that must be both.
+        if (true === p?.isRefer) {
+            return this.with(ctx, {
+                tval: (0, unify_1.unite)(ctx, this.tval, p.tval, 'refer-t'),
+                addr: this.addr ?? p.addr,
+                addrsrc: this.addrsrc ?? p.addrsrc,
+                held: null == this.held ? p.held
+                    : null == p.held ? this.held
+                        : (0, unify_1.unite)(ctx, this.held, p.held, 'refer-held'),
+            }, this);
+        }
+        if (null == peer || true === p.isTop) {
+            return this.settle(ctx, this);
+        }
+        if (true === p.isNil) {
+            return peer;
+        }
+        // A STRING is the ADDRESS, when there is not one yet. It is the
+        // only thing that can be: a link's value is its address.
+        if (undefined === this.addr
+            && true === p.isScalar && 'string' === typeof p.peg) {
+            const addr = parseAddress(p.peg);
+            if (undefined === addr) {
+                return (0, err_1.makeNilErr)(ctx, 'refer_address', this, peer, 'refer', { addr: p.peg });
+            }
+            return this.with(ctx, { addr, addrsrc: p.peg }, peer);
+        }
+        // A value that can never BE a string cannot constrain one either,
+        // and no later pass can repair it — so this arm refuses rather
+        // than defers. A KIND or a constraint is not in it: `string`,
+        // `re("^svc/")` and the like are perfectly good constraints on an
+        // address, and are held below until there is one to apply them to.
+        if ((true === p.isScalar && 'string' !== typeof p.peg)
+            || true === p.isMap || true === p.isList) {
+            return (0, err_1.makeNilErr)(ctx, 'refer_address', this, peer, 'refer');
+        }
+        // HELD: everything else waits for the address. Carried on the
+        // residual rather than parked in a conjunct, because a conjunct
+        // rebuilt every pass grows a level every pass; the held constraint
+        // meets the link the moment the address resolves, so
+        // `refer() & "x" & "y"` still conflicts and `refer() & string & "x"`
+        // still passes.
+        return this.with(ctx, {
+            held: null == this.held ? peer : (0, unify_1.unite)(ctx, this.held, peer, 'refer-held'),
+        }, this);
+    }
+    // with is the residual reshaped: every arm above answers a NEW
+    // ReferVal rather than mutating this one, because a spread template's
+    // residual is shared by every child it is applied to.
+    with(ctx, spec, site) {
+        const out = new ReferVal({}, ctx);
+        out.tval = spec.tval ?? this.tval;
+        out.addr = spec.addr ?? this.addr;
+        out.addrsrc = spec.addrsrc ?? this.addrsrc;
+        out.held = spec.held ?? this.held;
+        (0, utility_1.propagateMarks)(this, out);
+        out.site = site.site;
+        out.path = this.path;
+        return out.settle(ctx, site);
+    }
+    // settle answers the address if the evaluation can, and stays
+    // pending if it cannot YET. `site` is the value whose position the
+    // resolved string should take.
+    settle(ctx, site) {
+        if (undefined === this.addr) {
+            // NOT DONE, unlike `string` or `min(1)`. A refer without an
+            // address has not done its work — it exists to check one — and
+            // the pass loop must keep offering it the chance. The cost is
+            // that a SCHEMA mentioning a link never resolves either, so
+            // `type({from: refer($.std.Port)})` is not expressible today;
+            // G4 phase 4 records why, and what it would take.
+            this.dc = 0;
+            return this;
+        }
+        const reg = ctx?.entities;
+        const found = findEntity(reg, this.addr);
+        if (undefined === found) {
+            // PENDING, not failed — until the last pass. An entity may be
+            // declared by a later conjunct, include or spread, so `refer`
+            // residuates as a forward reference does; but within ONE
+            // evaluation the document-set is fixed, so existence IS
+            // decidable, and the final pass is where it is decided. A
+            // pending refer keeps the tree not-done, so the pass loop always
+            // reaches that pass when there is one to decide.
+            if (ctx.cc + 1 >= ctx.budget.passes) {
+                return (0, err_1.makeNilErr)(ctx, 'refer_unresolved', this, undefined, 'refer', { addr: this.addrsrc });
+            }
+            this.dc = 0;
+            return this;
+        }
+        // THE FLOW. `t` is unified into the target and written back, so
+        // every position of the entity carries it after the pass's
+        // identity merge — the same channel the merge itself uses.
+        //
+        // RE-ENTRANT ONLY ONCE PER ENTITY (use-cases/BUGS.md §19). Uniting
+        // the target drives the target's OWN subtree, and if the target
+        // links back — `a` typed-refers `b`, `b` typed-refers `a`, the
+        // shape every inverse pair has — that drives this entity again,
+        // and the two flow into each other until the depth budget or the
+        // host stack ends it. `unify_cycle` on a model whose meet plainly
+        // converges: `{k:1}` meeting `{k:1}` is a fixpoint, and the
+        // evaluator never got far enough to notice.
+        //
+        // The guard is the set of entities a flow is currently inside, on
+        // the context. A flow that would re-enter one is SKIPPED, not
+        // failed: the outer flow it is nested in is already uniting that
+        // entity, so the same information arrives by the same channel one
+        // frame up. What each flow contributes is unchanged; only the
+        // order it arrives in is, and unification does not care.
+        const flowing = (ctx._referflow ??=
+            new Set());
+        if (!this.tval.isTop && !flowing.has(this.addr.name)) {
+            flowing.add(this.addr.name);
+            try {
+                // The flowed type is CONCRETE at the target: a schema flowing
+                // into a value must not make the value a schema. Same reasoning
+                // as a reference's clone clearing marks — `refer($.std.Service)`
+                // says the target IS a Service, not that it is the definition
+                // of one — and without it the target silently stopped
+                // generating.
+                const merged = (0, unify_1.unite)(ctx, found.val, concreteFlow(ctx, this.tval), 'refer-flow');
+                if (true === merged.isNil) {
+                    return merged;
+                }
+                if (undefined === found.parent) {
+                    reg.set(this.addr.name, merged);
+                }
+                else {
+                    found.parent.peg[found.key] = merged;
+                }
+            }
+            finally {
+                flowing.delete(this.addr.name);
+            }
+        }
+        // The value IS the address string: a link, not an embedding.
+        const out = new StringVal_1.StringVal({ peg: this.addrsrc }, ctx);
+        out.dc = type_1.DONE;
+        // STAMPED as a link (G4 phase 3): the value is the address string,
+        // so without this nothing downstream could tell a checked link from
+        // a literal that happens to look like one. The edge set is exactly
+        // the set of these stamps.
+        out.link = this.addrsrc;
+        (0, utility_1.propagateMarks)(this, out);
+        out.site = site.site;
+        out.path = this.path;
+        return null == this.held ? out : (0, unify_1.unite)(ctx, out, this.held, 'refer-held');
+    }
+    get canon() {
+        const t = this.tval.isTop ? '' : this.tval.canon;
+        const call = 'refer(' + t + ')' +
+            (null == this.held ? '' : '&' + this.held.canon);
+        return undefined === this.addrsrc
+            ? call : call + '&' + JSON.stringify(this.addrsrc);
+    }
+}
+exports.ReferVal = ReferVal;
+class ReferFuncVal extends FuncBaseVal_1.FuncBaseVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isReferFunc = true;
+    }
+    make(_ctx, spec) {
+        return new ReferFuncVal(spec);
+    }
+    funcname() {
+        return 'refer';
+    }
+    resolve(ctx, args) {
+        const out = new ReferVal({}, ctx);
+        out.tval = 0 < args.length ? args[0] : (0, top_1.top)();
+        out.site = this.site;
+        out.path = this.path;
+        return out;
+    }
+} /* node:coverage ignore next 6 */
+exports.ReferFuncVal = ReferFuncVal;
+//# sourceMappingURL=ReferFuncVal.js.map

package/dist/val/ReferFuncVal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReferFuncVal.js","sourceRoot":"","sources":["../../src/val/ReferFuncVal.ts"],"names":[],"mappings":"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"}

package/dist/val/ScalarKindVal.d.ts

@@ -12,7 +12,6 @@ declare class BigDecimal {
 declare class Null {
 }
 declare function kindParent(kind: any): any;
-declare function kindFamily(kind: any): any;
 declare function kindSubsumes(sup: any, sub: any): boolean;
 type ScalarConstructor = StringConstructor | NumberConstructor | BooleanConstructor | (typeof Integer) | (typeof Float) | (typeof BigInteger) | (typeof BigDecimal) | (typeof Null) | (typeof Integer.constructor);
 declare class ScalarKindVal extends FeatureVal {
@@ -23,4 +22,4 @@ declare class ScalarKindVal extends FeatureVal {
     superior(): Val;
     same(peer: any): boolean;
 }
-export { BigDecimal, BigInteger, Float, Integer, Null, ScalarConstructor, ScalarKindVal, kindFamily, kindParent, kindSubsumes, };
+export { BigDecimal, BigInteger, Float, Integer, Null, ScalarConstructor, ScalarKindVal, kindParent, kindSubsumes, };

package/dist/val/ScalarKindVal.js

@@ -2,7 +2,6 @@
 /* Copyright (c) 2021-2025 Richard Rodger, MIT License */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScalarKindVal = exports.Null = exports.Integer = exports.Float = exports.BigInteger = exports.BigDecimal = void 0;
-exports.kindFamily = kindFamily;
 exports.kindParent = kindParent;
 exports.kindSubsumes = kindSubsumes;
 const type_1 = require("../type");
@@ -70,16 +69,6 @@ const KIND_PARENT = new Map([
 function kindParent(kind) {
     return KIND_PARENT.get(kind);
 }
-// The root of a kind marker's family: the highest ancestor below top.
-// Every numeric leaf answers `number`; a kind with no parent is its own
-// family root (string, boolean, null).
-function kindFamily(kind) {
-    let root = kind;
-    for (let k = KIND_PARENT.get(kind); null != k; k = KIND_PARENT.get(k)) {
-        root = k;
-    }
-    return root;
-}
 // True when `sub` is `sup`, or sits anywhere below it. The numeric
 // lattice is two deep today; walking the chain keeps this correct if it
 // ever deepens.

package/dist/val/ScalarKindVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScalarKindVal.js","sourceRoot":"","sources":["../../src/val/ScalarKindVal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ScalarKindVal.js","sourceRoot":"","sources":["../../src/val/ScalarKindVal.ts"],"names":[],"mappings":"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"}

package/dist/val/TopVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"TopVal.js","sourceRoot":"","sources":["../../src/val/TopVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAQzD,kCAEgB;AAMhB,+BAEc;AAGd,yBAAyB;AACzB,MAAM,MAAO,SAAQ,SAAG;IAMtB,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QATlB,UAAK,GAAG,IAAI,CAAA;QAEZ,OAAE,GAAG,CAAC,CAAA;QACN,OAAE,GAAG,WAAI,CAAA;QAQP,qCAAqC;QACrC,IAAI,CAAC,EAAE,GAAG,WAAI,CAAA;QACd,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;IACxB,CAAC;IAED,IAAI,CAAC,IAAS;QACZ,uBAAuB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,IAAS,EAAE,GAAiB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,KAAK,KAAK,OAAO,KAAK,CAAA,CAAC,CAAC;IAE5B,QAAQ;QACN,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAkB,EAAE,KAAe;QACvC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG,CAAC,IAAmB;QACrB,OAAO,SAAS,CAAA;IAClB,CAAC;CAEF,CAAC,iCAAiC;QAIjC,MAAM"}
+{"version":3,"file":"TopVal.js","sourceRoot":"","sources":["../../src/val/TopVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAOzD,kCAEgB;AAMhB,+BAEc;AAGd,yBAAyB;AACzB,MAAM,MAAO,SAAQ,SAAG;IAMtB,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QATlB,UAAK,GAAG,IAAI,CAAA;QAEZ,OAAE,GAAG,CAAC,CAAA;QACN,OAAE,GAAG,WAAI,CAAA;QAQP,qCAAqC;QACrC,IAAI,CAAC,EAAE,GAAG,WAAI,CAAA;QACd,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;IACxB,CAAC;IAED,IAAI,CAAC,IAAS;QACZ,uBAAuB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,IAAS,EAAE,GAAiB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,KAAK,KAAK,OAAO,KAAK,CAAA,CAAC,CAAC;IAE5B,QAAQ;QACN,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAkB,EAAE,KAAe;QACvC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG,CAAC,IAAmB;QACrB,OAAO,SAAS,CAAA;IAClB,CAAC;CAEF,CAAC,iCAAiC;QAIjC,MAAM"}

package/dist/val/TypeFuncVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypeFuncVal.js","sourceRoot":"","sources":["../../src/val/TypeFuncVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,gCAAmC;AAEnC,wCAImB;AAGnB,+CAA2C;AAG3C,MAAM,WAAY,SAAQ,yBAAW;IAKnC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QARlB,eAAU,GAAG,IAAI,CAAA;QAUf,qCAAqC;QACrC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;IACxB,CAAC;IAGD,IAAI,CAAC,IAAkB,EAAE,IAAa;QACpC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,QAAQ;QACN,OAAO,MAAM,CAAA;IACf,CAAC;IAGD,OAAO,CAAC,GAAiB,EAAE,IAAW;QACpC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAA,gBAAU,EAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACf,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAEpB,IAAA,cAAI,EAAC,GAAG,EAAE,CAAC,IAAiC,EAAE,GAAQ,EAAE,EAAE;gBACxD,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;gBACpB,OAAO,GAAG,CAAA;YACZ,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;CACF,CAAC,iCAAiC;QAIjC,WAAW"}
+{"version":3,"file":"TypeFuncVal.js","sourceRoot":"","sources":["../../src/val/TypeFuncVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,gCAAmC;AAEnC,wCAEmB;AAGnB,+CAA2C;AAG3C,MAAM,WAAY,SAAQ,yBAAW;IAKnC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QARlB,eAAU,GAAG,IAAI,CAAA;QAUf,qCAAqC;QACrC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;IACxB,CAAC;IAGD,IAAI,CAAC,IAAkB,EAAE,IAAa;QACpC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,QAAQ;QACN,OAAO,MAAM,CAAA;IACf,CAAC;IAGD,OAAO,CAAC,GAAiB,EAAE,IAAW;QACpC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAA,gBAAU,EAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACf,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAEpB,IAAA,cAAI,EAAC,GAAG,EAAE,CAAC,IAAiC,EAAE,GAAQ,EAAE,EAAE;gBACxD,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;gBACpB,OAAO,GAAG,CAAA;YACZ,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;CACF,CAAC,iCAAiC;QAIjC,WAAW"}

package/dist/val/UpperFuncVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpperFuncVal.js","sourceRoot":"","sources":["../../src/val/UpperFuncVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,gCAAmC;AAInC,wDAAoD;AACpD,4CAA+C;AAC/C,4CAAwC;AAIxC,+CAA2C;AAG3C,MAAM,YAAa,SAAQ,yBAAW;IAGpC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QANlB,gBAAW,GAAG,IAAI,CAAA;IAOlB,CAAC;IAGD,IAAI,CAAC,IAAkB,EAAE,IAAa;QACpC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;IAED,QAAQ;QACN,OAAO,OAAO,CAAA;IAChB,CAAC;IAGD,OAAO,CAAC,GAA6B,EAAE,IAAW;QAChD,mEAAmE;QACnE,gEAAgE;QAChE,4DAA4D;QAC5D,kBAAkB;QAClB,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,MAAM,GAAG,GAAG,EAAE,GAAG,CAAA;QACvB,MAAM,GAAG,GAAG,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YAC7D,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC9C,gEAAgE;gBAChE,iEAAiE;gBACjE,+DAA+D;gBAC/D,gEAAgE;gBAChE,4DAA4D;gBAC5D,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;oBACnC,MAAM,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;wBACzC,SAAS,CAAA;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CACpB,IAAI,IAAI,GAAG,CAAC,CAAC;YACX,IAAA,gBAAU,EAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;YACtC,gEAAgE;YAChE,8DAA8D;YAC9D,gEAAgE;YAChE,8CAA8C;YAC9C,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAC3B,CAAA;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,QAAQ;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QACzB,OAAO,GAAG,EAAE,QAAQ,CAAC,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,6BAAa,CAAC;gBAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;aACd,CAAC,CAAC,CAAC,CAAC;YACL,KAAK,CAAC,QAAQ,EAAE,CAAA;IACpB,CAAC;CACF,CAAC,iCAAiC;QAIjC,YAAY"}
+{"version":3,"file":"UpperFuncVal.js","sourceRoot":"","sources":["../../src/val/UpperFuncVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,gCAAmC;AAGnC,wDAAoD;AACpD,4CAA+C;AAC/C,4CAAwC;AAIxC,+CAA2C;AAG3C,MAAM,YAAa,SAAQ,yBAAW;IAGpC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QANlB,gBAAW,GAAG,IAAI,CAAA;IAOlB,CAAC;IAGD,IAAI,CAAC,IAAkB,EAAE,IAAa;QACpC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;IAED,QAAQ;QACN,OAAO,OAAO,CAAA;IAChB,CAAC;IAGD,OAAO,CAAC,GAA6B,EAAE,IAAW;QAChD,mEAAmE;QACnE,gEAAgE;QAChE,4DAA4D;QAC5D,kBAAkB;QAClB,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,MAAM,GAAG,GAAG,EAAE,GAAG,CAAA;QACvB,MAAM,GAAG,GAAG,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YAC7D,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC9C,gEAAgE;gBAChE,iEAAiE;gBACjE,+DAA+D;gBAC/D,gEAAgE;gBAChE,4DAA4D;gBAC5D,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;oBACnC,MAAM,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;wBACzC,SAAS,CAAA;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CACpB,IAAI,IAAI,GAAG,CAAC,CAAC;YACX,IAAA,gBAAU,EAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;YACtC,gEAAgE;YAChE,8DAA8D;YAC9D,gEAAgE;YAChE,8CAA8C;YAC9C,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAC3B,CAAA;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,QAAQ;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QACzB,OAAO,GAAG,EAAE,QAAQ,CAAC,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,6BAAa,CAAC;gBAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;aACd,CAAC,CAAC,CAAC,CAAC;YACL,KAAK,CAAC,QAAQ,EAAE,CAAA;IACpB,CAAC;CACF,CAAC,iCAAiC;QAIjC,YAAY"}

package/dist/val/Val.d.ts

@@ -10,6 +10,7 @@ type ValSpec = {
     peg?: any;
     mark?: Partial<ValMark>;
     kind?: any;
+    dup?: boolean;
     row?: number;
     col?: number;
     url?: string;
@@ -25,6 +26,7 @@ type ValSpec = {
 declare const DONE = -1;
 declare const SPREAD: unique symbol;
 declare const EMPTY_ERR: any[];
+export declare function nextValId(): number;
 declare abstract class Val {
     isVal: boolean;
     isTop: boolean;
@@ -70,6 +72,10 @@ declare abstract class Val {
     get site(): Site;
     set site(s: Site);
     mark: ValMark;
+    deprecation?: Record<string, string>;
+    entity?: string;
+    link?: string;
+    graph?: any;
     peg: any;
     err: any[];
     explain: any[] | null;
@@ -86,7 +92,7 @@ declare abstract class Val {
     get isPathDependent(): boolean;
     place(v: Val): Val;
     unify(_peer: Val, _ctx: AontuContext): Val;
-    get canon(): string;
+    abstract get canon(): string;
     errcanon(): string;
     gen(_ctx: AontuContext): any;
     notdone(): void;
@@ -95,6 +101,7 @@ declare abstract class Val {
     inspect(d?: number): string;
     inspection(_d?: number): string;
 }
+declare function repathInstance(v: any, path: string[]): void;
 declare function empty(o: any): boolean;
 export type { ValMark, ValSpec, };
-export { Val, DONE, SPREAD, EMPTY_ERR, empty };
+export { Val, DONE, SPREAD, EMPTY_ERR, empty, repathInstance, };