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

package/core/renderers/measurables/inline_input.d.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Input } from '../../input.js';
+import type { ConstantProvider } from '../common/constants.js';
+import { InputConnection } from './input_connection.js';
+/**
+ * An object containing information about the space an inline input takes up
+ * during rendering
+ * @struct
+ * @alias Blockly.blockRendering.InlineInput
+ */
+export declare class InlineInput extends InputConnection {
+    connectionHeight: number;
+    connectionWidth: number;
+    /**
+     * @param constants The rendering constants provider.
+     * @param input The inline input to measure and store information for.
+     * @internal
+     */
+    constructor(constants: ConstantProvider, input: Input);
+}

package/core/renderers/measurables/{inline_input.js → inline_input.ts}

@@ -14,32 +14,33 @@
  * block.
  * @class
  */
-goog.module('Blockly.blockRendering.InlineInput');
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.InlineInput');
 
 /* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection');
-/* eslint-disable-next-line no-unused-vars */
-const {Input} = goog.requireType('Blockly.Input');
-const {Types} = goog.require('Blockly.blockRendering.Types');
+import type {Input} from '../../input.js';
+import type {ConstantProvider} from '../common/constants.js';
+
+import {InputConnection} from './input_connection.js';
+import {Types} from './types.js';
 
 
 /**
  * An object containing information about the space an inline input takes up
  * during rendering
- * @extends {InputConnection}
  * @struct
  * @alias Blockly.blockRendering.InlineInput
  */
