scratch-blocks 2.0.2 → 2.0.4

package/src/blocks/sound.ts

@@ -1,5 +1,4 @@
 /**
- * @license
  * Visual Blocks Editor
  *
  * Copyright 2016 Massachusetts Institute of Technology
@@ -17,15 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import * as Blockly from "blockly/core";
+import * as Blockly from 'blockly/core'
 
 /**
  * Sound effects drop-down menu. Populated dynamically by scratch-gui.
  */
-Blockly.Blocks["sound_sounds_menu"] = {};
+Blockly.Blocks.sound_sounds_menu = {}
 
-Blockly.Blocks["sound_play"] = {
+Blockly.Blocks.sound_play = {
   /**
    * Block to play sound.
    */
@@ -34,16 +32,16 @@ Blockly.Blocks["sound_play"] = {
       message0: Blockly.Msg.SOUND_PLAY,
       args0: [
         {
-          type: "input_value",
-          name: "SOUND_MENU",
+          type: 'input_value',
+          name: 'SOUND_MENU',
         },
       ],
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_playuntildone"] = {
+Blockly.Blocks.sound_playuntildone = {
   /**
    * Block to play sound until done.
    */
@@ -52,28 +50,28 @@ Blockly.Blocks["sound_playuntildone"] = {
       message0: Blockly.Msg.SOUND_PLAYUNTILDONE,
       args0: [
         {
-          type: "input_value",
-          name: "SOUND_MENU",
+          type: 'input_value',
+          name: 'SOUND_MENU',
         },
       ],
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_stopallsounds"] = {
+Blockly.Blocks.sound_stopallsounds = {
   /**
    * Block to stop all sounds
    */
   init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_STOPALLSOUNDS,
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_seteffectto"] = {
+Blockly.Blocks.sound_seteffectto = {
   /**
    * Block to set the audio effect
    */
@@ -82,24 +80,24 @@ Blockly.Blocks["sound_seteffectto"] = {
       message0: Blockly.Msg.SOUND_SETEFFECTO,
       args0: [
         {
-          type: "field_dropdown",
-          name: "EFFECT",
+          type: 'field_dropdown',
+          name: 'EFFECT',
           options: [
-            [Blockly.Msg.SOUND_EFFECTS_PITCH, "PITCH"],
-            [Blockly.Msg.SOUND_EFFECTS_PAN, "PAN"],
+            [Blockly.Msg.SOUND_EFFECTS_PITCH, 'PITCH'],
+            [Blockly.Msg.SOUND_EFFECTS_PAN, 'PAN'],
           ],
         },
         {
-          type: "input_value",
-          name: "VALUE",
+          type: 'input_value',
+          name: 'VALUE',
         },
       ],
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_changeeffectby"] = {
+Blockly.Blocks.sound_changeeffectby = {
   /**
    * Block to change the audio effect
    */
@@ -108,36 +106,36 @@ Blockly.Blocks["sound_changeeffectby"] = {
       message0: Blockly.Msg.SOUND_CHANGEEFFECTBY,
       args0: [
         {
-          type: "field_dropdown",
-          name: "EFFECT",
+          type: 'field_dropdown',
+          name: 'EFFECT',
           options: [
-            [Blockly.Msg.SOUND_EFFECTS_PITCH, "PITCH"],
-            [Blockly.Msg.SOUND_EFFECTS_PAN, "PAN"],
+            [Blockly.Msg.SOUND_EFFECTS_PITCH, 'PITCH'],
+            [Blockly.Msg.SOUND_EFFECTS_PAN, 'PAN'],
           ],
         },
         {
-          type: "input_value",
-          name: "VALUE",
+          type: 'input_value',
+          name: 'VALUE',
         },
       ],
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_cleareffects"] = {
+Blockly.Blocks.sound_cleareffects = {
   /**
    * Block to clear audio effects
    */
   init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_CLEAREFFECTS,
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_changevolumeby"] = {
+Blockly.Blocks.sound_changevolumeby = {
   /**
    * Block to change the sprite's volume by a certain value
    */
@@ -146,16 +144,16 @@ Blockly.Blocks["sound_changevolumeby"] = {
       message0: Blockly.Msg.SOUND_CHANGEVOLUMEBY,
       args0: [
         {
-          type: "input_value",
-          name: "VOLUME",
+          type: 'input_value',
+          name: 'VOLUME',
         },
       ],
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_setvolumeto"] = {
+Blockly.Blocks.sound_setvolumeto = {
   /**
    * Block to set the sprite's volume to a certain percent
    */
@@ -164,23 +162,23 @@ Blockly.Blocks["sound_setvolumeto"] = {
       message0: Blockly.Msg.SOUND_SETVOLUMETO,
       args0: [
         {
-          type: "input_value",
-          name: "VOLUME",
+          type: 'input_value',
+          name: 'VOLUME',
         },
       ],
-      extensions: ["colours_sounds", "shape_statement"],
-    });
+      extensions: ['colours_sounds', 'shape_statement'],
+    })
   },
-};
+}
 
-Blockly.Blocks["sound_volume"] = {
+Blockly.Blocks.sound_volume = {
   /**
    * Block to report volume
    */
   init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_VOLUME,
-      extensions: ["colours_sounds", "output_number", "monitor_block"],
-    });
+      extensions: ['colours_sounds', 'output_number', 'monitor_block'],
+    })
   },
-};
+}

package/src/blocks/text.ts

@@ -1,5 +1,4 @@
 /**
- * @license
  * Visual Blocks Editor
  *
  * Copyright 2012 Google Inc.
@@ -17,28 +16,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
- * @fileoverview Text blocks for Blockly.
+ * @file Text blocks for Blockly.
  * @author fraser@google.com (Neil Fraser)
  */
-import * as Blockly from "blockly/core";
+import * as Blockly from 'blockly/core'
 
-Blockly.Blocks["text"] = {
+Blockly.Blocks.text = {
   /**
    * Block for text value.
    */
   init: function (this: Blockly.Block) {
     this.jsonInit({
-      message0: "%1",
+      message0: '%1',
       args0: [
         {
-          type: "field_input",
-          name: "TEXT",
+          type: 'field_input',
+          name: 'TEXT',
         },
       ],
-      output: "String",
-      extensions: ["colours_textfield"],
-    });
+      output: 'String',
+      extensions: ['colours_textfield'],
+    })
   },
-};
+}

package/src/blocks/vertical_extensions.ts

@@ -1,5 +1,4 @@
 /**
- * @license
  * Visual Blocks Editor
  *
  * Copyright 2017 Google Inc.
@@ -17,41 +16,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
- * @fileoverview Extensions for vertical blocks in scratch-blocks.
+ * @file Extensions for vertical blocks in scratch-blocks.
  * The following extensions can be used to describe a block in Scratch terms.
  * For instance, a block in the operators colour scheme with a number output
  * would have the "colours_operators" and "output_number" extensions.
  * @author fenichel@google.com (Rachel Fenichel)
  */
-import * as Blockly from "blockly/core";
-import { ScratchProcedures } from "../procedures";
-import * as Constants from "../constants";
-import { FlyoutCheckboxIcon } from "../flyout_checkbox_icon";
+import * as Blockly from 'blockly/core'
+import * as Constants from '../constants'
+import { FlyoutCheckboxIcon } from '../flyout_checkbox_icon'
+import { ScratchProcedures } from '../procedures'
 
 /**
  * Helper function that generates an extension based on a category name.
  * The generated function will set the block's style based on the category name.
- *
  * @param category The name of the category to set colours for.
- * @return An extension function that sets colours based on the given category.
+ * @returns An extension function that sets colours based on the given category.
  */
 const colourHelper = function (category: string): () => void {
   /**
    * Set the block style on this block for the given category.
    */
   return function (this: Blockly.Block) {
-    this.setStyle(category);
-  };
-};
+    this.setStyle(category)
+  }
+}
 
 /**
  * Extension to set the colours of a text field, which are all the same.
  */
 const COLOUR_TEXTFIELD = function (this: Blockly.Block) {
-  colourHelper("textField").apply(this);
-};
+  colourHelper('textField').apply(this)
+}
 
 /**
  * Extension to make a block fit into a stack of statements, regardless of its
@@ -59,10 +56,10 @@ const COLOUR_TEXTFIELD = function (this: Blockly.Block) {
  * connection and have inline inputs.
  */
 const SHAPE_STATEMENT = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setPreviousStatement(true, null);
