Added constants for INPUT_CONDITION_PREFIX and INPUT_STEP_PREFIX.

Author: lizlooney

src/blocks/mrc_steps.ts

@@ -32,6 +32,9 @@ import * as toolboxItems from '../toolbox/items';
 
 export const BLOCK_NAME = 'mrc_steps';
 
+const INPUT_CONDITION_PREFIX = 'CONDITION_';
+const INPUT_STEP_PREFIX = 'STEP_';
+
 /** Extra state for serialising mrc_steps blocks. */
 type StepsExtraState = {
   /**
@@ -151,8 +154,8 @@ const STEPS = {
     // Build a map of step names to their current input indices
     const currentStepMap: { [stepName: string]: number } = {};
     let i = 0;
-    while (this.getInput('CONDITION_' + i)) {
-      const conditionInput = this.getInput('CONDITION_' + i);
+    while (this.getInput(INPUT_CONDITION_PREFIX + i)) {
+      const conditionInput = this.getInput(INPUT_CONDITION_PREFIX + i);
       const field = conditionInput?.fieldRow[0];
       if (field) {
         currentStepMap[field.getValue()] = i;
@@ -167,8 +170,8 @@ const STEPS = {
 
       if (currentIndex !== undefined && currentIndex !== j) {
         // Step exists but is at wrong position - move it
-        const conditionConnection = this.getInput('CONDITION_' + currentIndex)?.connection?.targetConnection;
-        const stepConnection = this.getInput('STEP_' + currentIndex)?.connection?.targetConnection;
+        const conditionConnection = this.getInput(INPUT_CONDITION_PREFIX + currentIndex)?.connection?.targetConnection;
+        const stepConnection = this.getInput(INPUT_STEP_PREFIX + currentIndex)?.connection?.targetConnection;
 
         // Temporarily disconnect
         if (conditionConnection) {
@@ -179,31 +182,31 @@ const STEPS = {
         }
 
         // Remove old inputs
-        this.removeInput('CONDITION_' + currentIndex, false);
-        this.removeInput('STEP_' + currentIndex, false);
+        this.removeInput(INPUT_CONDITION_PREFIX + currentIndex, false);
+        this.removeInput(INPUT_STEP_PREFIX + currentIndex, false);
 
         // Create new inputs at correct position
         const fieldFlydown = createStepFieldFlydown(stepName, true);
         fieldFlydown.setValidator(this.mrcUpdateStepName.bind(this, j));
 
-        this.appendValueInput('CONDITION_' + j)
+        this.appendValueInput(INPUT_CONDITION_PREFIX + j)
           .appendField(fieldFlydown)
           .setCheck('Boolean')
           .appendField(Blockly.Msg.REPEAT_UNTIL);
-        this.appendStatementInput('STEP_' + j);
+        this.appendStatementInput(INPUT_STEP_PREFIX + j);
 
         // Reconnect
         if (conditionConnection) {
-          this.getInput('CONDITION_' + j)?.connection?.connect(conditionConnection);
+          this.getInput(INPUT_CONDITION_PREFIX + j)?.connection?.connect(conditionConnection);
         }
         if (stepConnection) {
-          this.getInput('STEP_' + j)?.connection?.connect(stepConnection);
+          this.getInput(INPUT_STEP_PREFIX + j)?.connection?.connect(stepConnection);
         }
 
         delete currentStepMap[stepName];
       } else if (currentIndex !== undefined) {
         // Step is at correct position - just update the field
-        const conditionInput = this.getInput('CONDITION_' + j);
+        const conditionInput = this.getInput(INPUT_CONDITION_PREFIX + j);
         const field = conditionInput?.fieldRow[0];
         if (field && field.getValue() !== stepName) {
           field.setValue(stepName);
@@ -214,11 +217,11 @@ const STEPS = {
         const fieldFlydown = createStepFieldFlydown(stepName, true);
         fieldFlydown.setValidator(this.mrcUpdateStepName.bind(this, j));
 
-        const conditionInput = this.appendValueInput('CONDITION_' + j)
+        const conditionInput = this.appendValueInput(INPUT_CONDITION_PREFIX + j)
           .appendField(fieldFlydown)
           .setCheck('Boolean')
           .appendField(Blockly.Msg.REPEAT_UNTIL);
-        this.appendStatementInput('STEP_' + j);
+        this.appendStatementInput(INPUT_STEP_PREFIX + j);
 
         // Add shadow True block to the new condition input
         if (this.workspace) {
@@ -237,8 +240,8 @@ const STEPS = {
     // Remove any leftover inputs (steps that were deleted)
     for (const stepName in currentStepMap) {
       const index = currentStepMap[stepName];
-      this.removeInput('CONDITION_' + index, false);
-      this.removeInput('STEP_' + index, false);
+      this.removeInput(INPUT_CONDITION_PREFIX + index, false);
+      this.removeInput(INPUT_STEP_PREFIX + index, false);
     }
   },
   mrcGetStepNames: function (this: StepsBlock): string[] {
@@ -270,11 +273,11 @@ export const pythonFromBlock = function (
   code += generator.INDENT + 'match self._current_step:\n';
   block.mrcStepNames.forEach((stepName, index) => {
     code += generator.INDENT.repeat(2) + `case "${stepName}":\n`;
-    let stepCode = generator.statementToCode(block, 'STEP_' + index);
+    let stepCode = generator.statementToCode(block, INPUT_STEP_PREFIX + index);
     if (stepCode !== '') {
       code += generator.prefixLines(stepCode, generator.INDENT.repeat(2));
     }
-    let conditionCode = generator.valueToCode(block, 'CONDITION_' + index, Order.NONE) || 'False';
+    let conditionCode = generator.valueToCode(block, INPUT_CONDITION_PREFIX + index, Order.NONE) || 'False';
     code += generator.INDENT.repeat(3) + 'if ' + conditionCode + ':\n';
     if (index === block.mrcStepNames.length - 1) {
       code += generator.INDENT.repeat(4) + 'self._current_step = None\n';
@@ -294,6 +297,6 @@ export function createStepsBlock(): toolboxItems.Block {
   };
   const fields: {[key: string]: any} = {};
   const inputs: {[key: string]: any} = {};
-  inputs['CONDITION_' + 0] = value.createBooleanShadowValue(true);
+  inputs[INPUT_CONDITION_PREFIX + 0] = value.createBooleanShadowValue(true);
   return new toolboxItems.Block(BLOCK_NAME, extraState, fields, inputs);
 }