@weasel-js/routing 1.11.0 → 1.11.1

package/dist/{chunk-QBQQIFPI.js → chunk-KLBH7VFF.js}

@@ -4,7 +4,7 @@ import { RESERVED_ID_PREFIXES, RESERVED_ID_NAMES, isApplePlatform, routeGestureF
 export { GESTURE_DESCRIPTORS, LONG_PRESS_MS, RESERVED_ID_NAMES, RESERVED_ID_PREFIXES, ROUTE_FIELD_DEFINITIONS, ROUTE_TERMS, activatesFocusedControl, canonicalModifiers, collapseShiftPairs, describeRoute, describeRouteParts, focusedControlOwnsKey, formatPhaseAtom, formatRoute, getGestureDescriptor, isEditableTarget, isKnownGestureName, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, parseRoute, routeGestureForSpecKind, specKindForRouteGesture, specificity } from '@weasel-js/gestures';
 import { activeModeOf, NORMAL, DEFAULT_MODES, capabilitiesAllowed } from '@weasel-js/modes';
 import { resolveCursor } from '@weasel-js/cursor';
-import { prefIsShown, prefIsEnabled, isPrefLeaf, prefAliasTarget, prefLeafAt, prefAliasedLeaf, prefNumberAt, resolvePrefUnit, prefDisplayBounds, prefUnitAccepts } from '@weasel-js/prefs';
+import { prefIsShown, prefIsEnabled, isPrefLeaf, prefAliasTarget, prefLeafAt, prefAliasedLeaf, prefNumberAt, resolvePrefUnit, prefDisplayBounds, prefUnitAccepts, prefValueAtPath } from '@weasel-js/prefs';
 import { endlessAllows } from '@weasel-js/quantity';
 
 // src/interactions/actions/actionItems.ts
@@ -34,6 +34,21 @@ function actionItemTitle(item) {
   return `${item.action.label}: ${item.label}`;
 }
 
+// src/interactions/actions/actionSettings.ts
+var EMPTY = { values: {} };
+function readActionSettings(action, deps) {
+  const settings = action.settings;
+  if (!settings) return null;
+  try {
+    return settings.read(deps ?? {});
+  } catch {
+    return EMPTY;
+  }
+}
+function actionSettingsParams(settings, path, value) {
+  return settings.params ? settings.params(path, value) : { [path]: value };
+}
+
 // src/interactions/actions/binding.ts
 function actionBindings(action) {
   const gs = action.defaultBinding;
@@ -270,13 +285,21 @@ var DepNode = class extends ScopeNode {
       };
     },
     get: (name) => {
+      const stacks = [...this.start().chain()].map((n) => n.sources.get(name) ?? []);
+      return readFrom(stacks, 0, (stacks[0]?.length ?? 0) - 1);
+    },
+    subscribe: (listener) => this.tree.listeners.subscribe(listener),
+    list: () => {
+      const found = /* @__PURE__ */ new Map();
+      let depth = 0;
       for (const n of this.start().chain()) {
-        const source = n.sources.get(name)?.at(-1);
-        if (source) return source();
+        for (const [name, stack] of n.sources) {
+          if (!found.has(name)) found.set(name, { name, depth, stacked: stack.length });
+        }
+        depth++;
       }
-      return void 0;
+      return [...found.values()].sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
     },
-    subscribe: (listener) => this.tree.listeners.subscribe(listener),
     changed: () => this.changed()
   };
   constructor(parent, descends) {
@@ -284,6 +307,11 @@ var DepNode = class extends ScopeNode {
     NODES.set(this.registry, this);
   }
 };
