aontu 0.44.0 → 0.46.0

package/src/val/DisjunctVal.ts

@@ -30,7 +30,6 @@ import {
   top
 } from './top'
 
-
 import { NilVal, TRIAL_NIL } from '../val/NilVal'
 import { PrefVal } from '../val/PrefVal'
 import { JunctionVal } from '../val/JunctionVal'
@@ -68,11 +67,6 @@ class DisjunctVal extends JunctionVal {
   unify(peer: Val, ctx: AontuContext): Val {
     peer = peer ?? top()
 
-    // Fast path: already-done disjunct unifying with TOP.
-    if (this.done && peer.isTop) {
-      return this
-    }
-
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Disjunct', this, peer)
 
     if (!this.prefsRanked) {

package/src/val/ExpectVal.ts

@@ -51,25 +51,11 @@ class ExpectVal extends FeatureVal {
       this.peer = undefined === this.peer ? peer :
         unite(te ? ctx.clone({ explain: ec(te, 'PEER') }) : ctx, this.peer, peer, 'expect-peer')
 
-      // Unwrap nested ExpectVals to prevent infinite recursion
-      let peg = this.peg
-      while (peg?.isExpect) {
-        peg = peg.peg
-      }
+      const peeru =
+        unite(te ? ctx.clone({ explain: ec(te, 'EXPECT') }) : ctx, this.peer, this.peg, 'expect-self')
 
-      // Guard against re-entrant recursion
-      if ((this as any)._expectDepth > 0) {
-        out.dc = this.dc + 1
-      }
-      else {
-        (this as any)._expectDepth = ((this as any)._expectDepth || 0) + 1
-        const peeru =
-          unite(te ? ctx.clone({ explain: ec(te, 'EXPECT') }) : ctx, this.peer, peg, 'expect-self')
-        ;(this as any)._expectDepth--
-
-        if (peeru.isGenable) {
-          out = peeru
-        }
+      if (peeru.isGenable) {
+        out = peeru
       }
     }
 

package/src/val/JunctionVal.ts

@@ -17,7 +17,6 @@ import { FeatureVal } from './FeatureVal'
 // (ConjunctVal and DisjunctVal)
 abstract class JunctionVal extends FeatureVal {
   isJunction = true
-  _canonCache?: string
 
   constructor(
     spec: ValSpec,
@@ -39,13 +38,10 @@ abstract class JunctionVal extends FeatureVal {
   }
 
   get canon() {
-    if (this._canonCache !== undefined) return this._canonCache
-    const c = this.peg.map((v: Val) => {
+    return this.peg.map((v: Val) => {
       return (v as any).isJunction && Array.isArray(v.peg) && 1 < v.peg.length ?
         '(' + v.canon + ')' : v.canon // v.id + '=' + v.canon
     }).join(this.getJunctionSymbol()) // + '<' + (this.mark.hide ? 'H' : '') + '>'
-    if (this.done) this._canonCache = c
-    return c
   }
 
   // Abstract method to be implemented by subclasses to define their junction symbol

package/src/val/KeyFuncVal.ts

@@ -18,6 +18,7 @@ import { ConjunctVal } from '../val/ConjunctVal'
 
 import { FuncBaseVal } from './FuncBaseVal'
 
+
 class KeyFuncVal extends FuncBaseVal {
   isKeyFunc = true
 
@@ -40,12 +41,14 @@ class KeyFuncVal extends FuncBaseVal {
 
 
   unify(peer: Val, ctx: AontuContext): Val {
+    // TODO: this delay makes keys in spreads and refs work, but it is a hack - find a better way.
     let out: Val = this
 
     if (ctx.cc < 3) {
       this.notdone()
 
       if (peer.isTop || (peer.id === this.id)) {
+        // TODO: clone needed to avoid triggering unify_cycle - find a better way
         out = this.clone(ctx)
       }
       else if (peer.isNil) {

package/src/val/ListVal.ts

@@ -9,6 +9,7 @@ import type {
 
 import {
   DONE,
+  SPREAD,
 } from '../type'
 
 import { AontuContext } from '../ctx'
@@ -29,6 +30,7 @@ import {
   top
 } from './top'
 
+import { ConjunctVal } from './ConjunctVal'
 import { NilVal } from './NilVal'
 import { BagVal } from './BagVal'
 import { empty } from './Val'
@@ -36,7 +38,6 @@ import { empty } from './Val'
 
 class ListVal extends BagVal {
   isList = true
-  _canonCache?: string
 
   constructor(
     spec: {
@@ -50,6 +51,24 @@ class ListVal extends BagVal {
       throw new AontuError('ListVal spec.peg undefined')
     }
 
+    let spread = (this.peg as any)[SPREAD]
+    delete (this.peg as any)[SPREAD]
+
+    if (spread) {
+      if ('&' === spread.o) {
+
+        // TODO: handle existing spread!
+        this.spread.cj =
+          Array.isArray(spread.v) ?
+            1 < spread.v.length ?
+              new ConjunctVal({ peg: spread.v }, ctx) :
+              spread.v[0] :
+            spread.v
+
+        // let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
+        // this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
+      }
+    }
   }
 
 
@@ -67,7 +86,8 @@ class ListVal extends BagVal {
     let out: ListVal | NilVal = (peer.isTop ? this : new ListVal({ peg: [] }, ctx))
 
     out.closed = this.closed
-    out.optionalKeys = 0 < this.optionalKeys.length ? [...this.optionalKeys] : this.optionalKeys
+    out.optionalKeys = [...this.optionalKeys]
+    out.spread.cj = this.spread.cj
     out.site = this.site
 
     if (peer instanceof ListVal) {
@@ -77,6 +97,13 @@ class ListVal extends BagVal {
       }
       else {
         out.closed = out.closed || peer.closed
+        out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
+          null == peer.spread.cj ? out.spread.cj : (
+            out.spread.cj =
+            unite(te ? ctx.clone({ explain: ec(te, 'SPR') }) : ctx,
+              out.spread.cj, peer.spread.cj, 'list-peer')
+          )
+        )
       }
     }
 
@@ -84,39 +111,29 @@ class ListVal extends BagVal {
     if (!exit) {
       out.dc = this.dc + 1
 
-      // Fast path: self-unify with TOP.
-      if (peer.isTop) {
-        let allChildrenDone = true
-        for (let key in this.peg) {
-          if (DONE !== this.peg[key]?.dc) {
-            allChildrenDone = false
-            break
-          }
-        }
-        if (allChildrenDone) {
-          out.dc = DONE
-          ctx.explain && explainClose(te, out)
-          return out
-        }
-      }
+      let spread_cj = out.spread.cj || TOP
 
-      // Unify own children
+      // Always unify children first
       for (let key in this.peg) {
         const keyctx = ctx.descend(key)
+        const key_spread_cj = spread_cj.spreadClone(keyctx)
         const child = this.peg[key]
 
         propagateMarks(this, child)
 
         out.peg[key] =
-          undefined === child ? top() :
+          undefined === child ? key_spread_cj :
             child.isNil ? child :
-              child.done ? child :
-                unite(te ? keyctx.clone({ explain: ec(te, 'PEG:' + key) }) : keyctx,
-                  child, top(), 'list-own')
+              key_spread_cj.isNil ? key_spread_cj :
+                key_spread_cj.isTop && child.done ? child :
+                  child.isTop && key_spread_cj.done ? key_spread_cj :
+                    unite(te ? keyctx.clone({ explain: ec(te, 'PEG:' + key) }) : keyctx,
+                      child, key_spread_cj, 'list-own')
 
         done = (done && DONE === out.peg[key].dc)
       }
 
+      const allowedKeys: string[] = this.closed ? Object.keys(this.peg) : []
       let bad: NilVal | undefined = undefined
 
       if (peer instanceof ListVal) {
@@ -124,10 +141,11 @@ class ListVal extends BagVal {
           te ? ctx.clone({ explain: ec(te, 'PER') }) : ctx,
           peer, TOP, 'list-peer-list') as ListVal)
 
+        // NOTE: peerkey is the index
         for (let peerkey in upeer.peg) {
           let peerchild = upeer.peg[peerkey]
 
-          if (this.closed && !(peerkey in this.peg)) {
+          if (this.closed && !allowedKeys.includes(peerkey)) {
             bad = makeNilErr(ctx, 'closed', peerchild, undefined)
           }
 
@@ -137,11 +155,19 @@ class ListVal extends BagVal {
 
           let oval = out.peg[peerkey] =
             undefined === child ? peerchild :
-                child.isTop && peerchild.done ? peerchild :
-                  child.isNil ? child :
-                    peerchild.isNil ? peerchild :
-                      unite(te ? peerctx.clone({ explain: ec(te, 'CHD') }) : peerctx,
-                        child, peerchild, 'list-peer')
+              child.isTop && peerchild.done ? peerchild :
+                child.isNil ? child :
+                  peerchild.isNil ? peerchild :
+                    unite(te ? peerctx.clone({ explain: ec(te, 'CHD') }) : peerctx,
+                      child, peerchild, 'list-peer')
+
+          if (this.spread.cj) {
+            let key_spread_cj = spread_cj.spreadClone(peerctx)
+
+            oval = out.peg[peerkey] =
+              unite(te ? peerctx.clone({ explain: ec(te, 'PSP:' + peerkey) }) : peerctx,
+                out.peg[peerkey], key_spread_cj, 'list-spread')
+          }
 
           propagateMarks(this, oval)
 
@@ -171,18 +197,39 @@ class ListVal extends BagVal {
   }
 
 
-  // Spread clone: share path-independent children directly, clone
-  // only path-dependent ones. See MapVal.spreadClone for rationale.
+  // Spread clone: only deep-clone children that are path-dependent
+  // (isFunc, isRef). Share all other children directly.
+  // Spread clone: when all children are ScalarKindVal (simple type
+  // constraints like `string`, `number`), share them directly to avoid
+  // N x M allocations. ScalarKindVal is safe to share: it is immutable,
+  // always done, never path-dependent, and never has marks mutated.
+  // For anything more complex, fall back to full deep clone.
   spreadClone(ctx: AontuContext): Val {
+    // B1: share directly when the spread tree has no path-dependent
+    // leaves. See MapVal.spreadClone for rationale.
     if (!this.isPathDependent) return this
 
+    let allScalarKind = true
+    for (let key in this.peg) {
+      if (!(this.peg[key] as any)?.isScalarKind) {
+        allScalarKind = false
+        break
+      }
+    }
+
+    if (!allScalarKind) {
+      return this.clone(ctx)
+    }
+
     let out = (super.clone(ctx) as ListVal)
 
     for (let entry of Object.entries(this.peg)) {
-      const child = entry[1] as Val
-      out.peg[entry[0]] = child?.isPathDependent
-        ? child.clone(ctx, { mark: {} })
-        : child
+      out.peg[entry[0]] = entry[1]
+    }
+
+    // Must create a new spread object to avoid mutating the original.
+    out.spread = {
+      cj: this.spread.cj ? this.spread.cj.spreadClone(ctx) : undefined,
     }
 
     out.closed = this.closed
@@ -198,6 +245,10 @@ class ListVal extends BagVal {
       out.peg[entry[0]] =
         (entry[1] as any)?.isVal ? (entry[1] as Val).clone(ctx, spec?.mark ? { mark: spec.mark } : {}) : entry[1]
     }
+    if (this.spread.cj) {
+      out.spread.cj = this.spread.cj.clone(ctx, spec?.mark ? { mark: spec.mark } : {})
+    }
+
     out.closed = this.closed
     out.optionalKeys = [...this.optionalKeys]
 
@@ -207,19 +258,18 @@ class ListVal extends BagVal {
 
 
   get canon() {
-    if (this._canonCache !== undefined) return this._canonCache
     // console.log('LISTVAL-CANON', this.optionalKeys)
     let keys = Object.keys(this.peg)
-    const c = '' +
+    return '' +
       // this.errcanon() +
       '[' +
+      (this.spread.cj ? '&:' + this.spread.cj.canon +
+        (0 < keys.length ? ',' : '') : '') +
       keys
         .map(k => this.optionalKeys.includes(k) ?
           k + '?:' + this.peg[k].canon :
           this.peg[k].canon).join(',') +
       ']'
-    if (this.done) this._canonCache = c
-    return c
   }
 }
 

package/src/val/MapVal.ts

@@ -8,6 +8,7 @@ import type {
 
 import {
   DONE,
+  SPREAD,
 } from '../type'
 
 import { AontuContext } from '../ctx'
@@ -27,13 +28,13 @@ import {
 } from './top'
 
 
+import { ConjunctVal } from './ConjunctVal'
 import { NilVal } from './NilVal'
 import { BagVal } from './BagVal'
 
 
 class MapVal extends BagVal {
   isMap = true
-  _canonCache?: string
 
   constructor(
     spec: ValSpec,
@@ -47,6 +48,23 @@ class MapVal extends BagVal {
 
     this.mark.type = !!spec.mark?.type
     this.mark.hide = !!spec.mark?.hide
+
+    let spread = (this.peg as any)[SPREAD]
+    delete (this.peg as any)[SPREAD]
+
+    if (spread) {
+      if ('&' === spread.o) {
+        // TODO: handle existing spread!
+        this.spread.cj =
+          Array.isArray(spread.v) ?
+            1 < spread.v.length ?
+              new ConjunctVal({ peg: spread.v }, ctx) :
+              spread.v[0] :
+            spread.v
+      }
+    }
+
+    // console.log('MAPVAL-ctor', this.type, spec)
   }
 
 
@@ -57,23 +75,6 @@ class MapVal extends BagVal {
 
     const TOP = top()
     peer = peer ?? TOP
-
-    // Fast path: both maps done, no spreads, peer's keys are a
-    // subset of this's keys with the same child references, and
-    // neither side has type/hide marks. No new information.
-    if (this.done && peer instanceof MapVal && peer.done
-        && !this.mark.type && !this.mark.hide
-        && !peer.mark.type && !peer.mark.hide) {
-      let canSkip = true
-      for (const k in peer.peg) {
-        if (this.peg[k] !== peer.peg[k]) {
-          canSkip = false
-          break
-        }
-      }
-      if (canSkip) return this
-    }
-
     const te = ctx.explain && explainOpen(ctx, ctx.explain, 'Map', this, peer)
 
     let done: boolean = true
@@ -83,7 +84,8 @@ class MapVal extends BagVal {
     let out: MapVal | NilVal = (peer.isTop ? this : new MapVal({ peg: {} }, ctx))
 
     out.closed = this.closed
-    out.optionalKeys = 0 < this.optionalKeys.length ? [...this.optionalKeys] : this.optionalKeys
+    out.optionalKeys = [...this.optionalKeys]
+    out.spread.cj = this.spread.cj
     out.site = this.site
 
     if (peer instanceof MapVal) {
@@ -106,47 +108,53 @@ class MapVal extends BagVal {
           out = peer.unify(this, te ? ctx.clone({ explain: ec(te, 'SPC') }) : ctx) as MapVal
           exit = true
         }
+
       }
+
+      if (!exit) {
+        out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
+          null == peer.spread.cj ? out.spread.cj : (
+            out.spread.cj =
+            unite(te ? ctx.clone({ explain: ec(te, 'SPR') }) : ctx,
+              out.spread.cj, peer.spread.cj, 'map-self')
+          )
+        )
+      }
+    }
+    else {
+      // console.log('MAPVAL-PEER-OTHER', this.id, this.canon, this.done, peer.id, peer.canon, peer.done)
     }
 
 
     if (!exit) {
       out.dc = this.dc + 1
 
-      // Fast path: self-unify with TOP.
-      // If all children are already done, the map is fully converged.
-      if (peer.isTop) {
-        let allChildrenDone = true
-        for (let key in this.peg) {
-          if (DONE !== this.peg[key]?.dc) {
-            allChildrenDone = false
-            break
-          }
-        }
-        if (allChildrenDone) {
-          out.dc = DONE
-          ctx.explain && explainClose(te, out)
-          return out
-        }
-      }
+      // let newtype = this.type || peer.type
+
+      let spread_cj = out.spread.cj ?? TOP
 
-      // Unify own children
+      // Always unify own children first
       for (let key in this.peg) {
-        const child = this.peg[key]
         const keyctx = ctx.descend(key)
 
+        const key_spread_cj = spread_cj.spreadClone(keyctx)
+        const child = this.peg[key]
+
         propagateMarks(this, child)
 
         out.peg[key] =
-          undefined === child ? top() :
+          undefined === child ? key_spread_cj :
             child.isNil ? child :
-              child.done ? child :
-                unite(te ? keyctx.clone({ explain: ec(te, 'KEY:' + key) }) : keyctx,
-                  child, top(), 'map-own')
+              key_spread_cj.isNil ? key_spread_cj :
+                key_spread_cj.isTop && child.done ? child :
+                  child.isTop && key_spread_cj.done ? key_spread_cj :
+                    unite(te ? keyctx.clone({ explain: ec(te, 'KEY:' + key) }) : keyctx,
+                      child, key_spread_cj, 'map-own')
 
         done = (done && DONE === out.peg[key].dc)
       }
 
+      const allowedKeys: string[] = this.closed ? Object.keys(this.peg) : []
       let bad: NilVal | undefined = undefined
 
       if (peer instanceof MapVal) {
@@ -157,14 +165,12 @@ class MapVal extends BagVal {
         for (let peerkey in upeer.peg) {
           let peerchild = upeer.peg[peerkey]
 
-          if (this.closed && !(peerkey in this.peg)) {
+          if (this.closed && !allowedKeys.includes(peerkey)) {
             bad = makeNilErr(ctx, 'closed', peerchild, undefined)
           }
 
           // key optionality is additive
-          if (0 < upeer.optionalKeys.length
-              && upeer.optionalKeys.includes(peerkey)
-              && !out.optionalKeys.includes(peerkey)) {
+          if (upeer.optionalKeys.includes(peerkey) && !out.optionalKeys.includes(peerkey)) {
             out.optionalKeys.push(peerkey)
           }
 
@@ -174,11 +180,19 @@ class MapVal extends BagVal {
 
           let oval = out.peg[peerkey] =
             undefined === child ? this.handleExpectedVal(peerkey, peerchild, this, ctx) :
-                child.isTop && peerchild.done ? peerchild :
-                  child.isNil ? child :
-                    peerchild.isNil ? peerchild :
-                      unite(te ? peerctx.clone({ explain: ec(te, 'CHD') }) : peerctx,
-                        child, peerchild, 'map-peer')
+              child.isTop && peerchild.done ? peerchild :
+                child.isNil ? child :
+                  peerchild.isNil ? peerchild :
+                    unite(te ? peerctx.clone({ explain: ec(te, 'CHD') }) : peerctx,
+                      child, peerchild, 'map-peer')
+
+          if (this.spread.cj) {
+            let key_spread_cj = spread_cj.spreadClone(peerctx)
+
+            oval = out.peg[peerkey] =
+              unite(te ? peerctx.clone({ explain: ec(te, 'PSP:' + peerkey) }) : peerctx,
+                oval, key_spread_cj, 'map-peer-spread')
+          }
 
           propagateMarks(this, oval)
 
@@ -199,41 +213,66 @@ class MapVal extends BagVal {
         out.dc = done ? DONE : out.dc
         propagateMarks(peer, out)
         propagateMarks(this, out)
-
       }
     }
 
+    // console.log(
+    //   'MAPVAL-OUT', out.canon,
+    //   '\n  SELF', this,
+    //   '\n  PEER', peer,
+    //   '\n  OUT', out,
+    //   '\n  FROM', (out as any).spread.cj
+    // )
+
     ctx.explain && explainClose(te, out)
 
     return out
   }
 
 
-  // Optimized clone for use as a spread constraint: share
-  // path-independent children, clone only path-dependent ones.
+  // Spread clone: return a Val usable as the per-key spread constraint.
+  //
+  // Three tiers:
+  //   1. tree is path-independent (no RefVal/KeyFuncVal/PathFuncVal/
+  //      MoveFuncVal/SuperFuncVal anywhere below): return `this` directly.
+  //      Nothing in the unify path mutates the spread root, and no
+  //      child depends on its own stored .path, so sharing is safe.
+  //   2. top-level children are all ScalarKindVal: shallow clone
+  //      (share children, fresh MapVal wrapper).
+  //   3. otherwise: full deep clone via `this.clone(ctx)`.
+  //
+  // Tier 1 handles the foo-sdk common case of simple type-constraint
+  // spreads like `&:{active: *true | boolean, version: *'0.0.1' | string}`,
+  // which are cloned thousands of times per run.
   spreadClone(ctx: AontuContext): Val {
     if (!this.isPathDependent) return this
 
+    let allScalarKind = true
+    for (let key in this.peg) {
+      if (!(this.peg[key] as any)?.isScalarKind) {
+        allScalarKind = false
+        break
+      }
+    }
+
+    if (!allScalarKind) {
+      return this.clone(ctx)
+    }
+
     let out = (super.clone(ctx) as MapVal)
     out.peg = {}
 
     for (let entry of Object.entries(this.peg)) {
-      const child = entry[1] as Val
-      if (child?.isVal && child.isPathDependent) {
-        out.peg[entry[0]] = child.clone(ctx, { path: [...out.path, entry[0]] })
-      }
-      else if (child?.isVal) {
-        const wrapper = Object.create(child)
-        wrapper.mark = { ...child.mark }
-        out.peg[entry[0]] = wrapper
-      }
-      else {
-        out.peg[entry[0]] = child
-      }
+      out.peg[entry[0]] = entry[1]
+    }
+
+    // Must create a new spread object to avoid mutating the original.
+    out.spread = {
+      cj: this.spread.cj ? this.spread.cj.spreadClone(ctx) : undefined,
     }
 
     out.closed = this.closed
-    out.optionalKeys = 0 < this.optionalKeys.length ? [...this.optionalKeys] : this.optionalKeys
+    out.optionalKeys = [...this.optionalKeys]
 
     return out
   }
@@ -246,25 +285,36 @@ class MapVal extends BagVal {
     for (let entry of Object.entries(this.peg)) {
       out.peg[entry[0]] =
         (entry[1] as any)?.isVal ?
+          // (entry[1] as Val).clone(ctx, spec?.mark ? { mark: spec.mark } : {}) :
           (entry[1] as Val).clone(ctx, {
             mark: spec?.mark ?? {},
             path: [...out.path, entry[0]]
           }) :
           entry[1]
     }
+    if (this.spread.cj) {
+      out.spread.cj = this.spread.cj.clone(ctx, spec?.mark ? { mark: spec.mark } : {})
+    }
 
     out.closed = this.closed
     out.optionalKeys = [...this.optionalKeys]
 
+    // out.from = this.from
+
+    // console.log('MAPVAL-CLONE', this.canon, '->', out.canon)
     return out
   }
 
 
   get canon() {
-    if (this._canonCache !== undefined) return this._canonCache
-    let keys = Object.keys(this.peg).sort()
-    const c = '' +
+    let keys = Object.keys(this.peg)
+    return '' +
+      // this.errcanon() +
+      // (this.mark.type ? '<type>' : '') +
+      // (this.id + '=') +
       '{' +
+      (this.spread.cj ? '&:' + this.spread.cj.canon +
+        (0 < keys.length ? ',' : '') : '') +
       keys
         .map(k => [
           JSON.stringify(k) +
@@ -273,19 +323,18 @@ class MapVal extends BagVal {
           (this.peg[k]?.canon ?? this.peg[k])
         ])
         .join(',') +
-      '}'
-    if (this.done) this._canonCache = c
-    return c
+      '}' // + '<' + (this.mark.hide ? 'H' : '') + '>'
+
   }
 
 
-  inspection(_d?: number) {
-    return ''
+  inspection(d?: number) {
+    return this.spread.cj ? '&:' + this.spread.cj.inspect(null == d ? 0 : d + 1) : ''
   }
 
 }
 
 
 export {
-  MapVal,
+  MapVal
 }