scratch-blocks 2.1.18 → 2.1.20

package/dist/types/src/fields/scratch_field_angle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scratch_field_angle.d.ts","sourceRoot":"","sources":["../../../../src/fields/scratch_field_angle.ts"],"names":[],"mappings":"AAkcA,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,wBAAgB,yBAAyB,SAExC"}
+{"version":3,"file":"scratch_field_angle.d.ts","sourceRoot":"","sources":["../../../../src/fields/scratch_field_angle.ts"],"names":[],"mappings":"AAucA,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,wBAAgB,yBAAyB,SAExC"}

package/dist/types/src/renderer/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../src/renderer/renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,OAAO,CAAC,KAAK,CAAC,QAAQ;IACzD;;;;OAIG;IACM,YAAY,IAAI,MAAM;IAI/B;;;;;;OAMG;IACM,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM;IAI9F;;;;OAIG;IACM,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,GAAG,UAAU;IAI7D;;;OAGG;IACM,cAAc,IAAI,gBAAgB;IAI3C;;;;;OAKG;IACM,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,UAAU;IAItF;;;;OAIG;IACM,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO;CAGpF"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../src/renderer/renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,OAAO,CAAC,KAAK,CAAC,QAAQ;IACzD;;;;OAIG;IACM,YAAY,IAAI,MAAM;IAI/B;;;;;;OAMG;IACM,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM;IAI9F;;;;OAIG;IACM,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,GAAG,UAAU;IAI7D;;;OAGG;IACM,cAAc,IAAI,gBAAgB;IAI3C;;;;;OAKG;IACM,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,UAAU;IAItF;;;;OAIG;IACM,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO;CAIpF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -36,24 +36,24 @@
     "blockly": "^12.4.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.5.0",
-    "@commitlint/config-conventional": "20.5.0",
-    "@vitest/browser": "4.1.5",
-    "@vitest/browser-playwright": "4.1.5",
-    "eslint": "9.39.4",
-    "eslint-config-scratch": "14.1.12",
+    "@commitlint/cli": "20.5.3",
+    "@commitlint/config-conventional": "20.5.3",
+    "@vitest/browser": "4.1.11",
+    "@vitest/browser-playwright": "4.1.11",
+    "eslint": "9.39.5",
+    "eslint-config-scratch": "14.1.79",
     "husky": "9.1.7",
-    "playwright": "1.59.1",
-    "prettier": "3.8.3",
+    "playwright": "1.63.0",
+    "prettier": "3.8.5",
     "scratch-semantic-release-config": "4.0.1",
-    "semantic-release": "25.0.3",
+    "semantic-release": "25.0.9",
     "source-map-loader": "5.0.0",
-    "ts-loader": "9.5.7",
+    "ts-loader": "9.6.2",
     "typescript": "5.9.3",
-    "vitest": "4.1.5",
-    "webpack": "5.106.2",
+    "vitest": "4.1.11",
+    "webpack": "5.111.1",
     "webpack-cli": "6.0.1",
