aontu 0.9.0 → 0.10.0

package/dist/lib/val/RefVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"RefVal.js","sourceRoot":"","sources":["../../../lib/val/RefVal.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAUpD,kCAGgB;AAYhB,iCAEiB;AAEjB,oCAAgC;AAEhC,4CAAwC;AACxC,oDAAgD;AAEhD,gCAAkC;AAIlC,MAAM,MAAO,SAAQ,iBAAO;IAK1B,YAAY,GAAU,EAAE,GAAa;QACnC,KAAK,CAAC,EAAE,CAAC,CAAA;QAHX,QAAG,GAAG,GAAG,CAAA;QAIP,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,GAAG,CAAA;QAC5B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;QAEf,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;SAClB;IACH,CAAC;IAGD,MAAM,CAAC,IAAS;QACd,+BAA+B;QAE/B,IAAI,QAAQ,KAAK,OAAO,IAAI,EAAE;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACtB;aAEI,IAAI,IAAI,YAAY,eAAS,EAAE;YAClC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAC1B;aAEI,IAAI,IAAI,YAAY,MAAM,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;YAE9B,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;aACrB;SACF;QAED,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,QAAQ,GAAoB,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEnE,4CAA4C;QAC5C,QAAQ,GAAG,IAAI,IAAI,QAAQ,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAA;QAC3D,IAAI,GAAQ,CAAA;QAEZ,IAAI,QAAQ,YAAY,MAAM,EAAE;YAC9B,IAAI,UAAG,KAAK,IAAI,EAAE;gBAChB,GAAG,GAAG,IAAI,CAAA;aACX;iBACI,IAAI,IAAI,YAAY,SAAG,EAAE;gBAC5B,GAAG,GAAG,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;aACzD;iBACI;gBACH,oCAAoC;gBACpC,IAAI,CAAC,IAAI,GAAG,WAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;gBACrD,GAAG,GAAG,IAAI,yBAAW,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAA;aACzC;SACF;aACI;YACH,GAAG,GAAG,IAAA,UAAK,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;SACjC;QAED,GAAG,CAAC,IAAI,GAAG,WAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,WAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QAEnD,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAA;IACrD,CAAC;IAGD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAA;IACjB,CAAC;IAGD,GAAG,CAAC,IAAc;QAChB,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AAIC,wBAAM"}
+{"version":3,"file":"RefVal.js","sourceRoot":"","sources":["../../../lib/val/RefVal.ts"],"names":[],"mappings":"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"}

package/lib/err.ts

@@ -0,0 +1,36 @@
+/* Copyright (c) 2021 Richard Rodger, MIT License */
+
+
+import { Nil } from './val/Nil'
+
+
+function descErr<NILS extends Nil | Nil[]>(err: NILS): any {
+  if (err instanceof Nil) {
+    let v1: any = err.primary || {}
+    let v2: any = err.secondary || {}
+    err.msg = 'Cannot unify' +
+      (0 < err.path?.length ? ' path ' + err.path.join('.') : '') +
+      ' ' + (err.url ? 'in ' + err.url : '') + ':\n' +
+
+      'LHS: ' +
+      (0 < v1.path?.length ? v1.path.join('.') + ':' : '') +
+      `<${v1.canon}>:${v1.row}:${v1.col}` + ' ' +
+      ((v1.url && v1.url !== err.url) ? ' in ' + v1.url : '') + '\n' +
+
+      'RHS: ' +
+      (0 < v2.path?.length ? v2.path.join('.') + ':' : '') +
+      `<${v2.canon}>:${v2.row}:${v2.col}` + ' ' +
+      ((v2.url && v2.url !== err.url) ? ' in ' + v2.url : '') + '\n' +
+
+      ''
+    return err
+  }
+  else {
+    return err.map(n => descErr(n))
+  }
+}
+
+
+export {
+  descErr
+}

package/lib/lang.ts

@@ -57,8 +57,6 @@ import {
 
 
 
-// console.log('TOP', TOP)
-
 class Site {
   row: number = -1
   col: number = -1
@@ -187,10 +185,7 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
         },
       },
       evaluate: (r: Rule, op: Op, terms: any) => {
-        // console.log('LANG EVAL', r.keep, op, terms)
         let val: Val = opmap[op.name](r, op, terms)
-        // console.dir(val, { depth: null })
-
         return val
       }
     })
@@ -210,8 +205,6 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
         let valnode: Val = r.node
         let valtype = typeof valnode
 
-        // console.log('VAL RULE', valtype, r.use, r.node)
-
         if ('string' === valtype) {
           valnode = addpath(new StringVal(r.node), r.keep.path)
         }

package/lib/op/unite.ts

@@ -45,6 +45,10 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
     else if (b instanceof Nil) {
       out = update(b, a)
     }
+    else if (a instanceof ConjunctVal) {
+      // console.log('Q', a.canon, b.canon)
+      out = a.unify(b, ctx)
+    }
     else if (
       b instanceof ConjunctVal ||
       b instanceof DisjunctVal ||
@@ -52,8 +56,10 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
       b instanceof PrefVal
     ) {
 
-      //console.log('U', a.canon, b.canon)
-      return b.unify(a, ctx)
+      // console.log('U', a.canon, b.canon)
+      // return b.unify(a, ctx)
+      out = b.unify(a, ctx)
+      // console.log('UO', out.canon)
     }
 
     // Exactly equal scalars.

package/lib/unify.ts

@@ -67,15 +67,19 @@ class Context {
 
 
   find(ref: RefVal) {
-    // console.log('FIND', ref.path, ref.peg)
-
     // TODO: relative paths
-    if (this.root instanceof MapVal && ref.absolute) {
-      let node: MapVal = this.root
+    // if (this.root instanceof MapVal && ref.absolute) {
+    if (ref.absolute) {
+      let node = this.root
       let pI = 0
-      for (; pI < ref.parts.length && node instanceof MapVal; pI++) {
+      for (; pI < ref.parts.length; pI++) {
         let part = ref.parts[pI]
-        node = node.peg[part]
+        if (node instanceof MapVal) {
+          node = node.peg[part]
+        }
+        else {
+          break;
+        }
       }
 
       if (pI === ref.parts.length) {
@@ -116,6 +120,9 @@ class Unify {
 
     let maxdc = 999
     for (this.dc = 0; this.dc < maxdc && DONE !== res.done; this.dc++) {
+      // console.log('\n\nRES', this.dc, res.canon)
+      // console.dir(res, { depth: null })
+
       res = unite(ctx, res, TOP)
       // console.log('U', this.dc, res.canon)
       ctx = ctx.clone({ root: res })

package/lib/val/ConjunctVal.ts

@@ -20,7 +20,7 @@ import {
   Nil,
 } from '../val/Nil'
 
-// import { RefVal } from '../val/RefVal'
+import { RefVal } from '../val/RefVal'
 import { MapVal } from '../val/MapVal'
 
 import {
@@ -53,16 +53,21 @@ class ConjunctVal extends ValBase {
   }
 
   unify(peer: Val, ctx: Context): Val {
+    const mark = (Math.random() * 1e7) % 1e6 | 0
+    // console.log('CONJUNCT unify', mark, this.done, this.canon, 'peer=', peer.canon)
+
     let done = true
 
     // Unify each term of conjunct against peer
     let upeer: Val[] = []
 
     for (let vI = 0; vI < this.peg.length; vI++) {
-      // upeer[vI] = this.peg[vI].unify(peer, ctx)
       upeer[vI] = unite(ctx, this.peg[vI], peer)
-      done = done && DONE === upeer[vI].done
-      // // console.log('Ca', vI, this.peg[vI].canon, peer.canon, upeer[vI].canon)
+
+      let prevdone = done
+      done = done && (DONE === upeer[vI].done)
+
+      // console.log('CONJUNCT pud', mark, vI, done, prevdone, '|', upeer[vI].done, upeer[vI].canon)
 
       if (upeer[vI] instanceof Nil) {
         return Nil.make(
@@ -74,12 +79,10 @@ class ConjunctVal extends ValBase {
       }
     }
 
-    // // console.log('Cb', upeer.map(x => x.canon))
-
-
     upeer = norm(upeer)
+    // console.log('CONJUNCT upeer', mark, done, upeer.map(p => p.canon))
 
-    // console.log('CJ AA', upeer.map(x => x.canon))
+    // Unify terms against each other
 
     let outvals: Val[] = []
     let val: Val
@@ -88,8 +91,6 @@ class ConjunctVal extends ValBase {
     for (let pI = 0; pI < upeer.length; pI++) {
       let t0 = upeer[pI]
 
-      // console.log('CJ unify QQ', mark, uc, 't0', pI, t0.canon)
-
       if (DONE !== t0.done) {
         let u0 = unite(ctx, t0, TOP)
 
@@ -97,8 +98,14 @@ class ConjunctVal extends ValBase {
           DONE !== u0.done
 
           // Maps and Lists are still unified so that path refs will work
-          && !(u0 instanceof MapVal) // TODO: || ListVal - test!
+          // TODO: || ListVal - test!
+          && !(
+            u0 instanceof MapVal
+            || u0 instanceof RefVal
+          )
         ) {
+
+          // console.log('CONJUNCT PUSH A', u0.id, u0.canon)
           outvals.push(u0)
           continue next_term
         }
@@ -107,43 +114,20 @@ class ConjunctVal extends ValBase {
         }
       }
 
-
       let t1 = upeer[pI + 1]
 
-      // console.log('CJ unify WW', mark, uc, 't1', pI + 1, t1?.canon)
-
-      // if (
-      //   null == t1 ||
-      //   t0.id === t1.id ||
-      //   t0 instanceof RefVal
-      // ) {
-      //   if (DONE !== t0.done) {
-      //     let u0 = unite(ctx, t0, TOP)
-      //     // console.log('CJ unify EE', mark, uc, 't0', t0.canon, 'u0', u0.canon)
-      //     outvals.push(u0)
-      //   }
-      //   else {
-      //     outvals.push(t0)
-      //   }
-      //   pI++
-      // }
-
-      // else if (DONE !== t0.done || DONE != t1.done) {
-      //   if (DONE !== t0.done) {
-      //     let u0 = unite(ctx, t0, TOP)
-      //     // console.log('CJ unify FF', mark, uc, 't0', t0.canon, 'u0', u0.canon)
-      //     outvals.push(u0)
-      //   }
-      //   else {
-      //     outvals.push(t0)
-      //   }
-      // }
-
       if (null == t1) {
+        // console.log('CONJUNCT PUSH B', t0.canon)
+        outvals.push(t0)
+      }
+
+      // Can't unite with a RefVal, unless also a RefVal with same path.
+      else if (t0 instanceof RefVal && !(t1 instanceof RefVal)) {
+        // console.log('CONJUNCT PUSH D', t0.canon)
         outvals.push(t0)
       }
+
       else {
-        // console.log('CJS unify0', t0?.canon, t1?.canon)
         val = unite(ctx, t0, t1)
         done = done && DONE === val.done
 
@@ -157,6 +141,7 @@ class ConjunctVal extends ValBase {
         }
 
         // TODO: t0 should become this to avoid unnecessary repasses
+        // console.log('CONJUNCT PUSH C', val.canon)
         outvals.push(val)
 
         pI++
@@ -164,74 +149,28 @@ class ConjunctVal extends ValBase {
     }
 
 
-    // console.log('CJ BB', outvals.map(x => x.canon))
-
-    // // TODO: FIX: conjuncts get replicated inside each other
-    // // 1&/x => CV[CV[1&/x]]
-
-    // // Unify each term of conjunct against following sibling,
-    // // reducing to smallest conjunct or single val
-    // let outvals: Val[] = 0 < upeer.length ? [upeer[0]] : []
-
-    // let oI = 0
-    // for (let uI = 1; uI < upeer.length; uI++) {
-    //   // // console.log('Cu', oI, uI, outvals.map(x => x.canon))
-
-    //   if (outvals[oI] instanceof ConjunctVal) {
-    //     outvals.splice(oI, 0, ...outvals[oI].peg)
-    //     oI += outvals[oI].peg.length
-    //     done = false
-    //   }
-    //   else {
-    //     outvals[oI] = null == outvals[oI] ? upeer[uI] :
-    //       //outvals[oI].unify(upeer[uI], ctx)
-    //       unite(ctx, outvals[oI], upeer[uI])
-    //     done = done && DONE === outvals[oI].done
-
-    //     // Conjuct fails
-    //     if (outvals[oI] instanceof Nil) {
-    //       return outvals[oI]
-
-    //       /*
-    //       return Nil.make(
-    //         ctx,
-    //         '&reduce[' + outvals[oI].canon + ',' + upeer[uI].canon + ']',
-    //         outvals[oI],
-    //         upeer[uI]
-    //       )
-    //       */
-    //     }
-    //   }
-    // }
-
-    // // console.log('Cc', outvals.map(x => x.canon), outvals)
+    // console.log('CONJUNCT outvals', mark, outvals.map(v => v.canon))
 
     let out: Val
 
-    //let why = ''
-
     if (0 === outvals.length) {
-      //out = Nil.make(ctx, '&empty', this)
 
       // Empty conjuncts evaporate.
       out = TOP
-      //why += 'A'
     }
 
     // TODO: corrects CV[CV[1&/x]] issue above, but swaps term order!
     else if (1 === outvals.length) {
       out = outvals[0]
-      //why += 'B'
     }
     else {
       out = new ConjunctVal(outvals, ctx)
-      //why += 'C'
     }
 
-    // // console.log('Cd', why, out.peg)
-
     out.done = done ? DONE : this.done + 1
 
+    // console.log('CONJUNCT out', mark, out.done, out.canon)
+
     return out
   }
 
@@ -260,8 +199,9 @@ class ConjunctVal extends ValBase {
 }
 
 
+// Normalize Conjuct:
+// - flatten child conjuncts
 function norm(terms: Val[]): Val[] {
-  // console.log('CJ norm', terms.map((t: Val) => t.canon))
 
   let expand: Val[] = []
   for (let tI = 0, pI = 0; tI < terms.length; tI++, pI++) {

package/lib/val/MapVal.ts

@@ -68,10 +68,9 @@ class MapVal extends ValBase {
   // NOTE: order of keys is not preserved!
   // not possible in any case - consider {a,b} unify {b,a}
   unify(peer: Val, ctx: Context): Val {
-    // console.log('QQQ ctx', !!ctx)
-    if (null == ctx) {
-      console.trace()
-    }
+    // if (null == ctx) {
+    //   console.trace()
+    // }
 
     let done: boolean = true
     let out: MapVal = TOP === peer ? this : new MapVal({}, ctx)
@@ -90,58 +89,30 @@ class MapVal extends ValBase {
     out.done = this.done + 1
 
     if (this.spread.cj) {
-      //out.spread.cj =
-      //  DONE !== this.spread.cj.done ? this.spread.cj.unify(TOP, ctx) :
-      //    this.spread.cj
       out.spread.cj =
         DONE !== this.spread.cj.done ? unite(ctx, this.spread.cj) :
           this.spread.cj
-
+      done = (done && DONE === out.spread.cj.done)
     }
 
 
-    // console.log(
-    //   ('  '.repeat(ctx.path.length)),
-    //   'MV spread', this.id, peer.id, out.id, '|',
-    //   this.canon, peer.canon, out.canon, '|',
-    //   (this.spread.cj || {}).done,
-    //   (this.spread.cj || {}).canon, (out.spread.cj || {}).canon)
-
     let spread_cj = out.spread.cj || TOP
 
     // Always unify children first
     for (let key in this.peg) {
-      //let oval = out.peg[key] = this.peg[key].unify(spread_cj, ctx.descend(key))
-      //let oval =
+      // console.log('MAP ukA', key, this.peg[key].canon)
 
       out.peg[key] =
         unite(ctx.descend(key), this.peg[key], spread_cj)
 
-      done = (done && DONE === out.peg[key].done)
+      // console.log('MAP ukB', key, out.peg[key].canon)
 
-      //if (oval instanceof Nil) {
-      // ctx.err.push(oval)
-      //}
+      done = (done && DONE === out.peg[key].done)
     }
 
-    // console.log(
-    //   ('  '.repeat(ctx.path.length)),
-    //   'MV child ', this.id, peer.id, out.id, '|',
-    //   this.canon, peer.canon, out.canon, '|',
-    //   this.constructor.name,
-    //   peer.constructor.name,
-    //   out.constructor.name,
-    // )
-
     if (peer instanceof MapVal) {
-      //let upeer: MapVal = (peer.unify(TOP, ctx) as MapVal)
       let upeer: MapVal = (unite(ctx, peer) as MapVal)
 
-      // console.log(
-      //   ('  '.repeat(ctx.path.length)),
-      //   'MV peer A', this.id, peer.id, out.id, '|',
-      //   Object.keys(this.peg), Object.keys(upeer.peg), Object.keys(out.peg))
-
       for (let peerkey in upeer.peg) {
         let peerchild = upeer.peg[peerkey]
         let child = out.peg[peerkey]
@@ -150,47 +121,17 @@ class MapVal extends ValBase {
           undefined === child ? peerchild :
             child instanceof Nil ? child :
               peerchild instanceof Nil ? peerchild :
-                //child.unify(peerchild, ctx.descend(peerkey))
                 unite(ctx.descend(peerkey), child, peerchild)
 
         if (this.spread.cj) {
-          //out.peg[peerkey] = out.peg[peerkey].unify(spread_cj, ctx)
           out.peg[peerkey] = unite(ctx, out.peg[peerkey], spread_cj)
         }
 
         done = (done && DONE === oval.done)
 
-        if (oval instanceof Nil) {
-          // ctx.err.push(oval)
-        }
-
       }
-
-      // console.log(
-      //   ('  '.repeat(ctx.path.length)),
-      //   'MV peer B', this.id, peer.id, out.id, '|',
-      //   Object.keys(this.peg), Object.keys(upeer.peg), Object.keys(out.peg))
-
-      //out.done = done ? DONE : out.done
-
-      // console.log(' '.repeat(W) + 'MV OUT A', this.id, out.done, out.id, out.canon)//this.spread.cj, out.spread.cj)
-
-      // console.log(
-      //   ('  '.repeat(ctx.path.length)),
-      //   'MV out ', this.id, peer.id, out.id, '|',
-      //   this.canon, peer.canon, out.canon, '|',
-      //   this.constructor.name,
-      //   peer.constructor.name,
-      //   out.constructor.name,
-      // )
-
-
     }
     else if (TOP !== peer) {
-      //out.done = done ? DONE : out.done
-
-      //return (UNIFIER(out, peer, ctx) as MapVal)
-
       return Nil.make(ctx, 'map', this, peer)
     }
 
@@ -198,6 +139,7 @@ class MapVal extends ValBase {
     return out
   }
 
+
   get canon() {
     let keys = Object.keys(this.peg)
     return '{' +
@@ -208,6 +150,7 @@ class MapVal extends ValBase {
       '}'
   }
 
+
   gen(ctx: Context) {
     let out: any = {}
     for (let p in this.peg) {
@@ -218,9 +161,6 @@ class MapVal extends ValBase {
 }
 
 
-
-
-
 export {
   MapVal
 }

package/lib/val/Nil.ts

@@ -27,8 +27,11 @@ class Nil extends ValBase {
   why: any
   primary?: Val
   secondary?: Val
+  msg: string = ''
 
   // TODO: include Val generating nil, thus capture type
+
+  // A Nil is an error - should not happen - unify failed
   static make = (ctx?: Context, why?: any, av?: Val, bv?: Val) => {
     let nil = new Nil(why, ctx)
 

package/lib/val/RefVal.ts

@@ -41,11 +41,15 @@ class RefVal extends ValBase {
   absolute: boolean
   sep = '.'
 
-  constructor(peg: any[], abs?: boolean) {
+  constructor(peg: any[] | string, abs?: boolean) {
     super('')
     this.absolute = true === abs
     this.parts = []
 
+    if ('string' === typeof peg) {
+      peg = peg.split('.')
+    }
+
     for (let part of peg) {
       this.append(part)
     }
@@ -77,6 +81,7 @@ class RefVal extends ValBase {
   unify(peer: Val, ctx: Context): Val {
     let resolved: Val | undefined = null == ctx ? this : ctx.find(this)
 
+    // Don't try to resolve paths forever.
     // TODO: large amount of reruns needed? why?
     resolved = null == resolved && 999 < this.done ?
       Nil.make(ctx, 'no-path', this, peer) : (resolved || this)
@@ -89,6 +94,12 @@ class RefVal extends ValBase {
       else if (peer instanceof Nil) {
         out = Nil.make(ctx, 'ref[' + this.peg + ']', this, peer)
       }
+
+      // same path
+      else if (this.peg === peer.peg) {
+        out = this
+      }
+
       else {
         // Ensure RefVal done is incremented
         this.done = DONE === this.done ? DONE : this.done + 1
@@ -115,7 +126,17 @@ class RefVal extends ValBase {
   }
 
 
-  gen(_ctx?: Context) {
+  gen(ctx?: Context) {
+    // throw new Error('REF ' + this.peg)
+    if (ctx) {
+      ctx.err.push(Nil.make(
+        ctx,
+        'ref',
+        this.peg,
+        undefined,
+      ))
+    }
+
     return undefined
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -50,7 +50,7 @@
     "@jsonic/path": "^0.6.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.4.2",
     "browserify": "^17.0.0",
     "esbuild": "^0.17.11",
     "es-jest": "^2.1.0",
@@ -59,6 +59,6 @@
     "serve": "^14.2.0",
     "tinyify": "^4.0.0",
     "typescript": "^4.9.5",
-    "@types/node": "^18.14.6"
+    "@types/node": "^18.15.3"
   }
 }