-  this.setNextStatement(true, null);
-};
+  this.setInputsInline(true)
+  this.setPreviousStatement(true, null)
+  this.setNextStatement(true, null)
+}
 
 /**
  * Extension to make a block be shaped as a hat block, regardless of its
@@ -70,20 +67,20 @@ const SHAPE_STATEMENT = function (this: Blockly.Block) {
  * inputs, but have no previous connection.
  */
 const SHAPE_HAT = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setNextStatement(true, null);
-  this.hat = "cap";
-};
+  this.setInputsInline(true)
+  this.setNextStatement(true, null)
+  this.hat = 'cap'
+}
 
 /**
  * Extension to make a block be shaped as a bowler hat block, with rounded
  * corners on both sides and no indentation for statement blocks.
  */
 const SHAPE_BOWLER_HAT = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setNextStatement(true, null);
-  this.hat = "bowler";
-};
+  this.setInputsInline(true)
+  this.setNextStatement(true, null)
+  this.hat = 'bowler'
+}
 
 /**
  * Extension to make a block be shaped as an end block, regardless of its
@@ -91,9 +88,9 @@ const SHAPE_BOWLER_HAT = function (this: Blockly.Block) {
  * inline inputs, but have no next connection.
  */
 const SHAPE_END = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setPreviousStatement(true, null);
