chore(deps): bump @typescript-eslint/eslint-plugin from 7.17.0 to 8.0.1

.eslintrc.js

@@ -101,6 +101,8 @@ function buildTSOverride({files, tsconfig}) {
       '@typescript-eslint/no-empty-function': ['off'],
       // Temporarily disable. 3 problems.
       '@typescript-eslint/no-empty-interface': ['off'],
+      // We use this pattern extensively for block (e.g. controls_if) interfaces.
+      '@typescript-eslint/no-empty-object-type': ['off'],
 
       // TsDoc rules (using JsDoc plugin)
       // Disable built-in jsdoc verifier.

core/block.ts

@@ -223,7 +223,7 @@ export class Block implements IASTNodeLocation {
   /**
    * String for block help, or function that returns a URL. Null for no help.
    */
-  helpUrl: string | Function | null = null;
+  helpUrl: string | (() => string) | null = null;
 
   /** A bound callback function to use when the parent workspace changes. */
   private onchangeWrapper_: ((p1: Abstract) => void) | null = null;
@@ -997,7 +997,7 @@ export class Block implements IASTNodeLocation {
    * @param url URL string for block help, or function that returns a URL.  Null
    *     for no help.
    */
-  setHelpUrl(url: string | Function) {
+  setHelpUrl(url: string | (() => string)) {
     this.helpUrl = url;
   }
 
@@ -1864,7 +1864,7 @@ export class Block implements IASTNodeLocation {
         const rawValue = json['colour'];
         try {
           this.setColour(rawValue);
-        } catch (e) {
+        } catch {
           console.warn(warningPrefix + 'Illegal colour value: ', rawValue);
         }
       }
@@ -1881,7 +1881,7 @@ export class Block implements IASTNodeLocation {
     const blockStyleName = json['style'];
     try {
       this.setStyle(blockStyleName);
-    } catch (styleError) {
+    } catch {
       console.warn(warningPrefix + 'Style does not exist: ', blockStyleName);
     }
   }
@@ -2461,7 +2461,9 @@ export class Block implements IASTNodeLocation {
     const event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(
       this,
     ) as BlockMove;
-    reason && event.setReason(reason);
+    if (reason) {
+      event.setReason(reason);
+    }
     this.xy_.translate(dx, dy);
     event.recordNew();
     eventUtils.fire(event);

core/block_svg.ts

@@ -378,7 +378,9 @@ export class BlockSvg
     let event: BlockMove | null = null;
     if (eventsEnabled) {
       event = new (eventUtils.get(eventUtils.BLOCK_MOVE)!)(this) as BlockMove;
-      reason && event.setReason(reason);
+      if (reason) {
+        event.setReason(reason);
+      }
     }
 
     const delta = new Coordinate(dx, dy);

core/browser_events.ts

@@ -6,6 +6,10 @@
 
 // Former goog.module ID: Blockly.browserEvents
 
+// Theoretically we could figure out a way to type the event params correctly,
+// but it's not high priority.
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
+
 import * as Touch from './touch.js';
 import * as userAgent from './utils/useragent.js';
 
@@ -47,7 +51,7 @@ const PAGE_MODE_MULTIPLIER = 125;
 export function conditionalBind(
   node: EventTarget,
   name: string,
-  thisObject: Object | null,
+  thisObject: object | null,
   func: Function,
   opt_noCaptureIdentifier?: boolean,
 ): Data {
@@ -96,7 +100,7 @@ export function conditionalBind(
 export function bind(
   node: EventTarget,
   name: string,
-  thisObject: Object | null,
+  thisObject: object | null,
   func: Function,
 ): Data {
   /**

core/dragging/bubble_drag_strategy.ts

@@ -33,7 +33,9 @@ export class BubbleDragStrategy implements IDragStrategy {
     this.startLoc = this.bubble.getRelativeToSurfaceXY();
     this.workspace.setResizesEnabled(false);
     this.workspace.getLayerManager()?.moveToDragLayer(this.bubble);
-    this.bubble.setDragging && this.bubble.setDragging(true);
+    if (this.bubble.setDragging) {
+      this.bubble.setDragging(true);
+    }
   }
 
   drag(newLoc: Coordinate): void {

core/dropdowndiv.ts

@@ -53,7 +53,7 @@ export const ANIMATION_TIME = 0.25;
 let animateOutTimer: ReturnType<typeof setTimeout> | null = null;
 
 /** Callback for when the drop-down is hidden. */
-let onHide: Function | null = null;
+let onHide: (() => void) | null = null;
 
 /** A class name representing the current owner's workspace renderer. */
 let renderedClassName = '';
@@ -202,7 +202,7 @@ export function setColour(backgroundColour: string, borderColour: string) {
 export function showPositionedByBlock<T>(
   field: Field<T>,
   block: BlockSvg,
-  opt_onHide?: Function,
+  opt_onHide?: () => void,
   opt_secondaryYOffset?: number,
 ): boolean {
   return showPositionedByRect(
@@ -226,7 +226,7 @@ export function showPositionedByBlock<T>(
  */
 export function showPositionedByField<T>(
   field: Field<T>,
-  opt_onHide?: Function,
+  opt_onHide?: () => void,
   opt_secondaryYOffset?: number,
 ): boolean {
   positionToField = true;
@@ -278,7 +278,7 @@ function getScaledBboxOfField(field: Field): Rect {
 function showPositionedByRect(
   bBox: Rect,
   field: Field,
-  opt_onHide?: Function,
+  opt_onHide?: () => void,
   opt_secondaryYOffset?: number,
 ): boolean {
   // If we can fit it, render below the block.
@@ -334,7 +334,7 @@ export function show<T>(
   primaryY: number,
   secondaryX: number,
   secondaryY: number,
-  opt_onHide?: Function,
+  opt_onHide?: () => void,
 ): boolean {
   owner = newOwner as Field;
   onHide = opt_onHide || null;

core/events/utils.ts

@@ -256,7 +256,7 @@ function fireInternal(event: Abstract) {
       requestAnimationFrame(() => {
         setTimeout(fireNow, 0);
       });
-    } catch (e) {
+    } catch {
       // Otherwise we just want to delay so events can be coallesced.
       // requestAnimationFrame will error triggering this.
       setTimeout(fireNow, 0);

core/extensions.ts

@@ -27,7 +27,10 @@ export const TEST_ONLY = {allExtensions};
  * @throws {Error} if the extension name is empty, the extension is already
  *     registered, or extensionFn is not a function.
  */
-export function register(name: string, initFn: Function) {
+export function register<T extends Block>(
+  name: string,
+  initFn: (this: T) => void,
+) {
   if (typeof name !== 'string' || name.trim() === '') {
     throw Error('Error: Invalid extension name "' + name + '"');
   }

core/field.ts

@@ -1080,7 +1080,7 @@ export abstract class Field<T = any>
   setValue(newValue: AnyDuringMigration, fireChangeEvent = true) {
     const doLogging = false;
     if (newValue === null) {
-      doLogging && console.log('null, return');
+      if (doLogging) console.log('null, return');
       // Not a valid value to check.
       return;
     }
@@ -1092,7 +1092,7 @@ export abstract class Field<T = any>
       fireChangeEvent,
     );
     if (classValue instanceof Error) {
-      doLogging && console.log('invalid class validation, return');
+      if (doLogging) console.log('invalid class validation, return');
       return;
     }
 
@@ -1103,19 +1103,19 @@ export abstract class Field<T = any>
       fireChangeEvent,
     );
     if (localValue instanceof Error) {
-      doLogging && console.log('invalid local validation, return');
+      if (doLogging) console.log('invalid local validation, return');
       return;
     }
 
     const source = this.sourceBlock_;
     if (source && source.disposed) {
-      doLogging && console.log('source disposed, return');
+      if (doLogging) console.log('source disposed, return');
       return;
     }
 
     const oldValue = this.getValue();
     if (oldValue === localValue) {
-      doLogging && console.log('same, doValueUpdate_, return');
+      if (doLogging) console.log('same, doValueUpdate_, return');
       this.doValueUpdate_(localValue);
       return;
     }
@@ -1135,7 +1135,7 @@ export abstract class Field<T = any>
     if (this.isDirty_) {
       this.forceRerender();
     }
-    doLogging && console.log(this.value_);
+    if (doLogging) console.log(this.value_);
   }
 
   /**

core/flyout_base.ts

@@ -1070,7 +1070,7 @@ export abstract class Flyout
    * @param block The flyout block to copy.
    * @returns Function to call when block is clicked.
    */
-  private blockMouseDown(block: BlockSvg): Function {
+  private blockMouseDown(block: BlockSvg) {
     return (e: PointerEvent) => {
       const gesture = this.targetWorkspace.getGesture(e);
       if (gesture) {

core/flyout_metrics_manager.ts

@@ -44,7 +44,7 @@ export class FlyoutMetricsManager extends MetricsManager {
     let blockBoundingBox;
     try {
       blockBoundingBox = this.workspace_.getCanvas().getBBox();
-    } catch (e) {
+    } catch {
       // Firefox has trouble with hidden elements (Bug 528969).
       // 2021 Update: It looks like this was fixed around Firefox 77 released in
       // 2020.

core/insertion_marker_manager.ts

@@ -529,7 +529,7 @@ export class InsertionMarkerManager {
         local.getSourceBlock(),
         local,
       );
-    } catch (e) {
+    } catch {
       // It's possible that the number of connections on the local block has
       // changed since the insertion marker was originally created.  Let's
       // recreate the insertion marker and try again. In theory we could

core/interfaces/i_comment_icon.ts

@@ -26,7 +26,7 @@ export interface ICommentIcon extends IIcon, IHasBubble, ISerializable {
 }
 
 /** Checks whether the given object is an ICommentIcon. */
-export function isCommentIcon(obj: Object): obj is ICommentIcon {
+export function isCommentIcon(obj: object): obj is ICommentIcon {
   return (
     isIcon(obj) &&
     hasBubble(obj) &&

core/interfaces/i_legacy_procedure_blocks.ts

@@ -28,7 +28,7 @@ export interface LegacyProcedureDefBlock {
 
 /** @internal */
 export function isLegacyProcedureDefBlock(
-  block: Object,
+  block: object,
 ): block is LegacyProcedureDefBlock {
   return (block as any).getProcedureDef !== undefined;
 }
@@ -41,7 +41,7 @@ export interface LegacyProcedureCallBlock {
 
 /** @internal */
 export function isLegacyProcedureCallBlock(
-  block: Object,
+  block: object,
 ): block is LegacyProcedureCallBlock {
   return (
     (block as any).getProcedureCall !== undefined &&

core/interfaces/i_selectable.ts

@@ -24,7 +24,7 @@ export interface ISelectable {
 }
 
 /** Checks whether the given object is an ISelectable. */
-export function isSelectable(obj: Object): obj is ISelectable {
+export function isSelectable(obj: object): obj is ISelectable {
   return (
     typeof (obj as any).id === 'string' &&
     (obj as any).workspace !== undefined &&

core/interfaces/i_serializer.ts

@@ -31,7 +31,7 @@ export interface ISerializer {
    * @returns A JS object containing the system's state, or null if there is no
    *     state to record.
    */
-  save(workspace: Workspace): Object | null;
+  save(workspace: Workspace): object | null;
   /* eslint-enable valid-jsdoc */
 
   /**
@@ -42,7 +42,7 @@ export interface ISerializer {
    * @param workspace The workspace the system to deserialize is associated
    *     with.
    */
-  load(state: Object, workspace: Workspace): void;
+  load(state: object, workspace: Workspace): void;
 
   /**
    * Clears the state of the plugin or system.

core/menuitem.ts

@@ -41,7 +41,7 @@ export class MenuItem {
   private highlight = false;
 
   /** Bound function to call when this menu item is clicked. */
-  private actionHandler: Function | null = null;
+  private actionHandler: ((obj: this) => void) | null = null;
 
   /**
    * @param content Text caption to display as the content of the item, or a

core/registry.ts

@@ -193,7 +193,7 @@ export function register<T>(
  * @param registryItem A class or object that we are checking for the required
  *     properties.
  */
-function validate(type: string, registryItem: Function | AnyDuringMigration) {
+function validate(type: string, registryItem: AnyDuringMigration) {
   switch (type) {
     case String(Type.FIELD):
       if (typeof registryItem.fromJson !== 'function') {

core/rendered_connection.ts

@@ -146,7 +146,7 @@ export class RenderedConnection extends Connection {
     }
     // Raise it to the top for extra visibility.
     const selected = common.getSelected() == rootBlock;
-    selected || rootBlock.addSelect();
+    if (!selected) rootBlock.addSelect();
     let dx =
       staticConnection.x +
       config.snapRadius +
@@ -169,7 +169,7 @@ export class RenderedConnection extends Connection {
         this.x;
     }
     rootBlock.moveBy(dx, dy, ['bump']);
-    selected || rootBlock.removeSelect();
+    if (!selected) rootBlock.removeSelect();
   }
 
   /**
@@ -389,9 +389,10 @@ export class RenderedConnection extends Connection {
       if (block.isCollapsed()) {
         // This block should only be partially revealed since it is collapsed.
         connections = [];
-        block.outputConnection && connections.push(block.outputConnection);
-        block.nextConnection && connections.push(block.nextConnection);
-        block.previousConnection && connections.push(block.previousConnection);
+        if (block.outputConnection) connections.push(block.outputConnection);
+        if (block.nextConnection) connections.push(block.nextConnection);
+        if (block.previousConnection)
+          connections.push(block.previousConnection);
       } else {
         // Show all connections of this block.
         connections = block.getConnections_(true);

core/renderers/common/block_rendering.ts

@@ -45,7 +45,10 @@ import {Renderer} from './renderer.js';
  * @param rendererClass The new renderer class to register.
  * @throws {Error} if a renderer with the same name has already been registered.
  */
-export function register(name: string, rendererClass: Function) {
+export function register(
+  name: string,
+  rendererClass: new (name: string) => Renderer,
+) {
   registry.register(registry.Type.RENDERER, name, rendererClass);
 }
 

core/renderers/common/marker_svg.ts

@@ -176,9 +176,11 @@ export class MarkerSvg {
 
     // Ensures the marker will be visible immediately after the move.
     const animate = this.currentMarkerSvg!.childNodes[0];
-    if (animate !== undefined) {
-      (animate as SVGAnimationElement).beginElement &&
-        (animate as SVGAnimationElement).beginElement();
+    if (
+      animate !== undefined &&
+      (animate as SVGAnimationElement).beginElement
+    ) {
+      (animate as SVGAnimationElement).beginElement();
     }
   }
 

core/renderers/measurables/types.ts

@@ -13,6 +13,9 @@ import type {Row} from './row.js';
  * Types of rendering elements.
  */
 class TypesContainer {
+  // This class is very non-idiomatic for typescript, so we have to use
+  // the Function type to make it happy.
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   [index: string]: number | Function;
 
   NONE = 0; // None