@graphrefly/graphrefly 0.22.0 → 0.24.0

package/dist/core/index.d.cts

@@ -1,3 +1,3 @@
-export { A as Actor, C as COMPLETE, c as COMPLETE_MSG, d as COMPLETE_ONLY_BATCH, D as DATA, e as DEFAULT_ACTOR, f as DIRTY, g as DIRTY_MSG, h as DIRTY_ONLY_BATCH, i as DepRecord, E as ERROR, F as FnCtx, G as GlobalInspectorEvent, j as GlobalInspectorHook, k as GraphReFlyConfig, l as GuardAction, m as GuardDenied, n as GuardDeniedDetails, H as HashFn, I as INVALIDATE, o as INVALIDATE_MSG, p as INVALIDATE_ONLY_BATCH, M as Message, q as MessageContext, r as MessageTypeRegistration, s as MessageTypeRegistrationInput, t as Messages, N as Node, b as NodeActions, u as NodeCtx, v as NodeDescribeKind, w as NodeFn, x as NodeFnCleanup, y as NodeGuard, z as NodeImpl, B as NodeInspectorHook, J as NodeInspectorHookEvent, a as NodeOptions, K as NodeSink, L as NodeStatus, O as NodeTransportOptions, P as NodeVersionInfo, Q as OnMessageHandler, R as OnSubscribeHandler, S as PAUSE, T as PolicyAllow, U as PolicyDeny, V as PolicyRuleData, W as RESOLVED, X as RESOLVED_MSG, Y as RESOLVED_ONLY_BATCH, Z as RESUME, _ as START, $ as START_MSG, a0 as SubscribeContext, a1 as TEARDOWN, a2 as TEARDOWN_MSG, a3 as TEARDOWN_ONLY_BATCH, a4 as V0, a5 as V1, a6 as VersioningLevel, a7 as VersioningOptions, a8 as accessHintForGuard, a9 as advanceVersion, aa as configure, ab as createVersioning, ac as defaultConfig, ad as defaultHash, ae as isV1, af as node, ag as normalizeActor, ah as policy, ai as policyFromRules, aj as registerBuiltins } from '../node-C5UD5MGq.cjs';
-export { A as AutoTrackOptions, D as DerivedFn, a as DynamicFn, E as EffectFn, P as PipeOperator, b as ProducerFn, T as TrackFn, c as autoTrackNode, d as batch, e as derived, f as downWithBatch, g as dynamicNode, h as effect, j as isBatching, m as monotonicNs, p as pipe, k as producer, s as state, w as wallClockNs } from '../index-C9z6rU9P.cjs';
-export { D as DescribeDetail, a as DescribeField, b as DescribeNodeOutput, r as resolveDescribeFields } from '../meta--fr9sxRM.cjs';
+export { A as Actor, C as COMPLETE, c as COMPLETE_MSG, d as COMPLETE_ONLY_BATCH, D as DATA, e as DEFAULT_ACTOR, f as DIRTY, g as DIRTY_MSG, h as DIRTY_ONLY_BATCH, i as DepRecord, E as ERROR, F as FnCtx, G as GlobalInspectorEvent, j as GlobalInspectorHook, k as GraphReFlyConfig, l as GuardAction, m as GuardDenied, n as GuardDeniedDetails, H as HashFn, I as INVALIDATE, o as INVALIDATE_MSG, p as INVALIDATE_ONLY_BATCH, M as Message, q as MessageContext, r as MessageTypeRegistration, s as MessageTypeRegistrationInput, t as Messages, N as Node, b as NodeActions, u as NodeCtx, v as NodeDescribeKind, w as NodeFn, x as NodeFnCleanup, y as NodeGuard, z as NodeImpl, B as NodeInspectorHook, J as NodeInspectorHookEvent, a as NodeOptions, K as NodeSink, L as NodeStatus, O as NodeTransportOptions, P as NodeVersionInfo, Q as OnMessageHandler, R as OnSubscribeHandler, S as PAUSE, T as PolicyAllow, U as PolicyDeny, V as PolicyRuleData, W as RESOLVED, X as RESOLVED_MSG, Y as RESOLVED_ONLY_BATCH, Z as RESUME, _ as START, $ as START_MSG, a0 as SubscribeContext, a1 as TEARDOWN, a2 as TEARDOWN_MSG, a3 as TEARDOWN_ONLY_BATCH, a4 as V0, a5 as V1, a6 as VersioningLevel, a7 as VersioningOptions, a8 as accessHintForGuard, a9 as advanceVersion, aa as configure, ab as createVersioning, ac as defaultConfig, ad as defaultHash, ae as isV1, af as node, ag as normalizeActor, ah as policy, ai as policyFromRules, aj as registerBuiltins } from '../node-B-f-Lu-k.cjs';
+export { A as AutoTrackOptions, D as DerivedFn, a as DynamicFn, E as EffectFn, P as PipeOperator, b as ProducerFn, T as TrackFn, c as autoTrackNode, d as batch, e as derived, f as downWithBatch, g as dynamicNode, h as effect, j as isBatching, m as monotonicNs, p as pipe, k as producer, s as state, w as wallClockNs } from '../index-BJB7t9gg.cjs';
+export { D as DescribeDetail, a as DescribeField, b as DescribeNodeOutput, r as resolveDescribeFields } from '../meta-DWbkoq1s.cjs';

