chore: restructure workspace (#1887)

Co-authored-by: Tushar Mathur <[email protected]>

benches/data_loader_bench.rs

@@ -10,10 +10,9 @@ use async_trait::async_trait;
 use criterion::Criterion;
 use hyper::body::Bytes;
 use reqwest::Request;
-use tailcall::config::Batch;
-use tailcall::http::{DataLoaderRequest, HttpDataLoader, Response};
-use tailcall::runtime::TargetRuntime;
-use tailcall::{EnvIO, FileIO, HttpIO};
+use tailcall::{
+    Batch, DataLoaderRequest, EnvIO, FileIO, HttpDataLoader, HttpIO, Response, TargetRuntime,
+};
 
 #[derive(Clone)]
 struct MockHttpClient {

benches/impl_path_string_for_evaluation_context.rs

@@ -15,13 +15,10 @@ use indexmap::IndexMap;
 use once_cell::sync::Lazy;
 use reqwest::{Client, Request};
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
-use tailcall::blueprint::{Server, Upstream};
-use tailcall::cache::InMemoryCache;
-use tailcall::http::{RequestContext, Response};
-use tailcall::lambda::{EvaluationContext, ResolverContextLike};
-use tailcall::path::PathString;
-use tailcall::runtime::TargetRuntime;
-use tailcall::{EnvIO, FileIO, HttpIO};
+use tailcall::{
+    EnvIO, EvaluationContext, FileIO, HttpIO, InMemoryCache, PathString, RequestContext,
+    ResolverContextLike, Response, Server, TargetRuntime, Upstream,
+};
 
 struct Http {
     client: ClientWithMiddleware,
@@ -231,7 +228,7 @@ fn assert_test(eval_ctx: &EvaluationContext<'_, MockGraphqlContext>) {
 }
 
 fn request_context() -> RequestContext {
-    let config_module = tailcall::config::ConfigModule::default();
+    let config_module = tailcall::ConfigModule::default();
 
     //TODO: default is used only in tests. Drop default and move it to test.
     let upstream = Upstream::try_from(&config_module).unwrap();

benches/json_like_bench.rs

@@ -1,6 +1,6 @@
 use criterion::{black_box, Criterion};
 use serde_json::json;
-use tailcall::json::JsonLike;
+use tailcall::JsonLike;
 
 pub fn benchmark_batched_body(c: &mut Criterion) {
     c.bench_function("test_batched_body", |b| {
@@ -19,7 +19,7 @@ pub fn benchmark_batched_body(c: &mut Criterion) {
             });
 
             black_box(
-                serde_json::to_value(tailcall::json::gather_path_matches(
+                serde_json::to_value(tailcall::gather_path_matches(
                     &input,
                     &["data".into(), "user".into(), "id".into()],
                     vec![],

benches/protobuf_convert_output.rs

@@ -4,8 +4,7 @@ use anyhow::Result;
 use criterion::{black_box, Criterion};
 use rand::{thread_rng, Fill};
 use serde_json::{json, Value};
-use tailcall::blueprint::GrpcMethod;
-use tailcall::grpc::protobuf::ProtobufSet;
+use tailcall::{GrpcMethod, ProtobufSet};
 
 const PROTO_DIR: &str = "benches/grpc";
 const PROTO_FILE: &str = "dummy.proto";

benches/request_template_bench.rs

@@ -4,10 +4,7 @@ use criterion::{black_box, Criterion};
 use derive_setters::Setters;
 use hyper::HeaderMap;
 use serde_json::json;
-use tailcall::endpoint::Endpoint;
-use tailcall::has_headers::HasHeaders;
-use tailcall::http::RequestTemplate;
-use tailcall::path::PathString;
+use tailcall::{Endpoint, HasHeaders, PathString, RequestTemplate};
 
 #[derive(Setters)]
 struct Context {

src/cli/command.rs

@@ -1,7 +1,7 @@
 use clap::{Parser, Subcommand};
 use strum_macros::Display;
 
-use crate::{config, generator};
+use crate::core::{config, generator};
 
 pub const VERSION: &str = match option_env!("APP_VERSION") {
     Some(version) => version,

src/cli/error.rs

@@ -4,7 +4,7 @@ use colored::Colorize;
 use derive_setters::Setters;
 use thiserror::Error;
 
-use crate::valid::ValidationError;
+use crate::core::valid::ValidationError;
 
 #[derive(Debug, Error, Setters, PartialEq, Clone)]
 pub struct CLIError {
@@ -236,7 +236,7 @@ mod tests {
     use stripmargin::StripMargin;
 
     use super::*;
-    use crate::valid::Cause;
+    use crate::core::valid::Cause;
 
     #[test]
     fn test_no_newline() {

src/cli/fmt.rs

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

src/cli/javascript/js_request.rs

@@ -8,7 +8,7 @@ use reqwest::Request;
 use rquickjs::{FromJs, IntoJs};
 use serde::{Deserialize, Serialize};
 
-use crate::is_default;
+use crate::core::is_default;
 
 #[derive(Debug)]
 pub struct JsRequest(reqwest::Request);

src/cli/javascript/js_response.rs

@@ -4,7 +4,7 @@ use hyper::body::Bytes;
 use rquickjs::{FromJs, IntoJs};
 
 use super::create_header_map;
-use crate::http::Response;
+use crate::core::http::Response;
 
 #[derive(Debug)]
 pub struct JsResponse(Response<String>);
@@ -107,7 +107,7 @@ mod test {
     fn create_test_response() -> Result<JsResponse> {
         let mut headers = HeaderMap::new();
         headers.insert("content-type", "application/json".parse().unwrap());
-        let response = crate::http::Response {
+        let response = crate::core::http::Response {
             status: reqwest::StatusCode::OK,
             headers,
             body: Bytes::from("Hello, World!"),
@@ -132,7 +132,7 @@ mod test {
     #[test]
     fn test_from_js_response() {
         let js_response = create_test_response().unwrap();
-        let response: Result<crate::http::Response<Bytes>> = js_response.try_into();
+        let response: Result<crate::core::http::Response<Bytes>> = js_response.try_into();
         assert!(response.is_ok());
         let response = response.unwrap();
         assert_eq!(response.status, reqwest::StatusCode::OK);
@@ -151,11 +151,14 @@ mod test {
             HeaderName::from_static("x-unusual-header"),
             HeaderValue::from_str("🚀").unwrap(),
         );
-        let response =
-            crate::http::Response { status: reqwest::StatusCode::OK, headers, body: body.into() };
+        let response = crate::core::http::Response {
+            status: reqwest::StatusCode::OK,
+            headers,
+            body: body.into(),
+        };
         let js_response = JsResponse(response);
 
-        let response: Result<crate::http::Response<Bytes>, _> = js_response.try_into();
+        let response: Result<crate::core::http::Response<Bytes>, _> = js_response.try_into();
         assert!(response.is_ok());
         let response = response.unwrap();
         assert_eq!(response.headers.get("x-unusual-header").unwrap(), "🚀");

src/cli/javascript/mod.rs

@@ -13,7 +13,7 @@ pub use js_response::JsResponse;
 pub use request_filter::RequestFilter;
 pub use runtime::Runtime;
 
-use crate::{blueprint, HttpIO};
+use crate::core::{blueprint, HttpIO};
 
 pub fn init_http(
     http: Arc<impl HttpIO>,

src/cli/javascript/request_filter.rs

@@ -4,8 +4,8 @@ use hyper::body::Bytes;
 use rquickjs::FromJs;
 
 use super::{JsRequest, JsResponse};
-use crate::http::Response;
-use crate::{HttpIO, WorkerIO};
+use crate::core::http::Response;
+use crate::core::{HttpIO, WorkerIO};
 
 #[derive(Debug)]
 pub enum Event {
@@ -106,7 +106,7 @@ mod tests {
 
     use crate::cli::javascript::request_filter::Command;
     use crate::cli::javascript::{JsRequest, JsResponse};
-    use crate::http::Response;
+    use crate::core::http::Response;
 
     #[test]
     fn test_command_from_invalid_object() {

src/cli/javascript/runtime.rs

@@ -5,7 +5,7 @@ use rquickjs::{Context, Ctx, FromJs, Function, IntoJs, Value};
 
 use super::request_filter::{Command, Event};
 use super::JsRequest;
-use crate::{blueprint, WorkerIO};
+use crate::core::{blueprint, WorkerIO};
 
 struct LocalRuntime(Context);
 

src/cli/metrics.rs

@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Result};
 
-use crate::runtime::TargetRuntime;
+use crate::core::runtime::TargetRuntime;
 
 fn cache_metrics(runtime: &TargetRuntime) -> Result<()> {
     let meter = opentelemetry::global::meter("cache");

src/cli/runtime/env.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use crate::EnvIO;
+use crate::core::EnvIO;
 
 #[derive(Clone)]
 pub struct EnvNative {

src/cli/runtime/file.rs

@@ -1,7 +1,7 @@
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
 use crate::cli::CLIError;
-use crate::FileIO;
+use crate::core::FileIO;
 
 #[derive(Clone)]
 pub struct NativeFileIO {}

src/cli/runtime/http.rs

@@ -16,9 +16,9 @@ use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 use tracing_opentelemetry::OpenTelemetrySpanExt;
 
 use super::HttpIO;
-use crate::blueprint::telemetry::Telemetry;
-use crate::blueprint::Upstream;
-use crate::http::Response;
+use crate::core::blueprint::telemetry::Telemetry;
+use crate::core::blueprint::Upstream;
+use crate::core::http::Response;
 
 static HTTP_CLIENT_REQUEST_COUNT: Lazy<Counter<u64>> = Lazy::new(|| {
     let meter = opentelemetry::global::meter("http_request");

src/cli/runtime/mod.rs

@@ -5,10 +5,10 @@ mod http;
 use std::hash::Hash;
 use std::sync::Arc;
 
-use crate::blueprint::Blueprint;
-use crate::cache::InMemoryCache;
-use crate::runtime::TargetRuntime;
-use crate::{blueprint, EnvIO, FileIO, HttpIO};
+use crate::core::blueprint::Blueprint;
+use crate::core::cache::InMemoryCache;
+use crate::core::runtime::TargetRuntime;
+use crate::core::{blueprint, EnvIO, FileIO, HttpIO};
 
 // Provides access to env in native rust environment
 fn init_env() -> Arc<dyn EnvIO> {

src/cli/server/http_1.rs

@@ -4,9 +4,9 @@ use hyper::service::{make_service_fn, service_fn};
 use tokio::sync::oneshot;
 
 use super::server_config::ServerConfig;
-use crate::async_graphql_hyper::{GraphQLBatchRequest, GraphQLRequest};
 use crate::cli::CLIError;
-use crate::http::handle_request;
+use crate::core::async_graphql_hyper::{GraphQLBatchRequest, GraphQLRequest};
+use crate::core::http::handle_request;
 
 pub async fn start_http_1(
     sc: Arc<ServerConfig>,

src/cli/server/http_2.rs

@@ -9,9 +9,9 @@ use rustls_pki_types::{CertificateDer, PrivateKeyDer};
 use tokio::sync::oneshot;
 
 use super::server_config::ServerConfig;
-use crate::async_graphql_hyper::{GraphQLBatchRequest, GraphQLRequest};
 use crate::cli::CLIError;
-use crate::http::handle_request;
+use crate::core::async_graphql_hyper::{GraphQLBatchRequest, GraphQLRequest};
+use crate::core::http::handle_request;
 
 pub async fn start_http_2(
     sc: Arc<ServerConfig>,

src/cli/server/server.rs → src/cli/server/http_server.rs

@@ -7,10 +7,10 @@ use tokio::sync::oneshot::{self};
 use super::http_1::start_http_1;
 use super::http_2::start_http_2;
 use super::server_config::ServerConfig;
-use crate::blueprint::{Blueprint, Http};
 use crate::cli::telemetry::init_opentelemetry;
 use crate::cli::CLIError;
-use crate::config::ConfigModule;
+use crate::core::blueprint::{Blueprint, Http};
+use crate::core::config::ConfigModule;
 
 pub struct Server {
     config_module: ConfigModule,

src/cli/server/mod.rs

@@ -1,9 +1,9 @@
 pub mod http_1;
 pub mod http_2;
-pub mod server;
+pub mod http_server;
 pub mod server_config;
 
-pub use server::Server;
+pub use http_server::Server;
 
 use self::server_config::ServerConfig;
 

src/cli/server/server_config.rs

@@ -3,12 +3,12 @@ use std::sync::Arc;
 
 use async_graphql_extension_apollo_tracing::ApolloTracing;
 
-use crate::blueprint::telemetry::TelemetryExporter;
-use crate::blueprint::{Blueprint, Http};
 use crate::cli::runtime::init;
-use crate::http::AppContext;
-use crate::rest::{EndpointSet, Unchecked};
-use crate::schema_extension::SchemaExtension;
+use crate::core::blueprint::telemetry::TelemetryExporter;
+use crate::core::blueprint::{Blueprint, Http};
+use crate::core::http::AppContext;
+use crate::core::rest::{EndpointSet, Unchecked};
+use crate::core::schema_extension::SchemaExtension;
 
 pub struct ServerConfig {
     pub blueprint: Blueprint,

src/cli/tc.rs

@@ -11,15 +11,15 @@ use stripmargin::StripMargin;
 
 use super::command::{Cli, Command};
 use super::update_checker;
-use crate::blueprint::Blueprint;
 use crate::cli::fmt::Fmt;
 use crate::cli::server::Server;
 use crate::cli::{self, CLIError};
-use crate::config::reader::ConfigReader;
-use crate::generator::Generator;
-use crate::http::API_URL_PREFIX;
-use crate::print_schema;
-use crate::rest::{EndpointSet, Unchecked};
+use crate::core::blueprint::Blueprint;
+use crate::core::config::reader::ConfigReader;
+use crate::core::generator::Generator;
+use crate::core::http::API_URL_PREFIX;
+use crate::core::print_schema;
+use crate::core::rest::{EndpointSet, Unchecked};
 
 const FILE_NAME: &str = ".tailcallrc.graphql";
 const YML_FILE_NAME: &str = ".graphqlrc.yml";

src/cli/telemetry.rs

@@ -24,10 +24,10 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::{Layer, Registry};
 
 use super::metrics::init_metrics;
-use crate::blueprint::telemetry::{OtlpExporter, Telemetry, TelemetryExporter};
 use crate::cli::CLIError;
-use crate::runtime::TargetRuntime;
-use crate::tracing::{default_tracing_tailcall, get_log_level, tailcall_filter_target};
+use crate::core::blueprint::telemetry::{OtlpExporter, Telemetry, TelemetryExporter};
+use crate::core::runtime::TargetRuntime;
+use crate::core::tracing::{default_tracing_tailcall, get_log_level, tailcall_filter_target};
 
 static RESOURCE: Lazy<Resource> = Lazy::new(|| {
     Resource::default().merge(&Resource::new(vec![