blockly 12.0.0-beta.5 → 12.0.0-beta.6

package/core/keyboard_nav/flyout_button_navigation_policy.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { FlyoutButton } from '../flyout_button.js';
-import type { INavigable } from '../interfaces/i_navigable.js';
+import { FlyoutButton } from '../flyout_button.js';
+import type { IFocusableNode } from '../interfaces/i_focusable_node.js';
 import type { INavigationPolicy } from '../interfaces/i_navigation_policy.js';
 /**
  * Set of rules controlling keyboard navigation from a flyout button.
@@ -16,27 +16,41 @@ export declare class FlyoutButtonNavigationPolicy implements INavigationPolicy<F
      * @param _current The FlyoutButton instance to navigate from.
      * @returns Null.
      */
-    getFirstChild(_current: FlyoutButton): INavigable<unknown> | null;
+    getFirstChild(_current: FlyoutButton): IFocusableNode | null;
     /**
      * Returns the parent workspace of the given flyout button.
      *
      * @param current The FlyoutButton instance to navigate from.
      * @returns The given flyout button's parent workspace.
      */
-    getParent(current: FlyoutButton): INavigable<unknown> | null;
+    getParent(current: FlyoutButton): IFocusableNode | null;
     /**
      * Returns null since inter-item navigation is done by FlyoutNavigationPolicy.
      *
      * @param _current The FlyoutButton instance to navigate from.
      * @returns Null.
      */
-    getNextSibling(_current: FlyoutButton): INavigable<unknown> | null;
+    getNextSibling(_current: FlyoutButton): IFocusableNode | null;
     /**
      * Returns null since inter-item navigation is done by FlyoutNavigationPolicy.
      *
      * @param _current The FlyoutButton instance to navigate from.
      * @returns Null.
      */
-    getPreviousSibling(_current: FlyoutButton): INavigable<unknown> | null;
+    getPreviousSibling(_current: FlyoutButton): IFocusableNode | null;
+    /**
+     * Returns whether or not the given flyout button can be navigated to.
+     *
+     * @param current The instance to check for navigability.
+     * @returns True if the given flyout button can be focused.
+     */
+    isNavigable(current: FlyoutButton): boolean;
+    /**
+     * Returns whether the given object can be navigated from by this policy.
+     *
+     * @param current The object to check if this policy applies to.
+     * @returns True if the object is a FlyoutButton.
+     */
+    isApplicable(current: any): current is FlyoutButton;
 }
 //# sourceMappingURL=flyout_button_navigation_policy.d.ts.map

package/core/keyboard_nav/flyout_navigation_policy.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { IFlyout } from '../interfaces/i_flyout.js';
-import type { INavigable } from '../interfaces/i_navigable.js';
+import type { IFocusableNode } from '../interfaces/i_focusable_node.js';
 import type { INavigationPolicy } from '../interfaces/i_navigation_policy.js';
 /**
  * Generic navigation policy that navigates between items in the flyout.
@@ -25,27 +25,41 @@ export declare class FlyoutNavigationPolicy<T> implements INavigationPolicy<T> {
      * @param _current The flyout item to navigate from.
      * @returns Null to prevent navigating into flyout items.
      */
-    getFirstChild(_current: T): INavigable<unknown> | null;
+    getFirstChild(_current: T): IFocusableNode | null;
     /**
      * Returns the parent of the given flyout item.
      *
      * @param current The flyout item to navigate from.
      * @returns The parent of the given flyout item.
      */
-    getParent(current: T): INavigable<unknown> | null;
+    getParent(current: T): IFocusableNode | null;
     /**
      * Returns the next item in the flyout relative to the given item.
      *
      * @param current The flyout item to navigate from.
      * @returns The flyout item following the given one.
      */
-    getNextSibling(current: T): INavigable<unknown> | null;
+    getNextSibling(current: T): IFocusableNode | null;
     /**
      * Returns the previous item in the flyout relative to the given item.
      *
      * @param current The flyout item to navigate from.
      * @returns The flyout item preceding the given one.
      */
