aontu 0.0.9 → 0.2.0

package/lib/op/unite.ts

@@ -5,7 +5,6 @@
 import { Context } from '../unify'
 import {
   Val,
-  MapVal,
   ConjunctVal,
   DisjunctVal,
   RefVal,
@@ -19,10 +18,13 @@ import { Operation } from './op'
 
 // Vals should only have to unify downwards (in .unify) over Vals they understand.
 // and for complex Vals, TOP, which means self unify if not yet done
-const unite: Operation = (ctx: Context, a?: Val, b?: Val) => {
+const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
   let out = a
 
-  //console.log('Ua', a && a.canon, b && b.canon)
+  // console.log('AA OP unite  IN', a?.canon, b?.canon,
+  //   'W', whence,
+  //   'E', 0 < ctx?.err?.length ? ctx.err.map((e: Val) => e.canon) : '')
+
 
   if (b && (TOP === a || !a)) {
     //console.log('Utb', b.canon)
@@ -51,9 +53,12 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val) => {
       //console.log('U', a.canon, b.canon)
       return b.unify(a, ctx)
     }
+
+    // Exactly equal scalars.
     else if (a.constructor === b.constructor && a.peg === b.peg) {
       out = update(a, b)
     }
+
     else {
       out = a.unify(b, ctx)
     }
@@ -67,6 +72,9 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val) => {
     out = out.unify(TOP, ctx)
   }
 
+  // console.log('AA OP unite OUT', a?.canon, b?.canon, '->', out && out.canon,
+  //   0 < ctx?.err?.length ? ctx.err.map((e: Val) => e.canon) : '')
+
   return out
 }
 

package/lib/unify.ts

@@ -30,7 +30,6 @@ class Context {
   err: Nil[]  // Nil error log of current unify.
   vc: number  // Val counter to create unique val ids.
 
-
   constructor(cfg: {
     root: Val
     err?: Nil[],
@@ -46,12 +45,13 @@ class Context {
 
 
   clone(cfg: {
-    root: Val,
-    path?: Path
+    root?: Val,
+    path?: Path,
+    err?: Nil[],
   }): Context {
     return new Context({
-      root: cfg.root,
-      err: this.err,
+      root: cfg.root || this.root,
+      err: cfg.err || this.err,
       vc: this.vc,
     })
   }
@@ -112,11 +112,8 @@ class Unify {
     // perhaps parse should count intial vals, paths, etc?
 
 
-
-
     let maxdc = 999
     for (this.dc = 0; this.dc < maxdc && DONE !== res.done; this.dc++) {
-      //res = res.unify(TOP, ctx)
       res = unite(ctx, res, TOP)
       ctx = ctx.clone({ root: res })
     }

package/lib/val.ts

@@ -41,7 +41,6 @@ type ValMap = { [key: string]: Val }
 const DONE = -1
 
 
-
 // There can be only one.
 const TOP: Val = {
   id: 0,
@@ -261,6 +260,7 @@ class ScalarVal<T> extends Val {
     this.done = DONE
   }
   unify(peer: Val, ctx: Context): Val {
+    // Exactly equal scalars are handled in op/unite
     if (peer instanceof ScalarTypeVal) {
       return peer.unify(this, ctx)
     }
@@ -363,6 +363,7 @@ class MapVal extends Val {
 
     if (spread) {
       if ('&' === spread.o) {
+        // TODO: handle existing spread!
         this.spread.cj =
           new ConjunctVal(Array.isArray(spread.v) ? spread.v : [spread.v], ctx)
       }
@@ -500,7 +501,7 @@ class MapVal extends Val {
   get canon() {
     let keys = Object.keys(this.peg)
     return '{' +
-      (this.spread.cj ? '&=' + this.spread.cj.canon +
+      (this.spread.cj ? '&:' + this.spread.cj.canon +
         (0 < keys.length ? ',' : '') : '') +
       keys
         .map(k => [JSON.stringify(k) + ':' + this.peg[k].canon]).join(',') +
@@ -749,16 +750,51 @@ class DisjunctVal extends Val {
 class RefVal extends Val {
   parts: string[]
   absolute: boolean
+  sep = '.' // was '/'
 
-  constructor(peg: string, ctx?: Context) {
-    super(peg, ctx)
-    this.parts = peg.split('/').filter(p => '' != p)
-    this.absolute = peg.startsWith('/')
+  // constructor(peg: string | string[], ctx?: Context) {
+  //   super(peg, ctx)
+  //   this.parts = 'string' === typeof peg ? peg.split(this.sep) : peg
+  //   this.parts = this.parts.filter(p => '' != p)
+  //   // this.absolute = peg.startsWith(this.sep)
+  // }
+
+
+  constructor(peg: any[], abs?: boolean) {
+    super('')
+    this.absolute = true === abs
+    this.parts = []
+
+    // console.log('RV', peg)
+
+    for (let part of peg) {
+      this.append(part)
+    }
   }
 
-  append(part: string) {
-    this.parts.push(part)
-    this.peg = (this.absolute ? '/' : '') + this.parts.join('/')
+
+  append(part: any) {
+    //console.log('APPEND 0', part)
+
+    if ('string' === typeof part) {
+      this.parts.push(part)
+    }
+
+    else if (part instanceof StringVal) {
+      this.parts.push(part.peg)
+    }
+
+    else if (part instanceof RefVal) {
+      this.parts.push(...part.parts)
+
+      if (part.absolute) {
+        this.absolute = true
+      }
+    }
+
+    this.peg = (this.absolute ? this.sep : '') + this.parts.join(this.sep)
+
+    // console.log('APPEND 1', this.parts)
   }
 
   unify(peer: Val, ctx: Context): Val {
@@ -807,7 +843,6 @@ class RefVal extends Val {
 }
 
 
-
 class PrefVal extends Val {
   pref: Val
   constructor(peg: any, pref?: any, ctx?: Context) {
@@ -816,42 +851,28 @@ class PrefVal extends Val {
   }
 
   // PrefVal unify always returns a PrefVal
-  // PrevVals can only be removed by becoming Nil in a Disjunct
+  // PrefVals can only be removed by becoming Nil in a Disjunct
   unify(peer: Val, ctx: Context): Val {
     let done = true
-
-    //let peer_peg = peer instanceof PrefVal ? peer.peg : peer
-    //let peer_pref = peer instanceof PrefVal ? peer.pref : peer
-
     let out: Val
-    /*
-          = new PrefVal(
-          this.peg.unify(peer_peg, ctx),
-          this.pref.unify(peer_pref, ctx),
-          ctx
-        )
-    */
 
     if (peer instanceof PrefVal) {
       out = new PrefVal(
-        //this.peg.unify(peer.peg, ctx),
-        //this.pref.unify(peer.pref, ctx),
-        unite(ctx, this.peg, peer.peg),
-        unite(ctx, this.pref, peer.pref),
+        unite(ctx, this.peg, peer.peg, 'Pref000'),
+        unite(ctx, this.pref, peer.pref, 'Pref010'),
         ctx
       )
+
     }
     else {
       out = new PrefVal(
-        //this.peg.unify(peer, ctx),
-        //this.pref.unify(peer, ctx),
-        unite(ctx, this.peg, peer),
-        unite(ctx, this.pref, peer),
+        // TODO: find a better way to drop Nil non-errors
+        unite(ctx?.clone({ err: [] }), this.peg, peer, 'Pref020'),
+        unite(ctx?.clone({ err: [] }), this.pref, peer, 'Pref030'),
         ctx
       )
     }
 
-
     done = done && DONE === out.peg.done &&
       (null != (out as PrefVal).pref ? DONE === (out as PrefVal).pref.done : true)
 
@@ -881,6 +902,7 @@ class PrefVal extends Val {
 }
 
 
+
 export {
   DONE,
   Integer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.0.9",
+  "version": "0.2.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -23,12 +23,13 @@
     "xtest-web": "browserify -o test-web/test-web.js -e test/aontu.test.js -s Aontu -im -i assert -i @hapi/lab && open test-web/index.html",
     "coveralls": "lab -s -P test -r lcov -I URL,URLSearchParams | coveralls",
     "prettier": "prettier --write --no-semi --single-quote *.ts test/*.js",
-    "build": "tsc -d && cp dist/aontu.js dist/aontu.min.js && browserify -o dist/aontu.min.js -e dist/aontu.js -s Aontu -im -i assert -p tinyify",
+    "build": "tsc -d",
+    "build-web": "tsc -d && cp dist/aontu.js dist/aontu.min.js && browserify -o dist/aontu.min.js -e dist/aontu.js -s Aontu -im -i assert -p tinyify",
     "clean": "rm -rf node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
-    "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run test-web && npm run repo-tag && npm publish --registry http://registry.npmjs.org "
+    "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run test-web && npm run repo-tag && npm publish --registry https://registry.npmjs.org "
   },
   "license": "MIT",
   "files": [
@@ -38,20 +39,22 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@jsonic/multisource": "0.0.8",
-    "@types/node": "^16.3.1",
-    "jsonic": "jsonicjs/jsonic#4edd639987b75ef62a74e3904fb890f59d21379c"
+    "@jsonic/directive": "^0.6.0",
+    "@jsonic/expr": "^0.2.0",
+    "@jsonic/multisource": "0.5.0",
+    "@types/node": "^17.0.35",
+    "@jsonic/jsonic-next": "2.0.1"
   },
   "devDependencies": {
-    "@hapi/code": "^8.0.3",
-    "@hapi/lab": "^24.3.0",
+    "@hapi/code": "^9.0.0",
+    "@hapi/lab": "^25.0.1",
     "benchmark": "^2.1.4",
     "coveralls": "^3.1.1",
     "hapi-lab-shim": "0.0.2",
     "lab-transform-typescript": "^3.0.1",
-    "prettier": "^2.3.2",
-    "serve": "^12.0.0",
+    "prettier": "^2.6.2",
+    "serve": "^13.0.2",
     "tinyify": "^3.0.0",
-    "typescript": "^4.3.5"
+    "typescript": "^4.7.2"
   }
 }