+function readFrom(stacks, scope, index) {
+  if (scope >= stacks.length) return void 0;
+  if (index < 0) return readFrom(stacks, scope + 1, (stacks[scope + 1]?.length ?? 0) - 1);
+  return stacks[scope][index](() => readFrom(stacks, scope, index - 1));
+}
 var NODES = /* @__PURE__ */ new WeakMap();
 function depNodeOf(registry) {
   return registry ? NODES.get(registry) ?? null : null;
@@ -520,7 +548,8 @@ function routesForSpec(spec) {
   const phases = phaseAtomsForSpec("phase" in spec ? spec.phase : void 0);
   const target = descriptor.hasTarget ? routeTargetForSpec("target" in spec ? spec.target : void 0) ?? "*" : void 0;
   const args = descriptor.arg ? routeArgsForSpec(spec, descriptor.arg.default) : [void 0];
-  return args.map((arg) => formatRoute({ phases, gesture, arg, target, modifiers }));
+  const held = spec.kind === "hover" && spec.held !== void 0 ? { held: spec.held === true ? "required" : "optional" } : {};
+  return args.map((arg) => formatRoute({ phases, gesture, arg, target, modifiers, ...held }));
 }
 function entryFor(ownerId, spec, actionId) {
   const gesture = routeGestureForSpecKind(spec.kind);
@@ -671,11 +700,11 @@ function matchSortedWithBarred(e, bindings, isMac, engagedChannels, opts = {}) {
     const scopeBarred = [];
     for (const sb of bindings) {
       if (sb.scope !== scope) continue;
-      const admitted = admits(sb);
-      if (!admitted && !opts.collectBarred) continue;
+      const admitted2 = admits(sb);
+      if (!admitted2 && !opts.collectBarred) continue;
       const phaseCtx = { selfChannel: sb.ownerId, engagedChannels: engaged };
       if (matchSpec(e, sb.binding.spec, isMac, phaseCtx)) {
-        (admitted ? scopeMatches : scopeBarred).push({ binding: sb.binding, scope, ownerId: sb.ownerId });
+        (admitted2 ? scopeMatches : scopeBarred).push({ binding: sb.binding, scope, ownerId: sb.ownerId });
       }
     }
     scopeMatches.sort((a, b) => compareSpecificity(a.binding.spec, b.binding.spec));
@@ -933,33 +962,14 @@ function buildRuleCtx(args) {
     device: args.device
   };
 }
-var DEV2 = isDev();
-var TRACE_LIMIT = 200;
-var traceLog = DEV2 && typeof window !== "undefined" ? window.__weaselDispatchLog__ ??= [] : [];
-function recordTrace(entry) {
-  if (!DEV2) return;
-  traceLog.push(entry);
-  if (traceLog.length > TRACE_LIMIT) traceLog.shift();
-}
-function publishLiveDispatch(explain2) {
-  if (!DEV2 || typeof window === "undefined") return;
-  window.__weaselDispatchLive__ = explain2;
-}
-function recordModeSwitch(mode, from, to, detail) {
-  recordTrace({
-    kind: "mode",
-    ts: Date.now(),
-    mode,
-    from,
-    to,
-    ...detail !== void 0 ? { detail } : {}
-  });
-}
 
 // src/interactions/dispatcher/gestureIds.ts
 function pointerGestureId(pointerId) {
   return `pointer-${pointerId ?? "mouse"}`;
 }
+function carryGestureId(pointerId) {
+  return `carry-${pointerId ?? "mouse"}`;
+}
 function multiTouchGestureId(fingers) {
   return `multitouch-${fingers}`;
 }
@@ -977,7 +987,7 @@ function gestureIdFor(event) {
     return multiTouchGestureId(event.fingers);
   }
   if (event.kind === "carry") {
-    return `carry-${event.pointerId ?? "mouse"}`;
+    return carryGestureId(event.pointerId);
   }
   return `ongoing-${event.kind}`;
 }
@@ -1022,6 +1032,51 @@ function assembleEntries(entries, inputs) {
     }
   };
 }
