chore: fixes & anyhow removal from main code

tailcallhq · Jun 26, 2024 · c3d3158 · c3d3158 · github-actions · Jun 26, 2024
1 parent b1b501f
commit c3d3158
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 30 deletions.
diff --git a/src/cli/generator/config.rs b/src/cli/generator/config.rs
@@ -9,6 +9,7 @@ use serde::{Deserialize, Serialize};
 use url::Url;
 
 use crate::core::config::{self};
+use crate::core::error::Error;
 
 #[derive(Deserialize, Serialize, Debug, Default, Setters)]
 #[serde(rename_all = "camelCase")]
@@ -124,7 +125,7 @@ pub struct Schema {
 }
 
 impl Output<UnResolved> {
-    pub fn resolve(self, parent_dir: Option<&Path>) -> anyhow::Result<Output<Resolved>> {
+    pub fn resolve(self, parent_dir: Option<&Path>) -> Result<Output<Resolved>, Error> {
         Ok(Output {
             format: self.format,
             path: self.path.into_resolved(parent_dir),
@@ -133,7 +134,7 @@ impl Output<UnResolved> {
 }
 
 impl Source<UnResolved> {
-    pub fn resolve(self, parent_dir: Option<&Path>) -> anyhow::Result<Source<Resolved>> {
+    pub fn resolve(self, parent_dir: Option<&Path>) -> Result<Source<Resolved>, Error> {
         match self {
             Source::Curl { src, field_name } => {
                 let resolved_path = src.into_resolved(parent_dir);
@@ -152,22 +153,22 @@ impl Source<UnResolved> {
 }
 
 impl Input<UnResolved> {
-    pub fn resolve(self, parent_dir: Option<&Path>) -> anyhow::Result<Input<Resolved>> {
+    pub fn resolve(self, parent_dir: Option<&Path>) -> Result<Input<Resolved>, Error> {
         let resolved_source = self.source.resolve(parent_dir)?;
         Ok(Input { source: resolved_source })
     }
 }
 
 impl Config {
     /// Resolves all the relative paths present inside the GeneratorConfig.
-    pub fn into_resolved(self, config_path: &str) -> anyhow::Result<Config<Resolved>> {
+    pub fn into_resolved(self, config_path: &str) -> Result<Config<Resolved>, Error> {
         let parent_dir = Some(Path::new(config_path).parent().unwrap_or(Path::new("")));
 
         let inputs = self
             .inputs
             .into_iter()
             .map(|input| input.resolve(parent_dir))
-            .collect::<anyhow::Result<Vec<Input<Resolved>>>>()?;
+            .collect::<Result<Vec<Input<Resolved>>, Error>>()?;
 
         let output = self.output.resolve(parent_dir)?;
 

diff --git a/src/cli/generator/generator.rs b/src/cli/generator/generator.rs
@@ -7,6 +7,7 @@ use pathdiff::diff_paths;
 use super::config::{Config, Resolved, Source};
 use super::source::ConfigSource;
 use crate::core::config::{self, ConfigModule};
+use crate::core::error::Error;
 use crate::core::generator::{Generator as ConfigGenerator, Input};
 use crate::core::proto_reader::ProtoReader;
 use crate::core::resource_reader::ResourceReader;
@@ -26,7 +27,7 @@ impl Generator {
     }
 
     /// Writes the configuration to the output file if allowed.
-    async fn write(self, graphql_config: &ConfigModule, output_path: &str) -> anyhow::Result<()> {
+    async fn write(self, graphql_config: &ConfigModule, output_path: &str) -> Result<(), Error> {
         let output_source = config::Source::detect(output_path)?;
         let config = match output_source {
             config::Source::Json => graphql_config.to_json(true)?,
@@ -48,7 +49,7 @@ impl Generator {
 
     /// Checks if the output file already exists and prompts for overwrite
     /// confirmation.
-    fn should_overwrite(&self, output_path: &str) -> anyhow::Result<bool> {
+    fn should_overwrite(&self, output_path: &str) -> Result<bool, Error> {
         if is_exists(output_path) {
             let should_overwrite = Confirm::new(
                 format!(
@@ -66,7 +67,7 @@ impl Generator {
         Ok(true)
     }
 
-    async fn read(&self) -> anyhow::Result<Config<Resolved>> {
+    async fn read(&self) -> Result<Config<Resolved>, Error> {
         let config_path = &self.config_path;
         let source = ConfigSource::detect(config_path)?;
         let config_content = self.runtime.file.read(config_path).await?;
@@ -82,7 +83,7 @@ impl Generator {
 
     /// performs all the i/o's required in the config file and generates
     /// concrete vec containing data for generator.
-    async fn resolve_io(&self, config: Config<Resolved>) -> anyhow::Result<Vec<Input>> {
+    async fn resolve_io(&self, config: Config<Resolved>) -> Result<Vec<Input>, Error> {
         let mut input_samples = vec![];
 
         let reader = ResourceReader::cached(self.runtime.clone());
@@ -123,7 +124,7 @@ impl Generator {
     }
 
     /// generates the final configuration.
-    pub async fn generate(self) -> anyhow::Result<ConfigModule> {
+    pub async fn generate(self) -> Result<ConfigModule, Error> {
         let config = self.read().await?;
         let path = config.output.path.0.to_owned();
         let query_type = config.schema.query.clone();

diff --git a/src/cli/generator/mod.rs b/src/cli/generator/mod.rs
@@ -2,6 +2,6 @@
 
 pub mod config;
 mod generator;
-mod source;
+pub mod source;
 
 pub use generator::Generator;
diff --git a/src/cli/tc.rs b/src/cli/tc.rs
@@ -17,7 +17,6 @@ use crate::cli::server::Server;
 use crate::core::blueprint::Blueprint;
 use crate::core::config::reader::ConfigReader;
 use crate::core::error::Error;
-use crate::core::generator::Generator;
 use crate::core::http::API_URL_PREFIX;
 use crate::core::print_schema;
 use crate::core::rest::{EndpointSet, Unchecked};

diff --git a/src/core/config/config.rs b/src/core/config/config.rs
@@ -2,7 +2,6 @@ use std::collections::{BTreeMap, BTreeSet, HashSet};
 use std::fmt::{self, Display};
 use std::num::NonZeroU64;
 
-use async_graphql::parser::types::ServiceDocument;
 use derive_setters::Setters;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;

diff --git a/src/core/config/transformer/ambiguous_type.rs b/src/core/config/transformer/ambiguous_type.rs
@@ -152,10 +152,10 @@ mod tests {
 
     use crate::core::config::transformer::AmbiguousType;
     use crate::core::config::{Config, Type};
+    use crate::core::error::Error;
     use crate::core::generator::{Generator, Input};
     use crate::core::proto_reader::ProtoMetadata;
     use crate::core::transform::Transform;
-    use crate::core::error::Error;
     use crate::core::valid::Validator;
 
     fn build_qry(mut config: Config) -> Config {
@@ -225,7 +225,7 @@ mod tests {
         assert_snapshot!(config.to_sdl());
     }
 
-    fn compile_protobuf(files: &[&str]) -> anyhow::Result<FileDescriptorSet> {
+    fn compile_protobuf(files: &[&str]) -> Result<FileDescriptorSet, Error> {
         Ok(protox::compile(files, [protobuf::SELF])?)
     }
 

diff --git a/src/core/config/transformer/merge_types/type_merger.rs b/src/core/config/transformer/merge_types/type_merger.rs
@@ -211,6 +211,7 @@ mod test {
 
     use super::TypeMerger;
     use crate::core::config::{Config, Field, Type};
+    use crate::core::error::Error;
     use crate::core::transform::Transform;
     use crate::core::valid::Validator;
 
@@ -233,7 +234,7 @@ mod test {
     }
 
     #[test]
-    fn test_cyclic_merge_case() -> anyhow::Result<()> {
+    fn test_cyclic_merge_case() -> Result<(), Error> {
         let str_field = Field { type_of: "String".to_owned(), ..Default::default() };
         let int_field = Field { type_of: "Int".to_owned(), ..Default::default() };
         let bool_field = Field { type_of: "Boolean".to_owned(), ..Default::default() };
@@ -281,7 +282,7 @@ mod test {
     }
 
     #[test]
-    fn test_type_merger() -> anyhow::Result<()> {
+    fn test_type_merger() -> Result<(), Error> {
         let str_field = Field { type_of: "String".to_owned(), ..Default::default() };
         let int_field = Field { type_of: "Int".to_owned(), ..Default::default() };
         let bool_field = Field { type_of: "Boolean".to_owned(), ..Default::default() };

diff --git a/src/core/error.rs b/src/core/error.rs
@@ -14,6 +14,7 @@ use super::ir;
 use super::rest::error::Error as RestError;
 use super::valid::ValidationError;
 use crate::cli::error::Error as CLIError;
+use crate::cli::generator::source::UnsupportedFileFormat;
 
 #[derive(From, thiserror::Error, Debug)]
 pub enum Error {
@@ -166,6 +167,9 @@ pub enum Error {
 
     #[error("Headers Error")]
     Headers(headers::Error),
+
+    #[error("Unsupported File Format")]
+    UnsupportedFileFormat(UnsupportedFileFormat),
 }
 
 pub mod file {

diff --git a/src/core/generator/from_json.rs b/src/core/generator/from_json.rs
@@ -5,7 +5,6 @@ use super::json::{self, TypesGenerator};
 use super::NameGenerator;
 use crate::core::config::Config;
 use crate::core::merge_right::MergeRight;
-use crate::core::error::Error;
 use crate::core::transform::{Transform, TransformerOps};
 use crate::core::valid::{Valid, Validator};
 
@@ -77,6 +76,7 @@ mod tests {
     use serde::Deserialize;
 
     use crate::core::config::transformer::Preset;
+    use crate::core::error::Error;
     use crate::core::generator::{FromJsonGenerator, NameGenerator, RequestSample};
     use crate::core::transform::TransformerOps;
     use crate::core::valid::Validator;
@@ -93,7 +93,7 @@ mod tests {
     }
 
     #[test]
-    fn generate_config_from_json() -> anyhow::Result<()> {
+    fn generate_config_from_json() -> Result<(), Error> {
         let mut request_samples = vec![];
         let fixtures = [
             "src/core/generator/tests/fixtures/json/incompatible_properties.json",

diff --git a/src/core/generator/generator.rs b/src/core/generator/generator.rs
@@ -60,7 +60,7 @@ impl Generator {
         &self,
         type_name_generator: &NameGenerator,
         json_samples: &[RequestSample],
-    ) -> anyhow::Result<Config> {
+    ) -> Result<Config, Error> {
         Ok(
             FromJsonGenerator::new(json_samples, type_name_generator, &self.operation_name)
                 .generate()
@@ -73,7 +73,7 @@ impl Generator {
         &self,
         metadata: &ProtoMetadata,
         operation_name: &str,
-    ) -> anyhow::Result<Config> {
+    ) -> Result<Config, Error> {
         let descriptor_set = resolve_file_descriptor_set(metadata.descriptor_set.clone())?;
         let mut config = from_proto(&[descriptor_set], operation_name)?;
         config.links.push(Link {
@@ -85,7 +85,7 @@ impl Generator {
     }
 
     /// Generated the actual configuratio from provided samples.
-    pub fn generate(&self, use_transformers: bool) -> anyhow::Result<ConfigModule> {
+    pub fn generate(&self, use_transformers: bool) -> Result<ConfigModule, Error> {
         let mut config: Config = Config::default();
         let type_name_generator = NameGenerator::new(&self.type_name_prefix);
 
@@ -143,11 +143,12 @@ mod test {
 
     use super::Generator;
     use crate::core::config::transformer::Preset;
+    use crate::core::error::Error;
     use crate::core::generator::generator::Input;
     use crate::core::generator::NameGenerator;
     use crate::core::proto_reader::ProtoMetadata;
 
-    fn compile_protobuf(files: &[&str]) -> anyhow::Result<FileDescriptorSet> {
+    fn compile_protobuf(files: &[&str]) -> Result<FileDescriptorSet, Error> {
         Ok(protox::compile(files, [tailcall_fixtures::protobuf::SELF])?)
     }
 
@@ -163,7 +164,7 @@ mod test {
     }
 
     #[test]
-    fn should_generate_config_from_proto() -> anyhow::Result<()> {
+    fn should_generate_config_from_proto() -> Result<(), Error> {
         let news_proto = tailcall_fixtures::protobuf::NEWS;
         let set = compile_protobuf(&[news_proto])?;
 
@@ -179,7 +180,7 @@ mod test {
     }
 
     #[test]
-    fn should_generate_config_from_configs() -> anyhow::Result<()> {
+    fn should_generate_config_from_configs() -> Result<(), Error> {
         let cfg_module = Generator::default()
             .inputs(vec![Input::Config {
                 schema: std::fs::read_to_string(tailcall_fixtures::configs::USER_POSTS)?,
@@ -192,7 +193,7 @@ mod test {
     }
 
     #[test]
-    fn should_generate_config_from_json() -> anyhow::Result<()> {
+    fn should_generate_config_from_json() -> Result<(), Error> {
         let parsed_content =
             parse_json("src/core/generator/tests/fixtures/json/incompatible_properties.json");
         let cfg_module = Generator::default()
@@ -208,7 +209,7 @@ mod test {
     }
 
     #[test]
-    fn should_generate_combined_config() -> anyhow::Result<()> {
+    fn should_generate_combined_config() -> Result<(), Error> {
         // Proto input
         let news_proto = tailcall_fixtures::protobuf::NEWS;
         let proto_set = compile_protobuf(&[news_proto])?;
@@ -244,7 +245,7 @@ mod test {
     }
 
     #[test]
-    fn generate_from_config_from_multiple_jsons() -> anyhow::Result<()> {
+    fn generate_from_config_from_multiple_jsons() -> Result<(), Error> {
         let mut inputs = vec![];
         let json_fixtures = [
             "src/core/generator/tests/fixtures/json/incompatible_properties.json",

diff --git a/src/core/generator/tests/json_to_config_spec.rs b/src/core/generator/tests/json_to_config_spec.rs
@@ -3,8 +3,8 @@ use std::path::Path;
 
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use tailcall::core::generator::{Generator, Input};
 use tailcall::core::error::Error;
+use tailcall::core::generator::{Generator, Input};
 use url::Url;
 
 #[derive(Serialize, Deserialize)]

diff --git a/src/core/ir/error.rs b/src/core/ir/error.rs
@@ -26,6 +26,8 @@ pub enum Error {
 
     AuthError(String),
 
+    ExprEvalError(String),
+
     WorkerError(String),
 
     HttpError(String),
@@ -68,6 +70,10 @@ impl From<Error> for crate::core::Errata {
                 CoreError::new("Authentication Error").description(message)
             }
 
+            Error::ExprEvalError(message) => {
+                CoreError::new("Expression Evaluation Error").description(message)
+            }
+
             Error::WorkerError(message) => CoreError::new("Worker Error").description(message),
 
             Error::HttpError(message) => CoreError::new("HTTP Error").description(message),

diff --git a/src/core/mustache/parse.rs b/src/core/mustache/parse.rs
@@ -7,10 +7,11 @@ use nom::sequence::delimited;
 use nom::{Finish, IResult};
 
 use super::*;
+use crate::core::error::Error;
 
 impl Mustache {
     // TODO: infallible function, no need to return Result
-    pub fn parse(str: &str) -> anyhow::Result<Mustache> {
+    pub fn parse(str: &str) -> Result<Mustache, Error> {
         let result = parse_mustache(str).finish();
         match result {
             Ok((_, mustache)) => Ok(mustache),
Thread Stats	Avg	Stdev	Max	+/- Stdev
Latency	6.74ms	3.52ms	134.87ms	78.30%
Req/Sec	3.78k	214.61	4.13k	92.00%