-    getPreviousSibling(current: T): INavigable<unknown> | null;
+    getPreviousSibling(current: T): IFocusableNode | null;
+    /**
+     * Returns whether or not the given flyout item can be navigated to.
+     *
+     * @param current The instance to check for navigability.
+     * @returns True if the given flyout item can be focused.
+     */
+    isNavigable(current: T): boolean;
+    /**
+     * Returns whether the given object can be navigated from by this policy.
+     *
+     * @param current The object to check if this policy applies to.
+     * @returns True if the object is a BlockSvg.
+     */
+    isApplicable(current: any): current is T;
 }
 //# sourceMappingURL=flyout_navigation_policy.d.ts.map

package/core/keyboard_nav/flyout_separator_navigation_policy.d.ts

@@ -3,17 +3,31 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { FlyoutSeparator } from '../flyout_separator.js';
-import type { INavigable } from '../interfaces/i_navigable.js';
+import { FlyoutSeparator } from '../flyout_separator.js';
+import type { IFocusableNode } from '../interfaces/i_focusable_node.js';
 import type { INavigationPolicy } from '../interfaces/i_navigation_policy.js';
 /**
  * Set of rules controlling keyboard navigation from a flyout separator.
  * This is a no-op placeholder, since flyout separators can't be navigated to.
  */
 export declare class FlyoutSeparatorNavigationPolicy implements INavigationPolicy<FlyoutSeparator> {
-    getFirstChild(_current: FlyoutSeparator): INavigable<unknown> | null;
-    getParent(_current: FlyoutSeparator): INavigable<unknown> | null;
-    getNextSibling(_current: FlyoutSeparator): INavigable<unknown> | null;
-    getPreviousSibling(_current: FlyoutSeparator): INavigable<unknown> | null;
+    getFirstChild(_current: FlyoutSeparator): IFocusableNode | null;
+    getParent(_current: FlyoutSeparator): IFocusableNode | null;
+    getNextSibling(_current: FlyoutSeparator): IFocusableNode | null;
+    getPreviousSibling(_current: FlyoutSeparator): IFocusableNode | null;
+    /**
+     * Returns whether or not the given flyout separator can be navigated to.
+     *
+     * @param _current The instance to check for navigability.
+     * @returns False.
+     */
+    isNavigable(_current: FlyoutSeparator): boolean;
+    /**
+     * Returns whether the given object can be navigated from by this policy.
+     *
+     * @param current The object to check if this policy applies to.
+     * @returns True if the object is a FlyoutSeparator.
+     */
+    isApplicable(current: any): current is FlyoutSeparator;
 }
 //# sourceMappingURL=flyout_separator_navigation_policy.d.ts.map

package/core/keyboard_nav/line_cursor.d.ts

@@ -12,39 +12,21 @@
  * @author aschmiedt@google.com (Abby Schmiedt)
  */
 import { BlockSvg } from '../block_svg.js';
-import type { INavigable } from '../interfaces/i_navigable.js';
+import type { IFocusableNode } from '../interfaces/i_focusable_node.js';
 import { WorkspaceSvg } from '../workspace_svg.js';
 import { Marker } from './marker.js';
