[WIP] Refactor to NPM workspaces (#104)

src-tauri/src/grpc.rs

@@ -1,11 +1,11 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 use KeyAndValueRef::{Ascii, Binary};
 
 use yaak_grpc::{KeyAndValueRef, MetadataMap};
 
-pub fn metadata_to_map(metadata: MetadataMap) -> HashMap<String, String> {
-    let mut entries = HashMap::new();
+pub fn metadata_to_map(metadata: MetadataMap) -> BTreeMap<String, String> {
+    let mut entries = BTreeMap::new();
     for r in metadata.iter() {
         match r {
             Ascii(k, v) => entries.insert(k.to_string(), v.to_str().unwrap().to_string()),

src-tauri/src/http_request.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::fs;
 use std::fs::{create_dir_all, File};
 use std::io::Write;
@@ -487,7 +487,7 @@ fn get_str<'a>(v: &'a Value, key: &str) -> &'a str {
     }
 }
 
-fn get_str_h<'a>(v: &'a HashMap<String, Value>, key: &str) -> &'a str {
+fn get_str_h<'a>(v: &'a BTreeMap<String, Value>, key: &str) -> &'a str {
     match v.get(key) {
         None => "",
         Some(v) => v.as_str().unwrap_or_default(),

src-tauri/src/lib.rs

@@ -2,7 +2,7 @@ extern crate core;
 #[cfg(target_os = "macos")]
 extern crate objc;
 
-use std::collections::HashMap;
+use std::collections::{BTreeMap};
 use std::fs;
 use std::fs::{create_dir_all, read_to_string, File};
 use std::path::PathBuf;
@@ -210,7 +210,7 @@ async fn cmd_grpc_go(
         .map_err(|e| e.to_string())?;
     let req =
         render_grpc_request(window.app_handle(), &req, &workspace, environment.as_ref()).await;
-    let mut metadata = HashMap::new();
+    let mut metadata = BTreeMap::new();
 
     // Add the rest of metadata
     for h in req.clone().metadata {
@@ -794,9 +794,9 @@ async fn cmd_import_data(
         .map_err(|e| e.to_string())?;
 
     let mut imported_resources = WorkspaceExportResources::default();
-    let mut id_map: HashMap<String, String> = HashMap::new();
+    let mut id_map: BTreeMap<String, String> = BTreeMap::new();
 
-    fn maybe_gen_id(id: &str, model: ModelType, ids: &mut HashMap<String, String>) -> String {
+    fn maybe_gen_id(id: &str, model: ModelType, ids: &mut BTreeMap<String, String>) -> String {
         if !id.starts_with("GENERATE_ID::") {
             return id.to_string();
         }
@@ -814,7 +814,7 @@ async fn cmd_import_data(
     fn maybe_gen_id_opt(
         id: Option<String>,
         model: ModelType,
-        ids: &mut HashMap<String, String>,
+        ids: &mut BTreeMap<String, String>,
     ) -> Option<String> {
         match id {
             Some(id) => Some(maybe_gen_id(id.as_str(), model, ids)),

src-tauri/src/render.rs

@@ -1,6 +1,6 @@
 use crate::template_callback::PluginTemplateCallback;
 use serde_json::{json, Map, Value};
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 use tauri::{AppHandle, Manager, Runtime};
 use yaak_models::models::{
     Environment, EnvironmentVariable, GrpcMetadataEntry, GrpcRequest, HttpRequest,
@@ -37,7 +37,7 @@ pub async fn render_grpc_request<R: Runtime>(
         })
     }
 
-    let mut authentication = HashMap::new();
+    let mut authentication = BTreeMap::new();
     for (k, v) in r.authentication.clone() {
         authentication.insert(k, render_json_value(v, vars, cb).await);
     }
@@ -78,12 +78,12 @@ pub async fn render_http_request(
         })
     }
 
-    let mut body = HashMap::new();
+    let mut body = BTreeMap::new();
     for (k, v) in r.body.clone() {
         body.insert(k, render_json_value(v, vars, cb).await);
     }
 
-    let mut authentication = HashMap::new();
+    let mut authentication = BTreeMap::new();
     for (k, v) in r.authentication.clone() {
         authentication.insert(k, render_json_value(v, vars, cb).await);
     }
@@ -250,13 +250,16 @@ mod tests {
         vars.insert("a".to_string(), "aaa".to_string());
 
         let result = super::render_json_value(v, &vars, &EmptyCB {}).await;
-        assert_eq!(result, json!([
-            123,
-            {"aaa": "aaa"},
-            null,
-            "aaa",
-            false,
-            {"x": ["aaa"]}
-        ]))
+        assert_eq!(
+            result,
+            json!([
+                123,
+                {"aaa": "aaa"},
+                null,
+                "aaa",
+                false,
+                {"x": ["aaa"]}
+            ])
+        )
     }
 }