blockly 8.0.4-beta.0 → 8.0.5-beta.0

package/core/events/{utils.js → utils.ts}

@@ -8,283 +8,213 @@
  * @fileoverview Helper methods for events that are fired as a result of
  * actions in Blockly's editor.
  */
-'use strict';
 
 /**
  * Helper methods for events that are fired as a result of
  * actions in Blockly's editor.
  * @namespace Blockly.Events.utils
  */
-goog.module('Blockly.Events.utils');
-
-const idGenerator = goog.require('Blockly.utils.idGenerator');
-const registry = goog.require('Blockly.registry');
-/* eslint-disable-next-line no-unused-vars */
-const {Abstract} = goog.requireType('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const {BlockChange} = goog.requireType('Blockly.Events.BlockChange');
-/* eslint-disable-next-line no-unused-vars */
-const {BlockCreate} = goog.requireType('Blockly.Events.BlockCreate');
-/* eslint-disable-next-line no-unused-vars */
-const {BlockMove} = goog.requireType('Blockly.Events.BlockMove');
-/* eslint-disable-next-line no-unused-vars */
-const {Block} = goog.requireType('Blockly.Block');
-/* eslint-disable-next-line no-unused-vars */
-const {CommentCreate} = goog.requireType('Blockly.Events.CommentCreate');
-/* eslint-disable-next-line no-unused-vars */
-const {CommentMove} = goog.requireType('Blockly.Events.CommentMove');
-/* eslint-disable-next-line no-unused-vars */
-const {ViewportChange} = goog.requireType('Blockly.Events.ViewportChange');
-/* eslint-disable-next-line no-unused-vars */
-const {Workspace} = goog.requireType('Blockly.Workspace');
-/* eslint-disable-next-line no-unused-vars */
-const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
-
-
-/**
- * Group ID for new events.  Grouped events are indivisible.
- * @type {string}
- */
+import * as goog from '../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.Events.utils');
+
+import type {Block} from '../block.js';
+import * as common from '../common.js';
+import * as registry from '../registry.js';
+import * as idGenerator from '../utils/idgenerator.js';
+import type {Workspace} from '../workspace.js';
+import type {WorkspaceSvg} from '../workspace_svg.js';
+
+import type {Abstract} from './events_abstract.js';
+import type {BlockChange} from './events_block_change.js';
+import type {BlockCreate} from './events_block_create.js';
+import type {BlockMove} from './events_block_move.js';
+import type {CommentCreate} from './events_comment_create.js';
+import type {CommentMove} from './events_comment_move.js';
+import type {ViewportChange} from './events_viewport.js';
+
+
+/** Group ID for new events.  Grouped events are indivisible. */
 let group = '';
 
-/**
- * Sets whether the next event should be added to the undo stack.
- * @type {boolean}
- */
+/** Sets whether the next event should be added to the undo stack. */
 let recordUndo = true;
 
 /**
  * Sets whether events should be added to the undo stack.
- * @param {boolean} newValue True if events should be added to the undo stack.
+ * @param newValue True if events should be added to the undo stack.
  * @alias Blockly.Events.utils.setRecordUndo
  */
-const setRecordUndo = function(newValue) {
+export function setRecordUndo(newValue: boolean) {
   recordUndo = newValue;
-};
-exports.setRecordUndo = setRecordUndo;
+}
 
 /**
  * Returns whether or not events will be added to the undo stack.
- * @returns {boolean} True if events will be added to the undo stack.
+ * @returns True if events will be added to the undo stack.
  * @alias Blockly.Events.utils.getRecordUndo
  */
-const getRecordUndo = function() {
+export function getRecordUndo(): boolean {
   return recordUndo;
-};
-exports.getRecordUndo = getRecordUndo;
+}
 
-/**
- * Allow change events to be created and fired.
- * @type {number}
- */
+/** Allow change events to be created and fired. */
 let disabled = 0;
 
 /**
  * Name of event that creates a block. Will be deprecated for BLOCK_CREATE.
- * @const
  * @alias Blockly.Events.utils.CREATE
  */
-const CREATE = 'create';
-exports.CREATE = CREATE;
+export const CREATE = 'create';
 
 /**
  * Name of event that creates a block.
- * @const
  * @alias Blockly.Events.utils.BLOCK_CREATE
  */