-};
+  this.setInputsInline(true)
+  this.setPreviousStatement(true, null)
+}
 
 /**
  * Extension to make represent a number reporter in Scratch-Blocks.
@@ -101,10 +98,10 @@ const SHAPE_END = function (this: Blockly.Block) {
  * output type.
  */
 const OUTPUT_NUMBER = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setOutputShape(Constants.OUTPUT_SHAPE_ROUND);
-  this.setOutput(true, "Number");
-};
+  this.setInputsInline(true)
+  this.setOutputShape(Constants.OUTPUT_SHAPE_ROUND)
+  this.setOutput(true, 'Number')
+}
 
 /**
  * Extension to make represent a string reporter in Scratch-Blocks.
@@ -112,10 +109,10 @@ const OUTPUT_NUMBER = function (this: Blockly.Block) {
  * output type.
  */
 const OUTPUT_STRING = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setOutputShape(Constants.OUTPUT_SHAPE_ROUND);
-  this.setOutput(true, "String");
-};
+  this.setInputsInline(true)
+  this.setOutputShape(Constants.OUTPUT_SHAPE_ROUND)
+  this.setOutput(true, 'String')
+}
 
 /**
  * Extension to make represent a boolean reporter in Scratch-Blocks.
@@ -123,10 +120,10 @@ const OUTPUT_STRING = function (this: Blockly.Block) {
  * output type.
  */
 const OUTPUT_BOOLEAN = function (this: Blockly.Block) {
-  this.setInputsInline(true);
-  this.setOutputShape(Constants.OUTPUT_SHAPE_HEXAGONAL);
-  this.setOutput(true, "Boolean");
-};
+  this.setInputsInline(true)
+  this.setOutputShape(Constants.OUTPUT_SHAPE_HEXAGONAL)
+  this.setOutput(true, 'Boolean')
+}
 
 /**
  * Extension to make a block a monitor block, capable of reporting its current
@@ -134,9 +131,9 @@ const OUTPUT_BOOLEAN = function (this: Blockly.Block) {
  * flyout to toggle display of their current value in a chip on the stage.
  */
 const MONITOR_BLOCK = function (this: Blockly.BlockSvg) {
-  this.addIcon(new FlyoutCheckboxIcon(this));
-  (this as any).checkboxInFlyout = true;
-};
+  this.addIcon(new FlyoutCheckboxIcon(this))
+  ;(this as any).checkboxInFlyout = true
+}
 
 /**
  * Mixin to add a context menu for a procedure definition block.
@@ -146,75 +143,68 @@ const PROCEDURE_DEF_CONTEXTMENU = function (this: Blockly.Block) {
   /**
    * Add the "edit" option and removes the "duplicate" option from the context
    * menu.
-   *
    * @param menuOptions List of menu options to edit.
    */
   this.mixin(
     {
       customContextMenu: function (
-        menuOptions: Array<
+        menuOptions: (
           | Blockly.ContextMenuRegistry.ContextMenuOption
           | Blockly.ContextMenuRegistry.LegacyContextMenuOption
-        >
+        )[],
       ) {
         // Add the edit option at the end.
-        menuOptions.push(ScratchProcedures.makeEditOption(this));
+        menuOptions.push(ScratchProcedures.makeEditOption(this))
 
         // Find and remove the duplicate option
         for (let i = 0, option; (option = menuOptions[i]); i++) {
           if (option.text == Blockly.Msg.DUPLICATE) {
-            menuOptions.splice(i, 1);
-            break;
+            menuOptions.splice(i, 1)
+            break
           }
         }
       },
       checkAndDelete: function () {
-        const input = this.getInput("custom_block");
+        const input = this.getInput('custom_block')
         // this is the root block, not the shadow block.
-        if (input && input.connection && input.connection.targetBlock()) {
-          const procCode = input.connection.targetBlock().getProcCode();
-          const didDelete = ScratchProcedures.deleteProcedureDefCallback(
-            procCode,
-            this
-          );
+        if (input?.connection?.targetBlock()) {
+          const procCode = input.connection.targetBlock().getProcCode()
+          const didDelete = ScratchProcedures.deleteProcedureDefCallback(procCode, this)
           if (!didDelete) {
-            alert(Blockly.Msg.PROCEDURE_USED);
+            alert(Blockly.Msg.PROCEDURE_USED)
           }
         }
       },
     },
-    true
-  );
-};
+    true,
+  )
+}
 
 /**
  * Mixin to add a context menu for a procedure call block.
  * It adds the "edit" option and the "define" option.
- * @mixin
- * @augments Blockly.Block
  * @package
  */
 const PROCEDURE_CALL_CONTEXTMENU = {
   /**
    * Add the "edit" option to the context menu.
-   *
    * @todo Add "go to definition" option once implemented.
    * @param menuOptions List of menu options to edit.
    */
   customContextMenu: function (
     this: Blockly.BlockSvg,
-    menuOptions: Array<
+    menuOptions: (
       | Blockly.ContextMenuRegistry.ContextMenuOption
       | Blockly.ContextMenuRegistry.LegacyContextMenuOption
-    >
+    )[],
   ) {
-    menuOptions.push(ScratchProcedures.makeEditOption(this));
+    menuOptions.push(ScratchProcedures.makeEditOption(this))
   },
-};
+}
 
 const SCRATCH_EXTENSION = function (this: Blockly.Block) {
-  (this as any).isScratchExtension = true;
-};
+  ;(this as any).isScratchExtension = true
+}
 
 /**
  * Register all extensions for scratch-blocks.
@@ -222,51 +212,45 @@ const SCRATCH_EXTENSION = function (this: Blockly.Block) {
  */
 function registerAll() {
   const categoryNames = [
-    "control",
-    "data",
-    "data_lists",
-    "sounds",
-    "motion",
-    "looks",
-    "event",
-    "sensing",
-    "pen",
-    "operators",
-    "more",
-  ];
+    'control',
+    'data',
+    'data_lists',
+    'sounds',
+    'motion',
+    'looks',
+    'event',
+    'sensing',
+    'pen',
+    'operators',
+    'more',
+  ]
   // Register functions for all category colours.
   for (const name of categoryNames) {
-    Blockly.Extensions.register("colours_" + name, colourHelper(name));
+    Blockly.Extensions.register('colours_' + name, colourHelper(name))
   }
 
   // Text fields transcend categories.
