scratch-blocks 2.1.6 → 2.1.8

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

@@ -10,7 +10,7 @@ export declare class RenderInfo extends Blockly.zelos.RenderInfo {
     populateTopRow_(): void;
     populateBottomRow_(): void;
     computeBounds_(): void;
-    getInRowSpacing_(prev: Blockly.blockRendering.Measurable, next: Blockly.blockRendering.Measurable): number;
+    getInRowSpacing_(prev: Blockly.blockRendering.Measurable | null, next: Blockly.blockRendering.Measurable | null): number;
     getSpacerRowHeight_(prev: Blockly.blockRendering.Row, next: Blockly.blockRendering.Row): number;
     getElemCenterline_(row: Blockly.blockRendering.Row, elem: Blockly.blockRendering.Measurable): number;
     isBowlerHatBlock(): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"render_info.d.ts","sourceRoot":"","sources":["../../../../src/renderer/render_info.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,qBAAa,UAAW,SAAQ,OAAO,CAAC,KAAK,CAAC,UAAU;IAC9C,UAAU,EAAE,gBAAgB,CAAA;IAE3B,eAAe;IAaf,kBAAkB;IAOlB,cAAc;IA0Bd,gBAAgB,CACvB,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,EACvC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GACtC,MAAM;IAYA,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,GAAG,MAAM;IAQ/F,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM;IAgB7G,gBAAgB;IAIhB,aAAa;CAGd"}
+{"version":3,"file":"render_info.d.ts","sourceRoot":"","sources":["../../../../src/renderer/render_info.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAS9C,qBAAa,UAAW,SAAQ,OAAO,CAAC,KAAK,CAAC,UAAU;IAC9C,UAAU,EAAE,gBAAgB,CAAA;IAE3B,eAAe;IAaf,kBAAkB;IAOlB,cAAc;IA0Bd,gBAAgB,CACvB,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,IAAI,EAC9C,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,IAAI,GAC7C,MAAM;IAYA,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,GAAG,MAAM;IAQ/F,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM;IAmB7G,gBAAgB;IAIhB,aAAa;CAGd"}

package/eslint.config.mjs

@@ -16,22 +16,6 @@ export default eslintConfigScratch.defineConfig(
     files: ['**/*.{ts,tsx,mts,cts}'],
     plugins: { '@typescript-eslint': tseslint.plugin },
   },
-  {
-    // TODO: upstream to eslint-config-scratch
-    files: ['**/*.{ts,tsx,mts,cts}'],
-    rules: {
-      '@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}'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -38,10 +38,10 @@
   "devDependencies": {
     "@commitlint/cli": "20.5.0",
     "@commitlint/config-conventional": "20.5.0",
-    "@vitest/browser": "4.1.0",
-    "@vitest/browser-playwright": "4.1.0",
+    "@vitest/browser": "4.1.2",
+    "@vitest/browser-playwright": "4.1.2",
     "eslint": "9.39.4",
-    "eslint-config-scratch": "14.0.12",
+    "eslint-config-scratch": "14.1.1",
     "husky": "9.1.7",
     "playwright": "1.58.2",
     "prettier": "3.8.1",
@@ -50,7 +50,7 @@
     "source-map-loader": "5.0.0",
     "ts-loader": "9.5.4",
     "typescript": "5.9.3",
-    "vitest": "4.1.0",
+    "vitest": "4.1.2",
     "webpack": "5.105.4",
     "webpack-cli": "6.0.1",
     "webpack-dev-server": "5.2.3"

package/src/blocks/data.ts

@@ -615,7 +615,7 @@ const RENAME_OPTION_CALLBACK_FACTORY = function (block: Blockly.Block, fieldName
   return () => {
     const workspace = block.workspace
     const variable = (block.getField(fieldName) as ScratchFieldVariable).getVariable() as ScratchVariableModel
-    renameVariable(workspace as Blockly.WorkspaceSvg, variable)
+    renameVariable(workspace, variable)
   }
 }
 

package/src/renderer/render_info.ts

@@ -6,6 +6,13 @@ import * as Blockly from 'blockly/core'
 import { BowlerHat } from './bowler_hat'
 import { ConstantProvider } from './constants'
 
+// Blockly's BlockSvg types previousConnection as non-null, but blocks without a
+// previous connector (hat blocks) have it as null at runtime. This type corrects
+// that so null checks are recognized by the type system instead of suppressed.
+type BlockSvgWithNullableConnections = Omit<Blockly.BlockSvg, 'previousConnection'> & {
+  previousConnection: Blockly.RenderedConnection | null
+}
+
 export class RenderInfo extends Blockly.zelos.RenderInfo {
   declare constants_: ConstantProvider
 
@@ -56,12 +63,12 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
   }
 
   override getInRowSpacing_(
-    prev: Blockly.blockRendering.Measurable,
-    next: Blockly.blockRendering.Measurable,
+    prev: Blockly.blockRendering.Measurable | null,
+    next: Blockly.blockRendering.Measurable | null,
   ): number {
     if (
       this.isBowlerHatBlock() &&
-      (Blockly.blockRendering.Types.isHat(prev) || Blockly.blockRendering.Types.isHat(next))
+      ((prev && Blockly.blockRendering.Types.isHat(prev)) || (next && Blockly.blockRendering.Types.isHat(next)))
     ) {
       // Bowler hat rows have no spacing/gaps, just the hat.
       return 0
@@ -86,7 +93,10 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
       this.block_.isScratchExtension &&
       Blockly.blockRendering.Types.isField(elem) &&
       elem.field instanceof Blockly.FieldImage &&
-      elem.field === this.block_.inputList[0].fieldRow[0]
+      elem.field === this.block_.inputList[0].fieldRow[0] &&
+      // Hat-style extension blocks have no previousConnection and use their
+      // own centering; only offset stack-style extensions.
+      (this.block_ as BlockSvgWithNullableConnections).previousConnection
     ) {
       // Vertically center the icon on extension blocks.
       return super.getElemCenterline_(row, elem) + this.constants_.GRID_UNIT