scratch-blocks 2.1.4 → 2.1.6

package/dist/types/src/scratch_continuous_toolbox.d.ts

@@ -12,6 +12,7 @@ export declare class ScratchContinuousToolbox extends ContinuousToolbox {
      * List of functions to run after the next time the toolbox renders.
      */
     private postRenderCallbacks;
+    private getInitialFlyoutContents_;
     refreshSelection(): void;
     /**
      * Converts the given toolbox item to a corresponding array of items that
@@ -36,6 +37,6 @@ export declare class ScratchContinuousToolbox extends ContinuousToolbox {
      * @param newItem The item that is proposed to be selected instead.
      * @returns True if the old item should be allowed to be deselected.
      */
-    shouldDeselectItem_(oldItem: Blockly.ISelectableToolboxItem | null, newItem: Blockly.ISelectableToolboxItem | null): any;
+    shouldDeselectItem_(oldItem: Blockly.ISelectableToolboxItem | null, newItem: Blockly.ISelectableToolboxItem | null): boolean;
 }
 //# sourceMappingURL=scratch_continuous_toolbox.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scratch_continuous_toolbox.d.ts","sourceRoot":"","sources":["../../../src/scratch_continuous_toolbox.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAIvC;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,iBAAiB;IAC7D;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,gBAAgB;IAKhB;;;;;OAKG;IACH,SAAS,CAAC,+BAA+B,CACvC,WAAW,EAAE,OAAO,CAAC,YAAY,GAChC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB;IAY5C;;OAEG;IACH,aAAa;IAUb;;;OAGG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI;IAIrC;;;;;;OAMG;IACH,mBAAmB,CACjB,OAAO,EAAE,OAAO,CAAC,sBAAsB,GAAG,IAAI,EAC9C,OAAO,EAAE,OAAO,CAAC,sBAAsB,GAAG,IAAI;CAKjD"}