-class InlineInput extends InputConnection {
+export class InlineInput extends InputConnection {
+  connectionHeight: number;
+  connectionWidth: number;
+
   /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @param {!Input} input The inline input to measure and store
-   *     information for.
-   * @package
+   * @param constants The rendering constants provider.
+   * @param input The inline input to measure and store information for.
+   * @internal
    */
-  constructor(constants, input) {
+  constructor(constants: ConstantProvider, input: Input) {
     super(constants, input);
     this.type |= Types.INLINE_INPUT;
 
@@ -53,28 +54,23 @@ class InlineInput extends InputConnection {
       this.height = this.connectedBlockHeight;
     }
 
-    /** @type {number} */
     this.connectionHeight = !this.isDynamicShape ?
-        this.shape.height :
-        this.shape.height(this.height);
+        this.shape.height as number :
+        (this.shape.height as (p1: number) => number)(this.height);
 
-    /** @type {number} */
-    this.connectionWidth =
-        !this.isDynamicShape ? this.shape.width : this.shape.width(this.height);
+    this.connectionWidth = !this.isDynamicShape ?
+        this.shape.width as number :
+        (this.shape.width as (p1: number) => number)(this.height);
     if (!this.connectedBlock) {
       this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
     }
 
-    /** @type {number} */
-    this.connectionOffsetY = this.isDynamicShape ?
+    this.connectionOffsetY = 'connectionOffsetY' in this.shape ?
         this.shape.connectionOffsetY(this.connectionHeight) :
         this.constants_.TAB_OFFSET_FROM_TOP;
 
-    /** @type {number} */
-    this.connectionOffsetX = this.isDynamicShape ?
+    this.connectionOffsetX = 'connectionOffsetX' in this.shape ?
         this.shape.connectionOffsetX(this.connectionWidth) :
         0;
   }
 }
-
-exports.InlineInput = InlineInput;

package/core/renderers/measurables/input_connection.d.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { BlockSvg } from '../../block_svg.js';
+import type { Input } from '../../input.js';
+import type { ConstantProvider } from '../common/constants.js';
+import { Connection } from './connection.js';
+/**
+ * The base class to represent an input that takes up space on a block
+ * during rendering
+ * @alias Blockly.blockRendering.InputConnection
+ */
+export declare class InputConnection extends Connection {
+    input: Input;
+    align: number;
+    connectedBlock: BlockSvg | null;
+    connectedBlockWidth: number;
+    connectedBlockHeight: number;
+    connectionOffsetX: number;
+    connectionOffsetY: number;
+    /**
+     * @param constants The rendering constants provider.
+     * @param input The input to measure and store information for.
+     * @internal
+     */
+    constructor(constants: ConstantProvider, input: Input);
+}

package/core/renderers/measurables/input_connection.ts

@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing inputs with connections on a rendered block.
+ */
+
+/**
+ * Class representing inputs with connections on a rendered block.
+ * @class
+ */
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.InputConnection');
+
+import type {BlockSvg} from '../../block_svg.js';
+import type {Input} from '../../input.js';
+import type {RenderedConnection} from '../../rendered_connection.js';
+import type {ConstantProvider} from '../common/constants.js';
+
+import {Connection} from './connection.js';
+import {Types} from './types.js';
+
+
+/**
+ * The base class to represent an input that takes up space on a block
+ * during rendering
+ * @alias Blockly.blockRendering.InputConnection
+ */
+export class InputConnection extends Connection {
+  align: number;
+  connectedBlock: BlockSvg|null;
+  connectedBlockWidth: number;
+  connectedBlockHeight: number;
+  connectionOffsetX: number = 0;
+  connectionOffsetY: number = 0;
+
+  /**
+   * @param constants The rendering constants provider.
+   * @param input The input to measure and store information for.
+   * @internal
+   */
+  constructor(constants: ConstantProvider, public input: Input) {
+    super(constants, input.connection as RenderedConnection);
+
+    this.type |= Types.INPUT;
+
+    this.align = input.align;
+
+    this.connectedBlock =
+        (input.connection && input.connection.targetBlock() ?
+             input.connection.targetBlock() as BlockSvg :
+             null);
+
+    if (this.connectedBlock) {
+      const bBox = this.connectedBlock.getHeightWidth();
+      this.connectedBlockWidth = bBox.width;
+      this.connectedBlockHeight = bBox.height;
+    } else {
+      this.connectedBlockWidth = 0;
+      this.connectedBlockHeight = 0;
+    }
+  }
+}

package/core/renderers/measurables/input_row.d.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ConstantProvider } from '../common/constants.js';
+import { Row } from './row.js';
+/**
+ * An object containing information about a row that holds one or more inputs.
+ * @struct
+ * @alias Blockly.blockRendering.InputRow
+ */
+export declare class InputRow extends Row {
+    /**
+     * The total width of all blocks connected to this row.
+     * @internal
+     */
+    connectedBlockWidths: number;
+    /**
+     * @param constants The rendering constants provider.
+     * @internal
+     */
+    constructor(constants: ConstantProvider);
+    /**
+     * Inspect all subcomponents and populate all size properties on the row.
+     * @internal
+     */
+    measure(): void;
+    endsWithElemSpacer(): boolean;
+}

package/core/renderers/measurables/{input_row.js → input_row.ts}

@@ -14,46 +14,44 @@
  * rendered block.
  * @class
  */
-goog.module('Blockly.blockRendering.InputRow');
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.InputRow');
 
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection');
-const {ExternalValueInput} = goog.require('Blockly.blockRendering.ExternalValueInput');
-const {Row} = goog.require('Blockly.blockRendering.Row');
-const {StatementInput} = goog.require('Blockly.blockRendering.StatementInput');
-const {Types} = goog.require('Blockly.blockRendering.Types');
+import type {ConstantProvider} from '../common/constants.js';
+
+import {ExternalValueInput} from './external_value_input.js';
+import {InputConnection} from './input_connection.js';
+import {Row} from './row.js';
+import {StatementInput} from './statement_input.js';
+import {Types} from './types.js';
 
 
 /**
  * An object containing information about a row that holds one or more inputs.
- * @extends {Row}
  * @struct
  * @alias Blockly.blockRendering.InputRow
  */
-class InputRow extends Row {
+export class InputRow extends Row {
+  /**
+   * The total width of all blocks connected to this row.
+   * @internal
+   */
+  connectedBlockWidths = 0;
+
   /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
+   * @param constants The rendering constants provider.
+   * @internal
    */
-  constructor(constants) {
+  constructor(constants: ConstantProvider) {
     super(constants);
     this.type |= Types.INPUT_ROW;
-
-    /**
-     * The total width of all blocks connected to this row.
-     * @type {number}
-     * @package
-     */
-    this.connectedBlockWidths = 0;
   }
 
   /**
    * Inspect all subcomponents and populate all size properties on the row.
-   * @package
+   * @internal
    */
-  measure() {
+  override measure() {
     this.width = this.minWidth;
     this.height = this.minHeight;
     let connectedBlockWidths = 0;
@@ -67,10 +65,10 @@ class InputRow extends Row {
             Types.isExternalInput(elem) && elem instanceof ExternalValueInput &&
             elem.connectedBlockWidth !== 0) {
           connectedBlockWidths +=
-              (elem.connectedBlockWidth - elem.connectionWidth);
+              elem.connectedBlockWidth - elem.connectionWidth;
         }
       }
-      if (!(Types.isSpacer(elem))) {
+      if (!Types.isSpacer(elem)) {
         this.height = Math.max(this.height, elem.height);
       }
     }
@@ -78,12 +76,7 @@ class InputRow extends Row {
     this.widthWithConnectedBlocks = this.width + connectedBlockWidths;
   }
 
-  /**
-   * @override
-   */
-  endsWithElemSpacer() {
+  override endsWithElemSpacer() {
     return !this.hasExternalInput && !this.hasStatement;
   }
 }
-
-exports.InputRow = InputRow;

package/core/renderers/measurables/jagged_edge.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ConstantProvider } from '../common/constants.js';
+import { Measurable } from './base.js';
+/**
+ * An object containing information about the jagged edge of a collapsed block
+ * takes up during rendering
+ * @struct
+ * @alias Blockly.blockRendering.JaggedEdge
+ */
+export declare class JaggedEdge extends Measurable {
+    /**
+     * @param constants The rendering constants provider.
+     * @internal
+     */
+    constructor(constants: ConstantProvider);
+}

package/core/renderers/measurables/{jagged_edge.js → jagged_edge.ts}

@@ -14,33 +14,30 @@
  * block.
  * @class
  */
-goog.module('Blockly.blockRendering.JaggedEdge');
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.JaggedEdge');
 
-/* eslint-disable-next-line no-unused-vars */
-const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const {Measurable} = goog.require('Blockly.blockRendering.Measurable');
-const {Types} = goog.require('Blockly.blockRendering.Types');
+import type {ConstantProvider} from '../common/constants.js';
+
+import {Measurable} from './base.js';
+import {Types} from './types.js';
 
 
 /**
  * An object containing information about the jagged edge of a collapsed block
  * takes up during rendering
- * @extends {Measurable}
  * @struct
  * @alias Blockly.blockRendering.JaggedEdge
  */
-class JaggedEdge extends Measurable {
+export class JaggedEdge extends Measurable {
   /**
-   * @param {!ConstantProvider} constants The rendering
-   *   constants provider.
-   * @package
+   * @param constants The rendering constants provider.
+   * @internal
    */
-  constructor(constants) {
+  constructor(constants: ConstantProvider) {
     super(constants);
     this.type |= Types.JAGGED_EDGE;
     this.height = this.constants_.JAGGED_TEETH.height;
     this.width = this.constants_.JAGGED_TEETH.width;
   }
 }
-
-exports.JaggedEdge = JaggedEdge;

package/core/renderers/measurables/next_connection.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { RenderedConnection } from '../../rendered_connection.js';
+import type { ConstantProvider } from '../common/constants.js';
+import { Connection } from './connection.js';
+/**
+ * An object containing information about the space a next connection takes
+ * up during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.NextConnection
+ */
+export declare class NextConnection extends Connection {
+    /**
+     * @param constants The rendering constants provider.
+     * @param connectionModel The connection object on the block that this
+     *     represents.
+     * @internal
+     */
+    constructor(constants: ConstantProvider, connectionModel: RenderedConnection);
+}

package/core/renderers/measurables/next_connection.ts

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing the space a next connection takes up during
+ * rendering.
+ */
+
+/**
+ * Class representing the space a next connection takes up during
+ * rendering.
+ * @class
+ */
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.NextConnection');
+
+import type {RenderedConnection} from '../../rendered_connection.js';
+import type {ConstantProvider} from '../common/constants.js';
+
+import {Connection} from './connection.js';
+import {Types} from './types.js';
+
+
+/**
+ * An object containing information about the space a next connection takes
+ * up during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.NextConnection
+ */
+export class NextConnection extends Connection {
+  /**
+   * @param constants The rendering constants provider.
+   * @param connectionModel The connection object on the block that this
+   *     represents.
+   * @internal
+   */
+  constructor(
+      constants: ConstantProvider, connectionModel: RenderedConnection) {
+    super(constants, connectionModel);
+    this.type |= Types.NEXT_CONNECTION;
+    this.height = this.shape.height as number;
+    this.width = this.shape.width as number;
+  }
+}

package/core/renderers/measurables/output_connection.d.ts

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { RenderedConnection } from '../../rendered_connection.js';
+import type { ConstantProvider } from '../common/constants.js';
+import { Connection } from './connection.js';
+/**
+ * An object containing information about the space an output connection takes
+ * up during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.OutputConnection
+ */
+export declare class OutputConnection extends Connection {
+    startX: number;
+    connectionOffsetY: number;
+    connectionOffsetX: number;
+    /**
+     * @param constants The rendering constants provider.
+     * @param connectionModel The connection object on the block that this
+     *     represents.
+     * @internal
+     */
+    constructor(constants: ConstantProvider, connectionModel: RenderedConnection);
+}

package/core/renderers/measurables/output_connection.ts

@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing the space a output connection takes up
+ * during rendering.
+ */
+
+/**
+ * Class representing the space a output connection takes up
+ * during rendering.
+ * @class
+ */
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.OutputConnection');
+
+import type {RenderedConnection} from '../../rendered_connection.js';
+import type {ConstantProvider} from '../common/constants.js';
+
+import {Connection} from './connection.js';
+import {Types} from './types.js';
+
+
+/**
+ * An object containing information about the space an output connection takes
+ * up during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.OutputConnection
+ */
+export class OutputConnection extends Connection {
+  startX: number;
+  connectionOffsetY: number;
+  connectionOffsetX = 0;
+
+  /**
+   * @param constants The rendering constants provider.
+   * @param connectionModel The connection object on the block that this
+   *     represents.
+   * @internal
+   */
+  constructor(
+      constants: ConstantProvider, connectionModel: RenderedConnection) {
+    super(constants, connectionModel);
+    this.type |= Types.OUTPUT_CONNECTION;
+
+    this.height = !this.isDynamicShape ? this.shape.height as number : 0;
+    this.width = !this.isDynamicShape ? this.shape.width as number : 0;
+
+    this.startX = this.width;
+
+    this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
+  }
+}

package/core/renderers/measurables/previous_connection.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { RenderedConnection } from '../../rendered_connection.js';
+import type { ConstantProvider } from '../common/constants.js';
+import { Connection } from './connection.js';
+/**
+ * An object containing information about the space a previous connection takes
+ * up during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.PreviousConnection
+ */
+export declare class PreviousConnection extends Connection {
+    /**
+     * @param constants The rendering constants provider.
+     * @param connectionModel The connection object on the block that this
+     *     represents.
+     * @internal
+     */
+    constructor(constants: ConstantProvider, connectionModel: RenderedConnection);
+}

package/core/renderers/measurables/previous_connection.ts

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing the space a previous connection takes up
+ * during rendering.
+ */
+
+/**
+ * Class representing the space a previous connection takes up
+ * during rendering.
+ * @class
+ */
+import * as goog from '../../../closure/goog/goog.js';
+goog.declareModuleId('Blockly.blockRendering.PreviousConnection');
+
+import type {RenderedConnection} from '../../rendered_connection.js';
+import type {ConstantProvider} from '../common/constants.js';
+
+import {Connection} from './connection.js';
+import {Types} from './types.js';
+
+
+/**
+ * An object containing information about the space a previous connection takes
+ * up during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.PreviousConnection
+ */
+export class PreviousConnection extends Connection {
+  /**
+   * @param constants The rendering constants provider.
+   * @param connectionModel The connection object on the block that this
+   *     represents.
+   * @internal
+   */
+  constructor(
+      constants: ConstantProvider, connectionModel: RenderedConnection) {
+    super(constants, connectionModel);
+    this.type |= Types.PREVIOUS_CONNECTION;
+    this.height = this.shape.height as number;
+    this.width = this.shape.width as number;
+  }
+}

package/core/renderers/measurables/round_corner.d.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ConstantProvider } from '../common/constants.js';
+import { Measurable } from './base.js';
+/**
+ * An object containing information about the space a rounded corner takes up
+ * during rendering.
+ * @struct
+ * @alias Blockly.blockRendering.RoundCorner
+ */
+export declare class RoundCorner extends Measurable {
+    /**
+     * @param constants The rendering constants provider.
+     * @param opt_position The position of this corner.
+     * @internal
+     */
+    constructor(constants: ConstantProvider, opt_position?: string);
+}