aontu 0.28.0 → 0.30.1

package/lib/val/RefVal.ts

@@ -1,380 +0,0 @@
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-
-
-/* TODO
-   Rename ot PathVal
-   
-   $SELF.a - path starting at self
-   $PARENT.b === .b - sibling
-
-   implement $ as a prefix operator
-   this allows "$AString" to be used for literal part names
-*/
-
-
-
-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 RefVal extends ValBase {
-  isRefVal = true
-
-  absolute: boolean = false
-  prefix: boolean = false
-
-  constructor(
-    spec: {
-      peg: any[],
-      absolute?: boolean,
-      prefix?: boolean
-    },
-    ctx?: Context
-  ) {
-    super(spec, ctx)
-    this.peg = []
-
-    this.absolute = true === this.absolute ? true : // absolute sticks
-      true === spec.absolute ? true : false
-
-    this.prefix = true === spec.prefix
-
-    for (let pI = 0; pI < spec.peg.length; pI++) {
-      this.append(spec.peg[pI])
-    }
-  }
-
-
-  append(part: any) {
-    // console.log('APPEND', part, this)
-    let partval
-
-    if ('string' === typeof part) {
-      partval = part
-      this.peg.push(partval)
-    }
-
-    else if (part instanceof StringVal) {
-      partval = part.peg
-      this.peg.push(partval)
-    }
-
-    else if (part instanceof VarVal) {
-      partval = part
-      this.peg.push(partval)
-    }
-
-    else if (part instanceof RefVal) {
-      if (part.absolute) {
-        this.absolute = true
-      }
-
-      if (this.prefix) {
-        if (part.prefix) {
-          this.peg.push('.')
-        }
-      }
-      else {
-        if (part.prefix) {
-          if (0 === this.peg.length) {
-            this.prefix = true
-          }
-
-          else if (0 < this.peg.length) {
-            this.peg.push('.')
-          }
-        }
-      }
-
-      this.peg.push(...part.peg)
-    }
-  }
-
-
-  unify(peer: Val, ctx: Context): Val {
-    let out: Val = this
-    // let why = 'id'
-
-    if (this.id !== peer.id) {
-
-      // TODO: not resolved when all Vals in path are done is an error
-      // as path cannot be found
-      // 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) {
-        out = this
-      }
-      else if (resolved instanceof RefVal) {
-        if (TOP === peer) {
-          out = this
-          // why = 'pt'
-        }
-        else if (peer instanceof Nil) {
-          out = Nil.make(ctx, 'ref[' + this.peg + ']', this, peer)
-          // why = 'pn'
-        }
-
-        // same path
-        // else if (this.peg === peer.peg) {
-        else if (this.canon === peer.canon) {
-          out = this
-          // why = 'pp'
-        }
-
-        else {
-          // Ensure RefVal done is incremented
-          this.done = DONE === this.done ? DONE : this.done + 1
-          out = new ConjunctVal({ peg: [this, peer] }, ctx)
-          // why = 'cj'
-        }
-      }
-      else {
-        out = unite(ctx, resolved, peer, 'ref')
-        // why = 'u'
-      }
-
-      out.done = DONE === out.done ? DONE : this.done + 1
-    }
-
-    // console.log('RV', why, this.id, this.canon, '&', peer.canon, '->', out.canon)
-
-    return out
-  }
-
-
-  find(ctx: Context) {
-    // TODO: relative paths
-    // if (this.root instanceof MapVal && ref.absolute) {
-
-    // NOTE: path *to* the ref, not the ref itself!
-    let fullpath = this.path
-
-    let parts: string[] = []
-
-    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) {
-        let strval = (part as VarVal).peg
-        let name = strval ? '' + strval.peg : ''
-
-        if ('KEY' === name) {
-          if (pI === this.peg.length - 1) {
-            modes.push(name)
-          }
-          else {
-            // TODO: return a Nil explaining error
-            return
-          }
-        }
-
-        if ('SELF' === name) {
-          if (pI === 0) {
-            modes.push(name)
-          }
-          else {
-            // TODO: return a Nil explaining error
-            return
-          }
-        }
-        else if ('PARENT' === name) {
-          if (pI === 0) {
-            modes.push(name)
-          }
-          else {
-            // TODO: return a Nil explaining error
-            return
-          }
-        }
-        else if (0 === modes.length) {
-          part = (part as VarVal).unify(TOP, ctx)
-          if (part instanceof Nil) {
-            // TODO: var not found, so can't find path
-            return
-          }
-          else {
-            part = '' + part.peg
-          }
-        }
-      }
-      else {
-        parts.push(part)
-      }
-    }
-
-    // console.log('modes', modes)
-
-
-    if (this.absolute) {
-      fullpath = parts
-    }
-    else {
-      fullpath = fullpath.slice(
-        0,
-        (
-          modes.includes('SELF') ? 0 :
-            modes.includes('PARENT') ? -1 :
-              -1 // siblings
-        )
-      ).concat(parts)
-    }
-
-    let sep = '.'
-    fullpath = fullpath
-      .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++) {
-      // console.log('RefVal DESCEND', pI, node)
-      let part = fullpath[pI]
-
-      if (node instanceof MapVal) {
-        node = node.peg[part]
-      }
-      else {
-        break;
-      }
-    }
-
-    // console.log('RefVal KEY', modes, pI, fullpath)
-
-    if (pI === fullpath.length) {
-      // if (this.attr && 'KEY' === this.attr.kind) {
-      // 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
-      // }
-    }
-  }
-
-
-  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,
-      absolute: this.absolute,
-      ...(spec || {})
-    }, ctx) as RefVal)
-    return out
-  }
-
-
-  get canon() {
-    let str =
-      (this.absolute ? '$' : '') +
-      (0 < this.peg.length ? '.' : '') +
-      // this.peg.join(this.sep)
-      this.peg.map((p: any) => '.' === p ? '' :
-        (p.isVal ? p.canon : '' + p))
-        .join('.')
-    return str
-  }
-
-
-  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, ctx)
-
-    if (ctx) {
-      ctx.err.push(nil)
-    }
-    else {
-      throw new Error(nil.msg)
-    }
-
-    return undefined
-  }
-}
-
-
-export {
-  RefVal,
-}