-/** Options object for LineCursor instances. */
-export interface CursorOptions {
-    /**
-     * Can the cursor visit all stack connections (next/previous), or
-     * (if false) only unconnected next connections?
-     */
-    stackConnections: boolean;
-}
 /**
  * Class for a line cursor.
  */
 export declare class LineCursor extends Marker {
     protected readonly workspace: WorkspaceSvg;
     type: string;
-    /** Options for this line cursor. */
-    private readonly options;
     /** Locations to try moving the cursor to after a deletion. */
     private potentialNodes;
-    /** Whether the renderer is zelos-style. */
-    private isZelos;
     /**
      * @param workspace The workspace this cursor belongs to.
-     * @param options Cursor options.
      */
-    constructor(workspace: WorkspaceSvg, options?: Partial<CursorOptions>);
-    /**
-     * Registers default navigation policies for Blockly's built-in types with
-     * this cursor's workspace.
-     */
-    protected registerNavigationPolicies(): void;
+    constructor(workspace: WorkspaceSvg);
     /**
      * Moves the cursor to the next previous connection, next connection or block
      * in the pre order traversal. Finds the next node in the pre order traversal.
@@ -52,7 +34,7 @@ export declare class LineCursor extends Marker {
      * @returns The next node, or null if the current node is
      *     not set or there is no next value.
      */
-    next(): INavigable<any> | null;
+    next(): IFocusableNode | null;
     /**
      * Moves the cursor to the next input connection or field
      * in the pre order traversal.
@@ -60,7 +42,7 @@ export declare class LineCursor extends Marker {
      * @returns The next node, or null if the current node is
      *     not set or there is no next value.
      */
-    in(): INavigable<any> | null;
+    in(): IFocusableNode | null;
     /**
      * Moves the cursor to the previous next connection or previous connection in
      * the pre order traversal.
@@ -68,7 +50,7 @@ export declare class LineCursor extends Marker {
      * @returns The previous node, or null if the current node
      *     is not set or there is no previous value.
      */
-    prev(): INavigable<any> | null;
+    prev(): IFocusableNode | null;
     /**
      * Moves the cursor to the previous input connection or field in the pre order
      * traversal.
@@ -76,61 +58,14 @@ export declare class LineCursor extends Marker {
      * @returns The previous node, or null if the current node
      *     is not set or there is no previous value.
      */
-    out(): INavigable<any> | null;
+    out(): IFocusableNode | null;
     /**
      * Returns true iff the node to which we would navigate if in() were
-     * called, which will be a validInLineNode, is also a validLineNode
-     * - in effect, if the LineCursor is at the end of the 'current
+     * called is the same as the node to which we would navigate if next() were
+     * called - in effect, if the LineCursor is at the end of the 'current
      * line' of the program.
      */
     atEndOfLine(): boolean;
-    /**
-     * Returns true iff the given node represents the "beginning of a
-     * new line of code" (and thus can be visited by pressing the
-     * up/down arrow keys).  Specifically, if the node is for:
-     *
-     * - Any block that is not a value block.
-     * - A top-level value block (one that is unconnected).
-     * - An unconnected next statement input.
-     * - An unconnected 'next' connection - the "blank line at the end".
-     *   This is to facilitate connecting additional blocks to a
-     *   stack/substack.
-     *
-     * If options.stackConnections is true (the default) then allow the
-     * cursor to visit all (useful) stack connection by additionally
-     * returning true for:
-     *
-     *   - Any next statement input
-     *   - Any 'next' connection.
-     *   - An unconnected previous statement input.
-     *
-     * @param node The AST node to check.
-     * @returns True if the node should be visited, false otherwise.
-     */
-    protected validLineNode(node: INavigable<any> | null): boolean;
-    /**
-     * Returns true iff the given node can be visited by the cursor when
-     * using the left/right arrow keys.  Specifically, if the node is
-     * any node for which validLineNode would return true, plus:
-     *
-     * - Any block.
-     * - Any field that is not a full block field.
-     * - Any unconnected next or input connection.  This is to
-     *   facilitate connecting additional blocks.
-     *
-     * @param node The AST node to check whether it is valid.
-     * @returns True if the node should be visited, false otherwise.
-     */
-    protected validInLineNode(node: INavigable<any> | null): boolean;
-    /**
-     * Returns true iff the given node can be visited by the cursor.
-     * Specifically, if the node is any for which validInLineNode would
-     * return true, or if it is a workspace node.
-     *
-     * @param node The AST node to check whether it is valid.
-     * @returns True if the node should be visited, false otherwise.
-     */
-    protected validNode(node: INavigable<any> | null): boolean;
     /**
      * Uses pre order traversal to navigate the Blockly AST. This will allow
      * a user to easily navigate the entire Blockly AST without having to go in
@@ -153,7 +88,7 @@ export declare class LineCursor extends Marker {
      *     valid node was found.
      * @returns The next node in the traversal.
      */
-    getNextNode(node: INavigable<any> | null, isValid: (p1: INavigable<any> | null) => boolean, loop: boolean): INavigable<any> | null;
+    getNextNode(node: IFocusableNode | null, isValid: (p1: IFocusableNode | null) => boolean, loop: boolean): IFocusableNode | null;
     /**
      * Reverses the pre order traversal in order to find the previous node. This
      * will allow a user to easily navigate the entire Blockly AST without having
@@ -178,15 +113,7 @@ export declare class LineCursor extends Marker {
      * @returns The previous node in the traversal or null if no previous node
      *     exists.
      */
-    getPreviousNode(node: INavigable<any> | null, isValid: (p1: INavigable<any> | null) => boolean, loop: boolean): INavigable<any> | null;
-    /**
-     * From the given node find either the next valid sibling or the parent's
-     * next sibling.
-     *
-     * @param node The current position in the AST.
-     * @returns The next sibling node, the parent's next sibling, or null.
-     */
-    private findSiblingOrParentSibling;
+    getPreviousNode(node: IFocusableNode | null, isValid: (p1: IFocusableNode | null) => boolean, loop: boolean): IFocusableNode | null;
     /**
      * Get the right most child of a node.
      *
@@ -234,7 +161,7 @@ export declare class LineCursor extends Marker {
      *
      * @returns The current field, connection, or block the cursor is on.
      */
-    getCurNode(): INavigable<any> | null;
+    getCurNode(): IFocusableNode | null;
     /**
      * Set the location of the cursor and draw it.
      *
@@ -243,35 +170,18 @@ export declare class LineCursor extends Marker {
      *
      * @param newNode The new location of the cursor.
      */
-    setCurNode(newNode: INavigable<any> | null): void;
-    /**
-     * Updates the current node to match the selection.
-     *
-     * Clears the current node if it's on a block but the selection is null.
-     * Sets the node to a block if selected for our workspace.
-     * For shadow blocks selections the parent is used by default (unless we're
-     * already on the shadow block via keyboard) as that's where the visual
-     * selection is.
-     */
-    private updateCurNodeFromSelection;
-    /**
-     * Updates the current node to match what's currently focused.
-     *
-     * @returns Whether the current node has been set successfully from the
-     *     current focused node.
-     */
-    private updateCurNodeFromFocus;
+    setCurNode(newNode: IFocusableNode | null): void;
     /**
      * Get the first navigable node on the workspace, or null if none exist.
      *
      * @returns The first navigable node on the workspace, or null.
      */
-    getFirstNode(): INavigable<any> | null;
+    getFirstNode(): IFocusableNode | null;
     /**
      * Get the last navigable node on the workspace, or null if none exist.
      *
      * @returns The last navigable node on the workspace, or null.
      */
-    getLastNode(): INavigable<any> | null;
+    getLastNode(): IFocusableNode | null;
 }
 //# sourceMappingURL=line_cursor.d.ts.map

