In mrc_class_method_def.ts:

Added constants for NO_RETURN_VALUE and UNTYPED_RETURN_VALUE.
Added upgrade_004_to_005 to change mrcReturnType from 'Any' to UNTYPED_RETURN_VALUE.
Changed createCustomMethodBlockWithReturn to use UNTYPED_RETURN_VALUE instead of 'Any'.

In upgrade_project.ts:
Incremented CURRENT_VERSION to 0.0.5.
Changed switch statement in upgradeProjectIfNecessary to have the default case at the top.
All other cases have @ts-ignore and blank lines so it is more clear that the @ts-ignore goes with the case after it.
Added upgradeBlocksFiles function that can be called from other upgradeFrom_..._to_... functions.
Added upgradeFrom_004_to_005.

Author: lizlooney

src/blocks/mrc_class_method_def.ts

@@ -37,6 +37,9 @@ import * as paramContainer from './mrc_param_container'
 
 export const BLOCK_NAME = 'mrc_class_method_def';
 
+const NO_RETURN_VALUE = 'None';
+const UNTYPED_RETURN_VALUE = '';
+
 const INPUT_TITLE = 'TITLE';
 export const FIELD_METHOD_NAME = 'NAME';
 const FIELD_PARAM_PREFIX = 'PARAM_';