-const BLOCK_CREATE = CREATE;
-exports.BLOCK_CREATE = BLOCK_CREATE;
+export const BLOCK_CREATE = CREATE;
 
 /**
  * Name of event that deletes a block. Will be deprecated for BLOCK_DELETE.
- * @const
  * @alias Blockly.Events.utils.DELETE
  */
-const DELETE = 'delete';
-exports.DELETE = DELETE;
+export const DELETE = 'delete';
 
 /**
  * Name of event that deletes a block.
- * @const
  * @alias Blockly.Events.utils.BLOCK_DELETE
  */
-const BLOCK_DELETE = DELETE;
-exports.BLOCK_DELETE = BLOCK_DELETE;
+export const BLOCK_DELETE = DELETE;
 
 /**
  * Name of event that changes a block. Will be deprecated for BLOCK_CHANGE.
- * @const
  * @alias Blockly.Events.utils.CHANGE
  */
-const CHANGE = 'change';
-exports.CHANGE = CHANGE;
+export const CHANGE = 'change';
 
 /**
  * Name of event that changes a block.
- * @const
  * @alias Blockly.Events.utils.BLOCK_CHANGE
  */
-const BLOCK_CHANGE = CHANGE;
-exports.BLOCK_CHANGE = BLOCK_CHANGE;
+export const BLOCK_CHANGE = CHANGE;
 
 /**
  * Name of event that moves a block. Will be deprecated for BLOCK_MOVE.
- * @const
  * @alias Blockly.Events.utils.MOVE
  */
-const MOVE = 'move';
-exports.MOVE = MOVE;
+export const MOVE = 'move';
 
 /**
  * Name of event that moves a block.
- * @const
  * @alias Blockly.Events.utils.BLOCK_MOVE
  */
-const BLOCK_MOVE = MOVE;
-exports.BLOCK_MOVE = BLOCK_MOVE;
+export const BLOCK_MOVE = MOVE;
 
 /**
  * Name of event that creates a variable.
- * @const
  * @alias Blockly.Events.utils.VAR_CREATE
  */
-const VAR_CREATE = 'var_create';
-exports.VAR_CREATE = VAR_CREATE;
+export const VAR_CREATE = 'var_create';
 
 /**
  * Name of event that deletes a variable.
- * @const
  * @alias Blockly.Events.utils.VAR_DELETE
  */
-const VAR_DELETE = 'var_delete';
-exports.VAR_DELETE = VAR_DELETE;
+export const VAR_DELETE = 'var_delete';
 
 /**
  * Name of event that renames a variable.
- * @const
  * @alias Blockly.Events.utils.VAR_RENAME
  */
-const VAR_RENAME = 'var_rename';
-exports.VAR_RENAME = VAR_RENAME;
+export const VAR_RENAME = 'var_rename';
 
 /**
  * Name of generic event that records a UI change.
- * @const
  * @alias Blockly.Events.utils.UI
  */
-const UI = 'ui';
-exports.UI = UI;
+export const UI = 'ui';
 
 /**
  * Name of event that record a block drags a block.
- * @const
  * @alias Blockly.Events.utils.BLOCK_DRAG
  */
-const BLOCK_DRAG = 'drag';
-exports.BLOCK_DRAG = BLOCK_DRAG;
+export const BLOCK_DRAG = 'drag';
 
 /**
  * Name of event that records a change in selected element.
- * @const
  * @alias Blockly.Events.utils.SELECTED
  */
-const SELECTED = 'selected';
-exports.SELECTED = SELECTED;
+export const SELECTED = 'selected';
 
 /**
  * Name of event that records a click.
- * @const
  * @alias Blockly.Events.utils.CLICK
  */
-const CLICK = 'click';
-exports.CLICK = CLICK;
+export const CLICK = 'click';
 
 /**
  * Name of event that records a marker move.
- * @const
  * @alias Blockly.Events.utils.MARKER_MOVE
  */
-const MARKER_MOVE = 'marker_move';
-exports.MARKER_MOVE = MARKER_MOVE;
+export const MARKER_MOVE = 'marker_move';
 
 /**
  * Name of event that records a bubble open.
- * @const
  * @alias Blockly.Events.utils.BUBBLE_OPEN
  */
-const BUBBLE_OPEN = 'bubble_open';
-exports.BUBBLE_OPEN = BUBBLE_OPEN;
+export const BUBBLE_OPEN = 'bubble_open';
 
 /**
  * Name of event that records a trashcan open.
- * @const
  * @alias Blockly.Events.utils.TRASHCAN_OPEN
  */
-const TRASHCAN_OPEN = 'trashcan_open';
-exports.TRASHCAN_OPEN = TRASHCAN_OPEN;
+export const TRASHCAN_OPEN = 'trashcan_open';
 
 /**
  * Name of event that records a toolbox item select.
- * @const
  * @alias Blockly.Events.utils.TOOLBOX_ITEM_SELECT
  */
-const TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
-exports.TOOLBOX_ITEM_SELECT = TOOLBOX_ITEM_SELECT;
+export const TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
 
 /**
  * Name of event that records a theme change.
- * @const
  * @alias Blockly.Events.utils.THEME_CHANGE
  */
-const THEME_CHANGE = 'theme_change';
-exports.THEME_CHANGE = THEME_CHANGE;
+export const THEME_CHANGE = 'theme_change';
 
 /**
  * Name of event that records a viewport change.
- * @const
  * @alias Blockly.Events.utils.VIEWPORT_CHANGE
  */
-const VIEWPORT_CHANGE = 'viewport_change';
-exports.VIEWPORT_CHANGE = VIEWPORT_CHANGE;
+export const VIEWPORT_CHANGE = 'viewport_change';
 
 /**
  * Name of event that creates a comment.
- * @const
  * @alias Blockly.Events.utils.COMMENT_CREATE
  */
-const COMMENT_CREATE = 'comment_create';
-exports.COMMENT_CREATE = COMMENT_CREATE;
+export const COMMENT_CREATE = 'comment_create';
 
 /**
  * Name of event that deletes a comment.
- * @const
  * @alias Blockly.Events.utils.COMMENT_DELETE
  */
-const COMMENT_DELETE = 'comment_delete';
-exports.COMMENT_DELETE = COMMENT_DELETE;
+export const COMMENT_DELETE = 'comment_delete';
 
 /**
  * Name of event that changes a comment.
- * @const
  * @alias Blockly.Events.utils.COMMENT_CHANGE
  */
-const COMMENT_CHANGE = 'comment_change';
-exports.COMMENT_CHANGE = COMMENT_CHANGE;
+export const COMMENT_CHANGE = 'comment_change';
 
 /**
  * Name of event that moves a comment.
- * @const
  * @alias Blockly.Events.utils.COMMENT_MOVE
  */
-const COMMENT_MOVE = 'comment_move';
-exports.COMMENT_MOVE = COMMENT_MOVE;
+export const COMMENT_MOVE = 'comment_move';
 
 /**
  * Name of event that records a workspace load.
  * @alias Blockly.Events.utils.FINISHED_LOADING
  */
-const FINISHED_LOADING = 'finished_loading';
-exports.FINISHED_LOADING = FINISHED_LOADING;
+export const FINISHED_LOADING = 'finished_loading';
 
 /**
  * Type of events that cause objects to be bumped back into the visible
@@ -292,12 +222,9 @@ exports.FINISHED_LOADING = FINISHED_LOADING;
  *
  * Not to be confused with bumping so that disconnected connections do not
  * appear connected.
- * @typedef {!BlockCreate|!BlockMove|
- * !CommentCreate|!CommentMove}
  * @alias Blockly.Events.utils.BumpEvent
  */
-let BumpEvent;
-exports.BumpEvent = BumpEvent;
+export type BumpEvent = BlockCreate|BlockMove|CommentCreate|CommentMove;
 
 /**
  * List of events that cause objects to be bumped back into the visible
@@ -305,24 +232,27 @@ exports.BumpEvent = BumpEvent;
  *
  * Not to be confused with bumping so that disconnected connections do not
  * appear connected.
- * @const
  * @alias Blockly.Events.utils.BUMP_EVENTS
  */