+function createTraceRing(limit = 200, dev = isDev()) {
+  const entries = [];
+  const pushed = createEmitter();
+  let total = 0;
+  let watchers = 0;
+  const recording = () => dev || watchers > 0;
+  return {
+    recording,
+    push(entry) {
+      if (!recording()) return;
+      entries.push(entry);
+      if (entries.length > limit) entries.shift();
+      total++;
+      pushed.emit();
+    },
+    since(cursor) {
+      const first = total - entries.length;
+      return { entries: entries.slice(Math.max(cursor, first) - first), cursor: total };
+    },
+    watch() {
+      watchers++;
+      let released = false;
+      return () => {
+        if (released) return;
+        released = true;
+        watchers--;
+      };
+    },
+    subscribe: pushed.subscribe
+  };
+}
+function createDispatchTrace(limit, dev) {
+  const ring = createTraceRing(limit, dev);
+  let explain2 = null;
+  return {
+    ...ring,
+    recordModeSwitch(mode, from, to, detail) {
+      ring.push({ kind: "mode", ts: Date.now(), mode, from, to, ...detail !== void 0 ? { detail } : {} });
+    },
+    setLive(next) {
+      explain2 = next;
+    },
+    live: () => explain2?.() ?? null
+  };
+}
 
 // src/interactions/dispatcher/inputFacts.ts
 function modifiersOf(e) {
@@ -1043,6 +1098,7 @@ function worldPointOf(event) {
   }
 }
 function carriedBy(event) {
+  if (event.kind === "carry") return { items: [], carry: { type: event.type, value: event.value } };
   return event.kind === "drop" || event.kind === "paste" ? { items: event.items } : void 0;
 }
 function immediateParams(event, resolved) {
@@ -1109,6 +1165,7 @@ function immediateParams(event, resolved) {
         affordance: event.affordance,
         bodyTarget: event.bodyTarget,
         mods: modifiersOf(event),
+        held: event.held === true,
         ...resolved
       };
     case "carry":
@@ -1118,6 +1175,9 @@ function immediateParams(event, resolved) {
         clientX: event.clientX,
         clientY: event.clientY,
         carry: { type: event.type, value: event.value },
+        affordance: event.affordance,
+        bodyTarget: event.bodyTarget,
+        bodyKind: event.bodyKind,
         mods: modifiersOf(event),
         ...resolved
       };
@@ -1139,6 +1199,10 @@ function liveInView(binding, view) {
   const views = binding.opts?.views;
   return views === void 0 || views.includes(view);
 }
+function liveForKeys(binding, reach) {
+  if (reach === void 0) return true;
+  return binding.opts?.over ? reach.over : reach.held;
+}
 function namesView(binding, view) {
   return binding.opts?.views?.includes(view) ?? false;
 }
@@ -1557,7 +1621,7 @@ function pumpCarry(run, event) {
   if (event.stage === "enter") return void 0;
   const gestureId = gestureIdFor(event);
   const handle = run.inFlight.handles.get(gestureId);
-  if (!handle) return event.stage === "drop" ? void 0 : "unhandled";
+  if (!handle) return event.stage === "leave" ? "unhandled" : void 0;
   if (event.stage === "move") {
     handle.onMove?.(ctxFor(run, event, {}, gestureId));
     return "handled";
@@ -1566,7 +1630,7 @@ function pumpCarry(run, event) {
 }
 function carryStageFits(event, timing) {
   if (event.kind !== "carry") return true;
-  return event.stage === (timing === "immediate" ? "drop" : "enter");
+  return timing === "immediate" ? event.stage === "drop" : event.stage === "enter" || event.stage === "move";
 }
 function invokeAction(run, event, match, action, deps) {
   if (action.invoker && !carryStageFits(event, action.invoker.timing)) return "empty-handle";
@@ -1696,16 +1760,20 @@ function assembleScopedBindings(ctx) {
     ...allowedCapabilities ? { allowedCapabilities } : {}
   });
   const view = ctx.viewId ?? null;
-  const result = scopeBindings(ordered, state).filter((sb) => liveInView(sb.binding, view));
+  const live = (b) => liveInView(b, view) && liveForKeys(b, ctx.keyReach);
+  const result = scopeBindings(ordered, state).filter((sb) => live(sb.binding));
   for (const action of ctx.actions.list()) {
     const targetScope = action.scope === "hotkey" ? "hotkey" : "ambient";
     for (const binding of actionBindings(action)) {
-      if (!liveInView(binding, view)) continue;
+      if (!live(binding)) continue;
       result.push({ binding, scope: targetScope, ownerId: null });
     }
   }
   return result;
 }
+function anyBinding(ctx, test) {
+  return assembleScopedBindings(ctx).some((sb) => test(sb.binding.spec));
+}
 function buildActionMap(registry) {
   const map = /* @__PURE__ */ new Map();
   for (const action of registry.list()) {
@@ -1893,10 +1961,11 @@ function createDispatcher(opts) {
     const pumped = pumpGesture(run, event);
     if (pumped !== void 0) return pumped;
     if (event.kind === "hover") return hover(event, ctx);
-    const r = rank(event, ctx, inFlight.engagedOwners(), DEV2);
+    const trace = ctx.trace?.recording() ? ctx.trace : null;
+    const r = rank(event, ctx, inFlight.engagedOwners(), trace !== null);
     const walked = walk(r, event, ctx, invoking(event), false);
     const outcome = walked.stop === "fired" ? "handled" : "unhandled";
-    if (DEV2) recordTrace(buildDispatchRecord(r, walked, event, ctx, false, outcome));
+    trace?.push(buildDispatchRecord(r, walked, event, ctx, false, outcome));
     return outcome;
   }
   function hover(event, ctx) {
@@ -2333,6 +2402,20 @@ function normalizeMime(raw) {
   const bare = raw.split(";")[0].trim().toLowerCase();
   return bare || FALLBACK_MIME;
 }
+var admitted = /* @__PURE__ */ new Map();
+function admitIngestMime(mime) {
+  const key = normalizeMime(mime);
+  admitted.set(key, (admitted.get(key) ?? 0) + 1);
+  let released = false;
+  return () => {
+    if (released) return;
+    released = true;
+    const n = (admitted.get(key) ?? 1) - 1;
+    if (n > 0) admitted.set(key, n);
+    else admitted.delete(key);
+  };
+}
+var keepsString = (mime) => INGEST_STRING_MIMES.has(mime) || admitted.has(mime);
 function itemsFromFiles(files) {
   return files.map((file) => ({ kind: "file", mime: normalizeMime(file.type), file }));
 }
@@ -2346,7 +2429,7 @@ function itemsFromDataTransfer(dt) {
       if (file) files.push({ kind: "file", mime: normalizeMime(file.type), file });
     } else if (item.kind === "string") {
       const mime = normalizeMime(item.type);
-      if (INGEST_STRING_MIMES.has(mime)) {
+      if (keepsString(mime)) {
         const slot = strings.length;
         strings.push(null);
         reads.push(
@@ -2372,7 +2455,7 @@ function itemTypesFromDataTransfer(dt) {
   for (const item of Array.from(dt.items ?? [])) {
     const mime = item.type ? normalizeMime(item.type) : "";
     if (item.kind === "file") mimes.push(mime && mime !== "application/x-moz-file" ? mime : UNKNOWN_MIME);
-    else if (INGEST_STRING_MIMES.has(mime)) mimes.push(mime);
+    else if (keepsString(mime)) mimes.push(mime);
   }
   if (mimes.length === 0 && Array.from(dt.types ?? []).includes("Files")) mimes.push(UNKNOWN_MIME);
   return mimes.map((mime) => ({ mime }));
@@ -2382,7 +2465,7 @@ function itemsFromClipboardData(cd) {
   for (const file of Array.from(cd.files ?? [])) {
     out.push({ kind: "file", mime: normalizeMime(file.type), file });
   }
-  for (const mime of INGEST_STRING_MIMES) {
+  for (const mime of /* @__PURE__ */ new Set([...INGEST_STRING_MIMES, ...admitted.keys()])) {
     const text = cd.getData(mime);
     if (text) out.push({ kind: "string", mime, text });
   }
@@ -2473,6 +2556,7 @@ var sep = (key) => ({ kind: "separator", key });
 function itemOf(ctx, it, key, label, off, access) {
   const deps = ctx.src.depsFor(it.action);
   const point = ctx.at ? { worldX: ctx.at.x, worldY: ctx.at.y } : {};
+  if (it.action.settings) return settingsOf(ctx, it, key, label, off || !evaluateEnabled(it.action, deps, ctx.at).enabled, access);
   return {
     kind: "item",
     key,
@@ -2487,6 +2571,32 @@ function itemOf(ctx, it, key, label, off, access) {
     }
   };
 }
+function settingsOf(ctx, it, key, label, off, access) {
+  const settings = it.action.settings;
+  const state = off ? null : readActionSettings(it.action, ctx.src.depsFor(it.action));
+  const mixed = new Set(state?.mixed ?? []);
+  const values = (path) => mixed.has(path) ? void 0 : prefValueAtPath(state?.values, path);
+  const onChange = (path, value) => {
+    const params = actionSettingsParams(settings, path, value);
+    if (params) ctx.src.trigger(it.action.id, { ...ctx.params, ...it.params, ...params });
+  };
+  const form = {
+    ...ctx,
+    src: { ...ctx.src, values, onChange, over: settings.schema },
+    root: settings.schema,
+    read: (path, from) => from === "item" ? void 0 : values(path)
+  };
+  const entries = state ? tidy(groupRows(form, settings.schema, "", false)) : [];
+  return {
+    kind: "submenu",
+    key,
+    label,
+    ...it.icon ? { icon: it.icon } : {},
+    ...withAccess(access),
+    ...entries.length === 0 ? { disabled: true } : {},
+    entries
+  };
+}
 function itemsNamed(ctx, name) {
   const action = ctx.byId.get(name);
   if (action) return actionItems(action);
@@ -2584,9 +2694,23 @@ function colorRows(ctx, leaf, key, path, off) {
   if (!ctx.src.values) return [];
   return [{ kind: "color", key, label: leaf.name, ...withAccess(leaf.access), ...off ? { disabled: true } : {}, value: textAt(ctx, path) }];
 }
-function stringRows(ctx, leaf, key, path) {
-  if (!ctx.src.values) return [];
-  return [{ kind: "item", key, label: `${leaf.name}: ${textAt(ctx, path) ?? "\u2014"}`, ...withAccess(leaf.access), disabled: true, run: noop }];
+function stringRows(ctx, leaf, key, path, off) {
+  const { values, onChange } = ctx.src;
+  if (!values) return [];
+  if (leaf.readout || !onChange) {
+    return [{ kind: "item", key, label: `${leaf.name}: ${textAt(ctx, path) ?? "\u2014"}`, ...withAccess(leaf.access), disabled: true, run: noop }];
+  }
+  const stored = values(path);
+  return [{
+    kind: "text",
+    key,
+    label: leaf.name,
+    ...withAccess(leaf.access),
+    ...leaf.icon ? { icon: leaf.icon } : {},
+    ...off ? { disabled: true } : {},
+    value: typeof stored === "string" ? stored : void 0,
+    set: (text) => onChange(path, text)
+  }];
 }
 function leafRows(ctx, leaf, key, path, off) {
   switch (leaf.kind) {
@@ -2605,7 +2729,7 @@ function leafRows(ctx, leaf, key, path, off) {
     case "color":
       return colorRows(ctx, leaf, key, path, off);
     case "string":
-      return stringRows(ctx, leaf, key, path);
+      return stringRows(ctx, leaf, key, path, off);
     case "separator":
       return [sep(key)];
     case "label":
@@ -2720,6 +2844,6 @@ function createMenuHost(src) {
   };
 }
 
-export { ALWAYS, ActionDisabledReason, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, DEV2 as DEV, DepNode, INGEST_STRING_MIMES, LONG_PRESS_HAPTIC_MS, NEVER, PREDICATE_TARGET, ScopeNode, TOOL_OFFHAND_ID, actionBindings, actionCursor, actionItemTitle, actionItems, actionShortcuts, addCarrySurface, assembleEntries, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatcher, createLongPressStore, createMenuHost, depNodeOf, describeRule, dlog, dwarn, evaluate, evaluateActive, evaluateEnabled, findConflicts, gestureIdFor, heldKeySpec, historyKey, isDebugEnabled, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, keySpecShortcut, keysHeld, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, mergeMenuDefs, multiTouchGestureId, offhandKeyFor, openPointerSession, pickMenu, pointerGestureId, publishLiveDispatch, pushOwner, recordModeSwitch, reportRouteConflicts, resolveDeviceProfile, resolveMenu, resolveParams, resolveSchemaMenu, roleReader, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, startCarry, targetConsultsAffordance, tuneAction, tunedParams, validateActionDefaultBinding, validateActionId };
-//# sourceMappingURL=chunk-QBQQIFPI.js.map
-//# sourceMappingURL=chunk-QBQQIFPI.js.map
+export { ALWAYS, ActionDisabledReason, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, DepNode, INGEST_STRING_MIMES, LONG_PRESS_HAPTIC_MS, NEVER, PREDICATE_TARGET, ScopeNode, TOOL_OFFHAND_ID, actionBindings, actionCursor, actionItemTitle, actionItems, actionSettingsParams, actionShortcuts, addCarrySurface, admitIngestMime, anyBinding, assembleEntries, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, carryGestureId, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatchTrace, createDispatcher, createLongPressStore, createMenuHost, createTraceRing, depNodeOf, describeRule, dlog, dwarn, evaluate, evaluateActive, evaluateEnabled, findConflicts, heldKeySpec, historyKey, isDebugEnabled, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, keySpecShortcut, keysHeld, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, mergeMenuDefs, multiTouchGestureId, offhandKeyFor, openPointerSession, pickMenu, pointerGestureId, pushOwner, readActionSettings, reportRouteConflicts, resolveDeviceProfile, resolveMenu, resolveParams, resolveSchemaMenu, roleReader, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, startCarry, targetConsultsAffordance, tuneAction, tunedParams, validateActionDefaultBinding, validateActionId };
+//# sourceMappingURL=chunk-KLBH7VFF.js.map
+//# sourceMappingURL=chunk-KLBH7VFF.js.map