aontu 0.21.1 → 0.23.0

package/lib/val/PlusVal.ts

@@ -0,0 +1,76 @@
+/* Copyright (c) 2024 Richard Rodger, MIT License */
+
+
+import type {
+  Val,
+  ValSpec,
+} from '../type'
+
+import {
+  DONE,
+} from '../type'
+
+import {
+  descErr
+} from '../err'
+
+import {
+  Context,
+} from '../unify'
+
+import {
+  unite
+} from '../op/op'
+
+
+import { TOP, IntegerVal, NumberVal, StringVal } from '../val'
+import { Nil } from '../val/Nil'
+import { OpVal } from '../val/OpVal'
+
+
+
+
+
+class PlusVal extends OpVal {
+  isOpVal = true
+
+  constructor(
+    spec: {
+      peg: any[],
+    },
+    ctx?: Context
+  ) {
+    super(spec, ctx)
+  }
+
+
+  operate(ctx: Context) {
+    super.operate(ctx)
+
+    if (this.peg.find((v: any) => v.isRefVal)) {
+      return undefined
+    }
+
+    let peg = this.peg[0].peg + this.peg[1].peg
+    let pegtype = typeof peg
+    if ('string' === pegtype) {
+      return new StringVal({ peg })
+    }
+    else if ('number' === pegtype) {
+      return Number.isInteger(peg) ? new IntegerVal({ peg }) : new NumberVal({ peg })
+    }
+
+    return undefined
+  }
+
+
+  get canon() {
+    return this.peg[0].canon + '+' + this.peg[1].canon
+  }
+
+}
+
+
+export {
+  PlusVal,
+}

package/lib/val/PlusVal.ts~

@@ -0,0 +1,158 @@
+/* Copyright (c) 2024 Richard Rodger, MIT License */
+
+
+import type {
+  Val,
+  ValSpec,
+} from '../type'
+
+import {
+  DONE,
+} from '../type'
+
+import {
+  descErr
+} from '../err'
+
+import {
+  Context,
+} from '../unify'
+
+import {
+  unite
+} from '../op/op'
+
+import {
+  TOP,
+  StringVal,
+} from '../val'
+
+
+import { ConjunctVal } from '../val/ConjunctVal'
+import { MapVal } from '../val/MapVal'
+import { Nil } from '../val/Nil'
+import { VarVal } from '../val/VarVal'
+import { ValBase } from '../val/ValBase'
+
+
+
+
+
+class OpVal extends ValBase {
+  isOpVal = true
+
+  constructor(
+    spec: {
+      peg: any[],
+    },
+    ctx?: Context
+  ) {
+    super(spec, ctx)
+    this.peg = []
+
+    for (let pI = 0; pI < spec.peg.length; pI++) {
+      this.append(spec.peg[pI])
+    }
+  }
+
+
+  append(part: any) {
+    this.peg.push(part)
+  }
+
+
+  unify(peer: Val, ctx: Context): Val {
+    let out: Val = this
+
+    if (this.id !== peer.id) {
+      let result: Val | undefined = null == ctx ? this : this.operate(ctx)
+
+      result = result || this
+
+      if (null == result && this.canon === peer.canon) {
+        out = this
+      }
+      else if (result instanceof OpVal) {
+        if (TOP === peer) {
+          out = this
+        }
+        else if (peer instanceof Nil) {
+          out = Nil.make(ctx, 'op[' + this.peg + ']', this, peer)
+        }
+
+        else if (this.canon === peer.canon) {
+          out = this
+        }
+
+        else {
+          this.done = DONE === this.done ? DONE : this.done + 1
+          out = new ConjunctVal({ peg: [this, peer] }, ctx)
+        }
+      }
+      else {
+        out = unite(ctx, result, peer, 'op')
+      }
+
+      out.done = DONE === out.done ? DONE : this.done + 1
+    }
+
+    return out
+  }
+
+
+  same(peer: Val): boolean {
+    return null == peer ? false : this.peg === peer.peg
+  }
+
+
+  clone(spec?: ValSpec, ctx?: Context): Val {
+    let out = (super.clone({
+      peg: this.peg,
+    }, ctx) as OpVal)
+    return out
+  }
+
+
+  operate(_ctx: Context) {
+    return undefined
+  }
+
+
+
+  get canon() {
+    return ''
+  }
+
+
+  gen(ctx?: Context) {
+    // Unresolved ref cannot be generated, so always an error.
+    let nil = Nil.make(
+      ctx,
+      'ref',
+      this, // (formatPath(this.peg, this.absolute) as any),
+      undefined
+    )
+
+    // TODO: refactor to use Site
+    nil.path = this.path
+    nil.url = this.url
+    nil.row = this.row
+    nil.col = this.col
+
+    descErr(nil)
+
+    if (ctx) {
+      ctx.err.push(nil)
+    }
+    else {
+      throw new Error(nil.msg)
+    }
+
+    return undefined
+  }
+}
+
+
+export {
+  OpVal,
+}

package/lib/val/RefVal.ts

