Store modules with double extension: .robot.json, .mechanism.json, .opmode.json.

src/blocks/mrc_call_python_function.ts

@@ -553,7 +553,7 @@ const CALL_PYTHON_FUNCTION = {
       let foundComponent = false;
       const componentsInScope: storageModuleContent.Component[] = [];
       componentsInScope.push(...this.getComponentsFromRobot());
-      if (editor.getCurrentModuleType() === storageModule.MODULE_TYPE_MECHANISM) {
+      if (editor.getCurrentModuleType() === storageModule.ModuleType.MECHANISM) {
         componentsInScope.push(...editor.getComponentsFromWorkspace());
       }
       for (const component of componentsInScope) {
@@ -600,7 +600,7 @@ const CALL_PYTHON_FUNCTION = {
     // If the robot method has changed, update the block if possible or put a
     // visible warning on it.
     if (this.mrcFunctionKind === FunctionKind.INSTANCE_ROBOT) {
-      if (editor.getCurrentModuleType() === storageModule.MODULE_TYPE_MECHANISM) {
+      if (editor.getCurrentModuleType() === storageModule.ModuleType.MECHANISM) {
         warnings.push('This block is not allowed to be used inside a mechanism.');
       } else {
         let foundRobotMethod = false;
@@ -646,7 +646,7 @@ const CALL_PYTHON_FUNCTION = {
     // If the method has changed, update the block if possible or put a
     // visible warning on it.
     if (this.mrcFunctionKind === FunctionKind.INSTANCE_MECHANISM) {
-      if (editor.getCurrentModuleType() === storageModule.MODULE_TYPE_MECHANISM) {
+      if (editor.getCurrentModuleType() === storageModule.ModuleType.MECHANISM) {
         warnings.push('This block is not allowed to be used inside a mechanism.');
       } else {
         let foundMechanism = false;
@@ -805,11 +805,11 @@ export function pythonFromBlock(
           : block.getFieldValue(FIELD_FUNCTION_NAME);
       // Generate the correct code depending on the module type.
       switch (generator.getModuleType()) {
-        case storageModule.MODULE_TYPE_ROBOT:
-        case storageModule.MODULE_TYPE_MECHANISM:
+        case storageModule.ModuleType.ROBOT:
+        case storageModule.ModuleType.MECHANISM:
           code = 'self.';
           break;
-        case storageModule.MODULE_TYPE_OPMODE:
+        case storageModule.ModuleType.OPMODE:
           code = 'self.robot.';
           break;
       }
@@ -830,13 +830,13 @@ export function pythonFromBlock(
           : block.getFieldValue(FIELD_FUNCTION_NAME);
       // Generate the correct code depending on the module type.
       switch (generator.getModuleType()) {
-        case storageModule.MODULE_TYPE_ROBOT:
+        case storageModule.ModuleType.ROBOT:
           code = 'self.' + mechanismName;
           break;
-        case storageModule.MODULE_TYPE_OPMODE:
+        case storageModule.ModuleType.OPMODE:
           code = 'self.robot.' + mechanismName;
           break;
-        case storageModule.MODULE_TYPE_MECHANISM:
+        case storageModule.ModuleType.MECHANISM:
           // The INSTANCE_MECHANISM version should not be used in a mechanism.
           // TODO(lizlooney): What if the user copies a block from an robot or opmode and pastes
           // it into a mechanism?

src/blocks/mrc_class_method_def.ts

@@ -422,7 +422,7 @@ export const pythonFromBlock = function (
         // After executing the function body, revisit this block for the return.
         xfix2 = xfix1;
     }
-    if (block.mrcPythonMethodName == '__init__') {
+    if (block.mrcPythonMethodName === '__init__') {
         let class_specific = generator.getClassSpecificForInit();
         branch = generator.INDENT + 'super().__init__(' + class_specific + ')\n' +
             generator.generateInitStatements() + branch;
@@ -440,7 +440,7 @@ export const pythonFromBlock = function (
 
     let params = block.mrcParameters;
     let paramString = "self";
-    if (generator.getModuleType() == storageModule.MODULE_TYPE_MECHANISM && block.mrcPythonMethodName == '__init__') {
+    if (generator.getModuleType() === storageModule.ModuleType.MECHANISM && block.mrcPythonMethodName === '__init__') {
         const ports: string[] = generator.getComponentPortParameters();
         if (ports.length) {
             paramString += ', ' + ports.join(', ');

src/blocks/mrc_component.ts

@@ -130,7 +130,7 @@ const COMPONENT = {
    */
   updateBlock_: function (this: ComponentBlock): void {
     const editor = Editor.getEditorForBlocklyWorkspace(this.workspace);
-    if (editor && editor.getCurrentModuleType() === storageModule.MODULE_TYPE_ROBOT) {
+    if (editor && editor.getCurrentModuleType() === storageModule.ModuleType.ROBOT) {
       // Add input sockets for the arguments.
       for (let i = 0; i < this.mrcArgs.length; i++) {
         const input = this.appendValueInput('ARG' + i)
@@ -207,7 +207,7 @@ export const pythonFromBlock = function (
     if (i != 0) {
       code += ', ';
     }
-    if (generator.getModuleType() === storageModule.MODULE_TYPE_ROBOT) {
+    if (generator.getModuleType() === storageModule.ModuleType.ROBOT) {
       code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, 'ARG' + i, Order.NONE);
     } else {
       code += block.mrcArgs[i].name + ' = ' + block.getArgName(i);
@@ -217,7 +217,8 @@ export const pythonFromBlock = function (
   return code;
 }
 
-export function getAllPossibleComponents(moduleType: string): toolboxItems.ContentsType[] {
+export function getAllPossibleComponents(
+    moduleType: storageModule.ModuleType): toolboxItems.ContentsType[] {
   const contents: toolboxItems.ContentsType[] = [];
   // Iterate through all the components subclasses and add definition blocks.
   const componentTypes = getSubclassNames('component.Component');
@@ -244,7 +245,10 @@ export function getAllPossibleComponents(moduleType: string): toolboxItems.Conte
 }
 
 function createComponentBlock(
-    componentName: string, classData: ClassData, staticFunctionData: FunctionData, moduleType: string): toolboxItems.Block {
+    componentName: string,
+    classData: ClassData,
+    staticFunctionData: FunctionData,
+    moduleType: storageModule.ModuleType): toolboxItems.Block {
   const extraState: ComponentExtraState = {
     importModule: classData.moduleName,
     staticFunctionName: staticFunctionData.functionName,
@@ -260,7 +264,7 @@ function createComponentBlock(
       'name': argData.name,
       'type': argData.type,
     });
-    if (moduleType == storageModule.MODULE_TYPE_ROBOT) {
+    if (moduleType == storageModule.ModuleType.ROBOT) {
       if (argData.type === 'int') {
         const portType = getPortTypeForArgument(argData.name);
         if (portType) {

src/blocks/mrc_event_handler.ts

@@ -393,10 +393,10 @@ function generateRegisterEventHandler(
     fullSender = 'self.' + sender;
   } else if (block.mrcSenderType === SenderType.MECHANISM) {
     switch (generator.getModuleType()) {
-      case storageModule.MODULE_TYPE_ROBOT:
+      case storageModule.ModuleType.ROBOT:
         fullSender = 'self.' + sender;
         break;
-      case storageModule.MODULE_TYPE_OPMODE:
+      case storageModule.ModuleType.OPMODE:
         fullSender = 'self.robot.' + sender;
         break;
     }

src/blocks/mrc_mechanism_component_holder.ts

@@ -254,10 +254,10 @@ export const pythonFromBlock = function (
     block: MechanismComponentHolderBlock,
     generator: ExtendedPythonGenerator) {
   switch (generator.getModuleType()) {
-    case storageModule.MODULE_TYPE_ROBOT:
+    case storageModule.ModuleType.ROBOT:
       pythonFromBlockInRobot(block, generator);
       break;
-    case storageModule.MODULE_TYPE_MECHANISM:
+    case storageModule.ModuleType.MECHANISM:
       pythonFromBlockInMechanism(block, generator);
       break;
   }

src/editor/editor.ts

@@ -227,11 +227,11 @@ export class Editor {
     return this.blocklyWorkspace;
   }
 
-  public getCurrentModuleType(): string {
+  public getCurrentModuleType(): storageModule.ModuleType | null {
     if (this.currentModule) {
       return this.currentModule.moduleType;
     }
-    return storageModule.MODULE_TYPE_UNKNOWN;
+    return null;
   }
 
   private getModuleContentText(): string {
@@ -248,8 +248,8 @@ export class Editor {
     const components: storageModuleContent.Component[] = this.getComponentsFromWorkspace();
     const events: storageModuleContent.Event[] = this.getEventsFromWorkspace();
     const methods: storageModuleContent.Method[] = (
-        this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT ||
-        this.currentModule?.moduleType === storageModule.MODULE_TYPE_MECHANISM)
+        this.currentModule?.moduleType === storageModule.ModuleType.ROBOT ||
+        this.currentModule?.moduleType === storageModule.ModuleType.MECHANISM)
         ? this.getMethodsForOutsideFromWorkspace()
         : [];
     return storageModuleContent.makeModuleContentText(
@@ -258,16 +258,16 @@ export class Editor {
 
   public getMechanismsFromWorkspace(): storageModuleContent.MechanismInRobot[] {
     const mechanisms: storageModuleContent.MechanismInRobot[] = [];
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT) {
       mechanismComponentHolder.getMechanisms(this.blocklyWorkspace, mechanisms);
     }
     return mechanisms;
   }
 
   public getComponentsFromWorkspace(): storageModuleContent.Component[] {
     const components: storageModuleContent.Component[] = [];
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT ||
-        this.currentModule?.moduleType === storageModule.MODULE_TYPE_MECHANISM) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT ||
+        this.currentModule?.moduleType === storageModule.ModuleType.MECHANISM) {
       mechanismComponentHolder.getComponents(this.blocklyWorkspace, components);
     }
     return components;
@@ -294,8 +294,8 @@ export class Editor {
 
   public getEventsFromWorkspace(): storageModuleContent.Event[] {
     const events: storageModuleContent.Event[] = [];
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT ||
-        this.currentModule?.moduleType === storageModule.MODULE_TYPE_MECHANISM) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT ||
+        this.currentModule?.moduleType === storageModule.ModuleType.MECHANISM) {
       mechanismComponentHolder.getEvents(this.blocklyWorkspace, events);
     }
     return events;
@@ -329,7 +329,7 @@ export class Editor {
    * Returns the mechanisms defined in the robot.
    */
   public getMechanismsFromRobot(): storageModuleContent.MechanismInRobot[] {
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT) {
       return this.getMechanismsFromWorkspace();
     }
     if (this.robotContent) {
@@ -342,7 +342,7 @@ export class Editor {
    * Returns the components defined in the robot.
    */
   public getComponentsFromRobot(): storageModuleContent.Component[] {
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT) {
       return this.getComponentsFromWorkspace();
     }
     if (this.robotContent) {
@@ -355,7 +355,7 @@ export class Editor {
    * Returns the events defined in the robot.
    */
   public getEventsFromRobot(): storageModuleContent.Event[] {
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT) {
       return this.getEventsFromWorkspace();
     }
     if (this.robotContent) {
@@ -368,7 +368,7 @@ export class Editor {
    * Returns the methods defined in the robot.
    */
   public getMethodsFromRobot(): storageModuleContent.Method[] {
-    if (this.currentModule?.moduleType === storageModule.MODULE_TYPE_ROBOT) {
+    if (this.currentModule?.moduleType === storageModule.ModuleType.ROBOT) {
       return this.getMethodsForWithinFromWorkspace();
     }
     if (this.robotContent) {

src/editor/extended_python_generator.ts

@@ -111,7 +111,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
   generateInitStatements() : string {
     let initStatements = '';
 
-    if (this.getModuleType() === storageModule.MODULE_TYPE_MECHANISM && this.hasAnyComponents) {
+    if (this.getModuleType() === storageModule.ModuleType.MECHANISM && this.hasAnyComponents) {
       initStatements += this.INDENT + 'self.define_hardware(' +
           this.getComponentPortParameters().join(', ') + ')\n';
     }
@@ -134,7 +134,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
 
     this.hasAnyComponents = false;
     this.componentPorts = Object.create(null);
-    if (this.getModuleType() ===  storageModule.MODULE_TYPE_MECHANISM) {
+    if (this.getModuleType() ===  storageModule.ModuleType.MECHANISM) {
       this.hasAnyComponents = mechanismContainerHolder.hasAnyComponents(this.workspace);
       mechanismContainerHolder.getComponentPorts(this.workspace, this.componentPorts);
     }
@@ -147,7 +147,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
     return code;
   }
 
-  getModuleType(): string | null {
+  getModuleType(): storageModule.ModuleType | null {
     if (this.context) {
       return this.context.getModuleType();
     }

src/editor/generator_context.ts

@@ -34,7 +34,7 @@ export class GeneratorContext {
     this.module = module;
   }
 
-  getModuleType(): string | null {
+  getModuleType(): storageModule.ModuleType | null {
     if (this.module) {
       return this.module.moduleType;
     }
@@ -52,14 +52,13 @@ export class GeneratorContext {
     if (!this.module) {
       throw new Error('getParentClassName: this.module is null.');
     }
-    if (this.module.moduleType === storageModule.MODULE_TYPE_ROBOT) {
-      return CLASS_NAME_ROBOT_BASE;
-    }
-    if (this.module.moduleType === storageModule.MODULE_TYPE_OPMODE) {
-      return CLASS_NAME_OPMODE;
-    }
-    if (this.module.moduleType === storageModule.MODULE_TYPE_MECHANISM) {
-      return CLASS_NAME_MECHANISM;
+    switch (this.module.moduleType) {
+      case storageModule.ModuleType.ROBOT:
+        return CLASS_NAME_ROBOT_BASE;
+      case storageModule.ModuleType.OPMODE:
+        return CLASS_NAME_OPMODE;
+      case storageModule.ModuleType.MECHANISM:
+        return CLASS_NAME_MECHANISM;
     }
     return '';
   }

src/reactComponents/AddTabDialog.tsx

@@ -129,12 +129,12 @@ export default function AddTabDialog(props: AddTabDialogProps) {
       return;
     }
 
-    const storageType = tabType === TabType.MECHANISM ?
-      storageModule.MODULE_TYPE_MECHANISM :
-      storageModule.MODULE_TYPE_OPMODE;
+    const moduleType = (tabType === TabType.MECHANISM)
+      ? storageModule.ModuleType.MECHANISM
+      : storageModule.ModuleType.OPMODE;
 
     await storageProject.addModuleToProject(
-        props.storage, props.project, storageType, newClassName);
+        props.storage, props.project, moduleType, newClassName);
 
     const newModule = storageProject.findModuleByClassName(props.project, newClassName);
     if (newModule) {