scratch-blocks 2.1.5 → 2.1.7

package/src/scratch_c_block_wrap.ts

@@ -28,7 +28,7 @@ Blockly.Connection.getConnectionForOrphanedConnection = function (
   // Apply the wrapping logic when the orphaned connection is a statement
   // connection (PREVIOUS_STATEMENT).  Value connections (OUTPUT_VALUE) are
   // already handled by the original implementation.
-  if (orphanConnection.type === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
+  if ((orphanConnection.type as Blockly.ConnectionType) === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
     const checker = orphanConnection.getConnectionChecker()
     for (const input of startBlock.inputList) {
       const conn = input.connection
@@ -61,32 +61,48 @@ Blockly.Connection.getConnectionForOrphanedConnection = function (
  * marker's statement input back to `marker.nextConnection` before the original
  * cleanup runs, so the standard healing logic reconnects B1.next → B2.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any -- InsertionMarkerPreviewer does not publicly expose hideInsertionMarker
-const proto = Blockly.InsertionMarkerPreviewer.prototype as any
-const originalHideInsertionMarker = proto.hideInsertionMarker as (markerConn: Blockly.Connection) => void
-proto.hideInsertionMarker = function (this: Blockly.InsertionMarkerPreviewer, markerConn: Blockly.Connection) {
-  const marker = markerConn.getSourceBlock() as Blockly.BlockSvg
+const previewerProto = Blockly.InsertionMarkerPreviewer.prototype
+const hideInsertionMarker: unknown = Reflect.get(previewerProto, 'hideInsertionMarker')
+if (typeof hideInsertionMarker !== 'function') {
+  throw new Error('Expected InsertionMarkerPreviewer.hideInsertionMarker to be a function')
+}
+const originalHideInsertionMarker = hideInsertionMarker as (
+  this: Blockly.InsertionMarkerPreviewer,
+  markerConn: Blockly.Connection,
+) => void
+Reflect.set(
+  previewerProto,
+  'hideInsertionMarker',
+  function (this: Blockly.InsertionMarkerPreviewer, markerConn: Blockly.Connection) {
+    const marker = markerConn.getSourceBlock()
+    const markerPreviousConnection = marker.previousConnection
+    const markerNextConnection = marker.nextConnection
 
-  // Restore a real block from a statement input to nextConnection so that
-  // unplug(true) can heal the stack correctly.  Conditions:
-  //   - marker is mid-stack (has a predecessor)
-  //   - marker.nextConnection is empty (displaced block is NOT already there)
-  //   - a non-marker block is sitting in a statement input
-  if (marker.previousConnection?.isConnected() && marker.nextConnection && !marker.nextConnection.isConnected()) {
-    for (const input of marker.inputList) {
-      const conn = input.connection
-      if (conn?.type === Blockly.ConnectionType.NEXT_STATEMENT && conn.isConnected()) {
-        const blockInInput = conn.targetBlock() as Blockly.BlockSvg | null
+    // Restore a real block from a statement input to nextConnection so that
+    // unplug(true) can heal the stack correctly.  Conditions:
+    //   - marker is mid-stack (has a predecessor)
+    //   - marker.nextConnection is empty (displaced block is NOT already there)
+    //   - a non-marker block is sitting in a statement input
+    if (markerPreviousConnection?.isConnected() && markerNextConnection && !markerNextConnection.isConnected()) {
+      for (const input of marker.inputList) {
+        const conn = input.connection
+        const connType = conn?.type as Blockly.ConnectionType | undefined
+        if (connType !== Blockly.ConnectionType.NEXT_STATEMENT || !conn?.isConnected()) {
+          continue
+        }
+        const blockInInput = conn.targetBlock()
         if (blockInInput && !blockInInput.isInsertionMarker()) {
           const prev = blockInInput.previousConnection
-          if (!prev) continue
+          if (!prev) {
+            continue
+          }
           prev.disconnect()
-          marker.nextConnection.connect(prev)
+          markerNextConnection.connect(prev)
           break
         }
       }
     }
-  }
 
-  originalHideInsertionMarker.call(this, markerConn)
-}
+    originalHideInsertionMarker.call(this, markerConn)
+  },
+)

package/src/scratch_comment_bubble.ts

@@ -27,16 +27,16 @@ export class ScratchCommentBubble
     this.getSvgRoot().setAttribute('style', `--colour-commentBorder: ${sourceBlock.getColourTertiary()};`)
     this.getSvgRoot().setAttribute('id', this.id)
 
-    Blockly.browserEvents.conditionalBind(this.getSvgRoot(), 'pointerdown', this, this.startGesture)
+    Blockly.browserEvents.conditionalBind(this.getSvgRoot(), 'pointerdown', this, this.startGesture.bind(this))
     // Don't zoom with mousewheel; let it scroll instead.
     Blockly.browserEvents.conditionalBind(this.getSvgRoot(), 'wheel', this, (e: WheelEvent) => {
       e.stopPropagation()
     })
   }
 
-  setDeleteStyle(enable: boolean) {}
+  setDeleteStyle(_enable: boolean) {}
   showContextMenu() {}
-  setDragging(start: boolean) {}
+  setDragging(_start: boolean) {}
   select() {}
   unselect() {}
 
@@ -51,10 +51,15 @@ export class ScratchCommentBubble
   moveTo(xOrCoordinate: number, y: number): void
   moveTo(xOrCoordinate: Blockly.utils.Coordinate): void
   moveTo(xOrCoordinate: Blockly.utils.Coordinate | number, y?: number) {
-    const destination =
-      xOrCoordinate instanceof Blockly.utils.Coordinate
-        ? xOrCoordinate
-        : new Blockly.utils.Coordinate(xOrCoordinate, y!)
+    let destination: Blockly.utils.Coordinate
+    if (xOrCoordinate instanceof Blockly.utils.Coordinate) {
+      destination = xOrCoordinate
+    } else {
+      if (y === undefined) {
+        throw new Error('ScratchCommentBubble.moveTo: missing y coordinate')
+      }
+      destination = new Blockly.utils.Coordinate(xOrCoordinate, y)
+    }
     super.moveTo(destination)
     this.redrawAnchorChain()
   }
@@ -69,14 +74,14 @@ export class ScratchCommentBubble
     }
   }
 
-  startDrag(event: PointerEvent) {
+  startDrag(_event: PointerEvent) {
     this.dragStartLocation = this.getRelativeToSurfaceXY()
     this.workspace.setResizesEnabled(false)
     this.workspace.getLayerManager()?.moveToDragLayer(this)
     Blockly.utils.dom.addClass(this.getSvgRoot(), 'blocklyDragging')
   }
 
-  drag(newLocation: Blockly.utils.Coordinate, event?: PointerEvent) {
+  drag(newLocation: Blockly.utils.Coordinate, _event?: PointerEvent) {
     this.moveTo(newLocation)
   }
 
@@ -90,35 +95,41 @@ export class ScratchCommentBubble
   }
 
   revertDrag() {
-    this.moveTo(this.dragStartLocation!)
+    if (!this.dragStartLocation) {
+      throw new Error('ScratchCommentBubble.revertDrag: missing drag start location')
+    }
+    this.moveTo(this.dragStartLocation)
   }
 
   setAnchorLocation(newAnchor: Blockly.utils.Coordinate) {
     const oldAnchor = this.anchor
-    const alreadyAnchored = !!this.anchor
+    const alreadyAnchored = oldAnchor !== undefined
     this.anchor = newAnchor
     if (!alreadyAnchored) {
       this.dropAnchor()
     } else {
       const oldLocation = this.getRelativeToSurfaceXY()
-      const delta = Blockly.utils.Coordinate.difference(this.anchor, oldAnchor!)
+      const delta = Blockly.utils.Coordinate.difference(this.anchor, oldAnchor)
       const newLocation = Blockly.utils.Coordinate.sum(oldLocation, delta)
       this.moveTo(newLocation)
     }
   }
 
   dropAnchor() {
+    if (!this.anchor || !this.sourceBlock) {
+      throw new Error('ScratchCommentBubble.dropAnchor: missing anchor or source block')
+    }
     const verticalOffset = 16
-    this.moveTo(this.anchor!.x + 40 * (this.workspace.RTL ? -1 : 1), this.anchor!.y - verticalOffset)
+    this.moveTo(this.anchor.x + 40 * (this.workspace.RTL ? -1 : 1), this.anchor.y - verticalOffset)
     const location = this.getRelativeToSurfaceXY()
     this.anchorChain = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.LINE,
       {
-        x1: this.anchor!.x - location.x,
-        y1: this.anchor!.y - location.y,
+        x1: this.anchor.x - location.x,
+        y1: this.anchor.y - location.y,
         x2: (this.getSize().width / 2) * (this.workspace.RTL ? -1 : 1),
         y2: verticalOffset,
-        style: `stroke: ${this.sourceBlock!.getColourTertiary()}; stroke-width: 1`,
+        style: `stroke: ${this.sourceBlock.getColourTertiary()}; stroke-width: 1`,
       },
       this.getSvgRoot(),
     )
@@ -126,11 +137,11 @@ export class ScratchCommentBubble
   }
 
   redrawAnchorChain() {
-    if (!this.anchorChain) return
+    if (!this.anchorChain || !this.anchor) return
 
     const location = this.getRelativeToSurfaceXY()
-    this.anchorChain.setAttribute('x1', `${this.anchor!.x - location.x}`)
-    this.anchorChain.setAttribute('y1', `${this.anchor!.y - location.y}`)
+    this.anchorChain.setAttribute('x1', `${this.anchor.x - location.x}`)
+    this.anchorChain.setAttribute('y1', `${this.anchor.y - location.y}`)
   }
 
   getId() {

package/src/scratch_comment_icon.ts

@@ -39,7 +39,7 @@ export class ScratchCommentIcon extends Blockly.icons.Icon implements Blockly.IS
     return Blockly.icons.IconType.COMMENT
   }
 
-  initView(pointerDownListener: (e: PointerEvent) => void) {
+  initView(_pointerDownListener: (e: PointerEvent) => void) {
     // Scratch comments have no indicator icon on the block.
     return
   }
@@ -57,8 +57,6 @@ export class ScratchCommentIcon extends Blockly.icons.Icon implements Blockly.IS
   }
 
   onLocationChange(blockOrigin: Blockly.utils.Coordinate) {
-    if (!this.sourceBlock || !this.commentBubble) return
-
     if (this.sourceBlock.isInsertionMarker()) {
       this.commentBubble.dispose()
       return
@@ -74,11 +72,11 @@ export class ScratchCommentIcon extends Blockly.icons.Icon implements Blockly.IS
   }
 
   setText(text: string) {
-    this.commentBubble?.setText(text)
+    this.commentBubble.setText(text)
   }
 
   getText(): string {
-    return this.commentBubble?.getText() ?? ''
+    return this.commentBubble.getText()
   }
 
   onTextChanged(oldText: string, newText: string) {
@@ -97,26 +95,24 @@ export class ScratchCommentIcon extends Blockly.icons.Icon implements Blockly.IS
   }
 
   setBubbleSize(size: Blockly.utils.Size) {
-    this.commentBubble?.setSize(size)
+    this.commentBubble.setSize(size)
   }
 
   getBubbleSize(): Blockly.utils.Size {
-    return this.commentBubble?.getSize() ?? new Blockly.utils.Size(0, 0)
+    return this.commentBubble.getSize()
   }
 
   setBubbleLocation(newLocation: Blockly.utils.Coordinate) {
     const oldLocation = this.getBubbleLocation()
-    this.commentBubble?.moveTo(newLocation)
+    this.commentBubble.moveTo(newLocation)
     Blockly.Events.fire(new (Blockly.Events.get('block_comment_move'))(this.commentBubble, oldLocation, newLocation))
   }
 
   getBubbleLocation(): Blockly.utils.Coordinate {
-    return this.commentBubble?.getRelativeToSurfaceXY()
+    return this.commentBubble.getRelativeToSurfaceXY()
   }
 
   saveState(): CommentState | null {
-    if (!this.commentBubble) return null
-
     const size = this.getBubbleSize()
     const bubbleLocation = this.commentBubble.getRelativeToSurfaceXY()
     const delta = Blockly.utils.Coordinate.difference(bubbleLocation, this.workspaceLocation)
@@ -145,8 +141,9 @@ export class ScratchCommentIcon extends Blockly.icons.Icon implements Blockly.IS
     return true
   }
 
-  async setBubbleVisible(visible: boolean) {
+  setBubbleVisible(visible: boolean) {
     this.commentBubble.setCollapsed(!visible)
+    return Promise.resolve()
   }
 
   getBubble(): ScratchCommentBubble | null {

package/src/scratch_continuous_category.ts

@@ -19,6 +19,8 @@ export class ScratchContinuousCategory extends ContinuousCategory {
    * devices.
    */
   private showStatusButton = false
+  private iconURI?: string
+  private secondaryColour?: string
 
   /**
    * Creates a new ScratchContinuousCategory.
@@ -33,21 +35,29 @@ export class ScratchContinuousCategory extends ContinuousCategory {
   ) {
     super(toolboxItemDef, parentToolbox, opt_parent)
     this.showStatusButton = toolboxItemDef.showStatusButton === 'true'
+    const iconURI = 'iconURI' in toolboxItemDef ? toolboxItemDef.iconURI : undefined
+    const secondaryColour = 'secondaryColour' in toolboxItemDef ? toolboxItemDef.secondaryColour : undefined
+    this.iconURI = typeof iconURI === 'string' ? iconURI : undefined
+    this.secondaryColour = typeof secondaryColour === 'string' ? secondaryColour : undefined
   }
 
   /**
    * Creates a DOM element for this category's icon.
    * @returns A DOM element for this category's icon.
    */
-  createIconDom_(): HTMLElement {
-    if (this.toolboxItemDef_.iconURI) {
+  createIconDom_(): Element {
+    if (this.iconURI) {
       const icon = document.createElement('img')
-      icon.src = this.toolboxItemDef_.iconURI
+      icon.src = this.iconURI
       icon.className = 'categoryIconBubble'
       return icon
     } else {
       const icon = super.createIconDom_()
-      icon.style.border = `1px solid ${this.toolboxItemDef_.secondaryColour}`
+      if (icon instanceof HTMLElement) {
+        if (this.secondaryColour) {
+          icon.style.border = `1px solid ${this.secondaryColour}`
+        }
+      }
       return icon
     }
   }
@@ -59,7 +69,9 @@ export class ScratchContinuousCategory extends ContinuousCategory {
   setSelected(isSelected: boolean) {
     super.setSelected(isSelected)
     // Prevent hardcoding the background color to grey.
-    this.rowDiv_.style.backgroundColor = ''
+    if (this.rowDiv_) {
+      this.rowDiv_.style.backgroundColor = ''
+    }
   }
 
   /**
@@ -74,10 +86,7 @@ export class ScratchContinuousCategory extends ContinuousCategory {
 
 /** Registers this toolbox category and unregisters the default one. */
 export function registerScratchContinuousCategory() {
-  Blockly.registry.unregister(Blockly.registry.Type.TOOLBOX_ITEM, ScratchContinuousCategory.registrationName)
-  Blockly.registry.register(
-    Blockly.registry.Type.TOOLBOX_ITEM,
-    ScratchContinuousCategory.registrationName,
-    ScratchContinuousCategory,
-  )
+  const registrationName = ScratchContinuousCategory.registrationName
+  Blockly.registry.unregister(Blockly.registry.Type.TOOLBOX_ITEM, registrationName)
+  Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM, registrationName, ScratchContinuousCategory)
 }

package/src/scratch_continuous_toolbox.ts

@@ -16,6 +16,10 @@ export class ScratchContinuousToolbox extends ContinuousToolbox {
    */
   private postRenderCallbacks: (() => void)[] = []
 
+  private getInitialFlyoutContents_(): Blockly.utils.toolbox.FlyoutItemInfoArray {
+    return this.getToolboxItems().flatMap((item) => this.convertToolboxItemToFlyoutItems(item))
+  }
+
   refreshSelection() {
     // Intentionally a no-op, Scratch manually manages refreshing the toolbox
     // via forceRerender().
@@ -45,9 +49,14 @@ export class ScratchContinuousToolbox extends ContinuousToolbox {
    * Forcibly rerenders the toolbox, preserving selection when possible.
    */
   forceRerender() {
-    const selectedCategoryName = this.selectedItem_?.getName()
-    this.getFlyout().show(this.getInitialFlyoutContents())
-    this.selectCategoryByName(selectedCategoryName)
+    const selectedCategoryName = this.getSelectedItem()?.getName()
+    if (selectedCategoryName === '') {
+      throw new Error('Expected selected category name to be non-empty')
+    }
+    this.getFlyout().show(this.getInitialFlyoutContents_())
+    if (selectedCategoryName) {
+      this.selectCategoryByName(selectedCategoryName)
+    }
     let callback
     while ((callback = this.postRenderCallbacks.shift())) {
       callback()

package/src/scratch_dragger.ts

@@ -93,7 +93,7 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
       dragRoot.type === 'procedures_definition' &&
       this.wouldDeleteDraggable(event, dragRoot.getRootBlock())
     ) {
-      const prototype = dragRoot.getInput('custom_block')!.connection!.targetBlock()
+      const prototype = dragRoot.getInput('custom_block')?.connection?.targetBlock()
       const hasCaller =
         prototype instanceof Blockly.BlockSvg &&
         isProcedureBlock(prototype) &&
@@ -118,7 +118,7 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
       // on the workspace in order to depict the block mid-drag needs to be
       // deleted.
       if (this.originatedFromFlyout && this.draggedOutOfBounds) {
-        Blockly.renderManagement.finishQueuedRenders().then(() => {
+        void Blockly.renderManagement.finishQueuedRenders().then(() => {
           const rootBlock = this.getDragRoot(this.draggable)
           if (rootBlock instanceof Blockly.BlockSvg) {
             rootBlock.dispose()

package/src/scratch_variable_map.ts

@@ -12,7 +12,7 @@ class ScratchVariableMap extends Blockly.VariableMap {
     // Variable names in Blockly are case-insensitive, but case sensitive in
     // Scratch. Override the implementation to only return a variable whose name
     // is identical to the one requested.
-    const variables = this.getVariablesOfType(type ?? '')
+    const variables = this.getVariablesOfType(type)
     if (!variables.length) return null
     return variables.find((v) => v.getName() === name) ?? null
   }

package/src/status_indicator_label.ts

@@ -46,7 +46,7 @@ export class StatusIndicatorLabel extends Blockly.FlyoutButton {
   /**
    * Function to be invoked when the status indicator is clicked.
    */
-  static statusButtonCallback: (extensionId: string) => void
+  static statusButtonCallback: ((extensionId: string) => void) | null = null
 
   /**
    * Creates a new StatusIndicatorLabel.
@@ -60,11 +60,17 @@ export class StatusIndicatorLabel extends Blockly.FlyoutButton {
     json: Blockly.utils.toolbox.LabelInfo,
   ) {
     super(workspace, targetWorkspace, json, true)
-    this.extensionId = json.id!
+    if (!json.id) {
+      throw new Error('StatusIndicatorLabel: missing required extension id in toolbox JSON')
+    }
+    this.extensionId = json.id
 
     const heightDelta = 40 - this.height
     this.height = 40
-    const text = this.getSvgRoot().querySelector('text')!
+    const text = this.getSvgRoot().querySelector('text')
+    if (!text) {
+      throw new Error('StatusIndicatorLabel: missing flyout text element')
+    }
     const previousY = Number(text.getAttribute('y'))
 
     text.setAttribute('y', `${previousY + heightDelta / 2}`)
@@ -73,7 +79,7 @@ export class StatusIndicatorLabel extends Blockly.FlyoutButton {
     const marginX = 20
     const marginY = 5
     const touchPadding = 16
-    const flyoutWidth = targetWorkspace.getFlyout()!.getWidth()
+    const flyoutWidth = targetWorkspace.getFlyout()?.getWidth() ?? 0
 
     const statusButtonX = workspace.RTL
       ? marginX - flyoutWidth + statusButtonWidth
@@ -129,17 +135,15 @@ export class StatusIndicatorLabel extends Blockly.FlyoutButton {
    * @package
    */
   setImageSrc(src: string) {
-    if (this.imageElement) {
-      this.imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', src)
-    }
+    this.imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', src)
   }
 
   /**
    * Gets the extension state. Overridden externally.
-   * @param extensionId A string identifying which extension's state to retrieve.
+   * @param _extensionId A string identifying which extension's state to retrieve.
    * @returns Whether the extension is ready to be used.
    */
-  getExtensionState(extensionId: string): StatusButtonState {
+  getExtensionState(_extensionId: string): StatusButtonState {
     return StatusButtonState.NOT_READY
   }
 

package/src/status_indicator_label_flyout_inflater.ts

@@ -18,7 +18,8 @@ class StatusIndicatorLabelFlyoutInflater extends Blockly.LabelFlyoutInflater {
    * @returns The newly created status indicator label.
    */
   load(state: Blockly.utils.toolbox.LabelInfo, flyout: Blockly.IFlyout): Blockly.FlyoutItem {
-    const label = new StatusIndicatorLabel(flyout.getWorkspace(), flyout.targetWorkspace!, state)
+    const targetWorkspace = flyout.targetWorkspace ?? flyout.getWorkspace()
+    const label = new StatusIndicatorLabel(flyout.getWorkspace(), targetWorkspace, state)
     label.show()
     return new Blockly.FlyoutItem(label, STATUS_INDICATOR_LABEL_TYPE)
   }

package/src/variables.ts

@@ -84,23 +84,26 @@ export function createVariable(
     // opt_type -- turns a falsey opt_type into ''
     // TODO (#1251) Warn developers that they didn't provide an opt_type/
     // provided a falsey opt_type
-    opt_type = opt_type ? opt_type : ''
+    opt_type = opt_type ?? ''
     newMsg = Blockly.Msg.NEW_VARIABLE_TITLE
     modalTitle = Blockly.Msg.VARIABLE_MODAL_TITLE
   }
   const validate = nameValidator.bind(null, opt_type)
+  if (!prompt) {
+    throw new Error('createVariable: prompt handler is not set')
+  }
 
   // Prompt the user to enter a name for the variable
-  prompt!(
+  prompt(
     newMsg,
     '',
-    (text: string, additionalVars: string[], variableOptions?: { scope?: string; isCloud?: boolean }) => {
-      variableOptions = variableOptions || {}
+    (text: string, additionalVars?: string[], variableOptions?: { scope?: string; isCloud?: boolean }) => {
+      variableOptions = variableOptions ?? {}
       const scope = variableOptions.scope
-      const isLocal = scope === 'local' || false
-      const isCloud = variableOptions.isCloud || false
+      const isLocal = scope === 'local'
+      const isCloud = variableOptions.isCloud ?? false
       // Default to [] if additionalVars is not provided
-      additionalVars = additionalVars || []
+      additionalVars = additionalVars ?? []
       // Only use additionalVars for global variable creation.
       const additionalVarNames = isLocal ? [] : additionalVars
 
@@ -159,7 +162,7 @@ export function createVariable(
 function nameValidator(
   type: string,
   text: string,
-  workspace: Blockly.WorkspaceSvg,
+  workspace: Blockly.Workspace,
   additionalVars: string[],
   isCloud: boolean,
   opt_callback?: (id?: string) => void,
@@ -200,7 +203,7 @@ function nameValidator(
  */
 function validateBroadcastMessageName(
   name: string,
-  workspace: Blockly.WorkspaceSvg,
+  workspace: Blockly.Workspace,
   opt_callback?: (id?: string) => void,
 ): string | null {
   if (!name) {
@@ -242,7 +245,7 @@ function validateBroadcastMessageName(
  */
 function validateScalarVarOrListName(
   name: string,
-  workspace: Blockly.WorkspaceSvg,
+  workspace: Blockly.Workspace,
   additionalVars: string[],
   isCloud: boolean,
   type: string,
@@ -275,7 +278,7 @@ function validateScalarVarOrListName(
  *     an existing variable was chosen.
  */
 export function renameVariable(
-  workspace: Blockly.WorkspaceSvg,
+  workspace: Blockly.Workspace,
   variable: ScratchVariableModel,
   opt_callback?: (id?: string) => void,
 ) {
@@ -305,15 +308,19 @@ export function renameVariable(
     promptDefaultText = promptDefaultText.substring(CLOUD_PREFIX.length)
   }
 
-  prompt!(
+  if (!prompt) {
+    throw new Error('renameVariable: prompt handler is not set')
+  }
+
+  prompt(
     promptText,
     promptDefaultText,
-    (newName: string, additionalVars: string[]) => {
+    (newName: string, additionalVars?: string[]) => {
       if (variable.isCloud && newName.length > 0 && newName.startsWith(CLOUD_PREFIX)) {
         newName = newName.substring(CLOUD_PREFIX.length)
         // The name validator will add the prefix back
       }
-      additionalVars = additionalVars || []
+      additionalVars = additionalVars ?? []
       const additionalVarNames = variable.isLocal ? [] : additionalVars
       const validatedText = validate(newName, workspace, additionalVarNames, variable.isCloud)
       if (validatedText) {

package/src/workspace_block_lookup.ts

@@ -0,0 +1,14 @@
+import * as Blockly from 'blockly/core'
+
+export function getRequiredMainWorkspaceSvg(): Blockly.WorkspaceSvg {
+  const mainWorkspace = Blockly.getMainWorkspace()
+  if (!(mainWorkspace instanceof Blockly.WorkspaceSvg)) {
+    throw new Error('Expected main workspace to be a WorkspaceSvg')
+  }
+  return mainWorkspace
+}
+
+export function getBlockSvgById(workspace: Blockly.WorkspaceSvg, id: string): Blockly.BlockSvg | null {
+  const block = workspace.getBlockById(id)
+  return block instanceof Blockly.BlockSvg ? block : null
+}

package/src/xml.ts

@@ -22,7 +22,7 @@ export function clearWorkspaceAndLoadFromXml(xml: Element, workspace: Blockly.Wo
     const id = variable.getAttribute('id')
     if (!id) continue
     const type = variable.getAttribute('type') ?? ''
-    const name = variable.textContent ?? ''
+    const name = variable.textContent
     const isLocal = variable.getAttribute('islocal') === 'true'
     const isCloud = variable.getAttribute('iscloud') === 'true'
 

package/types/continuous-toolbox.d.ts

@@ -1 +0,0 @@
-declare module '@blockly/continuous-toolbox'