Move upgrade details of mrc_class_method into the block

Author: alan412

src/blocks/mrc_class_method_def.ts

@@ -39,7 +39,7 @@ export const BLOCK_NAME = 'mrc_class_method_def';
 
 export const FIELD_METHOD_NAME = 'NAME';
 
-export type Parameter = {
+type Parameter = {
     name: string,
     type?: string,
 };
@@ -322,6 +322,14 @@ const CLASS_METHOD_DEF = {
             this.mrcMethodId = oldIdToNewId[this.mrcMethodId];
         }
     },
+    upgrade_002_to_003: function(this: ClassMethodDefBlock) {
+        if (this.getFieldValue('NAME') === 'init') {
+            // Remove robot parameter from init method
+            const methodBlock = this as ClassMethodDefBlock;
+            let filteredParams: Parameter[] = methodBlock.mrcParameters.filter(param => param.name !== 'robot');
+            methodBlock.mrcParameters = filteredParams;
+        }
+    },
 };
 
 /**

src/storage/upgrade_project.ts

@@ -28,7 +28,7 @@ import * as storageModule from './module';
 import * as storageModuleContent from './module_content';
 import * as storageNames from './names';
 import * as storageProject from './project';
-import { ClassMethodDefBlock, Parameter, BLOCK_NAME as MRC_CLASS_METHOD_DEF_BLOCK_NAME } from '../blocks/mrc_class_method_def';
+import { ClassMethodDefBlock, BLOCK_NAME as MRC_CLASS_METHOD_DEF_BLOCK_NAME } from '../blocks/mrc_class_method_def';
 
 export const NO_VERSION = '0.0.0';
 export const CURRENT_VERSION = '0.0.3';
@@ -121,17 +121,10 @@ async function upgradeFrom_002_to_003(
       try {
         Blockly.serialization.workspaces.load(blocks, headlessWorkspace);
 
-        // Find and modify init method blocks to remove robot parameter
-        const allBlocks = headlessWorkspace.getAllBlocks();
-        for (const block of allBlocks) {
-          if (block.type === MRC_CLASS_METHOD_DEF_BLOCK_NAME &&
-            block.getFieldValue('NAME') === 'init') {
-            // Remove robot parameter from init method
-            const methodBlock = block as ClassMethodDefBlock;
-            let filteredParams: Parameter[] = methodBlock.mrcParameters.filter(param => param.name !== 'robot');
-            methodBlock.mrcParameters = filteredParams;
-          }
-        }
+        // Method blocks need to be upgraded
+        headlessWorkspace.getBlocksByType(MRC_CLASS_METHOD_DEF_BLOCK_NAME, false).forEach(block => {
+          (block as ClassMethodDefBlock).upgrade_002_to_003();
+        });
         blocks = Blockly.serialization.workspaces.save(headlessWorkspace);
       } finally {
         headlessWorkspace.dispose();