blockly 7.20211209.2 → 8.0.0

package/blocks/text.js

@@ -10,7 +10,7 @@
  */
 'use strict';
 
-goog.module('Blockly.blocks.texts');
+goog.module('Blockly.libraryBlocks.texts');
 
 const Extensions = goog.require('Blockly.Extensions');
 const {Msg} = goog.require('Blockly.Msg');
@@ -19,7 +19,8 @@ const xmlUtils = goog.require('Blockly.utils.xml');
 const {Align} = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
-const {Blocks} = goog.require('Blockly.blocks');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDefinition} = goog.requireType('Blockly.blocks');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
 const {FieldImage} = goog.require('Blockly.FieldImage');
@@ -27,14 +28,18 @@ const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
 const {Mutator} = goog.require('Blockly.Mutator');
 /* eslint-disable-next-line no-unused-vars */
 const {Workspace} = goog.requireType('Blockly.Workspace');
-const {defineBlocksWithJsonArray} = goog.require('Blockly.common');
+const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldMultilineInput');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldVariable');
 
 
-defineBlocksWithJsonArray([
+/**
+ * A dictionary of the block definitions provided by this module.
+ * @type {!Object<string, !BlockDefinition>}
+ */
+const blocks = createBlockDefinitionsFromJsonArray([
   // Block for text value
   {
     'type': 'text',
@@ -238,8 +243,9 @@ defineBlocksWithJsonArray([
     'mutator': 'text_charAt_mutator',
   },
 ]);
+exports.blocks = blocks;
 
-Blocks['text_getSubstring'] = {
+blocks['text_getSubstring'] = {
   /**
    * Block for getting substring.
    * @this {Block}
@@ -363,7 +369,7 @@ Blocks['text_getSubstring'] = {
   },
 };
 
-Blocks['text_changeCase'] = {
+blocks['text_changeCase'] = {
   /**
    * Block for changing capitalization.
    * @this {Block}
@@ -383,7 +389,7 @@ Blocks['text_changeCase'] = {
   },
 };
 
-Blocks['text_trim'] = {
+blocks['text_trim'] = {
   /**
    * Block for trimming spaces.
    * @this {Block}
@@ -403,7 +409,7 @@ Blocks['text_trim'] = {
   },
 };
 
-Blocks['text_print'] = {
+blocks['text_print'] = {
   /**
    * Block for print statement.
    * @this {Block}
@@ -463,7 +469,7 @@ const TEXT_PROMPT_COMMON = {
   },
 };
 
-Blocks['text_prompt_ext'] = {
+blocks['text_prompt_ext'] = {
   ...TEXT_PROMPT_COMMON,
   /**
    * Block for prompt function (external message).
@@ -496,7 +502,7 @@ Blocks['text_prompt_ext'] = {
   // XML hooks are kept for backwards compatibility.
 };
 
-Blocks['text_prompt'] = {
+blocks['text_prompt'] = {
   ...TEXT_PROMPT_COMMON,
   /**
    * Block for prompt function (internal message).
@@ -531,7 +537,7 @@ Blocks['text_prompt'] = {
   },
 };
 
-Blocks['text_count'] = {
+blocks['text_count'] = {
   /**
    * Block for counting how many times one string appears within another string.
    * @this {Block}
@@ -560,7 +566,7 @@ Blocks['text_count'] = {
   },
 };
 
-Blocks['text_replace'] = {
+blocks['text_replace'] = {
   /**
    * Block for replacing one string with another in the text.
    * @this {Block}
@@ -594,7 +600,7 @@ Blocks['text_replace'] = {
   },
 };
 
-Blocks['text_reverse'] = {
+blocks['text_reverse'] = {
   /**
    * Block for reversing a string.
    * @this {Block}
@@ -981,3 +987,6 @@ Extensions.registerMutator(
 
 Extensions.registerMutator(
     'text_charAt_mutator', TEXT_CHARAT_MUTATOR_MIXIN, TEXT_CHARAT_EXTENSION);
+
+// Register provided blocks.
+defineBlocks(blocks);

package/blocks/variables.js

@@ -10,7 +10,7 @@
  */
 'use strict';
 
-goog.module('Blockly.blocks.variables');
+goog.module('Blockly.libraryBlocks.variables');
 
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Extensions = goog.require('Blockly.Extensions');
@@ -18,15 +18,21 @@ const Variables = goog.require('Blockly.Variables');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDefinition} = goog.requireType('Blockly.blocks');
 const {Msg} = goog.require('Blockly.Msg');
-const {defineBlocksWithJsonArray} = goog.require('Blockly.common');
+const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldVariable');
 
 
-defineBlocksWithJsonArray([
+/**
+ * A dictionary of the block definitions provided by this module.
+ * @type {!Object<string, !BlockDefinition>}
+ */
+const blocks = createBlockDefinitionsFromJsonArray([
   // Block for variable getter.
   {
     'type': 'variables_get',
@@ -67,6 +73,8 @@ defineBlocksWithJsonArray([
     'extensions': ['contextMenu_variableSetterGetter'],
   },
 ]);
+exports.blocks = blocks;
+
 
 /**
  * Mixin to add context menu items to create getter/setter blocks for this
@@ -161,3 +169,6 @@ const deleteOptionCallbackFactory = function(block) {
 Extensions.registerMixin(
     'contextMenu_variableSetterGetter',
     CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN);
+
+// Register provided blocks.
+defineBlocks(blocks);

package/blocks/variables_dynamic.js

@@ -10,7 +10,7 @@
  */
 'use strict';
 
-goog.module('Blockly.blocks.variablesDynamic');
+goog.module('Blockly.libraryBlocks.variablesDynamic');
 
 /* eslint-disable-next-line no-unused-vars */
 const AbstractEvent = goog.requireType('Blockly.Events.Abstract');
@@ -20,15 +20,21 @@ const Variables = goog.require('Blockly.Variables');
 const xml = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDefinition} = goog.requireType('Blockly.blocks');
 const {Msg} = goog.require('Blockly.Msg');
-const {defineBlocksWithJsonArray} = goog.require('Blockly.common');
+const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldVariable');
 
 
-defineBlocksWithJsonArray([
+/**
+ * A dictionary of the block definitions provided by this module.
+ * @type {!Object<string, !BlockDefinition>}
+ */
+const blocks = createBlockDefinitionsFromJsonArray([
   // Block for variable getter.
   {
     'type': 'variables_get_dynamic',
@@ -67,6 +73,7 @@ defineBlocksWithJsonArray([
     'extensions': ['contextMenu_variableDynamicSetterGetter'],
   },
 ]);
+exports.blocks = blocks;
 
 /**
  * Mixin to add context menu items to create getter/setter blocks for this
@@ -178,3 +185,6 @@ const deleteOptionCallbackFactory = function(block) {
 Extensions.registerMixin(
     'contextMenu_variableDynamicSetterGetter',
     CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN);
+
+// Register provided blocks.
+defineBlocks(blocks);