aontu 0.5.0 → 0.7.0

package/dist/lib/val/ConjunctVal.js

@@ -0,0 +1,191 @@
+"use strict";
+/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConjunctVal = exports.norm = void 0;
+const type_1 = require("../type");
+const ValBase_1 = require("../val/ValBase");
+const Nil_1 = require("../val/Nil");
+// import { RefVal } from '../val/RefVal'
+const MapVal_1 = require("../val/MapVal");
+const op_1 = require("../op/op");
+// TODO: move main logic to op/conjunct
+class ConjunctVal extends ValBase_1.ValBase {
+    constructor(peg, ctx) {
+        super(peg, ctx);
+    }
+    // NOTE: mutation!
+    append(peer) {
+        this.peg.push(peer);
+        return this;
+    }
+    unify(peer, ctx) {
+        let done = true;
+        // Unify each term of conjunct against peer
+        let upeer = [];
+        for (let vI = 0; vI < this.peg.length; vI++) {
+            // upeer[vI] = this.peg[vI].unify(peer, ctx)
+            upeer[vI] = (0, op_1.unite)(ctx, this.peg[vI], peer);
+            done = done && type_1.DONE === upeer[vI].done;
+            // // console.log('Ca', vI, this.peg[vI].canon, peer.canon, upeer[vI].canon)
+            if (upeer[vI] instanceof Nil_1.Nil) {
+                return Nil_1.Nil.make(ctx, '&peer[' + upeer[vI].canon + ',' + peer.canon + ']', this.peg[vI], peer);
+            }
+        }
+        // // console.log('Cb', upeer.map(x => x.canon))
+        upeer = norm(upeer);
+        // console.log('CJ AA', upeer.map(x => x.canon))
+        let outvals = [];
+        let val;
+        next_term: for (let pI = 0; pI < upeer.length; pI++) {
+            let t0 = upeer[pI];
+            // console.log('CJ unify QQ', mark, uc, 't0', pI, t0.canon)
+            if (type_1.DONE !== t0.done) {
+                let u0 = (0, op_1.unite)(ctx, t0, type_1.TOP);
+                if (type_1.DONE !== u0.done
+                    // Maps and Lists are still unified so that path refs will work
+                    && !(u0 instanceof MapVal_1.MapVal) // TODO: || ListVal - test!
+                ) {
+                    outvals.push(u0);
+                    continue next_term;
+                }
+                else {
+                    t0 = u0;
+                }
+            }
+            let t1 = upeer[pI + 1];
+            // console.log('CJ unify WW', mark, uc, 't1', pI + 1, t1?.canon)
+            // if (
+            //   null == t1 ||
+            //   t0.id === t1.id ||
+            //   t0 instanceof RefVal
+            // ) {
+            //   if (DONE !== t0.done) {
+            //     let u0 = unite(ctx, t0, TOP)
+            //     // console.log('CJ unify EE', mark, uc, 't0', t0.canon, 'u0', u0.canon)
+            //     outvals.push(u0)
+            //   }
+            //   else {
+            //     outvals.push(t0)
+            //   }
+            //   pI++
+            // }
+            // else if (DONE !== t0.done || DONE != t1.done) {
+            //   if (DONE !== t0.done) {
+            //     let u0 = unite(ctx, t0, TOP)
+            //     // console.log('CJ unify FF', mark, uc, 't0', t0.canon, 'u0', u0.canon)
+            //     outvals.push(u0)
+            //   }
+            //   else {
+            //     outvals.push(t0)
+            //   }
+            // }
+            if (null == t1) {
+                outvals.push(t0);
+            }
+            else {
+                // console.log('CJS unify0', t0?.canon, t1?.canon)
+                val = (0, op_1.unite)(ctx, t0, t1);
+                done = done && type_1.DONE === val.done;
+                if (val instanceof ConjunctVal) {
+                    if (t0.id === val.peg[0].id) {
+                        val = t0;
+                    }
+                }
+                else if (val instanceof Nil_1.Nil) {
+                    return val;
+                }
+                // TODO: t0 should become this to avoid unnecessary repasses
+                outvals.push(val);
+                pI++;
+            }
+        }
+        // console.log('CJ BB', outvals.map(x => x.canon))
+        // // TODO: FIX: conjuncts get replicated inside each other
+        // // 1&/x => CV[CV[1&/x]]
+        // // Unify each term of conjunct against following sibling,
+        // // reducing to smallest conjunct or single val
+        // let outvals: Val[] = 0 < upeer.length ? [upeer[0]] : []
+        // let oI = 0
+        // for (let uI = 1; uI < upeer.length; uI++) {
+        //   // // console.log('Cu', oI, uI, outvals.map(x => x.canon))
+        //   if (outvals[oI] instanceof ConjunctVal) {
+        //     outvals.splice(oI, 0, ...outvals[oI].peg)
+        //     oI += outvals[oI].peg.length
+        //     done = false
+        //   }
+        //   else {
+        //     outvals[oI] = null == outvals[oI] ? upeer[uI] :
+        //       //outvals[oI].unify(upeer[uI], ctx)
+        //       unite(ctx, outvals[oI], upeer[uI])
+        //     done = done && DONE === outvals[oI].done
+        //     // Conjuct fails
+        //     if (outvals[oI] instanceof Nil) {
+        //       return outvals[oI]
+        //       /*
+        //       return Nil.make(
+        //         ctx,
+        //         '&reduce[' + outvals[oI].canon + ',' + upeer[uI].canon + ']',
+        //         outvals[oI],
+        //         upeer[uI]
+        //       )
+        //       */
+        //     }
+        //   }
+        // }
+        // // console.log('Cc', outvals.map(x => x.canon), outvals)
+        let out;
+        //let why = ''
+        if (0 === outvals.length) {
+            //out = Nil.make(ctx, '&empty', this)
+            // Empty conjuncts evaporate.
+            out = type_1.TOP;
+            //why += 'A'
+        }
+        // TODO: corrects CV[CV[1&/x]] issue above, but swaps term order!
+        else if (1 === outvals.length) {
+            out = outvals[0];
+            //why += 'B'
+        }
+        else {
+            out = new ConjunctVal(outvals, ctx);
+            //why += 'C'
+        }
+        // // console.log('Cd', why, out.peg)
+        out.done = done ? type_1.DONE : this.done + 1;
+        return out;
+    }
+    // TODO: need a well-defined val order so conjunt canon is always the same
+    get canon() {
+        return this.peg.map((v) => v.canon).join('&');
+    }
+    gen(ctx) {
+        if (0 < this.peg.length) {
+            // Default is just the first term - does this work?
+            // TODO: maybe use a PrefVal() ?
+            let v = this.peg[0];
+            let out = undefined;
+            if (undefined !== v && !(v instanceof Nil_1.Nil)) {
+                out = v.gen(ctx);
+            }
+            return out;
+        }
+        return undefined;
+    }
+}
+exports.ConjunctVal = ConjunctVal;
+function norm(terms) {
+    // console.log('CJ norm', terms.map((t: Val) => t.canon))
+    let expand = [];
+    for (let tI = 0, pI = 0; tI < terms.length; tI++, pI++) {
+        if (terms[tI] instanceof ConjunctVal) {
+            expand.push(...terms[tI].peg);
+            pI += terms[tI].peg.length - 1;
+        }
+        else {
+            expand[pI] = terms[tI];
+        }
+    }
+    return expand;
+}
+exports.norm = norm;
+//# sourceMappingURL=ConjunctVal.js.map

