cli

Cargo.toml

@@ -1,13 +1,13 @@
 [workspace]
 resolver = "2"
 members = [
-  "src/common",
   "src/meta-cli",
   "src/metagen",
   "src/metagen/src/fdk_rs/static",
   "src/mt_deno",
   "src/typegate/engine",
   "src/typegate/standalone",
+  "src/typegate_api",
   "src/typegraph/core",
   "src/typegraph/schema",
   "src/xtask",
@@ -16,7 +16,7 @@ members = [
   "src/substantial",
   "src/metagen-client-rs",
   "tests/metagen/typegraphs/sample/rs",
-  "tests/metagen/typegraphs/sample/rs_upload",
+  "tests/metagen/typegraphs/sample/rs_upload", "src/typegate_api",
 ]
 
 exclude = [
@@ -34,13 +34,13 @@ edition = "2021"
 
 # internal crates
 mt_deno = { path = "src/mt_deno/" }
-common = { path = "src/common/" }
 tg_schema = { path = "src/typegraph/schema" }
 typegraph_core = { path = "src/typegraph/core" }
 substantial = { path = "src/substantial/" }
 metagen = { path = "src/metagen/" }
 metagen-client = { path = "src/metagen-client-rs" }
 typegate_engine = { path = "src/typegate/engine" }
+typegate_api = { path = "src/typegate_api" }
 grpc_utils = { path = "src/utils/grpc" }
 archive_utils = { path = "src/utils/archive" }
 

src/meta-cli/Cargo.toml

@@ -32,9 +32,11 @@ typegate = ["dep:typegate_engine"]
 
 # internal
 typegraph_core.workspace = true
+tg_schema.workspace = true
 typegate_engine = { workspace = true, optional = true }
-common.workspace = true
+typegate_api.workspace = true
 metagen.workspace = true
+archive_utils.workspace = true
 
 # data structures
 chrono = { workspace = true, features = ["serde"] }

src/meta-cli/src/cli/deploy.rs

@@ -10,7 +10,7 @@ use crate::deploy::actors::console::ConsoleActor;
 use crate::interlude::*;
 use crate::secrets::{RawSecrets, Secrets};
 use clap::Parser;
-use common::node::Node;
+use typegate_api::Node;
 
 #[derive(Parser, Debug)]
 pub struct DeploySubcommand {

src/meta-cli/src/cli/gen.rs

@@ -12,10 +12,10 @@ use crate::interlude::*;
 use crate::{config::Config, deploy::actors::console::ConsoleActor};
 use actix::Actor;
 use clap::Parser;
-use common::typegraph::Typegraph;
 use dashmap::DashMap;
 use futures_concurrency::future::FutureGroup;
 use metagen::*;
+use tg_schema::Typegraph;
 
 #[derive(Parser, Debug, Clone)]
 pub struct Gen {
@@ -105,7 +105,7 @@ impl Action for Gen {
 #[derive(Debug)]
 struct MetagenCtx {
     config: Arc<Config>,
-    typegate: Arc<common::node::Node>,
+    typegate: Arc<typegate_api::Node>,
     dir: PathBuf,
     typegraph_cache: DashMap<String, Arc<Typegraph>>,
 }

src/meta-cli/src/cli/list.rs

@@ -11,10 +11,9 @@ use crate::interlude::*;
 use anyhow::Result;
 use async_trait::async_trait;
 use clap::Parser;
-use common::graphql::Query;
-use common::node::Node;
 use serde::Deserialize;
 use tabled::{settings::Style, Table, Tabled};
+use typegate_api::{graphql::Query, Node};
 
 #[derive(Parser, Debug)]
 pub struct List {

src/meta-cli/src/cli/serialize.rs

@@ -9,9 +9,9 @@ use crate::deploy::actors::task::TaskFinishStatus;
 use crate::deploy::actors::task_manager::{Report, StopReason, TaskManagerInit, TaskSource};
 use crate::interlude::*;
 use clap::Parser;
-use common::typegraph::Typegraph;
 use core::fmt::Debug;
 use std::io::{self, Write};
+use tg_schema::Typegraph;
 use tokio::io::AsyncWriteExt;
 
 #[derive(Parser, Debug)]

src/meta-cli/src/config.rs

@@ -6,13 +6,13 @@ use crate::interlude::*;
 use crate::cli::NodeArgs;
 use crate::fs::find_in_parents;
 use crate::utils::BasicAuth;
-use common::node::Node;
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use reqwest::Url;
 use std::fs::{self, File};
 use std::io;
 use std::slice;
 use std::str::FromStr;
+use typegate_api::Node;
 
 pub const METATYPE_FILES: &[&str] = &["metatype.yml", "metatype.yaml"];
 pub const VENV_FOLDERS: &[&str] = &[".venv"];

src/meta-cli/src/deploy/actors/task.rs

@@ -27,11 +27,11 @@ use crate::deploy::actors::task_io::TaskIoActor;
 use crate::interlude::*;
 use action::{get_typegraph_name, TaskActionGenerator};
 use colored::OwoColorize;
-use common::typegraph::Typegraph;
 use indexmap::IndexMap;
 use process_wrap::tokio::TokioChildWrapper;
 use serde::Deserialize;
 use std::time::Duration;
+use tg_schema::Typegraph;
 use tokio::process::Command;
 
 pub mod message {

src/meta-cli/src/deploy/actors/task/deploy.rs

@@ -17,12 +17,12 @@ use crate::typegraph::rpc::{RpcCall as TypegraphRpcCall, RpcDispatch};
 use artifacts::ArtifactUploader;
 use base64::prelude::*;
 use color_eyre::owo_colors::OwoColorize;
-use common::node::Node;
 use reqwest::header::{self, HeaderMap, HeaderValue};
 use reqwest::Client;
 use serde::Deserialize;
 use std::{path::Path, sync::Arc};
 use tokio::process::Command;
+use typegate_api::Node;
 use typegraph_core::sdk::core::{Artifact, Handler as _, PrismaMigrationConfig, SerializeParams};
 use typegraph_core::sdk::utils::{Handler as _, QueryDeployParams};
 use typegraph_core::Lib;

src/meta-cli/src/deploy/actors/task/deploy/migrations.rs

@@ -64,7 +64,7 @@ impl DeployActionInner {
 
         for migration in migrations.iter() {
             let dest = migdir.join(&migration.runtime);
-            if let Err(err) = common::archive::unpack(&dest, Some(&migration.archive)) {
+            if let Err(err) = archive_utils::unpack(&dest, Some(&migration.archive)) {
                 ctx.console.error(format!(
                     "{scope} error while unpacking migrations into {:?}",
                     migdir

src/meta-cli/src/deploy/actors/task/serialize.rs

@@ -12,9 +12,9 @@ use crate::deploy::actors::task_manager::TaskRef;
 use crate::interlude::*;
 use crate::typegraph::rpc::{RpcCall as TypegraphRpcCall, RpcDispatch};
 use color_eyre::owo_colors::OwoColorize;
-use common::typegraph::Typegraph;
 use serde::Deserialize;
 use std::sync::Arc;
+use tg_schema::Typegraph;
 use tokio::process::Command;
 use typegraph_core::sdk::core::{Handler, SerializeParams};
 use typegraph_core::Lib;

src/meta-cli/src/utils/mod.rs

@@ -11,7 +11,7 @@ use std::env::{set_var, var};
 
 use crate::config::VENV_FOLDERS;
 use crate::fs::find_in_parents;
-use common::node::BasicAuth as BasicAuthCommon;
+use typegate_api::BasicAuth as BasicAuthCommon;
 
 pub fn ensure_venv<P: AsRef<Path>>(dir: P) -> Result<()> {
     if let Ok(active_venv) = var("VIRTUAL_ENV") {

src/typegate/engine/Cargo.toml

@@ -48,7 +48,6 @@ tempfile.workspace = true
 
 # internal
 mt_deno.workspace = true
-common.workspace = true
 substantial.workspace = true
 
 # runtimes

src/common/Cargo.toml → src/typegate_api/Cargo.toml

@@ -1,38 +1,17 @@
 [package]
-name = "common"
+name = "typegate_api"
 version.workspace = true
 edition.workspace = true
 
 [dependencies]
-# patterns
+tg_schema.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
 indoc.workspace = true
 thiserror.workspace = true
-
-# encoding
-base64.workspace = true
-flate2.workspace = true
-tar.workspace = true
-
 serde.workspace = true
 serde_json = { workspace = true, features = ["preserve_order"] }
-serde_with.workspace = true
-
-# ds
-indexmap.workspace = true
-
-# fs
-ignore.workspace = true
-
-# http
 reqwest = { workspace = true, features = ["json"] }
 url = { workspace = true, features = ["serde"] }
-
-# grpc
-protobuf.workspace = true
-proto-parser.workspace = true
-
-# cli
 colored.workspace = true
 async-trait.workspace = true

src/common/src/lib.rs → src/typegate_api/src/lib.rs

@@ -3,3 +3,5 @@
 
 pub mod graphql;
 pub mod node;
+
+pub use node::{BasicAuth, Node};

src/common/src/node.rs → src/typegate_api/src/node.rs

@@ -7,10 +7,8 @@ use reqwest::{Client, IntoUrl, RequestBuilder, Url};
 use serde::Serialize;
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use crate::{
-    graphql::{self, Query},
-    typegraph::Typegraph,
-};
+use crate::graphql::{self, Query};
+use tg_schema::Typegraph;
 
 #[derive(Debug, Serialize, Clone)]
 pub struct BasicAuth {