chore: Migrate core/ to Typescript, actually (#6299)

* fix: convert files to typescript

* fix: add alias for AnyDuringMigration so that tsc will run

* chore: format

* chore: enable ts for the clang-format workflow (#6233)

* chore: Restore @fileoverview comment locations (#6237)

* chore: add declareModuleId (#6238)

* fix: Revert comment change to app_controller.js (#6241)

* fix: Add missing import goog statements (#6240)

I've added the import statement immediately before the
goog.declareModuleId calls that depend on it.

There is an argument to be made that we should put the import
statement in their normal place amongst any other imports, and
move the declareModuleId statement to below the double blank
line below the imports, but as these are so tightly coupled,
replace the previous goog.module calls, and will both be deleted
at the same time once the transition to TypeScript is fully complete
I think it's fine (and certainly much easier) to do it this way.

* chore: Fix whitespace (#6243)

* fix: Remove spurious blank lines

  Remove extraneous blank lines introduced by deletion of
  'use strict'; pragmas.

  Also fix the location of the goog.declareModuleId call in
  core/utils/array.ts.

* fix: Add missing double-blank-line before body of modules

  Our convention is to have two blank lines between the imports (or
  module ID, if there are no imports) and the beginning of the body
  of the module.  Enforce this.

* fix: one addition format error for PR #6243

* fix(build): Skip npm prepare when running in CI (#6244)

Have npm prepare do nothing when running in CI.

We don't need to do any building, because npm test will build
everything needed in the workflows in which it is run, and we
don't want to build anything in other workflows because a tsc
error would prevent those workflows from completing.

* fix: re-add `@package` annotations as `@internal` annotations (#6232)

* fix: add ~70% of internal attributes

* fix: work on manually adding more @internal annotations

* fix: add more manual internal annotations

* fix: rename package typos to internal

* fix: final manual fixes for internal annotations

* chore: format

* chore: make unnecessary multiline jsdoc a single line

* fix: fix internal tags in serialization exceptions

* fix: tsc errors picked up from develop (#6224)

* fix: relative path for deprecation utils

* fix: checking if properties exist in svg_math

* fix: set all timeout PIDs to AnyDuringMigration

* fix: make nullability errors explicity in block drag surface

* fix: make null check in events_block_change explicit

* fix: make getEventWorkspace_ internal so we can access it from CommentCreateDeleteHelper

* fix: rename DIV -> containerDiv in tooltip

* fix: ignore backwards compat check in category

* fix: set block styles to AnyDuringMigration

* fix: type typo in KeyboardShortcut

* fix: constants name in row measurables

* fix: typecast in mutator

* fix: populateProcedures type of flattened array

* fix: ignore errors related to workspace comment deserialization

* chore: format files

* fix: renaming imports missing file extensions

* fix: remove check for sound.play

* fix: temporarily remove bad requireType.

All `export type` statements are stripped when tsc is run. This means
that when we attempt to require BlockDefinition from the block files, we
get an error because it does not exist.

We decided to temporarily remove the require, because this will no
longer be a problem when we conver the blocks to typescript, and
everything gets compiled together.

* fix: bad jsdoc in array

* fix: silence missing property errors

Closure was complaining about inexistant properties, but they actually
do exist, they're just not being transpiled by tsc in a way that closure
understands.

I.E. if things are initialized in a function called by the constructor,
rather than in a class field or in the custructor itself, closure would
error.

It would also error on enums, because they are transpiled to a weird
IIFE.

* fix: context menu action handler not knowing the type of this.

this: TypeX information gets stripped when tsc is run, so closure could
not know that this was not global. Fixed this by reorganizing to use the
option object directly instead of passing it to onAction to be bound to
this.

* fix: readd getDeveloperVars checks (should not be part of migration)

This was found because ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE was no
longer being accessed.

* fix: silence closure errors about overriding supertype props

We propertly define the overrides in typescript, but these get removed
from the compiled output, so closure doesn't know they exist.

* fix: silence globalThis errors

this: TypeX annotations get stripped from the compiled output, so
closure can't know that we're accessing the correct things. However,
typescript makes sure that this always has the correct properties, so
silencing this should be fine.

* fix: bad jsdoc name

* chore: attempt compiling with blockly.js

* fix: attempt moving the import statement above the namespace line

* chore: add todo comments to block def files

* chore: remove todo from context menu

* chore: add comments abotu disabled errors

* chore: move comments back to their correct positions (#6249)

* fix: work on fixing comments

* chore: finish moving all comments

* chore: format

* chore: move some other messed up comments

* chore: format

* fix: Correct enum formatting, use merged `namespace`s for types that are class static members (#6246)

* fix: formatting of enum KeyCodes

* fix: Use merged namespace for ContextMenuRegistry static types

  - Create a namespace to be merged with the ContextMenuRegistry
    class containing the types that were formerly declared as static
    properties on that class.

  - Use type aliases to export them individually as well, for
    compatibility with the changes made by MigranTS (and/or
    @gonfunko) to how other modules in core/ now import these
    types.

  - Update renamings.json5 to reflect the availability of the
    direct exports for modules that import this module directly
    (though they are not available to, and will not be used by,
    code that imports only via blockly.js/blockly.ts.)

* fix: Use merged namespace for Input.Align

  - Create a merged namespace for the Input.Align enum.

  - Use type/const aliases to export it as Input too.

  - Update renamings.json5 to reflect the availability of the
    direct export.

* fix: Use merged namespace for Names.NameType

  - Create a merged namespace for the Names.NameType enum.

  - Use type/const aliases to export it as NameType too.

  - Update renamings.json5 to reflect the availability of the
    direct export.  (This ought to have happened in an earlier
    version as it was already available by both routes.)

* chore: Fix minor issues for PR #6246

  - Use `Align` instead of `Input.Align` where possible.

* fix(build): Suppress irrelevant JSC_UNUSED_LOCAL_ASSIGNMENT errors

  tsc generates code for merged namespaces that looks like:

      (function (ClassName) {
          let EnumName;
          (function (EnumName) {
              EnumName[EnumNameAlign["v1"] = 0] = "v1";
              // etc.
          })(EnumName = ClassName.EnumName || (ClassName.EnumName = {}));
      })(ClassName || (ClassName = {}));

  and Closure Compiler complains about the fact that the EnumName let
  binding is initialised but never used.  (It exists so that any other
  code that was in the namespace could see the enum.)

  Suppress this message, since it is not actionable and lint and/or tsc
  should tell us if we have actual unused variables in our .ts files.

* chore(build): Suppress spurious warnings from closure-make-deps (#6253)

A little bit of an ugly hack, but it works: pipe stderr through
grep -v to suppress error output starting with "WARNING in".

* fix: remaining enums that weren't properly exported (#6251)

* fix: remaining enums that weren't properly exported

* chore: format

* fix: add enum value exports

* chore: format

* fix: properly export interfaces that were typedefs (#6250)

* fix: properly export interfaces that were typedefs

* fix: allowCollsion -> allowCollision

* fix: convert unconverted enums

* fix: enums that were/are instance properties

* fix: revert changes to property enums

* fix: renamed protected parameter properties (#6252)

* fix: bad protected parameter properties

* chore:format

* fix: gesture constructor

* fix: overridden properties that were renamed

* refactor: Migrate `blockly.js` to TypeScript (#6261)

* chore: Apply changes to blockly.js to blockly.ts

* fix: Build using core/blockly.ts instead of .js

  Compiles and runs in compressed mode correctly!

* fix(build): Don't depend on execSync running bash (#6262)

For some reason on Github CI servers execSync uses /bin/sh, which
is (on Ubuntu) dash rather than bash, and does not understand
the pipefail option.

So remove the grep pipe on stderr and just discard all error output
at all.

This is not ideal as errors in test deps will go unreported AND
not even cause test failure, but it's not clear that it's worth
investing more time to fix this at the moment.

* chore: use `import type` where possible (#6279)

* chore: automatically change imports to import types

* chore: revert changes that actually need to be imports

* chore: format

* chore: add more import type statements based on importsNotUsedAsValues

* chore: fix tsconfig

* chore: add link to compiler issue

* fix: add type information to blockly options (#6283)

* fix: add type information to blockly options

* chore: format

* chore: remove erroneous comment

* fix: bugs revealed by getting the built output working (#6282)

* fix: types of compose and decompose in block

* fix: workspace naming in toolbox

* chore: add jsdoc

* chore: restore registry comments to better positions

* chore: pr comments'

* fix(variables): Revert inadvertent change to allDeveloperVariables (#6290)

It appears that a function call got modified incorrectly (probably
in an effort to fix a typing issue).  This fix trivially reverts
the line in question to match the original JS version from develop.

This causes the generator tests to pass.

* fix: circular dependencies (#6281)

* chore: fix circular dependencies w/ static workspace funcs

* remove preserved imports that aren't currently necessary (probably)

* fix circular dependency with workspaces and block using stub

* fix dependency between variables and xml by moving function to utils

* add stub for trashcan as well

* fix line endings from rebase

* fix goog/base order

* add trashcan patch

* fix: types of compose and decompose in block

* fix: workspace naming in toolbox

* chore: add jsdoc

* chore: restore registry comments to better positions

* chore: remove implementations in goog.js

* chore: fix types of stubs

* chore: remove added AnyDuringMigration casts

* chore: remove modifications to xml and variables

* chore: format

* chore: remove event requirements in workspace comments

* chore: fix circular dependency with xml and workspace comments

* fixup remove ContextMenu import

* chore: fix dependency between mutator and workspace

* chore: break circular dependency between names and procedures

* chore: get tests to run?

* chore: pr comments'

* chore: fix stubbing field registry fromJson

* chore: fix spying on fire

* chore: fix stubbing parts of connection checker

* chore: fix stubbing dialog

* chore: fix stubbing style

* chore: fix spying on duplicate

* chore: fix stubbing variables

* chore: fix stubbing copy

* chore: fix stubbing in workspace

* chore: remove unnecessary stubs

* chore: fix formatting

* chore: fix other formatting

* chore: add backwards compatible static properties to workspace

* chore: move static type properties

* chore: move and comment stubs

* chore: add newlines at EOF

* chore: improve errors for monkey patched functions

* chore: update comment with a pointer to the doc

* chore: update comment with a pointer to the doc

* chore: format

* chore: revert changes to playground used for testing (#6292)

* chore: get mocha tests to pass. (#6291)

* chore: fix undo and empty code blocks

* chore: skip IE test

* chore: fix gesture test

* chore: fix replace message references test

* chore: fix string table interpolation

* chore: skip getById tests

* chore: fix field tests

* chore: fix console errors by making workspace nullable

* chore: format

* chore: fix definition overwrite warning

* chore: update metadata

* chore: temporarily modify the the advanced compile test

* chore: fix gestures by fixing test instead

Co-authored-by: Neil Fraser <fraser@google.com>
Co-authored-by: Christopher Allen <cpcallen+git@google.com>

core/utils.ts

@@ -7,178 +7,192 @@
 /**
  * @fileoverview Utility methods.
  */
-'use strict';
 
 /**
  * Utility methods.
  * @namespace Blockly.utils
  */
-goog.module('Blockly.utils');
+import * as goog from '../closure/goog/goog.js';
+goog.declareModuleId('Blockly.utils');
 
-const aria = goog.require('Blockly.utils.aria');
-const arrayUtils = goog.require('Blockly.utils.array');
-const browserEvents = goog.require('Blockly.browserEvents');
-const colourUtils = goog.require('Blockly.utils.colour');
-const common = goog.require('Blockly.common');
-const deprecation = goog.require('Blockly.utils.deprecation');
-const dom = goog.require('Blockly.utils.dom');
-const extensions = goog.require('Blockly.Extensions');
-const idGenerator = goog.require('Blockly.utils.idGenerator');
-const math = goog.require('Blockly.utils.math');
-const object = goog.require('Blockly.utils.object');
-const parsing = goog.require('Blockly.utils.parsing');
-const stringUtils = goog.require('Blockly.utils.string');
-const style = goog.require('Blockly.utils.style');
-const svgMath = goog.require('Blockly.utils.svgMath');
-const svgPaths = goog.require('Blockly.utils.svgPaths');
-const toolbox = goog.require('Blockly.utils.toolbox');
-const userAgent = goog.require('Blockly.utils.userAgent');
-const xmlUtils = goog.require('Blockly.utils.xml');
-/* eslint-disable-next-line no-unused-vars */
-const {Block} = goog.requireType('Blockly.Block');
-const {Coordinate} = goog.require('Blockly.utils.Coordinate');
-const {KeyCodes} = goog.require('Blockly.utils.KeyCodes');
-const {Metrics} = goog.require('Blockly.utils.Metrics');
-const {Rect} = goog.require('Blockly.utils.Rect');
-const {Size} = goog.require('Blockly.utils.Size');
-const {Svg} = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
+import type {Block} from './block.js';
+import * as browserEvents from './browser_events.js';
+import * as common from './common.js';
+import * as extensions from './extensions.js';
+import * as aria from './utils/aria.js';
+import * as arrayUtils from './utils/array.js';
+import * as colour from './utils/colour.js';
+import {Coordinate} from './utils/coordinate.js';
+import * as deprecation from './utils/deprecation.js';
+import * as dom from './utils/dom.js';
+import * as idGenerator from './utils/idgenerator.js';
+import {KeyCodes} from './utils/keycodes.js';
+import * as math from './utils/math.js';
+import type {Metrics} from './utils/metrics.js';
+import * as object from './utils/object.js';
+import * as parsing from './utils/parsing.js';
+import {Rect} from './utils/rect.js';
+import {Size} from './utils/size.js';
+import * as stringUtils from './utils/string.js';
+import * as style from './utils/style.js';
+import {Svg} from './utils/svg.js';
+import * as svgMath from './utils/svg_math.js';
+import * as svgPaths from './utils/svg_paths.js';
+import * as toolbox from './utils/toolbox.js';
+import * as userAgent from './utils/useragent.js';
+import * as xml from './utils/xml.js';
+import type {WorkspaceSvg} from './workspace_svg.js';
 
 
-exports.aria = aria;
-exports.colour = colourUtils;
-exports.Coordinate = Coordinate;
-exports.deprecation = deprecation;
-exports.dom = dom;
-exports.idGenerator = idGenerator;
-exports.KeyCodes = KeyCodes;
-exports.math = math;
-exports.Metrics = Metrics;
-exports.object = object;
-exports.parsing = parsing;
-exports.Rect = Rect;
-exports.Size = Size;
-exports.string = stringUtils;
-exports.style = style;
-exports.Svg = Svg;
-exports.svgPaths = svgPaths;
-exports.svgMath = svgMath;
-exports.toolbox = toolbox;
-exports.userAgent = userAgent;
-exports.xml = xmlUtils;
+export {
+  aria,
+  arrayUtils as array,
+  browserEvents,
+  colour,
+  Coordinate,
+  deprecation,
+  dom,
+  extensions,
+  idGenerator,
+  KeyCodes,
+  math,
+  Metrics,
+  object,
+  parsing,
+  Rect,
+  Size,
+  stringUtils as string,
+  style,
+  Svg,
+  svgMath,
+  svgPaths,
+  toolbox,
+  userAgent,
+  xml
+};
 
 /**
  * Halts the propagation of the event without doing anything else.
- * @param {!Event} e An event.
+ * @param e An event.
  * @deprecated
  * @alias Blockly.utils.noEvent
  */
-const noEvent = function(e) {
-  deprecation.warn('Blockly.utils.noEvent', 'September 2021', 'September 2022');
+export function noEvent(e: Event) {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn('Blockly.utils.noEvent', 'September 2021', 'September 2022');
   // This event has been handled.  No need to bubble up to the document.
   e.preventDefault();
   e.stopPropagation();
-};
-exports.noEvent = noEvent;
+}
 
 /**
  * Returns true if this event is targeting a text input widget?
- * @param {!Event} e An event.
- * @return {boolean} True if text input.
+ * @param e An event.
+ * @return True if text input.
  * @deprecated Use Blockly.browserEvents.isTargetInput instead.
  * @alias Blockly.utils.isTargetInput
  */
-const isTargetInput = function(e) {
-  deprecation.warn(
-      'Blockly.utils.isTargetInput', 'September 2021', 'September 2022',
-      'Blockly.browserEvents.isTargetInput');
+export function isTargetInput(e: Event): boolean {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.isTargetInput', 'September 2021', 'September 2022',
+          'Blockly.browserEvents.isTargetInput');
   return browserEvents.isTargetInput(e);
-};
-exports.isTargetInput = isTargetInput;
+}
 
 /**
  * Return the coordinates of the top-left corner of this element relative to
  * its parent.  Only for SVG elements and children (e.g. rect, g, path).
- * @param {!Element} element SVG element to find the coordinates of.
- * @return {!Coordinate} Object with .x and .y properties.
+ * @param element SVG element to find the coordinates of.
+ * @return Object with .x and .y properties.
  * @deprecated
  * @alias Blockly.utils.getRelativeXY
  */
-const getRelativeXY = function(element) {
-  deprecation.warn(
-      'Blockly.utils.getRelativeXY', 'December 2021', 'December 2022',
-      'Blockly.utils.svgMath.getRelativeXY');
-  return svgMath.getRelativeXY(element);
-};
-exports.getRelativeXY = getRelativeXY;
+export function getRelativeXY(element: Element): Coordinate {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.getRelativeXY', 'December 2021', 'December 2022',
+          'Blockly.utils.svgMath.getRelativeXY');
+  // AnyDuringMigration because:  Property 'getRelativeXY' does not exist on
+  // type 'void'.
+  return (svgMath as AnyDuringMigration).getRelativeXY(element);
+}
 
 /**
  * Return the coordinates of the top-left corner of this element relative to
  * the div Blockly was injected into.
- * @param {!Element} element SVG element to find the coordinates of. If this is
- *     not a child of the div Blockly was injected into, the behaviour is
- *     undefined.
- * @return {!Coordinate} Object with .x and .y properties.
+ * @param element SVG element to find the coordinates of. If this is not a child
+ *     of the div Blockly was injected into, the behaviour is undefined.
+ * @return Object with .x and .y properties.
  * @deprecated
  * @alias Blockly.utils.getInjectionDivXY_
  */
-const getInjectionDivXY = function(element) {
-  deprecation.warn(
-      'Blockly.utils.getInjectionDivXY_', 'December 2021', 'December 2022',
-      'Blockly.utils.svgMath.getInjectionDivXY');
-  return svgMath.getInjectionDivXY(element);
-};
-exports.getInjectionDivXY_ = getInjectionDivXY;
+function getInjectionDivXY(element: Element): Coordinate {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.getInjectionDivXY_', 'December 2021', 'December 2022',
+          'Blockly.utils.svgMath.getInjectionDivXY');
+  // AnyDuringMigration because:  Property 'getInjectionDivXY' does not exist on
+  // type 'void'.
+  return (svgMath as AnyDuringMigration).getInjectionDivXY(element);
+}
+export const getInjectionDivXY_ = getInjectionDivXY;
 
 /**
  * Returns true this event is a right-click.
- * @param {!Event} e Mouse event.
- * @return {boolean} True if right-click.
+ * @param e Mouse event.
+ * @return True if right-click.
  * @deprecated Use Blockly.browserEvents.isRightButton instead.
  * @alias Blockly.utils.isRightButton
  */
-const isRightButton = function(e) {
-  deprecation.warn(
-      'Blockly.utils.isRightButton', 'September 2021', 'September 2022',
-      'Blockly.browserEvents.isRightButton');
+export function isRightButton(e: Event): boolean {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.isRightButton', 'September 2021', 'September 2022',
+          'Blockly.browserEvents.isRightButton');
   return browserEvents.isRightButton(e);
-};
-exports.isRightButton = isRightButton;
+}
 
 /**
  * Returns the converted coordinates of the given mouse event.
  * The origin (0,0) is the top-left corner of the Blockly SVG.
- * @param {!Event} e Mouse event.
- * @param {!SVGSVGElement} svg SVG element.
- * @param {?SVGMatrix} matrix Inverted screen CTM to use.
- * @return {!SVGPoint} Object with .x and .y properties.
+ * @param e Mouse event.
+ * @param svg SVG element.
+ * @param matrix Inverted screen CTM to use.
+ * @return Object with .x and .y properties.
  * @deprecated Use Blockly.browserEvents.mouseToSvg instead;
  * @alias Blockly.utils.mouseToSvg
  */
-const mouseToSvg = function(e, svg, matrix) {
-  deprecation.warn(
-      'Blockly.utils.mouseToSvg', 'September 2021', 'September 2022',
-      'Blockly.browserEvents.mouseToSvg');
+export function mouseToSvg(
+    e: Event, svg: SVGSVGElement, matrix: SVGMatrix|null): SVGPoint {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.mouseToSvg', 'September 2021', 'September 2022',
+          'Blockly.browserEvents.mouseToSvg');
   return browserEvents.mouseToSvg(e, svg, matrix);
-};
-exports.mouseToSvg = mouseToSvg;
+}
 
 /**
  * Returns the scroll delta of a mouse event in pixel units.
- * @param {!WheelEvent} e Mouse event.
- * @return {{x: number, y: number}} Scroll delta object with .x and .y
- *    properties.
+ * @param e Mouse event.
+ * @return Scroll delta object with .x and .y properties.
  * @deprecated Use Blockly.browserEvents.getScrollDeltaPixels instead.
  * @alias Blockly.utils.getScrollDeltaPixels
  */
-const getScrollDeltaPixels = function(e) {
-  deprecation.warn(
-      'Blockly.utils.getScrollDeltaPixels', 'September 2021', 'September 2022',
-      'Blockly.browserEvents.getScrollDeltaPixels');
+export function getScrollDeltaPixels(e: WheelEvent): {x: number, y: number} {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.getScrollDeltaPixels', 'September 2021',
+          'September 2022', 'Blockly.browserEvents.getScrollDeltaPixels');
   return browserEvents.getScrollDeltaPixels(e);
-};
-exports.getScrollDeltaPixels = getScrollDeltaPixels;
+}
 
 /**
  * Parse a string with any number of interpolation tokens (%1, %2, ...).
@@ -186,196 +200,229 @@ exports.getScrollDeltaPixels = getScrollDeltaPixels;
  * %{BKY_MY_MSG} will both be replaced with the value in
  * Msg['MY_MSG']). Percentage sign characters '%' may be self-escaped
  * (e.g., '%%').
- * @param {string} message Text which might contain string table references and
+ * @param message Text which might contain string table references and
  *     interpolation tokens.
- * @return {!Array<string|number>} Array of strings and numbers.
+ * @return Array of strings and numbers.
  * @deprecated
  * @alias Blockly.utils.tokenizeInterpolation
  */
-const tokenizeInterpolation = function(message) {
-  deprecation.warn(
-      'Blockly.utils.tokenizeInterpolation', 'December 2021', 'December 2022',
-      'Blockly.utils.parsing.tokenizeInterpolation');
-  return parsing.tokenizeInterpolation(message);
-};
-exports.tokenizeInterpolation = tokenizeInterpolation;
+export function tokenizeInterpolation(message: string): Array<string|number> {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.tokenizeInterpolation', 'December 2021',
+          'December 2022', 'Blockly.utils.parsing.tokenizeInterpolation');
+  // AnyDuringMigration because:  Property 'tokenizeInterpolation' does not
+  // exist on type 'void'.
+  return (parsing as AnyDuringMigration).tokenizeInterpolation(message);
+}
 
 /**
  * Replaces string table references in a message, if the message is a string.
  * For example, "%{bky_my_msg}" and "%{BKY_MY_MSG}" will both be replaced with
  * the value in Msg['MY_MSG'].
- * @param {string|?} message Message, which may be a string that contains
- *     string table references.
- * @return {string} String with message references replaced.
+ * @param message Message, which may be a string that contains string table
+ *     references.
+ * @return String with message references replaced.
  * @deprecated
  * @alias Blockly.utils.replaceMessageReferences
  */
-const replaceMessageReferences = function(message) {
-  deprecation.warn(
-      'Blockly.utils.replaceMessageReferences', 'December 2021',
-      'December 2022', 'Blockly.utils.parsing.replaceMessageReferences');
-  return parsing.replaceMessageReferences(message);
-};
-exports.replaceMessageReferences = replaceMessageReferences;
+export function replaceMessageReferences(message: string|
+                                         AnyDuringMigration): string {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.replaceMessageReferences', 'December 2021',
+          'December 2022', 'Blockly.utils.parsing.replaceMessageReferences');
+  // AnyDuringMigration because:  Property 'replaceMessageReferences' does not
+  // exist on type 'void'.
+  return (parsing as AnyDuringMigration).replaceMessageReferences(message);
+}
 
 /**
  * Validates that any %{MSG_KEY} references in the message refer to keys of
  * the Msg string table.
- * @param {string} message Text which might contain string table references.
- * @return {boolean} True if all message references have matching values.
+ * @param message Text which might contain string table references.
+ * @return True if all message references have matching values.
  *     Otherwise, false.
  * @deprecated
  * @alias Blockly.utils.checkMessageReferences
  */
-const checkMessageReferences = function(message) {
-  deprecation.warn(
-      'Blockly.utils.checkMessageReferences', 'December 2021', 'December 2022',
-      'Blockly.utils.parsing.checkMessageReferences');
-  return parsing.checkMessageReferences(message);
-};
-exports.checkMessageReferences = checkMessageReferences;
+export function checkMessageReferences(message: string): boolean {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.checkMessageReferences', 'December 2021',
+          'December 2022', 'Blockly.utils.parsing.checkMessageReferences');
+  // AnyDuringMigration because:  Property 'checkMessageReferences' does not
+  // exist on type 'void'.
+  return (parsing as AnyDuringMigration).checkMessageReferences(message);
+}
 
 /**
  * Generate a unique ID.
- * @return {string} A globally unique ID string.
+ * @return A globally unique ID string.
  * @deprecated Use Blockly.utils.idGenerator.genUid instead.
  * @alias Blockly.utils.genUid
  */
-const genUid = function() {
-  deprecation.warn(
-      'Blockly.utils.genUid', 'September 2021', 'September 2022',
-      'Blockly.utils.idGenerator.genUid');
-  return idGenerator.genUid();
-};
-exports.genUid = genUid;
+export function genUid(): string {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.genUid', 'September 2021', 'September 2022',
+          'Blockly.utils.idGenerator.genUid');
+  // AnyDuringMigration because:  Property 'genUid' does not exist on type
+  // 'void'.
+  return (idGenerator as AnyDuringMigration).genUid();
+}
 
 /**
  * Check if 3D transforms are supported by adding an element
  * and attempting to set the property.
- * @return {boolean} True if 3D transforms are supported.
+ * @return True if 3D transforms are supported.
  * @deprecated
  * @alias Blockly.utils.is3dSupported
  */
-const is3dSupported = function() {
-  deprecation.warn(
-      'Blockly.utils.is3dSupported', 'December 2021', 'December 2022',
-      'Blockly.utils.svgMath.is3dSupported');
-  return svgMath.is3dSupported();
-};
-exports.is3dSupported = is3dSupported;
+export function is3dSupported(): boolean {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.is3dSupported', 'December 2021', 'December 2022',
+          'Blockly.utils.svgMath.is3dSupported');
+  // AnyDuringMigration because:  Property 'is3dSupported' does not exist on
+  // type 'void'.
+  return (svgMath as AnyDuringMigration).is3dSupported();
+}
 
 /**
  * Get the position of the current viewport in window coordinates.  This takes
  * scroll into account.
- * @return {!Rect} An object containing window width, height, and
- *     scroll position in window coordinates.
+ * @return An object containing window width, height, and scroll position in
+ *     window coordinates.
  * @alias Blockly.utils.getViewportBBox
  * @deprecated
- * @package
+ * @internal
  */
-const getViewportBBox = function() {
-  deprecation.warn(
-      'Blockly.utils.getViewportBBox', 'December 2021', 'December 2022',
-      'Blockly.utils.svgMath.getViewportBBox');
-  return svgMath.getViewportBBox();
-};
-exports.getViewportBBox = getViewportBBox;
+export function getViewportBBox(): Rect {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.getViewportBBox', 'December 2021', 'December 2022',
+          'Blockly.utils.svgMath.getViewportBBox');
+  // AnyDuringMigration because:  Property 'getViewportBBox' does not exist on
+  // type 'void'.
+  return (svgMath as AnyDuringMigration).getViewportBBox();
+}
 
 /**
  * Removes the first occurrence of a particular value from an array.
- * @param {!Array} arr Array from which to remove value.
- * @param {*} value Value to remove.
- * @return {boolean} True if an element was removed.
+ * @param arr Array from which to remove value.
+ * @param value Value to remove.
+ * @return True if an element was removed.
  * @alias Blockly.utils.arrayRemove
  * @deprecated
- * @package
+ * @internal
  */
-const arrayRemove = function(arr, value) {
-  deprecation.warn(
-      'Blockly.utils.arrayRemove', 'December 2021', 'December 2022');
+export function arrayRemove(
+    arr: AnyDuringMigration[], value: AnyDuringMigration): boolean {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn('Blockly.utils.arrayRemove', 'December 2021', 'December 2022');
   return arrayUtils.removeElem(arr, value);
-};
-exports.arrayRemove = arrayRemove;
+}
 
 /**
  * Gets the document scroll distance as a coordinate object.
  * Copied from Closure's goog.dom.getDocumentScroll.
- * @return {!Coordinate} Object with values 'x' and 'y'.
+ * @return Object with values 'x' and 'y'.
  * @deprecated
  * @alias Blockly.utils.getDocumentScroll
  */
-const getDocumentScroll = function() {
-  deprecation.warn(
-      'Blockly.utils.getDocumentScroll', 'December 2021', 'December 2022',
-      'Blockly.utils.svgMath.getDocumentScroll');
-  return svgMath.getDocumentScroll();
-};
-exports.getDocumentScroll = getDocumentScroll;
+export function getDocumentScroll(): Coordinate {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.getDocumentScroll', 'December 2021', 'December 2022',
+          'Blockly.utils.svgMath.getDocumentScroll');
+  // AnyDuringMigration because:  Property 'getDocumentScroll' does not exist on
+  // type 'void'.
+  return (svgMath as AnyDuringMigration).getDocumentScroll();
+}
 
 /**
  * Get a map of all the block's descendants mapping their type to the number of
  *    children with that type.
- * @param {!Block} block The block to map.
- * @param {boolean=} opt_stripFollowing Optionally ignore all following
- *    statements (blocks that are not inside a value or statement input
- *    of the block).
- * @return {!Object} Map of types to type counts for descendants of the bock.
+ * @param block The block to map.
+ * @param opt_stripFollowing Optionally ignore all following statements (blocks
+ *     that are not inside a value or statement input of the block).
+ * @return Map of types to type counts for descendants of the bock.
  * @deprecated
  * @alias Blockly.utils.getBlockTypeCounts
  */
-const getBlockTypeCounts = function(block, opt_stripFollowing) {
-  deprecation.warn(
-      'Blockly.utils.getBlockTypeCounts', 'December 2021', 'December 2022',
-      'Blockly.common.getBlockTypeCounts');
+export function getBlockTypeCounts(
+    block: Block, opt_stripFollowing?: boolean): AnyDuringMigration {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.getBlockTypeCounts', 'December 2021', 'December 2022',
+          'Blockly.common.getBlockTypeCounts');
   return common.getBlockTypeCounts(block, opt_stripFollowing);
-};
-exports.getBlockTypeCounts = getBlockTypeCounts;
+}
 
 /**
  * Converts screen coordinates to workspace coordinates.
- * @param {!WorkspaceSvg} ws The workspace to find the coordinates on.
- * @param {!Coordinate} screenCoordinates The screen coordinates to
- * be converted to workspace coordinates
+ * @param ws The workspace to find the coordinates on.
+ * @param screenCoordinates The screen coordinates to be converted to workspace
+ *     coordinates
  * @deprecated
- * @return {!Coordinate} The workspace coordinates.
+ * @return The workspace coordinates.
  */
-const screenToWsCoordinates = function(ws, screenCoordinates) {
-  deprecation.warn(
-      'Blockly.utils.screenToWsCoordinates', 'December 2021', 'December 2022',
-      'Blockly.utils.svgMath.screenToWsCoordinates');
-  return svgMath.screenToWsCoordinates(ws, screenCoordinates);
-};
-exports.screenToWsCoordinates = screenToWsCoordinates;
+export function screenToWsCoordinates(
+    ws: WorkspaceSvg, screenCoordinates: Coordinate): Coordinate {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.screenToWsCoordinates', 'December 2021',
+          'December 2022', 'Blockly.utils.svgMath.screenToWsCoordinates');
+  // AnyDuringMigration because:  Property 'screenToWsCoordinates' does not
+  // exist on type 'void'.
+  return (svgMath as AnyDuringMigration)
+      .screenToWsCoordinates(ws, screenCoordinates);
+}
 
 /**
  * Parse a block colour from a number or string, as provided in a block
  * definition.
- * @param {number|string} colour HSV hue value (0 to 360), #RRGGBB string,
- *     or a message reference string pointing to one of those two values.
- * @return {{hue: ?number, hex: string}} An object containing the colour as
- *     a #RRGGBB string, and the hue if the input was an HSV hue value.
+ * @param colour HSV hue value (0 to 360), #RRGGBB string, or a message
+ *     reference string pointing to one of those two values.
+ * @return An object containing the colour as a #RRGGBB string, and the hue if
+ *     the input was an HSV hue value.
  * @throws {Error} If the colour cannot be parsed.
  * @deprecated
  * @alias Blockly.utils.parseBlockColour
  */
-const parseBlockColour = function(colour) {
-  deprecation.warn(
-      'Blockly.utils.parseBlockColour', 'December 2021', 'December 2022',
-      'Blockly.utils.parsing.parseBlockColour');
-  return parsing.parseBlockColour(colour);
-};
-exports.parseBlockColour = parseBlockColour;
+export function parseBlockColour(colour: number|
+                                 string): {hue: number|null, hex: string} {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn(
+          'Blockly.utils.parseBlockColour', 'December 2021', 'December 2022',
+          'Blockly.utils.parsing.parseBlockColour');
+  // AnyDuringMigration because:  Property 'parseBlockColour' does not exist on
+  // type 'void'.
+  return (parsing as AnyDuringMigration).parseBlockColour(colour);
+}
 
 /**
  * Calls a function after the page has loaded, possibly immediately.
- * @param {function()} fn Function to run.
+ * @param fn Function to run.
  * @throws Error Will throw if no global document can be found (e.g., Node.js).
  * @deprecated
  * @alias Blockly.utils.runAfterPageLoad
  */
-const runAfterPageLoad = function(fn) {
-  deprecation.warn(
-      'Blockly.utils.runAfterPageLoad', 'December 2021', 'December 2022');
+export function runAfterPageLoad(fn: () => AnyDuringMigration) {
+  // AnyDuringMigration because:  Property 'warn' does not exist on type 'void'.
+  (deprecation as AnyDuringMigration)
+      .warn('Blockly.utils.runAfterPageLoad', 'December 2021', 'December 2022');
   extensions.runAfterPageLoad(fn);
-};
-exports.runAfterPageLoad = runAfterPageLoad;
+}