package/dist/lib/val/ConjunctVal.js.map

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

package/dist/lib/val/DisjunctVal.d.ts

@@ -0,0 +1,12 @@
+import type { Val } from '../type';
+import { Context } from '../unify';
+import { Site } from '../lang';
+import { ValBase } from '../val/ValBase';
+declare class DisjunctVal extends ValBase {
+    constructor(peg: Val[], ctx?: Context, _sites?: Site[]);
+    append(peer: Val): DisjunctVal;
+    unify(peer: Val, ctx: Context): Val;
+    get canon(): any;
+    gen(ctx?: Context): any;
+}
+export { DisjunctVal, };

package/dist/lib/val/DisjunctVal.js

@@ -0,0 +1,85 @@
+"use strict";
+/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DisjunctVal = void 0;
+const type_1 = require("../type");
+const op_1 = require("../op/op");
+const ValBase_1 = require("../val/ValBase");
+const Nil_1 = require("./Nil");
+const PrefVal_1 = require("./PrefVal");
+// TODO: move main logic to op/disjunct
+class DisjunctVal extends ValBase_1.ValBase {
+    // TODO: sites from normalization of orginal Disjuncts, as well as child pegs
+    constructor(peg, ctx, _sites) {
+        super(peg, ctx);
+    }
+    // NOTE: mutation!
+    append(peer) {
+        this.peg.push(peer);
+        return this;
+    }
+    unify(peer, ctx) {
+        let done = true;
+        let oval = [];
+        // console.log('oval', this.canon, peer.canon)
+        // Conjunction (&) distributes over disjunction (|)
+        for (let vI = 0; vI < this.peg.length; vI++) {
+            //oval[vI] = this.peg[vI].unify(peer, ctx)
+            oval[vI] = (0, op_1.unite)(ctx, this.peg[vI], peer);
+            // console.log('ovalA', vI, this.peg[vI].canon, peer.canon, oval[vI].canon)
+            done = done && type_1.DONE === oval[vI].done;
+        }
+        // console.log('ovalB', oval.map(v => v.canon))
+        // Remove duplicates, and normalize
+        if (1 < oval.length) {
+            for (let vI = 0; vI < oval.length; vI++) {
+                if (oval[vI] instanceof DisjunctVal) {
+                    oval.splice(vI, 1, ...oval[vI].peg);
+                }
+            }
+            //console.log('ovalC', oval.map(v => v.canon))
+            // TODO: not an error Nil!
+            let remove = new Nil_1.Nil();
+            for (let vI = 0; vI < oval.length; vI++) {
+                for (let kI = vI + 1; kI < oval.length; kI++) {
+                    if (oval[kI].same(oval[vI])) {
+                        oval[kI] = remove;
+                    }
+                }
+            }
+            //console.log('ovalD', oval.map(v => v.canon))
+            oval = oval.filter(v => !(v instanceof Nil_1.Nil));
+        }
+        let out;
+        if (1 == oval.length) {
+            out = oval[0];
+        }
+        else if (0 == oval.length) {
+            return Nil_1.Nil.make(ctx, '|:empty', this);
+        }
+        else {
+            out = new DisjunctVal(oval, ctx);
+        }
+        out.done = done ? type_1.DONE : this.done + 1;
+        return out;
+    }
+    get canon() {
+        return this.peg.map((v) => v.canon).join('|');
+    }
+    gen(ctx) {
+        // TODO: this is not right - unresolved Disjuncts eval to undef
+        if (0 < this.peg.length) {
+            let vals = this.peg.filter((v) => v instanceof PrefVal_1.PrefVal);
+            vals = 0 === vals.length ? this.peg : vals;
+            // console.log(vals.map((m: any) => m.canon))
+            let val = vals[0];
+            for (let vI = 1; vI < this.peg.length; vI++) {
+                val = val.unify(this.peg[vI], ctx);
+            }
+            return val.gen(ctx);
+        }
+        return undefined;
+    }
+}
+exports.DisjunctVal = DisjunctVal;
+//# sourceMappingURL=DisjunctVal.js.map