package/core/keyboard_nav/marker.d.ts

@@ -10,8 +10,7 @@
  * @class
  */
 import { BlockSvg } from '../block_svg.js';
-import type { INavigable } from '../interfaces/i_navigable.js';
-import { ASTNode } from './ast_node.js';
+import type { IFocusableNode } from '../interfaces/i_focusable_node.js';
 /**
  * Class for a marker.
  * This is used in keyboard navigation to save a location in the Blockly AST.
@@ -20,7 +19,7 @@ export declare class Marker {
     /** The colour of the marker. */
     colour: string | null;
     /** The current location of the marker. */
-    protected curNode: INavigable<any> | null;
+    protected curNode: IFocusableNode | null;
     /** The type of the marker. */
     type: string;
     /**
@@ -28,23 +27,21 @@ export declare class Marker {
      *
      * @returns The current field, connection, or block the marker is on.
      */
-    getCurNode(): INavigable<any> | null;
+    getCurNode(): IFocusableNode | null;
     /**
      * Set the location of the marker and call the update method.
      *
      * @param newNode The new location of the marker, or null to remove it.
      */
-    setCurNode(newNode: INavigable<any> | null): void;
+    setCurNode(newNode: IFocusableNode | null): void;
     /** Dispose of this marker. */
     dispose(): void;
     /**
-     * Converts an INavigable to a legacy ASTNode.
+     * Returns the block that the given node is a child of.
      *
-     * @param node The INavigable instance to convert.
-     * @returns An ASTNode representation of the given object if possible,
-     *     otherwise null.
+     * @returns The parent block of the node if any, otherwise null.
      */
