CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-17 13:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate core/renderers/measurables/types.js to goog.module syntax (#5309)

Browse Source 
* Migrate core/renderers/measurables/types.js to goog.module

* Migrate core/renderers/measurables/types.js to named requires

* clang-format core/renderers/measurables/types.js
This commit is contained in:
Aaron Dodson
2021-08-05 13:57:16 -07:00
committed by GitHub
parent 04d032a8f0
commit 2b6d275440
2 changed files with 116 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
core/renderers/measurables/types.js
View File

@@ -11,42 +11,45 @@
'use strict';
goog.provide('Blockly.blockRendering.Types');
goog.module('Blockly.blockRendering.Types');
goog.module.declareLegacyNamespace();
goog.requireType('Blockly.blockRendering.Measurable');
goog.requireType('Blockly.blockRendering.Row');
/* eslint-disable-next-line no-unused-vars */
const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
/* eslint-disable-next-line no-unused-vars */
const Row = goog.requireType('Blockly.blockRendering.Row');
/**
* Types of rendering elements.
* @enum {number}
*/
Blockly.blockRendering.Types = {
NONE: 0, // None
FIELD: 1 << 0, // Field.
HAT: 1 << 1, // Hat.
ICON: 1 << 2, // Icon.
SPACER: 1 << 3, // Spacer.
BETWEEN_ROW_SPACER: 1 << 4, // Between Row Spacer.
IN_ROW_SPACER: 1 << 5, // In Row Spacer.
EXTERNAL_VALUE_INPUT: 1 << 6, // External Value Input.
INPUT: 1 << 7, // Input.
INLINE_INPUT: 1 << 8, // Inline Input.
STATEMENT_INPUT: 1 << 9, // Statement Input.
CONNECTION: 1 << 10, // Connection.
PREVIOUS_CONNECTION: 1 << 11, // Previous Connection.
NEXT_CONNECTION: 1 << 12, // Next Connection.
OUTPUT_CONNECTION: 1 << 13, // Output Connection.
CORNER: 1 << 14, // Corner.
LEFT_SQUARE_CORNER: 1 << 15, // Square Corner.
LEFT_ROUND_CORNER: 1 << 16, // Round Corner.
RIGHT_SQUARE_CORNER: 1 << 17, // Right Square Corner.
RIGHT_ROUND_CORNER: 1 << 18, // Right Round Corner.
JAGGED_EDGE: 1 << 19, // Jagged Edge.
ROW: 1 << 20, // Row.
TOP_ROW: 1 << 21, // Top Row.
BOTTOM_ROW: 1 << 22, // Bottom Row.
INPUT_ROW: 1 << 23 // Input Row.
const Types = {
NONE: 0, // None
FIELD: 1 << 0, // Field.
HAT: 1 << 1, // Hat.
ICON: 1 << 2, // Icon.
SPACER: 1 << 3, // Spacer.
BETWEEN_ROW_SPACER: 1 << 4, // Between Row Spacer.
IN_ROW_SPACER: 1 << 5, // In Row Spacer.
EXTERNAL_VALUE_INPUT: 1 << 6, // External Value Input.
INPUT: 1 << 7, // Input.
INLINE_INPUT: 1 << 8, // Inline Input.
STATEMENT_INPUT: 1 << 9, // Statement Input.
CONNECTION: 1 << 10, // Connection.
PREVIOUS_CONNECTION: 1 << 11, // Previous Connection.
NEXT_CONNECTION: 1 << 12, // Next Connection.
OUTPUT_CONNECTION: 1 << 13, // Output Connection.
CORNER: 1 << 14, // Corner.
LEFT_SQUARE_CORNER: 1 << 15, // Square Corner.
LEFT_ROUND_CORNER: 1 << 16, // Round Corner.
RIGHT_SQUARE_CORNER: 1 << 17, // Right Square Corner.
RIGHT_ROUND_CORNER: 1 << 18, // Right Round Corner.
JAGGED_EDGE: 1 << 19, // Jagged Edge.
ROW: 1 << 20, // Row.
TOP_ROW: 1 << 21, // Top Row.
BOTTOM_ROW: 1 << 22, // Bottom Row.
INPUT_ROW: 1 << 23 // Input Row.
};
/**
@@ -55,9 +58,7 @@ Blockly.blockRendering.Types = {
* @const
* @package
*/
Blockly.blockRendering.Types.LEFT_CORNER =
Blockly.blockRendering.Types.LEFT_SQUARE_CORNER |
Blockly.blockRendering.Types.LEFT_ROUND_CORNER;
Types.LEFT_CORNER = Types.LEFT_SQUARE_CORNER | Types.LEFT_ROUND_CORNER;
/**
* A Right Corner Union Type.
@@ -65,19 +66,17 @@ Blockly.blockRendering.Types.LEFT_CORNER =
* @const
* @package
*/
Blockly.blockRendering.Types.RIGHT_CORNER =
Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER |
Blockly.blockRendering.Types.RIGHT_ROUND_CORNER;
Types.RIGHT_CORNER = Types.RIGHT_SQUARE_CORNER | Types.RIGHT_ROUND_CORNER;
/**
* Next flag value to use for custom rendering element types.
* This must be updated to reflect the next enum flag value
* to use if additional elements are added to
* `Blockly.blockRendering.Types`.
* `Types`.
* @type {number}
* @private
*/
Blockly.blockRendering.Types.nextTypeValue_ = 1 << 24;
Types.nextTypeValue_ = 1 << 24;
/**
* Get the enum flag value of an existing type or register a new type.
@@ -85,268 +84,267 @@ Blockly.blockRendering.Types.nextTypeValue_ = 1 << 24;
* @return {!number} The enum flag value associated with that type.
* @package
*/
Blockly.blockRendering.Types.getType = function(type) {
if (!Object.prototype.hasOwnProperty.call(Blockly.blockRendering.Types, type)) {
Blockly.blockRendering.Types[type] =
Blockly.blockRendering.Types.nextTypeValue_;
Blockly.blockRendering.Types.nextTypeValue_ <<= 1;
Types.getType = function(type) {
if (!Object.prototype.hasOwnProperty.call(Types, type)) {
Types[type] = Types.nextTypeValue_;
Types.nextTypeValue_ <<= 1;
}
return Blockly.blockRendering.Types[type];
return Types[type];
};
/**
* Whether a measurable stores information about a field.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a field.
* @package
*/
Blockly.blockRendering.Types.isField = function(elem) {
return elem.type & Blockly.blockRendering.Types.FIELD;
Types.isField = function(elem) {
return elem.type & Types.FIELD;
};
/**
* Whether a measurable stores information about a hat.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a hat.
* @package
*/
Blockly.blockRendering.Types.isHat = function(elem) {
return elem.type & Blockly.blockRendering.Types.HAT;
Types.isHat = function(elem) {
return elem.type & Types.HAT;
};
/**
* Whether a measurable stores information about an icon.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about an icon.
* @package
*/
Blockly.blockRendering.Types.isIcon = function(elem) {
return elem.type & Blockly.blockRendering.Types.ICON;
Types.isIcon = function(elem) {
return elem.type & Types.ICON;
};
/**
* Whether a measurable stores information about a spacer.
* @param {!Blockly.blockRendering.Measurable|!Blockly.blockRendering.Row} elem
* @param {!Measurable|!Row} elem
* The element to check.
* @return {number} 1 if the object stores information about a spacer.
* @package
*/
Blockly.blockRendering.Types.isSpacer = function(elem) {
return elem.type & Blockly.blockRendering.Types.SPACER;
Types.isSpacer = function(elem) {
return elem.type & Types.SPACER;
};
/**
* Whether a measurable stores information about an in-row spacer.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about an
* in-row spacer.
* @package
*/
Blockly.blockRendering.Types.isInRowSpacer = function(elem) {
return elem.type & Blockly.blockRendering.Types.IN_ROW_SPACER;
Types.isInRowSpacer = function(elem) {
return elem.type & Types.IN_ROW_SPACER;
};
/**
* Whether a measurable stores information about an input.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about an input.
* @package
*/
Blockly.blockRendering.Types.isInput = function(elem) {
return elem.type & Blockly.blockRendering.Types.INPUT;
Types.isInput = function(elem) {
return elem.type & Types.INPUT;
};
/**
* Whether a measurable stores information about an external input.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about an
* external input.
* @package
*/
Blockly.blockRendering.Types.isExternalInput = function(elem) {
return elem.type & Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
Types.isExternalInput = function(elem) {
return elem.type & Types.EXTERNAL_VALUE_INPUT;
};
/**
* Whether a measurable stores information about an inline input.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about an
* inline input.
* @package
*/
Blockly.blockRendering.Types.isInlineInput = function(elem) {
return elem.type & Blockly.blockRendering.Types.INLINE_INPUT;
Types.isInlineInput = function(elem) {
return elem.type & Types.INLINE_INPUT;
};
/**
* Whether a measurable stores information about a statement input.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* statement input.
* @package
*/
Blockly.blockRendering.Types.isStatementInput = function(elem) {
return elem.type & Blockly.blockRendering.Types.STATEMENT_INPUT;
Types.isStatementInput = function(elem) {
return elem.type & Types.STATEMENT_INPUT;
};
/**
* Whether a measurable stores information about a previous connection.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* previous connection.
* @package
*/
Blockly.blockRendering.Types.isPreviousConnection = function(elem) {
return elem.type & Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
Types.isPreviousConnection = function(elem) {
return elem.type & Types.PREVIOUS_CONNECTION;
};
/**
* Whether a measurable stores information about a next connection.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* next connection.
* @package
*/
Blockly.blockRendering.Types.isNextConnection = function(elem) {
return elem.type & Blockly.blockRendering.Types.NEXT_CONNECTION;
Types.isNextConnection = function(elem) {
return elem.type & Types.NEXT_CONNECTION;
};
/**
* Whether a measurable stores information about a previous or next connection.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a previous or
* next connection.
* @package
*/
Blockly.blockRendering.Types.isPreviousOrNextConnection = function(elem) {
return elem.type & (Blockly.blockRendering.Types.PREVIOUS_CONNECTION |
Blockly.blockRendering.Types.NEXT_CONNECTION);
Types.isPreviousOrNextConnection = function(elem) {
return elem.type & (Types.PREVIOUS_CONNECTION | Types.NEXT_CONNECTION);
};
/**
* Whether a measurable stores information about a left round corner.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* left round corner.
* @package
*/
Blockly.blockRendering.Types.isLeftRoundedCorner = function(elem) {
return elem.type & Blockly.blockRendering.Types.LEFT_ROUND_CORNER;
Types.isLeftRoundedCorner = function(elem) {
return elem.type & Types.LEFT_ROUND_CORNER;
};
/**
* Whether a measurable stores information about a right round corner.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* right round corner.
* @package
*/
Blockly.blockRendering.Types.isRightRoundedCorner = function(elem) {
return elem.type & Blockly.blockRendering.Types.RIGHT_ROUND_CORNER;
Types.isRightRoundedCorner = function(elem) {
return elem.type & Types.RIGHT_ROUND_CORNER;
};
/**
* Whether a measurable stores information about a left square corner.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* left square corner.
* @package
*/
Blockly.blockRendering.Types.isLeftSquareCorner = function(elem) {
return elem.type & Blockly.blockRendering.Types.LEFT_SQUARE_CORNER;
Types.isLeftSquareCorner = function(elem) {
return elem.type & Types.LEFT_SQUARE_CORNER;
};
/**
* Whether a measurable stores information about a right square corner.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* right square corner.
* @package
*/
Blockly.blockRendering.Types.isRightSquareCorner = function(elem) {
return elem.type & Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER;
Types.isRightSquareCorner = function(elem) {
return elem.type & Types.RIGHT_SQUARE_CORNER;
};
/**
* Whether a measurable stores information about a corner.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a
* corner.
* @package
*/
Blockly.blockRendering.Types.isCorner = function(elem) {
return elem.type & Blockly.blockRendering.Types.CORNER;
Types.isCorner = function(elem) {
return elem.type & Types.CORNER;
};
/**
* Whether a measurable stores information about a jagged edge.
* @param {!Blockly.blockRendering.Measurable} elem The element to check.
* @param {!Measurable} elem The element to check.
* @return {number} 1 if the object stores information about a jagged edge.
* @package
*/
Blockly.blockRendering.Types.isJaggedEdge = function(elem) {
return elem.type & Blockly.blockRendering.Types.JAGGED_EDGE;
Types.isJaggedEdge = function(elem) {
return elem.type & Types.JAGGED_EDGE;
};
/**
* Whether a measurable stores information about a row.
* @param {!Blockly.blockRendering.Row} row The row to check.
* @param {!Row} row The row to check.
* @return {number} 1 if the object stores information about a row.
* @package
*/
Blockly.blockRendering.Types.isRow = function(row) {
return row.type & Blockly.blockRendering.Types.ROW;
Types.isRow = function(row) {
return row.type & Types.ROW;
};
/**
* Whether a measurable stores information about a between-row spacer.
* @param {!Blockly.blockRendering.Row} row The row to check.
* @param {!Row} row The row to check.
* @return {number} 1 if the object stores information about a
* between-row spacer.
* @package
*/
Blockly.blockRendering.Types.isBetweenRowSpacer = function(row) {
return row.type & Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
Types.isBetweenRowSpacer = function(row) {
return row.type & Types.BETWEEN_ROW_SPACER;
};
/**
* Whether a measurable stores information about a top row.
* @param {!Blockly.blockRendering.Row} row The row to check.
* @param {!Row} row The row to check.
* @return {number} 1 if the object stores information about a top row.
* @package
*/
Blockly.blockRendering.Types.isTopRow = function(row) {
return row.type & Blockly.blockRendering.Types.TOP_ROW;
Types.isTopRow = function(row) {
return row.type & Types.TOP_ROW;
};
/**
* Whether a measurable stores information about a bottom row.
* @param {!Blockly.blockRendering.Row} row The row to check.
* @param {!Row} row The row to check.
* @return {number} 1 if the object stores information about a bottom row.
* @package
*/
Blockly.blockRendering.Types.isBottomRow = function(row) {
return row.type & Blockly.blockRendering.Types.BOTTOM_ROW;
Types.isBottomRow = function(row) {
return row.type & Types.BOTTOM_ROW;
};
/**
* Whether a measurable stores information about a top or bottom row.
* @param {!Blockly.blockRendering.Row} row The row to check.
* @param {!Row} row The row to check.
* @return {number} 1 if the object stores information about a top or
* bottom row.
* @package
*/
Blockly.blockRendering.Types.isTopOrBottomRow = function(row) {
return row.type & (Blockly.blockRendering.Types.TOP_ROW |
Blockly.blockRendering.Types.BOTTOM_ROW);
Types.isTopOrBottomRow = function(row) {
return row.type & (Types.TOP_ROW | Types.BOTTOM_ROW);
};
/**
* Whether a measurable stores information about an input row.
* @param {!Blockly.blockRendering.Row} row The row to check.
* @param {!Row} row The row to check.
* @return {number} 1 if the object stores information about an input row.
* @package
*/
Blockly.blockRendering.Types.isInputRow = function(row) {
return row.type & Blockly.blockRendering.Types.INPUT_ROW;
Types.isInputRow = function(row) {
return row.type & Types.INPUT_ROW;
};
exports = Types;

2
tests/deps.js
View File

@@ -144,7 +144,7 @@ goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.
goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);