aontu 0.33.2 → 0.34.4

package/src/val/ListVal.ts

@@ -89,7 +89,6 @@ class ListVal extends BagVal {
     out.optionalKeys = [...this.optionalKeys]
     out.spread.cj = this.spread.cj
     out.site = this.site
-    out.from_spread = this.from_spread
 
     if (peer instanceof ListVal) {
       if (!this.closed && peer.closed) {
@@ -166,8 +165,6 @@ 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 = spread_cj
           }
 
           propagateMarks(this, oval)
@@ -192,10 +189,6 @@ class ListVal extends BagVal {
       }
     }
 
-    if (out.isBag) {
-      (out as BagVal).from_spread = this.from_spread
-    }
-
     ctx.explain && explainClose(te, out)
 
     return out
@@ -234,69 +227,6 @@ class ListVal extends BagVal {
           this.peg[k].canon).join(',') +
       ']'
   }
-
-  /*
-    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]
-      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)
-        }
-  
-        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
-      }
-  
-      return out
-      }
-      */
 }
 
 

package/src/val/MapVal.ts

@@ -87,11 +87,6 @@ class MapVal extends BagVal {
     out.optionalKeys = [...this.optionalKeys]
     out.spread.cj = this.spread.cj
     out.site = this.site
-    out.from_spread = this.from_spread
-
-    if (this.spread.cj && null == out.from_spread) {
-      out.from_spread = this.spread.cj
-    }
 
     if (peer instanceof MapVal) {
       if (!this.closed && peer.closed) {
@@ -143,10 +138,10 @@ class MapVal extends BagVal {
         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]
 
+        // console.log('MAPVAL-SPREAD', this.id, key, child, key_spread_cj.id, key_spread_cj.canon, key_spread_cj.done)
+
         propagateMarks(this, child)
 
         out.peg[key] =
@@ -158,12 +153,6 @@ class MapVal extends BagVal {
                     unite(keyctx.clone({ explain: ec(te, 'KEY:' + key) }),
                       child, key_spread_cj, 'map-own')
 
-
-
-        if (this.spread.cj) {
-          out.from_spread = this.spread.cj
-        }
-
         done = (done && DONE === out.peg[key].dc)
       }
 
@@ -189,7 +178,7 @@ class MapVal extends BagVal {
           let child = out.peg[peerkey]
 
           let oval = out.peg[peerkey] =
-            undefined === child ? peerchild :
+            undefined === child ? this.handleExpectedVal(peerkey, peerchild, this, ctx) :
               child.isTop && peerchild.done ? peerchild :
                 child.isNil ? child :
                   peerchild.isNil ? peerchild :
@@ -203,8 +192,6 @@ class MapVal extends BagVal {
             oval = out.peg[peerkey] =
               unite(key_ctx.clone({ explain: ec(te, 'PSP:' + peerkey) }),
                 oval, key_spread_cj, 'map-peer-spread')
-
-            oval.from_spread = this.spread.cj
           }
 
           propagateMarks(this, oval)
@@ -229,10 +216,6 @@ class MapVal extends BagVal {
       }
     }
 
-    if (out.isBag) {
-      (out as BagVal).from_spread = this.from_spread
-    }
-
     // console.log(
     //   'MAPVAL-OUT', out.canon,
     //   '\n  SELF', this,

package/src/val/NilVal.ts

@@ -21,6 +21,7 @@ import { AontuError } from '../err'
 
 class NilVal extends Val {
   isNil = true
+  isGenable = true
 
   nil = true
   why: any

package/src/val/PrefVal.ts

@@ -27,6 +27,7 @@ import { FeatureVal } from './FeatureVal'
 
 class PrefVal extends FeatureVal {
   isPref = true
+  isGenable = true
 
   superpeg: Val
   rank: number = 0

package/src/val/RefVal.ts

@@ -42,6 +42,7 @@ import { FeatureVal } from './FeatureVal'
 
 class RefVal extends FeatureVal {
   isRef = true
+  isGenable = true
 
   absolute: boolean = false
   prefix: boolean = false

package/src/val/ScalarVal.ts

@@ -26,7 +26,10 @@ import { ScalarKindVal } from './ScalarKindVal'
 
 class ScalarVal extends Val {
   kind: any
+
   isScalar = true
+  isGenable = true
+
   src: string
 
   constructor(

package/src/val/Val.ts

@@ -89,6 +89,8 @@ abstract class Val {
   isTypeFunc = false
   isUpperFunc = false
 
+  isGenable = false
+
   id: number
   dc: number = 0
   path: string[] = []