aontu 0.32.1 → 0.33.0

package/src/val/BagVal.ts

@@ -9,7 +9,15 @@ import {
   AontuContext,
 } from '../ctx'
 
+import {
+  items,
+} from '../utility'
+
+import { makeNilErr } from '../err'
+import { empty } from './Val'
 
+import { Val } from './Val'
+import { NilVal } from './NilVal'
 import { FeatureVal } from './FeatureVal'
 
 
@@ -19,12 +27,97 @@ abstract class BagVal extends FeatureVal {
   closed: boolean = false
   optionalKeys: string[] = []
 
+  spread = {
+    cj: (undefined as Val | undefined),
+  }
+
+  from?: Val
+
+
   constructor(
     spec: ValSpec,
     ctx?: AontuContext
   ) {
     super(spec, ctx)
   }
+
+
+  gen(ctx: AontuContext) {
+    let out: any = this.isMap ? {} : []
+
+    if (this.mark.type || this.mark.hide) {
+      return undefined
+    }
+
+    for (let item of items(this.peg)) {
+      const p = item[0]
+      const child = item[1]
+
+      if (child.mark.type || child.mark.hide) {
+        continue
+      }
+
+      const optional = this.optionalKeys.includes('' + p)
+
+      // 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)
+
+        if (undefined === cval) {
+          continue
+        }
+
+        out[p] = cval
+      }
+
+      else if (child.isScalar
+        || child.isMap
+        || child.isList
+        || child.isPref
+        || child.isRef
+        || child.isDisjunct
+        || child.isNil
+      ) {
+        let cval = child.gen(ctx)
+
+        if (optional && (undefined === cval || empty(cval))) {
+          continue
+        }
+
+        out[p] = cval
+      }
+      else if (child.isNil) {
+        ctx.adderr(child)
+      }
+      else if (!optional) {
+        const prefix = this.isMap ? 'map' : 'list'
+        let code = this.closed ? prefix + 'val_required' : prefix + 'val_no_gen'
+        let va = child
+        let vb = undefined
+
+        if (this.from) {
+          code = prefix + 'val_spread_required'
+          vb = new NilVal()
+          vb.path = child.path
+          vb.site = this.site
+          vb.primary = this
+        }
+
+        const details = { key: p }
+
+        makeNilErr(ctx, code, va, vb, undefined, details)
+
+        break
+      }
+
+      // else optional so we can ignore it
+    }
+
+    return out
+  }
+
 }
 
 

package/src/val/ListVal.ts

@@ -20,6 +20,7 @@ import {
   explainOpen,
   ec,
   explainClose,
+  items,
 } from '../utility'
 
 import { makeNilErr, AontuError } from '../err'