package/dist/lib/val/DisjunctVal.js.map

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

package/dist/lib/val/ListVal.d.ts

@@ -0,0 +1,14 @@
+import type { Val, ValList } from '../type';
+import { Context } from '../unify';
+import { ValBase } from '../val/ValBase';
+declare class ListVal extends ValBase {
+    static SPREAD: symbol;
+    spread: {
+        cj: Val | undefined;
+    };
+    constructor(peg: ValList, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
+    get canon(): string;
+    gen(ctx?: Context): any;
+}
+export { ListVal, };

package/dist/lib/val/ListVal.js

@@ -0,0 +1,91 @@
+"use strict";
+/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ListVal = void 0;
+const type_1 = require("../type");
+const op_1 = require("../op/op");
+const Nil_1 = require("../val/Nil");
+const ValBase_1 = require("../val/ValBase");
+const ConjunctVal_1 = require("../val/ConjunctVal");
+class ListVal extends ValBase_1.ValBase {
+    constructor(peg, ctx) {
+        super(peg, ctx);
+        this.spread = {
+            cj: undefined,
+        };
+        let spread = this.peg[ListVal.SPREAD];
+        delete this.peg[ListVal.SPREAD];
+        if (spread) {
+            if ('&' === spread.o) {
+                // TODO: handle existing spread!
+                this.spread.cj =
+                    new ConjunctVal_1.ConjunctVal(Array.isArray(spread.v) ? spread.v : [spread.v], ctx);
+            }
+        }
+    }
+    // NOTE: order of keys is not preserved!
+    // not possible in any case - consider {a,b} unify {b,a}
+    unify(peer, ctx) {
+        let done = true;
+        let out = type_1.TOP === peer ? this : new ListVal([], ctx);
+        out.spread.cj = this.spread.cj;
+        if (peer instanceof ListVal) {
+            out.spread.cj = null == out.spread.cj ? peer.spread.cj : (null == peer.spread.cj ? out.spread.cj : (out.spread.cj = new ConjunctVal_1.ConjunctVal([out.spread.cj, peer.spread.cj], ctx)));
+        }
+        out.done = this.done + 1;
+        if (this.spread.cj) {
+            out.spread.cj =
+                type_1.DONE !== this.spread.cj.done ? (0, op_1.unite)(ctx, this.spread.cj) :
+                    this.spread.cj;
+        }
+        let spread_cj = out.spread.cj || type_1.TOP;
+        // Always unify children first
+        for (let key in this.peg) {
+            out.peg[key] =
+                (0, op_1.unite)(ctx.descend(key), this.peg[key], spread_cj);
+            done = (done && type_1.DONE === out.peg[key].done);
+        }
+        if (peer instanceof ListVal) {
+            let upeer = (0, op_1.unite)(ctx, peer);
+            for (let peerkey in upeer.peg) {
+                let peerchild = upeer.peg[peerkey];
+                let child = out.peg[peerkey];
+                let oval = out.peg[peerkey] =
+                    undefined === child ? peerchild :
+                        child instanceof Nil_1.Nil ? child :
+                            peerchild instanceof Nil_1.Nil ? peerchild :
+                                (0, op_1.unite)(ctx.descend(peerkey), child, peerchild);
+                if (this.spread.cj) {
+                    out.peg[peerkey] = (0, op_1.unite)(ctx, out.peg[peerkey], spread_cj);
+                }
+                done = (done && type_1.DONE === oval.done);
+            }
+        }
+        else if (type_1.TOP !== peer) {
+            return Nil_1.Nil.make(ctx, 'map', this, peer);
+        }
+        out.done = done ? type_1.DONE : out.done;
+        return out;
+    }
+    get canon() {
+        let keys = Object.keys(this.peg);
+        return '[' +
+            (this.spread.cj ? '&:' + this.spread.cj.canon +
+                (0 < keys.length ? ',' : '') : '') +
+            keys
+                // NOTE: handle array non-index key vals
+                // .map(k => [JSON.stringify(k) + ':' + this.peg[k].canon]).join(',') +
+                .map(k => [this.peg[k].canon]).join(',') +
+            ']';
+    }
+    gen(ctx) {
+        let out = this.peg.map((v) => v.gen(ctx));
+        // for (let p in this.peg) {
+        //   out[p] = this.peg[p].gen(ctx)
+        // }
+        return out;
+    }
+}
+exports.ListVal = ListVal;
+ListVal.SPREAD = Symbol('spread');
+//# sourceMappingURL=ListVal.js.map

package/dist/lib/val/ListVal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ListVal.js","sourceRoot":"","sources":["../../../lib/val/ListVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AASzD,kCAGgB;AAYhB,iCAEiB;AAEjB,oCAAgC;AAEhC,4CAEuB;AAEvB,oDAAgD;AAMhD,MAAM,OAAQ,SAAQ,iBAAO;IAO3B,YAAY,GAAY,EAAE,GAAa;QACrC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QALjB,WAAM,GAAG;YACP,EAAE,EAAG,SAA6B;SACnC,CAAA;QAKC,IAAI,MAAM,GAAI,IAAI,CAAC,GAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9C,OAAQ,IAAI,CAAC,GAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAExC,IAAI,MAAM,EAAE;YACV,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE;gBACpB,gCAAgC;gBAChC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACZ,IAAI,yBAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;aACxE;SACF;IACH,CAAC;IAED,wCAAwC;IACxC,wDAAwD;IACxD,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,IAAI,GAAY,IAAI,CAAA;QACxB,IAAI,GAAG,GAAY,UAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAE7D,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;QAE9B,IAAI,IAAI,YAAY,OAAO,EAAE;YAC3B,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CACvD,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CACvC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,yBAAW,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CACtE,CACF,CAAA;SACF;QAGD,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QAExB,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YAClB,GAAG,CAAC,MAAM,CAAC,EAAE;gBACX,WAAI,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,UAAK,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;oBACzD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;SACnB;QAED,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,UAAG,CAAA;QAEpC,8BAA8B;QAC9B,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE;YACxB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;gBACV,IAAA,UAAK,EAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAA;YAEnD,IAAI,GAAG,CAAC,IAAI,IAAI,WAAI,KAAK,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;SAC5C;QAED,IAAI,IAAI,YAAY,OAAO,EAAE;YAC3B,IAAI,KAAK,GAAa,IAAA,UAAK,EAAC,GAAG,EAAE,IAAI,CAAa,CAAA;YAElD,KAAK,IAAI,OAAO,IAAI,KAAK,CAAC,GAAG,EAAE;gBAC7B,IAAI,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAClC,IAAI,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAE5B,IAAI,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;oBACzB,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;wBAC/B,KAAK,YAAY,SAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;4BAC5B,SAAS,YAAY,SAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gCACpC,IAAA,UAAK,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;gBAErD,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;oBAClB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAA,UAAK,EAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;iBAC3D;gBAED,IAAI,GAAG,CAAC,IAAI,IAAI,WAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAA;aAEpC;SACF;aACI,IAAI,UAAG,KAAK,IAAI,EAAE;YACrB,OAAO,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;SACxC;QAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,WAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAA;QACjC,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,KAAK;QACP,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAChC,OAAO,GAAG;YACR,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK;gBAC3C,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpC,IAAI;gBACF,wCAAwC;gBACxC,uEAAuE;iBACtE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1C,GAAG,CAAA;IACP,CAAC;IAED,GAAG,CAAC,GAAa;QACf,IAAI,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QACnD,4BAA4B;QAC5B,kCAAkC;QAClC,IAAI;QAEJ,OAAO,GAAG,CAAA;IACZ,CAAC;;AAOD,0BAAO;AA/GA,cAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA"}

package/dist/lib/val/MapVal.d.ts

@@ -0,0 +1,14 @@
+import type { Val, ValMap } from '../type';
+import { Context } from '../unify';
+import { ValBase } from '../val/ValBase';
+declare class MapVal extends ValBase {
+    static SPREAD: symbol;
+    spread: {
+        cj: Val | undefined;
+    };
+    constructor(peg: ValMap, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
+    get canon(): string;
+    gen(ctx: Context): any;
+}
+export { MapVal };

package/dist/lib/val/MapVal.js

@@ -0,0 +1,141 @@
+"use strict";
+/* Copyright (c) 2021 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MapVal = void 0;
+const type_1 = require("../type");
+const op_1 = require("../op/op");
+const ValBase_1 = require("../val/ValBase");
+const Nil_1 = require("./Nil");
+const ConjunctVal_1 = require("./ConjunctVal");
+class MapVal extends ValBase_1.ValBase {
+    constructor(peg, ctx) {
+        super(peg, ctx);
+        this.spread = {
+            cj: undefined,
+        };
+        let spread = this.peg[MapVal.SPREAD];
+        delete this.peg[MapVal.SPREAD];
+        if (spread) {
+            if ('&' === spread.o) {
+                // TODO: handle existing spread!
+                this.spread.cj =
+                    new ConjunctVal_1.ConjunctVal(Array.isArray(spread.v) ? spread.v : [spread.v], ctx);
+            }
+        }
+    }
+    // NOTE: order of keys is not preserved!
+    // not possible in any case - consider {a,b} unify {b,a}
+    unify(peer, ctx) {
+        // console.log('QQQ ctx', !!ctx)
+        if (null == ctx) {
+            console.trace();
+        }
+        let done = true;
+        let out = type_1.TOP === peer ? this : new MapVal({}, ctx);
+        out.spread.cj = this.spread.cj;
+        if (peer instanceof MapVal) {
+            out.spread.cj = null == out.spread.cj ? peer.spread.cj : (null == peer.spread.cj ? out.spread.cj : (out.spread.cj = new ConjunctVal_1.ConjunctVal([out.spread.cj, peer.spread.cj], ctx)));
+        }
+        out.done = this.done + 1;
+        if (this.spread.cj) {
+            //out.spread.cj =
+            //  DONE !== this.spread.cj.done ? this.spread.cj.unify(TOP, ctx) :
+            //    this.spread.cj
+            out.spread.cj =
+                type_1.DONE !== this.spread.cj.done ? (0, op_1.unite)(ctx, this.spread.cj) :
+                    this.spread.cj;
+        }
+        // console.log(
+        //   ('  '.repeat(ctx.path.length)),
+        //   'MV spread', this.id, peer.id, out.id, '|',
+        //   this.canon, peer.canon, out.canon, '|',
+        //   (this.spread.cj || {}).done,
+        //   (this.spread.cj || {}).canon, (out.spread.cj || {}).canon)
+        let spread_cj = out.spread.cj || type_1.TOP;
+        // Always unify children first
+        for (let key in this.peg) {
+            //let oval = out.peg[key] = this.peg[key].unify(spread_cj, ctx.descend(key))
+            //let oval =
+            out.peg[key] =
+                (0, op_1.unite)(ctx.descend(key), this.peg[key], spread_cj);
+            done = (done && type_1.DONE === out.peg[key].done);
+            //if (oval instanceof Nil) {
+            // ctx.err.push(oval)
+            //}
+        }
+        // console.log(
+        //   ('  '.repeat(ctx.path.length)),
+        //   'MV child ', this.id, peer.id, out.id, '|',
+        //   this.canon, peer.canon, out.canon, '|',
+        //   this.constructor.name,
+        //   peer.constructor.name,
+        //   out.constructor.name,
+        // )
+        if (peer instanceof MapVal) {
+            //let upeer: MapVal = (peer.unify(TOP, ctx) as MapVal)
+            let upeer = (0, op_1.unite)(ctx, peer);
+            // console.log(
+            //   ('  '.repeat(ctx.path.length)),
+            //   'MV peer A', this.id, peer.id, out.id, '|',
+            //   Object.keys(this.peg), Object.keys(upeer.peg), Object.keys(out.peg))
+            for (let peerkey in upeer.peg) {
+                let peerchild = upeer.peg[peerkey];
+                let child = out.peg[peerkey];
+                let oval = out.peg[peerkey] =
+                    undefined === child ? peerchild :
+                        child instanceof Nil_1.Nil ? child :
+                            peerchild instanceof Nil_1.Nil ? peerchild :
+                                //child.unify(peerchild, ctx.descend(peerkey))
+                                (0, op_1.unite)(ctx.descend(peerkey), child, peerchild);
+                if (this.spread.cj) {
+                    //out.peg[peerkey] = out.peg[peerkey].unify(spread_cj, ctx)
+                    out.peg[peerkey] = (0, op_1.unite)(ctx, out.peg[peerkey], spread_cj);
+                }
+                done = (done && type_1.DONE === oval.done);
+                if (oval instanceof Nil_1.Nil) {
+                    // ctx.err.push(oval)
+                }
+            }
+            // console.log(
+            //   ('  '.repeat(ctx.path.length)),
+            //   'MV peer B', this.id, peer.id, out.id, '|',
+            //   Object.keys(this.peg), Object.keys(upeer.peg), Object.keys(out.peg))
+            //out.done = done ? DONE : out.done
+            // console.log(' '.repeat(W) + 'MV OUT A', this.id, out.done, out.id, out.canon)//this.spread.cj, out.spread.cj)
+            // console.log(
+            //   ('  '.repeat(ctx.path.length)),
+            //   'MV out ', this.id, peer.id, out.id, '|',
+            //   this.canon, peer.canon, out.canon, '|',
+            //   this.constructor.name,
+            //   peer.constructor.name,
+            //   out.constructor.name,
+            // )
+        }
+        else if (type_1.TOP !== peer) {
+            //out.done = done ? DONE : out.done
+            //return (UNIFIER(out, peer, ctx) as MapVal)
+            return Nil_1.Nil.make(ctx, 'map', this, peer);
+        }
+        out.done = done ? type_1.DONE : out.done;
+        return out;
+    }
+    get canon() {
+        let keys = Object.keys(this.peg);
+        return '{' +
+            (this.spread.cj ? '&:' + this.spread.cj.canon +
+                (0 < keys.length ? ',' : '') : '') +
+            keys
+                .map(k => [JSON.stringify(k) + ':' + this.peg[k].canon]).join(',') +
+            '}';
+    }
+    gen(ctx) {
+        let out = {};
+        for (let p in this.peg) {
+            out[p] = this.peg[p].gen(ctx);
+        }
+        return out;
+    }
+}
+exports.MapVal = MapVal;
+MapVal.SPREAD = Symbol('spread');
+//# sourceMappingURL=MapVal.js.map

package/dist/lib/val/MapVal.js.map

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

package/dist/lib/val/Nil.d.ts

@@ -0,0 +1,15 @@
+import type { Val } from '../type';
+import { Context } from '../unify';
+import { ValBase } from '../val/ValBase';
+declare class Nil extends ValBase {
+    nil: boolean;
+    why: any;
+    primary?: Val;
+    secondary?: Val;
+    static make: (ctx?: Context, why?: any, av?: Val, bv?: Val) => Nil;
+    constructor(why?: any, ctx?: Context);
+    unify(_peer: Val, _ctx: Context): this;
+    get canon(): string;
+    gen(_ctx?: Context): undefined;
+}
+export { Nil, };

package/dist/lib/val/Nil.js

@@ -0,0 +1,54 @@
+"use strict";
+/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Nil = void 0;
+const type_1 = require("../type");
+const ValBase_1 = require("../val/ValBase");
+class Nil extends ValBase_1.ValBase {
+    constructor(why, ctx) {
+        super(null, ctx);
+        this.nil = true;
+        this.why = why;
+        // Nil is always DONE, by definition.
+        this.done = type_1.DONE;
+    }
+    unify(_peer, _ctx) {
+        return this;
+    }
+    get canon() {
+        return 'nil';
+    }
+    gen(_ctx) {
+        return undefined;
+    }
+}
+exports.Nil = Nil;
+// TODO: include Val generating nil, thus capture type
+Nil.make = (ctx, why, av, bv) => {
+    let nil = new Nil(why, ctx);
+    // TODO: this should be done lazily, for multiple terms
+    // Terms later in same file are considered the primary error location.
+    if (null != av) {
+        nil.row = av.row;
+        nil.col = av.col;
+        nil.url = av.url;
+        nil.primary = av;
+        if (null != bv) {
+            nil.secondary = bv;
+            let bv_loc_wins = (nil.url === bv.url) && ((nil.row < bv.row) ||
+                (nil.row === bv.row && nil.col < bv.col));
+            if (bv_loc_wins) {
+                nil.row = bv.row;
+                nil.col = bv.col;
+                nil.url = bv.url;
+                nil.primary = bv;
+                nil.secondary = av;
+            }
+        }
+    }
+    if (ctx) {
+        ctx.err.push(nil);
+    }
+    return nil;
+};
+//# sourceMappingURL=Nil.js.map