Changes to add ports, get things more like we want

Author: alan412

src/blocks/mrc_component.ts

@@ -37,12 +37,14 @@ export type ConstructorArg = {
 
 type ComponentExtraState = {
   importModule?: string,
+  hideParams?: boolean,
   params?: ConstructorArg[],
 }
 
 type ComponentBlock = Blockly.Block & ComponentMixin;
 interface ComponentMixin extends ComponentMixinType {
   mrcArgs: ConstructorArg[],
+  hideParams: boolean,
   mrcImportModule: string,
 }
 type ComponentMixinType = typeof COMPONENT;
@@ -59,7 +61,6 @@ const COMPONENT = {
       .appendField(createFieldNonEditableText(''), 'TYPE');
     this.setPreviousStatement(true, OUTPUT_NAME);
     this.setNextStatement(true, OUTPUT_NAME);
-    // this.setOutput(true, OUTPUT_NAME);
   },
 
   /**
@@ -74,20 +75,24 @@ const COMPONENT = {
         'name': arg.name,
         'type': arg.type,
       });
-    });    
+    });
     if (this.mrcImportModule) {
       extraState.importModule = this.mrcImportModule;
     }
+    if (this.hideParams) {
+      extraState.hideParams = this.hideParams;
+    }
     return extraState;
   },
   /**
   * Applies the given state to this block.
   */
   loadExtraState: function (this: ComponentBlock, extraState: ComponentExtraState): void {
     this.mrcImportModule = extraState.importModule ? extraState.importModule : '';
+    this.hideParams = extraState.hideParams ? extraState.hideParams : false;
     this.mrcArgs = [];
 
-    if(extraState.params){
+    if (extraState.params) {
       extraState.params.forEach((arg) => {
         this.mrcArgs.push({
           'name': arg.name,
@@ -101,17 +106,19 @@ const COMPONENT = {
   /**
      * Update the block to reflect the newly loaded extra state.
      */
-    updateBlock_: function(this: ComponentBlock): void {
+  updateBlock_: function (this: ComponentBlock): void {
+    if (this.hideParams == false) {
       // Add input sockets for the arguments.
       for (let i = 0; i < this.mrcArgs.length; i++) {
         const input = this.appendValueInput('ARG' + i)
-            .setAlign(Blockly.inputs.Align.RIGHT)
-            .appendField(this.mrcArgs[i].name);
+          .setAlign(Blockly.inputs.Align.RIGHT)
+          .appendField(this.mrcArgs[i].name);
         if (this.mrcArgs[i].type) {
           input.setCheck(getAllowedTypesForSetCheck(this.mrcArgs[i].type));
         }
       }
     }
+  }
 }
 
 export const setup = function () {
@@ -122,18 +129,26 @@ export const pythonFromBlock = function (
   block: ComponentBlock,
   generator: ExtendedPythonGenerator,
 ) {
-  if(block.mrcImportModule){
+  if (block.mrcImportModule) {
     generator.addImport(block.mrcImportModule);
   }
   let code = 'self.' + block.getFieldValue('NAME') + ' = ' + block.getFieldValue('TYPE') + '(';
-  
+
   for (let i = 0; i < block.mrcArgs.length; i++) {
-      const fieldName = 'ARG' + i;
+    const fieldName = 'ARG' + i;
+    if (i != 0) {
+      code += ', '
+    }
+    if(block.hideParams){
+      let extension = '';
       if(i != 0){
-        code += ', '
+        extension = '_' + (i + 1).toString();
       }
+      code += block.mrcArgs[i].name + " = " + block.getFieldValue('NAME') + extension; 
+    }else{
       code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, fieldName, Order.NONE);
-    } 
+    }
+  }
   code += ')\n' + "self.hardware.append(self." + block.getFieldValue('NAME') + ")\n";
   return code;
 }

src/blocks/mrc_port.ts

@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2025 Porpoiseful LLC
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Create a component with a name of a certain type
+ * @author [email protected] (Alan Smith)
+ */
+import * as Blockly from 'blockly';
+import { Order } from 'blockly/python';
+
+import { MRC_STYLE_PORTS } from '../themes/styles'
+import { createFieldNonEditableText } from '../fields/FieldNonEditableText';
+import { ExtendedPythonGenerator } from '../editor/extended_python_generator';
+import { createFieldDropdown } from '../fields/FieldDropdown';
+
+export const BLOCK_NAME = 'mrc_port';
+export const OUTPUT_NAME = 'mrc_port';
+
+
+type PortBlock = Blockly.Block & PortMixin;
+interface PortMixin extends PortMixinType {
+}
+type PortMixinType = typeof COMPONENT;
+
+const COMPONENT = {
+  /**
+    * Block initialization.
+    */
+  init: function (this: PortBlock): void {
+    this.setStyle(MRC_STYLE_PORTS);
+    this.appendDummyInput()
+      .appendField(createFieldNonEditableText(''), 'TYPE')
+      .appendField(new Blockly.FieldTextInput(''), 'PORT_NUM');
+
+    //this.setOutput(true, OUTPUT_NAME);
+    this.setOutput(true);
+  },
+}
+
+export const setup = function () {
+  Blockly.Blocks[BLOCK_NAME] = COMPONENT;
+}
+
+export const pythonFromBlock = function (
+  block: PortBlock,
+  generator: ExtendedPythonGenerator,
+) {
+    let code = "";
+    //TODO(Alan) - Make this real
+    
+  return [code, Order.ATOMIC];
+}

src/blocks/setup_custom_blocks.ts

@@ -11,6 +11,7 @@ import * as ClassMethodDef from './mrc_class_method_def';
 import * as Mechanism from './mrc_mechanism';
 import * as Component from './mrc_component';
 import * as MechanismContainerHolder from './mrc_mechanism_component_holder';
+import * as Port from './mrc_port';
 
 const customBlocks = [
   CallPythonFunction,
@@ -25,6 +26,7 @@ const customBlocks = [
   Mechanism,
   Component,
   MechanismContainerHolder,
+  Port,
 ];
 
 export const setup = function(forBlock: any) {

src/modules/mechanism_start.json

@@ -13,7 +13,16 @@
                     "canBeCalledWithinClass": false,
                     "canBeCalledOutsideClass": false,
                     "returnType": "None",
-                    "params": [],
+                    "params": [
+                        {
+                            "name": "port_my_motor",
+                            "type": "int"
+                        },
+                        {
+                            "name": "port_my_color_range_sensor",
+                            "type": "int"                          
+                        }
+                    ],
                     "pythonMethodName": "__init__"
                 },
                 "fields": {

src/themes/styles.ts

@@ -30,6 +30,7 @@ export const MRC_STYLE_CLASS_BLOCKS = 'mrc_style_class_blocks';
 export const MRC_CATEGORY_STYLE_METHODS = 'mrc_category_style_methods';
 export const MRC_STYLE_MECHANISMS = 'mrc_style_mechanisms';
 export const MRC_STYLE_COMPONENTS = 'mrc_style_components';
+export const MRC_STYLE_PORTS = 'mrc_style_ports';
 
 export const add_mrc_styles = function (theme: Blockly.Theme): Blockly.Theme {
     theme.setBlockStyle(MRC_STYLE_FUNCTIONS, {
@@ -85,6 +86,12 @@ export const add_mrc_styles = function (theme: Blockly.Theme): Blockly.Theme {
         "colourTertiary": "#496684",
         hat: ""
     });
+    theme.setBlockStyle(MRC_STYLE_PORTS, {
+        colourPrimary: "#5ba55b",
+        colourSecondary: "#deedde",
+        colourTertiary: "#498449",
+        hat: ""
+    });
 
     return theme;
 }