+{"version":3,"file":"scratch_continuous_toolbox.d.ts","sourceRoot":"","sources":["../../../src/scratch_continuous_toolbox.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAIvC;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,iBAAiB;IAC7D;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,yBAAyB;IAIjC,gBAAgB;IAKhB;;;;;OAKG;IACH,SAAS,CAAC,+BAA+B,CACvC,WAAW,EAAE,OAAO,CAAC,YAAY,GAChC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB;IAY5C;;OAEG;IACH,aAAa;IAeb;;;OAGG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI;IAIrC;;;;;;OAMG;IACH,mBAAmB,CACjB,OAAO,EAAE,OAAO,CAAC,sBAAsB,GAAG,IAAI,EAC9C,OAAO,EAAE,OAAO,CAAC,sBAAsB,GAAG,IAAI;CAKjD"}

package/dist/types/src/status_indicator_label.d.ts

@@ -42,7 +42,7 @@ export declare class StatusIndicatorLabel extends Blockly.FlyoutButton {
     /**
      * Function to be invoked when the status indicator is clicked.
      */
-    static statusButtonCallback: (extensionId: string) => void;
+    static statusButtonCallback: ((extensionId: string) => void) | null;
     /**
      * Creates a new StatusIndicatorLabel.
      * @param workspace The workspace in which to place this header.
@@ -62,10 +62,10 @@ export declare class StatusIndicatorLabel extends Blockly.FlyoutButton {
     setImageSrc(src: string): void;
     /**
      * Gets the extension state. Overridden externally.
-     * @param extensionId A string identifying which extension's state to retrieve.
+     * @param _extensionId A string identifying which extension's state to retrieve.
      * @returns Whether the extension is ready to be used.
      */
-    getExtensionState(extensionId: string): StatusButtonState;
+    getExtensionState(_extensionId: string): StatusButtonState;
     /**
      * Disposes of this status indicator label.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"status_indicator_label.d.ts","sourceRoot":"","sources":["../../../src/status_indicator_label.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;;GAIG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,YAAY;IAC5D;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,YAAY,EAAE,eAAe,CAAA;IAE7B;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAA;IAE1C;;OAEG;IACH,MAAM,CAAC,oBAAoB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IAE1D;;;;;OAKG;gBAED,SAAS,EAAE,OAAO,CAAC,YAAY,EAC/B,eAAe,EAAE,OAAO,CAAC,YAAY,EACrC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;IAoDvC;;OAEG;IACH,aAAa;IAWb;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM;IAMvB;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB;IAIzD;;OAEG;IACH,OAAO;CAIR;AAED;;GAEG;AACH,oBAAY,iBAAiB;IAC3B,KAAK,UAAU;IACf,SAAS,cAAc;CACxB"}
+{"version":3,"file":"status_indicator_label.d.ts","sourceRoot":"","sources":["../../../src/status_indicator_label.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;;GAIG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,YAAY;IAC5D;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,YAAY,EAAE,eAAe,CAAA;IAE7B;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAA;IAE1C;;OAEG;IACH,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAO;IAE1E;;;;;OAKG;gBAED,SAAS,EAAE,OAAO,CAAC,YAAY,EAC/B,eAAe,EAAE,OAAO,CAAC,YAAY,EACrC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;IA0DvC;;OAEG;IACH,aAAa;IAWb;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB;;;;OAIG;IACH,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,iBAAiB;IAI1D;;OAEG;IACH,OAAO;CAIR;AAED;;GAEG;AACH,oBAAY,iBAAiB;IAC3B,KAAK,UAAU;IACf,SAAS,cAAc;CACxB"}

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

@@ -1 +1 @@
-{"version":3,"file":"status_indicator_label_flyout_inflater.d.ts","sourceRoot":"","sources":["../../../src/status_indicator_label_flyout_inflater.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,2BAA2B,2BAA2B,CAAA;AAmBnE;;GAEG;AACH,wBAAgB,0CAA0C,SAMzD"}
+{"version":3,"file":"status_indicator_label_flyout_inflater.d.ts","sourceRoot":"","sources":["../../../src/status_indicator_label_flyout_inflater.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,2BAA2B,2BAA2B,CAAA;AAoBnE;;GAEG;AACH,wBAAgB,0CAA0C,SAMzD"}

package/dist/types/src/variables.d.ts

@@ -49,6 +49,6 @@ export declare function createVariable(workspace: Blockly.WorkspaceSvg, opt_call
  *     name, or null if change is to be aborted (cancel button), or undefined if
  *     an existing variable was chosen.
  */
-export declare function renameVariable(workspace: Blockly.WorkspaceSvg, variable: ScratchVariableModel, opt_callback?: (id?: string) => void): void;
+export declare function renameVariable(workspace: Blockly.Workspace, variable: ScratchVariableModel, opt_callback?: (id?: string) => void): void;
 export { getVariablesCategory } from './data_category';
 //# sourceMappingURL=variables.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../src/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAIvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAS/D,KAAK,UAAU,GAAG,CAChB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CACR,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EAAE,EACxB,eAAe,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,KACpD,IAAI,EACT,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,KACb,IAAI,CAAA;AAIT;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,UAAU,QAEnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,OAAO,CAAC,YAAY,EAC/B,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACpC,QAAQ,CAAC,EAAE,MAAM,QAiElB;AAsID;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,OAAO,CAAC,YAAY,EAC/B,QAAQ,EAAE,oBAAoB,EAC9B,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,QAsDrC;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../src/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAIvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAS/D,KAAK,UAAU,GAAG,CAChB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CACR,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EAAE,EACxB,eAAe,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,KACpD,IAAI,EACT,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,KACb,IAAI,CAAA;AAIT;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,UAAU,QAEnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,OAAO,CAAC,YAAY,EAC/B,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACpC,QAAQ,CAAC,EAAE,MAAM,QAoElB;AAsID;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,QAAQ,EAAE,oBAAoB,EAC9B,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,QA0DrC;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA"}

package/dist/types/src/workspace_block_lookup.d.ts

@@ -0,0 +1,4 @@
+import * as Blockly from 'blockly/core';
+export declare function getRequiredMainWorkspaceSvg(): Blockly.WorkspaceSvg;
+export declare function getBlockSvgById(workspace: Blockly.WorkspaceSvg, id: string): Blockly.BlockSvg | null;
+//# sourceMappingURL=workspace_block_lookup.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"workspace_block_lookup.d.ts","sourceRoot":"","sources":["../../../src/workspace_block_lookup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC,wBAAgB,2BAA2B,IAAI,OAAO,CAAC,YAAY,CAMlE;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAGpG"}

package/eslint.config.mjs

@@ -13,35 +13,32 @@ export default eslintConfigScratch.defineConfig(
     },
   },
   {
-    // TypeScript rule overrides (type-checked rules must be scoped to TS files)
     files: ['**/*.{ts,tsx,mts,cts}'],
     plugins: { '@typescript-eslint': tseslint.plugin },
+  },
+  {
+    // TODO: upstream to eslint-config-scratch
+    files: ['**/*.{ts,tsx,mts,cts}'],
     rules: {
-      // TODO: improve TypeScript type annotations to remove `any` usage
-      '@typescript-eslint/no-explicit-any': 'warn',
-      '@typescript-eslint/no-unsafe-argument': 'warn',
-      '@typescript-eslint/no-unsafe-assignment': 'warn',
-      '@typescript-eslint/no-unsafe-call': 'warn',
-      '@typescript-eslint/no-unsafe-enum-comparison': 'warn',
-      '@typescript-eslint/no-unsafe-member-access': 'warn',
-      '@typescript-eslint/no-unsafe-return': 'warn',
-      '@typescript-eslint/unbound-method': 'warn',
-
-      // TODO: fix incrementally
-      '@typescript-eslint/no-non-null-assertion': 'warn',
-      '@typescript-eslint/no-unnecessary-condition': 'warn',
-      '@typescript-eslint/prefer-nullish-coalescing': 'warn',
-      '@typescript-eslint/no-base-to-string': 'warn',
-      '@typescript-eslint/no-empty-function': 'warn',
-      '@typescript-eslint/no-floating-promises': 'warn',
-      '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
-      '@typescript-eslint/no-unused-vars': 'warn',
-      '@typescript-eslint/only-throw-error': 'warn',
-      '@typescript-eslint/prefer-optional-chain': 'warn',
-      '@typescript-eslint/require-await': 'warn',
-      '@typescript-eslint/restrict-plus-operands': 'warn',
-      '@typescript-eslint/prefer-for-of': 'warn',
-      '@typescript-eslint/restrict-template-expressions': 'warn',
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+          ignoreRestSiblings: true,
+        },
+      ],
+    },
+  },
+  {
+    // Tests frequently introspect internals and invoke prototype methods directly.
+    files: ['tests/**/*.{ts,tsx,mts,cts}'],
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
     },
   },
   globalIgnores([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -23,8 +23,11 @@
     "format": "prettier --write . && eslint --fix",
     "prepare": "husky || true",
     "start": "webpack serve --open --mode development",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "vitest run",
+    "test:browser": "vitest run --project browser",
     "test:lint": "eslint && prettier --check .",
+    "test:unit": "vitest run --project unit",
+    "test:watch": "vitest",
     "watch": "webpack --mode development --watch"
   },
   "dependencies": {
@@ -35,15 +38,19 @@
   "devDependencies": {
     "@commitlint/cli": "20.5.0",
     "@commitlint/config-conventional": "20.5.0",
+    "@vitest/browser": "4.1.0",
+    "@vitest/browser-playwright": "4.1.0",
     "eslint": "9.39.4",
-    "eslint-config-scratch": "14.0.11",
+    "eslint-config-scratch": "14.0.12",
     "husky": "9.1.7",
+    "playwright": "1.58.2",
     "prettier": "3.8.1",
     "scratch-semantic-release-config": "4.0.1",
     "semantic-release": "25.0.3",
     "source-map-loader": "5.0.0",
     "ts-loader": "9.5.4",
     "typescript": "5.9.3",
+    "vitest": "4.1.0",
     "webpack": "5.105.4",
     "webpack-cli": "6.0.1",
     "webpack-dev-server": "5.2.3"

package/src/block_reporting.ts

@@ -1,12 +1,12 @@
 import * as Blockly from 'blockly/core'
 import { Colours } from './colours'
+import { getBlockSvgById, getRequiredMainWorkspaceSvg } from './workspace_block_lookup'
 
 export function reportValue(id: string, value: string) {
-  const block = (Blockly.getMainWorkspace().getBlockById(id) ||
-    (Blockly.getMainWorkspace() as Blockly.WorkspaceSvg)
-      .getFlyout()
-      ?.getWorkspace()
-      ?.getBlockById(id)) as Blockly.BlockSvg
+  const mainWorkspace = getRequiredMainWorkspaceSvg()
+  const flyout = mainWorkspace.getFlyout()
+  const flyoutBlock = flyout ? getBlockSvgById(flyout.getWorkspace(), id) : null
+  const block = getBlockSvgById(mainWorkspace, id) ?? flyoutBlock
   if (!block) {
     throw new Error('Tried to report value on block that does not exist.')
   }

package/src/blocks/control.ts

@@ -24,7 +24,7 @@ Blockly.Blocks.control_forever = {
    * https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#5eke39
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       id: 'control_forever',
       message0: Blockly.Msg.CONTROL_FOREVER,
@@ -58,7 +58,7 @@ Blockly.Blocks.control_repeat = {
    * https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#so57n9
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       id: 'control_repeat',
       message0: Blockly.Msg.CONTROL_REPEAT,
@@ -164,7 +164,7 @@ Blockly.Blocks.control_stop = {
     const OTHER_SCRIPTS = 'other scripts in sprite'
     const stopDropdown = new Blockly.FieldDropdown(
       function () {
-        if (this.sourceBlock_ && this.sourceBlock_.nextConnection && this.sourceBlock_.nextConnection.isConnected()) {
+        if (this.sourceBlock_?.nextConnection?.isConnected()) {
           return [[Blockly.Msg.CONTROL_STOP_OTHER, OTHER_SCRIPTS]]
         }
         return [
@@ -232,7 +232,7 @@ Blockly.Blocks.control_repeat_until = {
    * Block to repeat until a condition becomes true.
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       message0: Blockly.Msg.CONTROL_REPEATUNTIL,
       message1: '%1',
@@ -272,7 +272,7 @@ Blockly.Blocks.control_while = {
    * (This is an obsolete "hacked" block, for compatibility with 2.0.)
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       message0: Blockly.Msg.CONTROL_WHILE,
       message1: '%1',

package/src/blocks/event.ts

@@ -64,7 +64,7 @@ Blockly.Blocks.event_whenflagclicked = {
    * Block for when flag clicked.
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       id: 'event_whenflagclicked',
       message0: Blockly.Msg.EVENT_WHENFLAGCLICKED,

package/src/blocks/motion.ts

@@ -41,7 +41,7 @@ Blockly.Blocks.motion_turnright = {
    * Block to turn right.
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       message0: Blockly.Msg.MOTION_TURNRIGHT,
       args0: [
@@ -66,7 +66,7 @@ Blockly.Blocks.motion_turnleft = {
    * Block to turn left.
    */
   init: function (this: Blockly.Block) {
-    const ws = this.workspace.options.parentWorkspace || this.workspace
+    const ws = this.workspace.options.parentWorkspace ?? this.workspace
     this.jsonInit({
       message0: Blockly.Msg.MOTION_TURNLEFT,
       args0: [