@@ -82,8 +85,8 @@ type ClassMethodDefExtraState = {
   canBeCalledOutsideClass: boolean,
   /**
    * The return type of the function.
-   * Use 'None' for no return value.
-   * Use '' for an untyped return value.
+   * Use NO_RETURN_VALUE for no return value.
+   * Use UNTYPED_RETURN_VALUE for an untyped return value.
    */
   returnType: string,
   /**
@@ -252,8 +255,8 @@ const CLASS_METHOD_DEF = {
       this.removeInput(INPUT_RETURN);
     }
 
-    // Add return input if return type is not 'None'
-    if (this.mrcReturnType && this.mrcReturnType !== 'None') {
+    // Add return input if return type is not NO_RETURN_VALUE
+    if (this.mrcReturnType !== undefined && this.mrcReturnType !== NO_RETURN_VALUE) {
       this.appendValueInput(INPUT_RETURN)
           .setAlign(Blockly.inputs.Align.RIGHT)
           .appendField(Blockly.Msg.PROCEDURES_DEFRETURN_RETURN);
@@ -348,6 +351,11 @@ const CLASS_METHOD_DEF = {
       methodBlock.mrcParameters = filteredParams;
     }
   },
+  upgrade_004_to_005: function(this: ClassMethodDefBlock) {
+    if (this.mrcReturnType === 'Any') {
+      this.mrcReturnType = UNTYPED_RETURN_VALUE;
+    }
+  },
 };
 
 /**
@@ -508,7 +516,7 @@ export function createCustomMethodBlock(): toolboxItems.Block {
     canChangeSignature: true,
     canBeCalledWithinClass: true,
     canBeCalledOutsideClass: true,
-    returnType: 'None',
+    returnType: NO_RETURN_VALUE,
     params: [],
   };
   const fields: {[key: string]: any} = {};
@@ -521,7 +529,7 @@ export function createCustomMethodBlockWithReturn(): toolboxItems.Block {
       canChangeSignature: true,
       canBeCalledWithinClass: true,
       canBeCalledOutsideClass: true,
-      returnType: 'Any',
+      returnType: UNTYPED_RETURN_VALUE,
       params: [],
   };
   const fields: {[key: string]: any} = {};
@@ -609,3 +617,17 @@ export function getMethodNamesAlreadyOverriddenInWorkspace(
     }
   });
 }
+
+/**
+ * Upgrades the ClassMethodDefBlocks in the given workspace from version 004 to 005.
+ * This function should only be called when upgrading old projects.
+ */
+export function upgrade_004_to_005(workspace: Blockly.Workspace): void {
+  // Make sure the workspace is headless.
+  if (workspace.rendered) {
+    throw new Error('upgrade_004_to_005 should never be called with a rendered workspace.');
+  }
+  workspace.getBlocksByType(BLOCK_NAME).forEach(block => {
+    (block as ClassMethodDefBlock).upgrade_004_to_005();
+  });
+}

src/storage/upgrade_project.ts

@@ -28,39 +28,83 @@ import * as storageModule from './module';
 import * as storageModuleContent from './module_content';
 import * as storageNames from './names';
 import * as storageProject from './project';
-import { ClassMethodDefBlock, 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, upgrade_004_to_005 } from '../blocks/mrc_class_method_def';
 import * as workspaces from '../blocks/utils/workspaces';
 
 export const NO_VERSION = '0.0.0';
-export const CURRENT_VERSION = '0.0.4';
+export const CURRENT_VERSION = '0.0.5';
 
 export async function upgradeProjectIfNecessary(
     storage: commonStorage.Storage, projectName: string): Promise<void> {
   const projectInfo = await storageProject.fetchProjectInfo(storage, projectName);
   if (semver.lt(projectInfo.version, CURRENT_VERSION)) {
     switch (projectInfo.version) {
+      default:
+        throw new Error('Unrecognized project version: ' + projectInfo.version);
+
+      // Intentional fallthrough after case '0.0.0'
       // @ts-ignore
       case '0.0.0':
         upgradeFrom_000_to_001(storage, projectName, projectInfo)
-      // Intentional fallthrough
+
+      // Intentional fallthrough after case '0.0.1'
       // @ts-ignore
       case '0.0.1':
         upgradeFrom_001_to_002(storage, projectName, projectInfo);
-      // Intentional fallthrough
+
+      // Intentional fallthrough after case '0.0.2'
       // @ts-ignore
       case '0.0.2':
-        upgradeFrom_002_to_003(storage, projectName, projectInfo);   
+        upgradeFrom_002_to_003(storage, projectName, projectInfo);
+
+      // Intentional fallthrough after case '0.0.3'
+      // @ts-ignore
       case '0.0.3':
         upgradeFrom_003_to_004(storage, projectName, projectInfo);
-        break;
-      default:
-        throw new Error('Unrecognized project version: ' + projectInfo.version);
 
+      // Intentional fallthrough after case '0.0.4'
+      // @ts-ignore
+      case '0.0.4':
+        upgradeFrom_004_to_005(storage, projectName, projectInfo);
     }
     await storageProject.saveProjectInfo(storage, projectName);
   }
 }
 
+async function upgradeBlocksFiles(
+    storage: commonStorage.Storage,
+    projectName: string,
+    upgradeFunc: (w: Blockly.Workspace) => void
+): Promise<void> {
+  const projectFileNames: string[] = await storage.list(
+    storageNames.makeProjectDirectoryPath(projectName));
+  for (const projectFileName of projectFileNames) {
+    const modulePath = storageNames.makeFilePath(projectName, projectFileName);
+    const moduleType = storageNames.getModuleType(modulePath);
+
+    let moduleContentText = await storage.fetchFileContentText(modulePath);
+    const moduleContent = storageModuleContent.parseModuleContentText(moduleContentText);
+    let blocks = moduleContent.getBlocks();
+
+    // Create a temporary workspace to upgrade the blocks.
+    const headlessWorkspace = workspaces.createHeadlessWorkspace(moduleType);
+
+    try {
+      Blockly.serialization.workspaces.load(blocks, headlessWorkspace);
+
+      upgradeFunc(headlessWorkspace);
+
+      blocks = Blockly.serialization.workspaces.save(headlessWorkspace);
+    } finally {
+      workspaces.destroyHeadlessWorkspace(headlessWorkspace);
+    }
+
+    moduleContent.setBlocks(blocks);
+    moduleContentText = moduleContent.getModuleContentText();
+    await storage.saveFile(modulePath, moduleContentText);
+  }
+}
+
 async function upgradeFrom_000_to_001(
     _storage: commonStorage.Storage,
     _projectName: string,
@@ -157,3 +201,12 @@ async function upgradeFrom_003_to_004(
   // from loading a project with an older version of software.
   projectInfo.version = '0.0.4';
 }
+
+async function upgradeFrom_004_to_005(
+    storage: commonStorage.Storage,
+    projectName: string,
+    projectInfo: storageProject.ProjectInfo): Promise<void> {
+  // mrc_class_method_def blocks that return a value need to have returnType changed from 'Any' to ''.
+  await upgradeBlocksFiles(storage, projectName, upgrade_004_to_005);
+  projectInfo.version = '0.0.5';
+}