style(*): clean-up imports

.rustfmt.toml

@@ -1,3 +1,6 @@
+unstable_features = true
 max_width = 120
 struct_lit_width = 120
-tab_spaces = 2
+tab_spaces = 2
+imports_granularity = "Module"
+group_imports = "StdExternalCrate"

assets/jsonplaceholder.graphql

@@ -27,5 +27,7 @@ type Post {
   userId: Int!
   title: String!
   body: String!
-  user: User @http(path: "/users/{{value.userId}}")
+  user: User
+    @http(path: "/users", query: {id: "{{parent.value.userId}}"})
+    @batch(key: "userId", path: ["id"])
 }

lint.sh

@@ -1,2 +1,2 @@
-cargo fmt
+cargo +nightly fmt
 cargo clippy --all-targets --all-features --fix --allow-staged --allow-dirty

src/blueprint/blueprint.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use async_graphql::dynamic::{Schema, SchemaBuilder};
+use async_graphql::extensions::ApolloTracing;
+use async_graphql::*;
 use derive_setters::Setters;
 use serde_json::Value;
 
-use crate::config;
-
 use super::GlobalTimeout;
-use crate::lambda::Expression;
-use crate::lambda::Lambda;
-use async_graphql::extensions::ApolloTracing;
-use async_graphql::*;
+use crate::config;
+use crate::lambda::{Expression, Lambda};
 
 /// Blueprint is an intermediary representation that allows us to generate graphQL APIs.
 /// It can only be generated from a valid Config.

src/blueprint/from_config.rs

@@ -7,24 +7,18 @@ use async_graphql::parser::types::ConstDirective;
 use async_graphql::InputType;
 use regex::Regex;
 
-use crate::blueprint;
+use super::UnionTypeDefinition;
 use crate::blueprint::Type::ListType;
 use crate::blueprint::*;
-use crate::config;
-use crate::config::{Arg, Field};
-use crate::config::{Config, InlineType};
+use crate::config::{Arg, Config, Field, InlineType};
 use crate::directive::DirectiveCodec;
 use crate::endpoint::Endpoint;
-use crate::http::Method;
-use crate::http::Scheme;
+use crate::http::{Method, Scheme};
 use crate::inet_address::InetAddress;
 use crate::json::JsonSchema;
 use crate::lambda::Lambda;
-use crate::valid::OptionExtension;
-use crate::valid::Valid as ValidDefault;
-use crate::valid::{ValidExtensions, ValidationError, VectorExtension};
-
-use super::UnionTypeDefinition;
+use crate::valid::{OptionExtension, Valid as ValidDefault, ValidExtensions, ValidationError, VectorExtension};
+use crate::{blueprint, config};
 
 type Valid<A> = ValidDefault<A, String>;
 

src/blueprint/into_schema.rs

@@ -1,12 +1,11 @@
 use std::borrow::Cow;
-
 use std::sync::Arc;
 
-use async_graphql::dynamic::{self, FieldFuture, SchemaBuilder};
-
-use crate::blueprint::Definition;
-use crate::blueprint::{Blueprint, Type};
+use async_graphql::dynamic::{
+  FieldFuture, SchemaBuilder, {self},
+};
 
+use crate::blueprint::{Blueprint, Definition, Type};
 use crate::http::RequestContext;
 use crate::lambda::EvaluationContext;
 

src/blueprint/mod.rs

@@ -5,5 +5,4 @@ mod into_schema;
 mod timeout;
 
 pub use blueprint::*;
-
 pub use timeout::GlobalTimeout;

src/blueprint/timeout.rs

@@ -1,11 +1,9 @@
-use async_graphql::ServerError;
-use async_graphql::{
-  extensions::{Extension, ExtensionContext, ExtensionFactory, NextExecute},
-  Response,
-};
-use async_graphql_value::ConstValue;
 use std::sync::Arc;
 use std::time::Duration;
+
+use async_graphql::extensions::{Extension, ExtensionContext, ExtensionFactory, NextExecute};
+use async_graphql::{Response, ServerError};
+use async_graphql_value::ConstValue;
 use tokio::time::timeout;
 
 pub struct GlobalTimeout;

src/cli/error.rs

