aontu 0.3.0 → 0.6.1

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":"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"}

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"Nil.js","sourceRoot":"","sources":["../../../lib/val/Nil.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAOzD,kCAEgB;AAOhB,4CAEuB;AAMvB,MAAM,GAAI,SAAQ,iBAAO;IA8CvB,YAAY,GAAS,EAAE,GAAa;QAClC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QA9ClB,QAAG,GAAG,IAAI,CAAA;QA+CR,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEd,qCAAqC;QACrC,IAAI,CAAC,IAAI,GAAG,WAAI,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,KAAU,EAAE,IAAa;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,KAAK;QACP,OAAO,KAAK,CAAA;IACd,CAAC;IAED,GAAG,CAAC,IAAc;QAChB,OAAO,SAAS,CAAA;IAClB,CAAC;;AAID,kBAAG;AA9DH,sDAAsD;AAC/C,QAAI,GAAG,CAAC,GAAa,EAAE,GAAS,EAAE,EAAQ,EAAE,EAAQ,EAAE,EAAE;IAC7D,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAE3B,uDAAuD;IAEvD,sEAAsE;IACtE,IAAI,IAAI,IAAI,EAAE,EAAE;QACd,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;QAChB,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;QAChB,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;QAEhB,GAAG,CAAC,OAAO,GAAG,EAAE,CAAA;QAEhB,IAAI,IAAI,IAAI,EAAE,EAAE;YACd,GAAG,CAAC,SAAS,GAAG,EAAE,CAAA;YAElB,IAAI,WAAW,GACb,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CACtB,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;gBAClB,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,CACzC,CAAA;YAEH,IAAI,WAAW,EAAE;gBACf,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;gBAChB,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;gBAChB,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;gBAChB,GAAG,CAAC,OAAO,GAAG,EAAE,CAAA;gBAChB,GAAG,CAAC,SAAS,GAAG,EAAE,CAAA;aACnB;SACF;KACF;IAED,IAAI,GAAG,EAAE;QACP,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KAClB;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}

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

@@ -0,0 +1,12 @@
+import type { Val } from '../type';
+import { Context } from '../unify';
+import { ValBase } from '../val/ValBase';
+declare class PrefVal extends ValBase {
+    pref: Val;
+    constructor(peg: any, pref?: any, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
+    same(peer: Val): boolean;
+    get canon(): any;
+    gen(ctx?: Context): any;
+}
+export { PrefVal, };

package/dist/lib/val/PrefVal.js

@@ -0,0 +1,60 @@
+"use strict";
+/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrefVal = 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");
+class PrefVal extends ValBase_1.ValBase {
+    constructor(peg, pref, ctx) {
+        super(peg, ctx);
+        this.pref = pref || peg;
+    }
+    // PrefVal unify always returns a PrefVal
+    // PrefVals can only be removed by becoming Nil in a Disjunct
+    unify(peer, ctx) {
+        let done = true;
+        let out;
+        if (peer instanceof PrefVal) {
+            out = new PrefVal((0, op_1.unite)(ctx, this.peg, peer.peg, 'Pref000'), (0, op_1.unite)(ctx, this.pref, peer.pref, 'Pref010'), ctx);
+        }
+        else {
+            out = new PrefVal(
+            // TODO: find a better way to drop Nil non-errors
+            (0, op_1.unite)(ctx === null || ctx === void 0 ? void 0 : ctx.clone({ err: [] }), this.peg, peer, 'Pref020'), (0, op_1.unite)(ctx === null || ctx === void 0 ? void 0 : ctx.clone({ err: [] }), this.pref, peer, 'Pref030'), ctx);
+        }
+        done = done && type_1.DONE === out.peg.done &&
+            (null != out.pref ? type_1.DONE === out.pref.done : true);
+        if (out.peg instanceof Nil_1.Nil) {
+            out = out.pref;
+        }
+        else if (out.pref instanceof Nil_1.Nil) {
+            out = out.peg;
+        }
+        out.done = done ? type_1.DONE : this.done + 1;
+        return out;
+    }
+    same(peer) {
+        if (null == peer) {
+            return false;
+        }
+        let pegsame = (this.peg === peer.peg) ||
+            (this.peg instanceof ValBase_1.ValBase && this.peg.same(peer.peg));
+        let prefsame = peer instanceof PrefVal &&
+            ((this.pref === peer.pref) ||
+                (this.pref instanceof ValBase_1.ValBase && this.pref.same(peer.pref)));
+        return pegsame && prefsame;
+    }
+    get canon() {
+        return this.pref instanceof Nil_1.Nil ? this.peg.canon : '*' + this.pref.canon;
+    }
+    gen(ctx) {
+        let val = !(this.pref instanceof Nil_1.Nil) ? this.pref :
+            !(this.peg instanceof Nil_1.Nil) ? this.peg :
+                undefined;
+        return undefined === val ? undefined : val.gen(ctx);
+    }
+}
+exports.PrefVal = PrefVal;
+//# sourceMappingURL=PrefVal.js.map

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

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

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

@@ -0,0 +1,15 @@
+import type { Val } from '../type';
+import { Context } from '../unify';
+import { ValBase } from '../val/ValBase';
+declare class RefVal extends ValBase {
+    parts: string[];
+    absolute: boolean;
+    sep: string;
+    constructor(peg: any[], abs?: boolean);
+    append(part: any): void;
+    unify(peer: Val, ctx: Context): Val;
+    same(peer: Val): boolean;
+    get canon(): any;
+    gen(_ctx?: Context): undefined;
+}
+export { RefVal, };

package/dist/lib/val/RefVal.js

@@ -0,0 +1,73 @@
+"use strict";
+/* Copyright (c) 2021 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RefVal = 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");
+const val_1 = require("../val");
+class RefVal extends ValBase_1.ValBase {
+    constructor(peg, abs) {
+        super('');
+        this.sep = '.';
+        this.absolute = true === abs;
+        this.parts = [];
+        for (let part of peg) {
+            this.append(part);
+        }
+    }
+    append(part) {
+        //console.log('APPEND 0', part)
+        if ('string' === typeof part) {
+            this.parts.push(part);
+        }
+        else if (part instanceof val_1.StringVal) {
+            this.parts.push(part.peg);
+        }
+        else if (part instanceof RefVal) {
+            this.parts.push(...part.parts);
+            if (part.absolute) {
+                this.absolute = true;
+            }
+        }
+        this.peg = (this.absolute ? this.sep : '') + this.parts.join(this.sep);
+    }
+    unify(peer, ctx) {
+        let resolved = null == ctx ? this : ctx.find(this);
+        // TODO: large amount of reruns needed? why?
+        resolved = null == resolved && 999 < this.done ?
+            Nil_1.Nil.make(ctx, 'no-path', this, peer) : (resolved || this);
+        let out;
+        if (resolved instanceof RefVal) {
+            if (type_1.TOP === peer) {
+                out = this;
+            }
+            else if (peer instanceof Nil_1.Nil) {
+                out = Nil_1.Nil.make(ctx, 'ref[' + this.peg + ']', this, peer);
+            }
+            else {
+                // Ensure RefVal done is incremented
+                this.done = type_1.DONE === this.done ? type_1.DONE : this.done + 1;
+                out = new ConjunctVal_1.ConjunctVal([this, peer], ctx);
+            }
+        }
+        else {
+            out = (0, op_1.unite)(ctx, resolved, peer);
+        }
+        out.done = type_1.DONE === out.done ? type_1.DONE : this.done + 1;
+        return out;
+    }
+    same(peer) {
+        return null == peer ? false : this.peg === peer.peg;
+    }
+    get canon() {
+        return this.peg;
+    }
+    gen(_ctx) {
+        return undefined;
+    }
+}
+exports.RefVal = RefVal;
+//# sourceMappingURL=RefVal.js.map

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

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

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

@@ -0,0 +1,22 @@
+import type { Val } from '../type';
+import { Context } from '../unify';
+import { Site } from '../lang';
+declare abstract class ValBase implements Val {
+    id: number;
+    done: number;
+    path: string[];
+    row: number;
+    col: number;
+    url: string;
+    top?: boolean;
+    peg?: any;
+    err?: any[];
+    deps?: any;
+    constructor(peg?: any, ctx?: Context);
+    same(peer: Val): boolean;
+    get site(): Site;
+    abstract unify(peer: Val, ctx?: Context): Val;
+    abstract get canon(): string;
+    abstract gen(ctx?: Context): any;
+}
+export { ValBase, };