aontu 0.30.2 → 0.31.0

package/dist/val/Val.js

@@ -17,8 +17,6 @@ exports.SPREAD = exports.DONE = exports.Val = void 0;
 exports.empty = empty;
 const node_util_1 = require("node:util");
 const site_1 = require("../site");
-// import { AontuError, descErr, makeNilErr } from '../err'
-// import { AontuError } from '../err'
 const DONE = -1;
 exports.DONE = DONE;
 const SPREAD = Symbol('spread');
@@ -99,11 +97,15 @@ class Val {
     }
     clone(ctx, spec) {
         let cloneCtx;
-        let cut = this.path.indexOf('&');
-        cut = -1 < cut ? cut + 1 : ctx.path.length;
-        cloneCtx = ctx.clone({
-            path: ctx.path.concat(this.path.slice(cut))
-        });
+        let path = spec?.path;
+        if (null == path) {
+            let cut = this.path.indexOf('&');
+            cut = -1 < cut ? cut + 1 : ctx.path.length;
+            path = ctx.path.concat(this.path.slice(cut));
+        }
+        // console.log('CLONE', path, this.canon)
+        // console.trace()
+        cloneCtx = ctx.clone({ path });
         let fullspec = {
             peg: this.peg,
             mark: { type: this.mark.type, hide: this.mark.hide },
@@ -111,10 +113,11 @@ class Val {
         };
         let out = new this
             .constructor(fullspec, cloneCtx);
+        out.dc = this.done ? DONE : out.dc;
         out.site.row = spec?.row ?? this.site.row ?? -1;
         out.site.col = spec?.col ?? this.site.col ?? -1;
         out.site.url = spec?.url ?? this.site.url ?? '';
-        // TODO: should not be needed - update all VAL ctors to handle spec.mark
+        out.mark = Object.assign({}, this.mark, fullspec.mark ?? {});
         out.mark.type = this.mark.type && (fullspec.mark?.type ?? true);
         out.mark.hide = this.mark.hide && (fullspec.mark?.hide ?? true);
         return out;
@@ -139,44 +142,60 @@ class Val {
     notdone() {
         this.dc = DONE === this.dc ? DONE : this.dc + 1;
     }
-    [(_Val_ctx = new WeakMap(), node_util_1.inspect.custom)](_d, _o, _inspect) {
+    [(_Val_ctx = new WeakMap(), node_util_1.inspect.custom)](d, _opts, _inspect) {
+        return this.inspect(d);
+    }
+    inspect(d) {
+        d = null == d ? -1 : d;
         let s = ['<' + this.constructor.name.replace(/Val$/, '') + '/' + this.id];
         s.push('/' + this.path.join('.') + '/');
         s.push([
             DONE === this.dc ? 'D' : 'd' + this.dc,
             ...Object.entries(this.mark).filter(n => n[1]).map(n => n[0]).sort()
         ].filter(n => null != n).join(','));
-        let insp = this.inspection(node_util_1.inspect);
+        // let insp = this.inspection(inspect)
+        let insp = this.inspection(1 + d);
         if (null != insp && '' != insp) {
             s.push('/' + insp);
         }
         s.push('/');
-        if ('object' === typeof this.peg) {
-            s.push(inspectpeg(this.peg));
+        if (this.peg?.isVal) {
+            s.push(this.peg.inspect(1 + d));
+        }
+        else if (null != this.peg && 'object' === typeof this.peg &&
+            Object.entries(this.peg)[0]?.[1]?.isVal) {
+            s.push(inspectpeg(this.peg, 1 + d));
         }
         else if ('function' === typeof this.peg) {
             s.push(this.peg.name);
         }
         else {
-            s.push(this.peg);
+            s.push(this.peg?.toString?.() ?? '');
         }
         s.push('>');
         const out = s.join('');
         return out;
     }
-    inspection(_inspect) {
+    inspection(_d) {
         return '';
     }
 }
 exports.Val = Val;
-function inspectpeg(peg) {
-    return pretty(!Array.isArray(peg) ? (0, node_util_1.inspect)(peg) :
-        ('[' + peg.map(n => (0, node_util_1.inspect)(n)).join(',\n') + ']'));
+function inspectpeg(peg, d) {
+    const indent = '  '.repeat(d);
+    return pretty(Array.isArray(peg) ?
+        ('[' + peg.map(n => '\n  ' + indent + (n.inspect?.(d) ?? n)).join(',') +
+            '\n' + indent + ']') :
+        ('{' +
+            Object.entries(peg).map((n) => '\n  ' + indent + n[0] + ': ' + // n[1].inspect(d)
+                (n[1].inspect(d) ?? '' + n[1])).join(',') +
+            '\n' + indent + '}'));
 }
 function pretty(s) {
     return ((String(s))
         .replace(/\[Object: null prototype\]/g, '')
-        .replace(/\s+/g, ''));
+    // .replace(/([^\n]) +/g, '$1')
+    );
 }
 function empty(o) {
     return ((Array.isArray(o) && 0 === o.length)

package/dist/val/Val.js.map

@@ -1 +1 @@
-{"version":3,"file":"Val.js","sourceRoot":"","sources":["../../src/val/Val.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;;;;;;;;;;;;;AAoSvD,sBAAK;AAlSP,yCAAmC;AAInC,kCAEgB;AAgChB,2DAA2D;AAC3D,sCAAsC;AAGtC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAA;AAsPb,oBAAI;AApPN,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;AAqP7B,wBAAM;AAlPR,IAAI,EAAE,GAAG,IAAI,CAAA;AAGb,MAAe,GAAG;IA4DhB,4BAA4B;IAC5B,YAAY,IAAa,EAAE,GAAkB;QA5D7C,UAAK,GAAG,IAAI,CAAA;QAEZ,UAAK,GAAG,KAAK,CAAA;QACb,UAAK,GAAG,KAAK,CAAA;QACb,UAAK,GAAG,KAAK,CAAA;QACb,WAAM,GAAG,KAAK,CAAA;QACd,aAAQ,GAAG,KAAK,CAAA;QAChB,iBAAY,GAAG,KAAK,CAAA;QACpB,UAAK,GAAG,KAAK,CAAA;QACb,WAAM,GAAG,KAAK,CAAA;QACd,UAAK,GAAG,KAAK,CAAA;QACb,UAAK,GAAG,KAAK,CAAA;QACb,aAAQ,GAAG,KAAK,CAAA;QAChB,cAAS,GAAG,KAAK,CAAA;QACjB,aAAQ,GAAG,KAAK,CAAA;QAChB,cAAS,GAAG,KAAK,CAAA;QACjB,eAAU,GAAG,KAAK,CAAA;QAClB,eAAU,GAAG,KAAK,CAAA;QAClB,eAAU,GAAG,KAAK,CAAA;QAElB,SAAI,GAAG,KAAK,CAAA;QACZ,aAAQ,GAAG,KAAK,CAAA;QAEhB,WAAM,GAAG,KAAK,CAAA;QACd,gBAAW,GAAG,KAAK,CAAA;QACnB,eAAU,GAAG,KAAK,CAAA;QAClB,eAAU,GAAG,KAAK,CAAA;QAClB,eAAU,GAAG,KAAK,CAAA;QAClB,cAAS,GAAG,KAAK,CAAA;QACjB,gBAAW,GAAG,KAAK,CAAA;QACnB,eAAU,GAAG,KAAK,CAAA;QAClB,eAAU,GAAG,KAAK,CAAA;QAClB,eAAU,GAAG,KAAK,CAAA;QAClB,gBAAW,GAAG,KAAK,CAAA;QACnB,eAAU,GAAG,KAAK,CAAA;QAClB,gBAAW,GAAG,KAAK,CAAA;QAGnB,OAAE,GAAW,CAAC,CAAA;QACd,SAAI,GAAa,EAAE,CAAA;QACnB,SAAI,GAAS,IAAI,WAAI,EAAE,CAAA;QAEvB,wBAAwB;QACxB,SAAI,GAAY,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;QAE5C,uBAAuB;QACvB,QAAG,GAAQ,SAAS,CAAA;QAEpB,8CAA8C;QAC9C,gCAAgC;QAChC,QAAG,GAAU,EAAE,CAAA;QACf,YAAO,GAAiB,IAAI,CAAA;QAM5B,2BAAS;QAIP,uBAAA,IAAI,YAAQ,GAAG,MAAA,CAAA;QAEf,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,CAAA;QAEpB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,MAAM,GAAI,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC,CAAA;YACtC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAC7C;YAAE,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;QACxC,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,IAAI,EAAE,CAAA;QAE3B,uBAAuB;QACvB,gDAAgD;QAChD,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAA;QAEd,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QAEZ,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAA;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAA;QAElC,qEAAqE;IACvE,CAAC;IAGD,GAAG;QACD,OAAO,uBAAA,IAAI,gBAAK,CAAA;IAClB,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,EAAE,KAAK,IAAI,CAAA;IACzB,CAAC;IAGD,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAA;IACnD,CAAC;IAGD,KAAK,CAAC,GAAiB,EAAE,IAAc;QACrC,IAAI,QAAQ,CAAA;QAEZ,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAA;QAC1C,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC5C,CAAC,CAAA;QAEF,IAAI,QAAQ,GAAG;YACb,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACpD,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;SAChB,CAAA;QAED,IAAI,GAAG,GAAG,IAAK,IAAY;aACxB,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAElC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAC/C,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAC/C,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAA;QAE/C,wEAAwE;QACxE,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/D,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,CAAA;QAE/D,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,KAAK,CAAC,CAAM;QACV,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QAC1B,OAAO,CAAC,CAAA;IACV,CAAC;IAED,oEAAoE;IACpE,KAAK,CAAC,KAAU,EAAE,IAAkB,IAAS,OAAO,IAAI,CAAA,CAAC,CAAC;IAE1D,+DAA+D;IAC/D,iDAAiD;IACjD,IAAI,KAAK,KAAa,OAAO,EAAE,CAAA,CAAC,CAAC;IAGjC,QAAQ;QACN,OAAO,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAA;IACjE,CAAC;IAGD,GAAG,CAAC,IAAkB;QACpB,OAAO,SAAS,CAAA;IAClB,CAAC;IAGD,OAAO;QACL,IAAI,CAAC,EAAE,GAAG,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC;IAMD,4BAAC,mBAAO,CAAC,MAAM,EAAC,CAAC,EAAU,EAAE,EAAO,EAAE,QAAa;QACjD,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAA;QAEzE,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QAEvC,CAAC,CAAC,IAAI,CAAC;YACL,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE;YACtC,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;SACrE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAEnC,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,mBAAO,CAAC,CAAA;QACnC,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;QACpB,CAAC;QAED,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;YACjC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC9B,CAAC;aACI,IAAI,UAAU,KAAK,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;YACxC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;aACI,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;QAED,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEX,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEtB,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,UAAU,CAAC,QAAkB;QAC3B,OAAO,EAAE,CAAA;IACX,CAAC;CAEF;AAiCC,kBAAG;AA9BL,SAAS,UAAU,CAAC,GAAQ;IAC1B,OAAO,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAO,EAAC,GAAG,CAAC,CAAC,CAAC;QAChD,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;AACvD,CAAC;AAED,SAAS,MAAM,CAAC,CAAS;IACvB,OAAO,CACL,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACR,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC;SAC1C,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,CAAA;AACH,CAAC;AAGD,SAAS,KAAK,CAAC,CAAM;IACnB,OAAO,CACL,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;WACjC,CAAC,IAAI,IAAI,CAAC,IAAI,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;WACnE,KAAK,CACT,CAAA;AACH,CAAC"}
+{"version":3,"file":"Val.js","sourceRoot":"","sources":["../../src/val/Val.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.30.2",
+  "version": "0.31.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",

package/src/ctx.ts

@@ -20,7 +20,7 @@ import {
 type AontuContextConfig = {
   cc?: number
   err?: any[] // Omit<NilVal[], "push">
-  explain?: any[]
+  explain?: any[] | boolean | null
   fs?: any
   path?: string[]
   root?: Val
@@ -71,7 +71,7 @@ class AontuContext {
     this.collect = cfg.collect ?? null != cfg.err
 
     this.err = cfg.err ?? []
-    this.explain = cfg.explain ?? null
+    this.explain = Array.isArray(cfg.explain) ? cfg.explain : null
 
     this.fs = cfg.fs ?? null
 
@@ -97,7 +97,7 @@ class AontuContext {
     root?: Val,
     path?: string[],
     err?: any[],
-    explain?: any[]
+    explain?: any[] | boolean | null
   }): AontuContext {
     const ctx = Object.create(this)
     ctx.path = cfg.path ?? this.path
@@ -105,7 +105,7 @@ class AontuContext {
     ctx.var = Object.create(this.vars)
 
     ctx.err = cfg.err ?? ctx.err
-    ctx.explain = cfg.explain ?? ctx.explain
+    ctx.explain = Array.isArray(cfg.explain) ? cfg.explain : ctx.explain
 
     ctx._pathstr = undefined
 

package/src/hints.ts

@@ -53,6 +53,16 @@ const hints: Record<string, string> = {
   literal_nil:
     'A literal nil cannot unify with any other value.',
 
+  unify_cycle: 'Circular reference detected during unification.',
+
+  conjunct:
+    'This conjunction (& operator) could not be completed as some terms\n' +
+    'could not be resolved.',
+
+  no_path: 'The path reference could not be found.' +
+    '\n \nExamples:\n' +
+    '  a:1 b:$.a  -> a:1,b:1  # $.a is a valid path reference as a is a key of root ($).\n' +
+    '  a:$.b      -> nil      # $.b is not a valid path reference as there is no key b in root ($).\n',
 
   // Parsing errors
   'parse_bad_src': 'Invalid source provided for parsing. The source must be a non-empty string.',
@@ -61,7 +71,7 @@ const hints: Record<string, string> = {
   'unify_no_src': 'No source provided for unification. Cannot unify without source values.',
   'unify_no_res': 'Unification produced no result. The values could not be unified.',
   'unite': 'Failed to unite two values. The values are incompatible and cannot be unified.',
-  'cycle': 'Circular reference detected during unification. The unification process encountered a cycle.',
+
   'internal': 'Internal error during unification. This indicates an unexpected error in the unification process.',
 
   // Type mismatch errors

package/src/unify.ts

@@ -39,22 +39,24 @@ const unite = (ctx: AontuContext, a: any, b: any, whence: string) => {
   let out = a
   let why = 'u'
 
-  // const saw = a?.isTop && b?.isTop ? '' :
-  //   (a ? a.id + (a.done ? '' : '*') : '') + '~' + (b ? b.id + (b.done ? '' : '*') : '')
-
   const saw =
     (a ? a.id + (a.done ? '' : '*') : '') + '~' + (b ? b.id + (b.done ? '' : '*') : '') +
     '@' + ctx.pathstr
 
+
   /*
-  if (10 < ctx.seen[saw]) {
+  if (1 < ctx.seen[saw]) {
     console.log('UNITE-SAW', ctx.cc, saw, ctx.seen[saw], 1 < ctx.seen[saw] ? (a?.canon + ' ~ ' + b?.canon) : '')
-    console.trace()
+    // console.trace()
+    // process.exit()
   }
   */
 
+  // NOTE: if this error occurs "unreasonably", attemp to avoid unnecesary unification
+  // See for example PrefVal peg.id equality inspection.
   if (MAXCYCLE < ctx.seen[saw]) {
-    out = makeNilErr(ctx, 'cycle', a, b)
+    // console.log('SAW', ctx.seen[saw], saw, a?.id, a?.canon, b?.id, b?.canon, ctx.cc)
+    out = makeNilErr(ctx, 'unify_cycle', a, b)
   }
   else {
     ctx.seen[saw] = 1 + (ctx.seen[saw] ?? 0)
@@ -118,15 +120,21 @@ const unite = (ctx: AontuContext, a: any, b: any, whence: string) => {
         why += 'N'
       }
 
-      if (DONE !== out.dc && !unified) {
+      // console.log('UNITE-DONE', out.id, out.canon, out.done)
+
+      // if (DONE !== out.dc && !unified) {
+      if (!out.done && !unified) {
         let nout = out.unify(top(), ctx.clone({ explain: ec(te, 'ND') }))
         out = nout
         why += 'T'
       }
 
+      // console.log('UNITE', why, a?.id, a?.canon, a?.done, b?.id, b?.canon, b?.done, '->', out?.id, out?.canon, out?.done)
+
       uc++
     }
     catch (err: any) {
+      // console.log(err)
       // TODO: handle unexpected
       out = makeNilErr(ctx, 'internal', a, b)
     }

package/src/utility.ts

@@ -73,14 +73,18 @@ function walk(
   if (null != child && !child.isVal) {
     if ('object' === typeof child) {
       for (let ckey in child) {
-        child[ckey] = walk(
-          child[ckey], before, after, maxdepth, ckey, out, [...(path || []), ckey])
+        if (child[ckey] && child[ckey].isVal) {
+          child[ckey] = walk(
+            child[ckey], before, after, maxdepth, ckey, out, [...(path || []), ckey])
+        }
       }
     }
     else if (Array.isArray(child)) {
       for (let i = 0; i < child.length; i++) {
-        child[i] = walk(
-          child[i], before, after, maxdepth, i, out, [...(path || []), '' + i])
+        if (child[i] && child[i].isVal) {
+          child[i] = walk(
+            child[i], before, after, maxdepth, i, out, [...(path || []), '' + i])
+        }
       }
     }
   }
@@ -93,10 +97,11 @@ function walk(
 
 const T_NOTE = 0
 const T_WHY = 1
-const T_AVAL = 2
-const T_BVAL = 3
-const T_OVAL = 4
-const T_CHILDREN = 5
+const T_PATH = 2
+const T_AVAL = 3
+const T_BVAL = 4
+const T_OVAL = 5
+const T_CHILDREN = 6
 
 
 function explainOpen(
@@ -111,6 +116,7 @@ function explainOpen(
   t = t ?? [null, 'root', null, null, null, null]
   t[T_WHY] = t[T_WHY] ?? ''
   t[T_NOTE] = (0 <= ctx.cc ? ctx.cc + '~' : '') + note
+  t[T_PATH] = ['$', ctx.path.join('.')].filter(p => '' != p).join('.') + '  '
   if (ac) {
     t[T_AVAL] = ac.id + (ac.done ? '' : '!') + '=' + ac.canon
   }
@@ -136,7 +142,7 @@ function explainClose(t: any[] | undefined | null, out?: Val) {
   if (null == t) return;
 
   if (out) {
-    t[T_OVAL] = out.id + (out.done ? '' : '!') + '=' + out.canon
+    t[T_OVAL] = '-> ' + out.id + (out.done ? '' : '!') + '=' + out.canon
   }
 }
 

package/src/val/ConjunctVal.ts

@@ -84,6 +84,7 @@ class ConjunctVal extends JunctionVal {
 
     this.peg = norm(this.peg)
 
+    // console.log('\nCONJUNCT', ctx.cc, this.id, this.canon, peer.id, peer.canon)
 
     // Unify each term of conjunct against peer
     let upeer: Val[] = []
@@ -92,6 +93,7 @@ class ConjunctVal extends JunctionVal {
     let newhide = this.mark.hide || peer.mark.hide
 
     for (let vI = 0; vI < this.peg.length; vI++) {
+      // console.log('CONJUNCT-peg', vI, this.peg[vI].canon, this.peg[vI].mark)
       newtype = this.peg[vI].mark.type || newtype
       newhide = this.peg[vI].mark.hide || newhide
     }
@@ -103,6 +105,7 @@ class ConjunctVal extends JunctionVal {
 
       upeer[vI] = (this.peg[vI].done && peer.isTop) ? this.peg[vI] :
         unite(ctx.clone({ explain: ec(te, 'OWN') }), this.peg[vI], peer, 'cj-own')
+
       upeer[vI].mark.type = newtype = newtype || upeer[vI].mark.type
       upeer[vI].mark.hide = newhide = newhide || upeer[vI].mark.hide
 
@@ -135,7 +138,7 @@ class ConjunctVal extends JunctionVal {
     for (let pI = 0; pI < upeer.length; pI++) {
       let t1 = upeer[pI + 1]
 
-      // console.log('CONJUNCT-TERMS-C', this.id, pI, t0, t1, 'OV=', outvals.map((v: Val) => v))
+      // console.log('CONJUNCT-TERMS-C', ctx.cc, this.id, pI, t0.id, t0.canon, t1?.id, t1?.canon, 'OV=', outvals.map((v: Val) => v.canon))
 
       if (null == t1) {
         outvals.push(t0)
@@ -158,6 +161,7 @@ class ConjunctVal extends JunctionVal {
 
       else {
         val = unite(ctx.clone({ explain: ec(te, 'DEF') }), t0, t1, 'cj-peer-t0t1')
+        // console.log('CONJUNCT-T', t0.canon, t1?.canon, '->', val.canon)
         done = done && DONE === val.dc
         newtype = this.mark.type || val.mark.type
         newhide = this.mark.hide || val.mark.hide
@@ -173,10 +177,6 @@ class ConjunctVal extends JunctionVal {
         else {
           t0 = val
         }
-        // TODO: t0 should become this to avoid unnecessary repasses
-        // outvals.push(val)
-
-        // pI++
       }
     }
 

package/src/val/CopyFuncVal.ts

@@ -43,21 +43,34 @@ class CopyFuncVal extends FuncBaseVal {
     return new CopyFuncVal(spec)
   }
 
+
   funcname() {
     return 'copy'
   }
 
-  resolve(ctx: AontuContext | undefined, args: Val[]) {
+  prepare(_ctx: AontuContext, _args: Val[]) {
+    return null
+  }
+
+
+  resolve(ctx: AontuContext, args: Val[]) {
     const val = args?.[0]
     const out = null == val || null == ctx ?
       makeNilErr(ctx, 'invalid-arg', this) :
-      val.clone(ctx, { mark: { type: false, hide: false } })
+      val.clone(ctx)
+
+    // console.log('CR', out)
+
+    if (!out.isRef) {
+      walk(out, (_key: string | number | undefined, val: Val) => {
+        // console.log('WALK', val)
+        val.mark.type = false
+        val.mark.hide = false
+        return val
+      })
+    }
 
-    walk(out, (_key: string | number | undefined, val: Val) => {
-      val.mark.type = false
-      val.mark.hide = false
-      return val
-    })
+    // console.log('COPY-RESOLVE', ctx.cc, val, out)
 
     return out
   }

package/src/val/FuncBaseVal.ts

@@ -27,7 +27,6 @@ import {
   top
 } from './top'
 
-import { NilVal } from '../val/NilVal'
 import { ConjunctVal } from '../val/ConjunctVal'
 import { FeatureVal } from '../val/FeatureVal'
 
@@ -59,6 +58,7 @@ class FuncBaseVal extends FeatureVal {
 
 
   unify(peer: Val, ctx: AontuContext): Val {
+    const TOP = top()
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Func:' + this.funcname(), this, peer)
 
     // const sc = this.id + '=' + this.canon
@@ -71,6 +71,8 @@ class FuncBaseVal extends FeatureVal {
 
     // console.log('FBV', this.id, this.constructor.name, this.mark.type, this.peg?.canon, 'PEER', peer.id, peer.canon)
 
+    let pegdone = true
+
     if (this.id !== peer.id) {
 
       if (peer.isTop && (this.mark.type || this.mark.hide)) {
@@ -78,25 +80,34 @@ class FuncBaseVal extends FeatureVal {
       }
 
       else {
-        let pegdone = true
+
         let newpeg: Val[] = []
         let newtype = this.mark.type
         let newhide = this.mark.hide
 
-        this.peg = this.prepare(ctx, this.peg)
-
-        for (let arg of this.peg) {
-          // console.log('FUNCBASE-UNIFY-PEG-A', arg.canon)
+        let pegprep = this.prepare(ctx, this.peg)
 
-          let newarg = arg
-          if (!arg.done) {
-            newarg = arg.unify(top(), ctx.clone({ explain: ec(te, 'ARG') }))
-            newtype = newtype || newarg.mark.type
-            newhide = newhide || newarg.mark.hide
-            // console.log('FUNCBASE-UNIFY-PEG-B', arg.canon, '->', newarg.canon)
+        if (null === pegprep) {
+          pegdone = true
+          newpeg = this.peg
+        }
+        else {
+          this.peg = pegprep
+
+          for (let arg of this.peg) {
+            // console.log('FUNCBASE-UNIFY-PEG-A', arg.canon)
+
+            let newarg = arg
+            if (!arg.done) {
+              newarg = arg.unify(TOP, ctx.clone({ explain: ec(te, 'ARG') }))
+              newtype = newtype || newarg.mark.type
+              newhide = newhide || newarg.mark.hide
+              // console.log('FUNCBASE-UNIFY-PEG-B', arg.canon, arg.done, '->', newarg.canon, newarg.done)
+            }
+            // pegdone &&= arg.done
+            pegdone &&= newarg.done
+            newpeg.push(newarg)
           }
-          pegdone &&= arg.done
-          newpeg.push(newarg)
         }
 
         // console.log('FUNCBASE-PEG', this.id, pegdone, this.peg.map((p: any) => p?.canon))
@@ -106,15 +117,10 @@ class FuncBaseVal extends FeatureVal {
           // console.log('FUNC-RESOLVED', ctx.cc, resolved?.canon)
 
           out = resolved.done && peer.isTop ? resolved :
-            unite(ctx.clone({ explain: ec(te, 'PEG') }), resolved, peer, 'func-' + this.funcname() + '/' + this.id)
+            unite(ctx.clone({ explain: ec(te, 'PEG') }),
+              resolved, peer, 'func-' + this.funcname() + '/' + this.id)
           propagateMarks(this, out)
 
-          // const unified =
-          //   unite(ctx, resolved, peer, 'func-' + this.funcname() + '/' + this.id)
-          // out = unified
-          // propagateMarks(unified, out)
-          // propagateMarks(this, out)
-
           // TODO: make should handle this using ctx?
           out.site.row = this.site.row
           out.site.col = this.site.col
@@ -157,7 +163,7 @@ class FuncBaseVal extends FeatureVal {
       }
     }
 
-    // console.log('FUNC-UNIFY-OUT', this.funcname(), this.id, this.canon, 'W=', why, peer.id, peer.canon, 'O=', out.dc, out.id, out.canon)
+    // console.log('FUNC-UNIFY-OUT', ctx.cc, this.funcname(), this.id, this.canon, 'D=', pegdone, 'W=', why, peer.id, peer.canon, 'O=', out.dc, out.id, out.canon)
 
     explainClose(te, out)
 
@@ -180,12 +186,12 @@ class FuncBaseVal extends FeatureVal {
   }
 
 
-  prepare(_ctx: AontuContext | undefined, args: Val[]): Val[] {
+  prepare(_ctx: AontuContext, args: Val[]): Val[] | null {
     return args
   }
 
 
-  resolve(ctx: AontuContext | undefined, _args: Val[]): Val {
+  resolve(ctx: AontuContext, _args: Val[]): Val {
     return makeNilErr(ctx, 'func:' + this.funcname(), this, undefined, 'resolve')
   }
 

package/src/val/JunctionVal.ts

@@ -40,8 +40,8 @@ abstract class JunctionVal extends FeatureVal {
   get canon() {
     return this.peg.map((v: Val) => {
       return (v as any).isJunction && Array.isArray(v.peg) && 1 < v.peg.length ?
-        '(' + v.canon + ')' : v.canon
-    }).join(this.getJunctionSymbol())
+        '(' + v.canon + ')' : v.canon // v.id + '=' + v.canon
+    }).join(this.getJunctionSymbol()) // + '<' + (this.mark.hide ? 'H' : '') + '>'
   }
 
   // Abstract method to be implemented by subclasses to define their junction symbol

package/src/val/KeyFuncVal.ts

@@ -12,6 +12,7 @@ import {
 } from '../ctx'
 
 import { StringVal } from '../val/StringVal'
+import { ConjunctVal } from '../val/ConjunctVal'
 
 
 
@@ -39,17 +40,52 @@ class KeyFuncVal extends FuncBaseVal {
   }
 
 
+  unify(peer: Val, ctx: AontuContext): Val {
+    // TODO: this delay makes keys in spreads and refs work, but it is a hack - find a better way.
+    let out: Val = this
+
+    if (ctx.cc < 3) {
+      this.notdone()
+
+      if (peer.isTop || (peer.id === this.id)) {
+        // TODO: clone needed to avoid triggering unify_cycle - find a better way
+        out = this.clone(ctx)
+      }
+      else if (peer.isNil) {
+        out = peer
+      }
+      else {
+        if (
+          peer.isKeyFunc
+          && peer.path.join('.') === this.path.join('.')
+          && peer.peg?.[0]?.peg === this.peg?.[0]?.peg
+        ) {
+          out = this
+        }
+        else {
+          out = new ConjunctVal({ peg: [this, peer] }, ctx)
+        }
+      }
+    }
+    else {
+      out = super.unify(peer, ctx)
+    }
+
+    return out
+  }
+
 
   resolve(_ctx: AontuContext, _args: Val[]) {
     let out: Val = this
 
-    if (!this.mark.type && !this.mark.hide) {
-      let move = this.peg?.[0]?.peg
-      move = isNaN(move) ? 1 : +move
-      const key = this.path[this.path.length - (1 + move)] ?? ''
+    // if (!this.mark.type && !this.mark.hide) {
+    let move = this.peg?.[0]?.peg
+    move = isNaN(move) ? 1 : +move
+    const key = this.path[this.path.length - (1 + move)] ?? ''
+    // console.log('KEY', this.path, move, key)
 
-      out = new StringVal({ peg: key })
-    }
+    out = new StringVal({ peg: key })
+    // }
 
     return out
   }