-    "webpack-dev-server": "5.2.3"
+    "webpack-dev-server": "5.2.6"
   },
   "config": {
     "commitizen": {

package/src/fields/scratch_field_angle.ts

@@ -140,12 +140,15 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
     this.gauge = undefined
     if (this.mouseDownWrapper_) {
       Blockly.browserEvents.unbind(this.mouseDownWrapper_)
+      this.mouseDownWrapper_ = undefined
     }
     if (this.mouseUpWrapper) {
       Blockly.browserEvents.unbind(this.mouseUpWrapper)
+      this.mouseUpWrapper = undefined
     }
     if (this.mouseMoveWrapper) {
       Blockly.browserEvents.unbind(this.mouseMoveWrapper)
+      this.mouseMoveWrapper = undefined
     }
   }
 
@@ -298,9 +301,11 @@ class ScratchFieldAngle extends Blockly.FieldNumber {
   onMouseUp() {
     if (this.mouseMoveWrapper) {
       Blockly.browserEvents.unbind(this.mouseMoveWrapper)
+      this.mouseMoveWrapper = undefined
     }
     if (this.mouseUpWrapper) {
       Blockly.browserEvents.unbind(this.mouseUpWrapper)
+      this.mouseUpWrapper = undefined
     }
   }
 

package/src/fields/scratch_field_variable.ts

@@ -47,7 +47,7 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
     // dropdownCreate returns MenuOption[] rather than Blockly.MenuGenerator's
     // MenuOption[][] variant; the cast is needed to satisfy FieldVariable's
     // menuGenerator_ type while the actual runtime shape is compatible.
-    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this) as unknown as Blockly.MenuGenerator
+    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this)
   }
 
   initModel() {

package/src/index.ts

@@ -159,7 +159,7 @@ export function isContentNodeFocused(): boolean {
   return Blockly.getFocusManager().getFocusedNode() !== null
 }
 
-;(registerContinuousToolbox as () => void)()
+registerContinuousToolbox()
 Blockly.Scrollbar.scrollbarThickness = Blockly.Touch.TOUCH_ENABLED ? 14 : 11
 Blockly.FlyoutButton.TEXT_MARGIN_X = 40
 Blockly.FlyoutButton.TEXT_MARGIN_Y = 10

package/src/renderer/constants.ts

@@ -52,7 +52,7 @@ export class ConstantProvider extends Blockly.zelos.ConstantProvider {
    * @returns The shape object for the given connection.
    */
   override shapeFor(connection: Blockly.RenderedConnection): ReturnType<Blockly.zelos.ConstantProvider['shapeFor']> {
-    const connectionType = connection.type as Blockly.ConnectionType
+    const connectionType: Blockly.ConnectionType = connection.type
     let checks = connection.getCheck()
     const hexagonal = this.HEXAGONAL
     const rounded = this.ROUNDED

package/src/renderer/drawer.ts

@@ -64,7 +64,7 @@ export class Drawer extends Blockly.zelos.Drawer {
    */
   override drawConnectionHighlightPath(measurable: Blockly.blockRendering.Connection) {
     const conn = measurable.connectionModel
-    const connectionType = conn.type as Blockly.ConnectionType
+    const connectionType: Blockly.ConnectionType = conn.type
     if (connectionType === Blockly.ConnectionType.INPUT_VALUE && measurable.isDynamicShape) {
       const input = measurable as Blockly.blockRendering.InlineInput
       const EXPAND_X = 0.5

package/src/renderer/renderer.ts

@@ -65,7 +65,8 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    * @returns True if we should highlight the connection.
    */
   override shouldHighlightConnection(connection: Blockly.RenderedConnection): boolean {
-    return (connection.type as Blockly.ConnectionType) === Blockly.ConnectionType.INPUT_VALUE
+    const connectionType: Blockly.ConnectionType = connection.type
+    return connectionType === Blockly.ConnectionType.INPUT_VALUE
   }
 }
 

package/src/scratch_c_block_wrap.ts

@@ -28,7 +28,8 @@ Blockly.Connection.getConnectionForOrphanedConnection = function (
   // Apply the wrapping logic when the orphaned connection is a statement
   // connection (PREVIOUS_STATEMENT).  Value connections (OUTPUT_VALUE) are
   // already handled by the original implementation.
-  if ((orphanConnection.type as Blockly.ConnectionType) === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
+  const orphanType: Blockly.ConnectionType = orphanConnection.type
+  if (orphanType === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
     const checker = orphanConnection.getConnectionChecker()
     for (const input of startBlock.inputList) {
       const conn = input.connection
@@ -87,7 +88,7 @@ Reflect.set(
     if (markerPreviousConnection?.isConnected() && !markerNextConnection?.isConnected()) {
       for (const input of marker.inputList) {
         const conn = input.connection
-        const connType = conn?.type as Blockly.ConnectionType | undefined
+        const connType = conn?.type
         if (connType !== Blockly.ConnectionType.NEXT_STATEMENT || !conn?.isConnected()) {
           continue
         }

package/src/scratch_comment_bubble.ts

@@ -69,7 +69,7 @@ export class ScratchCommentBubble
     if (gesture) {
       // ScratchCommentBubble implements IBubble structurally but TypeScript
       // cannot verify it because IBubble.drag has a different signature here.
-      gesture.handleBubbleStart(e, this as unknown as Blockly.IBubble)
+      gesture.handleBubbleStart(e, this)
       Blockly.common.setSelected(this)
     }
   }

package/src/scratch_connection_checker.ts

@@ -50,8 +50,9 @@ class ScratchConnectionChecker extends Blockly.ConnectionChecker {
     // getConnectionForOrphanedConnection patch routes displaced blocks into
     // statement inputs, so we allow the connection when a suitable statement
     // input exists on the dragging block.
+    const bType: Blockly.ConnectionType = b.type
     if (
-      (b.type as Blockly.ConnectionType) === Blockly.ConnectionType.NEXT_STATEMENT &&
+      bType === Blockly.ConnectionType.NEXT_STATEMENT &&
       b.isConnected() &&
       !(a.getSourceBlock() as Blockly.Block).nextConnection
     ) {