scratch-blocks 2.0.0-spork.1 → 2.0.0-spork.3

package/src/blocks/{sensing.js → sensing.ts}

@@ -19,15 +19,13 @@
  */
 
 import * as Blockly from "blockly/core";
-import { Categories } from "../categories.js";
-import * as Constants from "../constants.js";
+import * as Constants from "../constants";
 
 Blockly.Blocks["sensing_touchingobject"] = {
   /**
    * Block to Report if its touching a Object.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_TOUCHINGOBJECT,
       args0: [
@@ -36,7 +34,6 @@ Blockly.Blocks["sensing_touchingobject"] = {
           name: "TOUCHINGOBJECTMENU",
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_boolean"],
     });
   },
@@ -50,9 +47,8 @@ Blockly.Blocks["sensing_touchingobjectmenu"] = {};
 Blockly.Blocks["sensing_touchingcolor"] = {
   /**
    * Block to Report if its touching a certain Color.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_TOUCHINGCOLOR,
       args0: [
@@ -61,7 +57,6 @@ Blockly.Blocks["sensing_touchingcolor"] = {
           name: "COLOR",
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_boolean"],
     });
   },
@@ -70,9 +65,8 @@ Blockly.Blocks["sensing_touchingcolor"] = {
 Blockly.Blocks["sensing_coloristouchingcolor"] = {
   /**
    * Block to Report if a color is touching a certain Color.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_COLORISTOUCHINGCOLOR,
       args0: [
@@ -85,7 +79,6 @@ Blockly.Blocks["sensing_coloristouchingcolor"] = {
           name: "COLOR2",
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_boolean"],
     });
   },
@@ -94,9 +87,8 @@ Blockly.Blocks["sensing_coloristouchingcolor"] = {
 Blockly.Blocks["sensing_distanceto"] = {
   /**
    * Block to Report distance to another Object.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_DISTANCETO,
       args0: [
@@ -105,7 +97,6 @@ Blockly.Blocks["sensing_distanceto"] = {
           name: "DISTANCETOMENU",
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number"],
     });
   },
@@ -119,9 +110,8 @@ Blockly.Blocks["sensing_distancetomenu"] = {};
 Blockly.Blocks["sensing_askandwait"] = {
   /**
    * Block to ask a question and wait
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_ASKANDWAIT,
       args0: [
@@ -130,7 +120,6 @@ Blockly.Blocks["sensing_askandwait"] = {
           name: "QUESTION",
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "shape_statement"],
     });
   },
@@ -139,12 +128,10 @@ Blockly.Blocks["sensing_askandwait"] = {
 Blockly.Blocks["sensing_answer"] = {
   /**
    * Block to report answer
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_ANSWER,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number", "monitor_block"],
     });
   },
@@ -153,9 +140,8 @@ Blockly.Blocks["sensing_answer"] = {
 Blockly.Blocks["sensing_keypressed"] = {
   /**
    * Block to Report if a key is pressed.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_KEYPRESSED,
       args0: [
@@ -164,7 +150,6 @@ Blockly.Blocks["sensing_keypressed"] = {
           name: "KEY_OPTION",
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_boolean"],
     });
   },
@@ -173,9 +158,8 @@ Blockly.Blocks["sensing_keypressed"] = {
 Blockly.Blocks["sensing_keyoptions"] = {
   /**
    * Options for Keys
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -236,12 +220,10 @@ Blockly.Blocks["sensing_keyoptions"] = {
 Blockly.Blocks["sensing_mousedown"] = {
   /**
    * Block to Report if the mouse is down.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_MOUSEDOWN,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_boolean"],
     });
   },
@@ -250,12 +232,10 @@ Blockly.Blocks["sensing_mousedown"] = {
 Blockly.Blocks["sensing_mousex"] = {
   /**
    * Block to report mouse's x position
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_MOUSEX,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number"],
     });
   },
@@ -264,12 +244,10 @@ Blockly.Blocks["sensing_mousex"] = {
 Blockly.Blocks["sensing_mousey"] = {
   /**
    * Block to report mouse's y position
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_MOUSEY,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number"],
     });
   },
@@ -278,9 +256,8 @@ Blockly.Blocks["sensing_mousey"] = {
 Blockly.Blocks["sensing_setdragmode"] = {
   /**
    * Block to set drag mode.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_SETDRAGMODE,
       args0: [
@@ -293,7 +270,6 @@ Blockly.Blocks["sensing_setdragmode"] = {
           ],
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "shape_statement"],
     });
   },
@@ -302,12 +278,10 @@ Blockly.Blocks["sensing_setdragmode"] = {
 Blockly.Blocks["sensing_loudness"] = {
   /**
    * Block to report loudness
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_LOUDNESS,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number", "monitor_block"],
     });
   },
@@ -318,12 +292,10 @@ Blockly.Blocks["sensing_loud"] = {
    * Block to report if the loudness is "loud" (greater than 10). This is an
    * obsolete block that is implemented for compatibility with Scratch 2.0 and
    * 1.4 projects.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_LOUD,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_boolean"],
     });
   },
@@ -332,12 +304,10 @@ Blockly.Blocks["sensing_loud"] = {
 Blockly.Blocks["sensing_timer"] = {
   /**
    * Block to report timer
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_TIMER,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number", "monitor_block"],
     });
   },
@@ -346,12 +316,10 @@ Blockly.Blocks["sensing_timer"] = {
 Blockly.Blocks["sensing_resettimer"] = {
   /**
    * Block to reset timer
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_RESETTIMER,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "shape_statement"],
     });
   },
@@ -370,9 +338,8 @@ Blockly.Blocks["sensing_of"] = {};
 Blockly.Blocks["sensing_current"] = {
   /**
    * Block to Report the current option.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_CURRENT,
       args0: [
@@ -390,7 +357,6 @@ Blockly.Blocks["sensing_current"] = {
           ],
         },
       ],
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number", "monitor_block"],
     });
   },
@@ -399,12 +365,10 @@ Blockly.Blocks["sensing_current"] = {
 Blockly.Blocks["sensing_dayssince2000"] = {
   /**
    * Block to report days since 2000
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_DAYSSINCE2000,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number"],
     });
   },
@@ -413,12 +377,10 @@ Blockly.Blocks["sensing_dayssince2000"] = {
 Blockly.Blocks["sensing_username"] = {
   /**
    * Block to report user's username
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_USERNAME,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number", "monitor_block"],
     });
   },
@@ -429,12 +391,10 @@ Blockly.Blocks["sensing_userid"] = {
    * Block to report user's ID. Does not actually do anything. This is an
    * obsolete block that is implemented for compatibility with Scratch 2.0
    * projects.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SENSING_USERID,
-      category: Categories.sensing,
       extensions: ["colours_sensing", "output_number"],
     });
   },

package/src/blocks/{sound.js → sound.ts}

@@ -19,7 +19,6 @@
  */
 
 import * as Blockly from "blockly/core";
-import { Categories } from "../categories.js";
 
 /**
  * Sound effects drop-down menu. Populated dynamically by scratch-gui.
@@ -29,9 +28,8 @@ Blockly.Blocks["sound_sounds_menu"] = {};
 Blockly.Blocks["sound_play"] = {
   /**
    * Block to play sound.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_PLAY,
       args0: [
@@ -40,7 +38,6 @@ Blockly.Blocks["sound_play"] = {
           name: "SOUND_MENU",
         },
       ],
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -49,9 +46,8 @@ Blockly.Blocks["sound_play"] = {
 Blockly.Blocks["sound_playuntildone"] = {
   /**
    * Block to play sound until done.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_PLAYUNTILDONE,
       args0: [
@@ -60,7 +56,6 @@ Blockly.Blocks["sound_playuntildone"] = {
           name: "SOUND_MENU",
         },
       ],
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -69,12 +64,10 @@ Blockly.Blocks["sound_playuntildone"] = {
 Blockly.Blocks["sound_stopallsounds"] = {
   /**
    * Block to stop all sounds
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_STOPALLSOUNDS,
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -83,9 +76,8 @@ Blockly.Blocks["sound_stopallsounds"] = {
 Blockly.Blocks["sound_seteffectto"] = {
   /**
    * Block to set the audio effect
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_SETEFFECTO,
       args0: [
@@ -102,7 +94,6 @@ Blockly.Blocks["sound_seteffectto"] = {
           name: "VALUE",
         },
       ],
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -111,9 +102,8 @@ Blockly.Blocks["sound_seteffectto"] = {
 Blockly.Blocks["sound_changeeffectby"] = {
   /**
    * Block to change the audio effect
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_CHANGEEFFECTBY,
       args0: [
@@ -130,7 +120,6 @@ Blockly.Blocks["sound_changeeffectby"] = {
           name: "VALUE",
         },
       ],
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -139,12 +128,10 @@ Blockly.Blocks["sound_changeeffectby"] = {
 Blockly.Blocks["sound_cleareffects"] = {
   /**
    * Block to clear audio effects
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_CLEAREFFECTS,
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -153,9 +140,8 @@ Blockly.Blocks["sound_cleareffects"] = {
 Blockly.Blocks["sound_changevolumeby"] = {
   /**
    * Block to change the sprite's volume by a certain value
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_CHANGEVOLUMEBY,
       args0: [
@@ -164,7 +150,6 @@ Blockly.Blocks["sound_changevolumeby"] = {
           name: "VOLUME",
         },
       ],
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -173,9 +158,8 @@ Blockly.Blocks["sound_changevolumeby"] = {
 Blockly.Blocks["sound_setvolumeto"] = {
   /**
    * Block to set the sprite's volume to a certain percent
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_SETVOLUMETO,
       args0: [
@@ -184,7 +168,6 @@ Blockly.Blocks["sound_setvolumeto"] = {
           name: "VOLUME",
         },
       ],
-      category: Categories.sound,
       extensions: ["colours_sounds", "shape_statement"],
     });
   },
@@ -193,12 +176,10 @@ Blockly.Blocks["sound_setvolumeto"] = {
 Blockly.Blocks["sound_volume"] = {
   /**
    * Block to report volume
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.SOUND_VOLUME,
-      category: Categories.sound,
       extensions: ["colours_sounds", "output_number", "monitor_block"],
     });
   },

package/src/blocks/{text.js → text.ts}

@@ -27,9 +27,8 @@ import * as Blockly from "blockly/core";
 Blockly.Blocks["text"] = {
   /**
    * Block for text value.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [