From 6b07ccab96d02a555ad5cc71962181b32ad6db66 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Fri, 24 Sep 2021 08:33:35 -0700 Subject: [PATCH] chore: Remove declareLegacyNamespace from renderers (#5528) * chore: Remove declareLegacyNamespace from Geras renderer * chore: Remove declareLegacyNamespace from minimalist renderer * chore: Remove declareLegacyNamespace from thrasos renderer * chore: Remove declareLegacyNamespace from zelos renderer * fix: Move debugger functionality out of Blockly.blockRendering to avoid dependency cycle when re-exporting submodules * chore: Remove declareLegacyNamespace from Blockly.blockRendering.* --- core/blockly.js | 10 +++ core/renderers/common/block_rendering.js | 90 ++++++++++++++++--- core/renderers/common/constants.js | 1 - core/renderers/common/debug.js | 48 ++++++++++ core/renderers/common/debugger.js | 1 - core/renderers/common/drawer.js | 5 +- core/renderers/common/i_path_object.js | 1 - core/renderers/common/info.js | 1 - core/renderers/common/marker_svg.js | 1 - core/renderers/common/path_object.js | 1 - core/renderers/common/renderer.js | 7 +- core/renderers/geras/constants.js | 1 - core/renderers/geras/drawer.js | 5 +- core/renderers/geras/geras.js | 32 +++++++ core/renderers/geras/highlight_constants.js | 1 - core/renderers/geras/highlighter.js | 1 - core/renderers/geras/info.js | 1 - .../geras/measurables/inline_input.js | 1 - .../geras/measurables/statement_input.js | 1 - core/renderers/geras/path_object.js | 1 - core/renderers/geras/renderer.js | 1 - core/renderers/measurables/base.js | 1 - core/renderers/measurables/bottom_row.js | 1 - core/renderers/measurables/connection.js | 1 - .../measurables/external_value_input.js | 1 - core/renderers/measurables/field.js | 1 - core/renderers/measurables/hat.js | 1 - core/renderers/measurables/icon.js | 1 - core/renderers/measurables/in_row_spacer.js | 1 - core/renderers/measurables/inline_input.js | 1 - .../renderers/measurables/input_connection.js | 1 - core/renderers/measurables/input_row.js | 1 - core/renderers/measurables/jagged_edge.js | 1 - core/renderers/measurables/next_connection.js | 1 - .../measurables/output_connection.js | 1 - .../measurables/previous_connection.js | 1 - core/renderers/measurables/round_corner.js | 1 - core/renderers/measurables/row.js | 1 - core/renderers/measurables/spacer_row.js | 1 - core/renderers/measurables/square_corner.js | 1 - core/renderers/measurables/statement_input.js | 1 - core/renderers/measurables/top_row.js | 1 - core/renderers/measurables/types.js | 1 - core/renderers/minimalist/constants.js | 1 - core/renderers/minimalist/drawer.js | 1 - core/renderers/minimalist/info.js | 1 - core/renderers/minimalist/minimalist.js | 22 +++++ core/renderers/minimalist/renderer.js | 1 - core/renderers/thrasos/info.js | 1 - core/renderers/thrasos/renderer.js | 1 - core/renderers/thrasos/thrasos.js | 18 ++++ core/renderers/zelos/constants.js | 1 - core/renderers/zelos/drawer.js | 5 +- core/renderers/zelos/info.js | 1 - core/renderers/zelos/marker_svg.js | 1 - .../renderers/zelos/measurables/bottom_row.js | 1 - core/renderers/zelos/measurables/inputs.js | 1 - .../zelos/measurables/row_elements.js | 1 - core/renderers/zelos/measurables/top_row.js | 1 - core/renderers/zelos/path_object.js | 1 - core/renderers/zelos/renderer.js | 1 - core/renderers/zelos/zelos.js | 34 +++++++ tests/deps.js | 17 ++-- tests/deps.mocha.js | 17 ++-- 64 files changed, 272 insertions(+), 89 deletions(-) create mode 100644 core/renderers/common/debug.js create mode 100644 core/renderers/geras/geras.js create mode 100644 core/renderers/minimalist/minimalist.js create mode 100644 core/renderers/thrasos/thrasos.js create mode 100644 core/renderers/zelos/zelos.js diff --git a/core/blockly.js b/core/blockly.js index c4622ed17..30d5378e8 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -104,6 +104,7 @@ const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg'); const Xml = goog.require('Blockly.Xml'); const ZoomControls = goog.require('Blockly.ZoomControls'); const blockAnimations = goog.require('Blockly.blockAnimations'); +const blockRendering = goog.require('Blockly.blockRendering'); const browserEvents = goog.require('Blockly.browserEvents'); const bumpObjects = goog.require('Blockly.bumpObjects'); const clipboard = goog.require('Blockly.clipboard'); @@ -113,13 +114,17 @@ const constants = goog.require('Blockly.constants'); const deprecation = goog.require('Blockly.utils.deprecation'); const dialog = goog.require('Blockly.dialog'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); +const geras = goog.require('Blockly.geras'); const inject = goog.require('Blockly.inject'); const inputTypes = goog.require('Blockly.inputTypes'); const internalConstants = goog.require('Blockly.internalConstants'); +const minimalist = goog.require('Blockly.minimalist'); const registry = goog.require('Blockly.registry'); +const thrasos = goog.require('Blockly.thrasos'); const toolbox = goog.require('Blockly.utils.toolbox'); const uiPosition = goog.require('Blockly.uiPosition'); const utils = goog.require('Blockly.utils'); +const zelos = goog.require('Blockly.zelos'); const {Block} = goog.require('Blockly.Block'); const {BlockDragger} = goog.require('Blockly.BlockDragger'); const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg'); @@ -591,6 +596,7 @@ exports.WorkspaceSvg = WorkspaceSvg; exports.Xml = Xml; exports.ZoomControls = ZoomControls; exports.blockAnimations = blockAnimations; +exports.blockRendering = blockRendering; exports.browserEvents = browserEvents; exports.bumpObjects = bumpObjects; exports.clipboard = clipboard; @@ -600,8 +606,12 @@ exports.connectionTypes = ConnectionType; exports.constants = constants; exports.dialog = dialog; exports.fieldRegistry = fieldRegistry; +exports.geras = geras; exports.inject = inject; exports.inputTypes = inputTypes; +exports.minimalist = minimalist; exports.registry = registry; +exports.thrasos = thrasos; exports.uiPosition = uiPosition; exports.utils = utils; +exports.zelos = zelos; diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js index c00d58523..b1bfa911e 100644 --- a/core/renderers/common/block_rendering.js +++ b/core/renderers/common/block_rendering.js @@ -11,26 +11,52 @@ 'use strict'; goog.module('Blockly.blockRendering'); -goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.blockRendering.Renderer'); +const BottomRow = goog.require('Blockly.blockRendering.BottomRow'); +const Connection = goog.require('Blockly.blockRendering.Connection'); +const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); +const Debug = goog.require('Blockly.blockRendering.Debug'); +const Drawer = goog.require('Blockly.blockRendering.Drawer'); +const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput'); +const Field = goog.require('Blockly.blockRendering.Field'); +const Hat = goog.require('Blockly.blockRendering.Hat'); +const Icon = goog.require('Blockly.blockRendering.Icon'); +const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); +const InlineInput = goog.require('Blockly.blockRendering.InlineInput'); +const InputConnection = goog.require('Blockly.blockRendering.InputConnection'); +const InputRow = goog.require('Blockly.blockRendering.InputRow'); +const IPathObject = goog.require('Blockly.blockRendering.IPathObject'); +const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge'); +const MarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg'); +const Measurable = goog.require('Blockly.blockRendering.Measurable'); +const NextConnection = goog.require('Blockly.blockRendering.NextConnection'); +const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection'); +const PathObject = goog.require('Blockly.blockRendering.PathObject'); +const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection'); +const Renderer = goog.require('Blockly.blockRendering.Renderer'); +const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); +const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner'); +const Row = goog.require('Blockly.blockRendering.Row'); +const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow'); +const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner'); +const StatementInput = goog.require('Blockly.blockRendering.StatementInput'); /* eslint-disable-next-line no-unused-vars */ const Theme = goog.requireType('Blockly.Theme'); +const TopRow = goog.require('Blockly.blockRendering.TopRow'); +const Types = goog.require('Blockly.blockRendering.Types'); +const debug = goog.require('Blockly.blockRendering.debug'); +const deprecation = goog.require('Blockly.utils.deprecation'); const registry = goog.require('Blockly.registry'); - -/** - * Whether or not the debugger is turned on. - * @type {boolean} - */ -let useDebugger = false; /** * Returns whether the debugger is turned on. * @return {boolean} Whether the debugger is turned on. */ const isDebuggerEnabled = function() { - return useDebugger; + deprecation.warn( + 'Blockly.blockRendering.isDebuggerEnabled()', 'September 2021', + 'September 2022', 'Blockly.blockRendering.debug.isDebuggerEnabled()'); + return debug.isDebuggerEnabled(); }; /** @package */ exports.isDebuggerEnabled = isDebuggerEnabled; @@ -42,7 +68,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled; * to register. * @throws {Error} if a renderer with the same name has already been registered. */ -const register = function(name, rendererClass) { + const register = function(name, rendererClass) { registry.register(registry.Type.RENDERER, name, rendererClass); }; exports.register = register; @@ -61,7 +87,10 @@ exports.unregister = unregister; * @package */ const startDebugger = function() { - useDebugger = true; + deprecation.warn( + 'Blockly.blockRendering.startDebugger()', 'September 2021', + 'September 2022', 'Blockly.blockRendering.debug.startDebugger()'); + debug.startDebugger(); }; /** @package */ exports.startDebugger = startDebugger; @@ -71,7 +100,10 @@ exports.startDebugger = startDebugger; * @package */ const stopDebugger = function() { - useDebugger = false; + deprecation.warn( + 'Blockly.blockRendering.stopDebugger()', 'September 2021', + 'September 2022', 'Blockly.blockRendering.debug.stopDebugger()'); + debug.stopDebugger(); }; /** @package */ exports.stopDebugger = stopDebugger; @@ -93,3 +125,35 @@ const init = function(name, theme, opt_rendererOverrides) { }; /** @package */ exports.init = init; + +exports.BottomRow = BottomRow; +exports.Connection = Connection; +exports.ConstantProvider = ConstantProvider; +exports.Debug = Debug; +exports.Drawer = Drawer; +exports.ExternalValueInput = ExternalValueInput; +exports.Field = Field; +exports.Hat = Hat; +exports.Icon = Icon; +exports.InRowSpacer = InRowSpacer; +exports.InlineInput = InlineInput; +exports.InputConnection = InputConnection; +exports.InputRow = InputRow; +exports.IPathObject = IPathObject; +exports.JaggedEdge = JaggedEdge; +exports.MarkerSvg = MarkerSvg; +exports.Measurable = Measurable; +exports.NextConnection = NextConnection; +exports.OutputConnection = OutputConnection; +exports.PathObject = PathObject; +exports.PreviousConnection = PreviousConnection; +exports.Renderer = Renderer; +exports.RenderInfo = RenderInfo; +exports.RoundCorner = RoundCorner; +exports.Row = Row; +exports.SpacerRow = SpacerRow; +exports.SquareCorner = SquareCorner; +exports.StatementInput = StatementInput; +exports.TopRow = TopRow; +exports.Types = Types; +exports.debug = debug; diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js index 49b3bd430..8febc9f9a 100644 --- a/core/renderers/common/constants.js +++ b/core/renderers/common/constants.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.blockRendering.ConstantProvider'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); diff --git a/core/renderers/common/debug.js b/core/renderers/common/debug.js new file mode 100644 index 000000000..34c51224d --- /dev/null +++ b/core/renderers/common/debug.js @@ -0,0 +1,48 @@ +/** + * @license + * Copyright 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 +*/ + +/** + * @fileoverview Block rendering debugging functionality. + */ +'use strict'; + +goog.module('Blockly.blockRendering.debug'); + + +/** + * Whether or not the debugger is turned on. + * @type {boolean} + */ +let useDebugger = false; +/** + * Returns whether the debugger is turned on. + * @return {boolean} Whether the debugger is turned on. + */ +const isDebuggerEnabled = function() { + return useDebugger; +}; +/** @package */ +exports.isDebuggerEnabled = isDebuggerEnabled; + +/** + * Turn on the blocks debugger. + * @package + */ +const startDebugger = function() { + useDebugger = true; +}; +/** @package */ +exports.startDebugger = startDebugger; + +/** + * Turn off the blocks debugger. + * @package + */ +const stopDebugger = function() { + useDebugger = false; +}; +/** @package */ +exports.stopDebugger = stopDebugger; diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js index 23f6f0406..84c047ae5 100644 --- a/core/renderers/common/debugger.js +++ b/core/renderers/common/debugger.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.blockRendering.Debug'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js index f88e9faaa..075de23b2 100644 --- a/core/renderers/common/drawer.js +++ b/core/renderers/common/drawer.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.blockRendering.Drawer'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); @@ -26,7 +25,7 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ const Row = goog.requireType('Blockly.blockRendering.Row'); const Types = goog.require('Blockly.blockRendering.Types'); -const blockRendering = goog.require('Blockly.blockRendering'); +const debug = goog.require('Blockly.blockRendering.debug'); const svgPaths = goog.require('Blockly.utils.svgPaths'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); @@ -74,7 +73,7 @@ Drawer.prototype.draw = function() { if (this.info_.RTL) { this.block_.pathObject.flipRTL(); } - if (blockRendering.isDebuggerEnabled()) { + if (debug.isDebuggerEnabled()) { this.block_.renderingDebugger.drawDebug(this.block_, this.info_); } this.recordSizeOnBlock_(); diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js index 80d465682..eddf0c593 100644 --- a/core/renderers/common/i_path_object.js +++ b/core/renderers/common/i_path_object.js @@ -13,7 +13,6 @@ 'use strict'; goog.module('Blockly.blockRendering.IPathObject'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js index 3d807d04d..d47660579 100644 --- a/core/renderers/common/info.js +++ b/core/renderers/common/info.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.blockRendering.RenderInfo'); -goog.module.declareLegacyNamespace(); const BottomRow = goog.require('Blockly.blockRendering.BottomRow'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js index b8e190267..478848584 100644 --- a/core/renderers/common/marker_svg.js +++ b/core/renderers/common/marker_svg.js @@ -12,7 +12,6 @@ goog.module('Blockly.blockRendering.MarkerSvg'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js index 34f6ee16a..2c98e9e93 100644 --- a/core/renderers/common/path_object.js +++ b/core/renderers/common/path_object.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.blockRendering.PathObject'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js index b9615ca5e..f2bca0eef 100644 --- a/core/renderers/common/renderer.js +++ b/core/renderers/common/renderer.js @@ -11,9 +11,9 @@ 'use strict'; goog.module('Blockly.blockRendering.Renderer'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.Connection'); +const ConnectionType = goog.require('Blockly.ConnectionType'); const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ const Debug = goog.requireType('Blockly.blockRendering.Debug'); @@ -32,8 +32,7 @@ const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); const Theme = goog.requireType('Blockly.Theme'); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); -const blockRendering = goog.require('Blockly.blockRendering'); -const ConnectionType = goog.require('Blockly.ConnectionType'); +const debug = goog.require('Blockly.blockRendering.debug'); const object = goog.require('Blockly.utils.object'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); @@ -289,7 +288,7 @@ Renderer.prototype.getConnectionPreviewMethod = function( * @package */ Renderer.prototype.render = function(block) { - if (blockRendering.isDebuggerEnabled() && !block.renderingDebugger) { + if (debug.isDebuggerEnabled() && !block.renderingDebugger) { block.renderingDebugger = this.makeDebugger_(); } const info = this.makeRenderInfo_(block); diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js index 9a923a34a..cb5011367 100644 --- a/core/renderers/geras/constants.js +++ b/core/renderers/geras/constants.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.geras.ConstantProvider'); -goog.module.declareLegacyNamespace(); const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); const object = goog.require('Blockly.utils.object'); diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js index 15dcff2ae..9851cdd2b 100644 --- a/core/renderers/geras/drawer.js +++ b/core/renderers/geras/drawer.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.geras.Drawer'); -goog.module.declareLegacyNamespace(); const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); const Highlighter = goog.require('Blockly.geras.Highlighter'); @@ -19,7 +18,7 @@ const Highlighter = goog.require('Blockly.geras.Highlighter'); const PathObject = goog.requireType('Blockly.geras.PathObject'); /* eslint-disable-next-line no-unused-vars */ const RenderInfo = goog.requireType('Blockly.geras.RenderInfo'); -const blockRendering = goog.require('Blockly.blockRendering'); +const debug = goog.require('Blockly.blockRendering.debug'); const object = goog.require('Blockly.utils.object'); const svgPaths = goog.require('Blockly.utils.svgPaths'); /* eslint-disable-next-line no-unused-vars */ @@ -57,7 +56,7 @@ Drawer.prototype.draw = function() { if (this.info_.RTL) { pathObject.flipRTL(); } - if (blockRendering.isDebuggerEnabled()) { + if (debug.isDebuggerEnabled()) { this.block_.renderingDebugger.drawDebug(this.block_, this.info_); } this.recordSizeOnBlock_(); diff --git a/core/renderers/geras/geras.js b/core/renderers/geras/geras.js new file mode 100644 index 000000000..c15aff155 --- /dev/null +++ b/core/renderers/geras/geras.js @@ -0,0 +1,32 @@ +/** + * @license + * Copyright 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @fileoverview Re-exports of Blockly.geras.* modules. + */ +'use strict'; + +goog.module('Blockly.geras'); + +const ConstantProvider = goog.require('Blockly.geras.ConstantProvider'); +const Drawer = goog.require('Blockly.geras.Drawer'); +const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider'); +const Highlighter = goog.require('Blockly.geras.Highlighter'); +const InlineInput = goog.require('Blockly.geras.InlineInput'); +const PathObject = goog.require('Blockly.geras.PathObject'); +const RenderInfo = goog.require('Blockly.geras.RenderInfo'); +const Renderer = goog.require('Blockly.geras.Renderer'); +const StatementInput = goog.require('Blockly.geras.StatementInput'); + +exports.ConstantProvider = ConstantProvider; +exports.Drawer = Drawer; +exports.HighlightConstantProvider = HighlightConstantProvider; +exports.Highlighter = Highlighter; +exports.InlineInput = InlineInput; +exports.PathObject = PathObject; +exports.RenderInfo = RenderInfo; +exports.Renderer = Renderer; +exports.StatementInput = StatementInput; diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js index 5689029b5..46cf341b1 100644 --- a/core/renderers/geras/highlight_constants.js +++ b/core/renderers/geras/highlight_constants.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.geras.HighlightConstantProvider'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js index f04339d29..8b6d9f63a 100644 --- a/core/renderers/geras/highlighter.js +++ b/core/renderers/geras/highlighter.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.geras.Highlighter'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js index 8226cb292..e5edc0fa6 100644 --- a/core/renderers/geras/info.js +++ b/core/renderers/geras/info.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.geras.RenderInfo'); -goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput'); diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js index b0e3dd776..ed534cd8d 100644 --- a/core/renderers/geras/measurables/inline_input.js +++ b/core/renderers/geras/measurables/inline_input.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.geras.InlineInput'); -goog.module.declareLegacyNamespace(); const BaseInlineInput = goog.require('Blockly.blockRendering.InlineInput'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js index 1c49f2b42..92d58c303 100644 --- a/core/renderers/geras/measurables/statement_input.js +++ b/core/renderers/geras/measurables/statement_input.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.geras.StatementInput'); -goog.module.declareLegacyNamespace(); const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js index 9d50c672c..dc07b707e 100644 --- a/core/renderers/geras/path_object.js +++ b/core/renderers/geras/path_object.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.geras.PathObject'); -goog.module.declareLegacyNamespace(); const BasePathObject = goog.require('Blockly.blockRendering.PathObject'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js index 9cf592c69..b9ee3d6cc 100644 --- a/core/renderers/geras/renderer.js +++ b/core/renderers/geras/renderer.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.geras.Renderer'); -goog.module.declareLegacyNamespace(); const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js index b3a16d061..a7d208f3a 100644 --- a/core/renderers/measurables/base.js +++ b/core/renderers/measurables/base.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.blockRendering.Measurable'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js index 2ed324afe..6855089c7 100644 --- a/core/renderers/measurables/bottom_row.js +++ b/core/renderers/measurables/bottom_row.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.BottomRow'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js index f8b77714e..3f608f150 100644 --- a/core/renderers/measurables/connection.js +++ b/core/renderers/measurables/connection.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.Connection'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js index 8835716c4..06d48df88 100644 --- a/core/renderers/measurables/external_value_input.js +++ b/core/renderers/measurables/external_value_input.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.ExternalValueInput'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/field.js b/core/renderers/measurables/field.js index 33c6b6eb3..2d224913c 100644 --- a/core/renderers/measurables/field.js +++ b/core/renderers/measurables/field.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.Field'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/hat.js b/core/renderers/measurables/hat.js index a7d5f269b..3d6f18e48 100644 --- a/core/renderers/measurables/hat.js +++ b/core/renderers/measurables/hat.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.Hat'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/icon.js b/core/renderers/measurables/icon.js index 850d123f0..d5b0b5fd4 100644 --- a/core/renderers/measurables/icon.js +++ b/core/renderers/measurables/icon.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.Icon'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BlocklyIcon = goog.requireType('Blockly.Icon'); diff --git a/core/renderers/measurables/in_row_spacer.js b/core/renderers/measurables/in_row_spacer.js index 4177807f0..d8ef7fef0 100644 --- a/core/renderers/measurables/in_row_spacer.js +++ b/core/renderers/measurables/in_row_spacer.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.InRowSpacer'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js index 01ac0527d..d13c498bb 100644 --- a/core/renderers/measurables/inline_input.js +++ b/core/renderers/measurables/inline_input.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.InlineInput'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js index e6353c643..0466df7c2 100644 --- a/core/renderers/measurables/input_connection.js +++ b/core/renderers/measurables/input_connection.js @@ -10,7 +10,6 @@ */ goog.module('Blockly.blockRendering.InputConnection'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.blockRendering.Connection'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js index 587d8cb8b..33c57fa79 100644 --- a/core/renderers/measurables/input_row.js +++ b/core/renderers/measurables/input_row.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.InputRow'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/jagged_edge.js b/core/renderers/measurables/jagged_edge.js index 14c9dd533..c4e99faba 100644 --- a/core/renderers/measurables/jagged_edge.js +++ b/core/renderers/measurables/jagged_edge.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.JaggedEdge'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js index 79f50e7a8..3414c56a2 100644 --- a/core/renderers/measurables/next_connection.js +++ b/core/renderers/measurables/next_connection.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.NextConnection'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.blockRendering.Connection'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js index 3b1030bb9..a91c309c9 100644 --- a/core/renderers/measurables/output_connection.js +++ b/core/renderers/measurables/output_connection.js @@ -12,7 +12,6 @@ */ goog.module('Blockly.blockRendering.OutputConnection'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.blockRendering.Connection'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js index 6b48d8b44..4eb2c0f31 100644 --- a/core/renderers/measurables/previous_connection.js +++ b/core/renderers/measurables/previous_connection.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.PreviousConnection'); -goog.module.declareLegacyNamespace(); const Connection = goog.require('Blockly.blockRendering.Connection'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/measurables/round_corner.js b/core/renderers/measurables/round_corner.js index 605f5536b..8c79a7341 100644 --- a/core/renderers/measurables/round_corner.js +++ b/core/renderers/measurables/round_corner.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.RoundCorner'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js index 86be896c8..c776b1ce9 100644 --- a/core/renderers/measurables/row.js +++ b/core/renderers/measurables/row.js @@ -10,7 +10,6 @@ */ goog.module('Blockly.blockRendering.Row'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js index 3956355cb..8dde265ed 100644 --- a/core/renderers/measurables/spacer_row.js +++ b/core/renderers/measurables/spacer_row.js @@ -10,7 +10,6 @@ */ goog.module('Blockly.blockRendering.SpacerRow'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/square_corner.js b/core/renderers/measurables/square_corner.js index 7af12dad6..7674498f9 100644 --- a/core/renderers/measurables/square_corner.js +++ b/core/renderers/measurables/square_corner.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.SquareCorner'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js index 6050496d7..d151d0595 100644 --- a/core/renderers/measurables/statement_input.js +++ b/core/renderers/measurables/statement_input.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.blockRendering.StatementInput'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js index e64ba06a6..569189533 100644 --- a/core/renderers/measurables/top_row.js +++ b/core/renderers/measurables/top_row.js @@ -10,7 +10,6 @@ */ goog.module('Blockly.blockRendering.TopRow'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/measurables/types.js b/core/renderers/measurables/types.js index 655375569..6c201f853 100644 --- a/core/renderers/measurables/types.js +++ b/core/renderers/measurables/types.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.blockRendering.Types'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Measurable = goog.requireType('Blockly.blockRendering.Measurable'); diff --git a/core/renderers/minimalist/constants.js b/core/renderers/minimalist/constants.js index 186fe2e76..bbc11be1a 100644 --- a/core/renderers/minimalist/constants.js +++ b/core/renderers/minimalist/constants.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.minimalist.ConstantProvider'); -goog.module.declareLegacyNamespace(); const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); const object = goog.require('Blockly.utils.object'); diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js index 161287b7a..5cd9fc5fa 100644 --- a/core/renderers/minimalist/drawer.js +++ b/core/renderers/minimalist/drawer.js @@ -10,7 +10,6 @@ 'use strict'; goog.module('Blockly.minimalist.Drawer'); -goog.module.declareLegacyNamespace(); const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js index c46b16860..374600efd 100644 --- a/core/renderers/minimalist/info.js +++ b/core/renderers/minimalist/info.js @@ -10,7 +10,6 @@ 'use strict'; goog.module('Blockly.minimalist.RenderInfo'); -goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/minimalist/minimalist.js b/core/renderers/minimalist/minimalist.js new file mode 100644 index 000000000..9cb9e8bf7 --- /dev/null +++ b/core/renderers/minimalist/minimalist.js @@ -0,0 +1,22 @@ +/** + * @license + * Copyright 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @fileoverview Re-exports of Blockly.minimalist.* modules. + */ +'use strict'; + +goog.module('Blockly.minimalist'); + +const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider'); +const Drawer = goog.require('Blockly.minimalist.Drawer'); +const RenderInfo = goog.require('Blockly.minimalist.RenderInfo'); +const Renderer = goog.require('Blockly.minimalist.Renderer'); + +exports.ConstantProvider = ConstantProvider; +exports.Drawer = Drawer; +exports.RenderInfo = RenderInfo; +exports.Renderer = Renderer; diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js index c2d1855f1..b3adf69e4 100644 --- a/core/renderers/minimalist/renderer.js +++ b/core/renderers/minimalist/renderer.js @@ -10,7 +10,6 @@ 'use strict'; goog.module('Blockly.minimalist.Renderer'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js index a48b3c2af..b3a924c9a 100644 --- a/core/renderers/thrasos/info.js +++ b/core/renderers/thrasos/info.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.thrasos.RenderInfo'); -goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js index bbe85db11..1d4077d41 100644 --- a/core/renderers/thrasos/renderer.js +++ b/core/renderers/thrasos/renderer.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.thrasos.Renderer'); -goog.module.declareLegacyNamespace(); const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); const RenderInfo = goog.require('Blockly.thrasos.RenderInfo'); diff --git a/core/renderers/thrasos/thrasos.js b/core/renderers/thrasos/thrasos.js new file mode 100644 index 000000000..a5a5bfc45 --- /dev/null +++ b/core/renderers/thrasos/thrasos.js @@ -0,0 +1,18 @@ +/** + * @license + * Copyright 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @fileoverview Re-exports of Blockly.thrasos.* modules. + */ +'use strict'; + +goog.module('Blockly.thrasos'); + +const RenderInfo = goog.require('Blockly.thrasos.RenderInfo'); +const Renderer = goog.require('Blockly.thrasos.Renderer'); + +exports.RenderInfo = RenderInfo; +exports.Renderer = Renderer; diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js index e6c25751b..226b0805a 100644 --- a/core/renderers/zelos/constants.js +++ b/core/renderers/zelos/constants.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.zelos.ConstantProvider'); -goog.module.declareLegacyNamespace(); const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); const Svg = goog.require('Blockly.utils.Svg'); diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js index 52e371a4d..33dff7f0a 100644 --- a/core/renderers/zelos/drawer.js +++ b/core/renderers/zelos/drawer.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.zelos.Drawer'); -goog.module.declareLegacyNamespace(); const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); /* eslint-disable-next-line no-unused-vars */ @@ -20,7 +19,7 @@ const PathObject = goog.requireType('Blockly.zelos.PathObject'); const RenderInfo = goog.requireType('Blockly.zelos.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ const Row = goog.requireType('Blockly.blockRendering.Row'); -const blockRendering = goog.require('Blockly.blockRendering'); +const debug = goog.require('Blockly.blockRendering.debug'); const object = goog.require('Blockly.utils.object'); const svgPaths = goog.require('Blockly.utils.svgPaths'); /* eslint-disable-next-line no-unused-vars */ @@ -57,7 +56,7 @@ Drawer.prototype.draw = function() { if (this.info_.RTL) { pathObject.flipRTL(); } - if (blockRendering.isDebuggerEnabled()) { + if (debug.isDebuggerEnabled()) { this.block_.renderingDebugger.drawDebug(this.block_, this.info_); } this.recordSizeOnBlock_(); diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js index 710b1f6ba..a38bda9cf 100644 --- a/core/renderers/zelos/info.js +++ b/core/renderers/zelos/info.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.zelos.RenderInfo'); -goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); const BottomRow = goog.require('Blockly.zelos.BottomRow'); diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js index 88214aa2a..c85a258a7 100644 --- a/core/renderers/zelos/marker_svg.js +++ b/core/renderers/zelos/marker_svg.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.zelos.MarkerSvg'); -goog.module.declareLegacyNamespace(); const BaseMarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js index cf7b580cb..0c608af92 100644 --- a/core/renderers/zelos/measurables/bottom_row.js +++ b/core/renderers/zelos/measurables/bottom_row.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.zelos.BottomRow'); -goog.module.declareLegacyNamespace(); const BaseBottomRow = goog.require('Blockly.blockRendering.BottomRow'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js index cff7b4dae..f412a3484 100644 --- a/core/renderers/zelos/measurables/inputs.js +++ b/core/renderers/zelos/measurables/inputs.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.zelos.StatementInput'); -goog.module.declareLegacyNamespace(); const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js index 85e59e6ad..39c58fd65 100644 --- a/core/renderers/zelos/measurables/row_elements.js +++ b/core/renderers/zelos/measurables/row_elements.js @@ -11,7 +11,6 @@ */ goog.module('Blockly.zelos.RightConnectionShape'); -goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js index b602e7df5..9c9aa0eda 100644 --- a/core/renderers/zelos/measurables/top_row.js +++ b/core/renderers/zelos/measurables/top_row.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.zelos.TopRow'); -goog.module.declareLegacyNamespace(); const BaseTopRow = goog.require('Blockly.blockRendering.TopRow'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js index 5539fc503..d0236cc06 100644 --- a/core/renderers/zelos/path_object.js +++ b/core/renderers/zelos/path_object.js @@ -12,7 +12,6 @@ 'use strict'; goog.module('Blockly.zelos.PathObject'); -goog.module.declareLegacyNamespace(); const BasePathObject = goog.require('Blockly.blockRendering.PathObject'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js index 2dac896dc..b19d2ee4b 100644 --- a/core/renderers/zelos/renderer.js +++ b/core/renderers/zelos/renderer.js @@ -11,7 +11,6 @@ 'use strict'; goog.module('Blockly.zelos.Renderer'); -goog.module.declareLegacyNamespace(); const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); /* eslint-disable-next-line no-unused-vars */ diff --git a/core/renderers/zelos/zelos.js b/core/renderers/zelos/zelos.js new file mode 100644 index 000000000..89b3d0db0 --- /dev/null +++ b/core/renderers/zelos/zelos.js @@ -0,0 +1,34 @@ +/** + * @license + * Copyright 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @fileoverview Re-exports of Blockly.zelos.* modules. + */ +'use strict'; + +goog.module('Blockly.zelos'); + +const BottomRow = goog.require('Blockly.zelos.BottomRow'); +const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider'); +const Drawer = goog.require('Blockly.zelos.Drawer'); +const MarkerSvg = goog.require('Blockly.zelos.MarkerSvg'); +const PathObject = goog.require('Blockly.zelos.PathObject'); +const RenderInfo = goog.require('Blockly.zelos.RenderInfo'); +const Renderer = goog.require('Blockly.zelos.Renderer'); +const RightConnectionShape = goog.require('Blockly.zelos.RightConnectionShape'); +const StatementInput = goog.require('Blockly.zelos.StatementInput'); +const TopRow = goog.require('Blockly.zelos.TopRow'); + +exports.BottomRow = BottomRow; +exports.ConstantProvider = ConstantProvider; +exports.Drawer = Drawer; +exports.MarkerSvg = MarkerSvg; +exports.PathObject = PathObject; +exports.RenderInfo = RenderInfo; +exports.Renderer = Renderer; +exports.RightConnectionShape = RightConnectionShape; +exports.StatementInput = StatementInput; +exports.TopRow = TopRow; diff --git a/tests/deps.js b/tests/deps.js index b99d8bb28..18551fef4 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); @@ -138,17 +138,19 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); @@ -181,11 +183,13 @@ goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockR goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); @@ -194,6 +198,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']); goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js index 9d6c15eb9..152124f67 100644 --- a/tests/deps.mocha.js +++ b/tests/deps.mocha.js @@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); @@ -138,17 +138,19 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); @@ -181,11 +183,13 @@ goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockR goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); @@ -194,6 +198,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']); goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});