-const BUMP_EVENTS = [BLOCK_CREATE, BLOCK_MOVE, COMMENT_CREATE, COMMENT_MOVE];
-exports.BUMP_EVENTS = BUMP_EVENTS;
+export const BUMP_EVENTS: string[] =
+    [BLOCK_CREATE, BLOCK_MOVE, COMMENT_CREATE, COMMENT_MOVE];
 
-/**
- * List of events queued for firing.
- * @type {!Array<!Abstract>}
- */
-const FIRE_QUEUE = [];
+/** List of events queued for firing. */
+const FIRE_QUEUE: Abstract[] = [];
 
 /**
  * Create a custom event and fire it.
- * @param {!Abstract} event Custom data for event.
+ * @param event Custom data for event.
  * @alias Blockly.Events.utils.fire
  */
-const fire = function(event) {
+export function fire(event: Abstract) {
+  TEST_ONLY.fireInternal(event);
+}
+
+/**
+ * Private version of fireInternal for stubbing in tests.
+ */
+function fireInternal(event: Abstract) {
   if (!isEnabled()) {
     return;
   }
@@ -331,36 +261,34 @@ const fire = function(event) {
     setTimeout(fireNow, 0);
   }
   FIRE_QUEUE.push(event);
-};
-exports.fire = fire;
+}
 
