@weasel-js/routing 1.12.0 → 1.13.0

package/dist/{chunk-ARDHI47M.js → chunk-XVWEZTUX.js}

@@ -4,7 +4,7 @@ import { RESERVED_ID_PREFIXES, RESERVED_ID_NAMES, isApplePlatform, bindingSpec,
 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, prefValueAtPath } from '@weasel-js/prefs';
+import { isPrefLeaf, prefScopeIn, prefScopeUnder, prefConditionHolds, prefAliasTarget, prefLeafAt, prefAliasedLeaf, prefNumberAt, resolvePrefUnit, prefDisplayBounds, prefUnitAccepts, PREF_SCOPE, prefValueAtPath } from '@weasel-js/prefs';
 import { endlessAllows } from '@weasel-js/quantity';
 
 // src/interactions/actions/actionItems.ts
@@ -510,6 +510,122 @@ function overrideActionBindings(action, overrides) {
   return { ...action, defaultBinding: kept };
 }
 
+// src/interactions/dispatcher/inputFacts.ts
+function modifierStateOf(e) {
+  return { alt: e.altKey, ctrl: e.ctrlKey, meta: e.metaKey, shift: e.shiftKey };
+}
+function worldPointOf(event) {
+  switch (event.kind) {
+    case "pointerdown":
+    case "hover":
+    case "longpress":
+    case "click":
+    case "doubleclick":
+    case "contextmenu":
+      return event.x !== void 0 && event.y !== void 0 ? { x: event.x, y: event.y } : void 0;
+    case "carry":
+      return { x: event.x, y: event.y };
+    default:
+      return void 0;
+  }
+}
+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) {
+  switch (event.kind) {
+    case "wheel":
+      return {
+        deltaX: event.deltaX,
+        deltaY: event.deltaY,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        affordance: event.affordance,
+        ...resolved
+      };
+    case "pinch":
+      return {
+        scale: event.scale,
+        rotation: event.rotation,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        affordance: event.affordance,
+        ...resolved
+      };
+    case "click":
+    case "doubleclick":
+      return {
+        worldX: event.x,
+        worldY: event.y,
+        affordance: event.affordance,
+        // The press point too: an action that places geometry at the click wants it.
+        ...event.kind === "click" ? { pressX: event.pressX, pressY: event.pressY } : {},
+        mods: modifierStateOf(event),
+        ...resolved
+      };
+    // Only a `stage: 'press'` pointerdown reaches an immediate invoker: the
+    // buffered copy matches `drag` specs, which are ongoing.
+    case "contextmenu":
+      return {
+        worldX: event.x,
+        worldY: event.y,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        affordance: event.affordance,
+        bodyTarget: event.bodyTarget,
+        bodyKind: event.bodyKind,
+        mods: modifierStateOf(event),
+        ...resolved
+      };
+    case "pointerdown":
+    case "longpress":
+      return {
+        worldX: event.x,
+        worldY: event.y,
+        affordance: event.affordance,
+        bodyTarget: event.bodyTarget,
+        mods: modifierStateOf(event),
+        ...resolved
+      };
+    case "hover":
+      return {
+        worldX: event.x,
+        worldY: event.y,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        affordance: event.affordance,
+        bodyTarget: event.bodyTarget,
+        mods: modifierStateOf(event),
+        held: event.held === true,
+        ...resolved
+      };
+    case "carry":
+      return {
+        worldX: event.x,
+        worldY: event.y,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        carry: { type: event.type, value: event.value },
+        affordance: event.affordance,
+        bodyTarget: event.bodyTarget,
+        bodyKind: event.bodyKind,
+        mods: modifierStateOf(event),
+        ...resolved
+      };
+    case "drop":
+    case "paste":
+      return {
+        items: event.items,
+        via: event.kind,
+        ...event.kind === "drop" && event.x !== void 0 ? { worldX: event.x, worldY: event.y } : {},
+        ...resolved
+      };
+    default:
+      return resolved;
+  }
+}
+
 // src/interactions/actions/toolOffhand.ts
 var TOOL_OFFHAND_ID = "tool.offhand";
 function offhandKeyFor(trigger) {
@@ -1123,122 +1239,6 @@ function createDispatchTrace(limit, dev) {
   };
 }
 
