- moved config to cli as only cli cares about the file structure.

src/cli/generator.rs → src/cli/generator/generator.rs

@@ -6,13 +6,13 @@ use pathdiff::diff_paths;
 
 use crate::core::config::{self, ConfigModule};
 use crate::core::generator::source::{ConfigSource, ImportSource};
-use crate::core::generator::{
-    ConfigInput, Generator, GeneratorConfig, InputSource, JsonInput, ProtoInput, Resolved,
-};
+use crate::core::generator::{ConfigInput, Generator, JsonInput, ProtoInput};
 use crate::core::proto_reader::ProtoReader;
 use crate::core::resource_reader::ResourceReader;
 use crate::core::runtime::TargetRuntime;
 
+use super::config::{GeneratorConfig, InputSource, Resolved};
+
 /// Checks if file or folder already exists or not.
 fn is_exists(path: &str) -> bool {
     fs::metadata(path).is_ok()

src/cli/generator/mod.rs

@@ -0,0 +1,4 @@
+mod generator;
+mod config;
+
+pub use generator::ConfigConsoleGenerator;

src/core/generator/snapshots/tailcall__core__generator__config__tests__from_json.snap → src/cli/generator/snapshots/tailcall__cli__generator__config__tests__from_json.snap

@@ -1,32 +1,32 @@
 ---
-source: src/core/generator/config.rs
+source: src/cli/generator/config.rs
 expression: "&config"
 ---
 GeneratorConfig {
     input: [
         Input {
             source: Import {
                 src: "../protobuf/news.proto",
-                _marker: PhantomData<tailcall::core::generator::config::UnResolved>,
+                _marker: PhantomData<tailcall::cli::generator::config::UnResolved>,
             },
         },
         Input {
             source: Config {
                 src: "../configs/user-posts.graphql",
-                _marker: PhantomData<tailcall::core::generator::config::UnResolved>,
+                _marker: PhantomData<tailcall::cli::generator::config::UnResolved>,
             },
         },
         Input {
             source: Import {
                 src: "https://jsonplaceholder.typicode.com/posts",
-                _marker: PhantomData<tailcall::core::generator::config::UnResolved>,
+                _marker: PhantomData<tailcall::cli::generator::config::UnResolved>,
             },
         },
     ],
     output: Output {
         format: GraphQL,
         file: "./output.graphql",
-        _markder: PhantomData<tailcall::core::generator::config::UnResolved>,
+        _markder: PhantomData<tailcall::cli::generator::config::UnResolved>,
     },
     generate: GenerateOptions {
         schema: Schema {
@@ -55,5 +55,5 @@ GeneratorConfig {
             },
         ),
     },
-    _marker: PhantomData<tailcall::core::generator::config::UnResolved>,
+    _marker: PhantomData<tailcall::cli::generator::config::UnResolved>,
 }

src/core/generator/mod.rs

@@ -1,4 +1,3 @@
-mod config;
 mod from_json;
 mod from_proto;
 mod generator;
@@ -7,7 +6,6 @@ mod json;
 mod proto;
 pub mod source;
 
-pub use config::*;
 pub use from_json::{FromJsonGenerator, RequestSample};
 pub use generator::{ConfigInput, Generator, JsonInput, ProtoInput};
 pub use json::NameGenerator;