Merge remote-tracking branch 'upstream/main' into pr_multiple_ports

Author: alan412

.github/workflows/ci.yml

@@ -15,10 +15,11 @@ jobs:
           node-version: 20
       - name: Install Dependencies
         run: npm ci
+      - name: Check TypeScript Errors
+        run: npm run tscheck        
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
-
       - name: Build Project
         run: npm run build
       - name: Run tests
-        run: npm test
+        run: npm test

package-lock.json

@@ -24,14 +24,17 @@
     "react-dom": "^19.1.0",
     "react-i18next": "^15.6.0",
     "react-syntax-highlighter": "^15.6.1",
+    "semver": "^7.7.2",
+    "typescript": "^5.9.2",
     "web-vitals": "^5.0.3"
   },
   "scripts": {
     "start": "vite",
     "build": "vite build",
     "test": "vitest",
     "gen": "node src/Blockly/gen.js",
-    "dev": "vite"
+    "dev": "vite",
+    "tscheck": "npx tsc -b --noEmit"
   },
   "eslintConfig": {
     "extends": [
@@ -56,6 +59,7 @@
     "@shadcn/ui": "^0.0.4",
     "@types/node": "^24.0.15",
     "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/semver": "^7.7.0",
     "@vitejs/plugin-react": "^4.7.0",
     "autoprefixer": "^10.4.21",
     "playwright": "^1.54.1",

package.json

@@ -150,11 +150,6 @@ type CallPythonFunctionExtraState = {
    * The mechanism class name. Specified only if the function kind is INSTANCE_MECHANISM.
    */
   mechanismClassName?: string,
-
-  // The following fields allow Alan and Liz to load older projects.
-  // TODO(lizlooney): Remove these fields.
-  otherBlockId?: string,
-  mechanismBlockId?: string,
 }
 
 const CALL_PYTHON_FUNCTION = {
@@ -303,7 +298,6 @@ const CALL_PYTHON_FUNCTION = {
       this: CallPythonFunctionBlock,
       extraState: CallPythonFunctionExtraState
   ): void {
-    fixOldExtraState(extraState);
     this.mrcFunctionKind = extraState.functionKind as FunctionKind;
     this.mrcReturnType = extraState.returnType;
     this.mrcArgs = [];
@@ -1276,26 +1270,3 @@ function createFireEventBlock(event: storageModuleContent.Event): toolboxItems.B
   processArgs(args, extraState, inputs);
   return createBlock(extraState, fields, inputs);
 }
-
-// The following function allows Alan and Liz to load older projects.
-// TODO(lizlooney): Remove this function.
-function fixOldExtraState(extraState: CallPythonFunctionExtraState): void {
-  if (extraState.otherBlockId) {
-    switch (extraState.functionKind as FunctionKind) {
-      case FunctionKind.INSTANCE_WITHIN:
-      case FunctionKind.INSTANCE_ROBOT:
-      case FunctionKind.INSTANCE_MECHANISM:
-        extraState.methodId = extraState.otherBlockId;
-        break;
-      case FunctionKind.INSTANCE_COMPONENT:
-        extraState.componentId = extraState.otherBlockId;
-        break;
-      case FunctionKind.EVENT:
-        extraState.eventId = extraState.otherBlockId;
-        break;
-    }
-  }
-  if (extraState.mechanismBlockId) {
-    extraState.mechanismId = extraState.mechanismBlockId;
-  }
-}

src/blocks/mrc_call_python_function.ts

@@ -73,11 +73,6 @@ export interface EventHandlerExtraState {
    * Specified only if the sender type is MECHANISM.
    */
   mechanismId?: string,
-
-  // The following fields allow Alan and Liz to load older projects.
-  // TODO(lizlooney): Remove these fields.
-  otherBlockId?: string,
-  mechanismBlockId?: string,
 }
 
 const EVENT_HANDLER = {
@@ -126,7 +121,6 @@ const EVENT_HANDLER = {
    * Applies the given state to this block.
    */
   loadExtraState(this: EventHandlerBlock, extraState: EventHandlerExtraState): void {
-    fixOldExtraState(extraState);
     this.mrcSenderType = extraState.senderType;
     this.mrcParameters = [];
     this.mrcEventId = extraState.eventId;
@@ -508,14 +502,3 @@ export function renameMechanismName(workspace: Blockly.Workspace, mechanismId: s
     (block as EventHandlerBlock).renameMechanismName(mechanismId, newName);
   });
 }
-
-// The following function allows Alan and Liz to load older projects.
-// TODO(lizlooney): Remove this function.
-function fixOldExtraState(extraState: EventHandlerExtraState): void {
-  if (extraState.otherBlockId) {
-    extraState.eventId = extraState.otherBlockId;
-  }
-  if (extraState.mechanismBlockId) {
-    extraState.mechanismId = extraState.mechanismBlockId;
-  }
-}

src/blocks/mrc_event_handler.ts

@@ -40,7 +40,7 @@ import * as toolboxItems from '../toolbox/items';
 
 export const BLOCK_NAME = 'mrc_get_python_variable';
 
-enum VariableKind {
+export enum VariableKind {
   MODULE = 'module',
   CLASS = 'class',
   INSTANCE = 'instance',

src/blocks/mrc_get_python_variable.ts

@@ -16,7 +16,7 @@
  */
 
 /**
- * @fileoverview Miscellaneous blocks.
+ * @fileoverview Block to add an item to the end of a list.
  * @author [email protected] (Liz Looney)
  */
 

src/blocks/mrc_list_add_item.ts

@@ -16,7 +16,7 @@
  */
 
 /**
- * @fileoverview Miscellaneous blocks.
+ * @fileoverview Blocks for math min and max.
  * @author [email protected] (Liz Looney)
  */
 

src/blocks/mrc_math_min_max.ts

@@ -16,7 +16,7 @@
  */
 
 /**
- * @fileoverview Miscellaneous blocks.
+ * @fileoverview Block for a comment.
  * @author [email protected] (Liz Looney)
  */
 

src/blocks/mrc_misc_comment.ts

@@ -16,7 +16,7 @@
  */
 
 /**
- * @fileoverview Miscellaneous blocks.
+ * @fileoverview Blocks for evaluating something, but ignoring the result.
  * @author [email protected] (Liz Looney)
  */