Merge pull request code-dot-org#24791 from code-dot-org/rescue-from-codegen-errors

Defend against null inputConfig when generating code for a block

Author: Josh Lory

apps/src/block_utils.js

@@ -878,6 +878,9 @@ exports.createJsWrapperBlockCreator = function (
       let prefix = '';
       const values = args.map(arg => {
         const inputConfig = inputConfigs.find(input => input.name === arg.name);
+        if (!inputConfig) {
+          return;
+        }
         let inputCode = inputTypes[inputConfig.mode].generateCode(this, inputConfig);
         if (inputConfig.assignment) {
           prefix += `${inputCode} = `;

apps/test/unit/blockUtilsTest.js

@@ -11,6 +11,7 @@ import {
 import { parseElement, serialize } from '@cdo/apps/xml.js';
 import { expect } from '../util/configuredChai';
 import sinon from 'sinon';
+import { allowConsoleWarnings } from '../util/testUtils';
 
 describe('block utils', () => {
   describe('cleanBlocks', () => {
@@ -955,6 +956,7 @@ describe('block utils', () => {
       });
     });
     describe('custom inputs', () => {
+      allowConsoleWarnings();
       it('generates code for a statement input', () => {
         createBlock({
           func: 'runThisCallback',
@@ -1061,6 +1063,17 @@ describe('block utils', () => {
         expect(code.trim()).to.equal(
           'processAnotherStringValue("some input with a \\"quote\\" in it");');
       });
+      it('does not throw when there are extra args', () => {
+        createBlock({
+          name: 'extraArgsTest',
+          expression: 'extraArgsTest;',
+          blockText: 'run this program in strict mode',
+          args: [{name: 'EXTRA'}],
+        }, '', 'test');
+        const code = generator['test_extraArgsTest']();
+
+        expect(code.trim()).to.equal('extraArgsTest;');
+      });
     });
   });
 });