blockly 7.20211209.4 → 8.0.0

package/core/utils/coordinate.js

@@ -21,116 +21,118 @@ goog.module('Blockly.utils.Coordinate');
 
 /**
  * Class for representing coordinates and positions.
- * @param {number} x Left.
- * @param {number} y Top.
- * @struct
- * @constructor
  * @alias Blockly.utils.Coordinate
  */
-const Coordinate = function(x, y) {
+const Coordinate = class {
   /**
-   * X-value
-   * @type {number}
+   * @param {number} x Left.
+   * @param {number} y Top.
    */
-  this.x = x;
+  constructor(x, y) {
+    /**
+     * X-value
+     * @type {number}
+     */
+    this.x = x;
+
+    /**
+     * Y-value
+     * @type {number}
+     */
+    this.y = y;
+  }
 
   /**
-   * Y-value
-   * @type {number}
+   * Creates a new copy of this coordinate.
+   * @return {!Coordinate} A copy of this coordinate.
    */
-  this.y = y;
-};
-
-/**
- * Compares coordinates for equality.
- * @param {?Coordinate} a A Coordinate.
- * @param {?Coordinate} b A Coordinate.
- * @return {boolean} True iff the coordinates are equal, or if both are null.
- */
-Coordinate.equals = function(a, b) {
-  if (a === b) {
-    return true;
-  }
-  if (!a || !b) {
-    return false;
+  clone() {
+    return new Coordinate(this.x, this.y);
   }
-  return a.x === b.x && a.y === b.y;
-};
 
-/**
- * Returns the distance between two coordinates.
- * @param {!Coordinate} a A Coordinate.
- * @param {!Coordinate} b A Coordinate.
- * @return {number} The distance between `a` and `b`.
- */
-Coordinate.distance = function(a, b) {
-  const dx = a.x - b.x;
-  const dy = a.y - b.y;
-  return Math.sqrt(dx * dx + dy * dy);
-};
+  /**
+   * Scales this coordinate by the given scale factor.
+   * @param {number} s The scale factor to use for both x and y dimensions.
+   * @return {!Coordinate} This coordinate after scaling.
+   */
+  scale(s) {
+    this.x *= s;
+    this.y *= s;
+    return this;
+  }
 
-/**
- * Returns the magnitude of a coordinate.
- * @param {!Coordinate} a A Coordinate.
- * @return {number} The distance between the origin and `a`.
- */
-Coordinate.magnitude = function(a) {
-  return Math.sqrt(a.x * a.x + a.y * a.y);
-};
+  /**
+   * Translates this coordinate by the given offsets.
+   * respectively.
+   * @param {number} tx The value to translate x by.
+   * @param {number} ty The value to translate y by.
+   * @return {!Coordinate} This coordinate after translating.
+   */
+  translate(tx, ty) {
+    this.x += tx;
+    this.y += ty;
+    return this;
+  }
 
-/**
- * Returns the difference between two coordinates as a new
- * Coordinate.
- * @param {!Coordinate|!SVGPoint} a An x/y coordinate.
- * @param {!Coordinate|!SVGPoint} b An x/y coordinate.
- * @return {!Coordinate} A Coordinate representing the difference
- *     between `a` and `b`.
- */
-Coordinate.difference = function(a, b) {
-  return new Coordinate(a.x - b.x, a.y - b.y);
-};
+  /**
+   * Compares coordinates for equality.
+   * @param {?Coordinate} a A Coordinate.
+   * @param {?Coordinate} b A Coordinate.
+   * @return {boolean} True iff the coordinates are equal, or if both are null.
+   */
+  static equals(a, b) {
+    if (a === b) {
+      return true;
+    }
+    if (!a || !b) {
+      return false;
+    }
+    return a.x === b.x && a.y === b.y;
+  }
 
-/**
- * Returns the sum of two coordinates as a new Coordinate.
- * @param {!Coordinate|!SVGPoint} a An x/y coordinate.
- * @param {!Coordinate|!SVGPoint} b An x/y coordinate.
- * @return {!Coordinate} A Coordinate representing the sum of
- *     the two coordinates.
- */
-Coordinate.sum = function(a, b) {
-  return new Coordinate(a.x + b.x, a.y + b.y);
-};
+  /**
+   * Returns the distance between two coordinates.
+   * @param {!Coordinate} a A Coordinate.
+   * @param {!Coordinate} b A Coordinate.
+   * @return {number} The distance between `a` and `b`.
+   */
+  static distance(a, b) {
+    const dx = a.x - b.x;
+    const dy = a.y - b.y;
+    return Math.sqrt(dx * dx + dy * dy);
+  }
 
-/**
- * Creates a new copy of this coordinate.
- * @return {!Coordinate} A copy of this coordinate.
- */
-Coordinate.prototype.clone = function() {
-  return new Coordinate(this.x, this.y);
-};
+  /**
+   * Returns the magnitude of a coordinate.
+   * @param {!Coordinate} a A Coordinate.
+   * @return {number} The distance between the origin and `a`.
+   */
+  static magnitude(a) {
+    return Math.sqrt(a.x * a.x + a.y * a.y);
+  }
 
-/**
- * Scales this coordinate by the given scale factor.
- * @param {number} s The scale factor to use for both x and y dimensions.
- * @return {!Coordinate} This coordinate after scaling.
- */
-Coordinate.prototype.scale = function(s) {
-  this.x *= s;
-  this.y *= s;
-  return this;
-};
+  /**
+   * Returns the difference between two coordinates as a new
+   * Coordinate.
+   * @param {!Coordinate|!SVGPoint} a An x/y coordinate.
+   * @param {!Coordinate|!SVGPoint} b An x/y coordinate.
+   * @return {!Coordinate} A Coordinate representing the difference
+   *     between `a` and `b`.
+   */
+  static difference(a, b) {
+    return new Coordinate(a.x - b.x, a.y - b.y);
+  }
 
-/**
- * Translates this coordinate by the given offsets.
- * respectively.
- * @param {number} tx The value to translate x by.
- * @param {number} ty The value to translate y by.
- * @return {!Coordinate} This coordinate after translating.
- */
-Coordinate.prototype.translate = function(tx, ty) {
-  this.x += tx;
-  this.y += ty;
-  return this;
+  /**
+   * Returns the sum of two coordinates as a new Coordinate.
+   * @param {!Coordinate|!SVGPoint} a An x/y coordinate.
+   * @param {!Coordinate|!SVGPoint} b An x/y coordinate.
+   * @return {!Coordinate} A Coordinate representing the sum of
+   *     the two coordinates.
+   */
+  static sum(a, b) {
+    return new Coordinate(a.x + b.x, a.y + b.y);
+  }
 };
 
 exports.Coordinate = Coordinate;

package/core/utils/dom.js

@@ -403,11 +403,11 @@ const measureFontMetrics = function(text, fontSize, fontWeight, fontFamily) {
   span.style.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
   span.textContent = text;
 
-  const block = document.createElement('div');
+  const block = /** @type {!HTMLDivElement} */ (document.createElement('div'));
   block.style.width = '1px';
   block.style.height = 0;
 
-  const div = document.createElement('div');
+  const div = /** @type {!HTMLDivElement} */ (document.createElement('div'));
   div.setAttribute('style', 'position: fixed; top: 0; left: 0; display: flex;');
   div.appendChild(span);
   div.appendChild(block);

package/core/utils/global.js

@@ -16,6 +16,8 @@
 goog.module('Blockly.utils.global');
 
 
+/* eslint-disable no-undef, no-invalid-this */
+
 /**
  * Reference to the global object.
  *

package/core/utils/rect.js

@@ -22,50 +22,54 @@ goog.module('Blockly.utils.Rect');
 
 /**
  * Class for representing rectangular regions.
- * @param {number} top Top.
- * @param {number} bottom Bottom.
- * @param {number} left Left.
- * @param {number} right Right.
- * @struct
- * @constructor
  * @alias Blockly.utils.Rect
  */
-const Rect = function(top, bottom, left, right) {
-  /** @type {number} */
-  this.top = top;
+const Rect = class {
+  /**
+   * @param {number} top Top.
+   * @param {number} bottom Bottom.
+   * @param {number} left Left.
+   * @param {number} right Right.
+   * @struct
+   */
+  constructor(top, bottom, left, right) {
+    /** @type {number} */
+    this.top = top;
 
-  /** @type {number} */
-  this.bottom = bottom;
+    /** @type {number} */
+    this.bottom = bottom;
 
-  /** @type {number} */
-  this.left = left;
+    /** @type {number} */
+    this.left = left;
 
-  /** @type {number} */
-  this.right = right;
-};
+    /** @type {number} */
+    this.right = right;
+  }
 
-/**
- * Tests whether this rectangle contains a x/y coordinate.
- *
- * @param {number} x The x coordinate to test for containment.
- * @param {number} y The y coordinate to test for containment.
- * @return {boolean} Whether this rectangle contains given coordinate.
- */
-Rect.prototype.contains = function(x, y) {
-  return x >= this.left && x <= this.right && y >= this.top && y <= this.bottom;
-};
+  /**
+   * Tests whether this rectangle contains a x/y coordinate.
+   *
+   * @param {number} x The x coordinate to test for containment.
+   * @param {number} y The y coordinate to test for containment.
+   * @return {boolean} Whether this rectangle contains given coordinate.
+   */
+  contains(x, y) {
+    return x >= this.left && x <= this.right && y >= this.top &&
+        y <= this.bottom;
+  }
 
-/**
- * Tests whether this rectangle intersects the provided rectangle.
- * Assumes that the coordinate system increases going down and left.
- * @param {!Rect} other The other rectangle to check for
- *    intersection with.
- * @return {boolean} Whether this rectangle intersects the provided rectangle.
- */
-Rect.prototype.intersects = function(other) {
-  return !(
-      this.left > other.right || this.right < other.left ||
-      this.top > other.bottom || this.bottom < other.top);
+  /**
+   * Tests whether this rectangle intersects the provided rectangle.
+   * Assumes that the coordinate system increases going down and left.
+   * @param {!Rect} other The other rectangle to check for
+   *    intersection with.
+   * @return {boolean} Whether this rectangle intersects the provided rectangle.
+   */
+  intersects(other) {
+    return !(
+        this.left > other.right || this.right < other.left ||
+        this.top > other.bottom || this.bottom < other.top);
+  }
 };
 
 exports.Rect = Rect;

package/core/utils/sentinel.js

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview A type used to create flag values (e.g. SKIP_SETUP).
+ */
+'use strict';
+
+/**
+ * A type used to create flag values.
+ * @class
+ */
+goog.module('Blockly.utils.Sentinel');
+
+
+/**
+ * A type used to create flag values.
+ * @alias Blockly.utils.Sentinel
+ */
+class Sentinel {}
+
+exports.Sentinel = Sentinel;

package/core/utils/size.js

@@ -22,41 +22,44 @@ goog.module('Blockly.utils.Size');
 
 /**
  * Class for representing sizes consisting of a width and height.
- * @param {number} width Width.
- * @param {number} height Height.
- * @struct
- * @constructor
  * @alias Blockly.utils.Size
  */
-const Size = function(width, height) {
+const Size = class {
   /**
-   * Width
-   * @type {number}
+   * @param {number} width Width.
+   * @param {number} height Height.
+   * @struct
    */
-  this.width = width;
+  constructor(width, height) {
+    /**
+     * Width
+     * @type {number}
+     */
+    this.width = width;
+
+    /**
+     * Height
+     * @type {number}
+     */
+    this.height = height;
+  }
 
   /**
-   * Height
-   * @type {number}
+   * Compares sizes for equality.
+   * @param {?Size} a A Size.
+   * @param {?Size} b A Size.
+   * @return {boolean} True iff the sizes have equal widths and equal
+   *     heights, or if both are null.
    */
-  this.height = height;
-};
-
-/**
- * Compares sizes for equality.
- * @param {?Size} a A Size.
- * @param {?Size} b A Size.
- * @return {boolean} True iff the sizes have equal widths and equal
- *     heights, or if both are null.
- */
-Size.equals = function(a, b) {
-  if (a === b) {
-    return true;
-  }
-  if (!a || !b) {
-    return false;
+  static equals(a, b) {
+    if (a === b) {
+      return true;
+    }
+    if (!a || !b) {
+      return false;
+    }
+    return a.width === b.width && a.height === b.height;
   }
-  return a.width === b.width && a.height === b.height;
 };
 
 exports.Size = Size;

package/core/utils/svg.js

@@ -20,28 +20,30 @@ goog.module('Blockly.utils.Svg');
 
 /**
  * A name with the type of the SVG element stored in the generic.
- * @param {string} tagName The SVG element tag name.
- * @constructor
  * @template T
- * @private
  * @alias Blockly.utils.Svg
  */
-const Svg = function(tagName) {
+class Svg {
   /**
-   * @type {string}
-   * @private
+   * @param {string} tagName The SVG element tag name.
+   * @package
    */
-  this.tagName_ = tagName;
-};
+  constructor(tagName) {
+    /**
+     * @type {string}
+     * @private
+     */
+    this.tagName_ = tagName;
+  }
 
-/**
- * Returns the SVG element tag name.
- * @return {string} The name.
- * @override
- */
-Svg.prototype.toString = function() {
-  return this.tagName_;
-};
+  /**
+   * Returns the SVG element tag name.
+   * @return {string} The name.
+   */
+  toString() {
+    return this.tagName_;
+  }
+}
 
 /**
  * @type {!Svg<!SVGAnimateElement>}