-  Blockly.Extensions.register("colours_textfield", COLOUR_TEXTFIELD);
+  Blockly.Extensions.register('colours_textfield', COLOUR_TEXTFIELD)
 
   // Register extensions for common block shapes.
-  Blockly.Extensions.register("shape_statement", SHAPE_STATEMENT);
-  Blockly.Extensions.register("shape_hat", SHAPE_HAT);
-  Blockly.Extensions.register("shape_bowler_hat", SHAPE_BOWLER_HAT);
-  Blockly.Extensions.register("shape_end", SHAPE_END);
+  Blockly.Extensions.register('shape_statement', SHAPE_STATEMENT)
+  Blockly.Extensions.register('shape_hat', SHAPE_HAT)
+  Blockly.Extensions.register('shape_bowler_hat', SHAPE_BOWLER_HAT)
+  Blockly.Extensions.register('shape_end', SHAPE_END)
 
   // Output shapes and types are related.
-  Blockly.Extensions.register("output_number", OUTPUT_NUMBER);
-  Blockly.Extensions.register("output_string", OUTPUT_STRING);
-  Blockly.Extensions.register("output_boolean", OUTPUT_BOOLEAN);
+  Blockly.Extensions.register('output_number', OUTPUT_NUMBER)
+  Blockly.Extensions.register('output_string', OUTPUT_STRING)
+  Blockly.Extensions.register('output_boolean', OUTPUT_BOOLEAN)
 
   // Custom procedures have interesting context menus.
-  Blockly.Extensions.register(
-    "procedure_def_contextmenu",
-    PROCEDURE_DEF_CONTEXTMENU
-  );
-  Blockly.Extensions.registerMixin(
-    "procedure_call_contextmenu",
-    PROCEDURE_CALL_CONTEXTMENU
-  );
+  Blockly.Extensions.register('procedure_def_contextmenu', PROCEDURE_DEF_CONTEXTMENU)
+  Blockly.Extensions.registerMixin('procedure_call_contextmenu', PROCEDURE_CALL_CONTEXTMENU)
 
   // Extension blocks have slightly different block rendering.
-  Blockly.Extensions.register("scratch_extension", SCRATCH_EXTENSION);
+  Blockly.Extensions.register('scratch_extension', SCRATCH_EXTENSION)
 
-  Blockly.Extensions.register("monitor_block", MONITOR_BLOCK);
+  Blockly.Extensions.register('monitor_block', MONITOR_BLOCK)
 }
 
-registerAll();
+registerAll()