@@ -38,10 +39,6 @@ import { empty } from './Val'
 class ListVal extends BagVal {
   isList = true
 
-  spread = {
-    cj: (undefined as Val | undefined),
-  }
-
   constructor(
     spec: {
       peg: ValList
@@ -90,8 +87,9 @@ class ListVal extends BagVal {
 
     out.closed = this.closed
     out.optionalKeys = [...this.optionalKeys]
-
     out.spread.cj = this.spread.cj
+    out.site = this.site
+    out.from = this.from
 
     if (peer instanceof ListVal) {
       if (!this.closed && peer.closed) {
@@ -168,6 +166,8 @@ class ListVal extends BagVal {
             oval = out.peg[peerkey] =
               unite(key_ctx.clone({ explain: ec(te, 'PSP:' + peerkey) }),
                 out.peg[peerkey], key_spread_cj, 'list-spread')
+
+            oval.from = spread_cj
           }
 
           propagateMarks(this, oval)
@@ -192,6 +192,10 @@ class ListVal extends BagVal {
       }
     }
 
+    if (out.isBag) {
+      (out as BagVal).from = this.from
+    }
+
     ctx.explain && explainClose(te, out)
 
     return out
@@ -231,64 +235,68 @@ class ListVal extends BagVal {
       ']'
   }
 
-
-  gen(ctx: AontuContext) {
-    let out: any = []
-    if (this.mark.type || this.mark.hide) {
-      return undefined
-    }
-
-    for (let i = 0; i < this.peg.length; i++) {
-      const child = this.peg[i]
-
-      const optional = this.optionalKeys.includes('' + i)
-
-      // 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)
+  /*
+    gen(ctx: AontuContext) {
+      let out: any = []
+      if (this.mark.type || this.mark.hide) {
+        return undefined
       }
-
-      else if (child.isScalar
-        || child.isMap
-        || child.isList
-        || child.isPref
-        || child.isRef
-        || child.isDisjunct
-        || child.isNil
-      ) {
-        const cval = child.gen(ctx)
-
-        if (optional && empty(cval)) {
-          continue
+  
+      // for (let i = 0; i < this.peg.length; i++) {
+      //   const child = this.peg[i]
+      for (let item of items(this.peg)) {
+        const i = item[0]
+        const child = item[1]
+  
+        const optional = this.optionalKeys.includes('' + i)
+  
+        // 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)
         }
-
-        out.push(cval)
-      }
-      else if (child.isNil) {
-        ctx.adderr(child)
+  
+        else if (child.isScalar
+          || child.isMap
+          || child.isList
+          || child.isPref
+          || child.isRef
+          || child.isDisjunct
+          || child.isNil
+        ) {
+          const cval = child.gen(ctx)
+  
+          if (optional && empty(cval)) {
+            continue
+          }
+  
+          out.push(cval)
+        }
+        else if (child.isNil) {
+          ctx.adderr(child)
+        }
+        else if (!this.optionalKeys.includes('' + i)) {
+          makeNilErr(
+            ctx,
+            this.closed ? 'listval_required' : 'listval_no_gen',
+            child, undefined
+          )
+          break
+        }
+  
+        // else optional so we can ignore it
       }
-      else if (!this.optionalKeys.includes('' + i)) {
-        makeNilErr(
-          ctx,
-          this.closed ? 'listval_required' : 'listval_no_gen',
-          child, undefined
-        )
-        break
+  
+      return out
       }
-
-      // else optional so we can ignore it
-    }
-
-    return out
-  }
+      */
 }
 
 

package/src/val/MapVal.ts

@@ -32,16 +32,11 @@ import {
 import { ConjunctVal } from './ConjunctVal'
 import { NilVal } from './NilVal'
 import { BagVal } from './BagVal'
-import { empty } from './Val'
 
 
 class MapVal extends BagVal {
   isMap = true
 
-  spread = {
-    cj: (undefined as Val | undefined),
-  }
-
   constructor(
     spec: ValSpec,
     ctx?: AontuContext
@@ -91,22 +86,11 @@ class MapVal extends BagVal {
 
     out.closed = this.closed
     out.optionalKeys = [...this.optionalKeys]
-
     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)
-    }
-    */
+    out.site = this.site
+    out.from = this.from
 
     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
@@ -207,11 +191,11 @@ class MapVal extends BagVal {
             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')
+
+            oval.from = spread_cj
           }
 
           propagateMarks(this, oval)
@@ -236,6 +220,10 @@ class MapVal extends BagVal {
       }
     }
 
+    if (out.isBag) {
+      (out as BagVal).from = this.from
+    }
+
     // console.log('MAPVAL-OUT', this.id, this.closed, this.canon, 'P=', (peer as any).closed, peer.canon, '->', (out as any).closed, out.canon)
 
     ctx.explain && explainClose(te, out)
@@ -265,6 +253,8 @@ class MapVal extends BagVal {
     out.closed = this.closed
     out.optionalKeys = [...this.optionalKeys]
 
+    // out.from = this.from
+
     // console.log('MAPVAL-CLONE', this.canon, '->', out.canon)
     return out
   }
@@ -296,72 +286,6 @@ class MapVal extends BagVal {
     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
-    }
-
-    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)
-
-      // 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
-        || child.isRef
-        || child.isDisjunct
-        || child.isNil
-      ) {
-        let cval = child.gen(ctx)
-
-        if (optional && (undefined === cval || empty(cval))) {
-          continue
-        }
-
-        out[p] = cval
-      }
-      else if (!optional) {
-        makeNilErr(
-          ctx,
-          this.closed ? 'mapval_required' : 'mapval_no_gen',
-          child, undefined
-        )
-        break
-      }
-
-      // else optional so we can ignore it
-    }
-
-    return out
-  }
 }
 
 

package/src/val/NilVal.ts

@@ -16,7 +16,7 @@ import {
 
 import { Val } from './Val'
 
-import { AontuError, descErr } from '../err'
+import { AontuError } from '../err'
 
 
 class NilVal extends Val {
@@ -28,16 +28,24 @@ class NilVal extends Val {
   secondary?: Val
   msg: string = ''
   attempt?: string
+  details?: Record<string, any>
 
   // TODO: include Val generating nil, thus capture type
 
   // A Nil is an error - should not happen - unify failed
   // refactor ,make(spec,ctx)
-  static make = (ctx?: AontuContext, why?: any, av?: Val, bv?: Val, attempt?: string) => {
+  static make = (
+    ctx?: AontuContext,
+    why?: any,
+    av?: Val,
+    bv?: Val,
+    attempt?: string,
+    details?: Record<string, any>
+  ) => {
     let nil = new NilVal({ why }, ctx)
 
     nil.attempt = attempt
-    // TODO: this should be done lazily, for multiple terms
+    nil.details = details
 
     // Terms later in same file are considered the primary error location.
     if (null != av) {
@@ -46,6 +54,7 @@ class NilVal extends Val {
       nil.site.url = av.site.url
 
       nil.primary = av
+      nil.path = av.path
 
       if (null != bv) {
         nil.secondary = bv
@@ -62,6 +71,7 @@ class NilVal extends Val {
           nil.site.url = bv.site.url
           nil.primary = bv
           nil.secondary = av
+          nil.path = bv.path
         }
       }
     }

package/src/val/ScalarKindVal.ts

@@ -74,7 +74,7 @@ class ScalarKindVal extends FeatureVal {
         out = peer
       }
       else {
-        out = makeNilErr(ctx, 'no-scalar-unify', this, peer)
+        out = makeNilErr(ctx, 'no_scalar_unify', this, peer)
       }
     }
     else if (peerIsScalarKind) {

package/src/val/Val.ts

@@ -21,9 +21,12 @@ type ValSpec = {
   peg?: any,
   mark?: Partial<ValMark>,
   kind?: any,
+
+
   row?: number,
   col?: number,
   url?: string,
+
   path?: string[],
   id?: number,
   src?: string,
@@ -92,7 +95,10 @@ abstract class Val {
   site: Site = new Site()
 
   // Map of boolean flags.
-  mark: ValMark = { type: false, hide: false }
+  mark: ValMark = {
+    type: false,
+    hide: false,
+  }
 
   // Actual native value.
   peg: any = undefined
@@ -228,6 +234,8 @@ abstract class Val {
     d = null == d ? -1 : d
     let s = ['<' + this.constructor.name.replace(/Val$/, '') + '/' + this.id]
 
+    s.push('/@' + this.site?.row + ',' + this.site?.col)
+
     s.push('/' + this.path.join('.') + '/')
 
     s.push([