@opentui/keymap 0.5.9 → 0.5.11

package/src/index.js

@@ -1,26 +1,25 @@
 // @bun
 import {
-  KEYMAP_EXTENSION_CONTEXT,
-  activeOptionsForCaptures,
-  advanceSequenceCapture,
-  buildSequenceTree,
-  captureHasContinuations,
-  captureIsExact,
-  capturePriority,
-  cloneKeySequence,
+  normalizeBindingTokenName,
   cloneKeyStroke,
-  collectRootSequenceCaptures,
   createKeySequencePart,
+  cloneKeySequence,
+  resolveKeyMatch,
   createTextKeyMatch,
-  getActiveLayersForFocused,
+  stringifyKeyStroke2,
+  stringifyKeySequence2,
   getFocusedTargetIfAvailable,
+  getActiveLayersForFocused,
   isLayerActiveForFocused,
-  normalizeBindingTokenName,
-  resolveKeyMatch,
-  stringifyKeySequence,
-  stringifyKeyStroke
-} from "../chunks/index-frk6sdcd.js";
-import"../chunks/index-p35cyhc4.js";
+  captureHasContinuations,
+  captureIsExact,
+  buildSequenceTree,
+  activeOptionsForCaptures,
+  capturePriority,
+  advanceSequenceCapture,
+  collectRootSequenceCaptures,
+  KEYMAP_EXTENSION_CONTEXT2
+} from "../chunks/index-7g381cth.js";
 
 // src/lib/runtime-utils.ts
 function createRuntimeEmitter(onError) {
@@ -371,7 +370,7 @@ function collectSequencePartsFromPending(pending) {
       }
     }
     if (display === undefined || hasDisplayConflict) {
-      display = stringifyKeyStroke(firstPart.stroke);
+      display = stringifyKeyStroke2(firstPart.stroke);
     }
     if (hasTokenConflict) {
       tokenName = undefined;
@@ -477,10 +476,10 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
     setPendingSequence({ captures: nextCaptures });
     return true;
   };
-  const getActiveKeys = (options2) => {
-    const includeBindings = options2?.includeBindings === true;
-    const includeMetadata = options2?.includeMetadata === true;
-    const cache = getActiveKeysCache(activeKeysCaches, options2);
+  const getActiveKeys = (options) => {
+    const includeBindings = options?.includeBindings === true;
+    const includeMetadata = options?.includeMetadata === true;
+    const cache = getActiveKeysCache(activeKeysCaches, options);
     if (cache.notifyVersion === state.derivedVersion) {
       return cache.value;
     }
@@ -513,16 +512,16 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
     }
     return activeKeys;
   };
