Merge pull request #299 from BitsAndDroids/main

App v0.9.10
BitsAndDroids · Jan 10, 2025 · 8e491d4 · 8e491d4
2 parents 8f1fa53 + 2597c17
commit 8e491d4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp
@@ -882,9 +882,10 @@ void BitsAndDroidsFlightConnector::switchHandling() {
   // START CASE TEMPLATE
 
   // END CASE TEMPLATE
-  default:
+  default: {
     break;
   }
+  }
 }
 
 void BitsAndDroidsFlightConnector::propsInputHandling(int propPin1,

diff --git a/crates/connector/src-tauri/src/utils/library_handler.rs b/crates/connector/src-tauri/src/utils/library_handler.rs
@@ -78,13 +78,13 @@ pub fn generate_library(
 }
 
 #[tauri::command]
-pub fn get_library_outputs(app: tauri::AppHandle) -> HashMap<u32, WasmEvent> {
+pub fn get_library_outputs(app: tauri::AppHandle) -> Vec<WasmEvent> {
     let mut outputs = HashMap::new();
     let mut wasm_registry = events::wasm_registry::WASMRegistry::new();
     wasm_registry.load_wasm(&app);
     let wasm_outputs = wasm_registry.get_wasm_outputs();
     for output in wasm_outputs.values() {
         outputs.insert(output.id, output.clone());
     }
-    outputs
+    outputs.values().cloned().collect()
 }
diff --git a/crates/connector/src-tauri/tauri.conf.json b/crates/connector/src-tauri/tauri.conf.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.9",
+  "version": "0.9.10",
   "build": {
     "beforeDevCommand": "pnpm dev",
     "beforeBuildCommand": "pnpm run build",

diff --git a/frontend/library/utils/CustomWasmGenerator.ts b/frontend/library/utils/CustomWasmGenerator.ts
@@ -2,7 +2,7 @@ import { WASMEvent } from "@/model/WASMEvent";
 
 import { invoke } from "@tauri-apps/api/core";
 const generateVariables = (variables: WASMEvent[]): string => {
-  if (!variables.length) {
+  if (variables?.length == 0) {
     return "";
   }
   return variables.map(generateVariable).join("\n");
@@ -101,14 +101,14 @@ const insertVariables = (variableString: string, templateString: string) => {
 };
 
 const generateGetters = (variables: WASMEvent[]): string => {
-  if (!variables.length) {
+  if (variables?.length == 0) {
     return "";
   }
   return variables.map(generateGetter).join("\n");
 };
 
 const generateCases = (variables: WASMEvent[]): string => {
-  if (!variables.length) {
+  if (variables?.length == 0) {
     return "";
   }
   return variables.map(generateCase).join("\n");