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

package/src/blocks/{event.js → event.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["event_whentouchingobject"] = {
   /**
    * Block for when a sprite is touching an object.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.EVENT_WHENTOUCHINGOBJECT,
       args0: [
@@ -36,7 +34,6 @@ Blockly.Blocks["event_whentouchingobject"] = {
           name: "TOUCHINGOBJECTMENU",
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },
@@ -45,9 +42,8 @@ Blockly.Blocks["event_whentouchingobject"] = {
 Blockly.Blocks["event_touchingobjectmenu"] = {
   /**
    * "Touching [Object]" Block Menu.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -68,9 +64,8 @@ Blockly.Blocks["event_touchingobjectmenu"] = {
 Blockly.Blocks["event_whenflagclicked"] = {
   /**
    * Block for when flag clicked.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     const ws = this.workspace.options.parentWorkspace || this.workspace;
     this.jsonInit({
       id: "event_whenflagclicked",
@@ -84,7 +79,6 @@ Blockly.Blocks["event_whenflagclicked"] = {
           alt: "flag",
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },
@@ -93,12 +87,10 @@ Blockly.Blocks["event_whenflagclicked"] = {
 Blockly.Blocks["event_whenthisspriteclicked"] = {
   /**
    * Block for when this sprite clicked.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.EVENT_WHENTHISSPRITECLICKED,
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },
@@ -107,12 +99,10 @@ Blockly.Blocks["event_whenthisspriteclicked"] = {
 Blockly.Blocks["event_whenstageclicked"] = {
   /**
    * Block for when the stage is clicked.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.EVENT_WHENSTAGECLICKED,
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },
@@ -121,9 +111,8 @@ Blockly.Blocks["event_whenstageclicked"] = {
 Blockly.Blocks["event_whenbroadcastreceived"] = {
   /**
    * Block for when broadcast received.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       id: "event_whenbroadcastreceived",
       message0: Blockly.Msg.EVENT_WHENBROADCASTRECEIVED,
@@ -136,7 +125,6 @@ Blockly.Blocks["event_whenbroadcastreceived"] = {
           variable: Blockly.Msg.DEFAULT_BROADCAST_MESSAGE_NAME,
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },
@@ -151,9 +139,8 @@ Blockly.Blocks["event_whenbackdropswitchesto"] = {};
 Blockly.Blocks["event_whengreaterthan"] = {
   /**
    * Block for when loudness/timer/video motion is greater than the value.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.EVENT_WHENGREATERTHAN,
       args0: [
@@ -170,7 +157,6 @@ Blockly.Blocks["event_whengreaterthan"] = {
           name: "VALUE",
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },
@@ -179,9 +165,8 @@ Blockly.Blocks["event_whengreaterthan"] = {
 Blockly.Blocks["event_broadcast_menu"] = {
   /**
    * Broadcast drop-down menu.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -201,9 +186,8 @@ Blockly.Blocks["event_broadcast_menu"] = {
 Blockly.Blocks["event_broadcast"] = {
   /**
    * Block to send a broadcast.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       id: "event_broadcast",
       message0: Blockly.Msg.EVENT_BROADCAST,
@@ -213,7 +197,6 @@ Blockly.Blocks["event_broadcast"] = {
           name: "BROADCAST_INPUT",
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_statement"],
     });
   },
@@ -222,9 +205,8 @@ Blockly.Blocks["event_broadcast"] = {
 Blockly.Blocks["event_broadcastandwait"] = {
   /**
    * Block to send a broadcast.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.EVENT_BROADCASTANDWAIT,
       args0: [
@@ -233,7 +215,6 @@ Blockly.Blocks["event_broadcastandwait"] = {
           name: "BROADCAST_INPUT",
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_statement"],
     });
   },
@@ -242,9 +223,8 @@ Blockly.Blocks["event_broadcastandwait"] = {
 Blockly.Blocks["event_whenkeypressed"] = {
   /**
    * Block to send a broadcast.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       id: "event_whenkeypressed",
       message0: Blockly.Msg.EVENT_WHENKEYPRESSED,
@@ -298,7 +278,6 @@ Blockly.Blocks["event_whenkeypressed"] = {
           ],
         },
       ],
-      category: Categories.event,
       extensions: ["colours_event", "shape_hat"],
     });
   },

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

@@ -19,14 +19,12 @@
  */
 
 import * as Blockly from "blockly/core";
-import { Categories } from "../categories.js";
 
 Blockly.Blocks["looks_sayforsecs"] = {
   /**
    * Block to say for some time.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SAYFORSECS,
       args0: [
@@ -39,7 +37,6 @@ Blockly.Blocks["looks_sayforsecs"] = {
           name: "SECS",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -48,9 +45,8 @@ Blockly.Blocks["looks_sayforsecs"] = {
 Blockly.Blocks["looks_say"] = {
   /**
    * Block to say.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SAY,
       args0: [
@@ -59,7 +55,6 @@ Blockly.Blocks["looks_say"] = {
           name: "MESSAGE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -68,9 +63,8 @@ Blockly.Blocks["looks_say"] = {
 Blockly.Blocks["looks_thinkforsecs"] = {
   /**
    * Block to think for some time.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_THINKFORSECS,
       args0: [
@@ -83,7 +77,6 @@ Blockly.Blocks["looks_thinkforsecs"] = {
           name: "SECS",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -92,9 +85,8 @@ Blockly.Blocks["looks_thinkforsecs"] = {
 Blockly.Blocks["looks_think"] = {
   /**
    * Block to think.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_THINK,
       args0: [
@@ -103,7 +95,6 @@ Blockly.Blocks["looks_think"] = {
           name: "MESSAGE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -112,12 +103,10 @@ Blockly.Blocks["looks_think"] = {
 Blockly.Blocks["looks_show"] = {
   /**
    * Show block.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SHOW,
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -126,12 +115,10 @@ Blockly.Blocks["looks_show"] = {
 Blockly.Blocks["looks_hide"] = {
   /**
    * Hide block.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_HIDE,
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -142,12 +129,10 @@ Blockly.Blocks["looks_hideallsprites"] = {
    * Hide-all-sprites block. 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.LOOKS_HIDEALLSPRITES,
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -156,9 +141,8 @@ Blockly.Blocks["looks_hideallsprites"] = {
 Blockly.Blocks["looks_changeeffectby"] = {
   /**
    * Block to change graphic effect.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_CHANGEEFFECTBY,
       args0: [
@@ -180,7 +164,6 @@ Blockly.Blocks["looks_changeeffectby"] = {
           name: "CHANGE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -189,9 +172,8 @@ Blockly.Blocks["looks_changeeffectby"] = {
 Blockly.Blocks["looks_seteffectto"] = {
   /**
    * Block to set graphic effect.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SETEFFECTTO,
       args0: [
@@ -213,7 +195,6 @@ Blockly.Blocks["looks_seteffectto"] = {
           name: "VALUE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -222,12 +203,10 @@ Blockly.Blocks["looks_seteffectto"] = {
 Blockly.Blocks["looks_cleargraphiceffects"] = {
   /**
    * Block to clear graphic effects.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_CLEARGRAPHICEFFECTS,
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -236,9 +215,8 @@ Blockly.Blocks["looks_cleargraphiceffects"] = {
 Blockly.Blocks["looks_changesizeby"] = {
   /**
    * Block to change size
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_CHANGESIZEBY,
       args0: [
@@ -247,7 +225,6 @@ Blockly.Blocks["looks_changesizeby"] = {
           name: "CHANGE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -256,9 +233,8 @@ Blockly.Blocks["looks_changesizeby"] = {
 Blockly.Blocks["looks_setsizeto"] = {
   /**
    * Block to set size
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SETSIZETO,
       args0: [
@@ -267,7 +243,6 @@ Blockly.Blocks["looks_setsizeto"] = {
           name: "SIZE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -276,12 +251,10 @@ Blockly.Blocks["looks_setsizeto"] = {
 Blockly.Blocks["looks_size"] = {
   /**
    * Block to report size
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SIZE,
-      category: Categories.looks,
       extensions: ["colours_looks", "output_number", "monitor_block"],
     });
   },
@@ -299,9 +272,8 @@ Blockly.Blocks["looks_changestretchby"] = {
    * displayed as red "undefined" blocks. Some Scratch projects still contain
    * these blocks, however, and they don't open in 3.0 unless the blocks
    * actually exist (though they still don't funcitonally do anything).
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_CHANGESTRETCHBY,
       args0: [
@@ -310,7 +282,6 @@ Blockly.Blocks["looks_changestretchby"] = {
           name: "CHANGE",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -321,9 +292,8 @@ Blockly.Blocks["looks_setstretchto"] = {
    * Block to set stretch. Does not actually do anything. This is an obsolete
    * block that is implemented for compatibility with Scratch 1.4 projects
    * (see looks_changestretchby).
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SETSTRETCHTO,
       args0: [
@@ -332,7 +302,6 @@ Blockly.Blocks["looks_setstretchto"] = {
           name: "STRETCH",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -346,9 +315,8 @@ Blockly.Blocks["looks_costume"] = {};
 Blockly.Blocks["looks_switchcostumeto"] = {
   /**
    * Block to switch the sprite's costume to the selected one.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SWITCHCOSTUMETO,
       args0: [
@@ -357,7 +325,6 @@ Blockly.Blocks["looks_switchcostumeto"] = {
           name: "COSTUME",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -366,12 +333,10 @@ Blockly.Blocks["looks_switchcostumeto"] = {
 Blockly.Blocks["looks_nextcostume"] = {
   /**
    * Block to switch the sprite's costume to the next one.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_NEXTCOSTUME,
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -380,9 +345,8 @@ Blockly.Blocks["looks_nextcostume"] = {
 Blockly.Blocks["looks_switchbackdropto"] = {
   /**
    * Block to switch the backdrop to the selected one.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SWITCHBACKDROPTO,
       args0: [
@@ -391,7 +355,6 @@ Blockly.Blocks["looks_switchbackdropto"] = {
           name: "BACKDROP",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -405,9 +368,8 @@ Blockly.Blocks["looks_backdrops"] = {};
 Blockly.Blocks["looks_gotofrontback"] = {
   /**
    * "Go to front/back" Block.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_GOTOFRONTBACK,
       args0: [
@@ -420,7 +382,6 @@ Blockly.Blocks["looks_gotofrontback"] = {
           ],
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -429,9 +390,8 @@ Blockly.Blocks["looks_gotofrontback"] = {
 Blockly.Blocks["looks_goforwardbackwardlayers"] = {
   /**
    * "Go forward/backward [Number] Layers" Block.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_GOFORWARDBACKWARDLAYERS,
       args0: [
@@ -448,7 +408,6 @@ Blockly.Blocks["looks_goforwardbackwardlayers"] = {
           name: "NUM",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -457,9 +416,8 @@ Blockly.Blocks["looks_goforwardbackwardlayers"] = {
 Blockly.Blocks["looks_backdropnumbername"] = {
   /**
    * Block to report backdrop's number or name
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_BACKDROPNUMBERNAME,
       args0: [
@@ -472,7 +430,6 @@ Blockly.Blocks["looks_backdropnumbername"] = {
           ],
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "output_number", "monitor_block"],
     });
   },
@@ -481,9 +438,8 @@ Blockly.Blocks["looks_backdropnumbername"] = {
 Blockly.Blocks["looks_costumenumbername"] = {
   /**
    * Block to report costume's number or name
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_COSTUMENUMBERNAME,
       args0: [
@@ -496,7 +452,6 @@ Blockly.Blocks["looks_costumenumbername"] = {
           ],
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "output_number", "monitor_block"],
     });
   },
@@ -505,9 +460,8 @@ Blockly.Blocks["looks_costumenumbername"] = {
 Blockly.Blocks["looks_switchbackdroptoandwait"] = {
   /**
    * Block to switch the backdrop to the selected one and wait.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_SWITCHBACKDROPTOANDWAIT,
       args0: [
@@ -516,7 +470,6 @@ Blockly.Blocks["looks_switchbackdroptoandwait"] = {
           name: "BACKDROP",
         },
       ],
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },
@@ -525,12 +478,10 @@ Blockly.Blocks["looks_switchbackdroptoandwait"] = {
 Blockly.Blocks["looks_nextbackdrop"] = {
   /**
    * Block to switch the backdrop to the next one.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.LOOKS_NEXTBACKDROP_BLOCK,
-      category: Categories.looks,
       extensions: ["colours_looks", "shape_statement"],
     });
   },

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

@@ -23,14 +23,13 @@
  * @author q.neutron@gmail.com (Quynh Neutron)
  */
 import * as Blockly from "blockly/core";
-import * as Constants from "../constants.js";
+import * as Constants from "../constants";
 
 Blockly.Blocks["math_number"] = {
   /**
    * Block for generic numeric value.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -50,9 +49,8 @@ Blockly.Blocks["math_number"] = {
 Blockly.Blocks["math_integer"] = {
   /**
    * Block for integer value (no decimal, + or -).
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -72,9 +70,8 @@ Blockly.Blocks["math_integer"] = {
 Blockly.Blocks["math_whole_number"] = {
   /**
    * Block for whole number value, no negatives or decimals.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -95,9 +92,8 @@ Blockly.Blocks["math_whole_number"] = {
 Blockly.Blocks["math_positive_number"] = {
   /**
    * Block for positive number value, with decimal.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [
@@ -117,9 +113,8 @@ Blockly.Blocks["math_positive_number"] = {
 Blockly.Blocks["math_angle"] = {
   /**
    * Block for angle picker.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [

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

@@ -23,14 +23,13 @@
  * @author khanning@gmail.com (Kreg Hanning)
  */
 import * as Blockly from "blockly/core";
-import * as Constants from "../constants.js";
+import * as Constants from "../constants";
 
 Blockly.Blocks["matrix"] = {
   /**
    * Block for matrix value.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [