aontu 0.30.2 → 0.32.1

package/src/val/TopVal.ts

@@ -43,8 +43,8 @@ class TopVal extends Val {
     return peer.isTop
   }
 
-  unify(peer: Val, _ctx?: AontuContext): Val {
-    return peer
+  unify(peer: Val, ctx: AontuContext): Val {
+    return peer.unify(this, ctx)
   }
 
   get canon() { return 'top' }

package/src/val/Val.ts

@@ -38,8 +38,6 @@ type ValSpec = {
   prefix?: boolean,
 }
 
-// import { AontuError, descErr, makeNilErr } from '../err'
-// import { AontuError } from '../err'
 
 
 const DONE = -1
@@ -155,11 +153,16 @@ abstract class Val {
   clone(ctx: AontuContext, spec?: ValSpec): Val {
     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,
@@ -170,11 +173,13 @@ abstract class Val {
     let out = new (this as any)
       .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)
 
@@ -215,7 +220,12 @@ abstract class Val {
   abstract superior(): Val
 
 
-  [inspect.custom](_d: number, _o: any, _inspect: any): string {
+  [inspect.custom](d: number, _opts: any, _inspect: any) {
+    return this.inspect(d)
+  }
+
+  inspect(d?: number): string {
+    d = null == d ? -1 : d
     let s = ['<' + this.constructor.name.replace(/Val$/, '') + '/' + this.id]
 
     s.push('/' + this.path.join('.') + '/')
@@ -225,21 +235,26 @@ abstract class Val {
       ...Object.entries(this.mark).filter(n => n[1]).map(n => n[0]).sort()
     ].filter(n => null != n).join(','))
 
-    let insp = this.inspection(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] as any)?.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('>')
@@ -250,23 +265,32 @@ abstract class Val {
   }
 
 
-  inspection(_inspect: Function) {
+  inspection(_d?: number) {
     return ''
   }
 
 }
 
 
-function inspectpeg(peg: any) {
-  return pretty(!Array.isArray(peg) ? inspect(peg) :
-    ('[' + peg.map(n => inspect(n)).join(',\n') + ']'))
+function inspectpeg(peg: any, d: number) {
+  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: any) =>
+        '\n  ' + indent + n[0] + ': ' + // n[1].inspect(d)
+        (n[1].inspect(d) ?? '' + n[1])
+      ).join(',') +
+      '\n' + indent + '}')
+  )
 }
 
 function pretty(s: string) {
   return (
     (String(s))
       .replace(/\[Object: null prototype\]/g, '')
-      .replace(/\s+/g, '')
+    // .replace(/([^\n]) +/g, '$1')
   )
 }