From b024b941a6f85a5489fce2d38c200e8b587eb891 Mon Sep 17 00:00:00 2001 From: BitsAndDroids Date: Fri, 10 Jan 2025 15:18:25 +0100 Subject: [PATCH] fixed library generation --- .../connector_library/BitsAndDroidsFlightConnector.cpp | 3 ++- crates/connector/src-tauri/src/utils/library_handler.rs | 4 ++-- crates/connector/src-tauri/tauri.conf.json | 2 +- frontend/library/utils/CustomWasmGenerator.ts | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp b/crates/connector/src-tauri/connector_library/BitsAndDroidsFlightConnector.cpp index d0b3848..2b69d3f 100644 --- 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 index b45f957..0bbb549 100644 --- a/crates/connector/src-tauri/src/utils/library_handler.rs +++ b/crates/connector/src-tauri/src/utils/library_handler.rs @@ -78,7 +78,7 @@ pub fn generate_library( } #[tauri::command] -pub fn get_library_outputs(app: tauri::AppHandle) -> HashMap { +pub fn get_library_outputs(app: tauri::AppHandle) -> Vec { let mut outputs = HashMap::new(); let mut wasm_registry = events::wasm_registry::WASMRegistry::new(); wasm_registry.load_wasm(&app); @@ -86,5 +86,5 @@ pub fn get_library_outputs(app: tauri::AppHandle) -> HashMap { 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 index 12b1519..8c64a36 100644 --- 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 index dfc2722..3f043ba 100644 --- 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");