package/dist/core/index.d.ts

@@ -1,3 +1,3 @@
-export { A as Actor, C as COMPLETE, c as COMPLETE_MSG, d as COMPLETE_ONLY_BATCH, D as DATA, e as DEFAULT_ACTOR, f as DIRTY, g as DIRTY_MSG, h as DIRTY_ONLY_BATCH, i as DepRecord, E as ERROR, F as FnCtx, G as GlobalInspectorEvent, j as GlobalInspectorHook, k as GraphReFlyConfig, l as GuardAction, m as GuardDenied, n as GuardDeniedDetails, H as HashFn, I as INVALIDATE, o as INVALIDATE_MSG, p as INVALIDATE_ONLY_BATCH, M as Message, q as MessageContext, r as MessageTypeRegistration, s as MessageTypeRegistrationInput, t as Messages, N as Node, b as NodeActions, u as NodeCtx, v as NodeDescribeKind, w as NodeFn, x as NodeFnCleanup, y as NodeGuard, z as NodeImpl, B as NodeInspectorHook, J as NodeInspectorHookEvent, a as NodeOptions, K as NodeSink, L as NodeStatus, O as NodeTransportOptions, P as NodeVersionInfo, Q as OnMessageHandler, R as OnSubscribeHandler, S as PAUSE, T as PolicyAllow, U as PolicyDeny, V as PolicyRuleData, W as RESOLVED, X as RESOLVED_MSG, Y as RESOLVED_ONLY_BATCH, Z as RESUME, _ as START, $ as START_MSG, a0 as SubscribeContext, a1 as TEARDOWN, a2 as TEARDOWN_MSG, a3 as TEARDOWN_ONLY_BATCH, a4 as V0, a5 as V1, a6 as VersioningLevel, a7 as VersioningOptions, a8 as accessHintForGuard, a9 as advanceVersion, aa as configure, ab as createVersioning, ac as defaultConfig, ad as defaultHash, ae as isV1, af as node, ag as normalizeActor, ah as policy, ai as policyFromRules, aj as registerBuiltins } from '../node-C5UD5MGq.js';
-export { A as AutoTrackOptions, D as DerivedFn, a as DynamicFn, E as EffectFn, P as PipeOperator, b as ProducerFn, T as TrackFn, c as autoTrackNode, d as batch, e as derived, f as downWithBatch, g as dynamicNode, h as effect, j as isBatching, m as monotonicNs, p as pipe, k as producer, s as state, w as wallClockNs } from '../index-HdJx_BjO.js';
-export { D as DescribeDetail, a as DescribeField, b as DescribeNodeOutput, r as resolveDescribeFields } from '../meta-n3FoVWML.js';
+export { A as Actor, C as COMPLETE, c as COMPLETE_MSG, d as COMPLETE_ONLY_BATCH, D as DATA, e as DEFAULT_ACTOR, f as DIRTY, g as DIRTY_MSG, h as DIRTY_ONLY_BATCH, i as DepRecord, E as ERROR, F as FnCtx, G as GlobalInspectorEvent, j as GlobalInspectorHook, k as GraphReFlyConfig, l as GuardAction, m as GuardDenied, n as GuardDeniedDetails, H as HashFn, I as INVALIDATE, o as INVALIDATE_MSG, p as INVALIDATE_ONLY_BATCH, M as Message, q as MessageContext, r as MessageTypeRegistration, s as MessageTypeRegistrationInput, t as Messages, N as Node, b as NodeActions, u as NodeCtx, v as NodeDescribeKind, w as NodeFn, x as NodeFnCleanup, y as NodeGuard, z as NodeImpl, B as NodeInspectorHook, J as NodeInspectorHookEvent, a as NodeOptions, K as NodeSink, L as NodeStatus, O as NodeTransportOptions, P as NodeVersionInfo, Q as OnMessageHandler, R as OnSubscribeHandler, S as PAUSE, T as PolicyAllow, U as PolicyDeny, V as PolicyRuleData, W as RESOLVED, X as RESOLVED_MSG, Y as RESOLVED_ONLY_BATCH, Z as RESUME, _ as START, $ as START_MSG, a0 as SubscribeContext, a1 as TEARDOWN, a2 as TEARDOWN_MSG, a3 as TEARDOWN_ONLY_BATCH, a4 as V0, a5 as V1, a6 as VersioningLevel, a7 as VersioningOptions, a8 as accessHintForGuard, a9 as advanceVersion, aa as configure, ab as createVersioning, ac as defaultConfig, ad as defaultHash, ae as isV1, af as node, ag as normalizeActor, ah as policy, ai as policyFromRules, aj as registerBuiltins } from '../node-B-f-Lu-k.js';
+export { A as AutoTrackOptions, D as DerivedFn, a as DynamicFn, E as EffectFn, P as PipeOperator, b as ProducerFn, T as TrackFn, c as autoTrackNode, d as batch, e as derived, f as downWithBatch, g as dynamicNode, h as effect, j as isBatching, m as monotonicNs, p as pipe, k as producer, s as state, w as wallClockNs } from '../index-C-TXEa7C.js';
+export { D as DescribeDetail, a as DescribeField, b as DescribeNodeOutput, r as resolveDescribeFields } from '../meta-CnkLA_43.js';

