From c013a37271b00b9e25723bdc2657e1a1bace7d38 Mon Sep 17 00:00:00 2001 From: Jacob Sapoznikow Date: Wed, 10 Jul 2024 21:46:24 +0000 Subject: [PATCH] regen and fmt --- apps/wormhole/src/lib.rs | 4 +- crates/data/src/prisma.rs | 323 ++++++++++++++++------------- crates/rpc-rs/src/lib.rs | 4 +- crates/rpc-rs/src/module/mod.rs | 2 +- crates/rpc-rs/src/router/func.rs | 2 +- crates/rpc-rs/src/router/router.rs | 2 +- 6 files changed, 184 insertions(+), 153 deletions(-) diff --git a/apps/wormhole/src/lib.rs b/apps/wormhole/src/lib.rs index 0573349..a759e9f 100644 --- a/apps/wormhole/src/lib.rs +++ b/apps/wormhole/src/lib.rs @@ -21,13 +21,13 @@ impl Runnable for Cli { pub enum Commands { /// TypeScript bindgen CLI tool. Bindgen(bindings::Cli), - + /// Web UI management CLI. Server(webui::cli::Cli), /// Wormhole CLI. Cli(wormhole_cli::cli::Cli), - + /// Wormhole GUI app. #[default] Gui, diff --git a/crates/data/src/prisma.rs b/crates/data/src/prisma.rs index 550f317..8bd68c1 100644 --- a/crates/data/src/prisma.rs +++ b/crates/data/src/prisma.rs @@ -2,6 +2,10 @@ pub static DATAMODEL_STR: &'static str = include_str!("/mnt/vol/Wormhole/prisma/schema.prisma"); static DATABASE_STR: &'static str = "sqlite"; +use ::prisma_client_rust::migrations::include_dir; +pub static MIGRATIONS_DIR: &::prisma_client_rust::migrations::include_dir::Dir = &::prisma_client_rust::migrations::include_dir::include_dir!( + "/mnt/vol/Wormhole/prisma/migrations" +); pub use _prisma::*; use prisma_client_rust::scalar_types::*; pub mod _prisma { @@ -68,6 +72,33 @@ pub mod _prisma { pub fn _transaction(&self) -> ::prisma_client_rust::TransactionBuilder { ::prisma_client_rust::TransactionBuilder::_new(self, &self.0) } + pub async fn _migrate_deploy( + &self, + ) -> Result<(), ::prisma_client_rust::migrations::MigrateDeployError> { + let res = ::prisma_client_rust::migrations::migrate_deploy( + super::DATAMODEL_STR, + super::MIGRATIONS_DIR, + &self.0.url(), + ) + .await; + ::prisma_client_rust::tokio::time::sleep(core::time::Duration::from_millis(1)).await; + res + } + pub async fn _migrate_resolve( + &self, + migration: &str, + ) -> Result<(), ::prisma_client_rust::migrations::MigrateResolveError> { + ::prisma_client_rust::migrations::migrate_resolve( + migration, + super::DATAMODEL_STR, + super::MIGRATIONS_DIR, + &self.0.url(), + ) + .await + } + pub fn _db_push(&self) -> ::prisma_client_rust::migrations::DbPush { + ::prisma_client_rust::migrations::db_push(super::DATAMODEL_STR, &self.0.url()) + } pub fn game(&self) -> super::game::Actions { super::game::Actions { client: &self.0 } } @@ -269,23 +300,26 @@ pub mod _prisma { pub mod read_filters { use super::*; #[derive(Debug, Clone)] - pub enum DateTimeFilter { - Equals(DateTime), - InVec(Vec), - NotInVec(Vec), - Lt(DateTime), - Lte(DateTime), - Gt(DateTime), - Gte(DateTime), - Not(DateTime), + pub enum StringFilter { + Equals(String), + InVec(Vec), + NotInVec(Vec), + Lt(String), + Lte(String), + Gt(String), + Gte(String), + Contains(String), + StartsWith(String), + EndsWith(String), + Not(String), } - impl Into<::prisma_client_rust::SerializedWhereValue> for DateTimeFilter { + impl Into<::prisma_client_rust::SerializedWhereValue> for StringFilter { fn into(self) -> ::prisma_client_rust::SerializedWhereValue { match self { Self::Equals(value) => { ::prisma_client_rust::SerializedWhereValue::Object(vec![( "equals".to_string(), - ::prisma_client_rust::PrismaValue::DateTime(value), + ::prisma_client_rust::PrismaValue::String(value), )]) } Self::InVec(value) => { @@ -294,7 +328,7 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::DateTime(value)) + .map(|value| ::prisma_client_rust::PrismaValue::String(value)) .collect(), ), )]) @@ -305,52 +339,75 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::DateTime(value)) + .map(|value| ::prisma_client_rust::PrismaValue::String(value)) .collect(), ), )]) } Self::Lt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lt".to_string(), - ::prisma_client_rust::PrismaValue::DateTime(value), + ::prisma_client_rust::PrismaValue::String(value), )]), Self::Lte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lte".to_string(), - ::prisma_client_rust::PrismaValue::DateTime(value), + ::prisma_client_rust::PrismaValue::String(value), )]), Self::Gt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gt".to_string(), - ::prisma_client_rust::PrismaValue::DateTime(value), + ::prisma_client_rust::PrismaValue::String(value), )]), Self::Gte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gte".to_string(), - ::prisma_client_rust::PrismaValue::DateTime(value), + ::prisma_client_rust::PrismaValue::String(value), )]), + Self::Contains(value) => { + ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "contains".to_string(), + ::prisma_client_rust::PrismaValue::String(value), + )]) + } + Self::StartsWith(value) => { + ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "startsWith".to_string(), + ::prisma_client_rust::PrismaValue::String(value), + )]) + } + Self::EndsWith(value) => { + ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "endsWith".to_string(), + ::prisma_client_rust::PrismaValue::String(value), + )]) + } Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "not".to_string(), - ::prisma_client_rust::PrismaValue::DateTime(value), + ::prisma_client_rust::PrismaValue::String(value), )]), } } } #[derive(Debug, Clone)] - pub enum IntFilter { - Equals(Int), - InVec(Vec), - NotInVec(Vec), - Lt(Int), - Lte(Int), - Gt(Int), - Gte(Int), - Not(Int), + pub enum StringNullableFilter { + Equals(Option), + InVec(Vec), + NotInVec(Vec), + Lt(String), + Lte(String), + Gt(String), + Gte(String), + Contains(String), + StartsWith(String), + EndsWith(String), + Not(Option), } - impl Into<::prisma_client_rust::SerializedWhereValue> for IntFilter { + impl Into<::prisma_client_rust::SerializedWhereValue> for StringNullableFilter { fn into(self) -> ::prisma_client_rust::SerializedWhereValue { match self { Self::Equals(value) => { ::prisma_client_rust::SerializedWhereValue::Object(vec![( "equals".to_string(), - ::prisma_client_rust::PrismaValue::Int(value), + value + .map(|value| ::prisma_client_rust::PrismaValue::String(value)) + .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), )]) } Self::InVec(value) => { @@ -359,7 +416,7 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) + .map(|value| ::prisma_client_rust::PrismaValue::String(value)) .collect(), ), )]) @@ -370,54 +427,72 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) + .map(|value| ::prisma_client_rust::PrismaValue::String(value)) .collect(), ), )]) } Self::Lt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lt".to_string(), - ::prisma_client_rust::PrismaValue::Int(value), + ::prisma_client_rust::PrismaValue::String(value), )]), Self::Lte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lte".to_string(), - ::prisma_client_rust::PrismaValue::Int(value), + ::prisma_client_rust::PrismaValue::String(value), )]), Self::Gt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gt".to_string(), - ::prisma_client_rust::PrismaValue::Int(value), + ::prisma_client_rust::PrismaValue::String(value), )]), Self::Gte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gte".to_string(), - ::prisma_client_rust::PrismaValue::Int(value), + ::prisma_client_rust::PrismaValue::String(value), )]), + Self::Contains(value) => { + ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "contains".to_string(), + ::prisma_client_rust::PrismaValue::String(value), + )]) + } + Self::StartsWith(value) => { + ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "startsWith".to_string(), + ::prisma_client_rust::PrismaValue::String(value), + )]) + } + Self::EndsWith(value) => { + ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "endsWith".to_string(), + ::prisma_client_rust::PrismaValue::String(value), + )]) + } Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "not".to_string(), - ::prisma_client_rust::PrismaValue::Int(value), + value + .map(|value| ::prisma_client_rust::PrismaValue::String(value)) + .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), )]), } } } #[derive(Debug, Clone)] - pub enum IntNullableFilter { - Equals(Option), + pub enum IntFilter { + Equals(Int), InVec(Vec), NotInVec(Vec), Lt(Int), Lte(Int), Gt(Int), Gte(Int), - Not(Option), + Not(Int), } - impl Into<::prisma_client_rust::SerializedWhereValue> for IntNullableFilter { + impl Into<::prisma_client_rust::SerializedWhereValue> for IntFilter { fn into(self) -> ::prisma_client_rust::SerializedWhereValue { match self { Self::Equals(value) => { ::prisma_client_rust::SerializedWhereValue::Object(vec![( "equals".to_string(), - value - .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) - .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), + ::prisma_client_rust::PrismaValue::Int(value), )]) } Self::InVec(value) => { @@ -460,34 +535,31 @@ pub mod _prisma { )]), Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "not".to_string(), - value - .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) - .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), + ::prisma_client_rust::PrismaValue::Int(value), )]), } } } #[derive(Debug, Clone)] - pub enum StringFilter { - Equals(String), - InVec(Vec), - NotInVec(Vec), - Lt(String), - Lte(String), - Gt(String), - Gte(String), - Contains(String), - StartsWith(String), - EndsWith(String), - Not(String), + pub enum IntNullableFilter { + Equals(Option), + InVec(Vec), + NotInVec(Vec), + Lt(Int), + Lte(Int), + Gt(Int), + Gte(Int), + Not(Option), } - impl Into<::prisma_client_rust::SerializedWhereValue> for StringFilter { + impl Into<::prisma_client_rust::SerializedWhereValue> for IntNullableFilter { fn into(self) -> ::prisma_client_rust::SerializedWhereValue { match self { Self::Equals(value) => { ::prisma_client_rust::SerializedWhereValue::Object(vec![( "equals".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + value + .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) + .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), )]) } Self::InVec(value) => { @@ -496,7 +568,7 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::String(value)) + .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) .collect(), ), )]) @@ -507,75 +579,75 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::String(value)) + .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) .collect(), ), )]) } Self::Lt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lt".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::Int(value), )]), Self::Lte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lte".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::Int(value), )]), Self::Gt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gt".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::Int(value), )]), Self::Gte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gte".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::Int(value), )]), - Self::Contains(value) => { - ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "contains".to_string(), - ::prisma_client_rust::PrismaValue::String(value), - )]) - } - Self::StartsWith(value) => { - ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "startsWith".to_string(), - ::prisma_client_rust::PrismaValue::String(value), - )]) - } - Self::EndsWith(value) => { + Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( + "not".to_string(), + value + .map(|value| ::prisma_client_rust::PrismaValue::Int(value)) + .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), + )]), + } + } + } + #[derive(Debug, Clone)] + pub enum BooleanFilter { + Equals(Boolean), + Not(Boolean), + } + impl Into<::prisma_client_rust::SerializedWhereValue> for BooleanFilter { + fn into(self) -> ::prisma_client_rust::SerializedWhereValue { + match self { + Self::Equals(value) => { ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "endsWith".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + "equals".to_string(), + ::prisma_client_rust::PrismaValue::Boolean(value), )]) } Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "not".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::Boolean(value), )]), } } } #[derive(Debug, Clone)] - pub enum StringNullableFilter { - Equals(Option), - InVec(Vec), - NotInVec(Vec), - Lt(String), - Lte(String), - Gt(String), - Gte(String), - Contains(String), - StartsWith(String), - EndsWith(String), - Not(Option), + pub enum DateTimeFilter { + Equals(DateTime), + InVec(Vec), + NotInVec(Vec), + Lt(DateTime), + Lte(DateTime), + Gt(DateTime), + Gte(DateTime), + Not(DateTime), } - impl Into<::prisma_client_rust::SerializedWhereValue> for StringNullableFilter { + impl Into<::prisma_client_rust::SerializedWhereValue> for DateTimeFilter { fn into(self) -> ::prisma_client_rust::SerializedWhereValue { match self { Self::Equals(value) => { ::prisma_client_rust::SerializedWhereValue::Object(vec![( "equals".to_string(), - value - .map(|value| ::prisma_client_rust::PrismaValue::String(value)) - .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), + ::prisma_client_rust::PrismaValue::DateTime(value), )]) } Self::InVec(value) => { @@ -584,7 +656,7 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::String(value)) + .map(|value| ::prisma_client_rust::PrismaValue::DateTime(value)) .collect(), ), )]) @@ -595,71 +667,30 @@ pub mod _prisma { ::prisma_client_rust::PrismaValue::List( value .into_iter() - .map(|value| ::prisma_client_rust::PrismaValue::String(value)) + .map(|value| ::prisma_client_rust::PrismaValue::DateTime(value)) .collect(), ), )]) } Self::Lt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lt".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::DateTime(value), )]), Self::Lte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "lte".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::DateTime(value), )]), Self::Gt(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gt".to_string(), - ::prisma_client_rust::PrismaValue::String(value), + ::prisma_client_rust::PrismaValue::DateTime(value), )]), Self::Gte(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "gte".to_string(), - ::prisma_client_rust::PrismaValue::String(value), - )]), - Self::Contains(value) => { - ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "contains".to_string(), - ::prisma_client_rust::PrismaValue::String(value), - )]) - } - Self::StartsWith(value) => { - ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "startsWith".to_string(), - ::prisma_client_rust::PrismaValue::String(value), - )]) - } - Self::EndsWith(value) => { - ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "endsWith".to_string(), - ::prisma_client_rust::PrismaValue::String(value), - )]) - } - Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "not".to_string(), - value - .map(|value| ::prisma_client_rust::PrismaValue::String(value)) - .unwrap_or_else(|| ::prisma_client_rust::PrismaValue::Null), + ::prisma_client_rust::PrismaValue::DateTime(value), )]), - } - } - } - #[derive(Debug, Clone)] - pub enum BooleanFilter { - Equals(Boolean), - Not(Boolean), - } - impl Into<::prisma_client_rust::SerializedWhereValue> for BooleanFilter { - fn into(self) -> ::prisma_client_rust::SerializedWhereValue { - match self { - Self::Equals(value) => { - ::prisma_client_rust::SerializedWhereValue::Object(vec![( - "equals".to_string(), - ::prisma_client_rust::PrismaValue::Boolean(value), - )]) - } Self::Not(value) => ::prisma_client_rust::SerializedWhereValue::Object(vec![( "not".to_string(), - ::prisma_client_rust::PrismaValue::Boolean(value), + ::prisma_client_rust::PrismaValue::DateTime(value), )]), } } diff --git a/crates/rpc-rs/src/lib.rs b/crates/rpc-rs/src/lib.rs index 9406d61..81b5f53 100644 --- a/crates/rpc-rs/src/lib.rs +++ b/crates/rpc-rs/src/lib.rs @@ -1,5 +1,5 @@ //! # rpc-rs -//! +//! //! A simple IPC/RPC framework for Rust and TypeScript, //! built for Tauri and web apps. @@ -12,5 +12,5 @@ pub mod proc; pub mod router; pub mod util; -pub use router::{Router, Method}; pub use module::{Module, ModuleBuilder}; +pub use router::{Method, Router}; diff --git a/crates/rpc-rs/src/module/mod.rs b/crates/rpc-rs/src/module/mod.rs index e6e7e05..987960a 100644 --- a/crates/rpc-rs/src/module/mod.rs +++ b/crates/rpc-rs/src/module/mod.rs @@ -3,5 +3,5 @@ pub mod builder; pub mod module; -pub use module::Module; pub use builder::ModuleBuilder; +pub use module::Module; diff --git a/crates/rpc-rs/src/router/func.rs b/crates/rpc-rs/src/router/func.rs index 8cbead6..485b472 100644 --- a/crates/rpc-rs/src/router/func.rs +++ b/crates/rpc-rs/src/router/func.rs @@ -10,7 +10,7 @@ use specta::{ /// If your function requires a function body you can copy this function into your own codebase. /// /// Eg. `function name()` -/// +/// /// This had to be modified to support async `Promise`s and to not include the final semicolon. pub fn export_function_header(dt: FunctionDataType, config: &ExportConfig) -> Result { let type_map = TypeMap::default(); diff --git a/crates/rpc-rs/src/router/router.rs b/crates/rpc-rs/src/router/router.rs index 1317b5e..501aced 100644 --- a/crates/rpc-rs/src/router/router.rs +++ b/crates/rpc-rs/src/router/router.rs @@ -15,7 +15,7 @@ use crate::{module::module::Module, util::TripleS}; pub struct Router { /// A map of IDs to modules. pub(crate) modules: HashMap>, - + /// The [`TypeMap`] for this router. pub(crate) type_map: TypeMap,