scratch-blocks 2.1.5 → 2.1.7

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

@@ -17,35 +17,28 @@ export default eslintConfigScratch.defineConfig(
     plugins: { '@typescript-eslint': tseslint.plugin },
   },
   {
-    // TypeScript rule overrides (type-checked rules must be scoped to TS files)
-    // Fixing these requires non-trivial adjustments to code that was written before these rules were in place.
-    files: ['src/**/*.{ts,tsx,mts,cts}'],
+    // 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.5",
+  "version": "2.1.7",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",

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/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/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: [

package/src/blocks/procedures.ts

@@ -29,8 +29,8 @@ import type { ScratchDragger } from '../scratch_dragger'
 type ConnectionMap = Record<
   string,
   {
-    shadow: Element
-    block: Blockly.BlockSvg
+    shadow: Element | undefined
+    block: Blockly.BlockSvg | null
   } | null
 >
 
@@ -43,6 +43,86 @@ enum ArgumentType {
   BOOLEAN = 'b',
 }
 
+/**
+ * Parse a serialized procedure argument type token.
+ * @param value Serialized token from procCode.
+ * @returns The matching argument type.
+ */
+function parseArgumentType(value: string): ArgumentType {
+  switch (value) {
+    case 'n':
+      return ArgumentType.NUMBER
+    case 'b':
+      return ArgumentType.BOOLEAN
+    case 's':
+      return ArgumentType.STRING
+    default:
+      throw new Error(`Found a custom procedure with an invalid type: ${value}`)
+  }
+}
+
+/**
+ * Read a required mutation attribute or throw if missing.
+ * @param xmlElement The mutation element that should contain required attributes.
+ * @param name The specific mutation attribute to retrieve.
+ * @returns Attribute value.
+ */
+function getRequiredMutationAttribute(xmlElement: Element, name: string): string {
+  const value = xmlElement.getAttribute(name)
+  if (value === null) {
+    throw new Error(`Missing required mutation attribute: ${name}`)
+  }
+  return value
+}
+
+/**
+ * Parse a required mutation attribute as JSON, then validate its type.
+ * @param xmlElement The mutation element that should contain required attributes.
+ * @param name The specific mutation attribute to retrieve and parse.
+ * @param parse Validates and narrows the parsed JSON value.
+ * @returns Parsed and validated mutation attribute value.
+ */
+function parseRequiredMutationJson<T>(
+  xmlElement: Element,
+  name: string,
+  parse: (value: unknown, name: string) => T,
+): T {
+  const rawValue = getRequiredMutationAttribute(xmlElement, name)
+  let parsedValue: unknown
+  try {
+    parsedValue = JSON.parse(rawValue)
+  } catch {
+    throw new Error(`Invalid JSON in mutation attribute: ${name}`)
+  }
+  return parse(parsedValue, name)
+}
+
+/**
+ * Validate a parsed mutation value as a boolean.
+ * @param value Parsed mutation value.
+ * @param name Attribute name used in error messages.
+ * @returns Validated boolean value.
+ */
+function parseBooleanMutationValue(value: unknown, name: string): boolean {
+  if (typeof value !== 'boolean') {
+    throw new Error(`Expected boolean JSON value in mutation attribute: ${name}`)
+  }
+  return value
+}
+
+/**
+ * Validate a parsed mutation value as a string array.
+ * @param value Parsed mutation value.
+ * @param name Attribute name used in error messages.
+ * @returns Validated string array value.
+ */
+function parseStringArrayMutationValue(value: unknown, name: string): string[] {
+  if (!Array.isArray(value) || !value.every((entry) => typeof entry === 'string')) {
+    throw new Error(`Expected string[] JSON value in mutation attribute: ${name}`)
+  }
+  return value
+}
+
 /**
  * A drag strategy for the procedures_prototype block that delegates all drag
  * operations to its parent (the procedures_definition block). This lets the
@@ -193,10 +273,10 @@ function callerMutationToDom(this: ProcedureCallBlock): Element {
  * @param xmlElement XML storage element.
  */
 function callerDomToMutation(this: ProcedureCallBlock, xmlElement: Element) {
-  this.procCode_ = xmlElement.getAttribute('proccode')!
-  this.generateShadows_ = JSON.parse(xmlElement.getAttribute('generateshadows')!)
-  this.argumentIds_ = JSON.parse(xmlElement.getAttribute('argumentids')!)
-  this.warp_ = JSON.parse(xmlElement.getAttribute('warp')!)
+  this.procCode_ = getRequiredMutationAttribute(xmlElement, 'proccode')
+  this.generateShadows_ = parseRequiredMutationJson(xmlElement, 'generateshadows', parseBooleanMutationValue)
+  this.argumentIds_ = parseRequiredMutationJson(xmlElement, 'argumentids', parseStringArrayMutationValue)
+  this.warp_ = parseRequiredMutationJson(xmlElement, 'warp', parseBooleanMutationValue)
   this.updateDisplay_()
 }
 
@@ -230,15 +310,15 @@ function definitionMutationToDom(
  * @param xmlElement XML storage element.
  */
 function definitionDomToMutation(this: ProcedurePrototypeBlock | ProcedureDeclarationBlock, xmlElement: Element) {
-  this.procCode_ = xmlElement.getAttribute('proccode')!
-  this.warp_ = JSON.parse(xmlElement.getAttribute('warp')!)
+  this.procCode_ = getRequiredMutationAttribute(xmlElement, 'proccode')
+  this.warp_ = parseRequiredMutationJson(xmlElement, 'warp', parseBooleanMutationValue)
 
   const prevArgIds = this.argumentIds_
   const prevDisplayNames = this.displayNames_
 
-  this.argumentIds_ = JSON.parse(xmlElement.getAttribute('argumentids')!)
-  this.displayNames_ = JSON.parse(xmlElement.getAttribute('argumentnames')!)
-  this.argumentDefaults_ = JSON.parse(xmlElement.getAttribute('argumentdefaults')!)
+  this.argumentIds_ = parseRequiredMutationJson(xmlElement, 'argumentids', parseStringArrayMutationValue)
+  this.displayNames_ = parseRequiredMutationJson(xmlElement, 'argumentnames', parseStringArrayMutationValue)
+  this.argumentDefaults_ = parseRequiredMutationJson(xmlElement, 'argumentdefaults', parseStringArrayMutationValue)
 
   // During full XML deserialization (Blockly.Xml.domToWorkspace), the mutation element
   // is part of the parsed XML tree and its parent element also contains <value> children
@@ -308,13 +388,11 @@ function disconnectOldBlocks_(this: ProcedureBlock): ConnectionMap {
   const connectionMap: ConnectionMap = {}
   for (const input of this.inputList) {
     if (input.connection) {
-      const target = input.connection.targetBlock() as Blockly.BlockSvg
-      const saveInfo = {
-        shadow: input.connection.getShadowDom(true)!,
-        block: target,
+      const target = input.connection.targetBlock()
+      connectionMap[input.name] = {
+        shadow: input.connection.getShadowDom(true) ?? undefined,
+        block: target as Blockly.BlockSvg | null,
       }
-      connectionMap[input.name] = saveInfo
-
       if (target) {
         input.connection.disconnect()
       }
@@ -349,16 +427,7 @@ function createAllInputs_(this: ProcedureBlock, connectionMap: ConnectionMap) {
   for (const component of procComponents) {
     let labelText
     if (component.startsWith('%')) {
-      const argumentType = component.substring(1, 2)
-      if (
-        !(
-          argumentType === ArgumentType.NUMBER ||
-          argumentType === ArgumentType.BOOLEAN ||
-          argumentType === ArgumentType.STRING
-        )
-      ) {
-        throw new Error('Found an custom procedure with an invalid type: ' + argumentType)
-      }
+      const argumentType = parseArgumentType(component.substring(1, 2))
       labelText = component.substring(2).trim()
 
       const id = this.argumentIds_[argumentCount]
@@ -386,19 +455,20 @@ function createAllInputs_(this: ProcedureBlock, connectionMap: ConnectionMap) {
  *     connected to those IDs at the beginning of the mutation.
  */
 function disposeObsoleteBlocks_(this: ProcedureBlock, connectionMap: ConnectionMap) {
-  for (const id in connectionMap) {
-    const saveInfo = connectionMap[id]
-    if (saveInfo) {
-      const block = saveInfo.block
-      const isOrphanedArgumentReporter =
-        this.type === 'procedures_prototype' &&
-        (block.type === 'argument_reporter_string_number' || block.type === 'argument_reporter_boolean')
-      if (block.isShadow() || isOrphanedArgumentReporter) {
-        block.dispose()
-        connectionMap[id] = null
-        // At this point we know which shadow DOMs are about to be orphaned in
-        // the VM.  What do we do with that information?
-      }
+  for (const [id, saveInfo] of Object.entries(connectionMap)) {
+    const block = saveInfo?.block
+    if (!block) {
+      continue
+    }
+
+    const isOrphanedArgumentReporter =
+      this.type === 'procedures_prototype' &&
+      (block.type === 'argument_reporter_string_number' || block.type === 'argument_reporter_boolean')
+    if (block.isShadow() || isOrphanedArgumentReporter) {
+      block.dispose()
+      connectionMap[id] = null
+      // At this point we know which shadow DOMs are about to be orphaned in
+      // the VM.  What do we do with that information?
     }
   }
 }
@@ -458,6 +528,9 @@ function buildShadowDom_(type: ArgumentType): Element {
  */
 function attachShadow_(this: ProcedureCallBlock, input: Blockly.Input, argumentType: ArgumentType) {
   if (argumentType === ArgumentType.NUMBER || argumentType === ArgumentType.STRING) {
+    if (!input.connection) {
+      throw new Error(`Expected input connection for argument ${String(argumentType)}`)
+    }
     const blockType = argumentType === ArgumentType.NUMBER ? 'math_number' : 'text'
     Blockly.Events.disable()
     let newBlock
@@ -479,7 +552,7 @@ function attachShadow_(this: ProcedureCallBlock, input: Blockly.Input, argumentT
     if (Blockly.Events.isEnabled()) {
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock))
     }
-    newBlock.outputConnection.connect(input.connection!)
+    newBlock.outputConnection.connect(input.connection)
   }
 }
 
@@ -516,7 +589,7 @@ function createArgumentReporter_(
     Blockly.Events.enable()
   }
   if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock))
+    void Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock))
   }
   return newBlock
 }
@@ -538,21 +611,25 @@ function populateArgumentOnCaller_(
   id: string,
   input: Blockly.Input,
 ) {
-  let oldBlock: Blockly.BlockSvg | undefined
+  let oldBlock: Blockly.BlockSvg | null | undefined
   let oldShadow: Element | undefined
-  if (connectionMap && id in connectionMap) {
+  if (id in connectionMap) {
     const saveInfo = connectionMap[id]
     oldBlock = saveInfo?.block
     oldShadow = saveInfo?.shadow
   }
 
-  if (connectionMap && oldBlock) {
+  const conn = input.connection
+  if (!conn) {
+    throw new Error(`Expected caller input connection for argument id ${id}`)
+  }
+  if (oldBlock) {
     // Reattach the old block and shadow DOM.
     connectionMap[input.name] = null
-    oldBlock.outputConnection.connect(input.connection!)
+    oldBlock.outputConnection.connect(conn)
     if (type !== ArgumentType.BOOLEAN && this.generateShadows_) {
-      const shadowDom = oldShadow || this.buildShadowDom_(type)
-      input.connection!.setShadowDom(shadowDom)
+      const shadowDom = oldShadow ?? this.buildShadowDom_(type)
+      conn.setShadowDom(shadowDom)
     }
   } else if (this.generateShadows_) {
     this.attachShadow_(input, type)
@@ -584,7 +661,12 @@ function populateArgumentOnPrototype_(
   }
 
   let oldBlock: Blockly.BlockSvg | null = null
-  if (connectionMap && id in connectionMap) {
+  const conn = input.connection
+  if (!conn) {
+    throw new Error(`Expected prototype input connection for argument id ${id}`)
+  }
+
+  if (id in connectionMap) {
     const saveInfo = connectionMap[id]
     oldBlock = saveInfo?.block ?? null
   }
@@ -594,7 +676,7 @@ function populateArgumentOnPrototype_(
 
   // Decide which block to attach.
   let argumentReporter: Blockly.BlockSvg
-  if (connectionMap && oldBlock && oldTypeMatches) {
+  if (oldBlock && oldTypeMatches) {
     // Update the text if needed. The old argument reporter is the same type,
     // and on the same input, but the argument's display name may have changed.
     argumentReporter = oldBlock
@@ -605,7 +687,7 @@ function populateArgumentOnPrototype_(
   }
 
   // Attach the block.
-  input.connection!.connect(argumentReporter.outputConnection)
+  conn.connect(argumentReporter.outputConnection)
 }
 
 /**
@@ -627,13 +709,17 @@ function populateArgumentOnDeclaration_(
   input: Blockly.Input,
 ) {
   let oldBlock: Blockly.BlockSvg | null = null
-  if (connectionMap && id in connectionMap) {
+  if (id in connectionMap) {
     const saveInfo = connectionMap[id]
     oldBlock = saveInfo?.block ?? null
   }
 
   const oldTypeMatches = checkOldEditorTypeMatches_(oldBlock, type)
   const displayName = this.displayNames_[index]
+  const conn = input.connection
+  if (!conn) {
+    throw new Error(`Expected declaration input connection for argument id ${id}`)
+  }
 
   // Decide which block to attach.
   let argumentEditor: Blockly.BlockSvg
@@ -646,7 +732,7 @@ function populateArgumentOnDeclaration_(
   }
 
   // Attach the block.
-  input.connection!.connect(argumentEditor.outputConnection)
+  conn.connect(argumentEditor.outputConnection)
 }
 
 /**
@@ -721,13 +807,13 @@ function createArgumentEditor_(
     newBlock.setShadow(true)
     if (!this.isInsertionMarker()) {
       newBlock.initSvg()
-      newBlock.queueRender()
+      void newBlock.queueRender()
     }
   } finally {
     Blockly.Events.enable()
   }
   if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock))
+    void Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock))
   }
   return newBlock
 }
@@ -749,8 +835,11 @@ function updateDeclarationProcCode_(this: ProcedureDeclarationBlock) {
       this.procCode_ += input.fieldRow[0].getValue()
     } else if (input.type === Blockly.inputs.inputTypes.VALUE) {
       // Inspect the argument editor.
-      const target = input.connection!.targetBlock()!
-      this.displayNames_.push(target.getFieldValue('TEXT'))
+      const target = input.connection?.targetBlock()
+      if (!target) {
+        throw new Error(`Expected argument editor block on input ${input.name}`)
+      }
+      this.displayNames_.push(String(target.getFieldValue('TEXT')))
       this.argumentIds_.push(input.name)
       if (target.type === 'argument_editor_boolean') {
         this.procCode_ += '%b'
@@ -758,7 +847,7 @@ function updateDeclarationProcCode_(this: ProcedureDeclarationBlock) {
         this.procCode_ += '%s'
       }
     } else {
-      throw new Error('Unexpected input type on a procedure mutator root: ' + input.type)
+      throw new Error(`Unexpected input type on a procedure mutator root: ${String(input.type)}`)
     }
   }
 }
@@ -773,8 +862,15 @@ function focusLastEditor_(this: ProcedureDeclarationBlock) {
       newInput.fieldRow[0].showEditor()
     } else if (newInput.type === Blockly.inputs.inputTypes.VALUE) {
       // Inspect the argument editor.
-      const target = newInput.connection!.targetBlock()!
-      target.getField('TEXT')!.showEditor()
+      const target = newInput.connection?.targetBlock()
+      if (!target) {
+        throw new Error(`Expected argument editor block on input ${newInput.name}`)
+      }
+      const field = target.getField('TEXT')
+      if (!field) {
+        throw new Error(`Expected TEXT field on argument editor block ${target.id}`)
+      }
+      field.showEditor()
     }
   }
 }
@@ -843,16 +939,15 @@ function removeFieldCallback(this: ProcedureDeclarationBlock, field: Blockly.Fie
     return
   }
   let inputNameToRemove = null
-  for (let n = 0; n < this.inputList.length; n++) {
-    const input = this.inputList[n]
+  for (const input of this.inputList) {
     if (input.connection) {
-      const target = input.connection.targetBlock()!
-      if (field.name && target.getField(field.name) === field) {
+      const target = input.connection.targetBlock()
+      if (target && field.name && target.getField(field.name) === field) {
         inputNameToRemove = input.name
       }
     } else {
-      for (let j = 0; j < input.fieldRow.length; j++) {
-        if (input.fieldRow[j] === field) {
+      for (const inputField of input.fieldRow) {
+        if (inputField === field) {
           inputNameToRemove = input.name
         }
       }
@@ -875,9 +970,7 @@ function removeArgumentCallback_(
   field: Blockly.Field,
 ) {
   const parent = this.getParent()
-  if (parent && parent.removeFieldCallback) {
-    parent.removeFieldCallback(field)
-  }
+  ;(parent as ProcedureDeclarationBlock | null)?.removeFieldCallback(field)
 }
 
 /**

package/src/blocks/sensing.ts

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import * as Blockly from 'blockly/core'
-import * as Constants from '../constants'
 
 Blockly.Blocks.sensing_touchingobject = {
   /**