@@ -185,10 +185,11 @@ impl From<ValidationError<String>> for CLIError {
 
 #[cfg(test)]
 mod tests {
-  use super::*;
   use pretty_assertions::assert_eq;
   use stripmargin::StripMargin;
 
+  use super::*;
+
   #[test]
   fn test_no_newline() {
     let input = "Hello";

src/cli/fmt.rs

@@ -1,7 +1,7 @@
-use crate::config::Config;
-
 use colored::*;
 
+use crate::config::Config;
+
 pub struct Fmt {}
 
 impl Fmt {

src/cli/tc.rs

@@ -5,12 +5,12 @@ use std::fs;
 use anyhow::Result;
 use clap::Parser;
 
+use super::command::{Cli, Command};
+use crate::blueprint::Blueprint;
 use crate::cli::fmt::Fmt;
+use crate::config::Config;
 use crate::http::start_server;
 use crate::print_schema;
-use crate::{blueprint::Blueprint, config::Config};
-
-use super::command::{Cli, Command};
 
 pub async fn run() -> Result<()> {
   let cli = Cli::parse();

src/config/config.rs

@@ -1,18 +1,17 @@
 use std::collections::{BTreeMap, HashSet};
 
+use anyhow::Result;
 use async_graphql::parser::types::ServiceDocument;
 use derive_setters::Setters;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+use super::{Proxy, Server};
 use crate::batch::Batch;
 use crate::http::Method;
 use crate::json::JsonSchema;
 use crate::mustache::Mustache;
 use crate::path::{path_deserialize, path_serialize, Path};
-use anyhow::Result;
-
-use super::{Proxy, Server};
 
 #[derive(Serialize, Deserialize, Clone, Debug, Default, Setters)]
 #[serde(rename_all = "camelCase")]

src/config/from_document.rs

@@ -11,8 +11,7 @@ use async_graphql::Name;
 
 use crate::batch::Batch;
 use crate::config;
-use crate::config::Config;
-use crate::config::{GraphQL, RootSchema, Server, Union};
+use crate::config::{Config, GraphQL, RootSchema, Server, Union};
 use crate::directive::DirectiveCodec;
 
 fn from_document(doc: ServiceDocument) -> Config {

src/config/into_document.rs

@@ -2,9 +2,8 @@ use async_graphql::parser::types::*;
 use async_graphql::{Pos, Positioned};
 use async_graphql_value::{ConstValue, Name};
 
-use crate::directive::DirectiveCodec;
-
 use super::Config;
+use crate::directive::DirectiveCodec;
 
 fn pos<A>(a: A) -> Positioned<A> {
   Positioned::new(a, Pos::default())

src/directive.rs

@@ -1,11 +1,10 @@
+use anyhow::Result;
 use async_graphql::parser::types::ConstDirective;
 use async_graphql::{Name, Pos, Positioned};
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 use serde_path_to_error::deserialize;
 
-use anyhow::Result;
-
 use crate::valid::ValidationError;
 
 fn pos<A>(a: A) -> Positioned<A> {

src/endpoint.rs

@@ -1,21 +1,19 @@
 #![allow(clippy::too_many_arguments)]
 
-use serde_json::json;
 use std::collections::BTreeMap;
 use std::sync::Arc;
+
+use anyhow::Result;
+use derive_setters::Setters;
+use serde_json::json;
 use url::Url;
 
 use crate::batch::Batch;
-use crate::http::Method;
-use crate::http::Scheme;
+use crate::http::{Method, Scheme};
 use crate::inet_address::InetAddress;
-use crate::json::JsonLike;
-use crate::json::JsonSchema;
+use crate::json::{JsonLike, JsonSchema};
 use crate::mustache::Mustache;
 use crate::path::{Path, Segment};
-use anyhow::Result;
-
-use derive_setters::Setters;
 
 const EMPTY_VEC: &Vec<String> = &vec![];
 

src/http/client.rs

@@ -1,14 +1,11 @@
 use std::time::Duration;
 
 use http_cache_reqwest::{Cache, CacheMode, HttpCache, HttpCacheOptions, MokaManager};
-
 use reqwest::Client;
-
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 
-use crate::config::Server;
-
 use super::Response;
+use crate::config::Server;
 
 #[derive(Clone)]
 pub struct HttpClient {

src/http/data_loader.rs

@@ -1,24 +1,18 @@
-use std::collections::BTreeMap;
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
+use std::hash::{Hash, Hasher};
 use std::sync::Arc;
 use std::time::Duration;
 
+use anyhow::Result;
 use async_graphql::async_trait;
 use async_graphql::dataloader::{DataLoader, HashMapCache, Loader};
 use async_graphql::futures_util::future::join_all;
 use async_graphql_value::ConstValue;
 use derive_setters::Setters;
-
 use url::Url;
 
-use crate::http::Method;
-use crate::http::Response;
-
-use crate::http::HttpClient;
+use crate::http::{HttpClient, Method, Response};
 use crate::json::JsonLike;
-use std::hash::{Hash, Hasher};
-
-use anyhow::Result;
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct EndpointKey {
   pub url: Url,

src/http/memo_client.rs

@@ -1,11 +1,13 @@
-use std::{collections::HashMap, sync::Mutex};
+use std::collections::HashMap;
+use std::sync::Mutex;
 
-use super::HttpClient;
 use anyhow::Result;
 use http_cache_semantics::RequestLike;
 use hyper::Uri;
 use reqwest::Method;
 
+use super::HttpClient;
+
 // TODO: drop MemoClient
 #[allow(dead_code)]
 pub struct MemoClient {

src/http/mod.rs

@@ -14,7 +14,6 @@ use std::time::Duration;
 use cache_control::CacheControl;
 pub use client::*;
 pub use data_loader::*;
-
 use hyper::header::CACHE_CONTROL;
 pub use method::Method;
 pub use request_context::RequestContext;

src/http/request_context.rs

@@ -1,13 +1,14 @@
-use std::{collections::HashMap, sync::Mutex};
+use std::collections::HashMap;
+use std::sync::Mutex;
 
 use async_graphql::dataloader::{DataLoader, HashMapCache};
 use derive_setters::Setters;
 use hyper::{HeaderMap, Uri};
 
+use super::memo_client::MemoClient;
+use super::{EndpointKey, HttpClient, HttpDataLoader, Response, ServerContext};
 use crate::config::Server;
 
-use super::{memo_client::MemoClient, EndpointKey, HttpClient, HttpDataLoader, Response, ServerContext};
-
 #[derive(Setters)]
 pub struct RequestContext {
   pub data_loader: DataLoader<HttpDataLoader, HashMapCache>,

src/http/response.rs

@@ -1,9 +1,7 @@
+use anyhow::Result;
 use derive_setters::Setters;
-
 use http_cache_semantics::ResponseLike;
 
-use anyhow::Result;
-
 #[derive(Clone, Debug, Default, Setters)]
 pub struct Response {
   pub status: reqwest::StatusCode,

src/http/scheme.rs

@@ -1,5 +1,6 @@
-use serde::{Deserialize, Serialize};
 use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum Scheme {
   Http,

src/http/server.rs

@@ -3,17 +3,14 @@ use std::fs;
 use std::sync::Arc;
 
 use anyhow::Result;
-
 use async_graphql::http::GraphiQLSource;
-
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, HeaderMap, Request, Response, StatusCode};
 
 use super::request_context::RequestContext;
 use super::ServerContext;
 use crate::async_graphql_hyper;
 use crate::blueprint::Blueprint;
-
 use crate::cli::CLIError;
 use crate::config::Config;
 

src/http/server_context.rs

@@ -1,7 +1,9 @@
 use async_graphql::dynamic;
 use derive_setters::Setters;
 
-use crate::{blueprint::Blueprint, config::Server, http::HttpClient};
+use crate::blueprint::Blueprint;
+use crate::config::Server;
+use crate::http::HttpClient;
 
 #[derive(Clone, Setters)]
 pub struct ServerContext {

src/inet_address.rs

@@ -1,6 +1,7 @@
+use std::fmt::Display;
+
 use derive_setters::Setters;
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Setters)]
 pub struct InetAddress {
   pub host: String,

src/json/json_like.rs

@@ -236,7 +236,8 @@ mod tests {
   use pretty_assertions::assert_eq;
   use serde_json::json;
 
-  use crate::json::{group_by_key, json_like::gather_path_matches};
+  use crate::json::group_by_key;
+  use crate::json::json_like::gather_path_matches;
 
   #[test]
   fn test_gather_path_matches() {