-    toASTNode(node: INavigable<any> | null): ASTNode | null;
+    getSourceBlockFromNode(node: IFocusableNode | null): BlockSvg | null;
     /**
      * Returns the block that this marker's current node is a child of.
      *

package/core/keyboard_nav/workspace_navigation_policy.d.ts

@@ -3,9 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { INavigable } from '../interfaces/i_navigable.js';
+import type { IFocusableNode } from '../interfaces/i_focusable_node.js';
 import type { INavigationPolicy } from '../interfaces/i_navigation_policy.js';
-import type { WorkspaceSvg } from '../workspace_svg.js';
+import { WorkspaceSvg } from '../workspace_svg.js';
 /**
  * Set of rules controlling keyboard navigation from a workspace.
  */
@@ -16,27 +16,41 @@ export declare class WorkspaceNavigationPolicy implements INavigationPolicy<Work
      * @param current The workspace to return the first child of.
      * @returns The top block of the first block stack, if any.
      */
-    getFirstChild(current: WorkspaceSvg): INavigable<unknown> | null;
+    getFirstChild(current: WorkspaceSvg): IFocusableNode | null;
     /**
      * Returns the parent of the given workspace.
      *
      * @param _current The workspace to return the parent of.
      * @returns Null.
      */
-    getParent(_current: WorkspaceSvg): INavigable<unknown> | null;
+    getParent(_current: WorkspaceSvg): IFocusableNode | null;
     /**
      * Returns the next sibling of the given workspace.
      *
      * @param _current The workspace to return the next sibling of.
      * @returns Null.
      */
-    getNextSibling(_current: WorkspaceSvg): INavigable<unknown> | null;
+    getNextSibling(_current: WorkspaceSvg): IFocusableNode | null;
     /**
      * Returns the previous sibling of the given workspace.
      *
      * @param _current The workspace to return the previous sibling of.
      * @returns Null.
      */
-    getPreviousSibling(_current: WorkspaceSvg): INavigable<unknown> | null;
+    getPreviousSibling(_current: WorkspaceSvg): IFocusableNode | null;
+    /**
+     * Returns whether or not the given workspace can be navigated to.
+     *
+     * @param current The instance to check for navigability.
+     * @returns True if the given workspace can be focused.
+     */
+    isNavigable(current: WorkspaceSvg): boolean;
+    /**
+     * Returns whether the given object can be navigated from by this policy.
+     *
+     * @param current The object to check if this policy applies to.
+     * @returns True if the object is a WorkspaceSvg.
+     */
+    isApplicable(current: any): current is WorkspaceSvg;
 }
 //# sourceMappingURL=workspace_navigation_policy.d.ts.map

package/core/layer_manager.d.ts

@@ -3,6 +3,7 @@
  * Copyright 2023 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import type { IFocusableNode } from './interfaces/i_focusable_node.js';
 import { IRenderedElement } from './interfaces/i_rendered_element.js';
 import { Coordinate } from './utils/coordinate.js';
 import { WorkspaceSvg } from './workspace_svg.js';