-  const getActiveKeysForCaptures = (captures, options2) => {
-    const includeBindings = options2?.includeBindings === true;
-    const includeMetadata = options2?.includeMetadata === true;
+  const getActiveKeysForCaptures = (captures, options) => {
+    const includeBindings = options?.includeBindings === true;
+    const includeMetadata = options?.includeMetadata === true;
     const focused = getFocusedTarget();
     const activeView = catalog.getActiveCommandView(focused);
     return collectActiveKeysFromPending(captures, includeBindings, includeMetadata, focused, activeView);
   };
-  const getActiveKeysForFocused = (focused, options2) => {
-    const includeBindings = options2?.includeBindings === true;
-    const includeMetadata = options2?.includeMetadata === true;
+  const getActiveKeysForFocused = (focused, options) => {
+    const includeBindings = options?.includeBindings === true;
+    const includeMetadata = options?.includeMetadata === true;
     const currentFocused = getFocusedTargetIfAvailable2();
     const pending = focused === currentFocused ? ensureValidPendingSequence() : undefined;
     const activeView = catalog.getActiveCommandView(focused);
@@ -585,7 +584,7 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
     }
     if (display === undefined || hasDisplayConflict) {
       const stroke = bindings[0]?.sequence[partIndex]?.stroke;
-      display = stroke ? stringifyKeyStroke(stroke) : "";
+      display = stroke ? stringifyKeyStroke2(stroke) : "";
     }
     if (hasTokenConflict) {
       tokenName = undefined;
@@ -645,19 +644,19 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
   const selectActiveKeyNode = (node, includeBindings, focused, activeView) => {
     const continues = node.children.size > 0 || node.patternChildren.length > 0;
     if (!continues) {
-      const selected2 = selectActiveBindings(nodeExactBindingsNeedPrefilter(node) ? collectMatchingBindings(node.bindings, focused, activeView) : node.bindings, focused, activeView);
-      if (!selected2) {
+      const selected = selectActiveBindings(nodeExactBindingsNeedPrefilter(node) ? collectMatchingBindings(node.bindings, focused, activeView) : node.bindings, focused, activeView);
+      if (!selected) {
         return;
       }
-      const presentation2 = getPartPresentation(selected2.bindings, node.depth - 1);
+      const presentation = getPartPresentation(selected.bindings, node.depth - 1);
       return {
-        display: presentation2.display,
-        tokenName: presentation2.tokenName,
+        display: presentation.display,
+        tokenName: presentation.tokenName,
         continues: false,
-        firstBinding: selected2.bindings[0],
-        commandBinding: selected2.commandBinding,
-        bindings: includeBindings ? [...selected2.bindings] : undefined,
-        stop: selected2.stop
+        firstBinding: selected.bindings[0],
+        commandBinding: selected.commandBinding,
+        bindings: includeBindings ? [...selected.bindings] : undefined,
+        stop: selected.stop
       };
     }
     const reachableBindings = collectMatchingBindings(node.reachableBindings, focused, activeView);
@@ -693,14 +692,14 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
     collectActiveKeyOptions(activeOptionsForCaptures(captures, state.patterns), activeKeys, stopped, includeBindings, focused, activeView);
     return materializeActiveKeys(activeKeys, includeBindings, includeMetadata, focused, activeView);
   };
-  const collectActiveKeyOptions = (options2, activeKeys, stopped, includeBindings, focused, activeView) => {
+  const collectActiveKeyOptions = (options, activeKeys, stopped, includeBindings, focused, activeView) => {
     const seen = new Set;
-    for (const option of options2) {
+    for (const option of options) {
       if (seen.has(option.part.match)) {
         continue;
       }
       seen.add(option.part.match);
-      collectActiveKeyOption(option, options2, activeKeys, stopped, includeBindings, focused, activeView);
+      collectActiveKeyOption(option, options, activeKeys, stopped, includeBindings, focused, activeView);
     }
   };
   const collectActiveKeyOption = (option, siblingOptions, activeKeys, stopped, includeBindings, focused, activeView) => {
@@ -724,8 +723,8 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
   };
   const materializeActiveKeys = (activeKeys, includeBindings, includeMetadata, focused, activeView) => {
     const materialized = [];
-    for (const state2 of activeKeys.values()) {
-      const activeKey = materializeActiveKey(state2, includeBindings, includeMetadata, focused, activeView);
+    for (const state of activeKeys.values()) {
+      const activeKey = materializeActiveKey(state, includeBindings, includeMetadata, focused, activeView);
       if (activeKey) {
         materialized.push(activeKey);
       }
@@ -751,12 +750,12 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
       stop: continues || selected?.stop === true
     };
   };
-  const getOptionPresentation = (options2) => {
+  const getOptionPresentation = (options) => {
     let display;
     let tokenName;
     let hasDisplayConflict = false;
     let hasTokenConflict = false;
-    for (const option of options2) {
+    for (const option of options) {
       const part = option.part;
       if (display === undefined) {
         display = part.display;
@@ -770,9 +769,9 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
         hasTokenConflict = true;
       }
     }
-    const firstPart = options2[0]?.part;
+    const firstPart = options[0]?.part;
     if (display === undefined || hasDisplayConflict) {
-      display = firstPart ? stringifyKeyStroke(firstPart.stroke) : "";
+      display = firstPart ? stringifyKeyStroke2(firstPart.stroke) : "";
     }
     if (hasTokenConflict) {
       tokenName = undefined;
@@ -811,48 +810,48 @@ function createActivationService(state, host, hooks, notify, conditions, catalog
       bindings: includeBindings && selection.bindings ? [...selection.bindings] : undefined
     };
   };
-  const updateActiveKeyState = (state2, selection, includeBindings) => {
-    if (!state2.firstBinding && selection.firstBinding) {
-      state2.firstBinding = selection.firstBinding;
+  const updateActiveKeyState = (state, selection, includeBindings) => {
+    if (!state.firstBinding && selection.firstBinding) {
+      state.firstBinding = selection.firstBinding;
     }
-    if (!state2.commandBinding && selection.commandBinding) {
-      state2.commandBinding = selection.commandBinding;
+    if (!state.commandBinding && selection.commandBinding) {
+      state.commandBinding = selection.commandBinding;
     }
     if (selection.continues) {
-      state2.continues = true;
+      state.continues = true;
     }
     if (!includeBindings || !selection.bindings || selection.bindings.length === 0) {
       return;
     }
-    if (!state2.bindings) {
-      state2.bindings = [...selection.bindings];
+    if (!state.bindings) {
+      state.bindings = [...selection.bindings];
       return;
     }
-    state2.bindings.push(...selection.bindings);
+    state.bindings.push(...selection.bindings);
   };
-  const materializeActiveKey = (state2, includeBindings, includeMetadata, focused, activeView) => {
-    if (!state2.commandBinding && !state2.continues) {
+  const materializeActiveKey = (state, includeBindings, includeMetadata, focused, activeView) => {
+    if (!state.commandBinding && !state.continues) {
       return;
     }
     const activeKey = {
-      stroke: cloneKeyStroke(state2.stroke),
-      display: state2.display,
-      continues: state2.continues
+      stroke: cloneKeyStroke(state.stroke),
+      display: state.display,
+      continues: state.continues
     };
-    if (state2.tokenName) {
-      activeKey.tokenName = state2.tokenName;
+    if (state.tokenName) {
+      activeKey.tokenName = state.tokenName;
     }
-    if (state2.commandBinding) {
-      activeKey.command = state2.commandBinding.command;
+    if (state.commandBinding) {
+      activeKey.command = state.commandBinding.command;
     }
-    if (includeBindings && state2.bindings && state2.bindings.length > 0) {
-      activeKey.bindings = state2.bindings.length === 1 ? [toActiveBinding(state2.bindings[0], focused, activeView)] : collectActiveBindings(state2.bindings, focused, activeView);
+    if (includeBindings && state.bindings && state.bindings.length > 0) {
+      activeKey.bindings = state.bindings.length === 1 ? [toActiveBinding(state.bindings[0], focused, activeView)] : collectActiveBindings(state.bindings, focused, activeView);
     }
     if (includeMetadata) {
-      if (state2.firstBinding?.attrs) {
-        activeKey.bindingAttrs = state2.firstBinding.attrs;
+      if (state.firstBinding?.attrs) {
+        activeKey.bindingAttrs = state.firstBinding.attrs;
       }
-      const commandAttrs = state2.commandBinding ? catalog.getBindingCommandAttrs(state2.commandBinding, focused, activeView) : undefined;
+      const commandAttrs = state.commandBinding ? catalog.getBindingCommandAttrs(state.commandBinding, focused, activeView) : undefined;
       if (commandAttrs) {
         activeKey.commandAttrs = commandAttrs;
       }
@@ -1136,11 +1135,11 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
   const getResolvedCommandChain = (command, focused, execution) => {
     const view = getActiveCommandView2(focused);
     if (execution) {
-      const resolved2 = [];
+      const resolved = [];
       const chain = view.chainsByName.get(command);
       if (chain) {
         for (const entry of chain) {
-          resolved2.push({
+          resolved.push({
             target: entry.layer.target,
             command: entry.commandState.command,
             attrs: entry.commandState.attrs,
@@ -1148,11 +1147,11 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
           });
         }
       }
-      const fallback2 = resolveCommandWithResolversForMode(command, focused, { mode: "active", execution });
-      if (fallback2.resolved) {
-        resolved2.push(fallback2.resolved);
+      const fallback = resolveCommandWithResolversForMode(command, focused, { mode: "active", execution });
+      if (fallback.resolved) {
+        resolved.push(fallback.resolved);
       }
-      return { entries: resolved2.length > 0 ? resolved2 : undefined, hadError: fallback2.hadError };
+      return { entries: resolved.length > 0 ? resolved : undefined, hadError: fallback.hadError };
     }
     const resolved = [];
     for (const entry of view.chainsByName.get(command) ?? []) {
@@ -1246,23 +1245,23 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
   const activeCommandViewCanCache = () => {
     return state.activeCommandViewCacheBlockers === 0;
   };
-  const isBindingVisible = (binding, focused, activeView2) => {
+  const isBindingVisible = (binding, focused, activeView) => {
     if (binding.command === undefined || binding.run) {
       return true;
     }
     if (typeof binding.command !== "string") {
       return false;
     }
-    if (activeView2.reachableByName.has(binding.command)) {
+    if (activeView.reachableByName.has(binding.command)) {
       return true;
     }
     return getFallbackResolvedCommand(binding.command, focused, "active") !== undefined;
   };
-  const getBindingCommandAttrs = (binding, focused, activeView2) => {
+  const getBindingCommandAttrs = (binding, focused, activeView) => {
     if (typeof binding.command !== "string") {
       return;
     }
-    const active = activeView2.reachableByName.get(binding.command);
+    const active = activeView.reachableByName.get(binding.command);
     if (active) {
       return active.commandState.attrs;
     }
@@ -1270,7 +1269,7 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
     return fallback?.attrs;
   };
   const getCommandResolutionStatus = (command, layerCommands) => {
-    if (layerCommands?.some((state2) => state2.command.name === command) || getCommandView().chainsByName.has(command)) {
+    if (layerCommands?.some((state) => state.command.name === command) || getCommandView().chainsByName.has(command)) {
       return "resolved";
     }
     const lookup = resolveCommandWithResolversForMode(command, getFocusedTargetIfAvailable(host));
@@ -1297,8 +1296,8 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
     });
   };
   const getTopResolvedCommand = (command, focused) => {
-    const activeView2 = getActiveCommandView2(focused);
-    const active = activeView2.reachableByName.get(command);
+    const activeView = getActiveCommandView2(focused);
+    const active = activeView.reachableByName.get(command);
     if (active) {
       return {
         target: active.layer.target,
@@ -1419,16 +1418,16 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
       }
       return;
     }
-    const activeView2 = context.activeView;
-    if (!activeView2) {
+    const activeView = context.activeView;
+    if (!activeView) {
       return;
     }
-    for (const layer of activeView2.layers) {
+    for (const layer of activeView.layers) {
       if (layer.bindings.length === 0 || !conditions.matchesConditions(layer)) {
         continue;
       }
       for (const binding of layer.bindings) {
-        if (conditions.matchesConditions(binding) && isBindingVisible(binding, context.focused, activeView2)) {
+        if (conditions.matchesConditions(binding) && isBindingVisible(binding, context.focused, activeView)) {
           visit(binding);
         }
       }
@@ -1478,15 +1477,15 @@ function createCommandCatalogService(state, host, notify, conditions, options) {
     if (context.visibility === "registered") {
       return getCommandView().chainsByName.get(binding.command)?.[0]?.commandState.attrs;
     }
-    const activeView2 = context.activeView;
-    if (!activeView2) {
+    const activeView = context.activeView;
+    if (!activeView) {
       return;
     }
-    return getBindingCommandAttrs(binding, context.focused, activeView2);
+    return getBindingCommandAttrs(binding, context.focused, activeView);
   };
-  const resolveCommandWithResolversForMode = (command, focused, options2) => {
-    const mode = options2?.mode ?? "active";
-    const execution = options2?.execution ?? { input: command };
+  const resolveCommandWithResolversForMode = (command, focused, options) => {
+    const mode = options?.mode ?? "active";
+    const execution = options?.execution ?? { input: command };
     const lookup = resolveCommandWithResolvers(command, state.commandResolvers.values(), () => createCommandResolverContext(focused, mode, execution), (error) => {
       notify.emitError("command-resolver-error", error, `[Keymap] Error in command resolver for "${command}":`);
     });
@@ -2057,7 +2056,7 @@ function createCompilerService(state, notify, conditions, options) {
       tokens: state.tokens,
       patterns: state.patterns,
       layer: EMPTY_COMPILE_FIELDS,
-      parseObjectKey: (value, options2) => parseObjectKeyPart(value, options2)
+      parseObjectKey: (value, options) => parseObjectKeyPart(value, options)
     });
   };
   const parseKeySequence = (key) => {
@@ -2068,7 +2067,7 @@ function createCompilerService(state, notify, conditions, options) {
       tokens: state.tokens,
       patterns: state.patterns,
       layer: EMPTY_COMPILE_FIELDS,
-      parseObjectKey: (value, options2) => parseObjectKeyPart(value, options2)
+      parseObjectKey: (value, options) => parseObjectKeyPart(value, options)
     });
     for (const tokenName of parsed.unknownTokens) {
       options.warnUnknownToken(tokenName, key);
@@ -2078,8 +2077,8 @@ function createCompilerService(state, notify, conditions, options) {
     }
     return parsed.parts;
   };
-  const formatKey = (key, options2) => {
-    return stringifyKeySequence(parseKeySequence(key), options2);
+  const formatKey = (key, options) => {
+    return stringifyKeySequence2(parseKeySequence(key), options);
   };
   const compileBindings = (bindings, tokens, sourceTarget, sourceLayerOrder, compileFields) => {
     const bindingStates = [];
@@ -2108,7 +2107,7 @@ function createCompilerService(state, notify, conditions, options) {
             tokens,
             patterns: state.patterns,
             layer: compileFields,
-            parseObjectKey: (value, options2) => parseObjectKeyPart(value, options2)
+            parseObjectKey: (value, options) => parseObjectKeyPart(value, options)
           }) : {
             parts: [parseObjectKeyPart(expandedKey)],
             usedTokens: [],
@@ -2209,8 +2208,8 @@ function createCompilerService(state, notify, conditions, options) {
       hasTokenBindings
     };
   };
-  const parseObjectKeyPart = (key, options2) => {
-    return createKeySequencePart(key, options2);
+  const parseObjectKeyPart = (key, options) => {
+    return createKeySequencePart(key, options);
   };
   const normalizeBindingEvent = (event) => {
     if (event === undefined || event === "press") {
@@ -2242,7 +2241,7 @@ function createCompilerService(state, notify, conditions, options) {
               tokens,
               patterns: state.patterns,
               layer,
-              parseObjectKey: (value, options2) => parseObjectKeyPart(value, options2)
+              parseObjectKey: (value, options) => parseObjectKeyPart(value, options)
             });
           },
           add: (nextBinding) => {
@@ -2633,8 +2632,8 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
     cancelPendingDisambiguation();
   }
   function handleRawSequence(sequence) {
-    const hooks2 = state.rawHooks.entries();
-    if (hooks2.length === 0) {
+    const hooks = state.rawHooks.entries();
+    if (hooks.length === 0) {
       return false;
     }
     let stopped = false;
@@ -2644,7 +2643,7 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
         stopped = true;
       }
     };
-    for (const hook of hooks2) {
+    for (const hook of hooks) {
       try {
         hook.listener(context);
       } catch (error) {
@@ -2714,10 +2713,10 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
     });
   }
   function getKeyAfterHooks(release) {
-    const hooks2 = state.keyAfterHooks.entries();
-    for (const hook of hooks2) {
+    const hooks = state.keyAfterHooks.entries();
+    for (const hook of hooks) {
       if (hook.release === release) {
-        return hooks2;
+        return hooks;
       }
     }
     return;
@@ -2751,7 +2750,7 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
     }
     return current;
   }
-  function emitKeyAfter(hooks2, event, release, focused, outcome) {
+  function emitKeyAfter(hooks, event, release, focused, outcome) {
     const context = {
       event,
       eventType: release ? "release" : "press",
@@ -2777,7 +2776,7 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
         }
       }
     };
-    for (const hook of hooks2) {
+    for (const hook of hooks) {
       if (hook.release !== release) {
         continue;
       }
@@ -2815,7 +2814,7 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
     }
     const afterHooks = getKeyAfterHooks(release);
     const afterFocused = afterHooks ? activation.getFocusedTarget() : null;
-    const hooks2 = state.keyHooks.entries();
+    const hooks = state.keyHooks.entries();
     const context = {
       event,
       setData: (name, value) => {
@@ -2835,7 +2834,7 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
         }
       }
     };
-    for (const hook of hooks2) {
+    for (const hook of hooks) {
       if (hook.release !== release) {
         continue;
       }
@@ -2856,9 +2855,9 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
       }
     }
     if (release) {
-      const outcome2 = dispatchReleaseLayers(event);
+      const outcome = dispatchReleaseLayers(event);
       if (afterHooks) {
-        emitKeyAfter(afterHooks, event, release, afterFocused, outcome2);
+        emitKeyAfter(afterHooks, event, release, afterFocused, outcome);
       }
       return;
     }
@@ -2967,8 +2966,8 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
         if (hasHandledExact) {
           continue;
         }
-        const exactCaptures2 = collectExactCapturesForPrefix(advancedCaptures, capture);
-        const resolvedOutcome = tryResolvePendingAmbiguity(advancedCaptures, index, continuationCapturesForPrefix, exactCaptures2, event, focused, hasHandledExact);
+        const exactCaptures = collectExactCapturesForPrefix(advancedCaptures, capture);
+        const resolvedOutcome = tryResolvePendingAmbiguity(advancedCaptures, index, continuationCapturesForPrefix, exactCaptures, event, focused, hasHandledExact);
         if (resolvedOutcome) {
           return resolvedOutcome;
         }
@@ -3016,9 +3015,9 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
       }
       const layerContinuationCaptures = captures.filter((capture) => captureHasContinuations(capture, state.patterns, false));
       if (layerContinuationCaptures.length > 0) {
-        const exactCaptures2 = captures.filter((capture) => captureIsExact(capture, state.patterns));
+        const exactCaptures = captures.filter((capture) => captureIsExact(capture, state.patterns));
         const continuationCaptures = collectPendingCapturesFromRoot(activeLayers, index, matchKeys, event, focused);
-        const resolvedOutcome = tryResolveRootAmbiguity(activeLayers, index, matchKeys, continuationCaptures, exactCaptures2, event, focused);
+        const resolvedOutcome = tryResolveRootAmbiguity(activeLayers, index, matchKeys, continuationCaptures, exactCaptures, event, focused);
         if (resolvedOutcome) {
           return resolvedOutcome;
         }
@@ -3294,7 +3293,7 @@ function createDispatchService(state, notify, runtime, activation, conditions, e
     return pendingDisambiguation === pending;
   }
   function warnUnresolvedAmbiguity(sequence) {
-    const display = stringifyKeySequence(sequence, { preferDisplay: true });
+    const display = stringifyKeySequence2(sequence, { preferDisplay: true });
     notify.warnOnce(`unresolved-disambiguation:${display}`, "unresolved-disambiguation", { sequence: display }, `[Keymap] Ambiguous exact/prefix sequence "${display}" fell back to prefix handling because no disambiguation resolver resolved it`);
   }
   function collectPendingCapturesFromRoot(activeLayers, startIndex, matchKeys, event, focused) {
@@ -3564,10 +3563,10 @@ function registerToken(state, notify, compiler, layers, token) {
     if (current !== registeredToken) {
       return;
     }
-    const nextTokens2 = new Map(state.tokens);
-    nextTokens2.delete(normalizedToken);
+    const nextTokens = new Map(state.tokens);
+    nextTokens.delete(normalizedToken);
     try {
-      layers.applyTokenState(nextTokens2);
+      layers.applyTokenState(nextTokens);
     } catch (error) {
       notify.emitError("token-unregister-error", error, getErrorMessage(error, `Failed to unregister keymap token "${normalizedToken}"`));
     }
@@ -3807,7 +3806,7 @@ function createLayerService(state, notify, conditions, activation, options) {
     for (const transformer of transformers) {
       const next = transformer(current, {
         layer,
-        validateBindings: (bindings2) => validateBindings(bindings2)
+        validateBindings: (bindings) => validateBindings(bindings)
       });
       if (!next) {
         continue;
@@ -4264,7 +4263,7 @@ class Keymap {
       }));
     }
   }
-  [KEYMAP_EXTENSION_CONTEXT]() {
+  [KEYMAP_EXTENSION_CONTEXT2]() {
     return {
       state: this.#state,
       host: this.#host,
@@ -4497,11 +4496,11 @@ class Keymap {
   }
 }
 export {
-  stringifyKeyStroke,
-  stringifyKeySequence,
+  KEYMAP_EXTENSION_CONTEXT2 as KEYMAP_EXTENSION_CONTEXT,
   Keymap,
-  KEYMAP_EXTENSION_CONTEXT
+  stringifyKeySequence2 as stringifyKeySequence,
+  stringifyKeyStroke2 as stringifyKeyStroke
 };
 
-//# debugId=E1616C2DB5F874BD64756E2164756E21
+//# debugId=A921C8E17706FE5864756E2164756E21
 //# sourceMappingURL=index.js.map