-// src/interactions/dispatcher/inputFacts.ts
-function modifiersOf(e) {
-  return { alt: e.altKey, ctrl: e.ctrlKey, meta: e.metaKey, shift: e.shiftKey };
-}
-function worldPointOf(event) {
-  switch (event.kind) {
-    case "pointerdown":
-    case "hover":
-    case "longpress":
-    case "click":
-    case "doubleclick":
-    case "contextmenu":
-      return event.x !== void 0 && event.y !== void 0 ? { x: event.x, y: event.y } : void 0;
-    case "carry":
-      return { x: event.x, y: event.y };
-    default:
-      return void 0;
-  }
-}
-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) {
-  switch (event.kind) {
-    case "wheel":
-      return {
-        deltaX: event.deltaX,
-        deltaY: event.deltaY,
-        clientX: event.clientX,
-        clientY: event.clientY,
-        affordance: event.affordance,
-        ...resolved
-      };
-    case "pinch":
-      return {
-        scale: event.scale,
-        rotation: event.rotation,
-        clientX: event.clientX,
-        clientY: event.clientY,
-        affordance: event.affordance,
-        ...resolved
-      };
-    case "click":
-    case "doubleclick":
-      return {
-        worldX: event.x,
-        worldY: event.y,
-        affordance: event.affordance,
-        // The press point too: an action that places geometry at the click wants it.
-        ...event.kind === "click" ? { pressX: event.pressX, pressY: event.pressY } : {},
-        mods: modifiersOf(event),
-        ...resolved
-      };
-    // Only a `stage: 'press'` pointerdown reaches an immediate invoker: the
-    // buffered copy matches `drag` specs, which are ongoing.
-    case "contextmenu":
-      return {
-        worldX: event.x,
-        worldY: event.y,
-        clientX: event.clientX,
-        clientY: event.clientY,
-        affordance: event.affordance,
-        bodyTarget: event.bodyTarget,
-        bodyKind: event.bodyKind,
-        mods: modifiersOf(event),
-        ...resolved
-      };
-    case "pointerdown":
-    case "longpress":
-      return {
-        worldX: event.x,
-        worldY: event.y,
-        affordance: event.affordance,
-        bodyTarget: event.bodyTarget,
-        mods: modifiersOf(event),
-        ...resolved
-      };
-    case "hover":
-      return {
-        worldX: event.x,
-        worldY: event.y,
-        clientX: event.clientX,
-        clientY: event.clientY,
-        affordance: event.affordance,
-        bodyTarget: event.bodyTarget,
-        mods: modifiersOf(event),
-        held: event.held === true,
-        ...resolved
-      };
-    case "carry":
-      return {
-        worldX: event.x,
-        worldY: event.y,
-        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
-      };
-    case "drop":
-    case "paste":
-      return {
-        items: event.items,
-        via: event.kind,
-        ...event.kind === "drop" && event.x !== void 0 ? { worldX: event.x, worldY: event.y } : {},
-        ...resolved
-      };
-    default:
-      return resolved;
-  }
-}
-
 // src/interactions/dispatcher/ranking.ts
 function liveInView(binding, view) {
   const views = binding.opts?.views;
@@ -1358,7 +1358,7 @@ function buildDispatchRecord(r, walked, event, ctx, predicted, outcome) {
     input: {
       eventKind: event.kind,
       ...eventKey !== void 0 ? { key: eventKey } : {},
-      modifiers: modifiersOf(event),
+      modifiers: modifierStateOf(event),
       viewId: view,
       ...world !== void 0 ? { world } : {},
       ...r.ruleCtx !== void 0 ? { mode: r.ruleCtx.mode } : {}
@@ -2930,7 +2930,7 @@ function settingsOf(ctx, it, key, label, off, access) {
     root: settings.schema,
     read: (path, from) => from === "item" ? void 0 : values(path)
   };
-  const entries = state ? tidy(groupRows(form, settings.schema, "", false)) : [];
+  const entries = state ? tidy(groupRows(form, settings.schema, "", ROOT)) : [];
   return {
     kind: "submenu",
     key,
@@ -3087,21 +3087,27 @@ function leafRows(ctx, leaf, key, path, off) {
       return [];
   }
 }
-function groupRows(ctx, group, prefix, off) {
+var ROOT = { node: {}, scope: PREF_SCOPE, above: PREF_SCOPE };
+function groupRows(ctx, group, prefix, owner) {
+  const { read: read2 } = ctx;
+  const holds = (condition) => read2 === void 0 || prefConditionHolds(condition, read2);
   const out = [];
   for (const [k, node] of Object.entries(group.children)) {
     const path = prefix ? `${prefix}.${k}` : k;
-    if (ctx.read && !prefIsShown(node, ctx.read)) continue;
-    const disabled = off || ctx.read !== void 0 && !prefIsEnabled(node, ctx.read);
+    const sits = isPrefLeaf(node) ? prefScopeIn(owner, path, holds) : owner.scope;
+    const scope = prefScopeUnder(sits, node, holds);
+    if (!scope.shown) continue;
+    const disabled = !scope.enabled;
+    const inner = { node, scope, above: sits };
     if (isPrefLeaf(node)) {
       out.push(...leafRows(ctx, node, path, path, disabled));
     } else if (node.as !== void 0 && SUBMENU_AS.has(node.as)) {
-      const entries = tidy(groupRows(ctx, node, path, disabled));
+      const entries = tidy(groupRows(ctx, node, path, inner));
       if (entries.length) {
         out.push({ kind: "submenu", key: path, label: node.name, ...node.icon ? { icon: node.icon } : {}, ...withAccess(node.access), entries });
       }
     } else {
-      out.push(sep(`${path}/<`), ...groupRows(ctx, node, path, disabled), sep(`${path}/>`));
+      out.push(sep(`${path}/<`), ...groupRows(ctx, node, path, inner), sep(`${path}/>`));
     }
   }
   return out;
@@ -3125,7 +3131,7 @@ function resolveSchemaMenu(schema, src, at, params) {
     at,
     params
   };
-  return tidy(groupRows(ctx, schema, "", false));
+  return tidy(groupRows(ctx, schema, "", ROOT));
 }
 function resolveMenu(def, src, at, params) {
   return resolveSchemaMenu(def.menu, src, at, params);
@@ -3171,7 +3177,7 @@ function createMenuHost(src) {
         client: req.client,
         world: req.world,
         ...req.under ? { under: req.under } : {},
-        ...req.above ? { above: true } : {},
+        ...req.side ? { side: req.side } : {},
         source: req.source ?? "pointer"
       };
       emit();
@@ -3189,6 +3195,6 @@ function createMenuHost(src) {
   };
 }
 
-export { ALWAYS, ActionDisabledReason, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, DepNode, INGEST_STRING_MIMES, KEYMAP_HOLD, LONG_PRESS_HAPTIC_MS, NEVER, NO_OVERRIDES, PREDICATE_TARGET, ScopeNode, TOOL_OFFHAND_ID, actionBindings, actionCursor, actionItemTitle, actionItems, actionSettingsParams, actionShortcuts, addCarrySurface, admitIngestMime, anyBinding, assembleEntries, bindingId, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, carryGestureId, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatchTrace, createDispatcher, createKeymapStack, createLongPressStore, createMenuHost, createTraceRing, depNodeOf, describeKeymap, describeRule, dlog, dwarn, evaluate, evaluateActive, evaluateEnabled, findConflicts, heldKeySpec, historyKey, isDebugEnabled, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, keySpecShortcut, keymapContribution, keymapLeaderBindingId, keymapLeaderId, keymapShortcuts, keysHeld, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, mergeMenuDefs, multiTouchGestureId, offhandKeyFor, openPointerSession, overriddenBindings, overrideActionBindings, pickMenu, pointerGestureId, pushOwner, readActionSettings, reportRouteConflicts, resolveBindingOverrides, resolveDeviceProfile, resolveMenu, resolveParams, resolveSchemaMenu, roleReader, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, startCarry, targetConsultsAffordance, tuneAction, tunedParams, validateActionDefaultBinding, validateActionId };
-//# sourceMappingURL=chunk-ARDHI47M.js.map
-//# sourceMappingURL=chunk-ARDHI47M.js.map
+export { ALWAYS, ActionDisabledReason, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, DepNode, INGEST_STRING_MIMES, KEYMAP_HOLD, LONG_PRESS_HAPTIC_MS, NEVER, NO_OVERRIDES, PREDICATE_TARGET, ScopeNode, TOOL_OFFHAND_ID, actionBindings, actionCursor, actionItemTitle, actionItems, actionSettingsParams, actionShortcuts, addCarrySurface, admitIngestMime, anyBinding, assembleEntries, bindingId, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, carryGestureId, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatchTrace, createDispatcher, createKeymapStack, createLongPressStore, createMenuHost, createTraceRing, depNodeOf, describeKeymap, describeRule, dlog, dwarn, evaluate, evaluateActive, evaluateEnabled, findConflicts, heldKeySpec, historyKey, isDebugEnabled, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, keySpecShortcut, keymapContribution, keymapLeaderBindingId, keymapLeaderId, keymapShortcuts, keysHeld, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, mergeMenuDefs, modifierStateOf, multiTouchGestureId, offhandKeyFor, openPointerSession, overriddenBindings, overrideActionBindings, pickMenu, pointerGestureId, pushOwner, readActionSettings, reportRouteConflicts, resolveBindingOverrides, resolveDeviceProfile, resolveMenu, resolveParams, resolveSchemaMenu, roleReader, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, startCarry, targetConsultsAffordance, tuneAction, tunedParams, validateActionDefaultBinding, validateActionId };
+//# sourceMappingURL=chunk-XVWEZTUX.js.map
+//# sourceMappingURL=chunk-XVWEZTUX.js.map