-/**
- * Fire all queued events.
- */
-const fireNow = function() {
+
+/** Fire all queued events. */
+function fireNow() {
   const queue = filter(FIRE_QUEUE, true);
   FIRE_QUEUE.length = 0;
-  for (let i = 0, event; (event = queue[i]); i++) {
+  for (let i = 0, event; event = queue[i]; i++) {
     if (!event.workspaceId) {
       continue;
     }
-    const {Workspace} = goog.module.get('Blockly.Workspace');
-    const eventWorkspace = Workspace.getById(event.workspaceId);
+    const eventWorkspace = common.getWorkspaceById(event.workspaceId);
     if (eventWorkspace) {
       eventWorkspace.fireChangeListener(event);
     }
   }
-};
+}
 
 /**
  * Filter the queued events and merge duplicates.
- * @param {!Array<!Abstract>} queueIn Array of events.
- * @param {boolean} forward True if forward (redo), false if backward (undo).
- * @return {!Array<!Abstract>} Array of filtered events.
+ * @param queueIn Array of events.
+ * @param forward True if forward (redo), false if backward (undo).
+ * @return Array of filtered events.
  * @alias Blockly.Events.utils.filter
  */
-const filter = function(queueIn, forward) {
-  let queue = queueIn.slice();  // Shallow copy of queue.
+export function filter(queueIn: Abstract[], forward: boolean): Abstract[] {
+  let queue = queueIn.slice();
+  // Shallow copy of queue.
   if (!forward) {
     // Undo is merged in reverse order.
     queue.reverse();
@@ -368,12 +296,12 @@ const filter = function(queueIn, forward) {
   const mergedQueue = [];
   const hash = Object.create(null);
   // Merge duplicates.
-  for (let i = 0, event; (event = queue[i]); i++) {
+  for (let i = 0, event; event = queue[i]; i++) {
     if (!event.isNull()) {
       // Treat all UI events as the same type in hash table.
       const eventType = event.isUiEvent ? UI : event.type;
-      // TODO(#5927): Ceck whether `blockId` exists before accessing it.
-      const blockId = /** @type {*} */ (event).blockId;
+      // TODO(#5927): Check whether `blockId` exists before accessing it.
+      const blockId = (event as AnyDuringMigration).blockId;
       const key = [eventType, blockId, event.workspaceId].join(' ');
 
       const lastEntry = hash[key];
@@ -382,23 +310,24 @@ const filter = function(queueIn, forward) {
         // Each item in the hash table has the event and the index of that event
         // in the input array.  This lets us make sure we only merge adjacent
         // move events.
-        hash[key] = {event: event, index: i};
+        hash[key] = {event, index: i};
         mergedQueue.push(event);
       } else if (event.type === MOVE && lastEntry.index === i - 1) {
-        const moveEvent = /** @type {!BlockMove} */ (event);
+        const moveEvent = event as BlockMove;
         // Merge move events.
         lastEvent.newParentId = moveEvent.newParentId;
         lastEvent.newInputName = moveEvent.newInputName;
         lastEvent.newCoordinate = moveEvent.newCoordinate;
         lastEntry.index = i;
       } else if (
-          event.type === CHANGE && event.element === lastEvent.element &&
-          event.name === lastEvent.name) {
-        const changeEvent = /** @type {!BlockChange} */ (event);
+          event.type === CHANGE &&
+          (event as BlockChange).element === lastEvent.element &&
+          (event as BlockChange).name === lastEvent.name) {
+        const changeEvent = event as BlockChange;
         // Merge change events.
         lastEvent.newValue = changeEvent.newValue;
       } else if (event.type === VIEWPORT_CHANGE) {
-        const viewportEvent = /** @type {!ViewportChange} */ (event);
+        const viewportEvent = event as ViewportChange;
         // Merge viewport change events.
         lastEvent.viewTop = viewportEvent.viewTop;
         lastEvent.viewLeft = viewportEvent.viewLeft;
@@ -409,7 +338,7 @@ const filter = function(queueIn, forward) {
       } else {
         // Collision: newer events should merge into this event to maintain
         // order.
-        hash[key] = {event: event, index: i};
+        hash[key] = {event, index: i};
         mergedQueue.push(event);
       }
     }
@@ -424,108 +353,111 @@ const filter = function(queueIn, forward) {
   }
   // Move mutation events to the top of the queue.
   // Intentionally skip first event.
-  for (let i = 1, event; (event = queue[i]); i++) {
-    if (event.type === CHANGE && event.element === 'mutation') {
+  for (let i = 1, event; event = queue[i]; i++) {
+    // AnyDuringMigration because:  Property 'element' does not exist on type
+    // 'Abstract'.
+    if (event.type === CHANGE &&
+        (event as AnyDuringMigration).element === 'mutation') {
       queue.unshift(queue.splice(i, 1)[0]);
     }
   }
   return queue;
-};
-exports.filter = filter;
+}
 
 /**
  * Modify pending undo events so that when they are fired they don't land
  * in the undo stack.  Called by Workspace.clearUndo.
  * @alias Blockly.Events.utils.clearPendingUndo
  */
-const clearPendingUndo = function() {
-  for (let i = 0, event; (event = FIRE_QUEUE[i]); i++) {
+export function clearPendingUndo() {
+  for (let i = 0, event; event = FIRE_QUEUE[i]; i++) {
     event.recordUndo = false;
   }
-};
-exports.clearPendingUndo = clearPendingUndo;
+}
 
 /**
  * Stop sending events.  Every call to this function MUST also call enable.
  * @alias Blockly.Events.utils.disable
  */
-const disable = function() {
+export function disable() {
   disabled++;
-};
-exports.disable = disable;
+}
 
 /**
  * Start sending events.  Unless events were already disabled when the
  * corresponding call to disable was made.
  * @alias Blockly.Events.utils.enable
  */
-const enable = function() {
+export function enable() {
   disabled--;
-};
-exports.enable = enable;
+}
 
 /**
  * Returns whether events may be fired or not.
- * @return {boolean} True if enabled.
+ * @return True if enabled.
  * @alias Blockly.Events.utils.isEnabled
  */
-const isEnabled = function() {
+export function isEnabled(): boolean {
   return disabled === 0;
-};
-exports.isEnabled = isEnabled;
+}
 
 /**
  * Current group.
- * @return {string} ID string.
+ * @return ID string.
  * @alias Blockly.Events.utils.getGroup
  */
-const getGroup = function() {
+export function getGroup(): string {
   return group;
-};
-exports.getGroup = getGroup;
+}
 
 /**
  * Start or stop a group.
- * @param {boolean|string} state True to start new group, false to end group.
+ * @param state True to start new group, false to end group.
  *   String to set group explicitly.
  * @alias Blockly.Events.utils.setGroup
  */
-const setGroup = function(state) {
+export function setGroup(state: boolean|string) {
+  TEST_ONLY.setGroupInternal(state);
+}
+
+/**
+ * Private version of setGroup for stubbing in tests.
+ */
+function setGroupInternal(state: boolean|string) {
   if (typeof state === 'boolean') {
     group = state ? idGenerator.genUid() : '';
   } else {
     group = state;
   }
-};
-exports.setGroup = setGroup;
+}
 
 /**
  * Compute a list of the IDs of the specified block and all its descendants.
- * @param {!Block} block The root block.
- * @return {!Array<string>} List of block IDs.
+ * @param block The root block.
+ * @return List of block IDs.
  * @alias Blockly.Events.utils.getDescendantIds
- * @package
+ * @internal
  */
-const getDescendantIds = function(block) {
+export function getDescendantIds(block: Block): string[] {
   const ids = [];
   const descendants = block.getDescendants(false);
-  for (let i = 0, descendant; (descendant = descendants[i]); i++) {
+  for (let i = 0, descendant; descendant = descendants[i]; i++) {
     ids[i] = descendant.id;
   }
   return ids;
-};
-exports.getDescendantIds = getDescendantIds;
+}
 
 /**
  * Decode the JSON into an event.
- * @param {!Object} json JSON representation.
- * @param {!Workspace} workspace Target workspace for event.
- * @return {!Abstract} The event represented by the JSON.
+ * @param json JSON representation.
+ * @param workspace Target workspace for event.
+ * @return The event represented by the JSON.
  * @throws {Error} if an event type is not found in the registry.
  * @alias Blockly.Events.utils.fromJson
  */
-const fromJson = function(json, workspace) {
-  const eventClass = get(json.type);
+export function fromJson(
+    json: AnyDuringMigration, workspace: Workspace): Abstract {
+  const eventClass = get(json['type']);
   if (!eventClass) {
     throw Error('Unknown event type.');
   }
@@ -533,39 +465,35 @@ const fromJson = function(json, workspace) {
   event.fromJson(json);
   event.workspaceId = workspace.id;
   return event;
-};
-exports.fromJson = fromJson;
+}
 
 /**
  * Gets the class for a specific event type from the registry.
- * @param {string} eventType The type of the event to get.
- * @return {?function(new:Abstract, ...?)} The event class with
- *     the given type or null if none exists.
+ * @param eventType The type of the event to get.
+ * @return The event class with the given type or null if none exists.
  * @alias Blockly.Events.utils.get
  */
-const get = function(eventType) {
+export function get(eventType: string):
+    (new (...p1: AnyDuringMigration[]) => Abstract)|null {
   return registry.getClass(registry.Type.EVENT, eventType);
-};
-exports.get = get;
+}
 
 /**
  * Enable/disable a block depending on whether it is properly connected.
  * Use this on applications where all blocks should be connected to a top block.
  * Recommend setting the 'disable' option to 'false' in the config so that
  * users don't try to re-enable disabled orphan blocks.
- * @param {!Abstract} event Custom data for event.
+ * @param event Custom data for event.
  * @alias Blockly.Events.utils.disableOrphans
  */
-const disableOrphans = function(event) {
+export function disableOrphans(event: Abstract) {
   if (event.type === MOVE || event.type === CREATE) {
-    const blockEvent = /** @type {!BlockMove|!BlockCreate} */ (event);
+    const blockEvent = event as BlockMove | BlockCreate;
     if (!blockEvent.workspaceId) {
       return;
     }
-    const {Workspace} = goog.module.get('Blockly.Workspace');
     const eventWorkspace =
-        /** @type {!WorkspaceSvg} */ (
-            Workspace.getById(blockEvent.workspaceId));
+        common.getWorkspaceById(blockEvent.workspaceId) as WorkspaceSvg;
     let block = eventWorkspace.getBlockById(blockEvent.blockId);
     if (block) {
       // Changing blocks as part of this event shouldn't be undoable.
@@ -575,7 +503,7 @@ const disableOrphans = function(event) {
         const parent = block.getParent();
         if (parent && parent.isEnabled()) {
           const children = block.getDescendants(false);
-          for (let i = 0, child; (child = children[i]); i++) {
+          for (let i = 0, child; child = children[i]; i++) {
             child.setEnabled(true);
           }
         } else if (
@@ -591,10 +519,11 @@ const disableOrphans = function(event) {
       }
     }
   }
-};
-exports.disableOrphans = disableOrphans;
+}
 
-exports.TEST_ONLY = {
+export const TEST_ONLY = {
   FIRE_QUEUE,
   fireNow,
+  fireInternal,
+  setGroupInternal,
 };