aontu 0.30.2 → 0.32.1

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
   }

package/src/val/ListVal.ts

@@ -243,7 +243,20 @@ class ListVal extends BagVal {
 
       const optional = this.optionalKeys.includes('' + i)
 
-      if (child.isScalar
+      // Optional unresolved disjuncts are not an error, just dropped.
+      if (child.isDisjunct && optional) {
+        const dctx = ctx.clone({ err: [] })
+
+        let cval = child.gen(dctx)
+
+        if (undefined === cval) {
+          continue
+        }
+
+        out.push(cval)
+      }
+
+      else if (child.isScalar
         || child.isMap
         || child.isList
         || child.isPref

package/src/val/MapVal.ts

@@ -77,6 +77,8 @@ class MapVal extends BagVal {
   // NOTE: order of keys is not preserved!
   // not possible in any case - consider {a,b} unify {b,a}
   unify(peer: Val, ctx: AontuContext): Val {
+    // console.log('MAPVAL-UNIFY', this.id, this.canon, peer.id, peer.canon)
+
     const TOP = top()
     peer = peer ?? TOP
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Map', this, peer)
@@ -92,7 +94,19 @@ class MapVal extends BagVal {
 
     out.spread.cj = this.spread.cj
 
+    // TODO: some spreads (no path refs etc) could self unified
+    /*
+    if (out.spread.cj && !out.spread.cj.mark._self_unified) {
+      // console.log('MAPVAL-SPR-START', out.spread.cj.mark)
+      out.spread.cj = out.spread.cj.unify(TOP, ctx.clone({ explain: ec(te, 'SPR-SELF-UNIFY') }))
+      out.spread.cj.mark._self_unified = true
+      // console.log('MAPVAL-SU', out.spread.cj.id, out.spread.cj.canon, out.spread.cj.done)
+    }
+    */
+
     if (peer instanceof MapVal) {
+      // console.log('MAPVAL-PEER-MAPVAL', this.id, this.canon, this.done, peer.id, peer.canon, peer.done)
+
       if (!this.closed && peer.closed) {
         out = peer.unify(this, ctx.clone({ explain: ec(te, 'PMC') })) as MapVal
         exit = true
@@ -119,11 +133,16 @@ class MapVal extends BagVal {
         out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
           null == peer.spread.cj ? out.spread.cj : (
             out.spread.cj =
-            unite(ctx.clone({ explain: ec(te, 'SPR') }), out.spread.cj, peer.spread.cj, 'map-self')
+            unite(ctx.clone({ explain: ec(te, 'SPR') }),
+              out.spread.cj, peer.spread.cj, 'map-self')
           )
         )
       }
     }
+    else {
+      // console.log('MAPVAL-PEER-OTHER', this.id, this.canon, this.done, peer.id, peer.canon, peer.done)
+    }
+
 
     if (!exit) {
       out.dc = this.dc + 1
@@ -135,7 +154,10 @@ class MapVal extends BagVal {
       // Always unify own children first
       for (let key in this.peg) {
         const keyctx = ctx.descend(key)
+
         const key_spread_cj = spread_cj.clone(keyctx)
+        // console.log('MAPVAL-SPREAD', this.id, key, key_spread_cj.id, key_spread_cj.canon, key_spread_cj.done)
+
         const child = this.peg[key]
 
         propagateMarks(this, child)
@@ -146,7 +168,7 @@ class MapVal extends BagVal {
               key_spread_cj.isNil ? key_spread_cj :
                 key_spread_cj.isTop && child.done ? child :
                   child.isTop && key_spread_cj.done ? key_spread_cj :
-                    unite(keyctx.clone({ explain: ec(te, 'PEG:' + key) }),
+                    unite(keyctx.clone({ explain: ec(te, 'KEY:' + key) }),
                       child, key_spread_cj, 'map-own')
 
         done = (done && DONE === out.peg[key].dc)
@@ -184,6 +206,9 @@ class MapVal extends BagVal {
           if (this.spread.cj) {
             let key_ctx = ctx.descend(peerkey)
             let key_spread_cj = spread_cj.clone(key_ctx)
+
+            // console.log('MAPVAL-PEER-SPR', peerkey, key_spread_cj.id, key_spread_cj.canon, key_spread_cj.done)
+
             oval = out.peg[peerkey] =
               unite(key_ctx.clone({ explain: ec(te, 'PSP:' + peerkey) }),
                 oval, key_spread_cj, 'map-peer-spread')
@@ -222,9 +247,16 @@ class MapVal extends BagVal {
   clone(ctx: AontuContext, spec?: ValSpec): Val {
     let out = (super.clone(ctx, spec) as MapVal)
     out.peg = {}
+
     for (let entry of Object.entries(this.peg)) {
       out.peg[entry[0]] =
-        (entry[1] as any)?.isVal ? (entry[1] as Val).clone(ctx, spec?.mark ? { mark: spec.mark } : {}) : entry[1]
+        (entry[1] as any)?.isVal ?
+          // (entry[1] as Val).clone(ctx, spec?.mark ? { mark: spec.mark } : {}) :
+          (entry[1] as Val).clone(ctx, {
+            mark: spec?.mark ?? {},
+            path: [...out.path, entry[0]]
+          }) :
+          entry[1]
     }
     if (this.spread.cj) {
       out.spread.cj = this.spread.cj.clone(ctx, spec?.mark ? { mark: spec.mark } : {})
@@ -255,16 +287,19 @@ class MapVal extends BagVal {
           (this.peg[k]?.canon ?? this.peg[k])
         ])
         .join(',') +
-      '}'
+      '}' // + '<' + (this.mark.hide ? 'H' : '') + '>'
+
   }
 
 
-  inspection(inspect: Function) {
-    return this.spread.cj ? '&:' + inspect(this.spread.cj) : ''
+  inspection(d?: number) {
+    return this.spread.cj ? '&:' + this.spread.cj.inspect(null == d ? 0 : d + 1) : ''
   }
 
 
   gen(ctx: AontuContext) {
+    // console.log('MAPVAL-gen')
+
     let out: any = {}
     if (this.mark.type || this.mark.hide) {
       return undefined
@@ -272,13 +307,32 @@ class MapVal extends BagVal {
 
     for (let p in this.peg) {
       const child = this.peg[p]
+
       if (child.mark.type || child.mark.hide) {
         continue
       }
 
       const optional = this.optionalKeys.includes(p)
 
-      if (child.isScalar
+      // console.log('MAPVAL-gen-p', p, optional, child.isDisjunct, child)
+
+
+      // Optional unresolved disjuncts are not an error, just dropped.
+      if (child.isDisjunct && optional) {
+        const dctx = ctx.clone({ err: [], collect: true })
+
+        let cval = child.gen(dctx)
+
+        // console.log('CVAL', cval, ctx.err, dctx.err, child.err)
+
+        if (undefined === cval) {
+          continue
+        }
+
+        out[p] = cval
+      }
+
+      else if (child.isScalar
         || child.isMap
         || child.isList
         || child.isPref
@@ -286,9 +340,9 @@ class MapVal extends BagVal {
         || child.isDisjunct
         || child.isNil
       ) {
-        const cval = child.gen(ctx)
+        let cval = child.gen(ctx)
 
-        if (optional && empty(cval)) {
+        if (optional && (undefined === cval || empty(cval))) {
           continue
         }
 

package/src/val/MoveFuncVal.ts

@@ -22,6 +22,7 @@ import {
 
 import { FuncBaseVal } from './FuncBaseVal'
 import { CopyFuncVal } from './CopyFuncVal'
+import { PrefFuncVal } from './PrefFuncVal'
 
 
 
@@ -44,30 +45,33 @@ class MoveFuncVal extends FuncBaseVal {
     return 'move'
   }
 
+  prepare(_ctx: AontuContext, _args: Val[]) {
+    return null
+  }
 
   resolve(ctx: AontuContext, args: Val[]) {
     let out = args[0] ?? makeNilErr(ctx, 'arg', this)
 
     const orig = out
-    const origcanon = orig.canon
 
     if (!orig.isNil) {
       const src = orig.clone(ctx)
 
+      if (src.isRef) {
+        src.mark._hide_found = true
+      }
+
       walk(orig, (_key: string | number | undefined, val: Val) => {
         val.mark.hide = true
         return val
       })
 
-      out = new CopyFuncVal({ peg: [src] }, ctx)
+      // out = new CopyFuncVal({ peg: [src] }, ctx)
+      out = new PrefFuncVal({ peg: [src] }, ctx)
+      // out = src
     }
 
-    Object.defineProperty(out, 'canon', {
-      get: () => 'move(' + origcanon + ')',
-      configurable: true
-    })
-
-    // console.log('MOVE-resolve', out)
+    // console.log('MOVE-resolve', orig, out)
 
     return out
   }

package/src/val/PrefVal.ts

@@ -59,17 +59,27 @@ class PrefVal extends FeatureVal {
     let out: Val = this
     let why = ''
 
-
     if (!this.peg.done) {
-      const resolved = unite(ctx.clone({ explain: ec(te, 'RES') }), this.peg, top(), 'pref/resolve')
+      const resolved = unite(ctx.clone({ explain: ctx.explain && ec(te, 'RES') }),
+        this.peg, top(), 'pref/resolve')
       // console.log('PREF-RESOLVED', this.peg.canon, '->', resolved)
       this.peg = resolved
     }
 
-
     if (peer instanceof PrefVal) {
       why += 'pref-'
-      if (this.rank < peer.rank) {
+      if (this.id === peer.id) {
+        out = this
+        why += 'same'
+      }
+
+      // Avoid MAXCYCLE errors
+      else if (this.peg.id === peer.peg.id) {
+        out = this
+        why += 'same-peg'
+      }
+
+      else if (this.rank < peer.rank) {
         out = this
         why += 'rank-win'
       }
@@ -78,22 +88,23 @@ class PrefVal extends FeatureVal {
         why += 'rank-lose'
       }
       else {
-        let peg = unite(ctx.clone({ explain: ec(te, 'PEER') }), this.peg, peer.peg, 'pref-peer/' + this.id)
+        // console.log('PREF-PEER',
+        //   this.peg.id, this.peg, this.peg.done,
+        //   peer.peg.id, peer.peg, peer.peg.done,
+        // )
+
+        let peg = unite(ctx.clone({ explain: ctx.explain && ec(te, 'PREF-PEER') }),
+          this.peg, peer.peg, 'pref-peer/' + this.id)
         out = new PrefVal({ peg }, ctx)
+        // console.log('PREF-RANK-SAME-OUT', peg, peg.done, out, out.done)
         why += 'rank-same'
       }
     }
     else if (!peer.isTop) {
       why += 'super-'
 
-      // if (this.superpeg instanceof Nil) {
-      //   out = peer
-      //   why += 'nil'
-      // }
-      // else {
-      //   why += 'unify'
-
-      out = unite(ctx.clone({ explain: ec(te, 'SUPER') }), this.superpeg, peer, 'pref-super/' + this.id)
+      out = unite(ctx.clone({ explain: ctx.explain && ec(te, 'SUPER') }),
+        this.superpeg, peer, 'pref-super/' + this.id)
       if (out.same(this.superpeg)) {
         out = this.peg
         why += 'same'
@@ -109,7 +120,7 @@ class PrefVal extends FeatureVal {
 
     // console.log('PREFVAL-OUT', why, this.canon, peer.canon, '->', out.canon, out.done)
 
-    explainClose(te, out)
+    ctx.explain && explainClose(te, out)
 
     return out
   }

package/src/val/RefVal.ts

@@ -1,6 +1,8 @@
 /* Copyright (c) 2021-2025 Richard Rodger, MIT License */
 
 
+import Util from 'node:util'
+
 import {
   walk,
   explainOpen,
@@ -135,7 +137,7 @@ class RefVal extends FeatureVal {
 
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Ref', this, peer)
     let out: Val = this
-    // let why = 'id'
+    let why = 'id'
 
     if (this.id !== peer.id) {
 
@@ -152,35 +154,36 @@ class RefVal extends FeatureVal {
       else if (resolved instanceof RefVal) {
         if (peer.isTop) {
           out = this
-          // why = 'pt'
+          why = 'pt'
         }
         else if (peer.isNil) {
           out = makeNilErr(ctx, 'ref[' + this.peg + ']', this, peer)
-          // why = 'pn'
+          why = 'pn'
         }
 
         // same path
-        // else if (this.peg === peer.peg) {
         else if (this.canon === peer.canon) {
           out = this
-          // why = 'pp'
+          why = 'pp'
         }
 
         else {
           // Ensure RefVal done is incremented
           this.dc = DONE === this.dc ? DONE : this.dc + 1
           out = new ConjunctVal({ peg: [this, peer] }, ctx)
-          // why = 'cj'
+          why = 'cj'
         }
       }
       else {
         out = unite(ctx.clone({ explain: ec(te, 'RES') }), resolved, peer, 'ref')
-        // why = 'u'
+        why = 'u'
       }
 
       out.dc = DONE === out.dc ? DONE : this.dc + 1
     }
 
+    // console.log('REFVAL-UNIFY-OUT', ctx.cc, this.id, this.canon, this.done, 'P=', peer.id, peer.canon, peer.done, '->', out.id, out.canon, out.done)
+
     explainClose(te, out)
     return out
   }
@@ -189,7 +192,15 @@ class RefVal extends FeatureVal {
   find(ctx: AontuContext) {
     let out: Val | undefined = undefined
 
-    if (this.path.join('.').startsWith(this.peg.join('.'))) {
+    const selfpath = this.path.join('.')
+    const pegpath = this.peg.join('.')
+    const isprefixpath = selfpath.startsWith(pegpath)
+
+    let refpath: string[] = []
+    let pI = 0
+    // let descent = ''
+
+    if (isprefixpath) {
       out = makeNilErr(ctx, 'path_cycle', this)
     }
     else {
@@ -248,8 +259,6 @@ class RefVal extends FeatureVal {
         }
       }
 
-      let refpath: string[] = []
-
       if (this.absolute) {
         refpath = parts
       }
@@ -282,43 +291,86 @@ class RefVal extends FeatureVal {
       }
 
       let node = ctx.root as Val
-      let pI = 0
+
+      let nopath = false
 
       if (null != node) {
         for (; pI < refpath.length; pI++) {
           let part = refpath[pI]
+          // console.log('PART', pI, part, node)
 
-          if (null == node) {
-            break
-          }
-          else if (node.isMap) {
+          // descent += (' | ' + pI + '=' + node.canon) // Util.inspect(node))
+
+          if (node.isMap) {
             node = node.peg[part]
           }
           else if (node.isList) {
             node = node.peg[part]
           }
+          else if (node.done) {
+            nopath = true
+            break;
+          }
           else {
             break;
           }
+
+          if (null == node) {
+            nopath = true
+            break
+          }
+
         }
       }
 
-      if (pI === refpath.length) {
+      // console.log('REFPATH', ctx.cc, pI, refpath, nopath, ctx.root, node)
+
+
+      if (nopath) {
+        out = makeNilErr(ctx, 'no_path', this)
+      }
+      else if (pI === refpath.length) {
         out = node
 
         // Types and hidden values are cloned and made concrete
-        if (null != out && (out.mark.type || out.mark.hide)) {
+        if (null != out) { //  && (out.mark.type || out.mark.hide)) {
+
+          // console.log('FOUND-A', out)
+
+          if (this.mark.type || this.mark.hide) {
+            out.mark.type = this.mark.type
+            out.mark.hide = this.mark.hide
+
+            // walk(out, (_key: string | number | undefined, val: Val) => {
+            //   val.mark.type = this.mark.type
+            //   val.mark.hide = this.mark.hide
+            //   return val
+            // })
+          }
+
+          if (this.mark._hide_found) {
+            out.mark.hide = true
+          }
+
+          // console.log('FOUND-B', out)
+
           out = out.clone(ctx)
 
+          // if (this.mark.type || this.mark.hide) {
           walk(out, (_key: string | number | undefined, val: Val) => {
             val.mark.type = false
             val.mark.hide = false
             return val
           })
+          //}
+
+          // onsole.log('FOUND-C', out)
         }
       }
     }
 
+    // console.log('REF-FIND', ctx.cc, this.id, selfpath, 'PEG=', pegpath, 'RP', pI, refpath.join('.'), descent, 'O=', out?.id, out?.canon, out?.done)
+
     return out
   }
 

package/src/val/ScalarVal.ts

@@ -68,6 +68,8 @@ class ScalarVal extends Val {
         ((peer as any).kind === this.kind ? 'value' : 'kind'), this, peer)
     }
 
+    // console.log('SCALAR', this.canon, peer.canon, '->', out.canon)
+
     explainClose(te, out)
 
     return out