scratch-blocks 2.0.0 → 2.0.2

package/src/renderer/cat/drawer.ts

@@ -12,8 +12,8 @@ import { type RenderInfo } from "./render_info";
 import { CatFace } from "./cat_face";
 
 export class Drawer extends ClassicDrawer {
-  constants_: ConstantProvider;
-  info_: RenderInfo;
+  declare constants_: ConstantProvider;
+  declare info_: RenderInfo;
 
   override draw() {
     // Make sure the face exists if we need it.
@@ -57,7 +57,7 @@ export class Drawer extends ClassicDrawer {
     const pathObject = this.block_.pathObject as PathObject;
     return this.constants_.makeCatPath(
       this.info_.width,
-      pathObject.catFace.pathEarState
+      pathObject.catFace!.pathEarState
     );
   }
 }

package/src/renderer/cat/render_info.ts

@@ -10,6 +10,6 @@ import { ConstantProvider } from "./constants";
 import { CatScratchRenderer } from "./renderer";
 
 export class RenderInfo extends ClassicRenderInfo {
-  override constants_: ConstantProvider;
-  override renderer_: CatScratchRenderer;
+  declare constants_: ConstantProvider;
+  declare renderer_: CatScratchRenderer;
 }

package/src/renderer/cat/renderer.ts

@@ -18,8 +18,8 @@ export class CatScratchRenderer extends ScratchRenderer {
     return new ConstantProvider();
   }
 
-  override makeDrawer_(block: Blockly.BlockSvg, info: RenderInfo) {
-    return new Drawer(block, info);
+  override makeDrawer_(block: Blockly.BlockSvg, info: Blockly.blockRendering.RenderInfo) {
+    return new Drawer(block, info as RenderInfo);
   }
 
   override makeRenderInfo_(block: Blockly.BlockSvg): RenderInfo {

package/src/renderer/constants.ts

@@ -64,7 +64,7 @@ export class ConstantProvider extends Blockly.zelos.ConstantProvider {
    * drawn with the rounded shape that matches what they accept, not the
    * hexagonal shape of their parent block's output.
    */
-  override shapeFor(connection: Blockly.RenderedConnection) {
+  override shapeFor(connection: Blockly.RenderedConnection): ReturnType<Blockly.zelos.ConstantProvider["shapeFor"]> {
     let checks = connection.getCheck();
     if (!checks && connection.targetConnection) {
       checks = connection.targetConnection.getCheck();
@@ -75,19 +75,19 @@ export class ConstantProvider extends Blockly.zelos.ConstantProvider {
       if (outputShape !== null) {
         switch (outputShape) {
           case this.SHAPES.HEXAGONAL:
-            return this.HEXAGONAL;
+            return this.HEXAGONAL!;
           case this.SHAPES.ROUND:
-            return this.ROUNDED;
+            return this.ROUNDED!;
           case this.SHAPES.SQUARE:
-            return this.SQUARED;
+            return this.SQUARED!;
         }
       }
     }
 
     // For INPUT_VALUE (and OUTPUT_VALUE fallthrough), use connection checks.
-    if (checks?.includes("Boolean")) return this.HEXAGONAL;
-    if (checks?.includes("Number")) return this.ROUNDED;
-    if (checks?.includes("String")) return this.ROUNDED;
+    if (checks?.includes("Boolean")) return this.HEXAGONAL!;
+    if (checks?.includes("Number")) return this.ROUNDED!;
+    if (checks?.includes("String")) return this.ROUNDED!;
     // For INPUT_VALUE or OUTPUT_VALUE with unrecognized checks, default to
     // ROUNDED. Don't call super.shapeFor() here: the base implementation
     // uses getSourceBlock().getOutputShape(), which would incorrectly return
@@ -96,7 +96,7 @@ export class ConstantProvider extends Blockly.zelos.ConstantProvider {
       connection.type === Blockly.ConnectionType.INPUT_VALUE ||
       connection.type === Blockly.ConnectionType.OUTPUT_VALUE
     ) {
-      return this.ROUNDED;
+      return this.ROUNDED!;
     }
     return super.shapeFor(connection);
   }

package/src/renderer/drawer.ts

@@ -9,8 +9,8 @@ import type { RenderInfo } from "./render_info";
 import { ConstantProvider } from "./constants";
 
 export class Drawer extends Blockly.zelos.Drawer {
-  constants_: ConstantProvider;
-  info_: RenderInfo;
+  declare constants_: ConstantProvider;
+  declare info_: RenderInfo;
 
   override drawStatementInput_(row: Blockly.blockRendering.Row) {
     if (this.info_.isBowlerHatBlock()) {

package/src/renderer/render_info.ts

@@ -10,7 +10,7 @@ import { BowlerHat } from "./bowler_hat";
 import { ConstantProvider } from "./constants";
 
 export class RenderInfo extends Blockly.zelos.RenderInfo {
-  constants_: ConstantProvider;
+  declare constants_: ConstantProvider;
 
   override populateTopRow_() {
     if (this.isBowlerHatBlock()) {
@@ -41,19 +41,22 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
     if (this.isBowlerHatBlock()) {
       // Resize the render info to the same width as the widest part of a
       // bowler hat block.
-      const statementRow = this.rows.find((r) => r.hasStatement);
+      // Bowler hat blocks always have exactly one statement row and one input
+      // element, so these find() calls are guaranteed to succeed.
+      const statementRow = this.rows.find((r) => r.hasStatement)!;
       this.width =
         statementRow.widthWithConnectedBlocks -
         statementRow.elements.find((e) =>
           Blockly.blockRendering.Types.isInput(e)
-        ).width +
+        )!.width +
         this.constants_.MEDIUM_PADDING;
 
       // The bowler hat's width is the same as the block's width, so it can't
       // be derived from the constants like a normal hat and has to be set here.
+      // populateTopRow_ always adds a hat element for bowler hat blocks.
       const hat = this.topRow.elements.find((e) =>
         Blockly.blockRendering.Types.isHat(e)
-      );
+      )!;
       hat.width = this.width;
       this.topRow.measure();
     }

package/src/renderer/renderer.ts

@@ -32,8 +32,8 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    *     block.
    * @returns The drawer.
    */
-  override makeDrawer_(block: Blockly.BlockSvg, info: RenderInfo): Drawer {
-    return new Drawer(block, info);
+  override makeDrawer_(block: Blockly.BlockSvg, info: Blockly.blockRendering.RenderInfo): Drawer {
+    return new Drawer(block, info as RenderInfo);
   }
 
   /**

package/src/scratch_block_paster.ts

@@ -36,7 +36,7 @@ class ScratchBlockPaster extends Blockly.clipboard.BlockPaster {
     // fired for blocks with comments, the VM will never receive it, causing its
     // state to get out of sync. Manually fire it here (after suppression has
     // been turned off) if needed.
-    const commentIcon = block.getIcon(Blockly.icons.IconType.COMMENT);
+    const commentIcon = block?.getIcon(Blockly.icons.IconType.COMMENT);
     if (commentIcon) {
       (commentIcon as ScratchCommentIcon).fireCreateEvent();
     }

package/src/scratch_comment_bubble.ts

@@ -16,7 +16,7 @@ export class ScratchCommentBubble
   implements Blockly.IBubble, Blockly.ISelectable
 {
   id: string;
-  private sourceBlock: Blockly.BlockSvg;
+  private sourceBlock: Blockly.BlockSvg | null;
   private anchor?: Blockly.utils.Coordinate;
   private anchorChain?: SVGLineElement;
   private dragStartLocation?: Blockly.utils.Coordinate;
@@ -71,7 +71,7 @@ export class ScratchCommentBubble
     const destination =
       xOrCoordinate instanceof Blockly.utils.Coordinate
         ? xOrCoordinate
-        : new Blockly.utils.Coordinate(xOrCoordinate, y);
+        : new Blockly.utils.Coordinate(xOrCoordinate, y!);
     super.moveTo(destination);
     this.redrawAnchorChain();
   }
@@ -79,7 +79,9 @@ export class ScratchCommentBubble
   startGesture(e: PointerEvent) {
     const gesture = this.workspace.getGesture(e);
     if (gesture) {
-      gesture.handleBubbleStart(e, this);
+      // 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);
       Blockly.common.setSelected(this);
     }
   }
@@ -91,7 +93,7 @@ export class ScratchCommentBubble
     Blockly.utils.dom.addClass(this.getSvgRoot(), "blocklyDragging");
   }
 
-  drag(newLocation: Blockly.utils.Coordinate, event: Event) {
+  drag(newLocation: Blockly.utils.Coordinate, event?: PointerEvent) {
     this.moveTo(newLocation);
   }
 
@@ -111,7 +113,7 @@ export class ScratchCommentBubble
   }
 
   revertDrag() {
-    this.moveTo(this.dragStartLocation);
+    this.moveTo(this.dragStartLocation!);
   }
 
   setAnchorLocation(newAnchor: Blockly.utils.Coordinate) {
@@ -122,7 +124,7 @@ export class ScratchCommentBubble
       this.dropAnchor();
     } else {
       const oldLocation = this.getRelativeToSurfaceXY();
-      const delta = Blockly.utils.Coordinate.difference(this.anchor, oldAnchor);
+      const delta = Blockly.utils.Coordinate.difference(this.anchor, oldAnchor!);
       const newLocation = Blockly.utils.Coordinate.sum(oldLocation, delta);
       this.moveTo(newLocation);
     }
@@ -131,18 +133,18 @@ export class ScratchCommentBubble
   dropAnchor() {
     const verticalOffset = 16;
     this.moveTo(
-      this.anchor.x + 40 * (this.workspace.RTL ? -1 : 1),
-      this.anchor.y - verticalOffset
+      this.anchor!.x + 40 * (this.workspace.RTL ? -1 : 1),
+      this.anchor!.y - verticalOffset
     );
     const location = this.getRelativeToSurfaceXY();
     this.anchorChain = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.LINE,
       {
-        x1: this.anchor.x - location.x,
-        y1: this.anchor.y - location.y,
+        x1: this.anchor!.x - location.x,
+        y1: this.anchor!.y - location.y,
         x2: (this.getSize().width / 2) * (this.workspace.RTL ? -1 : 1),
         y2: verticalOffset,
-        style: `stroke: ${this.sourceBlock.getColourTertiary()}; stroke-width: 1`,
+        style: `stroke: ${this.sourceBlock!.getColourTertiary()}; stroke-width: 1`,
       },
       this.getSvgRoot()
     );
@@ -156,8 +158,8 @@ export class ScratchCommentBubble
     if (!this.anchorChain) return;
 
     const location = this.getRelativeToSurfaceXY();
-    this.anchorChain.setAttribute("x1", `${this.anchor.x - location.x}`);
-    this.anchorChain.setAttribute("y1", `${this.anchor.y - location.y}`);
+    this.anchorChain!.setAttribute("x1", `${this.anchor!.x - location.x}`);
+    this.anchorChain!.setAttribute("y1", `${this.anchor!.y - location.y}`);
   }
 
   getId() {
@@ -170,7 +172,7 @@ export class ScratchCommentBubble
 
   dispose() {
     this.disposing = true;
-    Blockly.utils.dom.removeNode(this.anchorChain);
+    Blockly.utils.dom.removeNode(this.anchorChain ?? null);
     if (this.sourceBlock) {
       Blockly.Events.fire(
         new (Blockly.Events.get("block_comment_delete"))(this, this.sourceBlock)

package/src/scratch_comment_icon.ts

@@ -196,7 +196,7 @@ export class ScratchCommentIcon
     this.commentBubble.setCollapsed(!visible);
   }
 
-  getBubble() {
+  getBubble(): ScratchCommentBubble | null {
     return this.commentBubble;
   }
 

package/src/scratch_dragger.ts

@@ -104,8 +104,8 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
       this.wouldDeleteDraggable(event, this.draggable.getRootBlock())
     ) {
       const prototype = this.draggable
-        .getInput("custom_block")
-        .connection.targetBlock();
+        .getInput("custom_block")!
+        .connection!.targetBlock();
       const hasCaller =
         prototype instanceof Blockly.BlockSvg &&
         isProcedureBlock(prototype) &&

package/src/scratch_variable_model.ts

@@ -13,8 +13,8 @@ export class ScratchVariableModel extends Blockly.VariableModel {
   constructor(
     workspace: Blockly.Workspace,
     name: string,
-    type: string,
-    id: string,
+    type?: string,
+    id?: string,
     public isLocal = false,
     public isCloud = false
   ) {

package/src/status_indicator_label.ts

@@ -64,11 +64,11 @@ export class StatusIndicatorLabel extends Blockly.FlyoutButton {
     json: Blockly.utils.toolbox.LabelInfo
   ) {
     super(workspace, targetWorkspace, json, true);
-    this.extensionId = json["id"];
+    this.extensionId = json["id"]!;
 
     const heightDelta = 40 - this.height;
     this.height = 40;
-    const text = this.getSvgRoot().querySelector("text");
+    const text = this.getSvgRoot().querySelector("text")!;
     const previousY = Number(text.getAttribute("y"));
 
     text.setAttribute("y", `${previousY + heightDelta / 2}`);
@@ -77,7 +77,7 @@ export class StatusIndicatorLabel extends Blockly.FlyoutButton {
     const marginX = 20;
     const marginY = 5;
     const touchPadding = 16;
-    const flyoutWidth = targetWorkspace.getFlyout().getWidth();
+    const flyoutWidth = targetWorkspace.getFlyout()!.getWidth();
 
     const statusButtonX = workspace.RTL
       ? marginX - flyoutWidth + statusButtonWidth

package/src/status_indicator_label_flyout_inflater.ts

@@ -26,7 +26,7 @@ class StatusIndicatorLabelFlyoutInflater extends Blockly.LabelFlyoutInflater {
   ): Blockly.FlyoutItem {
     const label = new StatusIndicatorLabel(
       flyout.getWorkspace(),
-      flyout.targetWorkspace,
+      flyout.targetWorkspace!,
       state
     );
     label.show();

package/src/variables.ts

@@ -98,7 +98,7 @@ export function createVariable(
   const validate = nameValidator.bind(null, opt_type);
 
   // Prompt the user to enter a name for the variable
-  prompt(
+  prompt!(
     newMsg,
     "",
     function (
@@ -127,7 +127,7 @@ export function createVariable(
           workspace,
           validatedText,
           opt_type,
-          null,
+          undefined,
           isLocal,
           isCloud
         );
@@ -137,7 +137,7 @@ export function createVariable(
         );
 
         const toolbox = workspace.getToolbox();
-        const flyout = toolbox.getFlyout();
+        const flyout = toolbox?.getFlyout();
         const variableBlockId = variable.getId();
         if (
           toolbox instanceof ScratchContinuousToolbox &&
@@ -154,7 +154,7 @@ export function createVariable(
       } else {
         // User canceled prompt without a value.
         if (opt_callback) {
-          opt_callback(null);
+          opt_callback(undefined);
         }
       }
     },
@@ -193,7 +193,7 @@ function nameValidator(
   additionalVars: string[],
   isCloud: boolean,
   opt_callback?: (id?: string) => void
-): string {
+): string | null {
   // The validators for the different variable types require slightly different
   // arguments. For broadcast messages, if a broadcast message of the provided
   // name already exists, the validator needs to call a function that updates
@@ -345,7 +345,7 @@ export function renameVariable(
     promptDefaultText = promptDefaultText.substring(CLOUD_PREFIX.length);
   }
 
-  prompt(
+  prompt!(
     promptText,
     promptDefaultText,
     (newName: string, additionalVars: string[]) => {
@@ -373,7 +373,7 @@ export function renameVariable(
       } else {
         // User canceled prompt without a value.
         if (opt_callback) {
-          opt_callback(null);
+          opt_callback(undefined);
         }
       }
     },

package/src/xml.ts

@@ -26,8 +26,8 @@ export function clearWorkspaceAndLoadFromXml(
   for (const variable of xml.querySelectorAll("variables variable")) {
     const id = variable.getAttribute("id");
     if (!id) continue;
-    const type = variable.getAttribute("type");
-    const name = variable.textContent;
+    const type = variable.getAttribute("type") ?? "";
+    const name = variable.textContent ?? "";
     const isLocal = variable.getAttribute("islocal") === "true";
     const isCloud = variable.getAttribute("iscloud") === "true";
 
@@ -47,7 +47,7 @@ export function clearWorkspaceAndLoadFromXml(
 
   // Remove the `variables` element from the XML to prevent Blockly from
   // throwing or stomping on the variables we created.
-  xml.querySelector("variables").remove();
+  xml.querySelector("variables")?.remove();
 
   // Defer to core for the rest of the deserialization.
   const blockIds = Blockly.Xml.domToWorkspace(xml, workspace);

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Type Checking */
     "noImplicitAny": true,
-    "strict": false, // TODO: try to enable "strict" mode and fix the resulting errors
+    "strict": true,
 
     /* Modules */
     "module": "esnext",