@@ -41,8 +41,6 @@ import {
 
 
 import { ConjunctVal } from '../val/ConjunctVal'
-// import { DisjunctVal } from '../val/DisjunctVal'
-// import { ListVal } from '../val/ListVal'
 import { MapVal } from '../val/MapVal'
 import { Nil } from '../val/Nil'
 import { VarVal } from '../val/VarVal'
@@ -193,7 +191,9 @@ class RefVal extends ValBase {
 
     let modes: string[] = []
 
-    // console.log('PARTS', this.peg)
+    // 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]
@@ -267,6 +267,22 @@ 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)
+
+      // TODO: other props?
+      sv.done = DONE
+      sv.path = this.path
+
+      return sv
+    }
+
+
+
     let node = ctx.root
     let pI = 0
     for (; pI < fullpath.length; pI++) {
@@ -285,20 +301,20 @@ class RefVal extends ValBase {
 
     if (pI === fullpath.length) {
       // if (this.attr && 'KEY' === this.attr.kind) {
-      if (modes.includes('KEY')) {
-        // let key = fullpath[fullpath.length - ('' === this.attr.part ? 1 : 2)]
-        let key = fullpath[fullpath.length - 1]
-        let sv = new StringVal({ peg: null == key ? '' : key }, ctx)
-
-        // TODO: other props?
-        sv.done = DONE
-        sv.path = this.path
-
-        return sv
-      }
-      else {
-        return node
-      }
+      // if (modes.includes('KEY')) {
+      //   let key = fullpath[fullpath.length - 1]
+      //   let sv = new StringVal({ peg: null == key ? '' : key }, ctx)
+
+      //   // TODO: other props?
+      //   sv.done = DONE
+      //   sv.path = this.path
+
+      //   return sv
+      // }
+      // else {
+      // console.log('REF', this.id, this.path, this.done, 'FOUND', node.canon)
+      return node
+      // }
     }
   }
 

package/lib/val/ValBase.ts

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
+/* Copyright (c) 2021-2024 Richard Rodger, MIT License */
 
 
 
@@ -18,6 +18,7 @@ import {
 } from '../lang'
 
 
+let ID = 0
 
 
 class ValBase implements Val {
@@ -39,11 +40,15 @@ class ValBase implements Val {
   err: any[] = []
   // deps?: any
 
+  uh: number[]
+
 
   constructor(spec: ValSpec, ctx?: Context) {
     this.peg = spec?.peg
     this.path = ctx?.path || []
-    this.id = (9e9 + Math.floor(Math.random() * (1e9)))
+    // this.id = (9e9 + Math.floor(Math.random() * (1e9)))
+    this.id = ++ID // (9e9 + Math.floor(Math.random() * (1e5)))
+    this.uh = []
   }
 
 
@@ -53,9 +58,15 @@ class ValBase implements Val {
 
 
   clone(spec?: ValSpec, ctx?: Context): Val {
-    let cloneCtx = ctx ? ctx.clone({
-      path: ctx.path.concat(this.path.slice(ctx.path.length))
-    }) : undefined
+    let cloneCtx
+
+    if (ctx) {
+      let cut = this.path.indexOf('&')
+      cut = -1 < cut ? cut + 1 : ctx.path.length
+      cloneCtx = ctx.clone({
+        path: ctx.path.concat(this.path.slice(cut))
+      })
+    }
 
     let out = new (this as any)
       .constructor(spec || { peg: this.peg }, cloneCtx)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.21.1",
+  "version": "0.23.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -32,7 +32,7 @@
     "version": "node -r fs -e \"v=require('./package.json').version;s=fs.readFileSync('./aontu.ts').toString();if(!s.includes('VERSION = \\''+v+'\\'')){s=s.replace(/VERSION = '.*?'/,'VERSION = \\''+v+'\\'');fs.writeFileSync('./aontu.ts',s)}\"",
     "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 https://registry.npmjs.org "
+    "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run repo-tag && npm publish --registry https://registry.npmjs.org "
   },
   "license": "MIT",
   "engines": {
@@ -49,22 +49,22 @@
     "@jsonic/directive": "^0.11.4",
     "@jsonic/expr": "^0.8.3",
     "@jsonic/jsonic-next": "^2.12.1",
-    "@jsonic/multisource": "^1.2.0",
+    "@jsonic/multisource": "^1.3.0",
     "@jsonic/path": "^0.7.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.12",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^22.7.8",
     "aliasify": "^2.1.0",
-    "browserify": "^17.0.0",
+    "browserify": "^17.0.1",
     "es-jest": "^2.1.0",
-    "esbuild": "^0.21.3",
+    "esbuild": "^0.24.0",
     "jest": "^29.7.0",
-    "prettier": "^3.2.5",
-    "serve": "^14.2.3",
+    "prettier": "^3.3.3",
+    "serve": "^14.2.4",
     "tinyify": "^4.0.0",
-    "ts-jest": "^29.1.3",
-    "typescript": "^5.4.5"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   },
   "aliasify": {
     "aliases": {