package/dist/core/index.js

@@ -1,7 +1,7 @@
-import "../chunk-RHI3GHZW.js";
+import "../chunk-QOWVNWOC.js";
 import {
   resolveDescribeFields
-} from "../chunk-TH6COGOP.js";
+} from "../chunk-H4RVA4VE.js";
 import {
   COMPLETE,
   COMPLETE_MSG,
@@ -52,7 +52,7 @@ import {
   registerBuiltins,
   state,
   wallClockNs
-} from "../chunk-QA3RP5NH.js";
+} from "../chunk-5DJTTKX3.js";
 export {
   COMPLETE,
   COMPLETE_MSG,

package/dist/extra/index.cjs

@@ -210,9 +210,20 @@ var flushInProgress = false;
 var drainPhase2 = [];
 var drainPhase3 = [];
 var drainPhase4 = [];
+var flushHooks = [];
 function isBatching() {
   return batchDepth > 0 || flushInProgress;
 }
+function isExplicitlyBatching() {
+  return batchDepth > 0;
+}
+function registerBatchFlushHook(hook) {
+  if (batchDepth > 0) {
+    flushHooks.push(hook);
+  } else {
+    hook();
+  }
+}
 function batch(fn) {
   batchDepth += 1;
   let threw = false;
@@ -226,6 +237,13 @@ function batch(fn) {
     if (batchDepth === 0) {
       if (threw) {
         if (!flushInProgress) {
+          const hooks = flushHooks.splice(0);
+          for (const h of hooks) {
+            try {
+              h();
+            } catch {
+            }
+          }
           drainPhase2.length = 0;
           drainPhase3.length = 0;
           drainPhase4.length = 0;
@@ -242,7 +260,18 @@ function drainPending() {
   const errors = [];
   let iterations = 0;
   try {
-    while (drainPhase2.length > 0 || drainPhase3.length > 0 || drainPhase4.length > 0) {
+    while (drainPhase2.length > 0 || drainPhase3.length > 0 || drainPhase4.length > 0 || ownsFlush && flushHooks.length > 0) {
+      if (ownsFlush && flushHooks.length > 0) {
+        const hooks = flushHooks.splice(0);
+        for (const h of hooks) {
+          try {
+            h();
+          } catch (e) {
+            errors.push(e);
+          }
+        }
+        continue;
+      }
       iterations += 1;
       if (iterations > MAX_DRAIN_ITERATIONS) {
         drainPhase2.length = 0;
@@ -900,6 +929,22 @@ var NodeImpl = class _NodeImpl {
    * treats `0` as "wave settled" — O(1) check for full dep settlement.
    */
   _dirtyDepCount = 0;
+  // --- Per-batch emit accumulator (Bug 2: K+1 fan-in fix) ---
+  /**
+   * Inside an explicit `batch(() => ...)` scope, every `_emit` accumulates
+   * its already-framed messages here instead of dispatching synchronously.
+   * At batch end, `_flushBatchPending` runs (registered via
+   * `registerBatchFlushHook`) and delivers the whole accumulated batch as
+   * one `downWithBatch` call — collapsing what would otherwise be K
+   * separate sink invocations into one. This is the fix for the diamond
+   * fan-in K+1 over-fire.
+   *
+   * `null` outside batch (or after flush). Only ever appended to within
+   * a single explicit batch lifetime; reset to `null` on flush. State
+   * updates (cache, version, status) still happen per-emit via
+   * `_updateState` — only the downstream delivery is coalesced.
+   */
+  _batchPendingMessages = null;
   // --- PAUSE/RESUME lock tracking (C0) ---
   /**
    * Set of active pause locks held against this node. Every `[PAUSE, lockId]`
@@ -1277,7 +1322,10 @@ var NodeImpl = class _NodeImpl {
         dep.unsub = noopUnsub;
         dep.unsub = dep.node.subscribe((msgs) => {
           if (dep.unsub === null) return;
+          const tierOf = this._config.tierOf;
+          let sawSettlement = false;
           for (const m of msgs) {
+            if (tierOf(m[0]) >= 3) sawSettlement = true;
             this._config.onMessage(
               this,
               m,
@@ -1285,6 +1333,7 @@ var NodeImpl = class _NodeImpl {
               this._actions
             );
           }
+          if (sawSettlement) this._maybeRunFnOnSettlement();
         });
         subscribedCount++;
       }
@@ -1339,7 +1388,10 @@ var NodeImpl = class _NodeImpl {
     try {
       record.unsub = depNode.subscribe((msgs) => {
         if (record.unsub === null) return;
+        const tierOf = this._config.tierOf;
+        let sawSettlement = false;
         for (const m of msgs) {
+          if (tierOf(m[0]) >= 3) sawSettlement = true;
           this._config.onMessage(
             this,
             m,
@@ -1347,6 +1399,7 @@ var NodeImpl = class _NodeImpl {
             this._actions
           );
         }
+        if (sawSettlement) this._maybeRunFnOnSettlement();
       });
     } catch (err) {
       record.unsub = null;
@@ -1468,7 +1521,6 @@ var NodeImpl = class _NodeImpl {
       }
       return;
     }
-    this._maybeRunFnOnSettlement();
   }
   // --- Centralized dep-state transitions (A3 settlement counters) ---
   //
@@ -1714,37 +1766,35 @@ var NodeImpl = class _NodeImpl {
   // --- Emit pipeline ---
   /**
    * @internal The unified dispatch waist — one call = one wave.
+   * See `GRAPHREFLY-SPEC.md` §1.3.1 for protocol context — the stages
+   * below are the implementation order.
    *
    * Pipeline stages, in order:
    *
-   *   1. Early-return on empty batch.
-   *   2. Terminal filter — post-COMPLETE/ERROR only TEARDOWN/INVALIDATE
+   *   1. Terminal filter — post-COMPLETE/ERROR only TEARDOWN/INVALIDATE
    *      still propagate so graph teardown and cache-clear still work.
-   *   3. Tier sort (stable) — the batch can be in any order when it
+   *   2. Tier sort (stable) — the batch can be in any order when it
    *      arrives; the walker downstream (`downWithBatch`) assumes
    *      ascending tier monotone, and so does `_updateState`'s tier-3
    *      slice walk. This is the single source of truth for ordering.
-   *   4. Synthetic DIRTY prefix — if a tier-3 payload is present, no
+   *   3. Synthetic DIRTY prefix — if a tier-3 payload is present, no
    *      DIRTY is already in the batch, and the node isn't already in
    *      `"dirty"` status, prepend `[DIRTY]` after any tier-0 START
    *      entries. Guarantees spec §1.3.1 (DIRTY precedes DATA within
    *      the same batch) uniformly across every entry point.
-   *   5. PAUSE/RESUME lock bookkeeping (C0) — update `_pauseLocks`,
+   *   4. PAUSE/RESUME lock bookkeeping (C0) — update `_pauseLocks`,
    *      derive `_paused`, filter unknown-lockId RESUME, replay
    *      bufferAll buffer on final lock release.
-   *   6. Meta TEARDOWN fan-out — notify meta children before
+   *   5. Meta TEARDOWN fan-out — notify meta children before
    *      `_updateState`'s TEARDOWN branch calls `_deactivate`. Hoisted
    *      out of the walk to keep `_updateState` re-entrance-free.
-   *   7. `_updateState` — walk the batch in tier order, advancing
+   *   6. `_updateState` — walk the batch in tier order, advancing
    *      `_cached` / `_status` / `_versioning` and running equals
    *      substitution on tier-3 DATA (§3.5.1). Returns
    *      `{finalMessages, equalsError?}`.
-   *   8. `downWithBatch` dispatch (or bufferAll capture if paused with
+   *   7. `downWithBatch` dispatch (or bufferAll capture if paused with
    *      `pausable: "resumeAll"`).
-   *   9. Recursive ERROR emission if equals threw mid-walk.
-   *
-   * `node.down` / `node.emit` / `actions.down` / `actions.emit` all
-   * converge here — the unified `_emit` waist (spec §1.3.1).
+   *   8. Recursive ERROR emission if equals threw mid-walk.
    */
   _emit(messages) {
     if (messages.length === 0) return;
@@ -1840,10 +1890,10 @@ var NodeImpl = class _NodeImpl {
           }
         }
         if (immediate.length > 0) {
-          downWithBatch(this._deliverToSinks, immediate, tierOf);
+          this._dispatchOrAccumulate(immediate);
         }
       } else {
-        downWithBatch(this._deliverToSinks, finalMessages, this._config.tierOf);
+        this._dispatchOrAccumulate(finalMessages);
       }
     }
     if (equalsError != null) {
@@ -1966,6 +2016,50 @@ var NodeImpl = class _NodeImpl {
     const snapshot = [...this._sinks];
     for (const sink of snapshot) sink(messages);
   };
+  /**
+   * @internal Dispatch entry point that respects the per-batch emit
+   * accumulator (Bug 2). Inside an explicit `batch()` scope, append to
+   * `_batchPendingMessages` and register a flush hook on first append.
+   * Outside batch — or during a drain (where `flushInProgress` is true
+   * but `batchDepth` is 0) — dispatch synchronously through `downWithBatch`.
+   *
+   * Per-emit state updates (`_frameBatch`, `_updateState`) have already
+   * happened by the time we reach here; only the **downstream delivery**
+   * is coalesced. Cache, version, and status are visible mid-batch on
+   * the emitting node itself.
+   */
+  _dispatchOrAccumulate(messages) {
+    if (isExplicitlyBatching()) {
+      if (this._batchPendingMessages === null) {
+        this._batchPendingMessages = [];
+        registerBatchFlushHook(() => this._flushBatchPending());
+      }
+      for (const m of messages) this._batchPendingMessages.push(m);
+      return;
+    }
+    downWithBatch(this._deliverToSinks, messages, this._config.tierOf);
+  }
+  /**
+   * @internal Flushes the accumulated batch through `downWithBatch` and
+   * clears the pending state. Idempotent — safe to call when pending is
+   * already null or empty (e.g. on a `batch()` throw, where the hook
+   * fires for cleanup but the drainPhase queues are wiped after).
+   *
+   * Critical: the accumulated batch is interleaved per-emit framings like
+   * `[DIRTY, DATA(1), DIRTY, DATA(2)]` — non-monotone tier order. We must
+   * re-frame to sort by tier before handing to `downWithBatch`, which
+   * assumes pre-sorted input. `_frameBatch` also handles the synthetic
+   * DIRTY prepend rule (no-op here — `hasDirty` is true since each
+   * accumulated emit already carries its own DIRTY prefix).
+   */
+  _flushBatchPending() {
+    const pending = this._batchPendingMessages;
+    if (pending === null) return;
+    this._batchPendingMessages = null;
+    if (pending.length === 0) return;
+    const framed = this._frameBatch(pending);
+    downWithBatch(this._deliverToSinks, framed, this._config.tierOf);
+  }
 };
 var isNodeArray = (value) => Array.isArray(value);
 var isNodeOptionsObject = (value) => typeof value === "object" && value != null && !Array.isArray(value);