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

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

@@ -19,14 +19,12 @@
  */
 
 import * as Blockly from "blockly/core";
-import { Categories } from "../categories.js";
 
 Blockly.Blocks["motion_movesteps"] = {
   /**
    * Block to move steps.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_MOVESTEPS,
       args0: [
@@ -35,7 +33,6 @@ Blockly.Blocks["motion_movesteps"] = {
           name: "STEPS",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -44,9 +41,8 @@ Blockly.Blocks["motion_movesteps"] = {
 Blockly.Blocks["motion_turnright"] = {
   /**
    * Block to turn right.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     const ws = this.workspace.options.parentWorkspace || this.workspace;
     this.jsonInit({
       message0: Blockly.Msg.MOTION_TURNRIGHT,
@@ -62,7 +58,6 @@ Blockly.Blocks["motion_turnright"] = {
           name: "DEGREES",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -71,9 +66,8 @@ Blockly.Blocks["motion_turnright"] = {
 Blockly.Blocks["motion_turnleft"] = {
   /**
    * Block to turn left.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     const ws = this.workspace.options.parentWorkspace || this.workspace;
     this.jsonInit({
       message0: Blockly.Msg.MOTION_TURNLEFT,
@@ -89,7 +83,6 @@ Blockly.Blocks["motion_turnleft"] = {
           name: "DEGREES",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -98,9 +91,8 @@ Blockly.Blocks["motion_turnleft"] = {
 Blockly.Blocks["motion_pointindirection"] = {
   /**
    * Block to point in direction.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_POINTINDIRECTION,
       args0: [
@@ -109,7 +101,6 @@ Blockly.Blocks["motion_pointindirection"] = {
           name: "DIRECTION",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -123,9 +114,8 @@ Blockly.Blocks["motion_pointtowards_menu"] = {};
 Blockly.Blocks["motion_pointtowards"] = {
   /**
    * Block to point in direction.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_POINTTOWARDS,
       args0: [
@@ -134,7 +124,6 @@ Blockly.Blocks["motion_pointtowards"] = {
           name: "TOWARDS",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -148,9 +137,8 @@ Blockly.Blocks["motion_goto_menu"] = {};
 Blockly.Blocks["motion_gotoxy"] = {
   /**
    * Block to go to X, Y.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_GOTOXY,
       args0: [
@@ -163,7 +151,6 @@ Blockly.Blocks["motion_gotoxy"] = {
           name: "Y",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -172,9 +159,8 @@ Blockly.Blocks["motion_gotoxy"] = {
 Blockly.Blocks["motion_goto"] = {
   /**
    * Block to go to a menu item.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_GOTO,
       args0: [
@@ -183,7 +169,6 @@ Blockly.Blocks["motion_goto"] = {
           name: "TO",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -192,9 +177,8 @@ Blockly.Blocks["motion_goto"] = {
 Blockly.Blocks["motion_glidesecstoxy"] = {
   /**
    * Block to glide for a specified time.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_GLIDESECSTOXY,
       args0: [
@@ -211,7 +195,6 @@ Blockly.Blocks["motion_glidesecstoxy"] = {
           name: "Y",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -225,9 +208,8 @@ Blockly.Blocks["motion_glideto_menu"] = {};
 Blockly.Blocks["motion_glideto"] = {
   /**
    * Block to glide to a menu item
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_GLIDETO,
       args0: [
@@ -240,7 +222,6 @@ Blockly.Blocks["motion_glideto"] = {
           name: "TO",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -249,9 +230,8 @@ Blockly.Blocks["motion_glideto"] = {
 Blockly.Blocks["motion_changexby"] = {
   /**
    * Block to change X.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_CHANGEXBY,
       args0: [
@@ -260,7 +240,6 @@ Blockly.Blocks["motion_changexby"] = {
           name: "DX",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -269,9 +248,8 @@ Blockly.Blocks["motion_changexby"] = {
 Blockly.Blocks["motion_setx"] = {
   /**
    * Block to set X.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_SETX,
       args0: [
@@ -280,7 +258,6 @@ Blockly.Blocks["motion_setx"] = {
           name: "X",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -289,9 +266,8 @@ Blockly.Blocks["motion_setx"] = {
 Blockly.Blocks["motion_changeyby"] = {
   /**
    * Block to change Y.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_CHANGEYBY,
       args0: [
@@ -300,7 +276,6 @@ Blockly.Blocks["motion_changeyby"] = {
           name: "DY",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -309,9 +284,8 @@ Blockly.Blocks["motion_changeyby"] = {
 Blockly.Blocks["motion_sety"] = {
   /**
    * Block to set Y.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_SETY,
       args0: [
@@ -320,7 +294,6 @@ Blockly.Blocks["motion_sety"] = {
           name: "Y",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -329,12 +302,10 @@ Blockly.Blocks["motion_sety"] = {
 Blockly.Blocks["motion_ifonedgebounce"] = {
   /**
    * Block to bounce on edge.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_IFONEDGEBOUNCE,
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -343,9 +314,8 @@ Blockly.Blocks["motion_ifonedgebounce"] = {
 Blockly.Blocks["motion_setrotationstyle"] = {
   /**
    * Block to set rotation style.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_SETROTATIONSTYLE,
       args0: [
@@ -359,7 +329,6 @@ Blockly.Blocks["motion_setrotationstyle"] = {
           ],
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -368,12 +337,10 @@ Blockly.Blocks["motion_setrotationstyle"] = {
 Blockly.Blocks["motion_xposition"] = {
   /**
    * Block to report X.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_XPOSITION,
-      category: Categories.motion,
       extensions: ["colours_motion", "output_number", "monitor_block"],
     });
   },
@@ -382,12 +349,10 @@ Blockly.Blocks["motion_xposition"] = {
 Blockly.Blocks["motion_yposition"] = {
   /**
    * Block to report Y.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_YPOSITION,
-      category: Categories.motion,
       extensions: ["colours_motion", "output_number", "monitor_block"],
     });
   },
@@ -396,12 +361,10 @@ Blockly.Blocks["motion_yposition"] = {
 Blockly.Blocks["motion_direction"] = {
   /**
    * Block to report direction.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: Blockly.Msg.MOTION_DIRECTION,
-      category: Categories.motion,
       extensions: ["colours_motion", "output_number", "monitor_block"],
     });
   },
@@ -412,9 +375,8 @@ Blockly.Blocks["motion_scroll_right"] = {
    * Block to scroll the stage right. 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.MOTION_SCROLLRIGHT,
       args0: [
@@ -423,7 +385,6 @@ Blockly.Blocks["motion_scroll_right"] = {
           name: "DISTANCE",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -434,9 +395,8 @@ Blockly.Blocks["motion_scroll_up"] = {
    * Block to scroll the stage up. 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.MOTION_SCROLLUP,
       args0: [
@@ -445,7 +405,6 @@ Blockly.Blocks["motion_scroll_up"] = {
           name: "DISTANCE",
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -456,9 +415,8 @@ Blockly.Blocks["motion_align_scene"] = {
    * Block to change the stage's scrolling alignment. 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.MOTION_ALIGNSCENE,
       args0: [
@@ -474,7 +432,6 @@ Blockly.Blocks["motion_align_scene"] = {
           ],
         },
       ],
-      category: Categories.motion,
       extensions: ["colours_motion", "shape_statement"],
     });
   },
@@ -485,12 +442,10 @@ Blockly.Blocks["motion_xscroll"] = {
    * Block to report the stage's scroll position's X value. 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.MOTION_XSCROLL,
-      category: Categories.motion,
       extensions: ["colours_motion", "output_number"],
     });
   },
@@ -501,12 +456,10 @@ Blockly.Blocks["motion_yscroll"] = {
    * Block to report the stage's scroll position's Y value. 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.MOTION_YSCROLL,
-      category: Categories.motion,
       extensions: ["colours_motion", "output_number"],
     });
   },

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

@@ -23,14 +23,13 @@
  * @author ericr@media.mit.edu (Eric Rosenbaum)
  */
 import * as Blockly from "blockly/core";
-import * as Constants from "../constants.js";
+import * as Constants from "../constants";
 
 Blockly.Blocks["note"] = {
   /**
    * Block for musical note value.
-   * @this Blockly.Block
    */
-  init: function () {
+  init: function (this: Blockly.Block) {
     this.jsonInit({
       message0: "%1",
       args0: [