aontu 0.27.0 → 0.29.0

package/lib/lang.ts

@@ -101,8 +101,6 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
     v.url = ctx.meta.multisource ? ctx.meta.multisource.path : ''
     v.path = r.k ? [...(r.k.path || [])] : []
 
-    // console.log('ADDSITE', v)
-
     return v
   }
 
@@ -208,6 +206,22 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
       return addsite(new PlusVal({ peg: [terms[0], terms[1]] }), r, ctx)
     },
 
+    'negative-prefix': (r: Rule, ctx: Context, _op: Op, terms: any) => {
+      let val = terms[0]
+      val.peg = -1 * val.peg
+      return addsite(val, r, ctx)
+    },
+
+    'positive-prefix': (r: Rule, ctx: Context, _op: Op, terms: any) => {
+      let val = terms[0]
+      return addsite(val, r, ctx)
+    },
+
+    'plain-paren': (r: Rule, ctx: Context, _op: Op, terms: any) => {
+      let val = terms[0]
+      return addsite(val, r, ctx)
+    },
+
   }
 
 
@@ -253,8 +267,16 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
           prefix: true,
           right: 24_000_000,
         },
+
+        addition: null,
+        subtraction: null,
+        multiplication: null,
+        division: null,
+        remainder: null,
       },
       evaluate: (r: Rule, ctx: Context, op: Op, terms: any) => {
+        // console.log('EVAL', op.name, terms)
+
         let val: Val = opmap[op.name](r, ctx, op, terms)
         return val
       }
@@ -293,18 +315,16 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
           valnode = addsite(new NullVal({ peg: r.node }), r, ctx)
         }
 
-        // if (null == r.node) {
-        //   console.log('QQQ', r)
-        // }
-
-        let st = r.o0
-        valnode.row = st.rI
-        valnode.col = st.cI
-        valnode.url = ctx.meta.multisource && ctx.meta.multisource.path
+        if (null != valnode && 'object' === typeof valnode) {
+          let st = r.o0
+          valnode.row = st.rI
+          valnode.col = st.cI
+          valnode.url = ctx.meta.multisource && ctx.meta.multisource.path
+        }
+        // else { ERROR? }
 
         r.node = valnode
 
-        // return out
         return undefined
       })
 
@@ -516,9 +536,10 @@ class Lang {
   }
 
 
-  parse(src: string, opts?: any): Val {
+  parse(src: string, opts?: Partial<Options>): Val {
     // JSONIC-UPDATE - check meta
     let jm: any = {
+      fs: opts?.fs,
       fileName: this.options.path,
       multisource: {
         path: this.options.path,

package/lib/op/disjunct.ts

@@ -30,7 +30,6 @@ const disjunct: Operation = (ctx?: Context, a?: Val, b?: Val) => {
 }
 
 
-
 function append(peers: Val[], v?: any) {
   // let origsite: Site = Site.NONE
 

package/lib/op/op.ts

@@ -8,7 +8,6 @@ import { disjunct } from './disjunct'
 import { unite } from './unite'
 
 
-
 type Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => Val
 
 export {

package/lib/type.ts

@@ -1,5 +1,6 @@
 /* Copyright (c) 2022-2023 Richard Rodger, MIT License */
 
+import * as Fs from 'node:fs'
 
 // TODO: refactor these out
 
@@ -13,6 +14,8 @@ import {
 
 
 
+type FST = typeof Fs
+
 type Options = {
   src: string    // Source text.
   print: number  // Print debug verbosity
@@ -21,11 +24,13 @@ type Options = {
   path?: string // Path of entry file
   debug?: boolean
   trace?: boolean
+  fs?: FST
+  deps?: any
+  log?: any
 }
 
 
 
-
 interface Val {
   isVal: boolean
 
@@ -68,12 +73,19 @@ type ValList = Val[]
 const DONE = -1
 
 
+type ErrContext = {
+  src?: string,
+  fs?: FST
+}
+
 export type {
   Val,
   ValSpec,
   ValMap,
   ValList,
   Options,
+  ErrContext,
+  FST,
 }
 
 export {

package/lib/unify.ts

@@ -3,7 +3,7 @@
 
 import type { Val } from './type'
 
-import { DONE, } from './type'
+import { DONE, FST } from './type'
 
 
 import {
@@ -19,18 +19,12 @@ import {
 } from './op/op'
 
 
-
-
-
-// import { MapVal } from '../lib/val/MapVal'
-// import { RefVal } from '../lib/val/RefVal'
 import { Nil } from '../lib/val/Nil'
 
 
 type Path = string[]
 
 
-
 class Context {
   root: Val   // Starting Val, root of paths.
   path: Path  // Path to current Val.
@@ -38,6 +32,8 @@ class Context {
   vc: number  // Val counter to create unique val ids.
   cc: number = -1
   var: Record<string, Val> = {}
+  src?: string
+  fs?: FST
 
   constructor(cfg: {
     root: Val,
@@ -93,15 +89,11 @@ class Unify {
   lang: Lang
 
   constructor(root: Val | string, lang?: Lang, ctx?: Context) {
-    // console.log('ROOT-A', root)
-
     this.lang = lang || new Lang()
     if ('string' === typeof root) {
       root = this.lang.parse(root)
     }
 
-    // console.log('ROOT-B', root)
-
     this.cc = 0
     this.root = root
     this.res = root
@@ -116,22 +108,14 @@ class Unify {
         err: this.err,
       })
 
-
-      // TODO: derive maxdc from res deterministically
-      // perhaps parse should count intial vals, paths, etc?
-
-
       let maxdc = 9 // 99
       for (; this.cc < maxdc && DONE !== res.done; this.cc++) {
         ctx.cc = this.cc
         res = unite(ctx, res, TOP)
         ctx = ctx.clone({ root: res })
-
-        // console.log('==============', this.cc)
       }
     }
 
-
     this.res = res
   }
 }

package/lib/utility.ts

@@ -1,6 +1,7 @@
 /* Copyright (c) 2023 Richard Rodger, MIT License */
 
 
+
 import type { Val } from './type'
 
 function formatPath(path: Val | string[], absolute?: boolean) {

package/lib/val/ConjunctVal.ts

@@ -37,6 +37,7 @@ import { ValBase } from '../val/ValBase'
 
 // TODO: move main logic to op/conjunct
 class ConjunctVal extends ValBase {
+  isBinaryOp = true
   isConjunctVal = true
 
   constructor(
@@ -57,29 +58,18 @@ class ConjunctVal extends ValBase {
   }
 
   unify(peer: Val, ctx: Context): Val {
-    // console.log('CONJUNCT UNIFY', this.done, this.path.join('.'), this.canon,
-    //   'P', peer.top || peer.constructor.name,
-    //  peer.done, peer.path.join('.'), peer.canon)
-
-
     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[] = []
 
-
-    // console.log('CJa' + mark, this.peg.map((p: Val) => p.canon), 'p=', peer.canon)
     for (let vI = 0; vI < this.peg.length; vI++) {
       upeer[vI] = unite(ctx, this.peg[vI], peer, 'cj-own' + mark)
 
       // 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(
           ctx,
@@ -92,15 +82,11 @@ class ConjunctVal extends ValBase {
 
     upeer = norm(upeer)
 
-    // console.log('CONJUNCT upeer', this.id, mark, this.done, done, upeer.map(p => p.canon))
-
     upeer.sort((a: Val, b: Val) => {
       return (a.constructor.name === b.constructor.name) ? 0 :
         (a.constructor.name < b.constructor.name ? -1 : 1)
     })
 
-    // console.log('CONJUNCT upeer sort', this.id, mark, this.done, done, upeer.map(p => p.canon))
-
     // Unify terms against each other
 
     let outvals: Val[] = []
@@ -118,8 +104,6 @@ class ConjunctVal extends ValBase {
     // }
 
 
-    // console.log('CJ upeer', mark, upeer.map(v => v.canon))
-
     let t0 = upeer[0]
 
     next_term:
@@ -141,9 +125,7 @@ class ConjunctVal extends ValBase {
           )
         ) {
 
-          // console.log('CONJUNCT PUSH A', u0.id, u0.canon)
           outvals.push(u0)
-          // console.log('CJ outvals A', outvals.map(v => v.canon))
           continue next_term
         }
         else {
@@ -152,27 +134,20 @@ class ConjunctVal extends ValBase {
       }
 
       let t1 = upeer[pI + 1]
-      // console.log('CJ TERM t1', pI + 1, t1?.done, t1?.canon)
 
       if (null == t1) {
-        // console.log('CONJUNCT PUSH B', t0.canon)
         outvals.push(t0)
-        // console.log('CJ outvals B', outvals.map(v => v.canon))
       }
 
       // 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)
         t0 = t1
-        // console.log('CJ outvals C', outvals.map(v => v.canon))
       }
 
       else if (t1 instanceof RefVal && !(t0 instanceof RefVal)) {
-        // console.log('CONJUNCT PUSH D', t0.canon)
         outvals.push(t0)
         t0 = t1
-        // console.log('CJ outvals C', outvals.map(v => v.canon))
       }
 
 
@@ -182,12 +157,8 @@ class ConjunctVal extends ValBase {
 
         // Unite was just a conjunt anyway, so discard.
         if (val instanceof ConjunctVal) {
-          // if (t0.id === val.peg[0].id) {
-          // val = t0
           outvals.push(t0)
           t0 = t1
-          // console.log('CJ outvals D', outvals.map(v => v.canon))
-          //}
         }
         else if (val instanceof Nil) {
           return val
@@ -196,15 +167,12 @@ class ConjunctVal extends ValBase {
           t0 = val
         }
         // TODO: t0 should become this to avoid unnecessary repasses
-        // console.log('CONJUNCT PUSH C', val.canon)
         // outvals.push(val)
 
         // pI++
       }
     }
 
-    // console.log('CJ outvals', mark, outvals.map(v => v.canon))
-
     let out: Val
 
     if (0 === outvals.length) {
@@ -223,8 +191,6 @@ class ConjunctVal extends ValBase {
 
     out.done = done ? DONE : this.done + 1
 
-    // console.log('CJ out', out.done, out.canon)
-
     return out
   }
 
@@ -238,8 +204,10 @@ class ConjunctVal extends ValBase {
 
   // TODO: need a well-defined val order so conjunt canon is always the same
   get canon() {
-    // return '  C( ' + this.peg.map((v: Val) => v.canon).join('&') + ' )  '
-    return this.peg.map((v: Val) => v.canon).join('&')
+    return this.peg.map((v: Val) => {
+      return (v as any).isBinaryOp && Array.isArray(v.peg) && 1 < v.peg.length ?
+        '(' + v.canon + ')' : v.canon
+    }).join('&')
   }
 
 

package/lib/val/DisjunctVal.ts

@@ -43,6 +43,7 @@ import { ValBase } from '../val/ValBase'
 // TODO: move main logic to op/disjunct
 class DisjunctVal extends ValBase {
   isDisjunctVal = true
+  isBinaryOp = true
 
   // TODO: sites from normalization of orginal Disjuncts, as well as child pegs
   constructor(
@@ -66,19 +67,13 @@ class DisjunctVal extends ValBase {
 
     let oval: Val[] = []
 
-    // console.log('oval', this.canon, peer.canon)
-
     // Conjunction (&) distributes over disjunction (|)
     for (let vI = 0; vI < this.peg.length; vI++) {
       //oval[vI] = this.peg[vI].unify(peer, ctx)
       oval[vI] = unite(ctx, this.peg[vI], peer)
-      // console.log('ovalA', vI, this.peg[vI].canon, peer.canon, oval[vI].canon)
-
       done = done && DONE === oval[vI].done
     }
 
-    // console.log('ovalB', oval.map(v => v.canon))
-
     // Remove duplicates, and normalize
     if (1 < oval.length) {
       for (let vI = 0; vI < oval.length; vI++) {
@@ -87,8 +82,6 @@ class DisjunctVal extends ValBase {
         }
       }
 
-      //console.log('ovalC', oval.map(v => v.canon))
-
       // TODO: not an error Nil!
       let remove = new Nil()
       for (let vI = 0; vI < oval.length; vI++) {
@@ -99,8 +92,6 @@ class DisjunctVal extends ValBase {
         }
       }
 
-      //console.log('ovalD', oval.map(v => v.canon))
-
       oval = oval.filter(v => !(v instanceof Nil))
     }
 
@@ -130,7 +121,10 @@ class DisjunctVal extends ValBase {
 
 
   get canon() {
-    return this.peg.map((v: Val) => v.canon).join('|')
+    return this.peg.map((v: Val) => {
+      return (v as any).isBinaryOp && Array.isArray(v.peg) && 1 < v.peg.length ?
+        '(' + v.canon + ')' : v.canon
+    }).join('|')
   }
 
 

package/lib/val/MapVal.ts

@@ -60,8 +60,6 @@ class MapVal extends ValBase {
 
     if (spread) {
       if ('&' === spread.o) {
-        // console.log('MapVal.ctor', this.id, this.path.join('.'),
-        //   'SPREAD', spread.v[0] && spread.v[0].id)
         // TODO: handle existing spread!
         this.spread.cj =
           Array.isArray(spread.v) ?
@@ -79,13 +77,6 @@ class MapVal extends ValBase {
   unify(peer: Val, ctx: Context): Val {
     // let mark = Math.random()
 
-    // console.log(
-    //   'MapVal.unify',
-    //   this.id, '=' + this.uh, this.path.join('.'),
-    //   (this.spread.cj ?
-    //     'spread:' + this.spread.cj.id + ':' + this.spread.cj.path.join('.') : ''),
-    //   peer.constructor.name, peer.id, peer.path.join('.'))
-
     let done: boolean = true
     let out: MapVal = TOP === peer ? this : new MapVal({ peg: {} }, ctx)
 
@@ -111,18 +102,6 @@ class MapVal extends ValBase {
       let keyctx = ctx.descend(key)
       let key_spread_cj = spread_cj.clone(null, keyctx)
 
-      // console.log('M0', this.id, mark, Object.keys(this.peg).join('~'),
-      //   'p=', this.path.join('.'),
-      //   'k=', key, peer.top || peer.constructor.name,
-      //   'pp=', this.peg[key].path.join('.'),
-      //   this.peg[key].canon,
-      //   'sp=', key_spread_cj.path.join('.'),
-      //   key_spread_cj.canon)
-
-      // if (1000000000 === this.id) {
-      //   console.dir(key_spread_cj, { depth: null })
-      // }
-
       out.peg[key] = unite(keyctx, this.peg[key], key_spread_cj, 'map-own')
       done = (done && DONE === out.peg[key].done)
     }
@@ -143,24 +122,9 @@ class MapVal extends ValBase {
 
         if (this.spread.cj) {
           let key_ctx = ctx.descend(peerkey)
-          // console.log('KEY_CTX', peerkey, key_ctx)
-
           let key_spread_cj = spread_cj.clone(null, key_ctx)
-
-          // console.log('MapVal.unify.spread', this.id, '=' + this.uh, this.path.join('.'),
-          //   key_spread_cj.id, key_spread_cj.path.join('.'))
-
-
-          // console.log('ORIG')
-          // console.dir(out.peg[peerkey], { depth: null })
-          // console.log('SPREAD')
-          // console.dir(this.spread.cj, { depth: null })
-
           oval = out.peg[peerkey] =
             unite(key_ctx, out.peg[peerkey], key_spread_cj)
-
-          // console.log('OVAL')
-          // console.dir(oval, { depth: null })
         }
 
         done = (done && DONE === oval.done)

package/lib/val/NullVal.ts

@@ -34,8 +34,6 @@ class NullVal extends ValBase {
   unify(peer: Val, ctx: Context): Val {
     let out: Val
 
-    // console.log('NULLVAL-U', peer)
-
     if ((peer as any).isTop || (peer as NullVal).isNullVal) {
       out = this
     }

package/lib/val/RefVal.ts

@@ -79,7 +79,6 @@ class RefVal extends ValBase {
 
 
   append(part: any) {
-    // console.log('APPEND', part, this)
     let partval
 
     if ('string' === typeof part) {
@@ -135,8 +134,6 @@ class RefVal extends ValBase {
       // let resolved: Val | undefined = null == ctx ? this : ctx.find(this)
       let resolved: Val | undefined = null == ctx ? this : this.find(ctx)
 
-      // console.log('UR', this.peg, resolved)
-
       resolved = resolved || this
 
       if (null == resolved && this.canon === peer.canon) {
@@ -174,8 +171,6 @@ class RefVal extends ValBase {
       out.done = DONE === out.done ? DONE : this.done + 1
     }
 
-    // console.log('RV', why, this.id, this.canon, '&', peer.canon, '->', out.canon)
-
     return out
   }
 
@@ -191,10 +186,6 @@ class RefVal extends ValBase {
 
     let modes: string[] = []
 
-    // console.log('REF', this.id, this.path, this.done, 'PEG', this.peg.map((p: any) => p.canon))
-    // console.dir(this.peg, { depth: null })
-
-
     for (let pI = 0; pI < this.peg.length; pI++) {
       let part = this.peg[pI]
       if (part instanceof VarVal) {
@@ -245,9 +236,6 @@ class RefVal extends ValBase {
       }
     }
 
-    // console.log('modes', modes)
-
-
     if (this.absolute) {
       fullpath = parts
     }
@@ -267,9 +255,6 @@ class RefVal extends ValBase {
       .reduce(((a: string[], p: string) =>
         (p === sep ? a.length = a.length - 1 : a.push(p), a)), [])
 
-    // console.log('REF', this.id, this.path, this.done, 'FULLPATH', fullpath)
-
-
     if (modes.includes('KEY')) {
       let key = this.path[this.path.length - 2]
       let sv = new StringVal({ peg: null == key ? '' : key }, ctx)
@@ -286,7 +271,6 @@ class RefVal extends ValBase {
     let node = ctx.root
     let pI = 0
     for (; pI < fullpath.length; pI++) {
-      // console.log('RefVal DESCEND', pI, node)
       let part = fullpath[pI]
 
       if (node instanceof MapVal) {
@@ -297,8 +281,6 @@ class RefVal extends ValBase {
       }
     }
 
-    // console.log('RefVal KEY', modes, pI, fullpath)
-
     if (pI === fullpath.length) {
       // if (this.attr && 'KEY' === this.attr.kind) {
       // if (modes.includes('KEY')) {

package/lib/val/VarVal.ts

@@ -1,6 +1,7 @@
 /* Copyright (c) 2021-2023 Richard Rodger, MIT License */
 
 
+
 /* TODO
 
    $SELF.a - path starting at self

package/lib/val.ts

@@ -41,6 +41,7 @@ import {
 } from './lang'
 
 
+
 import { Nil } from './val/Nil'
 import { RefVal } from './val/RefVal'
 import { ValBase } from './val/ValBase'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.27.0",
+  "version": "0.29.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -47,24 +47,24 @@
   ],
   "dependencies": {
     "@jsonic/directive": "^1.1.0",
-    "@jsonic/expr": "^1.2.0",
+    "@jsonic/expr": "^1.3.0",
     "jsonic": "^2.16.0",
     "@jsonic/multisource": "^1.9.0",
-    "@jsonic/path": "^1.3.0"
+    "@jsonic/path": "^1.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.10.10",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.3.0",
     "aliasify": "^2.1.0",
     "browserify": "^17.0.1",
     "es-jest": "^2.1.0",
-    "esbuild": "^0.24.2",
-    "jest": "^29.7.0",
-    "prettier": "^3.4.2",
+    "esbuild": "^0.25.9",
+    "jest": "^30.1.3",
+    "prettier": "^3.6.2",
     "serve": "^14.2.4",
     "tinyify": "^4.0.0",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.3"
+    "ts-jest": "^29.4.1",
+    "typescript": "^5.9.2"
   },
   "aliasify": {
     "aliases": {