@@ -39,13 +40,13 @@ export declare class LayerManager {
      *
      * @internal
      */
-    moveToDragLayer(elem: IRenderedElement): void;
+    moveToDragLayer(elem: IRenderedElement & IFocusableNode): void;
     /**
      * Moves the given element off of the drag layer.
      *
      * @internal
      */
-    moveOffDragLayer(elem: IRenderedElement, layerNum: number): void;
+    moveOffDragLayer(elem: IRenderedElement & IFocusableNode, layerNum: number): void;
     /**
      * Appends the given element to a layer. If the layer does not exist, it is
      * created.

package/core/navigator.d.ts

@@ -3,8 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { INavigable } from './interfaces/i_navigable.js';
+import type { IFocusableNode } from './interfaces/i_focusable_node.js';
 import type { INavigationPolicy } from './interfaces/i_navigation_policy.js';
+type RuleList<T> = INavigationPolicy<T>[];
 /**
  * Class responsible for determining where focus should move in response to
  * keyboard navigation commands.
@@ -14,21 +15,19 @@ export declare class Navigator {
      * Map from classes to a corresponding ruleset to handle navigation from
      * instances of that class.
      */
-    private rules;
+    protected rules: RuleList<any>;
     /**
-     * Associates a navigation ruleset with its corresponding class.
+     * Adds a navigation ruleset to this Navigator.
      *
-     * @param key The class whose object instances should have their navigation
-     *     controlled by the associated policy.
      * @param policy A ruleset that determines where focus should move starting
-     *     from an instance of the given class.
+     *     from an instance of its managed class.
      */
-    set<T extends INavigable<T>>(key: new (...args: any) => T, policy: INavigationPolicy<T>): void;
+    addNavigationPolicy(policy: INavigationPolicy<any>): void;
     /**
      * Returns the navigation ruleset associated with the given object instance's
      * class.
      *
-     * @param key An object to retrieve a navigation ruleset for.
+     * @param current An object to retrieve a navigation ruleset for.
      * @returns The navigation ruleset of objects of the given object's class, or
      *     undefined if no ruleset has been registered for the object's class.
      */
@@ -39,27 +38,28 @@ export declare class Navigator {
      * @param current The object to retrieve the first child of.
      * @returns The first child node of the given object, if any.
      */
-    getFirstChild<T extends INavigable<T>>(current: T): INavigable<any> | null;
+    getFirstChild(current: IFocusableNode): IFocusableNode | null;
     /**
      * Returns the parent of the given object instance, if any.
      *
      * @param current The object to retrieve the parent of.
      * @returns The parent node of the given object, if any.
      */
-    getParent<T extends INavigable<T>>(current: T): INavigable<any> | null;
+    getParent(current: IFocusableNode): IFocusableNode | null;
     /**
      * Returns the next sibling of the given object instance, if any.
      *
      * @param current The object to retrieve the next sibling node of.
      * @returns The next sibling node of the given object, if any.
      */
-    getNextSibling<T extends INavigable<T>>(current: T): INavigable<any> | null;
+    getNextSibling(current: IFocusableNode): IFocusableNode | null;
     /**
      * Returns the previous sibling of the given object instance, if any.
      *
      * @param current The object to retrieve the previous sibling node of.
      * @returns The previous sibling node of the given object, if any.
      */
-    getPreviousSibling<T extends INavigable<T>>(current: T): INavigable<any> | null;
+    getPreviousSibling(current: IFocusableNode): IFocusableNode | null;
 }
+export {};
 //# sourceMappingURL=navigator.d.ts.map

package/core/rendered_connection.d.ts

@@ -14,12 +14,11 @@ import { Connection } from './connection.js';
 import { IContextMenu } from './interfaces/i_contextmenu.js';
 import type { IFocusableNode } from './interfaces/i_focusable_node.js';
 import type { IFocusableTree } from './interfaces/i_focusable_tree.js';
-import type { INavigable } from './interfaces/i_navigable.js';
 import { Coordinate } from './utils/coordinate.js';
 /**
  * Class for a connection between blocks that may be rendered on screen.
  */
-export declare class RenderedConnection extends Connection implements IContextMenu, IFocusableNode, INavigable<RenderedConnection> {
+export declare class RenderedConnection extends Connection implements IContextMenu, IFocusableNode {
     sourceBlock_: BlockSvg;
     private readonly db;
     private readonly dbOpposite;
@@ -237,19 +236,9 @@ export declare class RenderedConnection extends Connection implements IContextMe
     onNodeFocus(): void;
     /** See IFocusableNode.onNodeBlur. */
     onNodeBlur(): void;
+    /** See IFocusableNode.canBeFocused. */
+    canBeFocused(): boolean;
     private findHighlightSvg;
-    /**
-     * Returns whether or not this connection is keyboard-navigable.
-     *
-     * @returns True.
-     */
-    isNavigable(): boolean;
-    /**
-     * Returns this connection's class for keyboard navigation.
-     *
-     * @returns RenderedConnection.
-     */
-    getClass(): typeof RenderedConnection;
 }
 export declare namespace RenderedConnection {
     /**

package/core/toolbox/toolbox.d.ts

@@ -399,6 +399,8 @@ export declare class Toolbox extends DeleteArea implements IAutoHideable, IKeybo
     onNodeFocus(): void;
     /** See IFocusableNode.onNodeBlur. */
     onNodeBlur(): void;
+    /** See IFocusableNode.canBeFocused. */
+    canBeFocused(): boolean;
     /** See IFocusableTree.getRootFocusableNode. */
     getRootFocusableNode(): IFocusableNode;
     /** See IFocusableTree.getRestoredFocusableNode. */

package/core/toolbox/toolbox_item.d.ts

@@ -103,5 +103,7 @@ export declare class ToolboxItem implements IToolboxItem {
     onNodeFocus(): void;
     /** See IFocusableNode.onNodeBlur. */
     onNodeBlur(): void;
+    /** See IFocusableNode.canBeFocused. */
+    canBeFocused(): boolean;
 }
 //# sourceMappingURL=toolbox_item.d.ts.map

package/core/utils/object.d.ts

@@ -6,6 +6,9 @@
 /**
  * Complete a deep merge of all members of a source object with a target object.
  *
+ * N.B. This is not a very sophisticated merge algorithm and does not
+ * handle complex cases. Use with caution.
+ *
  * @param target Target.
  * @param source Source.
  * @returns The resulting object.

package/core/variable_map.d.ts

@@ -21,14 +21,19 @@ import type { Workspace } from './workspace.js';
  */
 export declare class VariableMap implements IVariableMap<IVariableModel<IVariableState>> {
     workspace: Workspace;
+    potentialMap: boolean;
     /**
      * A map from variable type to map of IDs to variables. The maps contain
      * all of the named variables in the workspace, including variables that are
      * not currently in use.
      */
     private variableMap;
-    /** @param workspace The workspace this map belongs to. */
-    constructor(workspace: Workspace);
+    /**
+     * @param workspace The workspace this map belongs to.
+     * @param potentialMap True if this holds variables that don't exist in the
+     *  workspace yet.
+     */
+    constructor(workspace: Workspace, potentialMap?: boolean);
     /** Clear the variable map.  Fires events for every deletion. */
     clear(): void;
     /**

package/core/workspace.d.ts

@@ -13,7 +13,6 @@ import type { Block } from './block.js';
 import { WorkspaceComment } from './comments/workspace_comment.js';
 import type { ConnectionDB } from './connection_db.js';
 import type { Abstract } from './events/events_abstract.js';
-import type { IASTNodeLocation } from './interfaces/i_ast_node_location.js';
 import type { IConnectionChecker } from './interfaces/i_connection_checker.js';
 import { IProcedureMap } from './interfaces/i_procedure_map.js';
 import type { IVariableMap } from './interfaces/i_variable_map.js';
@@ -24,7 +23,7 @@ import type * as toolbox from './utils/toolbox.js';
  * Class for a workspace.  This is a data structure that contains blocks.
  * There is no UI, and can be created headlessly.
  */
-export declare class Workspace implements IASTNodeLocation {
+export declare class Workspace {
     /**
      * Angle away from the horizontal to sweep for blocks.  Order of execution is
      * generally top to bottom, but a small angle changes the scan to give a bit