In mrc_mechanism_component_holder.ts:

Renamed function hidePrivateComponents to upgrade_001_to_002 and added code to check that the module type is ROBOT.

In module_content.ts:
Renamed addPrivateComponents to preupgrade_001_to_002.

In upgrade_project.ts:
Updated upgradeFrom_001_to_002.

Author: lizlooney

src/blocks/mrc_mechanism_component_holder.ts

@@ -36,6 +36,7 @@ import { ComponentBlock } from './mrc_component';
 import { BLOCK_NAME as  MRC_EVENT_NAME } from './mrc_event';
 import { OUTPUT_NAME as EVENT_OUTPUT } from './mrc_event';
 import { EventBlock } from './mrc_event';
+import { getModuleTypeForWorkspace } from './utils/workspaces';
 
 export const BLOCK_NAME = 'mrc_mechanism_component_holder';
 
@@ -520,13 +521,18 @@ export function mrcDescendantsMayHaveChanged(workspace: Blockly.Workspace): void
 }
 
 /**
- * Hide private components.
+ * Upgrades the MechanismComponentHolderBlock in the given workspace from version 001 to 002 by
+ * setting mrcHidePrivateComponents to true.
  * This function should only be called when upgrading old projects.
  */
-export function hidePrivateComponents(workspace: Blockly.Workspace) {
+export function upgrade_001_to_002(workspace: Blockly.Workspace) {
   // Make sure the workspace is headless.
   if (workspace.rendered) {
-    throw new Error('hidePrivateComponents should never be called with a rendered workspace.');
+    throw new Error('upgrade_001_to_002 should never be called with a rendered workspace.');
+  }
+  // Make sure the module type is ROBOT.
+  if (getModuleTypeForWorkspace(workspace) !== storageModule.ModuleType.ROBOT) {
+    throw new Error('upgrade_001_to_002 should only be called for a robot module.');
   }
   workspace.getBlocksByType(BLOCK_NAME).forEach(block => {
     (block as MechanismComponentHolderBlock).mrcHidePrivateComponents = true;

src/storage/module_content.ts

@@ -270,10 +270,10 @@ export class ModuleContent {
 }
 
 /**
- * Add privateComponents field.
- * This function should only called when upgrading old projects.
+ * Preupgrades the module content text by adding the privateComponents field.
+ * This function should only be called when upgrading old projects.
  */
-export function addPrivateComponents(moduleContentText: string): string {
+export function preupgrade_001_to_002(moduleContentText: string): string {
   const parsedContent = JSON.parse(moduleContentText);
   if (!('privateComponents' in parsedContent)) {
     parsedContent.privateComponents = [];

src/storage/upgrade_project.ts

@@ -22,12 +22,12 @@
 import * as semver from 'semver';
 import * as Blockly from 'blockly/core';
 
-import * as mechanismComponentHolder from '../blocks/mrc_mechanism_component_holder';
 import * as commonStorage from './common_storage';
 import * as storageModule from './module';
 import * as storageModuleContent from './module_content';
 import * as storageNames from './names';
 import * as storageProject from './project';
+import { upgrade_001_to_002 } from '../blocks/mrc_mechanism_component_holder';
 import { upgrade_002_to_003, upgrade_004_to_005 } from '../blocks/mrc_class_method_def';
 import * as workspaces from '../blocks/utils/workspaces';
 
@@ -172,8 +172,8 @@ async function upgradeFrom_001_to_002(
   // The Robot's mrc_mechanism_component_holder block was saved without hidePrivateComponents.
   await upgradeBlocksFiles(
       storage, projectName,
-      anyModuleType, storageModuleContent.addPrivateComponents,
-      isRobot, mechanismComponentHolder.hidePrivateComponents);
+      anyModuleType, storageModuleContent.preupgrade_001_to_002,
+      isRobot, upgrade_001_to_002);
   projectInfo.version = '0.0.2';
 }