Changed code that looks at port argument names in pseudo constructors to look for names that match PortType enum values (case insensitive).

Updated python code so that port argument names match the PortType values.

Author: lizlooney

external_samples/rev_touch_sensor.py

@@ -55,8 +55,8 @@ def periodic(self) -> None:
 
     # Alternative constructor to create an instance from a smart io port
     @classmethod
-    def from_io_port(cls: type[Self], io_port: int) -> Self:
-        return cls([(PortType.SMART_IO_PORT, io_port)])
+    def from_smart_io_port(cls: type[Self], smart_io_port: int) -> Self:
+        return cls([(PortType.SMART_IO_PORT, smart_io_port)])
 
     # Component specific methods
 

external_samples/smart_motor.py

@@ -45,10 +45,10 @@ def get_connection_port_type(self) -> list[PortType]:
     def periodic(self) -> None:
         pass
 
-    # Alternative constructor to create an instance from a motor port
+    # Alternative constructor to create an instance from a smart motor port
     @classmethod
-    def from_motor_port(cls: type[Self], motor_port: int) -> Self:
-        return cls([(PortType.SMART_MOTOR_PORT, motor_port)])
+    def from_smart_motor_port(cls: type[Self], smart_motor_port: int) -> Self:
+        return cls([(PortType.SMART_MOTOR_PORT, smart_motor_port)])
 
     # Component specific methods
 

external_samples/spark_mini.py

@@ -61,10 +61,10 @@ def get_connection_port_type(self) -> list[PortType]:
     def periodic(self) -> None:
         pass
 
-    # Alternative constructor to create an instance from a motor port
+    # Alternative constructor to create an instance from a smart motor port
     @classmethod
-    def from_motor_port(cls: type[Self], motor_port: int) -> Self:
-        return cls([(PortType.SMART_MOTOR_PORT, motor_port)])
+    def from_smart_motor_port(cls: type[Self], smart_motor_port: int) -> Self:
+        return cls([(PortType.SMART_MOTOR_PORT, smart_motor_port)])
 
     # Component specific methods
 

src/blocks/mrc_component.ts

@@ -37,22 +37,6 @@ export const OUTPUT_NAME = 'mrc_component';
 export const FIELD_NAME = 'NAME';
 export const FIELD_TYPE = 'TYPE';
 
-// key is a regex pattern that matches a function argument name, value is type of mrc_port block to use.
-// TODO: Improve these regex pattern.
-// The types here match the PortType values in external_samples/component.py.
-const RECOGNIZED_PORT_ARG_NAME_PATTERNS: { [key: string]: string } = {
-  'can_port': 'CAN_PORT',
-  'io_port': 'SMART_IO_PORT',
-  'smartIO_port': 'SMART_IO_PORT',
-  'smart_io_port': 'SMART_IO_PORT',
-  'motor_port': 'SMART_MOTOR_PORT',
-  'smart_motor_port': 'SMART_MOTOR_PORT',
-  'servo_port': 'SERVO_PORT',
-  'i2c_port': 'I2C_PORT',
-  'usb_port': 'USB_PORT',
-};
-
-
 export type ConstructorArg = {
   name: string,
   type: string,
@@ -247,10 +231,18 @@ function createComponentBlock(
 }
 
 function getPortTypeForArgument(argName: string): string | null {
-  for (const pattern in RECOGNIZED_PORT_ARG_NAME_PATTERNS) {
-    if (new RegExp(pattern, 'i').test(argName)) {
-      return RECOGNIZED_PORT_ARG_NAME_PATTERNS[pattern];
-    }
+  // TODO(lizlooney): Currently the JSON for component.PortType is ClassData
+  // instead of EnumData. When it is fixed to be EnumData, this code will need
+  // to be updated.
+
+  const argNameLower = argName.toLowerCase();
+  const classData = getClassData('component.PortType');
+  if (classData) {
+     for (const varData of classData.classVariables) {
+       if (argNameLower === varData.name.toLowerCase()) {
+         return varData.name;
+       }
+     }
   }
   return null;
 }

src/blocks/utils/generated/external_samples_data.json

@@ -717,12 +717,12 @@
                     "args": [
                         {
                             "defaultValue": null,
-                            "name": "io_port",
+                            "name": "smart_io_port",
                             "type": "int"
                         }
                     ],
                     "declaringClassName": "rev_touch_sensor.RevTouchSensor",
-                    "functionName": "from_io_port",
+                    "functionName": "from_smart_io_port",
                     "returnType": "rev_touch_sensor.RevTouchSensor",
                     "tooltip": ""
                 }
@@ -1140,12 +1140,12 @@
                     "args": [
                         {
                             "defaultValue": null,
-                            "name": "motor_port",
+                            "name": "smart_motor_port",
                             "type": "int"
                         }
                     ],
                     "declaringClassName": "smart_motor.SmartMotor",
-                    "functionName": "from_motor_port",
+                    "functionName": "from_smart_motor_port",
                     "returnType": "smart_motor.SmartMotor",
                     "tooltip": ""
                 }
@@ -1603,12 +1603,12 @@
                     "args": [
                         {
                             "defaultValue": null,
-                            "name": "motor_port",
+                            "name": "smart_motor_port",
                             "type": "int"
                         }
                     ],
                     "declaringClassName": "spark_mini.SparkMiniComponent",
-                    "functionName": "from_motor_port",
+                    "functionName": "from_smart_motor_port",
                     "returnType": "spark_mini.SparkMiniComponent",
                     "tooltip": ""
                 }