package/lib/val/ValBase.ts

@@ -1,109 +0,0 @@
-/* Copyright (c) 2021-2024 Richard Rodger, MIT License */
-
-
-
-import type {
-  Val,
-  ValSpec,
-} from '../type'
-
-
-import {
-  Context,
-} from '../unify'
-
-
-import {
-  Site
-} from '../lang'
-
-
-let ID = 0
-
-
-class ValBase implements Val {
-  isVal = true
-
-  id: number
-  done: number = 0
-  path: string[] = []
-  row: number = -1
-  col: number = -1
-  url: string = ''
-
-  top: boolean = false
-
-  // Actual native value.
-  peg: any = undefined
-
-  // TODO: used for top level result - not great
-  err: any[] = []
-  // deps?: any
-
-  uh: number[]
-
-  // TODO: implement!
-  // site: Site
-
-  #ctx: any
-
-  // TODO: Site needed in ctor
-  constructor(spec: ValSpec, ctx?: Context) {
-    this.#ctx = ctx
-
-    this.peg = spec?.peg
-    this.path = ctx?.path || []
-    // this.id = (9e9 + Math.floor(Math.random() * (1e9)))
-    this.id = ++ID // (9e9 + Math.floor(Math.random() * (1e5)))
-    this.uh = []
-  }
-
-
-  ctx() {
-    return this.#ctx
-  }
-
-  same(peer: Val): boolean {
-    return null == peer ? false : this.id === peer.id
-  }
-
-
-  clone(spec?: ValSpec, ctx?: Context): Val {
-    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)
-
-    out.row = spec?.row || this.row || -1
-    out.col = spec?.col || this.col || -1
-    out.url = spec?.url || this.url || ''
-
-    if (null == cloneCtx) {
-      out.path = this.path.slice(0)
-    }
-
-    return out
-  }
-
-
-  get site(): Site {
-    return new Site(this)
-  }
-
-  unify(_peer: Val, _ctx?: Context): Val { return this }
-  get canon(): string { return '' }
-  gen(_ctx?: Context): any { return null }
-
-}
-
-export {
-  ValBase,
-}

package/lib/val/VarVal.ts

@@ -1,156 +0,0 @@
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-
-
-/* TODO
-
-   $SELF.a - path starting at self
-   $PARENT.b === .b - sibling
-
-   implement $ as a prefix operator
-   this allows "$AString" to be used for literal part names
-*/
-
-
-
-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 { DisjunctVal } from '../val/DisjunctVal'
-// import { ListVal } from '../val/ListVal'
-// import { MapVal } from '../val/MapVal'
-import { Nil } from '../val/Nil'
-import { RefVal } from '../val/RefVal'
-import { ValBase } from '../val/ValBase'
-
-
-
-// TODO: KEY, SELF, PARENT are reserved names - error
-
-class VarVal extends ValBase {
-  isVarVal = true
-
-  constructor(
-    spec: {
-      peg: string | Val
-    },
-    ctx?: Context
-  ) {
-    super(spec, ctx)
-  }
-
-
-  unify(peer: Val, ctx: Context): Val {
-    let out: Val
-
-    let nameVal
-
-    if (this.peg.isVal) {
-      // $.a.b.c - convert path to absolute
-      if (this.peg instanceof RefVal) {
-        this.peg.absolute = true
-        nameVal = this.peg
-      }
-      else {
-        nameVal = this.peg.unify(peer)
-      }
-    }
-    else {
-      // TODO: how to pass row+col?
-      nameVal = new StringVal({ peg: '' + this.peg }, ctx)
-    }
-
-    if (!(nameVal instanceof RefVal) && DONE === nameVal.done) {
-      if (nameVal instanceof StringVal) {
-        out = ctx.var[nameVal.peg]
-        if (null == out) {
-          out = Nil.make(ctx, 'var[' + nameVal.peg + ']', this, peer)
-        }
-      }
-      else {
-        out = Nil.make(ctx, 'var[' + typeof nameVal + ']', this, peer)
-      }
-    }
-    else {
-      out = nameVal
-    }
-
-    return out
-  }
-
-
-  same(peer: Val): boolean {
-    return null == peer ? false : peer instanceof VarVal && this.peg === peer.peg
-  }
-
-
-  clone(spec?: ValSpec, ctx?: Context): Val {
-    let out = (super.clone(spec, ctx) as VarVal)
-    return out
-  }
-
-
-  get canon() {
-    return '$' + (this.peg?.isVal ? this.peg.canon : '' + this.peg)
-  }
-
-
-  gen(ctx?: Context) {
-    // Unresolved var cannot be generated, so always an error.
-    let nil = Nil.make(
-      ctx,
-      'var',
-      this,
-      undefined
-    )
-
-    // TODO: refactor to use Site
-    nil.path = this.path
-    nil.url = this.url
-    nil.row = this.row
-    nil.col = this.col
-
-    descErr(nil, ctx)
-
-    if (ctx) {
-      ctx.err.push(nil)
-    }
-    else {
-      throw new Error(nil.msg)
-    }
-
-    return undefined
-  }
-}
-
-
-export {
-  VarVal,
-}