aontu 0.51.0 → 0.52.0

package/src/val/ListVal.ts

@@ -20,7 +20,6 @@ import {
   explainOpen,
   ec,
   explainClose,
-  items,
 } from '../utility'
 
 import { makeNilErr, AontuError } from '../err'
@@ -33,7 +32,6 @@ import {
 import { ConjunctVal } from './ConjunctVal'
 import { NilVal } from './NilVal'
 import { BagVal } from './BagVal'
-import { empty } from './Val'
 
 
 class ListVal extends BagVal {
@@ -121,9 +119,9 @@ class ListVal extends BagVal {
 
         propagateMarks(this, child)
 
+        // child is non-nullish: propagateMarks above dereferences it.
         out.peg[key] =
-          undefined === child ? key_spread_cj :
-            child.isNil ? child :
+          child.isNil ? child :
               key_spread_cj.isNil ? key_spread_cj :
                 key_spread_cj.isTop && child.done ? child :
                   child.isTop && key_spread_cj.done ? key_spread_cj :
@@ -271,7 +269,7 @@ class ListVal extends BagVal {
           this.peg[k].canon).join(',') +
       ']'
   }
-}
+} /* node:coverage ignore next 8 */
 
 
 

package/src/val/LowerFuncVal.ts

@@ -82,7 +82,7 @@ class LowerFuncVal extends FuncBaseVal {
       super.superior()
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/MapVal.ts

@@ -42,7 +42,7 @@ import { cmpCodePoint } from '../keyorder'
 // pass. The map lives on the unify root ctx (see Unify), so it persists
 // across fixpoint passes and is GC'd with the run.
 function spreadSnapKey(cj: any): string {
-  return cj.canon + '~' + (cj.site?.row ?? -1) + ':' + (cj.site?.col ?? -1)
+  return cj.canon + '~' + cj.site.row + ':' + cj.site.col
 }
 
 // Snapshot a path-dependent ref spread to its structural target once,
@@ -229,7 +229,9 @@ class MapVal extends BagVal {
         // but costs O(keys) deep template clones per pass on large
         // models — the dominant cost on generated-SDK model trees.
         let oval: Val
-        if (undefined !== child && !spread_cj.isTop
+        // No `undefined !== child` here: propagateMarks above already
+        // dereferenced it, so a missing child would have thrown there.
+        if (!spread_cj.isTop
           && (child as any)._spr === (spread_cj as any).id) {
           oval = child.done ? child :
             unite(te ? keyctx.clone({ explain: ec(te, 'KEY:' + key) }) : keyctx,
@@ -239,9 +241,9 @@ class MapVal extends BagVal {
         else {
           const key_spread_cj = spread_cj.spreadClone(keyctx)
 
+          // child is non-nullish: propagateMarks above dereferences it.
           oval =
-            undefined === child ? key_spread_cj :
-              child.isNil ? child :
+            child.isNil ? child :
                 key_spread_cj.isNil ? key_spread_cj :
                   key_spread_cj.isTop && child.done ? child :
                     child.isTop && key_spread_cj.done ? key_spread_cj :
@@ -449,7 +451,7 @@ class MapVal extends BagVal {
     return this.spread.cj ? '&:' + this.spread.cj.inspect(null == d ? 0 : d + 1) : ''
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/MoveFuncVal.ts

@@ -92,7 +92,7 @@ class MoveFuncVal extends FuncBaseVal {
 
     return out
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/NilVal.ts

@@ -18,6 +18,8 @@ import { Val, EMPTY_ERR } from './Val'
 
 import { AontuError, descErr } from '../err'
 
+import { codeClass } from '../hints'
+
 
 class NilVal extends Val {
   isNil = true
@@ -98,10 +100,10 @@ class NilVal extends Val {
     if (spec && 'object' === typeof spec) {
       this.why = spec?.why
       this.msg = 'string' === typeof spec?.msg ? spec.msg : this.msg
-      this.err = spec ?
+      this.err =
         Array.isArray(spec.err) ? [...spec.err] :
           null != spec.err ? [spec.err] :
-            EMPTY_ERR : EMPTY_ERR
+            EMPTY_ERR
     }
 
     // Nil is always DONE, by definition.
@@ -135,6 +137,14 @@ class NilVal extends Val {
   }
 
 
+  // The code's class from the shared registry (test/spec/errcodes.tsv):
+  // conflict | incomplete | reference | parse | budget | internal.
+  // A why-less nil classifies as its eventual gen-time code, nil_gen.
+  get class(): string {
+    return codeClass(null == this.why ? 'nil_gen' : String(this.why))
+  }
+
+
   gen(ctx: AontuContext) {
     // Unresolved nil cannot be generated, so always an error.
 
@@ -174,7 +184,7 @@ class NilVal extends Val {
 //
 // Do NOT use this sentinel for errors that may surface: those need
 // real NilVals with proper site/path info for descErr formatting.
-const TRIAL_NIL = new NilVal({ why: '|:trial-nil' })
+const TRIAL_NIL = new NilVal({ why: '|:trial-nil' }) /* node:coverage ignore next 7 */
 
 
 export {

package/src/val/NullVal.ts

@@ -29,7 +29,7 @@ class NullVal extends ScalarVal {
   unify(peer: Val, ctx: AontuContext): Val {
     return super.unify(peer, ctx)
   }
-}
+} /* node:coverage ignore next 7 */
 
 
 export {

package/src/val/NumberVal.ts

@@ -49,7 +49,7 @@ class NumberVal extends ScalarVal {
     let out: Val = this
 
     if (null != peer) {
-      if (peer.isScalarKind) {
+      if (peer.isScalarKind || (peer as any).isConstraint) {
         out = peer.unify(this, ctx)
       }
       else if (
@@ -95,7 +95,7 @@ class NumberVal extends ScalarVal {
       s.includes('N') ||
       s.includes('I')) ? s : s + '.0'
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/OpBaseVal.ts

@@ -67,7 +67,11 @@ class OpBaseVal extends FeatureVal {
 
   unify(peer: Val, ctx: AontuContext): Val {
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Op:' + this.opname(), this, peer)
-    let out: Val = this
+    // Declared without an initial value: every arm below assigns it, and
+    // seeding it with `this` made the two arms that stand the op read as
+    // redundant self-assignments. The arms themselves stay as they are —
+    // they mirror the dispatch switch in go/op.go arm for arm (ADR-001).
+    let out: Val
 
     if (this.id == peer.id) {
       return this
@@ -88,16 +92,12 @@ class OpBaseVal extends FeatureVal {
     // console.log('OPVAL', this.id, this.opname(), pegdone, newpeg.map(p => p.canon))
 
     if (pegdone) {
-      let result: Val | undefined = null == ctx ? this : this.operate(ctx, newpeg)
-
-      result = result || this
-
-      if (null == result && this.canon === peer.canon) {
-        out = this
-      }
+      // `|| this` makes result truthy, so an op that cannot compute yet
+      // takes the OpBaseVal arm below rather than a separate null arm.
+      let result: Val = this.operate(ctx, newpeg) || this
 
       // TODO: should be result.isOp
-      else if (result instanceof OpBaseVal) {
+      if (result instanceof OpBaseVal) {
         if (peer.isTop) {
           out = this
         }
@@ -223,7 +223,7 @@ class OpBaseVal extends FeatureVal {
 
     return undefined
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/OpenFuncVal.ts

@@ -52,7 +52,7 @@ class OpenFuncVal extends FuncBaseVal {
     return argval
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/PathFuncVal.ts

@@ -75,7 +75,7 @@ class PathFuncVal extends FuncBaseVal {
     return out
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/PlusOpVal.ts

@@ -237,7 +237,7 @@ function integer(v: any, k: OpKind): bigint {
 // Scale 0 normalises to the one decimal place the leaf keeps.
 function decimal(v: any, k: OpKind): Decimal {
   return 'bigdecimal' === k ? v.peg : new Decimal(integer(v, k), 0)
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/PrefFuncVal.ts

@@ -65,7 +65,7 @@ class PrefFuncVal extends FuncBaseVal {
     return out
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/PrefVal.ts

@@ -114,7 +114,6 @@ class PrefVal extends FeatureVal {
     peer = peer ?? top()
 
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Pref', this, peer)
-    let done = true
     let out: Val = this
     let why = ''
 
@@ -180,7 +179,9 @@ class PrefVal extends FeatureVal {
       why += 'none'
     }
 
-    out.dc = done ? DONE : this.dc + 1
+    // Every pref result is DONE, including a stuck conjunct from the
+    // superior-unify (mirrored by PrefVal.Unify in go/pref.go).
+    out.dc = DONE
 
     // console.log('PREFVAL-OUT', why, this.canon, peer.canon, '->', out.canon, out.done)
 
@@ -226,7 +227,7 @@ class PrefVal extends FeatureVal {
 
     return val.gen(ctx)
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/RefVal.ts

@@ -68,8 +68,9 @@ class RefVal extends FeatureVal {
     super(spec, ctx)
     this.peg = []
 
-    this.absolute = true === this.absolute ? true : // absolute sticks
-      true === spec.absolute ? true : false
+    // The field initialiser (absolute = false) has just run, so only
+    // the spec can carry absoluteness in (RefVal.clone re-passes it).
+    this.absolute = true === spec.absolute
 
     this.prefix = true === spec.prefix
 
@@ -181,14 +182,13 @@ class RefVal extends FeatureVal {
       // 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 found: Val | undefined = null == ctx ? this : this.find(ctx)
+      let found: Val | undefined = this.find(ctx)
 
+      // `?? this` makes resolved non-nullish, so an unresolved reference
+      // takes the RefVal arm below rather than a separate null arm.
       const resolved = found ?? this
 
-      if (null == resolved && this.canon === peer.canon) {
-        out = this
-      }
-      else if (resolved instanceof RefVal) {
+      if (resolved instanceof RefVal) {
         if (peer.isTop) {
           out = this
           why = 'pt'
@@ -413,8 +413,16 @@ class RefVal extends FeatureVal {
       else if (pI === refpath.length) {
         out = node
 
+        // A reference landing on another reference may be a PROVEN
+        // mutual cycle (a: $.b, b: $.a) -- follow the plain-ref chain
+        // and, if it revisits a node, report path_cycle now instead of
+        // deferring every pass and dying later as a generic ref error.
+        // No proof (chain leaves plain refs, or ends) defers as before.
+        if (null != out && (out as any).isRef && this.detectRefCycle(ctx)) {
+          out = makeNilErr(ctx, 'path_cycle', this)
+        }
         // Types and hidden values are cloned and made concrete
-        if (null != out) { //  && (out.mark.type || out.mark.hide)) {
+        else if (null != out) { //  && (out.mark.type || out.mark.hide)) {
 
           // console.log('FOUND-A', out)
 
@@ -456,6 +464,71 @@ class RefVal extends FeatureVal {
   }
 
 
+  // Follow the chain of plain references from this node; true iff the
+  // chain revisits a node -- a PROVEN reference cycle, distinct from a
+  // merely unresolved reference. Detection is only on the resolution
+  // chain revisiting a node, never on syntactic shape: a chain that
+  // passes through a variable segment, a conjunct, a function, or any
+  // non-ref value yields no proof and the ref defers as before.
+  detectRefCycle(ctx: AontuContext): boolean {
+    const seen = new Set<number>()
+    let cur: RefVal = this
+    // No hop cap: every iteration either returns or adds a NEW ref to
+    // `seen`, and the tree holds finitely many refs, so the chase
+    // terminates at the first repetition or the first non-ref — a cap
+    // would just make cycles longer than it invisible.
+    for (; ;) {
+      if (seen.has(cur.id)) {
+        return true
+      }
+      seen.add(cur.id)
+      const rp = cur.plainRefPath()
+      if (null == rp) {
+        return false
+      }
+      let node: any = ctx.root
+      for (let i = 0; i < rp.length && null != node; i++) {
+        node = (node.isMap || node.isList) ? node.peg[rp[i]] : undefined
+      }
+      if (null == node || !node.isRef) {
+        return false
+      }
+      cur = node
+    }
+  }
+
+
+  // The resolved absolute path of a reference whose segments are all
+  // plain strings; undefined when the ref has variable segments (no
+  // cycle proof is attempted for those). Mirrors find's refpath
+  // computation for the plain case, including the `.` prefix reduction.
+  plainRefPath(): string[] | undefined {
+    const parts: string[] = []
+    for (const p of this.peg) {
+      if ('string' !== typeof p) {
+        return undefined
+      }
+      parts.push(p)
+    }
+    const refpath = this.absolute ? parts :
+      this.path.slice(0, -1).concat(parts)
+    const reduced: string[] = []
+    for (const p of refpath) {
+      if ('.' === p) {
+        // A parent step off the top of the path proves nothing.
+        if (0 === reduced.length) {
+          return undefined
+        }
+        reduced.length = reduced.length - 1
+      }
+      else {
+        reduced.push(p)
+      }
+    }
+    return reduced
+  }
+
+
   same(peer: Val): boolean {
     return null == peer ? false : this.peg === peer.peg
   }
@@ -509,7 +582,7 @@ class RefVal extends FeatureVal {
     ].filter(p => '' != p).join(',')
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/ScalarKindVal.ts

@@ -148,7 +148,13 @@ class ScalarKindVal extends FeatureVal {
 
     let out: Val = this
 
-    if (peerIsScalarVal) {
+    if ((peer as any).isConstraint) {
+      // The constraint algebra owns the kind-meets-constraint rules
+      // (narrowing, domain checks) -- delegate, so disjunct trials and
+      // direct drives agree with the sorted conjunct fold.
+      out = (peer as any).unify(this, ctx)
+    }
+    else if (peerIsScalarVal) {
       let peerKind = (peer as any).kind
 
       // A kind admits a concrete value of that kind, or of any kind
@@ -213,7 +219,7 @@ class ScalarKindVal extends FeatureVal {
   }
 
 
-}
+} /* node:coverage ignore next 15 */
 
 
 export {

package/src/val/ScalarVal.ts

@@ -60,7 +60,7 @@ class ScalarVal extends Val {
     let out: Val
 
     // Exactly equal scalars are handled in unify.unite
-    if (peer.isScalarKind) {
+    if (peer.isScalarKind || (peer as any).isConstraint) {
       out = peer.unify(this, ctx)
     }
     else if (peer.isTop) {
@@ -121,7 +121,7 @@ class ScalarVal extends Val {
     }))
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/StringVal.ts

@@ -30,7 +30,7 @@ class StringVal extends ScalarVal {
     return JSON.stringify(this.peg)
   }
 
-}
+} /* node:coverage ignore next 5 */
 
 export {
   StringVal,

package/src/val/SuperFuncVal.ts

@@ -51,7 +51,7 @@ class SuperFuncVal extends FuncBaseVal {
     return this.place(this.superior())
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/TopVal.ts

@@ -61,7 +61,7 @@ class TopVal extends Val {
     return undefined
   }
 
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/TypeFuncVal.ts

@@ -61,7 +61,7 @@ class TypeFuncVal extends FuncBaseVal {
 
     return out
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/UpperFuncVal.ts

@@ -81,7 +81,7 @@ class UpperFuncVal extends FuncBaseVal {
       })) :
       super.superior()
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {

package/src/val/Val.ts

@@ -148,11 +148,13 @@ abstract class Val {
 
   deps?: any
 
-  #ctx: any
+  // TS-private (as _site above): the `#` form emits downlevel helper
+  // functions whose branches no supported Node can execute.
+  private _ctx: any
 
   // TODO: Site needed in ctor
   constructor(spec: ValSpec, ctx?: AontuContext) {
-    this.#ctx = ctx
+    this._ctx = ctx
 
     this.peg = spec?.peg
 
@@ -179,7 +181,7 @@ abstract class Val {
 
 
   ctx() {
-    return this.#ctx
+    return this._ctx
   }
 
 
@@ -217,9 +219,12 @@ abstract class Val {
 
     out.dc = this.done ? DONE : out.dc
 
-    out.site.row = spec?.row ?? this.site.row ?? -1
-    out.site.col = spec?.col ?? this.site.col ?? -1
-    out.site.url = spec?.url ?? this.site.url ?? ''
+    // this.site is a lazy getter that always yields a Site, and Site's
+    // constructor coerces row/col to numbers and url to a string, so the
+    // spec value is the only one that can be absent.
+    out.site.row = spec?.row ?? this.site.row
+    out.site.col = spec?.col ?? this.site.col
+    out.site.url = spec?.url ?? this.site.url
 
     out.mark = Object.assign({}, this.mark, fullspec.mark ?? {})
     out.mark.type = this.mark.type && (fullspec.mark?.type ?? true)
@@ -427,7 +432,7 @@ function inspectpeg(peg: any, d: number) {
     ('{' +
       Object.entries(peg).map((n: any) =>
         '\n  ' + indent + n[0] + ': ' + // n[1].inspect(d)
-        (n[1].inspect(d) ?? '' + n[1])
+        n[1].inspect(d)
       ).join(',') +
       '\n' + indent + '}')
   )
@@ -448,7 +453,7 @@ function empty(o: any) {
     || (null != o && 'object' === typeof o && 0 === Object.keys(o).length)
     || false
   )
-}
+} /* node:coverage ignore next 16 */
 
 
 

package/src/val/VarVal.ts

@@ -189,7 +189,7 @@ class VarVal extends FeatureVal {
 
     return undefined
   }
-}
+} /* node:coverage ignore next 6 */
 
 
 export {