@weasel-js/routing 1.10.0 → 1.10.1

package/dist/{chunk-4DR6AJMN.js → chunk-VCEIQ64H.js}

@@ -282,6 +282,47 @@ function resolveParams(params) {
   return typeof params === "function" ? params() : params;
 }
 
+// src/interactions/actions/tuning.ts
+var WRAPS = /* @__PURE__ */ new WeakMap();
+function layered(under, over) {
+  if (typeof under !== "function" && typeof over !== "function") return { ...under, ...over };
+  return () => ({ ...resolveParams(under), ...resolveParams(over) });
+}
+function wrapInvoker(invoker, params) {
+  for (let w = invoker; w; w = WRAPS.get(w)?.inner) {
+    if (WRAPS.get(w)?.params === params) return invoker;
+  }
+  const base = (given) => ({ ...resolveParams(params), ...given });
+  const wrapped = invoker.timing === "immediate" ? { timing: "immediate", run: (deps, given) => invoker.run(deps, base(given)) } : {
+    timing: "ongoing",
+    start: (ctx, opts) => invoker.start(
+      ctx.params ? { ...ctx, params: base(ctx.params) } : ctx,
+      { ...opts, params: layered(params, opts?.params) }
+    )
+  };
+  WRAPS.set(wrapped, { inner: invoker, params });
+  return wrapped;
+}
+function withBindings(own, added) {
+  const base = own === void 0 ? [] : Array.isArray(own) ? own : [own];
+  return [...base, ...added.filter((b) => !base.includes(b))];
+}
+function tuneOnce(action, tuning) {
+  const invoker = tuning.params && action.invoker ? wrapInvoker(action.invoker, tuning.params) : action.invoker;
+  const bindings = tuning.bindings?.length ? withBindings(action.defaultBinding, tuning.bindings) : null;
+  if (invoker === action.invoker && bindings === null) return action;
+  return {
+    ...action,
+    ...invoker ? { invoker } : {},
+    ...bindings ? { defaultBinding: bindings } : {}
+  };
+}
+function tuneAction(action, tunings) {
+  let out = action;
+  for (const t of tunings) out = tuneOnce(out, t);
+  return out;
+}
+
 // src/interactions/actions/toolOffhand.ts
 var TOOL_OFFHAND_ID = "tool.offhand";
 function offhandKeyFor(trigger) {
@@ -301,8 +342,12 @@ function offhandKeyFor(trigger) {
   }
 }
 function buildToolOffhandBindings(specs) {
-  return specs.map(({ toolId, key }) => ({ spec: heldKeySpec(key), opts: { params: { toolId } } }));
+  return specs.map(({ toolId, key }) => ({
+    spec: { ...heldKeySpec(key), phase: BETWEEN_GESTURES },
+    opts: { params: { toolId } }
+  }));
 }
+var BETWEEN_GESTURES = [{ channel: "*", phase: "initial" }];
 function heldKeySpec(key) {
   const isModifier = [key].flat().some((k) => MODIFIER_KEYS.has(k));
   return { kind: "key-held", key, mods: { ...isModifier ? ANY_MODS : SHIFT_OR_ALT } };
@@ -409,6 +454,7 @@ function routeArgsForSpec(spec, fallback) {
   if ("key" in spec) return Array.isArray(spec.key) ? spec.key : [spec.key];
   if ("fingers" in spec) return [String(spec.fingers)];
   if ("direction" in spec) return [spec.direction ?? fallback];
+  if (spec.kind === "hover") return [spec.motion ?? fallback];
   if ("types" in spec) return [spec.types?.length ? spec.types.join("|") : fallback];
   return [fallback];
 }
@@ -1181,8 +1227,9 @@ function createInFlightGestures() {
     },
     cursor() {
       let cursor = null;
-      for (const action of actions.values()) {
-        const spec = action.activeCursor ?? action.cursor;
+      for (const [id, handle] of handles) {
+        const action = actions.get(id);
+        const spec = handle.cursor?.() ?? action?.activeCursor ?? action?.cursor;
         if (spec !== void 0 && resolveCursor(spec)) cursor = spec;
       }
       return cursor;
@@ -2144,6 +2191,6 @@ function dwarn(namespace, ...args) {
   console.warn(`[${namespace}]`, ...args);
 }
 
-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, assembleEntries, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatcher, createLongPressStore, depNodeOf, describeRule, dlog, dwarn, evaluate, evaluateActive, evaluateEnabled, findConflicts, heldKeySpec, historyKey, isDebugEnabled, isDev, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, multiTouchGestureId, offhandKeyFor, openPointerSession, pointerGestureId, publishLiveDispatch, pushOwner, recordModeSwitch, reportRouteConflicts, resolveDeviceProfile, resolveParams, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, targetConsultsAffordance, validateActionDefaultBinding, validateActionId };
-//# sourceMappingURL=chunk-4DR6AJMN.js.map
-//# sourceMappingURL=chunk-4DR6AJMN.js.map
+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, assembleEntries, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatcher, createLongPressStore, depNodeOf, describeRule, dlog, dwarn, evaluate, evaluateActive, evaluateEnabled, findConflicts, heldKeySpec, historyKey, isDebugEnabled, isDev, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, multiTouchGestureId, offhandKeyFor, openPointerSession, pointerGestureId, publishLiveDispatch, pushOwner, recordModeSwitch, reportRouteConflicts, resolveDeviceProfile, resolveParams, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, targetConsultsAffordance, tuneAction, validateActionDefaultBinding, validateActionId };
+//# sourceMappingURL=chunk-VCEIQ64H.js.map
+//# sourceMappingURL=chunk-VCEIQ64H.js.map